[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
Mark H. Weaver |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Sat, 17 Mar 2018 01:19:38 -0400 (EDT) |
mhw pushed a commit to branch core-updates
in repository guix.
commit 9f388b1ee1733d84edff7f473cbcbc4ab42b7128
Merge: 2857e52 9f375a4
Author: Mark H Weaver <address@hidden>
Date: Sat Mar 17 01:18:37 2018 -0400
Merge branch 'master' into core-updates
doc/guix.texi | 10 ++
gnu/build/vm.scm | 103 +++++------
gnu/local.mk | 2 +
gnu/packages/ada.scm | 40 +++++
gnu/packages/admin.scm | 13 +-
gnu/packages/autotools.scm | 4 +-
gnu/packages/bioinformatics.scm | 152 ++++++++++++++++
gnu/packages/cdrom.scm | 14 +-
gnu/packages/compression.scm | 44 +++++
gnu/packages/cran.scm | 4 +-
gnu/packages/databases.scm | 120 +++++++++++++
gnu/packages/dns.scm | 7 +-
gnu/packages/emacs.scm | 45 +++++
gnu/packages/freedesktop.scm | 4 +-
gnu/packages/geo.scm | 121 +++++++++++++
gnu/packages/gnuzilla.scm | 30 ++--
gnu/packages/graph.scm | 35 ++++
gnu/packages/gtk.scm | 4 +-
gnu/packages/idris.scm | 64 +++++--
gnu/packages/image.scm | 21 +++
gnu/packages/inkscape.scm | 1 +
gnu/packages/java.scm | 44 ++---
gnu/packages/language.scm | 8 +-
gnu/packages/linux.scm | 11 +-
gnu/packages/maths.scm | 56 +++++-
gnu/packages/messaging.scm | 12 +-
gnu/packages/networking.scm | 21 ++-
gnu/packages/patches/shadow-CVE-2018-7169.patch | 191 +++++++++++++++++++++
.../patches/util-linux-CVE-2018-7738.patch | 49 ++++++
gnu/packages/python-web.scm | 4 +-
gnu/packages/python.scm | 1 +
gnu/packages/samba.scm | 4 +-
gnu/packages/serialization.scm | 78 ++++++++-
gnu/packages/suckless.scm | 4 +-
gnu/packages/tex.scm | 82 +++++++--
gnu/packages/tls.scm | 6 +-
gnu/packages/video.scm | 4 +-
gnu/packages/webkit.scm | 14 +-
gnu/packages/xiph.scm | 15 +-
gnu/services/base.scm | 67 ++++----
gnu/services/shepherd.scm | 26 ++-
gnu/system/install.scm | 4 +-
gnu/system/linux-initrd.scm | 46 +----
gnu/system/mapped-devices.scm | 51 +++++-
guix/scripts/system.scm | 18 +-
po/guix/POTFILES.in | 2 +-
tests/packages.scm | 19 +-
47 files changed, 1390 insertions(+), 285 deletions(-)
diff --cc gnu/packages/java.scm
index ce9896b,5771366..f94c384
--- a/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
--- a/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'