From a6f6102e1bd6b9193d83bd0480ef8498c4327ece Mon Sep 17 00:00:00 2001 From: Yelninei Date: Fri, 17 Oct 2025 11:28:39 +0000 Subject: [PATCH] gnu: hurd: Update to 0.9.git20250801. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/commencement.scm (hurd-headers-boot0): Update to 0.9.git20250801. * gnu/packages/hurd.scm (hurd-headers): Same. (hurd): Remove hurd-socket-activation.patch. * gnu/packages/patches/hurd-socket-activation.patch: Remove patch. * gnu/local.mk (dist_patch_DATA): Deregister it. * gnu/packages/patches/hurd-rumpdisk-no-hd.patch: Update patch. Change-Id: I88f94a940c49a4d938e1e21e13df9815204d5d22 Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 - gnu/packages/commencement.scm | 6 +-- gnu/packages/hurd.scm | 9 ++-- .../patches/hurd-rumpdisk-no-hd.patch | 4 +- .../patches/hurd-socket-activation.patch | 44 ------------------- 5 files changed, 9 insertions(+), 55 deletions(-) delete mode 100644 gnu/packages/patches/hurd-socket-activation.patch diff --git a/gnu/local.mk b/gnu/local.mk index f346f7ede6afe0aa4ad3df0afb09c8f9593bc224..ec0efb1a0a9ee767417d9837f78a00e984ccf662 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1584,7 +1584,6 @@ dist_patch_DATA = \ %D%/packages/patches/hugs-fix-build.patch \ %D%/packages/patches/hurd-refcounts-assert.patch \ %D%/packages/patches/hurd-rumpdisk-no-hd.patch \ - %D%/packages/patches/hurd-socket-activation.patch \ %D%/packages/patches/hurd-startup.patch \ %D%/packages/patches/hwloc-1-test-btrfs.patch \ %D%/packages/patches/i7z-gcc-10.patch \ diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 90935419b33e1c6c391ce79efc5043b0c2982b63..4924f3765cac1dd423c6ac5b4bed67d1d8693175 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2787,7 +2787,7 @@ memoized as a function of '%current-system'." (package (inherit hurd-headers) (name "hurd-headers-boot0") - (version "0.9.git20250420") + (version "0.9.git20250801") (source (origin (inherit (package-source hurd-headers)) @@ -2797,10 +2797,10 @@ memoized as a function of '%current-system'." (method url-fetch) (uri (string-append "https://git.savannah.gnu.org/cgit/hurd/hurd.git/snapshot/" - "hurd-v" version ".tar.gz")) + "hurd-" version ".tar.gz")) (sha256 (base32 - "14ldrijzgqkvnii873vjlsmrjr3kvs1aksyc5b4ha8anlnnvdkg1"))))))) + "153pb6spa8dzrkl863d9y1nja4yqa3wr9g4c3gb5jrmzqf6vpj79"))))))) (native-inputs (list autoconf-boot0 automake-boot0 mig-boot0)) (inputs '())))) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 48decc78c71e866a2e7160515ce5c4653955492e..b9017953408c1aa39a132054121358d9787bcbb4 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -132,8 +132,8 @@ communication.") (license gpl2+))) (define-public hurd-headers - (let ((revision "4") - (commit "v0.9.git20250420")) + (let ((revision "5") + (commit "v0.9.git20250801")) (package (name "hurd-headers") (version (string-drop commit 1)) @@ -144,7 +144,7 @@ communication.") (commit commit))) (sha256 (base32 - "09z9gj1z11wswmxy7jdzrbjmlplpy0fpbc6gaj09hh34j4y6yr91")) + "0k15zmrwdbmm62m0vy8pnkx18pyh2pj23gbrhrki37gkv73mijk9")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs @@ -343,8 +343,7 @@ Hurd-minimal package which are needed for both glibc and GCC.") (inherit (package-source hurd-headers)) (patches (search-patches "hurd-refcounts-assert.patch" "hurd-rumpdisk-no-hd.patch" - "hurd-startup.patch" - "hurd-socket-activation.patch")))) + "hurd-startup.patch")))) (version (package-version hurd-headers)) (arguments `(#:tests? #f ;no "check" target diff --git a/gnu/packages/patches/hurd-rumpdisk-no-hd.patch b/gnu/packages/patches/hurd-rumpdisk-no-hd.patch index 4e5d41917da48dd8a83cae24168da8b7cc9137bf..a16ea86551e4d96dcd6b8539eeaca7c7f78efc6b 100644 --- a/gnu/packages/patches/hurd-rumpdisk-no-hd.patch +++ b/gnu/packages/patches/hurd-rumpdisk-no-hd.patch @@ -2,16 +2,16 @@ This avoids rumpdisk crash when booting without "noide". Upstream status: Taken from Debian Salsa package git - https://salsa.debian.org/hurd-team/hurd/-/blob/f40ff84260b5a98bea949013415a1c92c127a43e/debian/patches/rumpdisk-no-hd + https://salsa.debian.org/hurd-team/hurd/-/blob/92e68a490628d8659987e3358a28f9020106e0ed/debian/patches/rumpdisk-no-hd Index: hurd-debian/rumpdisk/block-rump.c =================================================================== --- hurd-debian.orig/rumpdisk/block-rump.c +++ hurd-debian/rumpdisk/block-rump.c @@ -143,7 +143,6 @@ rumpdisk_device_init (void) - { device_t device; + #ifdef _RUMP_SATA -#if 0 if (! device_open (device_master, D_READ, "hd0", &device) || ! device_open (device_master, D_READ, "hd1", &device) diff --git a/gnu/packages/patches/hurd-socket-activation.patch b/gnu/packages/patches/hurd-socket-activation.patch deleted file mode 100644 index e204a90d3aad598bfaa3f45b6226b4da05d74528..0000000000000000000000000000000000000000 --- a/gnu/packages/patches/hurd-socket-activation.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 029ab7d7b38c76ba14c24fcbf526ccef29af9e88 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= -Date: Thu, 8 May 2025 23:11:36 +0200 -Subject: pflocal: Do not inherit PFLOCAL_SOCK_NONBLOCK across connect/accept. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Previously, ‘accept’ would return an O_NONBLOCK socket if the listening -socket was O_NONBLOCK at the time the connection was made. With this -change, ‘accept’ always returns a socket where O_NONBLOCK is cleared. ---- - pflocal/sock.c | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/pflocal/sock.c b/pflocal/sock.c -index 90c618e..6bc061d 100644 ---- a/pflocal/sock.c -+++ b/pflocal/sock.c -@@ -1,6 +1,6 @@ - /* Sock functions - -- Copyright (C) 1995,96,2000,01,02, 2005 Free Software Foundation, Inc. -+ Copyright (C) 1995,96,2000,01,02, 2005, 2025 Free Software Foundation, Inc. - Written by Miles Bader - - This program is free software; you can redistribute it and/or -@@ -167,8 +167,11 @@ sock_clone (struct sock *template, struct sock **sock) - if (err) - return err; - -- /* Copy some properties from TEMPLATE. */ -- (*sock)->flags = template->flags & ~PFLOCAL_SOCK_CONNECTED; -+ /* Copy some properties from TEMPLATE. Clear O_NONBLOCK because the socket -+ returned by 'accept' must not inherit O_NONBLOCK from the parent -+ socket. */ -+ (*sock)->flags = -+ template->flags & ~(PFLOCAL_SOCK_CONNECTED | PFLOCAL_SOCK_NONBLOCK); - - return 0; - } --- -cgit v1.1 -