From 054c001d265ac5b8189abdf6ea55e30a4d0c2436 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:00 +0200 Subject: gnu: Add mce-inject. * gnu/packages/linux.scm (mce-inject): New public variable. --- gnu/packages/linux.scm | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 81a7f99693..ad839ae45a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -6630,6 +6630,65 @@ (define-public module-init-tools @code{modprobe}, @code{insmod}, @code{lsmod}, and more.") (license license:gpl2+))) +(define-public mce-inject + (let ((revision "0") ; no git tags :-/ + (commit "4cbe46321b4a81365ff3aafafe63967264dbfec5")) + (package + (name "mce-inject") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.kernel.org/pub/scm/utils/cpu/mce/mce-inject.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0gjapg2hrlxp8ssrnhvc19i3r1xpcnql7xv0zjgbv09zyha08g6z")))) + (build-system gnu-build-system) + (arguments + ;; There is no test suite. There's a test/ directory, but it just holds + ;; example text files you could feed to the programme to crash something. + (list #:tests? #f + #:make-flags + #~(list (string-append "prefix=" #$output) + (string-append "CC=" #$(cc-for-target))) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) ; no configure script + (add-after 'install 'install-examples + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/" #$name)) + (dir (string-append doc "/examples"))) + (copy-recursively "test" dir ))))))) + (native-inputs + (list bison flex)) + (supported-systems (list "i686-linux" "x86_64-linux")) + (home-page + "https://git.kernel.org/pub/scm/utils/cpu/mce/mce-inject.git/about/") + (synopsis + "Inject x86 @acronym{MCEs, machine-check exceptions} into Linux") + (description + "This simple tool injects fake @acronym{MCEs, machine-check exceptions} +into a running Linux kernel, to debug or test the kernel's @acronym{EDAC, error +detection and correction}-handling code specific to x86 and x86_64 platforms. + +Real MCEs are internal CPU errors. Handling them correctly can be important to +system stability and even prevent physical damage. In contrast, simulated MCEs +produced by @command{mce-inject} are purely synthetic: injection happens only at +the software level, inside the kernel, and is not visible to the platform +hardware or firmware. + +A convenient feature of @command{mce-inject} is that the input language used to +describe MCEs is similar to the format used in Linux panic messages, with a few +extensions. In general, you should be able to pipe in any logged MCE panic to +simulate that same MCE. + +The target kernel must have the @code{CONFIG_X86_MCE_INJECT} option enabled and +the @code{mce-inject} module loaded if it exists.") + (license license:gpl2)))) + (define-public mcelog (package (name "mcelog") -- cgit v1.2.3 From 7a409a217c113dd55c44735331b4c4c1d60ad531 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:01 +0200 Subject: gnu: mtd-utils: Update to 2.1.4. * gnu/packages/linux.scm (mtd-utils): Update to 2.1.4. --- 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 ad839ae45a..906303175d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -6735,7 +6735,7 @@ (define-public mcelog (define-public mtd-utils (package (name "mtd-utils") - (version "2.1.2") + (version "2.1.4") (source (origin (method url-fetch) (uri (string-append @@ -6743,7 +6743,7 @@ (define-public mtd-utils "mtd-utils-" version ".tar.bz2")) (sha256 (base32 - "1mp9fqgnz5r69s8ly98ry6k2blqnaqpllwi8m930dm0n8zrwbm4a")))) + "168vyzpfa0n66i8lcf626b9jczjr81rqbdk7735lfb18bp8i2rrc")))) (arguments (list #:configure-flags (if (%current-target-system) ; When cross-compiling. -- cgit v1.2.3 From ab59155c5a38dda7efaceb47c7528578fcf0def4 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 31 Jul 2022 23:48:57 +0200 Subject: gnu: mtd-utils: Disable parallel tests. This is a followup to 7a409a217c113dd55c44735331b4c4c1d60ad531. * gnu/packages/linux.scm (mtd-utils)[arguments]: Add #:parallel-tests?. --- 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 906303175d..85a848dbde 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -6748,7 +6748,9 @@ (define-public mtd-utils (list #:configure-flags (if (%current-target-system) ; When cross-compiling. #~(list) - #~(list "--enable-unit-tests")))) + #~(list "--enable-unit-tests")) + + #:parallel-tests? #f)) ;tests may fail when running in parallel (native-inputs (list cmocka pkg-config)) (inputs -- cgit v1.2.3 From 28e523cc327b9f5b33b769f11de492859e4cd32e Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Sat, 16 Jul 2022 09:51:26 +0300 Subject: gnu: Add evtest. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/linux.scm (evtest): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/linux.scm | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 85a848dbde..a94e5c9bc9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -9342,3 +9342,57 @@ (define-public touchegg gestures you make on your touchpad or touchscreen into visible actions in your desktop.") (license license:gpl3+))) + +(define-public evtest + (package + (name "evtest") + (version "1.35") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.freedesktop.org/libevdev/evtest") + (commit (string-append "evtest-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "164prnw35kda6jfykl7h52lfzy99ma2lk029zscyqk766k19spf4")))) + (build-system gnu-build-system) + (arguments + (list #:tests? #f ;No tests exist + #:make-flags #~(list (string-append "CC=" + #$(cc-for-target)) + (string-append "PREFIX=" + #$output)) + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'generate-doc + (lambda _ + (invoke "asciidoc" "-d" "manpage" + "-b" "docbook" + "-o" "evtest.1.xml" + "evtest.txt") + (invoke "xsltproc" "--nonet" + (string-append + #$(this-package-native-input "docbook-xsl") + "/xml/xsl/docbook-xsl-" + #$(package-version + (this-package-native-input "docbook-xsl")) + "/manpages/docbook.xsl") + "evtest.1.xml"))) + (replace 'bootstrap + (lambda _ + (setenv "CONFIG_SHELL" (which "sh")) + (invoke "autoreconf" "-fi")))))) + (native-inputs (list autoconf + automake + bash-minimal + xmlto + docbook-xsl + libxslt + asciidoc)) + (home-page "https://gitlab.freedesktop.org/libevdev/evtest") + (synopsis "Kernel evdev device information and monitor") + (description + "@code{evtest} is a tool to print @code{evdev} kernel events. It reads +directly from the kernel device and prints a device description and the events +with the value and the symbolic name.") + (license license:gpl2+))) -- cgit v1.2.3 From d921cf8d279daa67406445aed5828564f059600c Mon Sep 17 00:00:00 2001 From: kiasoc5 Date: Wed, 20 Jul 2022 11:25:31 -0400 Subject: gnu: sshfs: Update to 3.7.3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/linux.scm (sshfs): Update to 3.7.3. [build-system]: Replace gnu-build-system with meson-build-system. [native-inputs]: Add dependencies to generate man page. Signed-off-by: 宋文武 --- gnu/packages/linux.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a94e5c9bc9..a9594905d9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3472,20 +3472,25 @@ (define-public unionfs-fuse/static (define-public sshfs (package (name "sshfs") - (version "2.10") + (version "3.7.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/libfuse/sshfs/releases/" "download/sshfs-" version "/sshfs-" version - ".tar.gz")) + ".tar.xz")) (sha256 (base32 - "00fir2iykdx11g8nv5gijg0zjrp2g3ldypnv0yi6lq3h5pg5v13h")))) - (build-system gnu-build-system) + "169fkilv060afgp9h7hvsbkg02bd1y77kmx06x0s7q1cvmxww62j")))) + (build-system meson-build-system) + (arguments + ;; XXX: tests are skipped: FUSE kernel module does not seem to be loaded + '(#:tests? #f)) (inputs - (list fuse glib)) + (list fuse-3 glib)) (native-inputs - (list pkg-config)) + (list pkg-config + ;; man page + python-docutils)) (home-page "https://github.com/libfuse/sshfs") (synopsis "Mount remote file systems over SSH") (description -- cgit v1.2.3 From f8b200db81445a180583afbc5974c3d2ccc33095 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 3 Aug 2022 16:04:25 -0400 Subject: gnu: linux-libre: Update to 5.18.16. * gnu/packages/linux.scm (linux-libre-5.18-version): Update to 5.18.16. (linux-libre-5.18-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 a9594905d9..3aa3aea1d2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -352,7 +352,7 @@ (define (%upstream-linux-source version hash) ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.18-version "5.18.14") +(define-public linux-libre-5.18-version "5.18.16") (define-public linux-libre-5.18-gnu-revision "gnu") (define deblob-scripts-5.18 (linux-libre-deblob-scripts @@ -362,7 +362,7 @@ (define deblob-scripts-5.18 (base32 "0vjpn8iw9yg39sr6jfhzyvivf159h9zfgnjamwa283zfll0h0a53"))) (define-public linux-libre-5.18-pristine-source (let ((version linux-libre-5.18-version) - (hash (base32 "1bsnk2rskdkimciij5q3hjs00lc7ks1h1qh9kc4s7lrk252lczg1"))) + (hash (base32 "1khi1npn8d8jimwdy8bf3r7l780mxdmvk5azdv419pk33qjqdxgi"))) (make-linux-libre-source version (%upstream-linux-source version hash) -- cgit v1.2.3 From b4af9220d0a4f5e1482d1364dbc00c57d23e80b6 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 3 Aug 2022 16:04:55 -0400 Subject: gnu: linux-libre 5.15: Update to 5.15.59. * gnu/packages/linux.scm (linux-libre-5.15-version): Update to 5.15.59. (linux-libre-5.15-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 3aa3aea1d2..3fa5c70bea 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -371,7 +371,7 @@ (define-public linux-libre-5.18-pristine-source ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.15-version "5.15.57") +(define-public linux-libre-5.15-version "5.15.59") (define-public linux-libre-5.15-gnu-revision "gnu") (define deblob-scripts-5.15 (linux-libre-deblob-scripts @@ -381,7 +381,7 @@ (define deblob-scripts-5.15 (base32 "129qlhwdv2mfb85gbvq03kkbdfp73b444rryr4rrbvi0jmq4cp24"))) (define-public linux-libre-5.15-pristine-source (let ((version linux-libre-5.15-version) - (hash (base32 "1zgh43pgn8fsyxzksfw6llxqw6fc8qassfn9a18k2xn83xd0kqv2"))) + (hash (base32 "1jxw6fnc7yaw7r6193wy6l8wdlpy3frw48drnc3dnh3k0m1cdpg6"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.15))) -- cgit v1.2.3 From c4a2a844340a4e2aa7d8b77d855b7f3cc08aad60 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 3 Aug 2022 16:05:10 -0400 Subject: gnu: linux-libre 5.10: Update to 5.10.135. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.135. (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 3fa5c70bea..20a35f4a62 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -386,7 +386,7 @@ (define-public linux-libre-5.15-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.15))) -(define-public linux-libre-5.10-version "5.10.133") +(define-public linux-libre-5.10-version "5.10.135") (define-public linux-libre-5.10-gnu-revision "gnu1") (define deblob-scripts-5.10 (linux-libre-deblob-scripts @@ -396,7 +396,7 @@ (define deblob-scripts-5.10 (base32 "1981axxswghza3iadp94q54y8w30h9w9vyq4cbjiiv9alvbv0pb8"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "03i84g3pfh24f10zsdyyqyv9fhy01ah9lk02y48hqwnabdylqp1v"))) + (hash (base32 "0i1kahv739qpyyml7d7sx306nv7gp55i5d97vlb0fryfx4dsd6g4"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit v1.2.3 From 5874779d80a4003090a2473ca9d722f6c72bf625 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 3 Aug 2022 16:05:25 -0400 Subject: gnu: linux-libre 5.4: Update to 5.4.209. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.209. (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 20a35f4a62..b428a329a8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -401,7 +401,7 @@ (define-public linux-libre-5.10-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.207") +(define-public linux-libre-5.4-version "5.4.209") (define-public linux-libre-5.4-gnu-revision "gnu1") (define deblob-scripts-5.4 (linux-libre-deblob-scripts @@ -411,7 +411,7 @@ (define deblob-scripts-5.4 (base32 "1vnjbdyssa7dwyjl9kg35alwvf7yh597cl74yr1wy2gk5bc9paw6"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1wwpd26qhv6i00p0yxjisns6qiz9bfrxvn1xb4ylwr8ls7zyx78v"))) + (hash (base32 "1kdnz99k7zspzaxqaxahbf6hncigy4cvjlb79jsy7a95qxxr31qf"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From f0866ba4de46e7bce2a21bff4e4ae6b0dba7e2c4 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 3 Aug 2022 16:05:42 -0400 Subject: gnu: linux-libre 4.19: Update to 4.19.254. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.254. (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 b428a329a8..f6d31639f7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -416,7 +416,7 @@ (define-public linux-libre-5.4-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.253") +(define-public linux-libre-4.19-version "4.19.254") (define-public linux-libre-4.19-gnu-revision "gnu1") (define deblob-scripts-4.19 (linux-libre-deblob-scripts @@ -426,7 +426,7 @@ (define deblob-scripts-4.19 (base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "1jc2j0wskgr1bdzpz6sn2bvafpviiin6mwr93yykcczzfjijr8yz"))) + (hash (base32 "1rd40wmdaymbly2zvf60mjqsflkd4n1y232qz0ixn1rfl28yz62i"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 168e58fb41d1ff71eb3c83c85591d5dc4e01bc3e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 3 Aug 2022 16:06:01 -0400 Subject: gnu: linux-libre 4.14: Update to 4.14.290. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.290. (linux-libre-4.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 f6d31639f7..cc5a4e1cfb 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -431,7 +431,7 @@ (define-public linux-libre-4.19-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.289") +(define-public linux-libre-4.14-version "4.14.290") (define-public linux-libre-4.14-gnu-revision "gnu1") (define deblob-scripts-4.14 (linux-libre-deblob-scripts @@ -441,7 +441,7 @@ (define deblob-scripts-4.14 (base32 "00i91lx938nqlgy63hiricqd0fnbbf26vgya9c5lb7m1f4x324im"))) (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "1v24mv49skgijcbafgai0glrzwiv2j1hndkz7v6ygc18jxh5fqg6"))) + (hash (base32 "0zyxb99a7fa2l85vnzmvg2nry99clj20d4j38piqm921iqxak2j4"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From 6048c05592e0aabb55bcd081100f9d75b7736890 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 4 Aug 2022 13:13:58 -0400 Subject: gnu: linux-libre 4.9: Update to 4.9.325. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.325. (linux-libre-4.9-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 cc5a4e1cfb..b33fc244b2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -446,7 +446,7 @@ (define-public linux-libre-4.14-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.324") +(define-public linux-libre-4.9-version "4.9.325") (define-public linux-libre-4.9-gnu-revision "gnu1") (define deblob-scripts-4.9 (linux-libre-deblob-scripts @@ -456,7 +456,7 @@ (define deblob-scripts-4.9 (base32 "0bib3641dbcqdkx3anna3caxnsg3nw9cnmhcklq0s93g3m57041h"))) (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "0g51vfp0g3py82l3q66p7nvl03h6l1nlny18gangji75a3c39yh4"))) + (hash (base32 "04msx0x0d8v93zjr3jj0qqkgg7m4hb7rj6hk5vzrzasmgbjmb3dl"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From e2397e66e6d6f0d67152b87b7ec8debee3687c53 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Wed, 20 Jul 2022 10:28:30 +0200 Subject: gnu: Add lkrg. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/linux.scm (lkrg): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/linux.scm | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b33fc244b2..aeb03020ce 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -60,7 +60,7 @@ ;;; Copyright © 2021 Josselin Poiret ;;; Copyright © 2021 Olivier Dion ;;; Copyright © 2021 Solene Rapenne -;;; Copyright © 2021 Petr Hodina +;;; Copyright © 2021, 2022 Petr Hodina ;;; Copyright © 2022 Artyom V. Poptsov ;;; Copyright © 2022 Rene Saavedra @@ -1342,6 +1342,37 @@ (define-public librem-ec-acpi-linux-module and the notification, WiFi, and Bluetooth LED.") (license license:gpl2))) +(define-public lkrg + (package + (name "lkrg") + (version "0.9.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/lkrg-org/lkrg") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0yirb7n4mqv8cn0gziz1m7ymq00dhhy79j59jdgrx00b8rj57cfw")))) + (build-system linux-module-build-system) + (arguments + (list #:linux linux-libre + #:tests? #f + #:make-flags #~(list (string-append "CC=" + #$(cc-for-target)) + (string-append "SYSSRC=" + (assoc-ref %build-inputs + "linux-module-builder") + "/lib/modules/build")))) + (inputs (list bash-minimal)) + (home-page "https://lkrg.org/") + (synopsis "Linux Kernel Runtime Guard") + (description + "This package performs runtime integrity checking of the Linux kernel and +detection of security vulnerability exploits against the kernel.") + (license license:gpl2))) + (define-public rtl8821ce-linux-module (let ((commit "be733dc86781c68571650b395dd0fa6b53c0a039") (revision "6")) -- cgit v1.2.3 From 792e1c2ce1776ed98c216a13df7af95b064f9a9d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 24 Jul 2022 02:00:01 +0200 Subject: gnu: libinih: Update to 56. * gnu/packages/linux.scm (libinih): Update to 56. --- 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 aeb03020ce..67ca86cbb0 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -8390,7 +8390,7 @@ (define-public go-netlink (define-public libinih (package (name "libinih") - (version "55") + (version "56") (source (origin (method git-fetch) (uri (git-reference @@ -8399,7 +8399,7 @@ (define-public libinih (file-name (git-file-name name version)) (sha256 (base32 - "0g6dkcphlzgxvh9zyf6rj82gigccca6x5acjxn01gz6rykfg0lnn")))) + "1fjqvf56yij15lgwj58dcmxlq5n98gzpbss0nnn1d2i5j7gf4kgf")))) (build-system meson-build-system) ;; Install static libraries for use by the initrd's xfsprogs/static. (outputs (list "out" "static")) -- cgit v1.2.3 From e3e33b5251e11beb0c77cc39f335a5116ab36f9c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 7 Aug 2022 16:17:23 +0300 Subject: gnu: shishi: Build with newer linux-pam. * gnu/packages/kerberos.scm (shishi)[inputs]: Replace linux-pam-1.2 with linux-pam. * gnu/packages/linux.scm (linux-pam-1.2): Remove variable. --- gnu/packages/kerberos.scm | 2 +- gnu/packages/linux.scm | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index a52d4b42cc..8f2bbd1c13 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -147,7 +147,7 @@ (define-public shishi (inputs (list gnutls libidn - linux-pam-1.2 + linux-pam zlib libgcrypt libtasn1)) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 67ca86cbb0..48e58c035d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1660,21 +1660,6 @@ (define-public linux-pam at login. Local and dynamic reconfiguration are its key features.") (license license:bsd-3))) -(define-public linux-pam-1.2 - (package - (inherit linux-pam) - (version "1.2.1") - (source - (origin - (method url-fetch) - (uri (string-append - "http://www.linux-pam.org/library/" - "Linux-PAM-" version ".tar.bz2")) - (sha256 - (base32 - "1n9lnf9gjs72kbj1g354v1xhi2j27aqaah15vykh7cnkq08i4arl")) - (patches (search-patches "linux-pam-no-setfsuid.patch")))))) - (define-public python-pamela (package (name "python-pamela") -- cgit v1.2.3 From 78c917e9a4aeb73ff332bee65f416b3677cd4f24 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 9 Aug 2022 22:16:24 +0200 Subject: gnu: liburing: Update to 2.2. * gnu/packages/linux.scm (liburing): Update to 2.2. --- 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 48e58c035d..5a9dbb35b8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -9147,7 +9147,7 @@ (define-public ipset (define-public liburing (package (name "liburing") - (version "0.7") + (version "2.2") (source (origin (method git-fetch) (uri (git-reference @@ -9156,7 +9156,7 @@ (define-public liburing (file-name (git-file-name name version)) (sha256 (base32 - "15z44l7y4c6s6dlf7v8lq4znlsjbja2r4ifbni0l8cdcnq0w3zh3")))) + "1677zqqbd9nw9hrdaxqbd1zwy54cxfsv2z0bjipn23mrkz2xzy1k")))) (build-system gnu-build-system) (arguments `(;; Tests are dependent on kernel version and features -- cgit v1.2.3 From d5986f7622bb59d40a227abf7cd973129dc4c129 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 9 Aug 2022 15:51:58 +0200 Subject: gnu: libbpf: Update to 0.8.1. * gnu/packages/linux.scm (libbpf): Update to 0.8.1. [inputs]: Change from LIBELF to ELFUTILS. [arguments]: Use CC-FOR-TARGET. Remove trailing #t. --- gnu/packages/linux.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5a9dbb35b8..adf660ea6b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -8919,7 +8919,7 @@ (define-public cachefilesd (define-public libbpf (package (name "libbpf") - (version "0.1.1") + (version "0.8.1") (source (origin (method git-fetch) @@ -8929,28 +8929,26 @@ (define-public libbpf (file-name (git-file-name name version)) (sha256 (base32 - "0ilnnm4q22f8fagwp8kb37licy4ks861i2iqh2djsypqhnxvx3fv")))) + "1zzpkk4x3f20483dzw43b3ml03d63vvkmqf4j8y3b61b67wm59bm")))) (build-system gnu-build-system) (native-inputs (list pkg-config)) (propagated-inputs ;; In Requires.private of libbpf.pc. - (list libelf zlib)) + (list elfutils zlib)) (arguments `(#:tests? #f ; no tests #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) (string-append "LIBDIR=$(PREFIX)/lib") - (string-append - "CC=" (assoc-ref %build-inputs "gcc") "/bin/gcc")) + (string-append "CC=" ,(cc-for-target))) #:phases (modify-phases %standard-phases (delete 'configure) (add-before 'build 'pre-build (lambda _ - (chdir "src") - #t))))) + (chdir "src")))))) (home-page "https://github.com/libbpf/libbpf") (synopsis "BPF CO-RE (Compile Once – Run Everywhere)") (description -- cgit v1.2.3 From 2fd9ca5e05cc6008d36b08a002d3f30d824140ce Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 9 Aug 2022 15:56:01 +0200 Subject: gnu: bcc: Update to 0.24.0. * gnu/packages/linux.scm (bcc): Update to 0.24.0. --- 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 adf660ea6b..1dc8b492ff 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -8960,7 +8960,7 @@ (define-public libbpf (define-public bcc (package (name "bcc") - (version "0.16.0") + (version "0.24.0") (source (origin (method git-fetch) @@ -8970,7 +8970,7 @@ (define-public bcc (file-name (git-file-name name version)) (sha256 (base32 - "1367c0bzrpclvjvmk0sxgi49rh7j2f9izqk5a7g3yvawh1fmvvjh")))) + "1i6xikkxf2nasfkqa91hjzdq0a88mgyzrvia4fi2i2v1d8pbmnp4")))) (build-system cmake-build-system) (native-inputs (list bison flex)) -- cgit v1.2.3 From 00962dd18f21270daaaf9a5b7c7cc995d8f6402f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 9 Aug 2022 15:58:40 +0200 Subject: gnu: bpftrace: Update to 0.15.0. * gnu/packages/linux.scm (bpftrace): Update to 0.15.0. [inputs]: Add CEREAL. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1dc8b492ff..7f909e863e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -9040,7 +9040,7 @@ (define-public bcc (define-public bpftrace (package (name "bpftrace") - (version "0.11.4") + (version "0.15.0") (source (origin (method git-fetch) @@ -9049,13 +9049,13 @@ (define-public bpftrace (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0y4qgm2cpccrsm20rnh92hqplddqsc5q5zhw9nqn2igm3h9i0z7h")) + (base32 "022fg0kiz0liahj82wvlxmivkwyp86shs5fwr2v4blx7lh05k9zm")) (patches (search-patches "bpftrace-disable-bfd-disasm.patch")))) (build-system cmake-build-system) (native-inputs (list bison flex)) (inputs - (list bcc clang-toolchain-9 elfutils libbpf)) + (list bcc clang-toolchain-9 elfutils libbpf cereal)) (arguments `(#:tests? #f ;Tests require googletest sources. #:configure-flags -- cgit v1.2.3 From 181fd74121fd763e5848c0d146f97ff528ce3bae Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 9 Aug 2022 22:49:31 +0200 Subject: gnu: multipath-tools: Remove input labels. * gnu/packages/linux.scm (multipath-tools)[arguments]: Use G-expression and SEARCH-INPUT-FILE. [inputs]: Remove labels. --- gnu/packages/linux.scm | 126 +++++++++++++++++++++++-------------------------- 1 file changed, 60 insertions(+), 66 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7f909e863e..a203adc1d4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5223,75 +5223,69 @@ (define-public multipath-tools #t)))) (build-system gnu-build-system) (arguments - '(#:test-target "test" - #:parallel-build? #f ;XXX: broken in 0.8.4 - #:make-flags (list "CC=gcc" - (string-append "DESTDIR=" - (assoc-ref %outputs "out")) - ;; Install Udev rules below this directory, relative - ;; to the prefix. - "SYSTEMDPATH=lib" - (string-append "LDFLAGS=-Wl,-rpath=" - (assoc-ref %outputs "out") - "/lib")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-source - (lambda* (#:key inputs #:allow-other-keys) - (let ((lvm2 (assoc-ref inputs "lvm2")) - (udev (assoc-ref inputs "udev"))) - (substitute* "Makefile.inc" - (("\\$\\(prefix\\)/usr") "$(prefix)") - ;; Do not save timestamp to avoid gzip "timestamp - ;; out-of-range" warnings. - (("gzip -9") "gzip -9n")) - (substitute* '("kpartx/Makefile" "libmultipath/Makefile") - (("/usr/include/libdevmapper.h") - (string-append lvm2 "/include/libdevmapper.h")) - (("/usr/include/libudev.h") - (string-append udev "/include/libudev.h"))) - #t))) - (add-after 'unpack 'fix-maybe-uninitialized-variable - (lambda _ - ;; This variable gets initialized later if needed, but GCC 7 - ;; fails to notice. Should be fixed for > 0.8.4. - ;; https://www.redhat.com/archives/dm-devel/2020-March/msg00137.html - (substitute* "libmultipath/structs_vec.c" - (("bool is_queueing;") - "bool is_queueing = false;")) - #t)) - (add-after 'unpack 'fix-linking-tests - (lambda _ - ;; Add missing linker flag for -lmpathcmd. This should be fixed - ;; for versions > 0.8.4. - (substitute* "tests/Makefile" - (("-lmultipath -lcmocka") - "-lmultipath -L$(mpathcmddir) -lmpathcmd -lcmocka")) - #t)) - (add-after 'unpack 'skip-failing-tests - (lambda _ - ;; This test and the module's setup() test an arbitrary block - ;; device node name, but the build environment has none. - (substitute* "tests/devt.c" - (("return get_one_devt.*") "return 0;\n") - (("cmocka_unit_test\\(test_devt2devname_devt_good\\),") "")) - ;; The above triggers -Werror=unused-function. Ignore it. - (substitute* "tests/Makefile" - (("CFLAGS \\+= " match) - (string-append match "-Wno-error=unused-function "))) - #t)) - (delete 'configure)))) ; no configure script + (list + #:test-target "test" + #:parallel-build? #f ;XXX: broken since 0.8.4 + #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "DESTDIR=" #$output) + ;; Install Udev rules below this directory, relative + ;; to the prefix. + "SYSTEMDPATH=lib" + (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda* (#:key inputs #:allow-other-keys) + (let ((libdevmapper.h + (search-input-file inputs "include/libdevmapper.h")) + (libudev.h + (search-input-file inputs "include/libudev.h"))) + (substitute* "Makefile.inc" + (("\\$\\(prefix\\)/usr") "$(prefix)") + ;; Do not save timestamp to avoid gzip "timestamp + ;; out-of-range" warnings. + (("gzip -9") "gzip -9n")) + (substitute* '("kpartx/Makefile" "libmultipath/Makefile") + (("/usr/include/libdevmapper.h") libdevmapper.h) + (("/usr/include/libudev.h") libudev.h))))) + (add-after 'unpack 'fix-maybe-uninitialized-variable + (lambda _ + ;; This variable gets initialized later if needed, but GCC 7 + ;; fails to notice. Should be fixed for > 0.8.4. + ;; https://www.redhat.com/archives/dm-devel/2020-March/msg00137.html + (substitute* "libmultipath/structs_vec.c" + (("bool is_queueing;") + "bool is_queueing = false;")))) + (add-after 'unpack 'fix-linking-tests + (lambda _ + ;; Add missing linker flag for -lmpathcmd. This should be fixed + ;; for versions > 0.8.4. + (substitute* "tests/Makefile" + (("-lmultipath -lcmocka") + "-lmultipath -L$(mpathcmddir) -lmpathcmd -lcmocka")))) + (add-after 'unpack 'skip-failing-tests + (lambda _ + ;; This test and the module's setup() test an arbitrary block + ;; device node name, but the build environment has none. + (substitute* "tests/devt.c" + (("return get_one_devt.*") "return 0;\n") + (("cmocka_unit_test\\(test_devt2devname_devt_good\\),") "")) + ;; The above triggers -Werror=unused-function. Ignore it. + (substitute* "tests/Makefile" + (("CFLAGS \\+= " match) + (string-append match "-Wno-error=unused-function "))))) + (delete 'configure)))) ;no configure script (native-inputs (list perl pkg-config valgrind ;; For tests. cmocka)) (inputs - `(("json-c" ,json-c) - ("libaio" ,libaio) - ("liburcu" ,liburcu) - ("lvm2" ,lvm2) - ("readline" ,readline) - ("udev" ,eudev))) + (list json-c + libaio + liburcu + lvm2 + readline + eudev)) (home-page "http://christophe.varoqui.free.fr/") (synopsis "Access block devices through multiple paths") (description @@ -5304,8 +5298,8 @@ (define-public multipath-tools @code{dm} multipath devices. @item @command{kpartx} - Create device maps from partition tables. @end enumerate") - (license (list license:gpl2+ ; main distribution - license:lgpl2.0+)))) ; libmpathcmd/mpath_cmd.h + (license (list license:gpl2+ ;main distribution + license:lgpl2.0+)))) ;libmpathcmd/mpath_cmd.h (define-public libaio (package -- cgit v1.2.3 From 01a4f6672ae67ee9ad506739f6a9401e3359dd1d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 9 Aug 2022 22:56:05 +0200 Subject: gnu: multipath-tools: Update to 0.9.0. * gnu/packages/linux.scm (multipath-tools): Update to 0.9.0. [home-page]: Change to current. [source](uri): Likewise. [source](snippet): Remove trailing #t. [arguments]: Move LDFLAGS out of #:make-flags, and add in a phase. Add substitution for /bin/echo, and remove obsolete phases. --- gnu/packages/linux.scm | 41 +++++++++++++++-------------------------- 1 file changed, 15 insertions(+), 26 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a203adc1d4..b868991461 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5201,16 +5201,15 @@ (define-public mdadm-static (define-public multipath-tools (package (name "multipath-tools") - (version "0.8.5") + (version "0.9.0") + (home-page "https://github.com/opensvc/multipath-tools") (source (origin (method git-fetch) - (uri (git-reference - (url "https://git.opensvc.com/multipath-tools/.git") - (commit version))) + (uri (git-reference (url home-page) (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "0gipg0z79h76j0f449cx4wcrfsv69ravjlpphsac11h302g3nrvg")) + "09m3vs798qb3xk0v7s3hy0nhw0dznkxjb56671kqj961h7zhg47b")) (modules '((guix build utils))) (snippet '(begin @@ -5219,8 +5218,7 @@ (define-public multipath-tools (substitute* '("multipathd/main.c" "libmultipath/debug.c") (("#include \"../third-party/") - "#include \"")) - #t)))) + "#include \"")))))) (build-system gnu-build-system) (arguments (list @@ -5230,8 +5228,7 @@ (define-public multipath-tools (string-append "DESTDIR=" #$output) ;; Install Udev rules below this directory, relative ;; to the prefix. - "SYSTEMDPATH=lib" - (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib")) + "SYSTEMDPATH=lib") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-source @@ -5241,6 +5238,7 @@ (define-public multipath-tools (libudev.h (search-input-file inputs "include/libudev.h"))) (substitute* "Makefile.inc" + (("/bin/echo") "echo") (("\\$\\(prefix\\)/usr") "$(prefix)") ;; Do not save timestamp to avoid gzip "timestamp ;; out-of-range" warnings. @@ -5248,21 +5246,6 @@ (define-public multipath-tools (substitute* '("kpartx/Makefile" "libmultipath/Makefile") (("/usr/include/libdevmapper.h") libdevmapper.h) (("/usr/include/libudev.h") libudev.h))))) - (add-after 'unpack 'fix-maybe-uninitialized-variable - (lambda _ - ;; This variable gets initialized later if needed, but GCC 7 - ;; fails to notice. Should be fixed for > 0.8.4. - ;; https://www.redhat.com/archives/dm-devel/2020-March/msg00137.html - (substitute* "libmultipath/structs_vec.c" - (("bool is_queueing;") - "bool is_queueing = false;")))) - (add-after 'unpack 'fix-linking-tests - (lambda _ - ;; Add missing linker flag for -lmpathcmd. This should be fixed - ;; for versions > 0.8.4. - (substitute* "tests/Makefile" - (("-lmultipath -lcmocka") - "-lmultipath -L$(mpathcmddir) -lmpathcmd -lcmocka")))) (add-after 'unpack 'skip-failing-tests (lambda _ ;; This test and the module's setup() test an arbitrary block @@ -5274,7 +5257,14 @@ (define-public multipath-tools (substitute* "tests/Makefile" (("CFLAGS \\+= " match) (string-append match "-Wno-error=unused-function "))))) - (delete 'configure)))) ;no configure script + (delete 'configure) ;no configure script + (add-before 'build 'set-LDFLAGS + (lambda _ + ;; Note: this cannot be passed as a make flag because that will + ;; override the build system LDFLAGS. + (setenv "LDFLAGS" + (string-append "-Wl,-rpath=" #$output "/lib"))))))) + (native-inputs (list perl pkg-config valgrind ;; For tests. @@ -5286,7 +5276,6 @@ (define-public multipath-tools lvm2 readline eudev)) - (home-page "http://christophe.varoqui.free.fr/") (synopsis "Access block devices through multiple paths") (description "This package provides the following binaries to drive the -- cgit v1.2.3 From d8d4b81147df59542385a79191eb51e3568ae309 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 10 Aug 2022 19:38:48 +0200 Subject: gnu: fuse@2: Prepare for newer glibc. * gnu/packages/patches/fuse-glibc-2.34.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/linux.scm (fuse)[source](patches): Add the patch. [arguments]: Add force-bootstrap phase. [native-inputs]: Add AUTOCONF, AUTOMAKE, GETTEXT-MINIMAL, and LIBTOOL. --- gnu/local.mk | 3 +- gnu/packages/linux.scm | 9 +++++- gnu/packages/patches/fuse-glibc-2.34.patch | 49 ++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/fuse-glibc-2.34.patch (limited to 'gnu/packages/linux.scm') diff --git a/gnu/local.mk b/gnu/local.mk index caf5fd68b0..247b9ec34f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1092,7 +1092,8 @@ dist_patch_DATA = \ %D%/packages/patches/freedink-engine-fix-sdl-hints.patch \ %D%/packages/patches/freeglut-gcc-compat.patch \ %D%/packages/patches/freeimage-unbundle.patch \ - %D%/packages/patches/fuse-overlapping-headers.patch \ + %D%/packages/patches/fuse-glibc-2.34.patch \ + %D%/packages/patches/fuse-overlapping-headers.patch \ %D%/packages/patches/fxdiv-system-libraries.patch \ %D%/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch \ %D%/packages/patches/ganeti-disable-version-symlinks.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b868991461..9bfa1951be 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3291,8 +3291,11 @@ (define-public fuse (sha256 (base32 "1ddlq6kzxilccgbvxjfx80jx6kamgw4sv49phks2zhlcc1frvrnh")) - (patches (search-patches "fuse-overlapping-headers.patch")))) + (patches (search-patches "fuse-overlapping-headers.patch" + "fuse-glibc-2.34.patch")))) (build-system gnu-build-system) + (native-inputs + (list autoconf automake gettext-minimal libtool)) (inputs (list bash-minimal util-linux)) (arguments @@ -3309,6 +3312,10 @@ (define-public fuse "/lib/udev/rules.d")) #:phases (modify-phases %standard-phases + (add-before 'bootstrap 'force-bootstrap + (lambda _ + ;; Force a bootstrap to make the patch changes effective. + (delete-file "configure"))) (add-before 'build 'set-file-names (lambda* (#:key inputs #:allow-other-keys) ;; libfuse calls out to mount(8) and umount(8). Make sure diff --git a/gnu/packages/patches/fuse-glibc-2.34.patch b/gnu/packages/patches/fuse-glibc-2.34.patch new file mode 100644 index 0000000000..5f973e2491 --- /dev/null +++ b/gnu/packages/patches/fuse-glibc-2.34.patch @@ -0,0 +1,49 @@ +Don't redefine 'closefrom' if available through glibc. + +Shamelessly stolen from Gentoo: + + https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-fs/fuse/files/fuse-2.9.9-closefrom-glibc-2-34.patch + +diff --git a/configure.ac b/configure.ac +index 9946a0efa..a2d481aa9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -55,6 +55,7 @@ fi + + AC_CHECK_FUNCS([fork setxattr fdatasync splice vmsplice utimensat]) + AC_CHECK_FUNCS([posix_fallocate]) ++AC_CHECK_FUNCS([closefrom]) + AC_CHECK_MEMBERS([struct stat.st_atim]) + AC_CHECK_MEMBERS([struct stat.st_atimespec]) + +diff --git a/util/ulockmgr_server.c b/util/ulockmgr_server.c +index 273c7d923..a04dac5c6 100644 +--- a/util/ulockmgr_server.c ++++ b/util/ulockmgr_server.c +@@ -22,6 +22,10 @@ + #include + #include + ++#ifdef HAVE_CONFIG_H ++ #include "config.h" ++#endif ++ + struct message { + unsigned intr : 1; + unsigned nofd : 1; +@@ -124,6 +128,7 @@ static int receive_message(int sock, void *buf, size_t buflen, int *fdp, + return res; + } + ++#if !defined(HAVE_CLOSEFROM) + static int closefrom(int minfd) + { + DIR *dir = opendir("/proc/self/fd"); +@@ -141,6 +146,7 @@ static int closefrom(int minfd) + } + return 0; + } ++#endif + + static void send_reply(int cfd, struct message *msg) + { -- cgit v1.2.3 From b611761bfcc9d603fba8147ae6bf9a61bb871a4a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 11 Aug 2022 00:31:18 +0200 Subject: gnu: strace: Add release-monitoring-url. * gnu/packages/linux.scm (strace)[properties]: New field. --- gnu/packages/linux.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9bfa1951be..3b886e38b1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2417,6 +2417,8 @@ (define-public strace (description "strace is a system call tracer, i.e. a debugging tool which prints out a trace of all the system calls made by a another process/program.") + (properties + '((release-monitoring-url . "https://github.com/strace/strace/releases"))) (license license:lgpl2.1+))) (define-public ltrace -- cgit v1.2.3 From e24f367f50f7a7e19ccc85d7f65ed57b1d464453 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 11 Aug 2022 00:31:42 +0200 Subject: gnu: strace: Update to 5.18. * gnu/packages/linux.scm (strace): Update to 5.18. --- 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 3b886e38b1..d7d373a92f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2379,7 +2379,7 @@ (define-public zerofree (define-public strace (package (name "strace") - (version "5.15") + (version "5.18") (home-page "https://strace.io") (source (origin (method url-fetch) @@ -2387,7 +2387,7 @@ (define-public strace "/strace-" version ".tar.xz")) (sha256 (base32 - "1p3jipp6mj5fwfcjdnp6xhxk84z07jy5qhjlqr6jjdbk54pw5jpb")) + "11qi7pdm0ldycsg9qhsa50icm219mmvy16yw1ih3s9f9kakkwab0")) (patches (search-patches "strace-readlink-tests.patch")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 246e8e7f818b43d759da2c6b31de35111a5e1ba1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 11 Aug 2022 19:04:59 +0200 Subject: gnu: ntfs-3g: Add release-monitoring-url and upstream-name. * gnu/packages/linux.scm (ntfs-3g)[properties]: New field. --- gnu/packages/linux.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d7d373a92f..cf2cbc7745 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -6183,6 +6183,9 @@ (define-public ntfs-3g "NTFS-3G provides read-write access to NTFS file systems, which are commonly found on Microsoft Windows. It is implemented as a FUSE file system. The package provides additional NTFS tools.") + (properties + '((release-monitoring-url . "https://github.com/tuxera/ntfs-3g/releases") + (upstream-name . "ntfs-3g_ntfsprogs"))) (license license:gpl2+))) (define-public ntfs-3g/static -- cgit v1.2.3 From 99b73f60415b282f2be39134f385cbda4840c336 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 11 Aug 2022 19:05:49 +0200 Subject: gnu: ntfs-3g: Update to 2022.5.17. * gnu/packages/linux.scm (ntfs-3g): Update to 2022.5.17. --- 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 cf2cbc7745..cc961b1e9b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -6137,14 +6137,14 @@ (define-public turbostat (define-public ntfs-3g (package (name "ntfs-3g") - (version "2021.8.22") + (version "2022.5.17") (source (origin (method url-fetch) (uri (string-append "https://tuxera.com/opensource/" "ntfs-3g_ntfsprogs-" version ".tgz")) (sha256 (base32 - "1yrf42xr92qv3pads8lzp5nyssz6875ncfgg8v3jwjyr0nm87f2m")) + "14zbsl7m32f796dkr334zbkj5rba7xa8smxb2ysf3095jyvgp284")) (modules '((guix build utils))) (snippet '(begin ;; Install under $prefix. -- cgit v1.2.3