guix_mirror_bot pushed a commit to branch hurd-team
in repository guix.
commit 40f3d0bb49ec6e3ce174b0a781cdb55ad8c10a9b
Author: Janneke Nieuwenhuizen <[email protected]>
AuthorDate: Sun Mar 1 12:18:24 2026 +0100
gnu: hurd: Update to 0.9.git20251029-0.6290b4c.
* gnu/packages/patches/hurd-crash-x86_64.patch,
gnu/packages/patches/hurd-proc-zombies.patch,
gnu/packages/patches/hurd-streamio-select.patch: Remove files.
* gnu/local.mk (dist_patch_DATA): Unregister them.
* gnu/packages/hurd.scm (hurd-headers): Remove them; update to
0.9.git20251029-0.6290b4c.
Change-Id: I951130ad373f9d323bfdfc5d18aab5584bb51a16
---
gnu/local.mk | 3 -
gnu/packages/hurd.scm | 119 ++++++++++++------------
gnu/packages/patches/hurd-crash-x86_64.patch | 30 ------
gnu/packages/patches/hurd-proc-zombies.patch | 28 ------
gnu/packages/patches/hurd-streamio-select.patch | 88 ------------------
5 files changed, 59 insertions(+), 209 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 701164b1e6..9bd069c45d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1604,12 +1604,9 @@ dist_patch_DATA =
\
%D%/packages/patches/hubbub-sort-entities.patch \
%D%/packages/patches/hueplusplus-mbedtls.patch \
%D%/packages/patches/hugs-fix-build.patch \
- %D%/packages/patches/hurd-crash-x86_64.patch \
%D%/packages/patches/hurd-refcounts-assert.patch \
%D%/packages/patches/hurd-rumpdisk-no-hd.patch \
%D%/packages/patches/hurd-startup.patch \
- %D%/packages/patches/hurd-streamio-select.patch \
- %D%/packages/patches/hurd-proc-zombies.patch \
%D%/packages/patches/hwloc-1-test-btrfs.patch \
%D%/packages/patches/i3lock-blur-fix-build-on-gcc-10.patch \
%D%/packages/patches/i7z-gcc-10.patch \
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 652cdeed58..35d13c80aa 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -134,65 +134,67 @@ communication.")
(license gpl2+))))
(define-public hurd-headers
- (package
- (name "hurd-headers")
- (version "0.9.git20251029")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://git.savannah.gnu.org/git/hurd/hurd.git";)
- (commit (string-append "v" version))))
- (sha256
- (base32
- "09pi6ci375ivbjvxlgdqp6vpm47arfvlh325sr2a5dmwxhs9pnp9"))
- (file-name (git-file-name name version))))
- (build-system gnu-build-system)
- (native-inputs
- (list autoconf
- automake
- (if (%current-target-system)
- (cross-mig (%current-target-system))
- mig)))
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (replace 'install
- (lambda _
- (invoke "make" "install-headers" "no_deps=t")))
- (delete 'build))
+ (let ((commit "6290b4cf92963f64ffa447cdaba099812c80fbfb")
+ (revision "0"))
+ (package
+ (name "hurd-headers")
+ (version (git-version "0.9.git20251029" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.savannah.gnu.org/git/hurd/hurd.git";)
+ (commit commit)))
+ (sha256
+ (base32
+ "0lkmxw2016isb80k8pjjr64il6irgwsqgd3634f79bry2fabhbdj"))
+ (file-name (git-file-name name version))))
+ (build-system gnu-build-system)
+ (native-inputs
+ (list autoconf
+ automake
+ (if (%current-target-system)
+ (cross-mig (%current-target-system))
+ mig)))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (replace 'install
+ (lambda _
+ (invoke "make" "install-headers" "no_deps=t")))
+ (delete 'build))
- #:configure-flags '( ;; Reduce set of dependencies.
- "--without-parted"
- "--disable-ncursesw"
- "--disable-test"
- "--without-libbz2"
- "--without-libcrypt"
- "--without-libz"
- "--without-rump"
- ;; Skip the clnt_create check because it expects
- ;; a working glibc causing a circular dependency.
- "ac_cv_search_clnt_create=no"
+ #:configure-flags '( ;; Reduce set of dependencies.
+ "--without-parted"
+ "--disable-ncursesw"
+ "--disable-test"
+ "--without-libbz2"
+ "--without-libcrypt"
+ "--without-libz"
+ "--without-rump"
+ ;; Skip the clnt_create check because it expects
+ ;; a working glibc causing a circular dependency.
+ "ac_cv_search_clnt_create=no"
- ;; Annihilate the checks for the 'file_exec_paths'
- ;; & co. libc functions to avoid "link tests are
- ;; not allowed after AC_NO_EXECUTABLES" error.
- "ac_cv_func_file_exec_paths=no"
- "ac_cv_func_exec_exec_paths=no"
- "ac_cv_func__hurd_exec_paths=no"
- "ac_cv_func__hurd_libc_proc_init=no"
- "ac_cv_func_mach_port_set_ktype=no"
- "ac_cv_func_file_futimens=no"
- "ac_cv_func_file_utimens=no"
- "ac_cv_lib_acpica_acpi_init=no")
+ ;; Annihilate the checks for the 'file_exec_paths'
+ ;; & co. libc functions to avoid "link tests are
+ ;; not allowed after AC_NO_EXECUTABLES" error.
+ "ac_cv_func_file_exec_paths=no"
+ "ac_cv_func_exec_exec_paths=no"
+ "ac_cv_func__hurd_exec_paths=no"
+ "ac_cv_func__hurd_libc_proc_init=no"
+ "ac_cv_func_mach_port_set_ktype=no"
+ "ac_cv_func_file_futimens=no"
+ "ac_cv_func_file_utimens=no"
+ "ac_cv_lib_acpica_acpi_init=no")
- #:tests? #f))
- (supported-systems %hurd-systems)
- (home-page "https://www.gnu.org/software/hurd/hurd.html";)
- (synopsis "GNU Hurd headers")
- (description
- "This package provides C headers of the GNU Hurd, used to build the GNU C
+ #:tests? #f))
+ (supported-systems %hurd-systems)
+ (home-page "https://www.gnu.org/software/hurd/hurd.html";)
+ (synopsis "GNU Hurd headers")
+ (description
+ "This package provides C headers of the GNU Hurd, used to build the GNU
C
Library and other user programs.")
- (license gpl2+)))
+ (license gpl2+))))
(define-public hurd-minimal
(package (inherit hurd-headers)
@@ -337,12 +339,9 @@ Hurd-minimal package which are needed for both glibc and
GCC.")
(name "hurd")
(source (origin
(inherit (package-source hurd-headers))
- (patches (search-patches "hurd-crash-x86_64.patch"
- "hurd-refcounts-assert.patch"
+ (patches (search-patches "hurd-refcounts-assert.patch"
"hurd-rumpdisk-no-hd.patch"
- "hurd-startup.patch"
- "hurd-streamio-select.patch"
- "hurd-proc-zombies.patch"))))
+ "hurd-startup.patch"))))
(version (package-version hurd-headers))
(arguments
`(#:tests? #f ;no "check" target
diff --git a/gnu/packages/patches/hurd-crash-x86_64.patch
b/gnu/packages/patches/hurd-crash-x86_64.patch
deleted file mode 100644
index 93c164d8d8..0000000000
--- a/gnu/packages/patches/hurd-crash-x86_64.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From c809367cb503830346bfb1d1fd927c09d3f3cb16 Mon Sep 17 00:00:00 2001
-From: Samuel Thibault <[email protected]>
-Date: Mon, 16 Feb 2026 00:32:00 +0100
-Subject: crash: Fix hang on x86_64 core generation
-
-The produced core file still make gdb crash, but at least crash doen't
-hang.
----
- exec/elfcore.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/exec/elfcore.c b/exec/elfcore.c
-index 8c85b13b..a2360965 100644
---- a/exec/elfcore.c
-+++ b/exec/elfcore.c
-@@ -97,6 +97,11 @@ fetch_thread_fpregset (thread_t thread, prfpregset_t
*fpregs)
- struct i386_float_state st;
- mach_msg_type_number_t count = i386_FLOAT_STATE_COUNT;
-
-+ if (!*fpregs)
-+ /* FIXME: having a pointer here is bogus actually, prfpregset_t should be
a
-+ struct, not a pointer, like on i386. This needs to be fixed in glibc
-+ etc. */
-+ return;
- memset (*fpregs, 0, sizeof (**fpregs));
-
- err = thread_get_state (thread, i386_FLOAT_STATE,
---
-cgit v1.2.3
-
diff --git a/gnu/packages/patches/hurd-proc-zombies.patch
b/gnu/packages/patches/hurd-proc-zombies.patch
deleted file mode 100644
index ecc50ec4e4..0000000000
--- a/gnu/packages/patches/hurd-proc-zombies.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Upstream status:
https://lists.gnu.org/archive/html/bug-hurd/2025-12/msg00019.html
-
-From 382c796742dad624d958ac283a7fb10960c742b1 Mon Sep 17 00:00:00 2001
-From: Yelninei <[email protected]>
-Date: Sat, 13 Dec 2025 17:55:08 +0000
-Subject: [PATCH] proc: Also check whether the last child is already dead.
-
-* proc/mgt.c (process_has_exited): Repeat check for the last child too.
----
- proc/mgt.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/proc/mgt.c b/proc/mgt.c
-index 3f04e2ba..dcb619af 100644
---- a/proc/mgt.c
-+++ b/proc/mgt.c
-@@ -1102,6 +1102,8 @@ process_has_exited (struct proc *p)
- 1, tp->p_pgrp->pg_pgid,
- !tp->p_pgrp->pg_orphcnt);
- tp->p_parent = reparent_to;
-+ if (tp->p_dead)
-+ isdead = 1;
-
- /* And now append the lists. */
- tp->p_sib = reparent_to->p_ochild;
---
-2.52.0
-
diff --git a/gnu/packages/patches/hurd-streamio-select.patch
b/gnu/packages/patches/hurd-streamio-select.patch
deleted file mode 100644
index 4bd8e48a13..0000000000
--- a/gnu/packages/patches/hurd-streamio-select.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-Upstream status:
https://lists.gnu.org/archive/html/bug-hurd/2025-12/msg00043.html
-
-From ffe82c73f89d12393c62d5ba35b06552af40e029 Mon Sep 17 00:00:00 2001
-From: Yelninei <[email protected]>
-Date: Sun, 28 Dec 2025 10:59:56 +0000
-Subject: [PATCH 1/2] streamio (io_select_common): Don't return in case of
- O_NONBLOCK.
-
-select should block even when opened with O_NONBLOCK.
----
- trans/streamio.c | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/trans/streamio.c b/trans/streamio.c
-index d21dc937..2a48d793 100644
---- a/trans/streamio.c
-+++ b/trans/streamio.c
-@@ -589,12 +589,6 @@ io_select_common (struct trivfs_protid *cred,
- return 0;
- }
-
-- if (cred->po->openmodes & O_NONBLOCK)
-- {
-- pthread_mutex_unlock (&global_lock);
-- return EWOULDBLOCK;
-- }
--
- ports_interrupt_self_on_port_death (cred, reply);
- err = pthread_hurd_cond_timedwait_np (&select_alert, &global_lock, tsp);
- if (err)
---
-2.52.0
-
-From 090062ef555ffc29bcb7afcaad5bb46dad5973e9 Mon Sep 17 00:00:00 2001
-From: Yelninei <[email protected]>
-Date: Sun, 28 Dec 2025 11:03:57 +0000
-Subject: [PATCH 2/2] streamio (io_select_common): Request data if none is
- available.
-
-If no data is available immediately start new read/write requests.
----
- trans/streamio.c | 23 +++++++++++++++++++++++
- 1 file changed, 23 insertions(+)
-
-diff --git a/trans/streamio.c b/trans/streamio.c
-index 2a48d793..f7cd442f 100644
---- a/trans/streamio.c
-+++ b/trans/streamio.c
-@@ -190,6 +190,8 @@ error_t dev_write (const void *buf, size_t len, size_t
*amount, int nowait);
- will wait for any activity to cease. */
- error_t dev_sync (int wait);
-
-+static error_t start_input (int nowait);
-+static error_t start_output (int nowait);
-
-
- static struct argp_option options[] =
-@@ -589,6 +591,27 @@ io_select_common (struct trivfs_protid *cred,
- return 0;
- }
-
-+ if (*type & SELECT_READ)
-+ {
-+ err = start_input(1);
-+ if (err)
-+ {
-+ *type = 0;
-+ pthread_mutex_unlock (&global_lock);
-+ return err;
-+ }
-+ }
-+ if (*type & SELECT_WRITE)
-+ {
-+ err = start_output(1);
-+ if (err)
-+ {
-+ *type = 0;
-+ pthread_mutex_unlock (&global_lock);
-+ return err;
-+ }
-+ }
-+
- ports_interrupt_self_on_port_death (cred, reply);
- err = pthread_hurd_cond_timedwait_np (&select_alert, &global_lock, tsp);
- if (err)
---
-2.52.0
-
