[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/04: Merge branch 'master' into core-updates
|
From: |
Marius Bakke |
|
Subject: |
02/04: Merge branch 'master' into core-updates |
|
Date: |
Mon, 18 Dec 2017 19:55:18 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 32cd878be0bb7e153fcaa6f3bfa2632867390ff9
Merge: 7534256 98bd11c
Author: Marius Bakke <address@hidden>
Date: Tue Dec 19 01:42:40 2017 +0100
Merge branch 'master' into core-updates
Makefile.am | 5 +-
build-aux/build-self.scm | 1 +
build-aux/hydra/gnu-system.scm | 17 +-
doc/contributing.texi | 28 +
doc/guix.texi | 217 +-
etc/snippets/scheme-mode/guix-cvs-reference | 8 +
etc/snippets/scheme-mode/guix-git-reference | 7 +
etc/snippets/scheme-mode/guix-hg-reference | 7 +
etc/snippets/scheme-mode/guix-origin | 23 +
etc/snippets/scheme-mode/guix-package | 34 +
etc/snippets/scheme-mode/guix-svn-reference | 7 +
.../text-mode/guix-commit-message-add-package | 8 +
.../text-mode/guix-commit-message-update-package | 9 +
gnu/bootloader/extlinux.scm | 10 +-
gnu/bootloader/u-boot.scm | 25 +-
.../u-boot.scm => build/bootloader.scm} | 38 +-
gnu/build/linux-boot.scm | 107 +
gnu/build/vm.scm | 44 +-
gnu/local.mk | 26 +-
gnu/packages/algebra.scm | 27 +-
gnu/packages/aspell.scm | 68 +-
gnu/packages/audio.scm | 137 +-
gnu/packages/axoloti.scm | 2 +-
gnu/packages/backup.scm | 1 +
gnu/packages/bioinformatics.scm | 174 +-
gnu/packages/build-tools.scm | 5 +-
gnu/packages/chez.scm | 15 +-
gnu/packages/code.scm | 6 +-
gnu/packages/compression.scm | 4 +-
gnu/packages/cran.scm | 131 +
gnu/packages/crypto.scm | 4 +-
gnu/packages/cups.scm | 23 +-
gnu/packages/databases.scm | 2 +-
gnu/packages/datastructures.scm | 55 +
gnu/packages/dictionaries.scm | 40 +
gnu/packages/emacs.scm | 178 +-
gnu/packages/embedded.scm | 38 +
gnu/packages/erlang.scm | 9 +-
gnu/packages/fontutils.scm | 8 +-
gnu/packages/fvwm.scm | 8 +-
gnu/packages/game-development.scm | 9 +-
gnu/packages/games.scm | 44 +
gnu/packages/gl.scm | 35 +
gnu/packages/gnome.scm | 6 +-
gnu/packages/gnunet.scm | 9 +-
gnu/packages/gnupg.scm | 7 +-
gnu/packages/gnuzilla.scm | 3 +-
gnu/packages/graph.scm | 26 +
gnu/packages/gstreamer.scm | 41 +-
gnu/packages/gtk.scm | 5 +-
gnu/packages/guile.scm | 19 +-
gnu/packages/haskell.scm | 4 +-
gnu/packages/image.scm | 4 +-
gnu/packages/imagemagick.scm | 14 +-
gnu/packages/jemalloc.scm | 20 +-
gnu/packages/kde.scm | 94 +-
gnu/packages/language.scm | 11 +-
gnu/packages/linux.scm | 137 +-
gnu/packages/machine-learning.scm | 4 +-
gnu/packages/mail.scm | 72 +-
gnu/packages/maths.scm | 8 +-
gnu/packages/messaging.scm | 2 +-
gnu/packages/mpd.scm | 4 +-
gnu/packages/music.scm | 343 +-
gnu/packages/networking.scm | 13 +-
gnu/packages/nutrition.scm | 9 +-
gnu/packages/package-management.scm | 6 +-
gnu/packages/password-utils.scm | 5 +
.../patches/borg-fix-archive-corruption-bug.patch | 68 +
gnu/packages/patches/eigen-arm-neon-fixes.patch | 245 +
...phicsmagick-CVE-2017-11403+CVE-2017-14103.patch | 137 -
.../patches/graphicsmagick-CVE-2017-12935.patch | 28 -
.../patches/graphicsmagick-CVE-2017-12936.patch | 16 -
.../patches/graphicsmagick-CVE-2017-12937.patch | 28 -
.../patches/graphicsmagick-CVE-2017-13775.patch | 195 -
...phicsmagick-CVE-2017-13776+CVE-2017-13777.patch | 179 -
.../patches/graphicsmagick-CVE-2017-14042.patch | 80 -
.../patches/graphicsmagick-CVE-2017-14165.patch | 72 -
.../patches/graphicsmagick-CVE-2017-14649.patch | 210 -
.../patches/jemalloc-arm-address-bits.patch | 39 +
gnu/packages/patches/libvdpau-va-gl-unbundle.patch | 35 +
.../patches/picprog-non-intel-support.patch | 74 +
...hon-scikit-learn-fix-test-non-determinism.patch | 25 +
gnu/packages/patches/qemu-CVE-2017-15118.patch | 58 -
gnu/packages/patches/qemu-CVE-2017-15119.patch | 68 -
gnu/packages/patches/qemu-CVE-2017-15268.patch | 62 -
gnu/packages/patches/rsync-CVE-2017-16548.patch | 31 +
.../patches/rsync-CVE-2017-17433-fix-tests.patch | 42 +
gnu/packages/patches/rsync-CVE-2017-17433.patch | 45 +
.../patches/rsync-CVE-2017-17434-pt1.patch | 28 +
.../patches/rsync-CVE-2017-17434-pt2.patch | 39 +
...-2011-1554.patch => t1lib-CVE-2011-1552+.patch} | 0
gnu/packages/perl-check.scm | 37 +-
gnu/packages/perl.scm | 22 +
gnu/packages/photo.scm | 6 +-
gnu/packages/popt.scm | 5 +-
gnu/packages/python.scm | 37 +-
gnu/packages/rsync.scm | 11 +-
gnu/packages/ruby.scm | 29 +-
gnu/packages/rust.scm | 1307 +-
gnu/packages/search.scm | 7 +-
gnu/packages/security-token.scm | 10 +-
gnu/packages/shells.scm | 12 +-
gnu/packages/skarnet.scm | 4 +-
gnu/packages/sml.scm | 5 +-
gnu/packages/statistics.scm | 15 +-
gnu/packages/tcl.scm | 4 +-
gnu/packages/terminals.scm | 4 +-
gnu/packages/tex.scm | 15 +-
gnu/packages/text-editors.scm | 13 +-
gnu/packages/tls.scm | 24 +-
gnu/packages/upnp.scm | 7 +-
gnu/packages/version-control.scm | 63 +-
gnu/packages/video.scm | 56 +-
gnu/packages/virtualization.scm | 77 +-
gnu/packages/web.scm | 30 +
gnu/packages/wine.scm | 16 +-
gnu/packages/wm.scm | 119 +-
gnu/packages/xdisorg.scm | 8 +-
gnu/packages/xfig.scm | 105 +-
gnu/packages/xorg.scm | 55 +-
gnu/services.scm | 3 +-
gnu/services/base.scm | 16 +-
gnu/services/certbot.scm | 6 +-
gnu/services/version-control.scm | 3 +-
gnu/services/web.scm | 442 +-
gnu/system/examples/beaglebone-black.tmpl | 54 +
gnu/system/install.scm | 31 +-
gnu/system/vm.scm | 16 +-
gnu/tests/version-control.scm | 7 +-
gnu/tests/web.scm | 128 +-
guix/build-system/asdf.scm | 124 +-
guix/build/ant-build-system.scm | 7 +-
guix/build/download.scm | 6 +-
guix/derivations.scm | 61 +-
guix/gexp.scm | 16 +-
guix/gnu-maintenance.scm | 3 +
guix/licenses.scm | 7 +
guix/man-db.scm | 200 +
guix/memoization.scm | 157 +-
guix/profiles.scm | 110 +-
guix/profiling.scm | 52 +
guix/progress.scm | 12 +-
guix/scripts/archive.scm | 1 +
guix/scripts/copy.scm | 1 +
guix/scripts/environment.scm | 1 +
guix/scripts/gc.scm | 31 +-
guix/scripts/lint.scm | 13 +-
guix/scripts/offload.scm | 39 +
guix/scripts/pack.scm | 1 +
guix/scripts/package.scm | 3 +-
guix/scripts/pull.scm | 1 +
guix/scripts/system.scm | 36 +-
guix/store.scm | 19 +-
guix/ui.scm | 24 +-
guix/utils.scm | 5 +
po/packages/hu.po | 19889 ++++++++++++++++++-
tests/guix-gc.sh | 3 +
tests/lint.scm | 15 +
159 files changed, 24691 insertions(+), 3269 deletions(-)
diff --cc gnu/local.mk
index f4a68c5,efb91fd..62812b3
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -701,16 -707,8 +704,7 @@@ dist_patch_DATA =
%D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \
%D%/packages/patches/gobject-introspection-cc.patch \
%D%/packages/patches/gobject-introspection-girepository.patch \
- %D%/packages/patches/graphicsmagick-CVE-2017-11403+CVE-2017-14103.patch
\
- %D%/packages/patches/graphicsmagick-CVE-2017-12935.patch \
- %D%/packages/patches/graphicsmagick-CVE-2017-12936.patch \
- %D%/packages/patches/graphicsmagick-CVE-2017-12937.patch \
- %D%/packages/patches/graphicsmagick-CVE-2017-13775.patch \
- %D%/packages/patches/graphicsmagick-CVE-2017-13776+CVE-2017-13777.patch
\
- %D%/packages/patches/graphicsmagick-CVE-2017-14042.patch \
- %D%/packages/patches/graphicsmagick-CVE-2017-14165.patch \
- %D%/packages/patches/graphicsmagick-CVE-2017-14649.patch \
%D%/packages/patches/graphite2-ffloat-store.patch \
- %D%/packages/patches/grep-gnulib-lock.patch \
%D%/packages/patches/grep-timing-sensitive-test.patch \
%D%/packages/patches/groff-source-date-epoch.patch \
%D%/packages/patches/gsl-test-i686.patch \
@@@ -760,7 -760,12 +754,8 @@@
%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/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 \
@@@ -822,13 -827,28 +817,14 @@@
%D%/packages/patches/libtar-CVE-2013-4420.patch \
%D%/packages/patches/libtasn1-CVE-2017-10790.patch \
%D%/packages/patches/libtheora-config-guess.patch \
- %D%/packages/patches/libtiff-CVE-2016-10688.patch \
- %D%/packages/patches/libtiff-CVE-2017-9936.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/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 \
%D%/packages/patches/libvpx-CVE-2016-2818.patch \
%D%/packages/patches/libxcb-python-3.5-compat.patch \
- %D%/packages/patches/libxml2-CVE-2016-4658.patch \
- %D%/packages/patches/libxml2-CVE-2016-5131.patch \
- %D%/packages/patches/libxml2-CVE-2017-0663.patch \
- %D%/packages/patches/libxml2-CVE-2017-7375.patch \
- %D%/packages/patches/libxml2-CVE-2017-7376.patch \
- %D%/packages/patches/libxml2-CVE-2017-9047+CVE-2017-9048.patch \
- %D%/packages/patches/libxml2-CVE-2017-9049+CVE-2017-9050.patch \
%D%/packages/patches/libxslt-generated-ids.patch \
- %D%/packages/patches/libxslt-CVE-2016-4738.patch \
%D%/packages/patches/libxt-guix-search-paths.patch \
%D%/packages/patches/lierolibre-check-unaligned-access.patch \
%D%/packages/patches/lierolibre-is-free-software.patch \
@@@ -1005,12 -1030,8 +1003,9 @@@
%D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
%D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \
%D%/packages/patches/python2-subprocess32-disable-input-test.patch \
- %D%/packages/patches/python2-unittest2-remove-argparse.patch \
+ %D%/packages/patches/python-unittest2-python3-compat.patch \
+ %D%/packages/patches/python-unittest2-remove-argparse.patch \
%D%/packages/patches/qemu-CVE-2017-15038.patch \
- %D%/packages/patches/qemu-CVE-2017-15118.patch \
- %D%/packages/patches/qemu-CVE-2017-15119.patch \
- %D%/packages/patches/qemu-CVE-2017-15268.patch \
%D%/packages/patches/qemu-CVE-2017-15289.patch \
%D%/packages/patches/qt4-ldflags.patch \
%D%/packages/patches/qtscript-disable-tests.patch \
@@@ -1053,9 -1079,10 +1053,9 @@@
%D%/packages/patches/synfigstudio-fix-ui-with-gtk3.patch \
%D%/packages/patches/t1lib-CVE-2010-2642.patch \
%D%/packages/patches/t1lib-CVE-2011-0764.patch \
- %D%/packages/patches/t1lib-CVE-2011-1552+CVE-2011-1553+CVE-2011-1554.patch
\
+ %D%/packages/patches/t1lib-CVE-2011-1552+.patch \
%D%/packages/patches/tar-CVE-2016-6321.patch \
%D%/packages/patches/tar-skip-unreliable-tests.patch \
- %D%/packages/patches/tcl-mkindex-deterministic.patch \
%D%/packages/patches/tclxml-3.2-install.patch \
%D%/packages/patches/tcsh-fix-autotest.patch \
%D%/packages/patches/tcsh-fix-out-of-bounds-read.patch \
diff --cc gnu/packages/tls.scm
index d0948ab,75d8c94..8eff723
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@@ -246,12 -254,11 +246,13 @@@ required structures."
(define-public openssl
(package
(name "openssl")
- (version "1.0.2l")
+ (version "1.0.2m")
+ (replacement openssl-1.0.2n)
(source (origin
(method url-fetch)
- (uri (list (string-append "ftp://ftp.openssl.org/source/";
+ (uri (list (string-append
"https://www.openssl.org/source/openssl-";
+ version ".tar.gz")
+ (string-append "ftp://ftp.openssl.org/source/";
name "-" version ".tar.gz")
(string-append "ftp://ftp.openssl.org/source/old/";
(string-trim-right version
char-set:letter)