lfam pushed a commit to branch core-updates in repository guix. commit f76fc968669721e3baa6a0662da8e9e9f5da66cf Merge: 24ee3b2 5dc0e0b Author: Leo Famulari <l...@famulari.name> Date: Thu Dec 21 13:58:35 2017 -0500
Merge branch 'master' into core-updates doc/guix.texi | 4 +- gnu/local.mk | 10 +- gnu/packages/avr.scm | 2 +- gnu/packages/backup.scm | 3 +- gnu/packages/bioinformatics.scm | 37 +++--- gnu/packages/compression.scm | 12 +- gnu/packages/cran.scm | 80 ++++++++++-- gnu/packages/games.scm | 48 +++++++- gnu/packages/gimp.scm | 4 +- gnu/packages/gnupg.scm | 31 +++-- gnu/packages/imagemagick.scm | 4 +- gnu/packages/irc.scm | 44 +++++-- gnu/packages/linux.scm | 36 ++++-- gnu/packages/mail.scm | 4 +- gnu/packages/maths.scm | 4 +- gnu/packages/messaging.scm | 14 +-- gnu/packages/mpd.scm | 4 +- gnu/packages/package-management.scm | 4 +- gnu/packages/password-utils.scm | 4 +- .../patches/libarchive-CVE-2017-14502.patch | 40 ++++++ gnu/packages/patches/libexif-CVE-2017-7544.patch | 29 +++++ gnu/packages/patches/links-CVE-2017-11114.patch | 99 +++++++++++++++ gnu/packages/patches/mupdf-CVE-2017-14685.patch | 34 ------ gnu/packages/patches/mupdf-CVE-2017-14686.patch | 34 ------ gnu/packages/patches/mupdf-CVE-2017-14687.patch | 130 -------------------- gnu/packages/patches/mupdf-CVE-2017-15587.patch | 25 ---- ...atch => mupdf-build-with-latest-openjpeg.patch} | 8 +- gnu/packages/patches/xboing-CVE-2004-0149.patch | 134 +++++++++++++++++++++ gnu/packages/pdf.scm | 13 +- gnu/packages/perl-check.scm | 24 ++++ gnu/packages/photo.scm | 2 + gnu/packages/python.scm | 27 +++++ gnu/packages/security-token.scm | 1 + gnu/packages/statistics.scm | 65 +++++----- gnu/packages/textutils.scm | 9 +- gnu/packages/tls.scm | 4 +- gnu/packages/web-browsers.scm | 1 + gnu/packages/web.scm | 14 ++- gnu/packages/webkit.scm | 4 +- gnu/packages/xfce.scm | 5 +- gnu/packages/xml.scm | 9 ++ gnu/services/base.scm | 18 +++ gnu/tests/web.scm | 2 +- guix/upstream.scm | 8 +- 44 files changed, 716 insertions(+), 372 deletions(-) diff --cc gnu/local.mk index 84d6df7,20b3c3e..fbc5f52 --- a/gnu/local.mk +++ b/gnu/local.mk @@@ -873,13 -900,10 +876,9 @@@ dist_patch_DATA = %D%/packages/patches/mozjs38-tracelogger.patch \ %D%/packages/patches/mozjs38-version-detection.patch \ %D%/packages/patches/mumps-build-parallelism.patch \ - %D%/packages/patches/mupdf-build-with-openjpeg-2.1.patch \ - %D%/packages/patches/mupdf-CVE-2017-14685.patch \ - %D%/packages/patches/mupdf-CVE-2017-14686.patch \ - %D%/packages/patches/mupdf-CVE-2017-14687.patch \ - %D%/packages/patches/mupdf-CVE-2017-15587.patch \ + %D%/packages/patches/mupdf-build-with-latest-openjpeg.patch \ %D%/packages/patches/mupen64plus-ui-console-notice.patch \ %D%/packages/patches/mutt-store-references.patch \ - %D%/packages/patches/ncurses-CVE-2017-10684-10685.patch \ %D%/packages/patches/net-tools-bitrot.patch \ %D%/packages/patches/netcdf-date-time.patch \ %D%/packages/patches/netcdf-tst_h_par.patch \ diff --cc gnu/packages/backup.scm index 28d6183,fab71d0..db1af03 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@@ -195,10 -195,9 +195,11 @@@ backups (called chunks) to allow easy b (method url-fetch) (uri (string-append "http://libarchive.org/downloads/libarchive-" version ".tar.gz")) - (patches (search-patches "libarchive-CVE-2017-14166.patch")) ++ (patches (search-patches "libarchive-CVE-2017-14166.patch" ++ "libarchive-CVE-2017-14502.patch")) (sha256 (base32 - "1rr40hxlm9vy5z2zb5w7pyfkgd1a4s061qapm83s19accb8mpji9")))) + "1km0mzfl6in7l5vz9kl09a88ajx562rw93ng9h2jqavrailvsbgd")))) (build-system gnu-build-system) ;; TODO: Add -L/path/to/nettle in libarchive.pc. (inputs diff --cc gnu/packages/password-utils.scm index d83c244,6824210..07197de --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@@ -97,8 -97,12 +97,8 @@@ human." version "-src.tar.xz")) (sha256 (base32 - "0wrl8kxb16wzdgfjj057yv18cfg0b8z8lxp1fl2q8fkdgr7phm9g")))) + "1pfkq1m5vb90kx67vyw70s1hc4ivjsvq2535vm6wdwwsncna6bz5")))) (build-system cmake-build-system) - (arguments - `(#:configure-flags - (list (string-append "-DCMAKE_INSTALL_LIBDIR=" - (assoc-ref %outputs "out") "/lib")))) (inputs `(("libgcrypt" ,libgcrypt) ("libxi" ,libxi)