From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org>
Received: from mp1.migadu.com ([2001:41d0:403:4876::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by ms13.migadu.com with LMTPS
	id WKiGBdrfQmdVQQEA62LTzQ:P1
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sun, 24 Nov 2024 08:12:10 +0000
Received: from aspmx1.migadu.com ([2001:41d0:403:4876::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp1.migadu.com with LMTPS
	id WKiGBdrfQmdVQQEA62LTzQ
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sun, 24 Nov 2024 09:12:10 +0100
X-Envelope-To: larch@yhetil.org
Authentication-Results: aspmx1.migadu.com;
	dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Yrv5TIAB;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=Axk59G5F;
	dmarc=pass (policy=none) header.from=gnu.org;
	spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"
ARC-Seal: i=1; s=key1; d=yhetil.org; t=1732435930; a=rsa-sha256; cv=none;
	b=SVCtLO1nJww6F5f7oelxN+qGWpLDxOge49StB3O6Eyb18et2o5ZPg3cfUv0RWuU10WBSZA
	nPXpV9NmWXb7GeN+zYR2sq/fH+BycRE8vIFBd5GMXTTQ6+TOZX4kvF6kgc5XnA0Cm3fXpW
	cNcs2/Ybwy2nMxjFz8SJkeyj0nMcQKkqwbz6dF+JJPf09ip5THiw4AFiXIKDFLqPChGC2J
	+SZPuRpy+Qe+ZcjlD2cX1F7XV2M2axhw3f2PjeNuQd1S/tbrwn/aWecD59cgNWyyQKkSLY
	H8+g+o7OpPvT8cZf8C8lxoI5/lQTBOvmJbNMdWb/BhEPzWVdzNKTbPA+LrWySg==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Yrv5TIAB;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=Axk59G5F;
	dmarc=pass (policy=none) header.from=gnu.org;
	spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org;
	s=key1; t=1732435930;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc:cc:mime-version:mime-version:
	 content-transfer-encoding:content-transfer-encoding:resent-cc:
	 resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to:
	 references:references:list-id:list-help:list-unsubscribe:
	 list-subscribe:list-post:dkim-signature;
	bh=ysWnOgMW99w6DK+Ivyoq1YsZsef0OievoeJe0IgNnhk=;
	b=MROYpAUIpU2bhZR1mYObjOdKRrGvuOdWLgSVmb65fCdNEY345m0SuOMXVSA3Hak7LIB3/t
	CCPogfffJWQwsus4+Tu7blPlqiTe3RlKylNUQNtDRe6msd/MjcQoUbHEDE73un0nTaaxp2
	4AaAtB6fbbkNKbbJjSEbOFBJ94r0bK1BRSgmdl9xWyuoydGBglgkuyQVEuX1984OZ83Rva
	GgRKXArZ/j3pXUdIMgf6/sB2nsb6SLOcm1twWeAZwGeQr/GrpwqVijkUhQuLv/48GFOnnQ
	eijY6WJKrzWyLhGKwkqZmKiQh/yYzyAFsLmJzFt8oM8EqYI3bsxKDHjRhXM4qQ==
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by aspmx1.migadu.com (Postfix) with ESMTPS id DE09C8C1D2
	for <larch@yhetil.org>; Sun, 24 Nov 2024 09:12:09 +0100 (CET)
Received: from localhost ([::1] helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <guix-patches-bounces@gnu.org>)
	id 1tF7TR-0008Iy-8F; Sun, 24 Nov 2024 02:56:05 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tF7TO-0008Ht-UP
 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:56:02 -0500
Received: from debbugs.gnu.org ([2001:470:142:5::43])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tF7TO-0001vz-LU; Sun, 24 Nov 2024 02:56:02 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 d=debbugs.gnu.org; s=debbugs-gnu-org; 
 h=MIME-Version:References:In-Reply-To:Date:From:To:Subject;
 bh=ysWnOgMW99w6DK+Ivyoq1YsZsef0OievoeJe0IgNnhk=; 
 b=Yrv5TIABEY3ipNzcPo5UGCIbSy1xQKMOB2ZJT48j6usvl27yhrHN+piJIEvG+TYj3H90O4c1UIU6oXBUlLqO9CgThH9IcNNL0AkT5NM+5aAxNNzJJFsO+QHtz+Wp+rBBBikss4hhQNCPljU1Ckg7IjTnp+DdGCctZVX2NyLw0qG7F163HrxKuDcjpBZ2lydlANhTyYG5fbOEpVuwTSfbEyWVPpDMw8tOTNMp+juCwkuYT6z7nk+fe50fCUoDAD0KrSyMZLE5To6pdpXrkpxoK8UUFkFV6lfzee+GTVnyhWh17mc6efMT/r0kDppHxdEqoA7VwRMbLz3obx1QW4RZXw==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tF7TO-0004V0-2F; Sun, 24 Nov 2024 02:56:02 -0500
X-Loop: help-debbugs@gnu.org
Subject: [bug#74290] [PATCH v4 01/58] gnu: gnumach: Update to v1.8+git20240714.
Resent-From: Janneke Nieuwenhuizen <janneke@gnu.org>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: andreas@enge.fr, efraim@flashner.co.il, ekaitz@elenq.tech,
 ludo@gnu.org, guix-patches@gnu.org
Resent-Date: Sun, 24 Nov 2024 07:56:02 +0000
Resent-Message-ID: <handler.74290.B74290.173243495417233@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 74290
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 74290@debbugs.gnu.org
Cc: Andreas Enge <andreas@enge.fr>, Efraim Flashner <efraim@flashner.co.il>,
 Ekaitz Zarraga <ekaitz@elenq.tech>,
 Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@gnu.org>
X-Debbugs-Original-Xcc: Andreas Enge <andreas@enge.fr>,
 Efraim Flashner <efraim@flashner.co.il>, Ekaitz Zarraga <ekaitz@elenq.tech>,
 Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@gnu.org>
Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243495417233
 (code B ref 74290); Sun, 24 Nov 2024 07:56:02 +0000
Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:55:54 +0000
Received: from localhost ([127.0.0.1]:60621 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1tF7TE-0004Tb-1a
 for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:55:54 -0500
Received: from eggs.gnu.org ([209.51.188.92]:41812)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <janneke@gnu.org>) id 1tF7TA-0004Sy-Fa
 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:55:49 -0500
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <janneke@gnu.org>)
 id 1tF7T5-0001rA-2S; Sun, 24 Nov 2024 02:55:43 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To:
 From; bh=ysWnOgMW99w6DK+Ivyoq1YsZsef0OievoeJe0IgNnhk=; b=Axk59G5FKCDvawV1cuQ/
 MqziUy1vvajd1TJScTyE1FblxRjsjoV81UH41BDe2tYWuCFH8Lko3XNisZ3cI39d8UQ7NZczUq1Vk
 3ejCrLzeIkC49jgevCex4UvwlvZy/TRtDYs0JpLRcXjwJ+r+5HnzXWIw0S2n855AGUXBfYLIQjTkv
 8oqIQci8qekVAVMsbJcvY7IfgT7OWy49qoDLOMXOk4VtK7FdPti6T5N7aTCWoWZyd3TOljm2+CBMD
 B6yAd/FgXwS1gjiyWAoN0LGhVOclzuRZ13q8fWQPJ5TztOIyHtsq+LnGfGg7qZK1kS/sKHU8hXlar
 NJkNTZckGPrfWg==;
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 24 Nov 2024 08:54:24 +0100
Message-ID: <666f102f47eacf0209652b6e1f85c7d8905c8438.1732434271.git.janneke@gnu.org>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <cover.1732434270.git.janneke@gnu.org>
References: <cover.1732434270.git.janneke@gnu.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
X-BeenThere: guix-patches@gnu.org
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org
Sender: guix-patches-bounces+larch=yhetil.org@gnu.org
X-Migadu-Country: US
X-Migadu-Flow: FLOW_IN
X-Migadu-Spam-Score: -6.98
X-Spam-Score: -6.98
X-Migadu-Queue-Id: DE09C8C1D2
X-Migadu-Scanner: mx10.migadu.com
X-TUID: +/p0+eH+/Gn0

* gnu/packages/patches/gnumach-version.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/hurd.scm (gnumach-headers): Update to v1.8+git20240714 and use
it.
* gnu/packages/commencement.scm (gnumach-headers-boot0)[origin]: Reset
patches.

Change-Id: I147c64021c2ee79dfc4cd4fd9a29529eef8890c5
---
 gnu/local.mk                               |  1 +
 gnu/packages/commencement.scm              |  1 +
 gnu/packages/hurd.scm                      |  9 ++++-----
 gnu/packages/patches/gnumach-version.patch | 23 ++++++++++++++++++++++
 4 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 gnu/packages/patches/gnumach-version.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 04e9b1c0fd..5e05fc9d10 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1461,6 +1461,7 @@ 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-version.patch			\
   %D%/packages/patches/gnupg-default-pinentry.patch		\
   %D%/packages/patches/gnupg-1-build-with-gcc10.patch		\
   %D%/packages/patches/gnutls-skip-trust-store-test.patch	\
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index ce40f0cea6..1cfaaae1e7 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2639,6 +2639,7 @@ (define gnumach-headers-boot0
      (source
       (origin
         (inherit (package-source gnumach-headers))
+        (patches '())
         (method
          (git-fetch-from-tarball
           (origin
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 9c1681f236..a22d0cadce 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -57,21 +57,20 @@ (define (hurd-source-url version)
                  version ".tar.gz"))
 
 (define-public gnumach-headers
-  (let ((revision "0")
-        (commit "2556fdece900d67529d5eda01f1bdaae4ffe96b0"))
+  (let ((commit "v1.8+git20240714"))
     (package
       (name "gnumach-headers")
-      (version (git-version "1.8" revision commit))
+      (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
-           "1lzsbix0l4jhab38pvwnmk7ip1lsn7m5smhnrciqajsqnadsnlzs"))))
+          (base32 "0ykav1kx0bgxcxw04bpcsh5s4531fzdkahjgrlsfs2h3w3vfkga0"))))
       (build-system gnu-build-system)
       (arguments
        `(#:phases
diff --git a/gnu/packages/patches/gnumach-version.patch b/gnu/packages/patches/gnumach-version.patch
new file mode 100644
index 0000000000..aec3c86a16
--- /dev/null
+++ b/gnu/packages/patches/gnumach-version.patch
@@ -0,0 +1,23 @@
+Upstream-status: Taken from Debian upstream:
+    <https://salsa.debian.org/hurd-team/gnumach/-/raw/master/debian/patches/12_version_suffix.patch>
+
+Index: gnumach/configure.ac
+===================================================================
+--- gnumach.orig/configure.ac
++++ gnumach/configure.ac
+@@ -19,6 +19,7 @@ AC_PREREQ([2.57])
+ m4_include([version.m4])
+ AC_INIT([AC_PACKAGE_NAME], [AC_PACKAGE_VERSION], [AC_PACKAGE_BUGREPORT],
+   [AC_PACKAGE_TARNAME])
++AC_SUBST([PACKAGE_VERSION_SUFFIX])
+ AC_CONFIG_SRCDIR([kern/ipc_kobject.c])
+ 
+ if test -z "${CFLAGS+set}"; then
+Index: gnumach/version.c.in
+===================================================================
+--- gnumach.orig/version.c.in
++++ gnumach/version.c.in
+@@ -1,2 +1,2 @@
+ /* @configure_input@ */
+-const char version[] = "@PACKAGE_NAME@ @PACKAGE_VERSION@";
++const char version[] = "@PACKAGE_NAME@ @PACKAGE_VERSION@@PACKAGE_VERSION_SUFFIX@";
-- 
2.46.0