[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
Leo Famulari |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Wed, 7 Jun 2017 12:17:36 -0400 (EDT) |
lfam pushed a commit to branch core-updates
in repository guix.
commit c67d587f94173fd42d65097165afc5c512935646
Merge: 4f493cb 4679dd6
Author: Leo Famulari <address@hidden>
Date: Wed Jun 7 12:11:24 2017 -0400
Merge branch 'master' into core-updates
This merge commit includes a fix for CVE-2017-6512 in Perl 5.26.0.
doc/guix.texi | 13 +-
gnu/build/file-systems.scm | 10 +-
gnu/local.mk | 8 +-
gnu/packages/code.scm | 4 +-
gnu/packages/crypto.scm | 4 +-
gnu/packages/dns.scm | 4 +-
gnu/packages/emacs.scm | 4 +-
gnu/packages/fonts.scm | 40 +++
gnu/packages/freedesktop.scm | 41 +++
gnu/packages/game-development.scm | 8 +-
gnu/packages/gdb.scm | 4 +-
gnu/packages/geo.scm | 4 +-
gnu/packages/gl.scm | 4 +-
gnu/packages/glib.scm | 34 +--
gnu/packages/gnome.scm | 333 ++++++++++++---------
gnu/packages/gnupg.scm | 29 ++
gnu/packages/graphics.scm | 43 +++
gnu/packages/gtk.scm | 42 ++-
gnu/packages/image-viewers.scm | 4 +-
gnu/packages/imagemagick.scm | 4 +-
gnu/packages/irc.scm | 4 +-
gnu/packages/javascript.scm | 85 ++++++
gnu/packages/linux.scm | 21 +-
gnu/packages/mail.scm | 4 +-
gnu/packages/mate.scm | 4 +-
gnu/packages/maths.scm | 4 +-
gnu/packages/mtools.scm | 4 +-
gnu/packages/networking.scm | 4 +-
gnu/packages/ocaml.scm | 246 +++++++++++++++
gnu/packages/package-management.scm | 6 +-
.../patches/gnome-shell-CVE-2017-8288.patch | 54 ----
gnu/packages/patches/libgdata-fix-tests.patch | 325 ++++++++++++++++++++
.../patches/libgdata-glib-duplicate-tests.patch | 16 +
.../patches/libssh-hostname-parser-bug.patch | 31 ++
gnu/packages/patches/openscenegraph-ffmpeg3.patch | 156 ++++++++++
.../patches/perl-file-path-CVE-2017-6512.patch | 173 +++++++++++
.../patches/xf86-input-wacom-xorg-abi-25.patch | 46 ---
gnu/packages/perl.scm | 7 +-
gnu/packages/ruby.scm | 93 ++++--
gnu/packages/ssh.scm | 7 +-
gnu/packages/version-control.scm | 6 +-
gnu/packages/video.scm | 20 +-
gnu/packages/web.scm | 30 ++
gnu/packages/wm.scm | 4 +-
gnu/packages/xdisorg.scm | 10 +-
gnu/packages/xorg.scm | 4 +-
gnu/services/base.scm | 10 +-
guix/import/cpan.scm | 4 +-
guix/ssh.scm | 76 +++--
tests/cpan.scm | 4 +-
50 files changed, 1683 insertions(+), 412 deletions(-)
diff --cc gnu/local.mk
index 015267f,ab3fbb2..74630eb
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -724,8 -730,9 +724,10 @@@ dist_patch_DATA =
%D%/packages/patches/libevent-2.1-skip-failing-test.patch \
%D%/packages/patches/libextractor-ffmpeg-3.patch \
%D%/packages/patches/libgit2-0.25.1-mtime-0.patch \
+ %D%/packages/patches/libgdata-fix-tests.patch \
+ %D%/packages/patches/libgdata-glib-duplicate-tests.patch \
%D%/packages/patches/libgit2-use-after-free.patch \
+ %D%/packages/patches/libffi-3.2.1-complex-alpha.patch \
%D%/packages/patches/libjxr-fix-function-signature.patch \
%D%/packages/patches/libjxr-fix-typos.patch \
%D%/packages/patches/liboop-mips64-deplibs-fix.patch \
@@@ -738,9 -745,27 +740,10 @@@
%D%/packages/patches/libsndfile-armhf-type-checks.patch \
%D%/packages/patches/libsndfile-CVE-2017-8361-8363-8365.patch \
%D%/packages/patches/libsndfile-CVE-2017-8362.patch \
+ %D%/packages/patches/libssh-hostname-parser-bug.patch \
%D%/packages/patches/libssh2-fix-build-failure-with-gcrypt.patch \
%D%/packages/patches/libtar-CVE-2013-4420.patch \
- %D%/packages/patches/libtasn1-CVE-2017-6891.patch \
%D%/packages/patches/libtheora-config-guess.patch \
- %D%/packages/patches/libtiff-CVE-2016-10092.patch \
- %D%/packages/patches/libtiff-CVE-2016-10093.patch \
- %D%/packages/patches/libtiff-CVE-2016-10094.patch \
- %D%/packages/patches/libtiff-CVE-2017-5225.patch \
- %D%/packages/patches/libtiff-assertion-failure.patch \
- %D%/packages/patches/libtiff-divide-by-zero-ojpeg.patch \
- %D%/packages/patches/libtiff-divide-by-zero-tiffcp.patch \
- %D%/packages/patches/libtiff-divide-by-zero-tiffcrop.patch \
- %D%/packages/patches/libtiff-divide-by-zero.patch \
- %D%/packages/patches/libtiff-heap-overflow-pixarlog-luv.patch \
- %D%/packages/patches/libtiff-heap-overflow-tif-dirread.patch \
- %D%/packages/patches/libtiff-heap-overflow-tiffcp.patch \
- %D%/packages/patches/libtiff-heap-overflow-tiffcrop.patch \
- %D%/packages/patches/libtiff-invalid-read.patch \
- %D%/packages/patches/libtiff-null-dereference.patch \
- %D%/packages/patches/libtiff-tiffcp-underflow.patch \
%D%/packages/patches/libtirpc-CVE-2017-8779.patch \
%D%/packages/patches/libtorrent-rasterbar-boost-compat.patch \
%D%/packages/patches/libtool-skip-tests2.patch \
diff --cc gnu/packages/perl.scm
index c3b4869,6da4bb1..876bad8
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@@ -58,8 -59,8 +58,9 @@@
version ".tar.gz"))
(sha256
(base32
- "00jj8zr8fnihrxxhl8h936ssczv5x86qb618yz1ig40d1rp0qhvy"))
+ "0zxn9hd7mqgq06ikyi6k70ngbvjf01z1paw0jd25byyl0rlwdrzb"))
(patches (search-patches
++ "perl-file-path-CVE-2017-6512.patch"
"perl-no-sys-dirs.patch"
"perl-autosplit-default-time.patch"
"perl-deterministic-ordering.patch"