From af23710ff522bb4e6cedf841c4fb977d96c9d8b3 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 19 Mar 2018 17:13:26 -0400 Subject: gnu: util-linux: Fix CVE-2018-7738 without grafting. * gnu/packages/linux.scm (util-linux)[replacement]: Remove field. (util-linux-2.31.1): New variable. * gnu/system.scm (%base-packages): Use util-linux-2.31.1. --- gnu/packages/linux.scm | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 6dc45bfce..dc9dfbbd7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -18,8 +18,8 @@ ;;; Copyright © 2016, 2017, 2018 Marius Bakke ;;; Copyright © 2016 Rene Saavedra ;;; Copyright © 2016 Carlos Sánchez de La Lama -;;; Copyright © 2016, 2017 Nils Gillmann -;;; Copyright © 2017 Leo Famulari +;;; Copyright © 2016, 2017 ng0 +;;; Copyright © 2017, 2018 Leo Famulari ;;; Copyright © 2017 José Miguel Sánchez García ;;; Copyright © 2017 Gábor Boskovits ;;; Copyright © 2017 Mathieu Othacehe @@ -547,7 +547,6 @@ providing the system administrator with some help in common tasks.") (define-public util-linux (package (name "util-linux") - (replacement util-linux/fixed) (version "2.31") (source (origin (method url-fetch) @@ -635,14 +634,31 @@ block devices, UUIDs, TTYs, and many other tools.") (license (list license:gpl3+ license:gpl2+ license:gpl2 license:lgpl2.0+ license:bsd-4 license:public-domain)))) -(define util-linux/fixed +;; The patch 'util-linux-CVE-2018-7738.patch' fixes a security bug in +;; the Bash completions for `mount`. Since this bug doesn't affect +;; other programs that link against libraries from util-linux, we don't +;; need to use a graft to make the fix available. Instead, users +;; installing util-linux will get the fix in this newer version, and +;; (@ (gnu system) %base-packages) takes care to use this package. +;; This solution was suggested here: +;; +(define-public util-linux-2.31.1 (package (inherit util-linux) - (source - (origin - (inherit (package-source util-linux)) - (patches (append (origin-patches (package-source util-linux)) - (search-patches "util-linux-CVE-2018-7738.patch"))))))) + (name "util-linux") + ;; XXX Don't update this without also updating %base-packages! + (version "2.31.1") + (source (origin + (inherit (package-source util-linux)) + (uri (string-append "mirror://kernel.org/linux/utils/" + name "/v" (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "04fzrnrr3pvqskvjn9f81y0knh0jvvqx4lmbz5pd4lfdm5pv2l8s")) + (patches + (append (origin-patches (package-source util-linux)) + (search-patches "util-linux-CVE-2018-7738.patch"))))))) (define-public ddate (package -- cgit v1.3 From b87c76dcaa86d0f90a856a930f461a9c9bc88ec5 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 21 Mar 2018 18:23:15 -0400 Subject: Fix copyright notice for Nils Gillmann. This is a followup to commit af23710ff522bb4e6cedf841c4fb977d96c9d8b3. * gnu/packages/linux.scm: Fix name and email address for Nils Gillmann. --- gnu/packages/linux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index dc9dfbbd7..0d7dc7161 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -18,7 +18,7 @@ ;;; Copyright © 2016, 2017, 2018 Marius Bakke ;;; Copyright © 2016 Rene Saavedra ;;; Copyright © 2016 Carlos Sánchez de La Lama -;;; Copyright © 2016, 2017 ng0 +;;; Copyright © 2016, 2017 Nils Gillmann ;;; Copyright © 2017, 2018 Leo Famulari ;;; Copyright © 2017 José Miguel Sánchez García ;;; Copyright © 2017 Gábor Boskovits -- cgit v1.3 From 8ec89c358fabc6ba819b4c0dfc64b971c0761f7b Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 21 Mar 2018 20:47:53 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.29. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.29. (%linux-libre-4.14-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0d7dc7161..403186b89 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -392,8 +392,8 @@ It has been modified to remove all non-free binary blobs.") %linux-compatible-systems #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.28") -(define %linux-libre-4.14-hash "0xg3zsm1yjsvxir8sz7zliz8gcc8d45xh23qyiszl75cfqjl36l3") +(define %linux-libre-4.14-version "4.14.29") +(define %linux-libre-4.14-hash "0y8p9pn40jgk96c10i9px2n6pqim788q7zssngp46glmpwfz4gra") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.3 From 4d7c5f6d7e50f9a675b0f9fec39a7a4ac00421f9 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 21 Mar 2018 20:48:49 -0400 Subject: gnu: linux-libre: Update to 4.15.12. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.15.12. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 403186b89..519338541 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -383,8 +383,8 @@ It has been modified to remove all non-free binary blobs.") ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.15.11") -(define %linux-libre-hash "0nrsmw7x5nsc3906dfvfakkibv8pv09r1sf5ckzbkcbkwpyq62h8") +(define %linux-libre-version "4.15.12") +(define %linux-libre-hash "01wpxlw70nzdl8nk3xb8z3m93ads55q56ky56wpsci304jlnrd3v") (define-public linux-libre (make-linux-libre %linux-libre-version -- cgit v1.3 From b06e94d310b71a2cc044b4aae02a90eded0005b2 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 23 Mar 2018 04:48:43 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.123. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.123. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 519338541..c03566346 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -408,8 +408,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.122" - "1ayilv7474vsif3jpb723jbcy4kymv1fpdr96c1g743bad1wkqqq" + (make-linux-libre "4.4.123" + "1ldc7pz4irngk204xsca2cy0ihlqinimn0hg20aqnbh48cw72iyg" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.3 From 77f2ced1a68edf3c676dcc1b81f856cae072b163 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 23 Mar 2018 04:49:15 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.89. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.89. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c03566346..b85ee67ee 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -402,8 +402,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.88" - "0qlhd8xw3g00i7krpfndkwxzjszk067h26qsxxsszvxyx2s6gp4x" + (make-linux-libre "4.9.89" + "14kk1mj0iml1x1vq1m625v2nyx4z8ixny87dv36sszl556idzpqp" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.3 From 7ebe7d85c0c39356506bf5105a88b579ac120608 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 26 Mar 2018 04:58:09 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.124. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.124. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b85ee67ee..55b202280 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -408,8 +408,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.123" - "1ldc7pz4irngk204xsca2cy0ihlqinimn0hg20aqnbh48cw72iyg" + (make-linux-libre "4.4.124" + "1368x0wki8zhk0hwz36hrkp2lr2kbm9i0fwzws201h3y85mldgh4" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.3 From af55816de52e652daea4e79224139d1786518757 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 26 Mar 2018 04:58:55 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.90. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.90. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 55b202280..100c5cae1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -402,8 +402,8 @@ It has been modified to remove all non-free binary blobs.") #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.89" - "14kk1mj0iml1x1vq1m625v2nyx4z8ixny87dv36sszl556idzpqp" + (make-linux-libre "4.9.90" + "0mzy6wcxp9m9icb8mvsbywp1lrbvbv6n8rs3xszqm43dxy9zj1jd" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.3 From 27d528d81a7086f545235350143b75bfda1850a0 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 26 Mar 2018 04:59:30 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.30. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.30. (%linux-libre-4.14-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 100c5cae1..c87349ce8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -392,8 +392,8 @@ It has been modified to remove all non-free binary blobs.") %linux-compatible-systems #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.29") -(define %linux-libre-4.14-hash "0y8p9pn40jgk96c10i9px2n6pqim788q7zssngp46glmpwfz4gra") +(define %linux-libre-4.14-version "4.14.30") +(define %linux-libre-4.14-hash "1j1vnr4397y4js7i24jdpfq85mc50b7kjz7gz1bbbrmda6cflwig") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.3 From 5dc8f5de0c97731d96435b1917c8a2e159fac441 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 26 Mar 2018 05:00:38 -0400 Subject: gnu: linux-libre: Update to 4.15.13. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.15.13. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c87349ce8..69fe81b7b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -383,8 +383,8 @@ It has been modified to remove all non-free binary blobs.") ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.15.12") -(define %linux-libre-hash "01wpxlw70nzdl8nk3xb8z3m93ads55q56ky56wpsci304jlnrd3v") +(define %linux-libre-version "4.15.13") +(define %linux-libre-hash "1z9f3m44n5w9ayad08h6nvx4nihc28h2jplk4jvyaj0460v8d11f") (define-public linux-libre (make-linux-libre %linux-libre-version -- cgit v1.3 From 36f3e1df5fd28f28a93eb91ef29e1fcb43b90492 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 27 Mar 2018 02:23:01 +0200 Subject: gnu: radeontop: Update to 1.1. * gnu/packages/linux.scm (radeontop): Update to 1.1. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 69fe81b7b..fae231674 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3768,7 +3768,7 @@ developers.") (define-public radeontop (package (name "radeontop") - (version "1.0") + (version "1.1") (home-page "https://github.com/clbr/radeontop/") (source (origin (method url-fetch) @@ -3776,7 +3776,7 @@ developers.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1z38nibirqxrbsfyhfcrnzlcw16cqjp4ds6qnjfxalwayf9fm5x9")))) + "1fv06j5c99imvzkac3j40lgjhr5b2i77fnyffhlvj92bli1fm1c6")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.3