mhw pushed a commit to branch core-updates in repository guix. commit a7fb29866520d5661e0ac8e47957c91a2a43e11e Merge: 6730d89 31c7002 Author: Mark H Weaver <m...@netris.org> Date: Sun Feb 11 04:05:07 2018 -0500
Merge branch 'master' into core-updates doc/guix.texi | 35 +- gnu/local.mk | 17 +- gnu/packages/admin.scm | 4 +- gnu/packages/avahi.scm | 27 +- gnu/packages/code.scm | 60 ++- gnu/packages/compression.scm | 15 +- gnu/packages/emacs.scm | 2 + gnu/packages/games.scm | 25 +- gnu/packages/glib.scm | 11 +- gnu/packages/guile.scm | 10 +- gnu/packages/image.scm | 12 + gnu/packages/java.scm | 587 +++++++++++++++++++++ gnu/packages/linux.scm | 12 +- gnu/packages/mail.scm | 8 +- gnu/packages/mtools.scm | 5 +- gnu/packages/music.scm | 18 +- gnu/packages/networking.scm | 4 +- gnu/packages/package-management.scm | 6 +- .../clementine-remove-crypto++-dependency.patch | 19 + .../patches/emacs-browse-at-remote-cgit-gnu.patch | 59 +++ .../patches/java-xerces-bootclasspath.patch | 38 ++ .../patches/java-xerces-build_dont_unzip.patch | 44 ++ .../patches/java-xerces-xjavac_taskdef.patch | 45 ++ gnu/packages/patches/libtasn1-CVE-2018-6003.patch | 73 +++ gnu/packages/patches/libtiff-CVE-2017-18013.patch | 45 ++ gnu/packages/patches/libtiff-CVE-2017-9935.patch | 162 ++++++ gnu/packages/patches/zziplib-CVE-2017-5974.patch | 28 - gnu/packages/patches/zziplib-CVE-2017-5975.patch | 32 -- gnu/packages/patches/zziplib-CVE-2017-5976.patch | 61 --- gnu/packages/patches/zziplib-CVE-2017-5978.patch | 37 -- gnu/packages/patches/zziplib-CVE-2017-5979.patch | 19 - gnu/packages/patches/zziplib-CVE-2017-5981.patch | 19 - gnu/packages/qt.scm | 6 +- gnu/packages/ruby.scm | 2 +- gnu/packages/samba.scm | 4 +- gnu/packages/shells.scm | 6 +- gnu/packages/terminals.scm | 6 +- gnu/packages/tls.scm | 9 + gnu/packages/video.scm | 4 +- gnu/packages/virtualization.scm | 7 +- gnu/packages/web.scm | 38 ++ gnu/packages/xml.scm | 489 +++++++++++++++++ gnu/services/avahi.scm | 6 +- gnu/services/games.scm | 81 +++ guix/licenses.scm | 6 + guix/ssh.scm | 17 +- 46 files changed, 1946 insertions(+), 274 deletions(-) diff --cc gnu/local.mk index 0a7810d,67623c6..030ea83 --- a/gnu/local.mk +++ b/gnu/local.mk @@@ -579,10 -580,8 +580,11 @@@ dist_patch_DATA = %D%/packages/patches/chmlib-inttypes.patch \ %D%/packages/patches/clang-libc-search-path.patch \ %D%/packages/patches/clang-3.8-libc-search-path.patch \ + %D%/packages/patches/clang-runtime-asan-build-fixes.patch \ + %D%/packages/patches/clang-runtime-esan-build-fixes.patch \ + %D%/packages/patches/clementine-remove-crypto++-dependency.patch \ %D%/packages/patches/clementine-use-openssl.patch \ + %D%/packages/patches/clisp-glibc-2.26.patch \ %D%/packages/patches/clisp-remove-failing-test.patch \ %D%/packages/patches/clucene-pkgconfig.patch \ %D%/packages/patches/clx-remove-demo.patch \ @@@ -775,8 -776,15 +778,11 @@@ %D%/packages/patches/isl-0.11.1-aarch64-support.patch \ %D%/packages/patches/jacal-fix-texinfo.patch \ %D%/packages/patches/java-powermock-fix-java-files.patch \ + %D%/packages/patches/java-xerces-bootclasspath.patch \ + %D%/packages/patches/java-xerces-build_dont_unzip.patch \ + %D%/packages/patches/java-xerces-xjavac_taskdef.patch \ %D%/packages/patches/jemalloc-arm-address-bits.patch \ %D%/packages/patches/jbig2dec-ignore-testtest.patch \ - %D%/packages/patches/jbig2dec-CVE-2016-9601.patch \ - %D%/packages/patches/jbig2dec-CVE-2017-7885.patch \ - %D%/packages/patches/jbig2dec-CVE-2017-7975.patch \ - %D%/packages/patches/jbig2dec-CVE-2017-7976.patch \ %D%/packages/patches/jq-CVE-2015-8863.patch \ %D%/packages/patches/kdbusaddons-kinit-file-name.patch \ %D%/packages/patches/khmer-use-libraries.patch \ @@@ -846,9 -852,18 +852,12 @@@ %D%/packages/patches/libssh2-fix-build-failure-with-gcrypt.patch \ %D%/packages/patches/libtar-CVE-2013-4420.patch \ %D%/packages/patches/libtasn1-CVE-2017-10790.patch \ + %D%/packages/patches/libtasn1-CVE-2018-6003.patch \ %D%/packages/patches/libtheora-config-guess.patch \ - %D%/packages/patches/libtiff-CVE-2016-10688.patch \ + %D%/packages/patches/libtirpc-missing-headers.patch \ + %D%/packages/patches/libtiff-CVE-2017-9935.patch \ - %D%/packages/patches/libtiff-CVE-2017-9936.patch \ - %D%/packages/patches/libtiff-CVE-2017-11335.patch \ + %D%/packages/patches/libtiff-CVE-2017-18013.patch \ - %D%/packages/patches/libtiff-tiffgetfield-bugs.patch \ - %D%/packages/patches/libtiff-tiffycbcrtorgb-integer-overflow.patch \ - %D%/packages/patches/libtiff-tiffycbcrtorgbinit-integer-overflow.patch \ %D%/packages/patches/libtool-skip-tests2.patch \ - %D%/packages/patches/libunistring-gnulib-multi-core.patch \ %D%/packages/patches/libusb-0.1-disable-tests.patch \ %D%/packages/patches/libusb-for-axoloti.patch \ %D%/packages/patches/libvdpau-va-gl-unbundle.patch \ diff --cc gnu/packages/image.scm index 9358b5a,a5738f4..9052a34 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@@ -390,7 -390,8 +390,8 @@@ extracting icontainer icon files." (define-public libtiff (package (name "libtiff") + (version "4.0.9") + (replacement libtiff/fixed) - (version "4.0.8") (source (origin (method url-fetch) @@@ -420,6 -427,18 +421,17 @@@ collection of tools for doing simple ma "See COPYRIGHT in the distribution.")) (home-page "http://www.simplesystems.org/libtiff/"))) + (define libtiff/fixed + (package + (inherit libtiff) + (source + (origin + (inherit (package-source libtiff)) + (patches + (append (origin-patches (package-source libtiff)) + (search-patches "libtiff-CVE-2017-9935.patch" - "libtiff-CVE-2017-11335.patch" + "libtiff-CVE-2017-18013.patch"))))))) + (define-public leptonica (package (name "leptonica")