Merge branch 'master' into core-updates

diff --cc gnu/local.mk
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc gnu/packages/java.scm
index ce9896b,5771366..f94c384
--- 1/gnu/packages/java.scm
--- 2/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@@ -1095,15 -1092,13 +1095,15 @@@ bootstrapping purposes."
                        version ".tar.xz"))
                  (sha256
                   (base32
-                   "0s0zh0mj1sab99kb516lsgq3859vsc951phc565gwix4l5g9zppk"))
+                   "1w331rdqx1dcx2xb0fmjmrkdc71xqn20fxsgw8by4xhiblh88khh"))
                  (modules '((guix build utils)))
                  (snippet
 -                 '(substitute* "Makefile.in"
 -                    ;; do not leak information about the build host
 -                    (("DISTRIBUTION_ID=\"\\$\\(DIST_ID\\)\"")
 -                     "DISTRIBUTION_ID=\"\\\"guix\\\"\"")))))
 +                 '(begin
 +                    (substitute* "Makefile.in"
 +                      ;; do not leak information about the build host
 +                      (("DISTRIBUTION_ID=\"\\$\\(DIST_ID\\)\"")
 +                       "DISTRIBUTION_ID=\"\\\"guix\\\"\""))
 +                    #t))))
        (build-system gnu-build-system)
        (outputs '("out"   ; Java Runtime Environment
                   "jdk"   ; Java Development Kit

diff --cc gnu/packages/linux.scm
index 8875e5d,df6d746..d2fc387
--- 1/gnu/packages/linux.scm
--- 2/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@@ -555,8 -556,8 +555,9 @@@ providing the system administrator wit
                                    name "-" version ".tar.xz"))
                (sha256
                 (base32
 -                "12nw108xjhm63sh2n5a0qs33vpvbvb6rln96l9j50p7wykf7rgpr"))
 -              (patches (search-patches "util-linux-tests.patch"))
 +                "04fzrnrr3pvqskvjn9f81y0knh0jvvqx4lmbz5pd4lfdm5pv2l8s"))
-               (patches (search-patches "util-linux-tests.patch"))
++              (patches (search-patches "util-linux-tests.patch"
++                                       "util-linux-CVE-2018-7738.patch"))
                (modules '((guix build utils)))
                (snippet
                 ;; We take the 'logger' program from GNU Inetutils and 'kill'

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

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

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

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

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

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

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