Merge branch 'master' into core-updates

diff --cc gnu/local.mk
index 0880de0,781c28a..9e1e14f
--- 1/gnu/local.mk
--- 2/gnu/local.mk
+++ b/gnu/local.mk
@@@ -520,6 -521,8 +521,7 @@@ dist_patch_DATA =                                          
    %D%/packages/patches/bigloo-gc-shebangs.patch                       \
    %D%/packages/patches/binutils-ld-new-dtags.patch            \
    %D%/packages/patches/binutils-loongson-workaround.patch     \
 -  %D%/packages/patches/binutils-mips-bash-bug.patch           \
+   %D%/packages/patches/blast+-fix-makefile.patch              \
    %D%/packages/patches/byobu-writable-status.patch            \
    %D%/packages/patches/cairo-CVE-2016-9082.patch                      \
    %D%/packages/patches/calibre-drop-unrar.patch                       \
@@@ -592,8 -600,9 +595,7 @@@
    %D%/packages/patches/freeimage-CVE-2015-0852.patch          \
    %D%/packages/patches/freeimage-CVE-2016-5684.patch          \
    %D%/packages/patches/freeimage-fix-build-with-gcc-5.patch   \
 -  %D%/packages/patches/freetype-CVE-2017-8105.patch           \
 -  %D%/packages/patches/freetype-CVE-2017-8287.patch           \
    %D%/packages/patches/fuse-overlapping-headers.patch                         \
-   %D%/packages/patches/gajim-CVE-2016-10376.patch             \
    %D%/packages/patches/gawk-shell.patch                               \
    %D%/packages/patches/gcc-arm-bug-71399.patch                        \
    %D%/packages/patches/gcc-arm-link-spec-fix.patch            \
@@@ -614,14 -624,16 +618,15 @@@
    %D%/packages/patches/gd-freetype-test-failure.patch         \
    %D%/packages/patches/gd-php-73968-Fix-109-XBM-reading.patch         \
    %D%/packages/patches/gegl-CVE-2012-4433.patch                       \
+   %D%/packages/patches/gemma-intel-compat.patch                       \
    %D%/packages/patches/geoclue-config.patch                   \
 +  %D%/packages/patches/gettext-multi-core.patch               \
 +  %D%/packages/patches/gettext-gnulib-multi-core.patch          \
    %D%/packages/patches/ghc-dont-pass-linker-flags-via-response-files.patch    \
 -  %D%/packages/patches/ghostscript-CVE-2013-5653.patch                \
 -  %D%/packages/patches/ghostscript-CVE-2015-3228.patch                \
 -  %D%/packages/patches/ghostscript-CVE-2016-7976.patch                \
 -  %D%/packages/patches/ghostscript-CVE-2016-7978.patch                \
 -  %D%/packages/patches/ghostscript-CVE-2016-7979.patch                \
 -  %D%/packages/patches/ghostscript-CVE-2016-8602.patch                \
    %D%/packages/patches/ghostscript-CVE-2017-8291.patch                \
 +  %D%/packages/patches/ghostscript-no-header-id.patch         \
 +  %D%/packages/patches/ghostscript-no-header-uuid.patch               \
 +  %D%/packages/patches/ghostscript-no-header-creationdate.patch \
    %D%/packages/patches/ghostscript-runpath.patch              \
    %D%/packages/patches/glib-networking-ssl-cert-file.patch    \
    %D%/packages/patches/glib-tests-timer.patch                 \
@@@ -754,8 -762,29 +759,12 @@@
    %D%/packages/patches/libssh-hostname-parser-bug.patch               \
    %D%/packages/patches/libssh2-fix-build-failure-with-gcrypt.patch    \
    %D%/packages/patches/libtar-CVE-2013-4420.patch             \
 -  %D%/packages/patches/libtasn1-CVE-2017-6891.patch           \
    %D%/packages/patches/libtheora-config-guess.patch           \
 -  %D%/packages/patches/libtiff-CVE-2016-10092.patch           \
 -  %D%/packages/patches/libtiff-CVE-2016-10093.patch           \
 -  %D%/packages/patches/libtiff-CVE-2016-10094.patch           \
+   %D%/packages/patches/libtiff-CVE-2016-10688.patch           \
 -  %D%/packages/patches/libtiff-CVE-2017-5225.patch            \
