From 17a21bcf316d11bdf54ec2483abe15f60dbd7cb0 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sun, 15 Jul 2018 17:58:41 +1000 Subject: gnu: ecryptfs-utils: Patch hardcoded-paths. * gnu/packages/linux.scm: (ecryptfs-utils): Patch hardcoded-paths. [arguments]: Add the phase patch-hardcoded-paths to replace various hardcoded references to /bin, /sbin, ... with direct references to the store. [inputs]: Add missing inputs util-linux, cryptsetup, and lvm2 so that the correct paths can be found and the resulting code works. Signed-off-by: Ludovic Courtès --- gnu/packages/linux.scm | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2ce0f56b8..277c2465b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -28,6 +28,7 @@ ;;; Copyright © 2017 nee ;;; Copyright © 2017 Dave Love ;;; Copyright © 2018 Pierre-Antoine Rouby +;;; Copyright © 2018 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -59,6 +60,7 @@ #:use-module (gnu packages calendar) #:use-module (gnu packages check) #:use-module (gnu packages crypto) + #:use-module (gnu packages cryptsetup) #:use-module (gnu packages compression) #:use-module (gnu packages databases) #:use-module (gnu packages datastructures) @@ -3699,7 +3701,43 @@ as used on certified hardware security devices.") "0zwq19siiwf09h7lwa7n7mgmrr8cxifp45lmwgcfr8c1gviv6b0i")))) (build-system gnu-build-system) (arguments - `(#:configure-flags (list "--disable-pywrap"))) + `(#:configure-flags (list "--disable-pywrap") + #:phases + (modify-phases %standard-phases + (add-after 'patch-source-shebangs 'patch-hardcoded-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (utils-linux (assoc-ref inputs "utils-linux")) + (cryptsetup (assoc-ref inputs "cryptsetup")) + (linux-pam (assoc-ref inputs "linux-pam")) + (lvm2 (assoc-ref inputs "lvm2"))) + (substitute* '("src/utils/ecryptfs-mount-private" + "src/utils/ecryptfs-umount-private" + "src/utils/ecryptfs-setup-private" + "src/utils/mount.ecryptfs.c" + "src/pam_ecryptfs/pam_ecryptfs.c" + "src/desktop/ecryptfs-mount-private.desktop.in" + "src/utils/ecryptfs-setup-swap") + (("/bin/mount") + (string-append utils-linux "/bin/mount")) + (("/bin/umount") + (string-append utils-linux "/bin/umount")) + (("/sbin/mount.ecryptfs_private") + (string-append out "/sbin/mount.ecryptfs_private")) + (("/sbin/umount.ecryptfs_private") + (string-append out "/sbin/umount.ecryptfs_private")) + (("/usr/bin/ecryptfs-mount-private") + (string-append out "/bin/ecryptfs-mount-private")) + (("/usr/bin/ecryptfs-rewrite-file") + (string-append out "/bin/ecryptfs-rewrite-file")) + (("/usr/bin/ecryptfs-setup-private") + (string-append out "/bin/ecryptfs-setup-private")) + (("/sbin/cryptsetup") + (string-append cryptsetup "/sbin/cryptsetup")) + (("/sbin/unix_chkpwd") + (string-append linux-pam "/sbin/unix_chkpwd")) + (("/sbin/dmsetup") + (string-append lvm2 "/sbin/dmsetup"))))))))) (native-inputs `(("intltool" ,intltool) ("perl" ,perl) ; for pod2man @@ -3707,6 +3745,9 @@ as used on certified hardware security devices.") (inputs `(("keyutils" ,keyutils) ("linux-pam" ,linux-pam) + ("utils-linux" ,util-linux) + ("cryptsetup" ,cryptsetup) + ("lvm2" ,lvm2) ("nss" ,nss))) (home-page "http://ecryptfs.org/") (synopsis "eCryptfs cryptographic file system utilities") -- cgit v1.3 From 1a149de74816cf025c08d4b3d22cfa39ed0577ee Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 17 Jul 2018 15:11:30 +0200 Subject: gnu: rng-tools: Update to 6.3.1. * gnu/packages/linux.scm (rng-tools): Update to 6.3.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 277c2465b..d9c098569 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3590,7 +3590,7 @@ The following service daemons are also provided: (define-public rng-tools (package (name "rng-tools") - (version "6.3") + (version "6.3.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/nhorman/rng-tools/" @@ -3598,7 +3598,7 @@ The following service daemons are also provided: (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1lc2kqw3idwmjyjnf16sqz0f4r1w7c638n4la1j1n5c3188q26bv")))) + "04p7wvcm389s21y9mq8ss6z2szxi4nfrfixzwqjkq2qciz705i4s")))) (build-system gnu-build-system) (arguments `(;; Avoid using OpenSSL, curl, and libxml2, reducing the closure by 166 MiB. -- cgit v1.3 From 06f06142a31cf017398a532544f3141b6ab970f5 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 18 Jul 2018 00:22:24 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.141. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.141. --- 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 d9c098569..138e8da7c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -429,8 +429,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.140" - "10h4k2c2ncnc1h61kikqb618dh9lp8fmzagz2ydykrdbb5jjiy82" + (make-linux-libre "4.4.141" + "0lzl0zz12r1s2r1x4bmyfhcj1mq14rm1c6npyvsj79fzz0z4z2pc" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.3 From 431936f22a50ae024a8eede8bab968809ea08b11 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 18 Jul 2018 00:23:16 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.113. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.113. --- 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 138e8da7c..f2af34c26 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -423,8 +423,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.112" - "1zrnbvzr7z5ky79r6hpjvn15bxmwcyi8lr7yq2nx1r8ladl8lnb0" + (make-linux-libre "4.9.113" + "12xj0ymwb0rdxnkl18xg40hiqcr5ad636xsjqz6aag2wxj8ld2xr" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.3 From 208df8ba8ab1999525310e8f2bf82b03350523c2 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 18 Jul 2018 00:24:01 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.56. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.56. (%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 f2af34c26..c70d4c46d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -413,8 +413,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.55") -(define %linux-libre-4.14-hash "1rlapfwkjfmyk4ahvqwqap4w9flbw2zag0r04fwrmyqz1y5ijayf") +(define %linux-libre-4.14-version "4.14.56") +(define %linux-libre-4.14-hash "15a4gsi1nsjab16qwfizc0bdn0h27w54qy2a50847i0ln4akdrzl") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.3 From 46978ff64f55ae09b578b73c52c789eabb3fe5c1 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 18 Jul 2018 13:39:03 -0400 Subject: gnu: linux-libre: Update to 4.17.7. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.17.7. (%linux-libre-hash): Update hash. (linux-libre)[source]: Add upstream patch to fix i686. --- gnu/packages/linux.scm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c70d4c46d..dc6c6b123 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -404,14 +404,25 @@ 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.17.6") -(define %linux-libre-hash "0d48r5jpj71ikdalz5z756snwq54cpnwnba8bbhg8r2ri3770wcm") +(define %linux-libre-version "4.17.7") +(define %linux-libre-hash "1815h0kf6c07zp9782v9n9a21x8wzdr4ws190nqp7z2xyip6xfjj") (define-public linux-libre (make-linux-libre %linux-libre-version %linux-libre-hash %linux-compatible-systems - #:configuration-file kernel-config)) + #:configuration-file kernel-config + #:patches + (list + (origin + (method url-fetch) + (uri "https://git.kernel.org/pub/scm/linux/kernel/git/\ +stable/linux.git/patch/?id=27d8b7daf73827e8263ab0b740da6ebdda9f9d56") + (file-name "linux-libre-4.17.7-fix-i686.patch") + (sha256 + (base32 + "0xbv04vwhyk3wvia13ca6kbysjqwsywcj6501i2wpddawm4q23sc"))) + %boot-logo-patch))) (define %linux-libre-4.14-version "4.14.56") (define %linux-libre-4.14-hash "15a4gsi1nsjab16qwfizc0bdn0h27w54qy2a50847i0ln4akdrzl") -- cgit v1.3 From 7da1db5b5799a8e18eeaf1a391d567e48028d87e Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 18 Jul 2018 22:12:57 -0400 Subject: gnu: linux-libre: Update to 4.17.8. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.17.8. (%linux-libre-hash): Update hash. (linux-libre): Remove patch. --- gnu/packages/linux.scm | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index dc6c6b123..ad2ce2588 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -404,25 +404,14 @@ 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.17.7") -(define %linux-libre-hash "1815h0kf6c07zp9782v9n9a21x8wzdr4ws190nqp7z2xyip6xfjj") +(define %linux-libre-version "4.17.8") +(define %linux-libre-hash "0anq35i9x0kslz42g73vq8wbg56rmrcb38j8mgnhc5c99037gkwr") (define-public linux-libre (make-linux-libre %linux-libre-version %linux-libre-hash %linux-compatible-systems - #:configuration-file kernel-config - #:patches - (list - (origin - (method url-fetch) - (uri "https://git.kernel.org/pub/scm/linux/kernel/git/\ -stable/linux.git/patch/?id=27d8b7daf73827e8263ab0b740da6ebdda9f9d56") - (file-name "linux-libre-4.17.7-fix-i686.patch") - (sha256 - (base32 - "0xbv04vwhyk3wvia13ca6kbysjqwsywcj6501i2wpddawm4q23sc"))) - %boot-logo-patch))) + #:configuration-file kernel-config)) (define %linux-libre-4.14-version "4.14.56") (define %linux-libre-4.14-hash "15a4gsi1nsjab16qwfizc0bdn0h27w54qy2a50847i0ln4akdrzl") -- cgit v1.3 From f7b447f84bc3d044ce9c8f9fa067f73d689479be Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 24 Jul 2018 09:56:53 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.143. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.143. --- 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 ad2ce2588..4a109f349 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -429,8 +429,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.141" - "0lzl0zz12r1s2r1x4bmyfhcj1mq14rm1c6npyvsj79fzz0z4z2pc" + (make-linux-libre "4.4.143" + "0kawgpmmv37gds3cbww791bbzvwfjg760yg3qw3dk913dawhdmzw" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.3 From b02ba32af54f7b31c321dbeb05ff6f84e90fbdc3 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 24 Jul 2018 09:57:48 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.114. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.114. --- 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 4a109f349..f23681251 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -423,8 +423,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.113" - "12xj0ymwb0rdxnkl18xg40hiqcr5ad636xsjqz6aag2wxj8ld2xr" + (make-linux-libre "4.9.114" + "069ckgck4skzci6sjrpk1sja0h1fdmrlcbpnqwl2844m5vfffzk9" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.3 From 7955bdbd174c51fd9da5f775d2ab2630251ba2fa Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 24 Jul 2018 09:58:41 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.57. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.57. (%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 f23681251..2de0dce7d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -413,8 +413,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.56") -(define %linux-libre-4.14-hash "15a4gsi1nsjab16qwfizc0bdn0h27w54qy2a50847i0ln4akdrzl") +(define %linux-libre-4.14-version "4.14.57") +(define %linux-libre-4.14-hash "1qp8g87ss4a3iz6k3k4mkllibvdrixh6ys4a9l7jidp2wmkxj3kc") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.3 From 20de675a2e8146d814b565314dd4c7a0234d626d Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 24 Jul 2018 09:59:35 -0400 Subject: gnu: linux-libre: Update to 4.17.9. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.17.9. (%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 2de0dce7d..7ad62b1d8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -404,8 +404,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.17.8") -(define %linux-libre-hash "0anq35i9x0kslz42g73vq8wbg56rmrcb38j8mgnhc5c99037gkwr") +(define %linux-libre-version "4.17.9") +(define %linux-libre-hash "1mahjxn4j7sdjdrbkrgal37nfx23njhnmrxcmixmphps8i44rlwm") (define-public linux-libre (make-linux-libre %linux-libre-version -- cgit v1.3 From 718f791f4ef9f0f3b7d9cd218ba55a3a73c62111 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 24 Jul 2018 23:15:56 +0200 Subject: gnu: fuse: Update to 2.9.8 [fixes CVE-2018-10906]. * gnu/packages/linux.scm (fuse): Update to 2.9.8. --- 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 7ad62b1d8..7edf20ebc 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1611,7 +1611,7 @@ processes currently causing I/O.") (define-public fuse (package (name "fuse") - (version "2.9.7") + (version "2.9.8") (source (origin (method url-fetch) (uri (string-append "https://github.com/libfuse/libfuse/releases/" @@ -1619,7 +1619,7 @@ processes currently causing I/O.") "/fuse-" version ".tar.gz")) (sha256 (base32 - "0x486nri30f7cgy0acj87v9sjxsjrr0cymrvw4h3r0sgmp8k4943")) + "1k4ggl2y5v0lr98l189pc81w0zijj23wbbnijsc6zlx84117nd0j")) (patches (search-patches "fuse-overlapping-headers.patch")))) (build-system gnu-build-system) (inputs `(("util-linux" ,util-linux))) -- cgit v1.3