[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: |
Mon, 10 Jul 2017 14:38:37 -0400 (EDT) |
lfam pushed a commit to branch core-updates
in repository guix.
commit c8eb2b8c60d954b4522555a5c75b7bb4be5a1a4d
Merge: ad22c71 61adfb0
Author: Leo Famulari <address@hidden>
Date: Mon Jul 10 14:37:53 2017 -0400
Merge branch 'master' into core-updates
Makefile.am | 4 +-
build-aux/hydra/gnu-system.scm | 9 +-
doc/guix.texi | 58 +-
gnu/bootloader/grub.scm | 35 +-
gnu/build/file-systems.scm | 3 +-
gnu/build/svg.scm | 4 +-
gnu/build/vm.scm | 30 +-
gnu/local.mk | 16 +-
gnu/packages/admin.scm | 31 +-
gnu/packages/algebra.scm | 4 +-
gnu/packages/audio.scm | 8 +-
.../linux-libre/{4.11-i686.conf => 4.12-i686.conf} | 209 +++--
.../{4.11-x86_64.conf => 4.12-x86_64.conf} | 210 ++++-
gnu/packages/bash.scm | 4 +-
gnu/packages/bioinformatics.scm | 105 ++-
gnu/packages/commencement.scm | 1 -
gnu/packages/compression.scm | 12 +-
gnu/packages/databases.scm | 8 +-
gnu/packages/dav.scm | 6 +-
gnu/packages/dns.scm | 4 +-
gnu/packages/docbook.scm | 34 +-
gnu/packages/education.scm | 4 +-
gnu/packages/emacs.scm | 172 +++-
gnu/packages/firmware.scm | 14 +-
gnu/packages/fonts.scm | 13 +-
gnu/packages/freeipmi.scm | 10 +-
gnu/packages/games.scm | 9 +-
gnu/packages/gcc.scm | 8 +-
gnu/packages/gettext.scm | 4 +-
gnu/packages/gnome.scm | 9 +-
gnu/packages/gnupg.scm | 4 +-
gnu/packages/gtk.scm | 105 ++-
gnu/packages/guile.scm | 18 +-
gnu/packages/ibus.scm | 4 +-
gnu/packages/image-viewers.scm | 4 +-
gnu/packages/image.scm | 39 +-
gnu/packages/irc.scm | 4 +-
gnu/packages/java.scm | 102 +++
gnu/packages/julia.scm | 3 +-
gnu/packages/libreoffice.scm | 4 +-
gnu/packages/linux.scm | 43 +-
gnu/packages/mail.scm | 8 +-
gnu/packages/make-bootstrap.scm | 1 -
gnu/packages/maths.scm | 106 ++-
gnu/packages/messaging.scm | 59 +-
gnu/packages/mpi.scm | 36 +-
gnu/packages/music.scm | 26 +-
gnu/packages/ncurses.scm | 3 +-
gnu/packages/openldap.scm | 4 +-
gnu/packages/parallel.scm | 2 +-
gnu/packages/patches/blast+-fix-makefile.patch | 15 +
gnu/packages/patches/dblatex-remove-multirow.patch | 30 +
gnu/packages/patches/gajim-CVE-2016-10376.patch | 57 --
.../patches/gcr-disable-failing-tests.patch | 126 +++
...-fix-collection-tests-to-work-with-gpg-21.patch | 31 +
gnu/packages/patches/gemma-intel-compat.patch | 44 +
gnu/packages/patches/guile-rsvg-pkgconfig.patch | 2 +-
gnu/packages/patches/libtiff-CVE-2016-10688.patch | 92 ++
gnu/packages/patches/libtiff-CVE-2017-9936.patch | 47 ++
.../libtiff-tiffycbcrtorgb-integer-overflow.patch | 57 ++
...btiff-tiffycbcrtorgbinit-integer-overflow.patch | 43 +
.../patches/ncurses-CVE-2017-10684-10685.patch | 200 +++++
.../python-pyopenssl-17.1.0-test-overflow.patch | 36 +
.../python-pyopenssl-skip-network-test.patch | 43 -
.../patches/xorg-server-CVE-2017-10971.patch | 153 ++++
.../patches/xorg-server-CVE-2017-10972.patch | 35 +
gnu/packages/plotutils.scm | 4 +-
gnu/packages/python.scm | 125 ++-
gnu/packages/qemu.scm | 4 +-
gnu/packages/qt.scm | 116 ++-
gnu/packages/regex.scm | 4 +-
gnu/packages/ruby.scm | 4 -
gnu/packages/serialization.scm | 23 +
gnu/packages/skribilo.scm | 2 +-
gnu/packages/ssh.scm | 33 +
gnu/packages/tex.scm | 922 ++++++++++++++++++++-
gnu/packages/tmux.scm | 4 +-
gnu/packages/tor.scm | 4 +-
gnu/packages/version-control.scm | 68 +-
gnu/packages/video.scm | 133 ++-
gnu/packages/vpn.scm | 4 +-
gnu/packages/web.scm | 21 +
gnu/packages/webkit.scm | 4 +-
gnu/packages/wine.scm | 21 +-
gnu/packages/xdisorg.scm | 4 +-
gnu/packages/xfce.scm | 3 +
gnu/packages/xml.scm | 22 +
gnu/packages/xorg.scm | 9 +-
gnu/services/sysctl.scm | 77 ++
gnu/system/install.scm | 11 +-
gnu/system/linux-initrd.scm | 111 +--
gnu/system/vm.scm | 94 ++-
guix/build-system/texlive.scm | 2 +
guix/build/syscalls.scm | 78 +-
guix/build/texlive-build-system.scm | 51 +-
guix/discovery.scm | 14 +-
guix/git.scm | 13 +-
guix/packages.scm | 5 +-
guix/profiles.scm | 12 +-
guix/scripts/copy.scm | 5 +-
guix/scripts/system.scm | 23 +-
guix/store.scm | 9 +-
guix/ui.scm | 5 +-
nix/nix-daemon/nix-daemon.cc | 6 +-
tests/discovery.scm | 14 +
105 files changed, 3889 insertions(+), 799 deletions(-)
diff --cc gnu/local.mk
index 0880de0,781c28a..9e1e14f
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -520,6 -521,8 +521,7 @@@ dist_patch_DATA =
%D%/packages/patches/bigloo-gc-shebangs.patch \
%D%/packages/patches/binutils-ld-new-dtags.patch \
%D%/packages/patches/binutils-loongson-workaround.patch \
- %D%/packages/patches/binutils-mips-bash-bug.patch \
+ %D%/packages/patches/blast+-fix-makefile.patch \
%D%/packages/patches/byobu-writable-status.patch \
%D%/packages/patches/cairo-CVE-2016-9082.patch \
%D%/packages/patches/calibre-drop-unrar.patch \
@@@ -592,8 -600,9 +595,7 @@@
%D%/packages/patches/freeimage-CVE-2015-0852.patch \
%D%/packages/patches/freeimage-CVE-2016-5684.patch \
%D%/packages/patches/freeimage-fix-build-with-gcc-5.patch \
- %D%/packages/patches/freetype-CVE-2017-8105.patch \
- %D%/packages/patches/freetype-CVE-2017-8287.patch \
%D%/packages/patches/fuse-overlapping-headers.patch
\
- %D%/packages/patches/gajim-CVE-2016-10376.patch \
%D%/packages/patches/gawk-shell.patch \
%D%/packages/patches/gcc-arm-bug-71399.patch \
%D%/packages/patches/gcc-arm-link-spec-fix.patch \
@@@ -614,14 -624,16 +618,15 @@@
%D%/packages/patches/gd-freetype-test-failure.patch \
%D%/packages/patches/gd-php-73968-Fix-109-XBM-reading.patch \
%D%/packages/patches/gegl-CVE-2012-4433.patch \
+ %D%/packages/patches/gemma-intel-compat.patch \
%D%/packages/patches/geoclue-config.patch \
+ %D%/packages/patches/gettext-multi-core.patch \
+ %D%/packages/patches/gettext-gnulib-multi-core.patch \
%D%/packages/patches/ghc-dont-pass-linker-flags-via-response-files.patch
\
- %D%/packages/patches/ghostscript-CVE-2013-5653.patch \
- %D%/packages/patches/ghostscript-CVE-2015-3228.patch \
- %D%/packages/patches/ghostscript-CVE-2016-7976.patch \
- %D%/packages/patches/ghostscript-CVE-2016-7978.patch \
- %D%/packages/patches/ghostscript-CVE-2016-7979.patch \
- %D%/packages/patches/ghostscript-CVE-2016-8602.patch \
%D%/packages/patches/ghostscript-CVE-2017-8291.patch \
+ %D%/packages/patches/ghostscript-no-header-id.patch \
+ %D%/packages/patches/ghostscript-no-header-uuid.patch \
+ %D%/packages/patches/ghostscript-no-header-creationdate.patch \
%D%/packages/patches/ghostscript-runpath.patch \
%D%/packages/patches/glib-networking-ssl-cert-file.patch \
%D%/packages/patches/glib-tests-timer.patch \
@@@ -754,8 -762,29 +759,12 @@@
%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-2016-10688.patch \
- %D%/packages/patches/libtiff-CVE-2017-5225.patch \
+ %D%/packages/patches/libtiff-CVE-2017-9936.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/libtiff-tiffgetfield-bugs.patch \
+ %D%/packages/patches/libtiff-tiffycbcrtorgb-integer-overflow.patch \
+ %D%/packages/patches/libtiff-tiffycbcrtorgbinit-integer-overflow.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/admin.scm
index b1f0e60,ac8f155..5fa9d5b
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@@ -163,8 -163,14 +163,14 @@@ and provides a \"top-like\" mode (monit
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--localstatedir=/var")))
- (native-inputs `(("pkg-config" ,pkg-config)))
- (inputs `(("guile" ,guile-2.2)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+
+ ;; This is the Guile we use as a cross-compiler...
- ("guile" ,guile-2.0)))
++ ("guile" ,guile-2.2)))
+ (inputs
+ ;; ... and this is the one that appears in shebangs when cross-compiling.
- `(("guile" ,guile-2.0)))
++ `(("guile" ,guile-2.2)))
(synopsis "System service manager")
(description
"The GNU Shepherd is a daemon-managing daemon, meaning that it supervises
diff --cc gnu/packages/guile.scm
index 1fb759f,b654bbc..f86d7ea
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@@ -220,17 -223,13 +220,16 @@@ without requiring the source code to b
(package (inherit guile-2.0)
(name "guile")
(version "2.2.2")
- (replacement #f)
(source (origin
(method url-fetch)
+
+ ;; Note: we are limited to one of the compression formats
+ ;; supported by the bootstrap binaries, so no lzip here.
(uri (string-append "mirror://gnu/guile/guile-" version
- ".tar.lz"))
+ ".tar.xz"))
(sha256
(base32
- "1dnh75h4rkx1zflpsngznkwcd6afn6zrc5x3xq7n946pm5bnx5bq"))
+ "1azm25zcmxif0skxfrp11d2wc89nrzpjaann9yxdw6pvjxhs948w"))
(modules '((guix build utils)))
;; Remove the pre-built object files. Instead, build everything
diff --cc gnu/packages/image.scm
index 149b45d,139be62..1b230b5
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@@ -335,15 -333,31 +334,21 @@@ extracting icontainer icon files."
(define-public libtiff
(package
(name "libtiff")
- (replacement libtiff-4.0.8)
- (version "4.0.7")
- (source (origin
- (method url-fetch)
- (uri (string-append "ftp://download.osgeo.org/libtiff/tiff-";
- version ".tar.gz"))
- (patches (search-patches "libtiff-heap-overflow-tiffcp.patch"
- "libtiff-null-dereference.patch"
- "libtiff-heap-overflow-tif-dirread.patch"
-
"libtiff-heap-overflow-pixarlog-luv.patch"
- "libtiff-divide-by-zero.patch"
- "libtiff-divide-by-zero-ojpeg.patch"
- "libtiff-tiffcp-underflow.patch"
- "libtiff-invalid-read.patch"
- "libtiff-CVE-2016-10092.patch"
- "libtiff-heap-overflow-tiffcrop.patch"
- "libtiff-divide-by-zero-tiffcrop.patch"
- "libtiff-CVE-2016-10093.patch"
- "libtiff-divide-by-zero-tiffcp.patch"
- "libtiff-assertion-failure.patch"
- "libtiff-CVE-2016-10094.patch"
- "libtiff-CVE-2017-5225.patch"))
- (sha256
- (base32
- "06ghqhr4db1ssq0acyyz49gr8k41gzw6pqb6mbn5r7jqp77s4hwz"))))
+ (version "4.0.8")
- (source (origin
- (method url-fetch)
- (uri (string-append "ftp://download.osgeo.org/libtiff/tiff-";
- version ".tar.gz"))
- (patches (search-patches "libtiff-tiffgetfield-bugs.patch"))
- (sha256
- (base32
- "0419mh6kkhz5fkyl77gv0in8x4d2jpdpfs147y8mj86rrjlabmsr"))))
++ (source
++ (origin
++ (method url-fetch)
++ (uri (string-append "ftp://download.osgeo.org/libtiff/tiff-";
++ version ".tar.gz"))
++ (patches
++ (search-patches "libtiff-tiffgetfield-bugs.patch"
++ "libtiff-CVE-2016-10688.patch"
++ "libtiff-CVE-2017-9936.patch"
++ "libtiff-tiffycbcrtorgb-integer-overflow.patch"
++ "libtiff-tiffycbcrtorgbinit-integer-overflow.patch"))
++ (sha256
++ (base32
++ "0419mh6kkhz5fkyl77gv0in8x4d2jpdpfs147y8mj86rrjlabmsr"))))
(build-system gnu-build-system)
(outputs '("out"
"doc")) ;1.3 MiB of HTML documentation
diff --cc gnu/packages/ncurses.scm
index 44a79e7,0b23baf..d8b72a1
--- a/gnu/packages/ncurses.scm
+++ b/gnu/packages/ncurses.scm
@@@ -42,6 -43,6 +42,7 @@@
(method url-fetch)
(uri (string-append "mirror://gnu/ncurses/ncurses-"
version ".tar.gz"))
++ (patches (search-patches "ncurses-CVE-2017-10684-10685.patch"))
(sha256
(base32
"0q3jck7lna77z5r42f13c4xglc7azd19pxfrjrpgp2yf615w4lgm"))))
diff --cc gnu/packages/xml.scm
index 287d5a7,67d6c8e..3cf1de3
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@@ -71,6 -75,39 +72,27 @@@ stream-oriented parser in which an appl
things the parser might find in the XML document (like start tags).")
(license license:expat)))
-(define expat-2.2.1 ; Fixes CVE-2017-9233, CVE-2016-9063 and other issues.
- (package
- (inherit expat)
- (version "2.2.1")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://sourceforge/expat/expat/"
- version "/expat-" version ".tar.bz2"))
- (sha256
- (base32
- "11c8jy1wvllvlk7xdc5cm8hdhg0hvs8j0aqy6s702an8wkdcls0q"))))))
-
+ (define-public libebml
+ (package
+ (name "libebml")
+ (version "1.3.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://dl.matroska.org/downloads/";
+ name "/" name "-" version ".tar.bz2"))
+ (sha256
+ (base32
+ "11zka6z9ncywyjr1gfm5cnii33ln7y3w6s86kiacchip2g7kw3f5"))))
+ (build-system gnu-build-system)
+ (home-page "https://www.matroska.org";)
+ (synopsis "C++ libary to parse EBML files")
+ (description "libebml is a C++ library to read and write EBML (Extensible
+ Binary Meta Language) files. EBML was designed to be a simplified binary
+ extension of XML for the purpose of storing and manipulating data in a
+ hierarchical form with variable field lengths.")
+ (license license:lgpl2.1)))
+
(define-public libxml2
(package
(name "libxml2")