+   %D%/packages/patches/libtiff-CVE-2017-9936.patch            \
 -  %D%/packages/patches/libtiff-assertion-failure.patch                \
 -  %D%/packages/patches/libtiff-divide-by-zero-ojpeg.patch     \
 -  %D%/packages/patches/libtiff-divide-by-zero-tiffcp.patch    \
 -  %D%/packages/patches/libtiff-divide-by-zero-tiffcrop.patch  \
 -  %D%/packages/patches/libtiff-divide-by-zero.patch           \
 -  %D%/packages/patches/libtiff-heap-overflow-pixarlog-luv.patch       \
 -  %D%/packages/patches/libtiff-heap-overflow-tif-dirread.patch        \
 -  %D%/packages/patches/libtiff-heap-overflow-tiffcp.patch     \
 -  %D%/packages/patches/libtiff-heap-overflow-tiffcrop.patch   \
 -  %D%/packages/patches/libtiff-invalid-read.patch             \
 -  %D%/packages/patches/libtiff-null-dereference.patch         \
 -  %D%/packages/patches/libtiff-tiffcp-underflow.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              \

diff --cc gnu/packages/admin.scm
index b1f0e60,ac8f155..5fa9d5b
--- 1/gnu/packages/admin.scm
--- 2/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@@ -163,8 -163,14 +163,14 @@@ and provides a \"top-like\" mode (monit
      (build-system gnu-build-system)
      (arguments
       '(#:configure-flags '("--localstatedir=/var")))
-     (native-inputs `(("pkg-config" ,pkg-config)))
-     (inputs `(("guile" ,guile-2.2)))
+     (native-inputs
+      `(("pkg-config" ,pkg-config)
+ 
+        ;; This is the Guile we use as a cross-compiler...
 -       ("guile" ,guile-2.0)))
++       ("guile" ,guile-2.2)))
+     (inputs
+      ;; ... and this is the one that appears in shebangs when cross-compiling.
 -     `(("guile" ,guile-2.0)))
