From 7b1c73f330397ea563af7206ca1f0eb4f8246853 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 13 Oct 2021 23:19:12 +0200 Subject: gnu: fakeroot: Update to 1.26. * gnu/packages/linux.scm (fakeroot): Update to 1.26. [source]: Remove generated man page translations in a new snippet. [arguments]: Patch Makefile.am instead of Makefile, and do so before bootstrapping. Don't explicitly return #t from phases. [native-inputs]: Use autoconf-2.71. --- gnu/packages/linux.scm | 112 +++++++++++++++++++++++++++---------------------- 1 file changed, 61 insertions(+), 51 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 21bdb76f36..f8c398ba41 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -7827,68 +7827,78 @@ the superuser to make device nodes.") (define-public fakeroot (package (name "fakeroot") - (version "1.25.3") - (source (origin - ;; There are no tags in the repository, so take this snapshot. - (method url-fetch) - (uri (string-append "https://deb.debian.org/debian/pool/main/f/" - "fakeroot/fakeroot_" version ".orig.tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0v4m3v1bdqvblwj3vqsb3mllgbci6dsgsydq6765nzvz6n1kd44f")))) + (version "1.26") + (source + (origin + ;; There are no tags in the repository, so take this snapshot. + (method url-fetch) + (uri (string-append "https://deb.debian.org/debian/pool/main/f/" + "fakeroot/fakeroot_" version ".orig.tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1sg8inv1zzp4h9ncbbmxip3svd11sd86j22cvxrjwnf5zn7mf2j8")) + (modules '((guix build utils) + (ice-9 ftw))) + (snippet + `(begin + ;; Delete pregenerated man page translations, but not the originals. + (with-directory-excursion "doc" + (for-each (lambda (language) + (for-each delete-file + (find-files language "\\.[0-9]$"))) + (scandir "." + (lambda (file) + (and (not (string-prefix? "." file)) + (eq? 'directory + (stat:type (lstat file)))))))))))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-Makefile.am + (lambda _ + (substitute* "Makefile.am" + (("/bin/sh") (which "sh"))))) + (add-after 'unpack 'patch-script + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "scripts/fakeroot.in" + (("getopt") + (string-append (assoc-ref inputs "util-linux") + "/bin/getopt")) + (("sed") + (string-append (assoc-ref inputs "sed") + "/bin/sed")) + (("cut") + (string-append (assoc-ref inputs "coreutils") + "/bin/cut")) ))) (replace 'bootstrap (lambda _ ;; The "preroll" script takes care of Autoconf and also ;; prepares the translated manuals. (invoke "sh" "./preroll"))) - (add-after 'configure 'patch-Makefile - (lambda _ - ;; Note: The root of the problem is already in "Makefile.am". - (substitute* "Makefile" - (("/bin/sh") (which "sh"))) - #t)) - (add-after 'unpack 'patch-script - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "scripts/fakeroot.in" - (("getopt") - (string-append (assoc-ref inputs "util-linux") - "/bin/getopt")) - (("sed") - (string-append (assoc-ref inputs "sed") - "/bin/sed")) - (("cut") - (string-append (assoc-ref inputs "coreutils") - "/bin/cut")) ) - #t)) - (add-before 'configure 'setenv - (lambda _ - (setenv "LIBS" "-lacl") - #t)) - (add-before 'check 'prepare-check - (lambda _ - (setenv "SHELL" (which "bash")) - (setenv "VERBOSE" "1") - (substitute* "test/t.touchinstall" - ;; We don't have the name of the root user, so use ID=0. - (("grep root") "grep \"\\<0\\>\"")) - (substitute* "test/tartest" - ;; We don't have the name of the root group, so use ID=0. - (("ROOTGROUP=root") "ROOTGROUP=0") - ;; We don't have the name of the daemon user, so use IDs. - (("daemon:sys") "1:3") - (("daemon:") "1:")) - ;; We don't have an /etc/passwd entry for "root" - use numeric IDs. - (substitute* "test/compare-tar" - (("tar -tvf") "tar --numeric-owner -tvf")) - #t))))) + (add-before 'configure 'setenv + (lambda _ + (setenv "LIBS" "-lacl"))) + (add-before 'check 'prepare-check + (lambda _ + (setenv "SHELL" (which "bash")) + (setenv "VERBOSE" "1") + (substitute* "test/t.touchinstall" + ;; We don't have the name of the root user, so use ID=0. + (("grep root") "grep \"\\<0\\>\"")) + (substitute* "test/tartest" + ;; We don't have the name of the root group, so use ID=0. + (("ROOTGROUP=root") "ROOTGROUP=0") + ;; We don't have the name of the daemon user, so use IDs. + (("daemon:sys") "1:3") + (("daemon:") "1:")) + ;; We don't have an /etc/passwd entry for "root" - use numeric IDs. + (substitute* "test/compare-tar" + (("tar -tvf") "tar --numeric-owner -tvf"))))))) (native-inputs `(;; For bootstrapping the package. - ("autoconf" ,autoconf) + ("autoconf" ,autoconf-2.71) ("automake" ,automake) ("libtool" ,libtool) ("gettext" ,gettext-minimal) -- cgit v1.2.3 From 0bd926b6e45ae0316583ef7079e988f6ea640fb6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 13 Oct 2021 23:20:44 +0200 Subject: gnu: fakeroot: Omit static library. * gnu/packages/linux.scm (fakeroot)[arguments]: Add "--disable-static" to #:configure-flags. --- gnu/packages/linux.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f8c398ba41..4a54fd954b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -7854,7 +7854,9 @@ the superuser to make device nodes.") (stat:type (lstat file)))))))))))) (build-system gnu-build-system) (arguments - `(#:phases + `(#:configure-flags + (list "--disable-static") + #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-Makefile.am (lambda _ -- cgit v1.2.3 From fb4c0efbb1d38edec7d939ba59ebd38672788cdc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 13 Oct 2021 23:21:29 +0200 Subject: gnu: fakeroot: Invoke an absolute cat. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/linux.scm (fakeroot)[arguments]: Refer to ‘cat’ by its absolute file name. --- 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 4a54fd954b..b34e00233d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -7871,9 +7871,9 @@ the superuser to make device nodes.") (("sed") (string-append (assoc-ref inputs "sed") "/bin/sed")) - (("cut") + (("cat|cut" command) (string-append (assoc-ref inputs "coreutils") - "/bin/cut")) ))) + "/bin/" command)) ))) (replace 'bootstrap (lambda _ ;; The "preroll" script takes care of Autoconf and also -- cgit v1.2.3 From a2c01c48aa2fe14f3138b11964d02810863db83a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 13 Oct 2021 23:32:19 +0200 Subject: gnu: fakeroot: Edit description. * gnu/packages/linux.scm (fakeroot)[synopsis]: Expand. [description]: Double-space sentences and otherwise slightly tweak. --- gnu/packages/linux.scm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b34e00233d..3c5a750cb7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -7915,14 +7915,17 @@ the superuser to make device nodes.") ("util-linux" ,util-linux) ("sed" ,sed) ("coreutils" ,coreutils))) - (synopsis "Provides a fake root environment") - (description "@command{fakeroot} runs a command in an environment where -it appears to have root privileges for file manipulation. This is useful -for allowing users to create archives (tar, ar, .deb etc.) with files in -them with root permissions/ownership. Without fakeroot one would have to -have root privileges to create the constituent files of the archives with -the correct permissions and ownership, and then pack them up, or one would -have to construct the archives directly, without using the archiver.") + (synopsis "Run commands in an environment with fake root privileges") + (description + "@command{fakeroot} runs a command in an environment where it appears to +have root privileges for file manipulation. This is useful for allowing users +to create archives (@file{tar}, @file{ar}, @file{deb}, etc.) with files in +them with root permissions and/or ownership. + +Without fakeroot, one would have to have root privileges to create the +constituent files of the archives with the correct permissions and ownership, +and then pack them up, or one would have to construct the archives directly, +without using the archiver.") (home-page "http://freshmeat.sourceforge.net/projects/fakeroot") (license license:gpl3+))) -- cgit v1.2.3 From 0f134637b417f9d55f737564f31c27c3f7ee7c29 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 13 Oct 2021 11:48:05 -0400 Subject: gnu: linux-libre: Update to 5.14.12. * gnu/packages/linux.scm (linux-libre-5.14-version): Update to 5.14.12. (linux-libre-5.14-pristine-source): 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 3c5a750cb7..f3bcdfad3b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -346,7 +346,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.14-version "5.14.11") +(define-public linux-libre-5.14-version "5.14.12") (define-public linux-libre-5.14-gnu-revision "gnu") (define deblob-scripts-5.14 (linux-libre-deblob-scripts @@ -356,7 +356,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "024rz0bp3n3r5nkwbib7byx10d72c2fh5cw9iv00diyzgnp819g7"))) (define-public linux-libre-5.14-pristine-source (let ((version linux-libre-5.14-version) - (hash (base32 "0capilz3wx29pw7n2m5cn229vy9psrccmdspp27znhjkvwj0m0wk"))) + (hash (base32 "0dswxf1qk70lms5lph15i7nz3ybwiia58v8zzrmi71ajviwjc9wd"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.14))) -- cgit v1.2.3 From 20ca4817a73db0edebe12107d43ffe11d07f6ea8 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 13 Oct 2021 11:48:23 -0400 Subject: gnu: linux-libre 5.10: Update to 5.10.73. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.73. (linux-libre-5.10-pristine-source): 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 f3bcdfad3b..901eb94e7a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -364,7 +364,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.10-version "5.10.72") +(define-public linux-libre-5.10-version "5.10.73") (define-public linux-libre-5.10-gnu-revision "gnu1") (define deblob-scripts-5.10 (linux-libre-deblob-scripts @@ -374,7 +374,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "024rz0bp3n3r5nkwbib7byx10d72c2fh5cw9iv00diyzgnp819g7"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "0z2cp8gqnbv7iz8kb5ydfmk019m0gds8wwvwc6kccsk4wypkbmml"))) + (hash (base32 "0xhf0g5pra27hnavpy0y3mn05m5hqn5rd3d6fx0a3vr35c1jicpd"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit v1.2.3 From c118f870564f45e2eaa5a0605520324825fa5fd2 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 13 Oct 2021 11:48:40 -0400 Subject: gnu: linux-libre 5.4: Update to 5.4.153. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.153. (linux-libre-5.4-pristine-source): 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 901eb94e7a..9254983c55 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -379,7 +379,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.152") +(define-public linux-libre-5.4-version "5.4.153") (define-public linux-libre-5.4-gnu-revision "gnu1") (define deblob-scripts-5.4 (linux-libre-deblob-scripts @@ -389,7 +389,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1a0k9i8gnzkyvfr80f8xw2fnxfwddhz1pzicz9fh0y3jzzkzk45p"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1may19d47d06mplpk29dpjsq31sxk8wwbwb2jspj3vay9h9wfi40"))) + (hash (base32 "0jaz57sd51xqc7w8k3f43bfc5mdsh1413mdngqqsgr8isv4hg7vd"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 92fdd7ab60a3889ed319635b481007f9ccfdebc9 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 13 Oct 2021 11:49:00 -0400 Subject: gnu: linux-libre 4.19: Update to 4.19.211. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.211. (linux-libre-4.19-pristine-source): 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 9254983c55..0088dbad4a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -394,7 +394,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.210") +(define-public linux-libre-4.19-version "4.19.211") (define-public linux-libre-4.19-gnu-revision "gnu1") (define deblob-scripts-4.19 (linux-libre-deblob-scripts @@ -404,7 +404,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1a0k9i8gnzkyvfr80f8xw2fnxfwddhz1pzicz9fh0y3jzzkzk45p"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0cv126j4sghwgzjm9p5l1brcnxkbgggja2ai37gl8m2s99cj59wv"))) + (hash (base32 "1m3y5gsf5s8bb4jxkri20dlxi8aiqabzaijj2h1svz4r19ca8j7v"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From c34333c3db25145d783a0554c5049bf85378ee34 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Oct 2021 02:00:58 +0200 Subject: gnu: jitterentropy-rngd: Update to 1.2.5. * gnu/packages/linux.scm (jitterentropy-rngd): Update to 1.2.5. --- 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 0088dbad4a..a64bc9b560 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2605,7 +2605,7 @@ Both commands are targeted at system administrators.") (define-public jitterentropy-rngd (package (name "jitterentropy-rngd") - (version "1.2.0") + (version "1.2.5") (source (origin (method git-fetch) @@ -2614,7 +2614,7 @@ Both commands are targeted at system administrators.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1fb8zfwhwkl1d8n4cdn7rdv5rwd75qgc00d36pmkl7wgnj3c9xda")))) + (base32 "05h9a60s9x3jav33lh50ac1jw8wvbljw2ndrk3k7gs2nlz0kkl14")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no test suite -- cgit v1.2.3 From 6441d8ad08ee9d47a3f4ea90d9a2ff633b4cf888 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Oct 2021 16:36:35 +0200 Subject: gnu: ipset: Update to 7.15. * gnu/packages/linux.scm (ipset): Update to 7.15. --- 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 a64bc9b560..80c0d8d913 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -8394,14 +8394,14 @@ receiving. It is dedicated to the PL011 UART of the Raspberry Pi.") (define-public ipset (package (name "ipset") - (version "7.11") + (version "7.15") (source (origin (method url-fetch) (uri (string-append "https://ipset.netfilter.org/" "ipset-" version ".tar.bz2")) (sha256 - (base32 "0zdzp9fhpp6hmirzxy7w27fb9xx9lxd2ykxbn8by7ngi62nvll9i")))) + (base32 "0l8pcaym6057hq3a4zwnk53p5y6xg1m3d3c83wn18h5nmnm4am8a")))) (build-system gnu-build-system) (inputs `(("libmnl" ,libmnl))) -- cgit v1.2.3 From d1b375402f5680b1e5a77dd1fb77e1e9d94625d1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Oct 2021 16:37:21 +0200 Subject: gnu: ipset: Omit static library. * gnu/packages/linux.scm (ipset)[arguments]: Add "--disable-static" to the #:configure-flags. --- gnu/packages/linux.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 80c0d8d913..5c21515e20 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -8408,7 +8408,8 @@ receiving. It is dedicated to the PL011 UART of the Raspberry Pi.") (native-inputs `(("pkg-config" ,pkg-config))) (arguments - `(#:configure-flags '("--with-kmod=no"))) + `(#:configure-flags '("--disable-static" + "--with-kmod=no"))) (home-page "https://ipset.netfilter.org/") (synopsis "Administration tool for IP sets") (description "IP sets are a framework inside the Linux 2.4.x and 2.6.x kernel which -- cgit v1.2.3