Merge branch 'master' into core-updates

diff --cc gnu/local.mk
index 84d6df7,20b3c3e..fbc5f52
--- 1/gnu/local.mk
--- 2/gnu/local.mk
+++ b/gnu/local.mk
@@@ -873,13 -900,10 +876,9 @@@ dist_patch_DATA =                                                
    %D%/packages/patches/mozjs38-tracelogger.patch              \
    %D%/packages/patches/mozjs38-version-detection.patch                \
    %D%/packages/patches/mumps-build-parallelism.patch          \
-   %D%/packages/patches/mupdf-build-with-openjpeg-2.1.patch    \
-   %D%/packages/patches/mupdf-CVE-2017-14685.patch             \
-   %D%/packages/patches/mupdf-CVE-2017-14686.patch             \
-   %D%/packages/patches/mupdf-CVE-2017-14687.patch             \
-   %D%/packages/patches/mupdf-CVE-2017-15587.patch             \
+   %D%/packages/patches/mupdf-build-with-latest-openjpeg.patch \
    %D%/packages/patches/mupen64plus-ui-console-notice.patch    \
    %D%/packages/patches/mutt-store-references.patch            \
 -  %D%/packages/patches/ncurses-CVE-2017-10684-10685.patch     \
    %D%/packages/patches/net-tools-bitrot.patch                 \
    %D%/packages/patches/netcdf-date-time.patch                 \
    %D%/packages/patches/netcdf-tst_h_par.patch                 \

diff --cc gnu/packages/backup.scm
index 28d6183,fab71d0..db1af03
--- 1/gnu/packages/backup.scm
--- 2/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@@ -195,10 -195,9 +195,11 @@@ backups (called chunks) to allow easy b
         (method url-fetch)
         (uri (string-append "http://libarchive.org/downloads/libarchive-"
                             version ".tar.gz"))
-        (patches (search-patches "libarchive-CVE-2017-14166.patch"))
++       (patches (search-patches "libarchive-CVE-2017-14166.patch"
++                                "libarchive-CVE-2017-14502.patch"))
         (sha256
          (base32
 -         "1rr40hxlm9vy5z2zb5w7pyfkgd1a4s061qapm83s19accb8mpji9"))))
 +         "1km0mzfl6in7l5vz9kl09a88ajx562rw93ng9h2jqavrailvsbgd"))))
      (build-system gnu-build-system)
      ;; TODO: Add -L/path/to/nettle in libarchive.pc.
      (inputs

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

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

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

diff --cc gnu/packages/gnupg.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/password-utils.scm
index d83c244,6824210..07197de
--- 1/gnu/packages/password-utils.scm
--- 2/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@@ -97,8 -97,12 +97,8 @@@ human."
                             version "-src.tar.xz"))
         (sha256
          (base32
-          "0wrl8kxb16wzdgfjj057yv18cfg0b8z8lxp1fl2q8fkdgr7phm9g"))))
+          "1pfkq1m5vb90kx67vyw70s1hc4ivjsvq2535vm6wdwwsncna6bz5"))))
      (build-system cmake-build-system)
 -    (arguments
 -     `(#:configure-flags
 -       (list (string-append "-DCMAKE_INSTALL_LIBDIR="
 -                            (assoc-ref %outputs "out") "/lib"))))
      (inputs
       `(("libgcrypt" ,libgcrypt)
         ("libxi" ,libxi)

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

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

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

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

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

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

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