++     `(("guile" ,guile-2.2)))
      (synopsis "System service manager")
      (description
       "The GNU Shepherd is a daemon-managing daemon, meaning that it supervises

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

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

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

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

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

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

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

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

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

diff --cc gnu/packages/guile.scm
index 1fb759f,b654bbc..f86d7ea
--- 1/gnu/packages/guile.scm
--- 2/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@@ -220,17 -223,13 +220,16 @@@ without requiring the source code to b
    (package (inherit guile-2.0)
      (name "guile")
      (version "2.2.2")
-     (replacement #f)
      (source (origin
                (method url-fetch)
 +
 +              ;; Note: we are limited to one of the compression formats
 +              ;; supported by the bootstrap binaries, so no lzip here.
                (uri (string-append "mirror://gnu/guile/guile-" version
 -                                  ".tar.lz"))
 +                                  ".tar.xz"))
                (sha256
                 (base32
 -                "1dnh75h4rkx1zflpsngznkwcd6afn6zrc5x3xq7n946pm5bnx5bq"))
 +                "1azm25zcmxif0skxfrp11d2wc89nrzpjaann9yxdw6pvjxhs948w"))
                (modules '((guix build utils)))
  
                ;; Remove the pre-built object files.  Instead, build everything

diff --cc gnu/packages/image.scm
index 149b45d,139be62..1b230b5
--- 1/gnu/packages/image.scm
--- 2/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@@ -335,15 -333,31 +334,21 @@@ extracting icontainer icon files."
  (define-public libtiff
    (package
     (name "libtiff")
 -   (replacement libtiff-4.0.8)
 -   (version "4.0.7")
 -   (source (origin
 -            (method url-fetch)
 -            (uri (string-append "ftp://download.osgeo.org/libtiff/tiff-"
 -                                version ".tar.gz"))
 -            (patches (search-patches "libtiff-heap-overflow-tiffcp.patch"
 -                                     "libtiff-null-dereference.patch"
 -                                     "libtiff-heap-overflow-tif-dirread.patch"
 -                                     "libtiff-heap-overflow-pixarlog-luv.patch"
 -                                     "libtiff-divide-by-zero.patch"
 -                                     "libtiff-divide-by-zero-ojpeg.patch"
 -                                     "libtiff-tiffcp-underflow.patch"
 -                                     "libtiff-invalid-read.patch"
 -                                     "libtiff-CVE-2016-10092.patch"
 -                                     "libtiff-heap-overflow-tiffcrop.patch"
 -                                     "libtiff-divide-by-zero-tiffcrop.patch"
 -                                     "libtiff-CVE-2016-10093.patch"
 -                                     "libtiff-divide-by-zero-tiffcp.patch"
 -                                     "libtiff-assertion-failure.patch"
 -                                     "libtiff-CVE-2016-10094.patch"
 -                                     "libtiff-CVE-2017-5225.patch"))
 -            (sha256
 -             (base32
 -              "06ghqhr4db1ssq0acyyz49gr8k41gzw6pqb6mbn5r7jqp77s4hwz"))))
 +   (version "4.0.8")
-    (source (origin
-             (method url-fetch)
-             (uri (string-append "ftp://download.osgeo.org/libtiff/tiff-"
-                                 version ".tar.gz"))
-             (patches (search-patches "libtiff-tiffgetfield-bugs.patch"))
-             (sha256
-              (base32
-               "0419mh6kkhz5fkyl77gv0in8x4d2jpdpfs147y8mj86rrjlabmsr"))))
++   (source
++     (origin
++       (method url-fetch)
++       (uri (string-append "ftp://download.osgeo.org/libtiff/tiff-"
++                           version ".tar.gz"))
++       (patches
++         (search-patches "libtiff-tiffgetfield-bugs.patch"
++                         "libtiff-CVE-2016-10688.patch"
++                         "libtiff-CVE-2017-9936.patch"
++                         "libtiff-tiffycbcrtorgb-integer-overflow.patch"
++                         "libtiff-tiffycbcrtorgbinit-integer-overflow.patch"))
++       (sha256
++        (base32
++         "0419mh6kkhz5fkyl77gv0in8x4d2jpdpfs147y8mj86rrjlabmsr"))))
     (build-system gnu-build-system)
     (outputs '("out"
                "doc"))                           ;1.3 MiB of HTML documentation

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

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

diff --cc gnu/packages/ncurses.scm
index 44a79e7,0b23baf..d8b72a1
--- 1/gnu/packages/ncurses.scm
--- 2/gnu/packages/ncurses.scm
+++ b/gnu/packages/ncurses.scm
@@@ -42,6 -43,6 +42,7 @@@
                (method url-fetch)
                (uri (string-append "mirror://gnu/ncurses/ncurses-"
                                    version ".tar.gz"))
++              (patches (search-patches "ncurses-CVE-2017-10684-10685.patch"))
                (sha256
                 (base32
                  "0q3jck7lna77z5r42f13c4xglc7azd19pxfrjrpgp2yf615w4lgm"))))

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

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

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

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

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

diff --cc gnu/packages/xml.scm
index 287d5a7,67d6c8e..3cf1de3
--- 1/gnu/packages/xml.scm
--- 2/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@@ -71,6 -75,39 +72,27 @@@ stream-oriented parser in which an appl
  things the parser might find in the XML document (like start tags).")
      (license license:expat)))
  
 -(define expat-2.2.1  ; Fixes CVE-2017-9233, CVE-2016-9063 and other issues.
 -  (package
 -    (inherit expat)
 -    (version "2.2.1")
 -    (source (origin
 -             (method url-fetch)
 -             (uri (string-append "mirror://sourceforge/expat/expat/"
 -                                 version "/expat-" version ".tar.bz2"))
 -             (sha256
 -              (base32
 -               "11c8jy1wvllvlk7xdc5cm8hdhg0hvs8j0aqy6s702an8wkdcls0q"))))))
 -
+ (define-public libebml
+   (package
+     (name "libebml")
+     (version "1.3.4")
+     (source
+      (origin
+        (method url-fetch)
+        (uri (string-append "https://dl.matroska.org/downloads/"
+                            name "/" name "-" version ".tar.bz2"))
+        (sha256
+         (base32
+          "11zka6z9ncywyjr1gfm5cnii33ln7y3w6s86kiacchip2g7kw3f5"))))
+     (build-system gnu-build-system)
+     (home-page "https://www.matroska.org")
+     (synopsis "C++ libary to parse EBML files")
+     (description "libebml is a C++ library to read and write EBML (Extensible
+ Binary Meta Language) files.  EBML was designed to be a simplified binary
+ extension of XML for the purpose of storing and manipulating data in a
+ hierarchical form with variable field lengths.")
+     (license license:lgpl2.1)))
+ 
  (define-public libxml2
    (package
      (name "libxml2")

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

diff --cc guix/packages.scm
Simple merge