[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/06: Merge branch 'master' into core-updates
|
From: |
Marius Bakke |
|
Subject: |
02/06: Merge branch 'master' into core-updates |
|
Date: |
Tue, 5 Dec 2017 17:51:48 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 77181815ae70cf573b6fa390a4400b718835aa8a
Merge: e3f9406 35377cf
Author: Marius Bakke <address@hidden>
Date: Tue Dec 5 23:41:30 2017 +0100
Merge branch 'master' into core-updates
.dir-locals.el | 3 +-
.mailmap | 21 +-
Makefile.am | 18 +-
NEWS | 76 +
bayfront.guixsd.org.pub => berlin.guixsd.org.pub | 0
build-aux/compile-all.scm | 6 +-
build-aux/hydra/evaluate.scm | 9 +-
build-aux/hydra/guix-modular.scm | 104 ++
doc/guix.texi | 773 ++++++---
gnu/bootloader/extlinux.scm | 22 +-
gnu/build/linux-boot.scm | 2 +-
gnu/build/shepherd.scm | 10 +-
gnu/build/vm.scm | 6 +-
gnu/local.mk | 29 +-
gnu/packages/admin.scm | 53 +-
gnu/packages/algebra.scm | 4 +-
gnu/packages/audio.scm | 122 +-
gnu/packages/aux-files/linux-libre/4.14-arm.conf | 25 +-
gnu/packages/backup.scm | 9 +-
gnu/packages/bioinformatics.scm | 379 ++++-
gnu/packages/bittorrent.scm | 6 +-
gnu/packages/bootloaders.scm | 24 +-
gnu/packages/certs.scm | 5 +-
gnu/packages/compression.scm | 116 +-
gnu/packages/cran.scm | 116 +-
gnu/packages/crypto.scm | 4 +-
gnu/packages/curl.scm | 14 +
gnu/packages/databases.scm | 66 +-
gnu/packages/direct-connect.scm | 25 +-
gnu/packages/django.scm | 20 +
gnu/packages/dns.scm | 29 +-
gnu/packages/elixir.scm | 34 +-
gnu/packages/emacs.scm | 151 +-
gnu/packages/engineering.scm | 14 +-
gnu/packages/enlightenment.scm | 8 +-
gnu/packages/erlang.scm | 6 +-
gnu/packages/file-systems.scm | 4 +-
gnu/packages/finance.scm | 11 +-
gnu/packages/fonts.scm | 106 ++
gnu/packages/fontutils.scm | 105 +-
gnu/packages/freedesktop.scm | 147 +-
gnu/packages/game-development.scm | 45 +-
gnu/packages/games.scm | 123 +-
gnu/packages/gcc.scm | 7 +-
gnu/packages/gnome.scm | 45 +-
gnu/packages/gnunet.scm | 29 +-
gnu/packages/gnupg.scm | 4 +-
gnu/packages/gnuzilla.scm | 11 +-
gnu/packages/gps.scm | 31 +-
gnu/packages/graphics.scm | 3 +-
gnu/packages/groff.scm | 47 +
gnu/packages/gstreamer.scm | 34 +-
gnu/packages/guile.scm | 141 +-
gnu/packages/haskell-check.scm | 5 +-
gnu/packages/haskell-crypto.scm | 9 +-
gnu/packages/haskell-web.scm | 9 +-
gnu/packages/haskell.scm | 206 ++-
gnu/packages/image.scm | 55 +-
gnu/packages/irc.scm | 8 +-
gnu/packages/java.scm | 308 +++-
gnu/packages/kodi.scm | 6 +-
gnu/packages/libcanberra.scm | 6 +-
gnu/packages/linux.scm | 22 +-
gnu/packages/lisp.scm | 163 +-
gnu/packages/lua.scm | 46 +-
gnu/packages/lxde.scm | 7 +-
gnu/packages/machine-learning.scm | 4 +-
gnu/packages/mail.scm | 49 +-
gnu/packages/man.scm | 23 +-
gnu/packages/markup.scm | 2 +-
gnu/packages/maths.scm | 9 +-
gnu/packages/mes.scm | 6 +-
gnu/packages/messaging.scm | 56 +-
gnu/packages/mp3.scm | 11 +-
gnu/packages/music.scm | 208 ++-
gnu/packages/musl.scm | 4 +-
gnu/packages/nano.scm | 4 +-
gnu/packages/networking.scm | 35 +-
gnu/packages/node.scm | 23 +-
gnu/packages/ntp.scm | 6 +-
gnu/packages/ocaml.scm | 2 +-
gnu/packages/package-management.scm | 37 +-
gnu/packages/parallel.scm | 5 +-
gnu/packages/password-utils.scm | 5 +-
gnu/packages/patches/bazaar-CVE-2017-14176.patch | 166 ++
gnu/packages/patches/clementine-use-openssl.patch | 67 +
gnu/packages/patches/dtc-32-bits-check.patch | 134 ++
gnu/packages/patches/dtc-format-modifier.patch | 38 +
.../patches/emacs-highlight-stages-add-gexp.patch | 26 +
gnu/packages/patches/exim-CVE-2017-1000369.patch | 59 -
.../patches/gcc-6-source-date-epoch-1.patch | 187 +++
.../patches/gcc-6-source-date-epoch-2.patch | 346 ++++
.../glusterfs-use-PATH-instead-of-hardcodes.patch | 140 ++
.../patches/guile-emacs-fix-configure.patch | 211 +++
.../patches/higan-remove-march-native-flag.patch | 15 +-
.../patches/libmygpo-qt-fix-jsoncreatortest.patch | 41 +
.../libtorrent-rasterbar-boost-compat.patch | 27 -
.../patches/libvirt-CVE-2017-1000256.patch | 84 -
.../node-test-http2-server-rst-stream.patch | 131 ++
.../patches/optipng-CVE-2017-1000229.patch | 22 +
gnu/packages/patches/pcmanfm-CVE-2017-8934.patch | 56 +
... => perl-text-markdown-discount-unbundle.patch} | 0
gnu/packages/patches/procmail-CVE-2017-16844.patch | 25 +
gnu/packages/patches/qemu-CVE-2017-15118.patch | 58 +
gnu/packages/patches/qemu-CVE-2017-15119.patch | 68 +
gnu/packages/patches/shepherd-close-fds.patch | 36 +
gnu/packages/patches/spice-CVE-2016-9577.patch | 33 -
gnu/packages/patches/spice-CVE-2016-9578-1.patch | 33 -
gnu/packages/patches/spice-CVE-2016-9578-2.patch | 38 -
gnu/packages/patches/spice-CVE-2017-7506.patch | 158 --
.../patches/supertuxkart-angelscript-ftbfs.patch | 42 -
gnu/packages/patches/vpnc-script.patch | 15 -
gnu/packages/perl.scm | 4 +-
gnu/packages/php.scm | 7 +-
gnu/packages/protobuf.scm | 68 +-
gnu/packages/python.scm | 119 +-
gnu/packages/qt.scm | 121 +-
gnu/packages/samba.scm | 4 +-
gnu/packages/scribus.scm | 14 +-
gnu/packages/security-token.scm | 9 +-
gnu/packages/shells.scm | 41 +-
gnu/packages/simulation.scm | 11 +
gnu/packages/spice.scm | 12 +-
gnu/packages/statistics.scm | 88 +-
gnu/packages/synergy.scm | 2 +-
gnu/packages/telephony.scm | 48 +
gnu/packages/time.scm | 10 +-
gnu/packages/tls.scm | 8 +-
gnu/packages/tor.scm | 4 +-
gnu/packages/version-control.scm | 26 +-
gnu/packages/video.scm | 15 +-
gnu/packages/vim.scm | 40 +
gnu/packages/virtualization.scm | 10 +-
gnu/packages/vpn.scm | 137 +-
gnu/packages/web.scm | 155 +-
gnu/packages/wget.scm | 4 +-
gnu/packages/wm.scm | 4 +-
gnu/packages/xdisorg.scm | 51 +
gnu/packages/xfig.scm | 2 +-
gnu/packages/xorg.scm | 35 +-
gnu/services/base.scm | 2 +-
gnu/services/certbot.scm | 133 ++
gnu/services/configuration.scm | 3 +-
gnu/services/desktop.scm | 13 +-
gnu/services/dict.scm | 26 +-
gnu/services/messaging.scm | 57 +-
gnu/services/version-control.scm | 63 +-
gnu/services/xorg.scm | 298 +++-
gnu/system.scm | 4 +-
gnu/system/install.scm | 27 +-
gnu/system/uuid.scm | 2 +-
gnu/system/vm.scm | 70 +-
gnu/tests/messaging.scm | 1 +
gnu/tests/version-control.scm | 131 +-
guix/build-system/scons.scm | 134 ++
guix/build/compile.scm | 6 +-
guix/build/profiles.scm | 2 +-
guix/build/scons-build-system.scm | 65 +
guix/build/union.scm | 11 +-
guix/gexp.scm | 55 +-
guix/git.scm | 12 +-
guix/gnu-maintenance.scm | 10 +-
guix/packages.scm | 1 +
guix/profiles.scm | 147 +-
guix/progress.scm | 69 +-
guix/records.scm | 2 +-
guix/scripts/environment.scm | 2 +-
guix/scripts/lint.scm | 31 +-
guix/scripts/offload.scm | 2 +-
guix/scripts/package.scm | 4 +-
guix/scripts/pull.scm | 8 +-
guix/scripts/system.scm | 85 +-
guix/scripts/weather.scm | 106 +-
guix/ssh.scm | 2 +-
guix/ui.scm | 50 +-
guix/utils.scm | 5 +
guix/zlib.scm | 46 +-
nix/scripts/list-runtime-roots.in | 1 +
po/guix/fr.po | 1706 ++++++++++++--------
po/packages/POTFILES.in | 2 +
tests/guix-system.sh | 4 +-
tests/lint.scm | 15 +-
tests/publish.scm | 2 +-
tests/store.scm | 4 +-
tests/syscalls.scm | 7 +-
185 files changed, 8334 insertions(+), 2938 deletions(-)
diff --cc Makefile.am
index 5320706,ddbf7a7..e9c323b
--- a/Makefile.am
+++ b/Makefile.am
@@@ -432,8 -435,10 +435,9 @@@ EXTRA_DIST =
build-aux/hydra/evaluate.scm \
build-aux/hydra/gnu-system.scm \
build-aux/hydra/guix.scm \
+ build-aux/hydra/guix-modular.scm \
build-aux/check-available-binaries.scm \
build-aux/check-final-inputs-self-contained.scm \
- build-aux/download.scm \
build-aux/generate-authors.scm \
build-aux/test-driver.scm \
build-aux/update-guix-package.scm \
diff --cc gnu/local.mk
index 5a70107,a0e3f6e..ac7e115
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -809,15 -832,27 +819,13 @@@ dist_patch_DATA =
%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/libtorrent-rasterbar-boost-compat.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/libvirt-CVE-2017-1000256.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 \
@@@ -913,6 -951,8 +923,7 @@@
%D%/packages/patches/patchelf-rework-for-arm.patch \
%D%/packages/patches/patchutils-xfail-gendiff-tests.patch \
%D%/packages/patches/patch-hurd-path-max.patch \
+ %D%/packages/patches/pcmanfm-CVE-2017-8934.patch \
- %D%/packages/patches/pcre-CVE-2017-7186.patch \
%D%/packages/patches/pcre2-CVE-2017-7186.patch \
%D%/packages/patches/pcre2-CVE-2017-8786.patch \
%D%/packages/patches/perl-file-path-CVE-2017-6512.patch \
@@@ -990,9 -1032,10 +1002,11 @@@
%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 \
diff --cc gnu/packages/curl.scm
index c291d60,49703c0..8cc590d
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@@ -43,7 -42,8 +43,8 @@@
(define-public curl
(package
(name "curl")
- (version "7.55.1")
+ (version "7.56.1")
+ (replacement curl-7.57.0)
(source (origin
(method url-fetch)
(uri (string-append "https://curl.haxx.se/download/curl-";
diff --cc gnu/packages/statistics.scm
index f2a6971,fc18719..bfa7e05
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@@ -118,10 -118,10 +118,10 @@@ be output in text, PostScript, PDF or H
version ".tar.gz"))
(sha256
(base32
- "0r0cv2kc3x5z9xycpnxx6fbvv22psw2m342jhpslbxkc8g1307lp"))))
+ "09pl0w01fr09bsrwd7nz2r5psysj0z93w4chz3hm2havvqqvhg3s"))))
(build-system gnu-build-system)
(arguments
- `(#:disallowed-references (,tzdata-2017a)
+ `(#:disallowed-references (,tzdata-for-tests)
#:make-flags
(list (string-append "LDFLAGS=-Wl,-rpath="
(assoc-ref %outputs "out")
diff --cc gnu/packages/tls.scm
index 1fe1e29,d8cc1cc..2aa082c
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@@ -10,7 -10,7 +10,8 @@@
;;; Copyright © 2016 Hartmut Goebel <address@hidden>
;;; Copyright © 2017 Ricardo Wurmus <address@hidden>
;;; Copyright © 2017 Marius Bakke <address@hidden>
+;;; Copyright © 2017 Tobias Geerinckx-Rice <address@hidden>
+ ;;; Copyright © 2017 Rutger Helling <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/xorg.scm
index adf2dff,d702269..4ea0fcd
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@@ -4891,15 -4891,33 +4891,33 @@@ new API's in libXft, or the legacy API'
(define-public libxfont2
(package
(inherit libxfont)
- (version "2.0.1")
+ (version "2.0.2")
+ (replacement libxfont2-2.0.3)
(source (origin
(method url-fetch)
(uri (string-append "mirror://xorg/individual/lib/libXfont2-"
version ".tar.bz2"))
(sha256
(base32
- "0znvwk36nhmyqpmhbm9mzisgixp1mp5qkfald8x1n5yxbm3vpyz9"))))))
+ "04f1lswh1ridkycgaivf1hrr77l5ap8smbfr2rqjrm7phwxqs24l"))))))
+ ;; Fixes the following security vulnerabilities:
+ ;; https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-13720
+ ;; https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-13722
+ ;; https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-16612
+ (define-public libxfont2-2.0.3
+ (package
+ (inherit libxfont2)
+ (version "2.0.3")
+ (source
+ (origin
+ (inherit (package-source libxfont2))
+ (uri (string-append "mirror://xorg/individual/lib/libXfont2-"
+ version ".tar.bz2"))
+ (sha256
+ (base32
+ "0klwmimmhm3axpj8pwn5l41lbggh47r5aazhw63zxkbwfgyvg2hf"))))))
+
(define-public libxi
(package
(name "libxi")
- branch core-updates updated (f79c3ea -> fa9fcd3), Marius Bakke, 2017/12/05
- 01/06: gnu: glibc: Update to 2.26.105-g0890d5379 [fixes CVE-2017-15804]., Marius Bakke, 2017/12/05
- 03/06: gnu: address@hidden: Remove graft for 2.0.3., Marius Bakke, 2017/12/05
- 06/06: gnu: libxcursor: Remove graft for 1.1.15., Marius Bakke, 2017/12/05
- 04/06: gnu: curl: Remove graft for 7.57.0., Marius Bakke, 2017/12/05
- 05/06: gnu: guile: Update to 2.2.3., Marius Bakke, 2017/12/05
- 02/06: Merge branch 'master' into core-updates,
Marius Bakke <=