[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/03: Merge branch 'master' into core-updates
|
From: |
Marius Bakke |
|
Subject: |
01/03: Merge branch 'master' into core-updates |
|
Date: |
Tue, 10 Oct 2017 16:41:19 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit c01ef97594a8b06e884906a5efbdfacf8ba33dc3
Merge: 86d02fa 4b8b441
Author: Marius Bakke <address@hidden>
Date: Tue Oct 10 22:33:28 2017 +0200
Merge branch 'master' into core-updates
.mailmap | 1 +
configure.ac | 2 +-
doc/guix.texi | 115 +-
gnu/build/activation.scm | 13 +-
gnu/build/file-systems.scm | 4 +-
gnu/local.mk | 29 +-
gnu/packages/admin.scm | 250 ++--
gnu/packages/algebra.scm | 31 +-
gnu/packages/android.scm | 38 +
gnu/packages/apr.scm | 25 +-
gnu/packages/aspell.scm | 2 +-
gnu/packages/assembly.scm | 4 +-
gnu/packages/audio.scm | 261 ++--
gnu/packages/autotools.scm | 5 +-
gnu/packages/backup.scm | 46 +-
gnu/packages/base.scm | 12 +-
gnu/packages/benchmark.scm | 67 +-
gnu/packages/bioinformatics.scm | 262 ++--
gnu/packages/bittorrent.scm | 33 +-
gnu/packages/build-tools.scm | 8 +-
gnu/packages/calendar.scm | 24 +-
gnu/packages/cdrom.scm | 2 +-
gnu/packages/check.scm | 48 +-
gnu/packages/code.scm | 6 +-
gnu/packages/compression.scm | 39 +-
gnu/packages/conky.scm | 31 +-
gnu/packages/crypto.scm | 4 +-
gnu/packages/cups.scm | 40 +-
gnu/packages/curl.scm | 21 +-
gnu/packages/databases.scm | 252 +++-
gnu/packages/dav.scm | 5 +-
gnu/packages/debug.scm | 70 +-
gnu/packages/display-managers.scm | 29 +-
gnu/packages/dns.scm | 12 +-
gnu/packages/electronics.scm | 2 +-
gnu/packages/emacs.scm | 153 ++-
gnu/packages/engineering.scm | 147 ++-
gnu/packages/finance.scm | 62 +-
gnu/packages/firmware.scm | 48 +-
gnu/packages/flashing-tools.scm | 88 +-
gnu/packages/fltk.scm | 42 +-
gnu/packages/fontutils.scm | 27 +-
gnu/packages/fpga.scm | 2 +-
gnu/packages/freedesktop.scm | 51 +-
gnu/packages/ftp.scm | 4 +-
gnu/packages/games.scm | 118 +-
gnu/packages/gd.scm | 19 +-
gnu/packages/ghostscript.scm | 20 +
gnu/packages/gkrellm.scm | 5 +-
gnu/packages/gl.scm | 25 +-
gnu/packages/glib.scm | 41 +-
gnu/packages/gnome.scm | 200 +--
gnu/packages/gnunet.scm | 8 +-
gnu/packages/golang.scm | 4 +-
gnu/packages/gprolog.scm | 17 +-
gnu/packages/gps.scm | 19 +-
gnu/packages/graphics.scm | 13 +-
gnu/packages/graphviz.scm | 72 +-
gnu/packages/gstreamer.scm | 4 +-
gnu/packages/gtk.scm | 96 +-
gnu/packages/guile-wm.scm | 81 +-
gnu/packages/guile.scm | 84 +-
gnu/packages/hugs.scm | 61 +-
gnu/packages/hurd.scm | 60 +-
gnu/packages/image-viewers.scm | 17 +-
gnu/packages/image.scm | 25 +-
gnu/packages/imagemagick.scm | 7 +-
gnu/packages/inkscape.scm | 11 +
gnu/packages/java.scm | 1304 ++++++++++++++++++++
gnu/packages/kde.scm | 5 +-
gnu/packages/kerberos.scm | 16 +-
gnu/packages/libcanberra.scm | 18 +-
gnu/packages/libevent.scm | 9 +-
gnu/packages/libreoffice.scm | 94 +-
gnu/packages/libusb.scm | 2 +-
gnu/packages/linux.scm | 299 ++---
gnu/packages/lisp.scm | 93 +-
gnu/packages/lua.scm | 2 +-
gnu/packages/machine-learning.scm | 88 +-
gnu/packages/mail.scm | 108 +-
gnu/packages/man.scm | 4 +-
gnu/packages/maths.scm | 240 +++-
gnu/packages/messaging.scm | 36 +-
gnu/packages/mp3.scm | 87 +-
gnu/packages/mpi.scm | 1 +
gnu/packages/music.scm | 102 +-
gnu/packages/networking.scm | 35 +
gnu/packages/noweb.scm | 79 +-
gnu/packages/package-management.scm | 6 +-
gnu/packages/patches/bluez-CVE-2017-1000250.patch | 42 -
.../patches/clisp-remove-failing-test.patch | 43 +
gnu/packages/patches/cube-nocheck.patch | 16 +
gnu/packages/patches/curl-bounds-check.patch | 19 -
.../patches/graphicsmagick-CVE-2017-14649.patch | 210 ++++
gnu/packages/patches/libmwaw-CVE-2017-9433.patch | 33 -
gnu/packages/patches/libvisio-fix-tests.patch | 35 +
gnu/packages/patches/libxfont-CVE-2017-13720.patch | 36 +
gnu/packages/patches/libxfont-CVE-2017-13722.patch | 53 +
.../patches/mesa-skip-disk-cache-test.patch | 6 +-
...ngodb-support-unknown-linux-distributions.patch | 55 +
gnu/packages/patches/openjpeg-CVE-2017-12982.patch | 28 -
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 --
.../python-nose-timer-drop-ordereddict.patch | 44 +
.../python2-unittest2-remove-argparse.patch | 11 +
gnu/packages/patches/qemu-CVE-2017-13711.patch | 89 --
gnu/packages/patches/qemu-CVE-2017-14167.patch | 69 --
.../patches/xorg-server-CVE-2017-10971.patch | 153 ---
.../patches/xorg-server-CVE-2017-10972.patch | 35 -
gnu/packages/patchutils.scm | 120 +-
gnu/packages/pdf.scm | 65 +-
gnu/packages/perl.scm | 54 +-
gnu/packages/photo.scm | 15 +-
gnu/packages/popt.scm | 17 +-
gnu/packages/pretty-print.scm | 65 +-
gnu/packages/profiling.scm | 399 ++++++
gnu/packages/pulseaudio.scm | 35 +-
gnu/packages/pumpio.scm | 33 +-
gnu/packages/python.scm | 394 +++++-
gnu/packages/qt.scm | 349 ++++--
gnu/packages/rdf.scm | 40 +-
gnu/packages/regex.scm | 20 +-
gnu/packages/rrdtool.scm | 19 +-
gnu/packages/ruby.scm | 74 +-
gnu/packages/sawfish.scm | 50 +-
gnu/packages/scheme.scm | 134 +-
gnu/packages/sdl.scm | 52 +-
gnu/packages/security-token.scm | 53 +-
gnu/packages/serveez.scm | 15 +-
gnu/packages/skribilo.scm | 29 +-
gnu/packages/smalltalk.scm | 17 +-
gnu/packages/ssh.scm | 42 +-
gnu/packages/suckless.scm | 4 +-
gnu/packages/tcl.scm | 15 +-
gnu/packages/telephony.scm | 12 +-
gnu/packages/terminals.scm | 9 +-
gnu/packages/tex.scm | 18 +
gnu/packages/textutils.scm | 25 +-
gnu/packages/time.scm | 20 +-
gnu/packages/tls.scm | 10 +-
gnu/packages/tor.scm | 26 +-
gnu/packages/uml.scm | 2 +-
gnu/packages/uucp.scm | 24 +-
gnu/packages/video.scm | 27 +-
gnu/packages/virtualization.scm | 7 +-
gnu/packages/web-browsers.scm | 10 +-
gnu/packages/web.scm | 113 +-
gnu/packages/wicd.scm | 214 ++--
gnu/packages/wm.scm | 2 +-
gnu/packages/wxwidgets.scm | 2 +-
gnu/packages/xdisorg.scm | 49 +-
gnu/packages/xfce.scm | 22 +-
gnu/packages/xfig.scm | 74 +-
gnu/packages/xorg.scm | 99 +-
gnu/packages/zile.scm | 4 +-
gnu/services/databases.scm | 89 ++
gnu/services/networking.scm | 1 -
gnu/services/version-control.scm | 119 +-
gnu/services/vpn.scm | 10 +-
gnu/system.scm | 18 +-
gnu/system/file-systems.scm | 6 +-
gnu/system/linux-initrd.scm | 13 +
gnu/system/uuid.scm | 13 +
gnu/system/vm.scm | 22 +-
gnu/tests/databases.scm | 145 ++-
gnu/tests/version-control.scm | 176 +++
guix/build-system/ant.scm | 6 +
guix/build/ant-build-system.scm | 38 +-
guix/build/pull.scm | 3 +-
guix/build/syscalls.scm | 1 +
guix/download.scm | 1 +
guix/scripts/lint.scm | 17 +
guix/scripts/package.scm | 12 +-
guix/scripts/publish.scm | 15 +-
guix/scripts/pull.scm | 2 +-
guix/scripts/refresh.scm | 20 +-
guix/scripts/system.scm | 65 +
guix/store.scm | 1 +
guix/upstream.scm | 18 +
tests/import-utils.scm | 5 +-
tests/publish.scm | 4 +-
tests/uuid.scm | 6 +
185 files changed, 7465 insertions(+), 3550 deletions(-)
diff --cc gnu/local.mk
index 9e37e9b,3af8e67..301058a
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -685,7 -687,9 +687,8 @@@ dist_patch_DATA =
%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 \
@@@ -808,9 -811,20 +810,17 @@@
%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/libvisio-fix-tests.patch \
%D%/packages/patches/libvpx-CVE-2016-2818.patch \
%D%/packages/patches/libxcb-python-3.5-compat.patch \
+ %D%/packages/patches/libxfont-CVE-2017-13720.patch \
+ %D%/packages/patches/libxfont-CVE-2017-13722.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 \