Merge branch 'master' into core-updates

diff --cc Makefile.am
Simple merge

diff --cc gnu/local.mk
index f4a68c5,efb91fd..62812b3
--- 1/gnu/local.mk
--- 2/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/backup.scm
Simple merge

diff --cc gnu/packages/compression.scm
Simple merge

diff --cc gnu/packages/cups.scm
Simple merge

diff --cc gnu/packages/databases.scm
Simple merge

diff --cc gnu/packages/fontutils.scm
Simple merge

diff --cc gnu/packages/games.scm
Simple merge

diff --cc gnu/packages/gl.scm
Simple merge

diff --cc gnu/packages/gnome.scm
Simple merge

diff --cc gnu/packages/gnupg.scm
Simple merge

diff --cc gnu/packages/gnuzilla.scm
Simple merge

diff --cc gnu/packages/gtk.scm
Simple merge

diff --cc gnu/packages/guile.scm
Simple merge

diff --cc gnu/packages/image.scm
Simple merge

diff --cc gnu/packages/linux.scm
Simple merge

diff --cc gnu/packages/maths.scm
Simple merge

diff --cc gnu/packages/package-management.scm
Simple merge

diff --cc gnu/packages/perl.scm
Simple merge

diff --cc gnu/packages/python.scm
Simple merge

diff --cc gnu/packages/ruby.scm
Simple merge

diff --cc gnu/packages/statistics.scm
Simple merge

diff --cc gnu/packages/tcl.scm
Simple merge

diff --cc gnu/packages/tls.scm
index d0948ab,75d8c94..8eff723
--- 1/gnu/packages/tls.scm
--- 2/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)

diff --cc gnu/packages/video.scm
Simple merge

diff --cc gnu/packages/web.scm
Simple merge

diff --cc gnu/packages/xdisorg.scm
Simple merge

diff --cc gnu/packages/xorg.scm
Simple merge

diff --cc guix/profiles.scm
Simple merge