[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/14: Merge remote-tracking branch 'origin/master' into core-updates
From: |
Efraim Flashner |
Subject: |
01/14: Merge remote-tracking branch 'origin/master' into core-updates |
Date: |
Sun, 1 Oct 2017 16:13:15 -0400 (EDT) |
efraim pushed a commit to branch core-updates
in repository guix.
commit 64df08f0cfac8f7a329002afa3461fd62a4b229c
Merge: b83ad3a 0ef1c22
Author: Efraim Flashner <address@hidden>
Date: Sun Oct 1 19:59:55 2017 +0300
Merge remote-tracking branch 'origin/master' into core-updates
.mailmap | 2 +-
Makefile.am | 22 +-
README | 38 +-
build-aux/compile-all.scm | 3 +-
build-aux/cuirass/gnu-system.scm | 47 +
build-aux/hydra/evaluate.scm | 13 +-
build-aux/hydra/gnu-system.scm | 19 +
configure.ac | 2 +-
doc/contributing.texi | 32 +-
doc/guix.texi | 346 +-
gnu/bootloader/grub.scm | 4 +-
gnu/build/file-systems.scm | 130 +-
gnu/build/marionette.scm | 7 +-
gnu/build/vm.scm | 66 +-
gnu/local.mk | 55 +-
gnu/packages.scm | 12 +-
gnu/packages/accessibility.scm | 45 +-
gnu/packages/admin.scm | 11 +-
gnu/packages/aidc.scm | 24 +
gnu/packages/algebra.scm | 4 +-
gnu/packages/astronomy.scm | 10 +-
gnu/packages/audio.scm | 54 +-
.../linux-libre/{4.12-i686.conf => 4.13-i686.conf} | 190 +-
.../{4.12-x86_64.conf => 4.13-x86_64.conf} | 191 +-
gnu/packages/avr.scm | 2 +-
gnu/packages/backup.scm | 11 +-
gnu/packages/base.scm | 14 +
gnu/packages/bdw-gc.scm | 12 +-
gnu/packages/bioinformatics.scm | 106 +-
gnu/packages/bootloaders.scm | 69 +
gnu/packages/build-tools.scm | 23 +-
gnu/packages/calendar.scm | 9 +-
gnu/packages/cdrom.scm | 4 +-
gnu/packages/certs.scm | 4 +-
gnu/packages/check.scm | 26 +-
gnu/packages/ci.scm | 24 +-
gnu/packages/cobol.scm | 59 +
gnu/packages/code.scm | 8 +-
gnu/packages/commencement.scm | 8 +-
gnu/packages/compression.scm | 46 +-
gnu/packages/cpp.scm | 6 +-
gnu/packages/cran.scm | 329 +-
gnu/packages/crypto.scm | 41 +-
gnu/packages/cups.scm | 124 +-
gnu/packages/databases.scm | 115 +-
gnu/packages/dav.scm | 4 +-
gnu/packages/debug.scm | 2 +-
gnu/packages/disk.scm | 25 +-
gnu/packages/display-managers.scm | 16 +-
gnu/packages/django.scm | 4 +-
gnu/packages/djvu.scm | 8 +
gnu/packages/dns.scm | 8 +-
gnu/packages/documentation.scm | 2 +-
gnu/packages/dunst.scm | 17 +-
gnu/packages/ebook.scm | 12 +-
gnu/packages/electronics.scm | 5 +-
gnu/packages/emacs.scm | 617 +-
gnu/packages/embedded.scm | 121 +-
gnu/packages/engineering.scm | 70 +-
gnu/packages/enlightenment.scm | 18 +-
gnu/packages/erlang.scm | 2 +-
gnu/packages/fabric-management.scm | 173 +
gnu/packages/file.scm | 1 -
gnu/packages/finance.scm | 216 +-
gnu/packages/fltk.scm | 2 +-
gnu/packages/fonts.scm | 31 +-
gnu/packages/fontutils.scm | 37 +-
gnu/packages/freedesktop.scm | 82 +-
gnu/packages/ftp.scm | 10 +-
gnu/packages/game-development.scm | 148 +-
gnu/packages/games.scm | 148 +-
gnu/packages/gcc.scm | 112 +-
gnu/packages/gd.scm | 20 +-
gnu/packages/gdb.scm | 4 +-
gnu/packages/gnome.scm | 321 +-
gnu/packages/gnunet.scm | 20 +-
gnu/packages/gnupg.scm | 161 +-
gnu/packages/gnustep.scm | 2 +-
gnu/packages/gnuzilla.scm | 217 +-
gnu/packages/graphics.scm | 40 +-
gnu/packages/gstreamer.scm | 28 +-
gnu/packages/gtk.scm | 30 +-
gnu/packages/guile.scm | 16 +-
gnu/packages/haskell.scm | 40 +
gnu/packages/hexedit.scm | 2 +-
gnu/packages/ibus.scm | 20 +-
gnu/packages/image-viewers.scm | 4 +-
gnu/packages/image.scm | 15 +-
gnu/packages/imagemagick.scm | 14 +-
gnu/packages/irc.scm | 57 +-
gnu/packages/java.scm | 30 +-
gnu/packages/javascript.scm | 12 +-
gnu/packages/jemalloc.scm | 8 +-
gnu/packages/kde-frameworks.scm | 26 +
gnu/packages/kde.scm | 8 +-
gnu/packages/ldc.scm | 4 +-
gnu/packages/libffcall.scm | 4 +-
gnu/packages/libidn.scm | 1 +
gnu/packages/libreoffice.scm | 86 +-
gnu/packages/libunwind.scm | 8 +-
gnu/packages/libusb.scm | 2 +-
gnu/packages/linux.scm | 138 +-
gnu/packages/lirc.scm | 14 +-
gnu/packages/logging.scm | 2 +-
gnu/packages/lxqt.scm | 30 +
gnu/packages/machine-learning.scm | 17 +-
gnu/packages/mail.scm | 102 +-
gnu/packages/man.scm | 4 +-
gnu/packages/markup.scm | 88 +
gnu/packages/mate.scm | 655 +-
gnu/packages/maths.scm | 263 +-
gnu/packages/mes.scm | 9 +-
gnu/packages/messaging.scm | 129 +-
gnu/packages/microcom.scm | 2 +-
gnu/packages/mp3.scm | 4 +-
gnu/packages/mpd.scm | 4 +-
gnu/packages/mpi.scm | 23 +-
gnu/packages/music.scm | 120 +-
gnu/packages/networking.scm | 4 +-
gnu/packages/node.scm | 12 +-
gnu/packages/ntp.scm | 6 +-
gnu/packages/ocaml.scm | 395 +-
gnu/packages/package-management.scm | 19 +-
gnu/packages/parallel.scm | 11 +-
gnu/packages/password-utils.scm | 98 +
gnu/packages/patches/bluez-CVE-2017-1000250.patch | 42 +
gnu/packages/patches/calibre-drop-unrar.patch | 49 -
gnu/packages/patches/csound-header-ordering.patch | 20 -
.../patches/e2fsprogs-32bit-quota-warnings.patch | 46 -
gnu/packages/patches/file-CVE-2017-1000249.patch | 27 +
gnu/packages/patches/fontforge-svg-modtime.patch | 35 -
.../patches/foomatic-filters-CVE-2015-8327.patch | 14 +
.../patches/foomatic-filters-CVE-2015-8560.patch | 13 +
gnu/packages/patches/gd-CVE-2017-7890.patch | 30 -
...phicsmagick-CVE-2017-11403+CVE-2017-14103.patch | 137 +
.../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 +
gnu/packages/patches/httpd-CVE-2017-9798.patch | 22 +
.../patches/libarchive-CVE-2017-14166.patch | 45 +
gnu/packages/patches/libunwind-CVE-2015-3239.patch | 17 -
gnu/packages/patches/libxml2-CVE-2017-0663.patch | 53 +
gnu/packages/patches/libxml2-CVE-2017-7375.patch | 45 +
gnu/packages/patches/libxml2-CVE-2017-7376.patch | 41 +
.../libxml2-CVE-2017-9047+CVE-2017-9048.patch | 130 +
.../libxml2-CVE-2017-9049+CVE-2017-9050.patch | 319 +
gnu/packages/patches/libzip-CVE-2017-12858.patch | 45 -
gnu/packages/patches/meson-for-build-rpath.patch | 24 +
gnu/packages/patches/metabat-fix-boost-issue.patch | 27 -
.../patches/metabat-remove-compilation-date.patch | 16 -
.../patches/multiqc-fix-git-subprocess-error.patch | 16 -
.../patches/newsbeuter-CVE-2017-14500.patch | 43 +
gnu/packages/patches/node-9077.patch | 31 -
.../ocaml-graph-honor-source-date-epoch.patch | 34 +
gnu/packages/patches/openfoam-4.1-cleanup.patch | 243 +
gnu/packages/patches/openjpeg-CVE-2017-14040.patch | 83 +
gnu/packages/patches/openjpeg-CVE-2017-14041.patch | 25 +
gnu/packages/patches/openjpeg-CVE-2017-14151.patch | 46 +
gnu/packages/patches/openjpeg-CVE-2017-14152.patch | 38 +
gnu/packages/patches/openjpeg-CVE-2017-14164.patch | 89 +
gnu/packages/patches/openocd-nrf52.patch | 64 +-
...ext-markdown-discount-use-system-markdown.patch | 32 +
...ython2-larch-coverage-4.0a6-compatibility.patch | 29 +
gnu/packages/patches/qemu-CVE-2017-10664.patch | 27 -
gnu/packages/patches/qemu-CVE-2017-10806.patch | 38 -
gnu/packages/patches/qemu-CVE-2017-10911.patch | 106 -
gnu/packages/patches/qemu-CVE-2017-11334.patch | 52 -
gnu/packages/patches/qemu-CVE-2017-11434.patch | 25 -
gnu/packages/patches/qemu-CVE-2017-12809.patch | 38 -
gnu/packages/patches/qemu-CVE-2017-13711.patch | 89 +
gnu/packages/patches/qemu-CVE-2017-14167.patch | 69 +
gnu/packages/patches/qemu-CVE-2017-7493.patch | 182 -
gnu/packages/patches/qemu-CVE-2017-8112.patch | 41 -
gnu/packages/patches/qemu-CVE-2017-8309.patch | 46 -
gnu/packages/patches/qemu-CVE-2017-8379.patch | 98 -
gnu/packages/patches/qemu-CVE-2017-8380.patch | 53 -
gnu/packages/patches/qemu-CVE-2017-9524.patch | 287 -
.../wmfire-update-for-new-gdk-versions.patch | 2 +-
gnu/packages/pdf.scm | 2 +-
gnu/packages/perl.scm | 498 +-
gnu/packages/photo.scm | 4 +-
gnu/packages/php.scm | 17 +-
gnu/packages/python.scm | 554 +-
gnu/packages/qt.scm | 16 +-
gnu/packages/ruby.scm | 238 +-
gnu/packages/samba.scm | 27 +-
gnu/packages/screen.scm | 4 +-
gnu/packages/search.scm | 10 +-
gnu/packages/serialization.scm | 10 +-
gnu/packages/shells.scm | 2 +-
gnu/packages/shellutils.scm | 35 +
gnu/packages/simulation.scm | 212 +
gnu/packages/statistics.scm | 215 +-
gnu/packages/sync.scm | 4 +-
gnu/packages/syndication.scm | 5 +-
gnu/packages/tcl.scm | 54 +-
gnu/packages/telephony.scm | 2 +-
gnu/packages/terminals.scm | 2 +-
gnu/packages/tex.scm | 20 +
gnu/packages/texinfo.scm | 16 +-
gnu/packages/textutils.scm | 4 +-
gnu/packages/time.scm | 59 +-
gnu/packages/tls.scm | 31 +-
gnu/packages/tor.scm | 4 +-
gnu/packages/version-control.scm | 120 +-
gnu/packages/video.scm | 71 +-
gnu/packages/vim.scm | 25 +-
gnu/packages/virtualization.scm | 45 +-
gnu/packages/vpn.scm | 7 +-
gnu/packages/w3m.scm | 2 +-
gnu/packages/web-browsers.scm | 6 +-
gnu/packages/web.scm | 243 +-
gnu/packages/webkit.scm | 17 +-
gnu/packages/wine.scm | 4 +-
gnu/packages/wm.scm | 4 +-
gnu/packages/xdisorg.scm | 35 +
gnu/packages/xfce.scm | 2 +-
gnu/packages/xml.scm | 9 +-
gnu/packages/xorg.scm | 133 +-
gnu/services.scm | 40 +-
gnu/services/audio.scm | 35 +-
gnu/services/base.scm | 125 +-
gnu/services/cuirass.scm | 7 +-
gnu/services/desktop.scm | 56 +-
gnu/services/networking.scm | 109 +-
gnu/services/rsync.scm | 172 +
gnu/services/web.scm | 14 +-
gnu/services/xorg.scm | 1 +
gnu/system.scm | 92 +-
gnu/system/examples/bare-bones.tmpl | 4 +-
gnu/system/file-systems.scm | 26 +-
gnu/system/install.scm | 17 +-
gnu/system/mapped-devices.scm | 7 +-
gnu/system/pam.scm | 47 +-
gnu/system/uuid.scm | 283 +
gnu/system/vm.scm | 79 +-
gnu/tests/base.scm | 23 +-
gnu/tests/desktop.scm | 105 +
gnu/tests/install.scm | 116 +-
gnu/tests/rsync.scm | 126 +
guix/build-system/meson.scm | 178 +
guix/build/download.scm | 179 +-
guix/build/emacs-build-system.scm | 45 +-
guix/build/meson-build-system.scm | 150 +
guix/cve.scm | 17 +-
guix/download.scm | 2 +-
guix/gnu-maintenance.scm | 151 +-
guix/http-client.scm | 46 +-
guix/import/cpan.scm | 2 +-
guix/import/gnome.scm | 112 +
guix/import/print.scm | 164 +
guix/import/utils.scm | 90 +-
guix/licenses.scm | 6 +
guix/memoization.scm | 5 +-
guix/scripts/archive.scm | 1 -
guix/scripts/copy.scm | 1 -
guix/scripts/download.scm | 2 +-
guix/scripts/environment.scm | 1 -
guix/scripts/import.scm | 2 +-
guix/scripts/import/json.scm | 102 +
guix/scripts/lint.scm | 7 +-
guix/scripts/pack.scm | 1 -
guix/scripts/package.scm | 24 +-
guix/scripts/pull.scm | 1 -
guix/scripts/size.scm | 2 +-
guix/scripts/substitute.scm | 207 +-
guix/scripts/system.scm | 20 +-
guix/scripts/system/search.scm | 144 +
guix/store.scm | 6 +-
guix/ui.scm | 44 +
guix/upstream.scm | 19 +
guix/utils.scm | 36 +-
po/guix/POTFILES.in | 1 +
po/packages/POTFILES.in | 2 +
po/packages/fr.po | 17387 +++++++++++++++++--
tests/cpan.scm | 2 +-
tests/file-systems.scm | 26 -
tests/guix-system.sh | 6 +-
tests/import-utils.scm | 40 +-
tests/print.scm | 64 +
tests/substitute.scm | 193 +-
tests/uuid.scm | 60 +
283 files changed, 30220 insertions(+), 4836 deletions(-)
diff --cc gnu/local.mk
index 34ceccb,edd6d82..e2b9a69
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -676,7 -684,12 +683,11 @@@ dist_patch_DATA =
%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/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 \
@@@ -800,9 -814,16 +812,8 @@@
%D%/packages/patches/libusb-0.1-disable-tests.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/libzip-CVE-2017-12858.patch \
%D%/packages/patches/lierolibre-check-unaligned-access.patch \
%D%/packages/patches/lierolibre-is-free-software.patch \
%D%/packages/patches/lierolibre-newer-libconfig.patch \
diff --cc gnu/packages/file.scm
index 9085ecf,3bc8e1d..63aa3fa
--- a/gnu/packages/file.scm
+++ b/gnu/packages/file.scm
@@@ -49,5 -50,11 +49,4 @@@ you in words what kind of data a file c
extensions to tell you the type of a file, but looks at the actual contents
of the file.")
(license bsd-2)
- (home-page "http://www.darwinsys.com/file/")))
-
-(define file/fixed
- (package
- (inherit file)
- (source (origin
- (inherit (package-source file))
- (patches (search-patches "file-CVE-2017-1000249.patch"))))))
+ (home-page "https://www.darwinsys.com/file/")))
-
diff --cc gnu/packages/texinfo.scm
index 5bf3a97,8c33023..29455b9
--- a/gnu/packages/texinfo.scm
+++ b/gnu/packages/texinfo.scm
@@@ -1,8 -1,7 +1,8 @@@
;;; GNU Guix --- Functional package management for GNU
- ;;; Copyright © 2012, 2013, 2015, 2016 Ludovic Courtès <address@hidden>
+ ;;; Copyright © 2012, 2013, 2015, 2016, 2017 Ludovic Courtès <address@hidden>
;;; Copyright © 2014, 2016 Eric Bavier <address@hidden>
;;; Copyright © 2015 Mark H Weaver <address@hidden>
+;;; Copyright © 2017 Efraim Flashner <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@@ -31,9 -30,10 +31,10 @@@
#:use-module (gnu packages ncurses))
(define-public texinfo
+ ;; TODO: Merge with 'texinfo-latest' on the next core-updates.
(package
(name "texinfo")
- (version "6.3")
+ (version "6.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/texinfo/texinfo-"
- 03/14: gnu: Remove package/inherit from commencement., (continued)
- 03/14: gnu: Remove package/inherit from commencement., Efraim Flashner, 2017/10/01
- 05/14: gnu: libarchive: Use 'modify-phases' syntax., Efraim Flashner, 2017/10/01
- 10/14: gnu: bluez: Ungraft package., Efraim Flashner, 2017/10/01
- 02/14: gnu: binutils: Update to 2.28.1., Efraim Flashner, 2017/10/01
- 06/14: gnu: curl: Update to 7.55.0., Efraim Flashner, 2017/10/01
- 08/14: gnu: libgcrypt: Update to 1.8.1., Efraim Flashner, 2017/10/01
- 13/14: gnu: libtasn1: Ungraft package., Efraim Flashner, 2017/10/01
- 14/14: gnu: expat: Update to 2.2.2., Efraim Flashner, 2017/10/01
- 09/14: gnu: gdk-pixbuf: Update to 2.36.10., Efraim Flashner, 2017/10/01
- 12/14: gnu: ruby: Update to 2.4.2., Efraim Flashner, 2017/10/01
- 01/14: Merge remote-tracking branch 'origin/master' into core-updates,
Efraim Flashner <=
- 11/14: gnu: pcre: Update to 8.41., Efraim Flashner, 2017/10/01
- 07/14: gnu: gd: Update to 2.2.5., Efraim Flashner, 2017/10/01