From 72fbea3fef404cde578bee9bca04da839c6a18d6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 8 Oct 2019 20:33:01 +0200 Subject: gnu: bluez: Update to 5.51. * gnu/packages/linux.scm (bluez): Update to 5.51. --- 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 e4abeadaa0..1d293c8239 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3737,7 +3737,7 @@ (define-public sbc (define-public bluez (package (name "bluez") - (version "5.50") + (version "5.51") (source (origin (method url-fetch) (uri (string-append @@ -3745,7 +3745,7 @@ (define-public bluez version ".tar.xz")) (sha256 (base32 - "048r91vx9gs5nwwbah2s0xig04nwk14c5s0vb7qmaqdvighsmz2z")))) + "1fpbsl9kkfq6mn6n0dg4h0il4c7fzhwhn79gh907k5b2kwszpvgb")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 From 8459cf5756c8cfaa6adb40b3f0b77f018179efa7 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 16 Nov 2019 11:38:37 -0500 Subject: gnu: linux-libre@4.4: Update to 4.4.202. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.202. (linux-libre-4.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 1962b961e7..47577451c9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -384,10 +384,10 @@ (define-public linux-libre-4.9-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.201") +(define-public linux-libre-4.4-version "4.4.202") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "120kci4kmc48zcw16lhxmh71kaxm9ac5qxik36q3a20czg28b2m7"))) + (hash (base32 "0adrmps7izfqy0yn4440isxvigslwzk1a375r9kh86idwbmcxb7x"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From bd7df85ea445bc9081c76f65623b697c03cd90bf Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 16 Nov 2019 11:39:42 -0500 Subject: gnu: linux-libre@4.9: Update to 4.9.202. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.202. (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 47577451c9..8097cf29c5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -376,10 +376,10 @@ (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.201") +(define-public linux-libre-4.9-version "4.9.202") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "125xmh5h1zmfniidpjljny53qkl4phpxaali69i66lajscxx8grq"))) + (hash (base32 "1gsfbvsswpwj6r56ynb6mmx7dc8hp9yhi7sfr0hhii0gs4ffq241"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From 191a9a26b5d1204c32f906a4dd0b6fd4e1b38130 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 16 Nov 2019 18:14:31 +0100 Subject: gnu: linux-libre: Remove cross-libc from CROSS_CPATH. * gnu/packages/linux.scm (make-linux-libre*)[arguments]: Do not unset CROSS_CPATH completely, instead remove cross-libc from CROSS_CPATH in the same way that libc is removed from CPATH. --- gnu/packages/linux.scm | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8097cf29c5..a5b0ce455f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -679,23 +679,26 @@ (define* (make-linux-libre* version source supported-systems #t)) (replace 'configure (lambda* (#:key inputs native-inputs target #:allow-other-keys) - ;; Unset CROSS_CPATH to make sure that cross-libc is not - ;; found. Otherwise, some of its header would conflict with the - ;; one from linux (stdint.h and linux/types.h) - ,@(if (%current-target-system) - '((unsetenv "CROSS_CPATH")) - '()) - - ;; On AArch64 (at least), we need to remove glibc headers from CPATH - ;; (they are still available as "system headers"), so that the kernel - ;; can override uint64_t. See . - (setenv "CPATH" - (string-join - (remove (cut string-prefix? (assoc-ref inputs "libc") <>) - (string-split (getenv "CPATH") #\:)) - ":")) - (format #t "environment variable `CPATH' changed to `~a'~%" - (getenv "CPATH")) + ;; On AArch64 (at least), we need to remove glibc headers from + ;; CPATH (they are still available as "system headers"), so that + ;; the kernel can override uint64_t. See + ;; . This is also true when + ;; cross-compiling, except in that case, cross-libc must be + ;; removed from CROSS_CPATH. + (let ((var ,(if (%current-target-system) + "CROSS_CPATH" + "CPATH")) + (libc ,(if (%current-target-system) + "cross-libc" + "libc"))) + (setenv var + (string-join + (remove + (cut string-prefix? (assoc-ref inputs libc) <>) + (string-split (getenv var) #\:)) + ":")) + (format #t "environment variable `~a' changed to `~a'~%" + var (getenv var))) ;; Avoid introducing timestamps (setenv "KCONFIG_NOTIMESTAMP" "1") -- cgit v1.2.3 From 2484e0b3e481e2b1fcb6761d0dbf80da98089de4 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 16 Nov 2019 17:40:06 -0500 Subject: gnu: linux-libre: Update deblob scripts. * gnu/packages/linux.scm (deblob-scripts-5.3): Update to 5.3.11. (deblob-scripts-5.19): Update to 4.19.84. (deblob-scripts-4.14): Update to 4.14.154. (deblob-scripts-4.9): Update to 4.9.201. (deblob-scripts-4.4): Update to 4.4.201. --- gnu/packages/linux.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a5b0ce455f..a95280c011 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -184,31 +184,31 @@ (define (linux-libre-deblob-scripts version (define deblob-scripts-5.3 (linux-libre-deblob-scripts - "5.3.6" + "5.3.11" (base32 "15n09zq38d69y1wl28s3nasf3377qp2yil5b887zpqrm00dif7i4") - (base32 "0nrimraf46nf6y1hwkg29fyl0a83wnj0mwq54ggxvffn9gk5h9pa"))) + (base32 "1xk3gzgnl9m29avka32zkggl36sdxyvps40hr12hjy42l1ysfshm"))) (define deblob-scripts-4.19 (linux-libre-deblob-scripts - "4.19.79" + "4.19.84" (base32 "02zs405awaxydbapka4nz8h6lmnc0dahgczqsrs5s2bmzjyyqkcy") - (base32 "1fyacg28aym6virxyn7wk99qil2fjbks3iwm7p3hxy51pccn34za"))) + (base32 "1s89hmy4ihd65by2p1xxkxj476f6c9s5g9r9yvqncb50xlhilk50"))) (define deblob-scripts-4.14 (linux-libre-deblob-scripts - "4.14.149" + "4.14.154" (base32 "091jk9jkn9jf39bxpc7395bhcb7p96nkg3a8047380ki06lnfxh6") - (base32 "0x9nd3hnyrm753cbgdqmy92mbnyw86w64g4hvyibnkpq5n7s3z9n"))) + (base32 "1pcsfzpcv3bs30iyhwpk1x64r0gyv7wi22spnq6avzj1ayva10kw"))) (define deblob-scripts-4.9 (linux-libre-deblob-scripts - "4.9.196" + "4.9.201" (base32 "1wvldzlv7q2xdbadas87dh593nxr4a8p5n0f8zpm72lja6w18hmg") (base32 "0is8gn4qdd7h5l6lacvhqdch26lmrbgxfm8ab7fx8n85ha7y358w"))) (define deblob-scripts-4.4 (linux-libre-deblob-scripts - "4.4.196" + "4.4.201" (base32 "0x2j1i88am54ih2mk7gyl79g25l9zz4r08xhl482l3fvjj2irwbw") (base32 "12ac4g3ky8yma8sylmxvvysqvd4hnaqjiwmxrxb6wlxggfd7zkbx"))) -- cgit v1.2.3 From 9ad4d9f8a234de06f63513b98221287d67825c42 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 20 Nov 2019 20:38:36 -0500 Subject: gnu: linux-libre@4.14: Update to 4.14.155. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.155. (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 a95280c011..1a2530bd52 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -368,10 +368,10 @@ (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.154") +(define-public linux-libre-4.14-version "4.14.155") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "00q662s8mgnzqfgk5gkzqfv9ws3vryf28blbq1zxcy4s6wj4mpl6"))) + (hash (base32 "10g4493ldc398qza304z5yz8qdp93w7a2bs5h5dwk0bbamwikmkp"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From e9f755f0b860282d6c909d5981e79872d96d278b Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 20 Nov 2019 20:39:31 -0500 Subject: gnu: linux-libre@4.19: Update to 4.19.85. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.85. (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 1a2530bd52..a778ca7384 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -360,10 +360,10 @@ (define-public linux-libre-5.3-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.3))) -(define-public linux-libre-4.19-version "4.19.84") +(define-public linux-libre-4.19-version "4.19.85") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0q06mhz170x1lkx6c6qdh82rcnsj03q6f2m28aqhmc4wc694m2w6"))) + (hash (base32 "1dsgbys73jga5h0a9icgif6qbi31g84315zlcdid9bzf1abkbx3v"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 477246878b766edb30a780190b2cead0c4b29156 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 20 Nov 2019 20:40:14 -0500 Subject: gnu: linux-libre: Update to 5.3.12. * gnu/packages/linux.scm (linux-libre-5.3-version): Update to 5.3.12. (linux-libre-5.3-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 a778ca7384..8e094ad021 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -352,10 +352,10 @@ (define (%upstream-linux-source version hash) "linux-" version ".tar.xz")) (sha256 hash))) -(define-public linux-libre-5.3-version "5.3.11") +(define-public linux-libre-5.3-version "5.3.12") (define-public linux-libre-5.3-pristine-source (let ((version linux-libre-5.3-version) - (hash (base32 "1dxfh0l4inpjd17pyxfsskjsphs43r8lg6nhhr3y4whxdna5cwbf"))) + (hash (base32 "184pmjyqh4bkrc3vj65zn6xnljzv9d1x7c1z0hlgj6fakpwgdgsk"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.3))) -- cgit v1.2.3 From d100d5d5449eabd65e9c26081b7620a3d342c9eb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 21 Nov 2019 15:31:34 +0100 Subject: gnu: libseccomp: Update to 2.4.2. * gnu/packages/linux.scm (libseccomp): Update to 2.4.2. * gnu/packages/virtualization.scm (qemu-minimal-2.10)[inputs]: Remove "libseccomp". --- gnu/packages/linux.scm | 4 ++-- gnu/packages/virtualization.scm | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8e094ad021..f424eb0db8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4786,7 +4786,7 @@ (define-public mtd-utils (define-public libseccomp (package (name "libseccomp") - (version "2.4.1") + (version "2.4.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/seccomp/libseccomp/" @@ -4794,7 +4794,7 @@ (define-public libseccomp "/libseccomp-" version ".tar.gz")) (sha256 (base32 - "1s06h2cgk0xxwmhwj72z33bllafc1xqnxzk2yyra2rmg959778qw")))) + "0nsq81acrbkdr8zairxbwa33bj2a6126npp76b4srjl472sjfkxm")))) (build-system gnu-build-system) (native-inputs `(("which" ,which))) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 9b89517bb1..a4b94b78f6 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -300,7 +300,12 @@ (define-public qemu-minimal-2.10 ;; qemu-minimal-2.10 needs Python 2. Remove below once no longer necessary. (native-inputs `(("python-2" ,python-2) ,@(fold alist-delete (package-native-inputs qemu) - '("python-wrapper"))))))) + '("python-wrapper")))) + (inputs + (fold alist-delete (package-inputs qemu) + ;; Disable seccomp support, because it's not required for the GRUB + ;; test suite, and because it fails with libseccomp 2.4.2 and later. + '("libseccomp")))))) (define-public libosinfo (package -- cgit v1.2.3 From cf87919657bcbc422ca599007f5b111dc7807919 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 22 Nov 2019 15:12:11 +0100 Subject: gnu: libseccomp: Fix build on AArch64. This is a followup to d100d5d5449eabd65e9c26081b7620a3d342c9eb. * gnu/packages/patches/libseccomp-open-aarch64.patch: New file. * gnu/packages/linux.scm (libseccomp)[source]: Use it. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/linux.scm | 3 ++- gnu/packages/patches/libseccomp-open-aarch64.patch | 27 ++++++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libseccomp-open-aarch64.patch (limited to 'gnu/packages/linux.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 7672295e69..ba86bf3224 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1078,6 +1078,7 @@ dist_patch_DATA = \ %D%/packages/patches/libmygpo-qt-missing-qt5-modules.patch \ %D%/packages/patches/libreoffice-icu.patch \ %D%/packages/patches/libreoffice-glm.patch \ + %D%/packages/patches/libseccomp-open-aarch64.patch \ %D%/packages/patches/libsndfile-armhf-type-checks.patch \ %D%/packages/patches/libsndfile-CVE-2017-8361-8363-8365.patch \ %D%/packages/patches/libsndfile-CVE-2017-8362.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f424eb0db8..9941129ba7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4794,7 +4794,8 @@ (define-public libseccomp "/libseccomp-" version ".tar.gz")) (sha256 (base32 - "0nsq81acrbkdr8zairxbwa33bj2a6126npp76b4srjl472sjfkxm")))) + "0nsq81acrbkdr8zairxbwa33bj2a6126npp76b4srjl472sjfkxm")) + (patches (search-patches "libseccomp-open-aarch64.patch")))) (build-system gnu-build-system) (native-inputs `(("which" ,which))) diff --git a/gnu/packages/patches/libseccomp-open-aarch64.patch b/gnu/packages/patches/libseccomp-open-aarch64.patch new file mode 100644 index 0000000000..6e62825892 --- /dev/null +++ b/gnu/packages/patches/libseccomp-open-aarch64.patch @@ -0,0 +1,27 @@ +This patch fixes the build failure on AArch64 reported +at . + +From cc21c1b48d35f9d34ef2da0e184af3855bfeee5f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Wed, 20 Nov 2019 14:11:12 -0500 +Subject: [PATCH] tests: use openat instead of open + +On arm64, __NR_open is not defined, openat is always used. Let's use openat +instead, which is defined for architectures currently. +--- + tests/15-basic-resolver.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/15-basic-resolver.c b/tests/15-basic-resolver.c +index 6badef1..4884faf 100644 +--- a/tests/15-basic-resolver.c ++++ b/tests/15-basic-resolver.c +@@ -55,7 +55,7 @@ int main(int argc, char *argv[]) + unsigned int arch; + char *name = NULL; + +- if (seccomp_syscall_resolve_name("open") != __NR_open) ++ if (seccomp_syscall_resolve_name("openat") != __NR_openat) + goto fail; + if (seccomp_syscall_resolve_name("read") != __NR_read) + goto fail; -- cgit v1.2.3 From 79832fb285a6ce67469287f6b0defbf2b5a1a074 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 25 Nov 2019 01:45:42 -0500 Subject: gnu: linux-libre@4.14: Update to 4.14.156. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.156. (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 9941129ba7..5fff866f1d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -368,10 +368,10 @@ (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.155") +(define-public linux-libre-4.14-version "4.14.156") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "10g4493ldc398qza304z5yz8qdp93w7a2bs5h5dwk0bbamwikmkp"))) + (hash (base32 "1h47fxfbq0d5ry7j3jxz45v5c4103qncgm2vydpz6zdx1kmrz27q"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From 6c693a6e3f0516475351954a29149ed2b10e3664 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 25 Nov 2019 01:46:15 -0500 Subject: gnu: linux-libre@4.19: Update to 4.19.86. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.86. (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 5fff866f1d..386b47233b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -360,10 +360,10 @@ (define-public linux-libre-5.3-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.3))) -(define-public linux-libre-4.19-version "4.19.85") +(define-public linux-libre-4.19-version "4.19.86") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "1dsgbys73jga5h0a9icgif6qbi31g84315zlcdid9bzf1abkbx3v"))) + (hash (base32 "1xmzcxsiydym574y7k313qd8s4c3mdahpb3nx3cingfl36ivnb5z"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 5d297ca6760d62f1287c9d6f4729ce3352752df8 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 25 Nov 2019 01:47:07 -0500 Subject: gnu: linux-libre: Update to 5.3.13. * gnu/packages/linux.scm (linux-libre-5.3-version): Update to 5.3.13. (linux-libre-5.3-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 386b47233b..49be57c3bc 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -352,10 +352,10 @@ (define (%upstream-linux-source version hash) "linux-" version ".tar.xz")) (sha256 hash))) -(define-public linux-libre-5.3-version "5.3.12") +(define-public linux-libre-5.3-version "5.3.13") (define-public linux-libre-5.3-pristine-source (let ((version linux-libre-5.3-version) - (hash (base32 "184pmjyqh4bkrc3vj65zn6xnljzv9d1x7c1z0hlgj6fakpwgdgsk"))) + (hash (base32 "0by9lmgmllf19yflzm9f24cy9glcq6m73ywm25bddsnh0czya14z"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.3))) -- cgit v1.2.3 From 93cae7458ae2b3e42538cfb6399e7abd53d70a08 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 26 Nov 2019 14:37:01 -0500 Subject: gnu: linux-libre@4.4: Update to 4.4.203. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.203. (linux-libre-4.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 49be57c3bc..58a6c5e499 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -384,10 +384,10 @@ (define-public linux-libre-4.9-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.202") +(define-public linux-libre-4.4-version "4.4.203") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "0adrmps7izfqy0yn4440isxvigslwzk1a375r9kh86idwbmcxb7x"))) + (hash (base32 "02krniihix9mb9bc0ffs03q4i9grjhwymnfp10h1r6gmxa554qlj"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From 778ae9f980c74d6b093eaae68ca5ee2be5f2ca8a Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 26 Nov 2019 14:38:02 -0500 Subject: gnu: linux-libre@4.9: Update to 4.9.203. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.203. (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 58a6c5e499..457f6579a8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -376,10 +376,10 @@ (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.202") +(define-public linux-libre-4.9-version "4.9.203") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "1gsfbvsswpwj6r56ynb6mmx7dc8hp9yhi7sfr0hhii0gs4ffq241"))) + (hash (base32 "0jd8n8y3yf59sgfjhgjxsznxng7s4b30x5vdb48wrpgqmz7m1n8w"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From d8f8adfebf2c4040b7c04ff5e158ec664b92c268 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 28 Nov 2019 18:17:14 +0100 Subject: gnu: psm: Disable memory statistics code. * gnu/packages/patches/psm-disable-memory-stats.patch: New file. * gnu/packages/linux.scm (psm)[source]: Use it. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/linux.scm | 3 +- .../patches/psm-disable-memory-stats.patch | 62 ++++++++++++++++++++++ 3 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/psm-disable-memory-stats.patch (limited to 'gnu/packages/linux.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 3f2e9f265f..a49c9109ab 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1259,6 +1259,7 @@ dist_patch_DATA = \ %D%/packages/patches/procmail-CVE-2017-16844.patch \ %D%/packages/patches/proot-test-fhs.patch \ %D%/packages/patches/psm-arch.patch \ + %D%/packages/patches/psm-disable-memory-stats.patch \ %D%/packages/patches/psm-ldflags.patch \ %D%/packages/patches/psm-repro.patch \ %D%/packages/patches/pugixml-versioned-libdir.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 457f6579a8..a5564d9a90 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5539,7 +5539,8 @@ (define-public psm (patches (search-patches "psm-arch.patch" ; uname -p returns "unknown" on Debian 9 "psm-ldflags.patch" ; build shared lib with LDFLAGS - "psm-repro.patch")))) ; reproducibility + "psm-repro.patch" ; reproducibility + "psm-disable-memory-stats.patch")))) (build-system gnu-build-system) (outputs '("out" "debug")) (inputs `(("libuuid" ,util-linux))) diff --git a/gnu/packages/patches/psm-disable-memory-stats.patch b/gnu/packages/patches/psm-disable-memory-stats.patch new file mode 100644 index 0000000000..52cd88a4e1 --- /dev/null +++ b/gnu/packages/patches/psm-disable-memory-stats.patch @@ -0,0 +1,62 @@ +The memory statistics code leads to segfaults during initialization (on +machines with InfiniPath networking): + + (gdb) bt full + #0 ips_ptl_init (ep=0x1fc6af8, ptl=0x1fc6f88, ctl=0x1fc6d78) at ptl.c:224 + err = PSM_OK + num_of_send_bufs = 1024 + num_of_send_desc = 4096 + imm_size = 128 + context = 0x1fc6b70 + user_info = 0x1fc6b90 + enable_shcontexts = 0 + current_count = + #1 0x00007fb2aa672abf in __psm_ep_open_internal ( + unique_job_key=unique_job_key@entry=0x7ffed1ee5800 "<\207\020#5\271\267\200\354x\242e8\364zo", + devid_enabled=devid_enabled@entry=0x7ffed1ee5724, opts_i=opts_i@entry=0x7ffed1ee5810, mq=, + epo=epo@entry=0x7ffed1ee5710, epido=epido@entry=0x7ffed1ee5708) at psm_ep.c:929 + ep = 0x1fc6af8 + num_units = 1 + len = + err = + epaddr = 0x1e9dd78 + buf = "miriel044:2.0.", '\000' + p = + e = + old_cpuaff = 0x0 + old_unit = 0x0 + yield_cnt = {e_void = 0xfa, e_str = 0xfa , e_int = 250, + e_uint = 250, e_long = 250, e_ulong = 250, e_ulonglong = 250} + no_cpuaff = {e_void = 0x0, e_str = 0x0, e_int = 0, e_uint = 0, e_long = 0, e_ulong = 0, e_ulonglong = 0} + env_unit_id = {e_void = 0xffffffffffffffff, + e_str = 0xffffffffffffffff , e_int = -1, + e_uint = 4294967295, e_long = -1, e_ulong = 18446744073709551615, e_ulonglong = 18446744073709551615} + env_port_id = {e_void = 0x0, e_str = 0x0, e_int = 0, e_uint = 0, e_long = 0, e_ulong = 0, e_ulonglong = 0} + env_sl = {e_void = 0x0, e_str = 0x0, e_int = 0, e_uint = 0, e_long = 0, e_ulong = 0, e_ulonglong = 0} + ptl_sizes = + default_cpuaff = + opts = {timeout = 180000000000, unit = -1, affinity = 0, shm_mbytes = 10, sendbufs_num = 1024, + network_pkey = 65535, port = 0, outsl = 0, service_id = 1152940698815692800, + path_res_type = PSM_PATH_RES_NONE, senddesc_num = 4096, imm_size = 128} + amsh_ptl = 0x1fc6e48 + ips_ptl = 0x1fc6f88 + self_ptl = 0x1fc99c8 + i = 3 + +It looks like ptl.c:24 is writing past the region that was malloc'd. + +Turning stats off solves the problem. + +diff --git a/psm_utils.c b/psm_utils.c +index c8651fe..5514921 100644 +--- a/psm_utils.c ++++ b/psm_utils.c +@@ -1058,7 +1058,7 @@ psmi_log_memstats(psmi_memtype_t type, int64_t nbytes) + return; + } + +-#define psmi_stats_mask PSMI_STATSTYPE_MEMORY ++#define psmi_stats_mask 0 + + #ifdef malloc + #undef malloc -- cgit v1.2.3 From d79db39dec0e50720843d33d561c4606e72eb7a6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 29 Nov 2019 00:21:05 +0200 Subject: gnu: iotop: Build with python3. * gnu/packages/linux.scm (iotop)[native-inputs]: Remove python-2, add python. [arguments]: Add phase to fix python3 compatibility. --- gnu/packages/linux.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a5564d9a90..d4624d1218 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2160,11 +2160,16 @@ (define-public iotop "1kp8mqg2pbxq4xzpianypadfxcsyfgwcaqgqia6h9fsq6zyh4z0s")))) (build-system python-build-system) (arguments - ;; The setup.py script expects python-2. - `(#:python ,python-2 + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-build-with-python3 + (lambda _ + (substitute* "setup.py" + (("itervalues") "values")) + #t))) ;; There are currently no checks in the package. #:tests? #f)) - (native-inputs `(("python" ,python-2))) + (native-inputs `(("python" ,python))) (home-page "http://guichaz.free.fr/iotop/") (synopsis "Displays the IO activity of running processes") -- cgit v1.2.3 From 0202bdc639f1367e38f6c294b0c99a421856ebf8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 29 Nov 2019 00:27:10 +0200 Subject: gnu: crda: Build without python. * gnu/packages/linux.scm (crda)[native-inputs]: Remove python-2. --- gnu/packages/linux.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages/linux.scm') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d4624d1218..6149fa53ac 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2887,7 +2887,6 @@ (define-public crda (string-append "REG_BIN=" regdb "/lib/crda/regulatory.bin"))))) (native-inputs `(("pkg-config" ,pkg-config) - ("python" ,python-2) ("wireless-regdb" ,wireless-regdb))) (inputs `(("libnl" ,libnl))) (home-page -- cgit v1.2.3 From aa56ca3dd01b1767fecad45091cbd9fa75dbd7ec Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 30 Nov 2019 00:58:36 -0500 Subject: gnu: linux-libre@4.4: Update to 4.4.205. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.205. (linux-libre-4.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 6149fa53ac..7f5d8ce894 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -384,10 +384,10 @@ (define-public linux-libre-4.9-pristine-source (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.203") +(define-public linux-libre-4.4-version "4.4.205") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "02krniihix9mb9bc0ffs03q4i9grjhwymnfp10h1r6gmxa554qlj"))) + (hash (base32 "19pasidvfmf94rs86v80x7hpirz9gavmkxwcl76ya61fq7lqy7zs"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From 45f810214b0f807681a05c37e830e5092c6cd648 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 30 Nov 2019 00:59:47 -0500 Subject: gnu: linux-libre@4.9: Update to 4.9.205. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.205. (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 7f5d8ce894..2b93178dc9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -376,10 +376,10 @@ (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.203") +(define-public linux-libre-4.9-version "4.9.205") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "0jd8n8y3yf59sgfjhgjxsznxng7s4b30x5vdb48wrpgqmz7m1n8w"))) + (hash (base32 "01cbqxw77g6rdg7dgk73pg9a2n9v4sxp48q2a77w1b068xjfifcq"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From a651323813b5bd46e0b6ac6b9ce28b05e5489e98 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 30 Nov 2019 01:00:24 -0500 Subject: gnu: linux-libre: Update to 5.3.14. * gnu/packages/linux.scm (linux-libre-5.3-version): Update to 5.3.14. (linux-libre-5.3-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 2b93178dc9..17aa61a4bb 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -352,10 +352,10 @@ (define (%upstream-linux-source version hash) "linux-" version ".tar.xz")) (sha256 hash))) -(define-public linux-libre-5.3-version "5.3.13") +(define-public linux-libre-5.3-version "5.3.14") (define-public linux-libre-5.3-pristine-source (let ((version linux-libre-5.3-version) - (hash (base32 "0by9lmgmllf19yflzm9f24cy9glcq6m73ywm25bddsnh0czya14z"))) + (hash (base32 "0ckrbzwsc4lxd3l287wsd88mkfsd0kpf8nzchd9nfmkjiil14mwm"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.3))) -- cgit v1.2.3 From d2119ddffb8ac4a7bdff50fb950a8170cc6ea1f2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 30 Nov 2019 23:21:22 +0100 Subject: gnu: f2fs-tools: Update to 1.13.0. * gnu/packages/linux.scm (f2fs-tools): Update to 1.13.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 17aa61a4bb..a895fa7e7c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4094,7 +4094,7 @@ (define-public f2fs-tools (package (inherit f2fs-tools-1.7) (name "f2fs-tools") - (version "1.12.0") + (version "1.13.0") (source (origin (method url-fetch) (uri (string-append @@ -4102,7 +4102,7 @@ (define-public f2fs-tools "/f2fs-tools.git/snapshot/f2fs-tools-" version ".tar.gz")) (sha256 (base32 - "15pn2fm9knn7p1vzfzy6msnrdl14p6y1gn4m2ka6ba5bzx6lw4p2")))) + "0z9c0y3qq75iyqknl5k0v7v46l8c3pcifpqb0yqalrs24blkm7dk")))) (inputs `(("libuuid" ,util-linux))))) -- cgit v1.2.3 From eac9ddfaf37c392a003ce35d8a6955764bcf147a Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 1 Dec 2019 20:49:20 -0500 Subject: gnu: linux-libre@4.14: Update to 4.14.157. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.157. (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 a895fa7e7c..e92039f732 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -368,10 +368,10 @@ (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.156") +(define-public linux-libre-4.14-version "4.14.157") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "1h47fxfbq0d5ry7j3jxz45v5c4103qncgm2vydpz6zdx1kmrz27q"))) + (hash (base32 "0cvpagbjwpj63lpybfq1rnwdnxcjw49z0b5prah39krf0nd7dylh"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From b3cea86ac853c509f0c42e5ae88d03ba06dae5f3 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 1 Dec 2019 20:50:28 -0500 Subject: gnu: linux-libre@4.19: Update to 4.19.87. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.87. (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 e92039f732..3c3f57773c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -360,10 +360,10 @@ (define-public linux-libre-5.3-pristine-source (%upstream-linux-source version hash) deblob-scripts-5.3))) -(define-public linux-libre-4.19-version "4.19.86") +(define-public linux-libre-4.19-version "4.19.87") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "1xmzcxsiydym574y7k313qd8s4c3mdahpb3nx3cingfl36ivnb5z"))) + (hash (base32 "07fsds2k0hxqgny86winzl46d79g6mb9s28bp7nwlvwf67l22wm5"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 378506a964abdc591bb4edba0620b2ce2a07d5ce Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 2 Dec 2019 23:37:46 +0100 Subject: gnu: sysstat: Update to 12.2.0. * gnu/packages/linux.scm (sysstat): Update to 12.2.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 3c3f57773c..2d206ebaa1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4945,14 +4945,14 @@ (define-public efibootmgr (define-public sysstat (package (name "sysstat") - (version "12.1.6") + (version "12.2.0") (source (origin (method url-fetch) (uri (string-append "http://pagesperso-orange.fr/sebastien.godard/" "sysstat-" version ".tar.xz")) (sha256 (base32 - "0agi17n82k363mf9f7cky3isq195hw112vs98v26yfhm0v2g6lpp")))) + "0xc3983ccr0dwab1px2jhbgj86pfmmr29k7ggnwjwm1qigmriak1")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; No test suite. -- cgit v1.2.3 From 252f44ffd951f383b929d4d84d596ca48715ed5a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 4 Dec 2019 04:54:30 +0100 Subject: gnu: procenv: Update to 0.51. * gnu/packages/linux.scm (procenv): Update to 0.51. --- 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 57add5317a..9b80ba691e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5470,7 +5470,7 @@ (define-public jmtpfs (define-public procenv (package (name "procenv") - (version "0.50") + (version "0.51") (source (origin (method url-fetch) @@ -5478,7 +5478,7 @@ (define-public procenv version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0dvscyf47i3j5ay0amncqmqw9kd916689r2pqdvpnsrhp6j46zp1")))) + (base32 "1javw97yw0qvjmj14js8vw6nsfyf2xc0kfiyq5f2hsp0553w2cdq")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-silent-rules"))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3