guix_mirror_bot pushed a commit to branch hurd-team
in repository guix.
commit 954ff693a166e47bfdad5201bbb25dd26b2138ce
Author: Yelninei <[email protected]>
AuthorDate: Sun Feb 15 19:42:40 2026 +0000
gnu: gnumach-headers: Update to 1.8+git20251228.
* gnu/packages/hurd.scm (gnumach-headers): Update to 1.8+git20251228.
(gnumach): Remove upstreamed patches.
* gnu/local.mk (dist_patch_DATA): Unregister patches.
* gnu/packages/patches/gnumach-div0.patch: Delete file.
* gnu/packages/patches/gnumach-kmsg-overflow.patch: Delete file.
* gnu/packages/commencement.scm (gnumach-headers-boot0): Inherit version,
don't use git-fetch-from-tarball.
Change-Id: I90662803f95252096b45d6a49c7863683a9f8b51
---
gnu/local.mk | 2 -
gnu/packages/commencement.scm | 13 +----
gnu/packages/hurd.scm | 67 +++++++++++-------------
gnu/packages/patches/gnumach-div0.patch | 51 ------------------
gnu/packages/patches/gnumach-kmsg-overflow.patch | 59 ---------------------
5 files changed, 31 insertions(+), 161 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 60892e32e7..8cefb3e046 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1513,8 +1513,6 @@ dist_patch_DATA =
\
%D%/packages/patches/gnome-session-support-elogind.patch \
%D%/packages/patches/gnome-tweaks-search-paths.patch \
%D%/packages/patches/gnulib-bootstrap.patch \
- %D%/packages/patches/gnumach-div0.patch \
- %D%/packages/patches/gnumach-kmsg-overflow.patch \
%D%/packages/patches/gnumach-version.patch \
%D%/packages/patches/gnupg-default-pinentry.patch \
%D%/packages/patches/gnupg-1-build-with-gcc10.patch \
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index dcaff72cf3..6d32307b06 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2723,21 +2723,10 @@ memoized as a function of '%current-system'."
(package
(inherit gnumach-headers)
(name "gnumach-headers-boot0")
- (version "1.8+git20250731")
(source
(origin
(inherit (package-source gnumach-headers))
- (patches '())
- (method
- (git-fetch-from-tarball
- (origin
- (method url-fetch)
- (uri (string-append
-
"https://git.savannah.gnu.org/cgit/hurd/gnumach.git/snapshot/";
- "gnumach-" version ".tar.gz"))
- (sha256
- (base32
- "1dc40cf2s8jr6xhhbmy6khmig5zz1gpb4vc9c40aagccxf72jkpv")))))))
+ (patches '())))
(native-inputs (list autoconf-boot0 automake-boot0 texinfo-boot0))
(arguments
(substitute-keyword-arguments (package-arguments gnumach-headers)
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 8c2b65903b..9db625b7a4 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -59,37 +59,36 @@
version ".tar.gz"))
(define-public gnumach-headers
- (let ((commit "v1.8+git20250731"))
- (package
- (name "gnumach-headers")
- (version (string-drop commit 1))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://git.savannah.gnu.org/git/hurd/gnumach.git";)
- (commit commit)))
- (patches (search-patches "gnumach-version.patch"))
- (file-name (git-file-name "gnumach" version))
- (sha256
- (base32 "1zfn2fvlrdm9pqz5bg8l4mq99xjnrfsacdv9lqz5d4c1mbwpffvd"))))
- (build-system gnu-build-system)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (replace 'install
- (lambda _
- (invoke "make" "install-data" "install-data-hook")))
- (delete 'build))
- #:tests? #f))
- (native-inputs
- (list autoconf automake texinfo))
- (supported-systems %hurd-systems)
- (home-page
"https://www.gnu.org/software/hurd/microkernel/mach/gnumach.html";)
- (synopsis "GNU Mach kernel headers")
- (description
- "Headers of the GNU Mach kernel.")
- (license gpl2+))))
+ (package
+ (name "gnumach-headers")
+ (version "1.8+git20251228")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.savannah.gnu.org/git/hurd/gnumach.git";)
+ (commit (string-append "v" version))))
+ (patches (search-patches "gnumach-version.patch"))
+ (file-name (git-file-name "gnumach" version))
+ (sha256
+ (base32 "0690mv9m228xlhz27pdsvqr7nm1i3f19l177kxz4nadh0fvi6fby"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (replace 'install
+ (lambda _
+ (invoke "make" "install-data" "install-data-hook")))
+ (delete 'build))
+ #:tests? #f))
+ (native-inputs
+ (list autoconf automake texinfo))
+ (supported-systems %hurd-systems)
+ (home-page
"https://www.gnu.org/software/hurd/microkernel/mach/gnumach.html";)
+ (synopsis "GNU Mach kernel headers")
+ (description
+ "Headers of the GNU Mach kernel.")
+ (license gpl2+)))
(define-public mig
(let ((revision "1")
@@ -277,12 +276,6 @@ Hurd-minimal package which are needed for both glibc and
GCC.")
(package
(inherit gnumach-headers)
(name "gnumach")
- (source (origin
- (inherit (package-source gnumach-headers))
- (patches (append (origin-patches
- (package-source gnumach-headers))
- (search-patches "gnumach-div0.patch"
-
"gnumach-kmsg-overflow.patch")))))
(arguments
(substitute-keyword-arguments (package-arguments gnumach-headers)
((#:configure-flags flags ''())
diff --git a/gnu/packages/patches/gnumach-div0.patch
b/gnu/packages/patches/gnumach-div0.patch
deleted file mode 100644
index a7aeb4fdb0..0000000000
--- a/gnu/packages/patches/gnumach-div0.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Taken from
-https://cgit.git.savannah.gnu.org/cgit/hurd/gnumach.git/commit/?id=eec7037c885f6e54bf8f22d421d6abc55a2cd667
-
-From eec7037c885f6e54bf8f22d421d6abc55a2cd667 Mon Sep 17 00:00:00 2001
-From: Samuel Thibault <[email protected]>
-Date: Wed, 27 Aug 2025 02:34:50 +0200
-Subject: [PATCH] idt_inittab: Fix terminator entry
-
-Better fill a complete entry, which is always two pointers, both in
-MACH_PV_DESCRIPTORS and !MACH_PV_DESCRIPTORS case.
-
-For the x86_64 case, only half a pointer was actually recorded, leaving
-to garbage getting registered in the idt. This was noticed by division
-by zero getting double-faults.
-
-Thanks Pellescours for the initial investigation!
----
- i386/i386/idt_inittab.S | 2 --
- x86_64/idt_inittab.S | 5 +----
- 2 files changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/i386/i386/idt_inittab.S b/i386/i386/idt_inittab.S
-index fc80e21b..a946fece 100644
---- a/i386/i386/idt_inittab.S
-+++ b/i386/i386/idt_inittab.S
-@@ -134,7 +134,5 @@ EXCEPTION(0x1f,t_trap_1f)
- /* Terminator */
- .data 2
- .long 0
--#ifdef MACH_PV_DESCRIPTORS
- .long 0
--#endif /* MACH_PV_DESCRIPTORS */
-
-diff --git a/x86_64/idt_inittab.S b/x86_64/idt_inittab.S
-index 3a205ae4..cd5f5d22 100644
---- a/x86_64/idt_inittab.S
-+++ b/x86_64/idt_inittab.S
-@@ -140,9 +140,6 @@ EXCEPTION(0x1f,t_trap_1f)
-
- /* Terminator */
- .data 2
-- .long 0
--#ifdef MACH_PV_DESCRIPTORS
-- .long 0
- .quad 0
--#endif /* MACH_PV_DESCRIPTORS */
-+ .quad 0
-
---
-2.51.0
-
diff --git a/gnu/packages/patches/gnumach-kmsg-overflow.patch
b/gnu/packages/patches/gnumach-kmsg-overflow.patch
deleted file mode 100644
index 8a1c2747e4..0000000000
--- a/gnu/packages/patches/gnumach-kmsg-overflow.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Upstream Status:
https://lists.gnu.org/archive/html/bug-hurd/2025-12/msg00043.html
-
-From 2c9868cd8974e75a028349aa1ec9b1417f5d6617 Mon Sep 17 00:00:00 2001
-From: Yelninei <[email protected]>
-Date: Thu, 2 Oct 2025 16:20:00 +0000
-Subject: [PATCH] kmsg: Don't truncate messages when overflowing.
-
-Instead of discarding a character drop the first unread one.
----
- device/kmsg.c | 21 +++++++++------------
- 1 file changed, 9 insertions(+), 12 deletions(-)
-
-diff --git a/device/kmsg.c b/device/kmsg.c
-index e5b518e6..bb72930d 100644
---- a/device/kmsg.c
-+++ b/device/kmsg.c
-@@ -217,7 +217,6 @@ void
- kmsg_putchar (int c)
- {
- io_req_t ior;
-- int offset;
- spl_t s = -1;
-
- /* XXX: cninit is not called before cnputc is used. So call kmsginit
-@@ -230,22 +229,20 @@ kmsg_putchar (int c)
-
- if (spl_init)
- s = simple_lock_irq (&kmsg_lock);
-- offset = kmsg_write_offset + 1;
-- if (offset == KMSGBUFSIZE)
-- offset = 0;
--
-- if (offset == kmsg_read_offset)
-- {
-- /* Discard C. */
-- if (spl_init)
-- simple_unlock_irq (s, &kmsg_lock);
-- return;
-- }
-
- kmsg_buffer[kmsg_write_offset++] = c;
- if (kmsg_write_offset == KMSGBUFSIZE)
- kmsg_write_offset = 0;
-
-+ if(kmsg_write_offset == kmsg_read_offset)
-+ {
-+ /* Drop first unread char */
-+ kmsg_read_offset++;
-+ if (kmsg_read_offset == KMSGBUFSIZE)
-+ kmsg_read_offset = 0;
-+ }
-+
-+
- while ((ior = (io_req_t) dequeue_head (&kmsg_read_queue)) != NULL)
- iodone (ior);
-
---
-2.52.0
-
