From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.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 8LBZAFKNMGeXcwAAqHPOHw:P1 (envelope-from ) for ; Sun, 10 Nov 2024 10:39:14 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id 8LBZAFKNMGeXcwAAqHPOHw (envelope-from ) for ; Sun, 10 Nov 2024 11:39:14 +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="UEA/nBJd"; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=HdW8euZ2; 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=1731235153; a=rsa-sha256; cv=none; b=h7Aa1QlljTRA5GS2/3TjXwRcKI9PbHfruGY82bUlnTOHVPtbXTBiDEidLIhNTCOPD40phS 0N1Ha9nfAwaigL5dILuVHq1gad5NNY+YGScS5gl18cJdb53EIH35ce6asyUGcv8ov8l5xk Jd11MOABhauRBuGMOH6XNv0wTX6ftHIF50ALH7ujLV6GZElL8YvkS8d4CWAt3YCz0LwJq5 RYYGPyYcJq61zdFNCfmdn60AEenG7ZRbYoeglQrUpRafc2RpK/+p2cbKulYe90MQ7wdwNm D/f6K5cVfFqSRYgXdqxtpDQOpDOiOizf/hq6Tfl86vluLCsqqjytyaTmfx98Jg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="UEA/nBJd"; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=HdW8euZ2; 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=1731235153; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: 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=OlP1p+Agy63T5Q3aWrUyFnLHQXBP7UhOmLkqMm41xBM=; b=MAPyYqHTmWi7Wszug7bx0doqUJatnq5WYZVLbkdyDqCR2u9lTJXQ2uv+a5rH1JPifYb2Q6 qtXxbBMcqcLeOLKqhuzh2OqbYLo26TZTo98iL4+aDwBX0sbkoUR2vo2F8HdCqyydAOmP/h HxxoGuf48c0KaA6Jr/FNINSACdaOEbQBx+IuDBsv0LfTCaVj4PszLavRQD+9ykM1NHRXaL YcDKQ93wNjZ5Kw3Ond6BZg9tsKhka1rW2f1E4fqXy0wwag1uw8emo+9/u+L3SFhnnZ5JiS qXiYI1Kydz/Q6cwfGypI0whe7Pt65deTShHFFNxF9/6Hk3O/Hoi9Z+P/QQAX1g== 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 8E65179932 for ; Sun, 10 Nov 2024 11:39:13 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tA5LU-0008T6-5y; Sun, 10 Nov 2024 05:39:04 -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 ) id 1tA5LS-0008Sg-Vp for guix-patches@gnu.org; Sun, 10 Nov 2024 05:39:03 -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 ) id 1tA5LS-0007rZ-N6 for guix-patches@gnu.org; Sun, 10 Nov 2024 05:39: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=OlP1p+Agy63T5Q3aWrUyFnLHQXBP7UhOmLkqMm41xBM=; b=UEA/nBJdy+NcarcExOzTCO4FuH3zPcr1KKzLCuq25HuRScDfnX4a4Sldmoo6cDc8DKQKYBYi4CrFlDhzGgw/qN3w40aF2/2QSk2myzzWIEwuNuhrbcU5JqsYn8HwqLMi25FZEpmaMllWRRCLf9K8rSDlEPtCWpE3FjSRiI1eBmhGSdU8EwmPYM8hyHjZGqMblgncGSTz9VsE9FzBIBALyVQCmXxKH1IGopr4MsAscNF2CuDobASVUEXYlD/F0FdBaFsMGinejAd7WflPQUA0xNEYuuGp3Gj7TnrDQQ/ISpx+9tFI0uHH7X3m0lGe7Q9niD9Z7g3kHvnTYkR1VEL2ng==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tA5LS-0002Zd-Gr for guix-patches@gnu.org; Sun, 10 Nov 2024 05:39:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 02/31] gnu: gnumach: Update to v1.8+git20240714. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:39:02 +0000 Resent-Message-ID: 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 Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17312351319767 (code B ref 74290); Sun, 10 Nov 2024 10:39:02 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:38:51 +0000 Received: from localhost ([127.0.0.1]:55665 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LG-0002XQ-Ss for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:38:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54576) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tA5LE-0002Ws-9Q for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:38: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 ) id 1tA5L8-0007lE-Hv; Sun, 10 Nov 2024 05:38:42 -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=OlP1p+Agy63T5Q3aWrUyFnLHQXBP7UhOmLkqMm41xBM=; b=HdW8euZ2vLICXU9UwSLy NdDfQJKbFNBBkMeHNwM+X9gVeRgsh0JMVghLC3uzCa8SsLohnbOZJkH/uMhVqiQhYlJYikYGyCW4R +gLCCWh2AemjV1zRzUrAQGriToq8ZN1vqSx6bg21Q9Y4vKr/A5OCbilMr2vFUUJnoIGgov4ZIH8OR 8m6QKN9AJmI444bh9pGkZGrF62uxX2h2VeK23PytUPzTmy0SeQyctfjwNx2cNq6Apv/daSQVSwb6P alNhdX0R2gp/pSzkmHe91fIynZpECcbgODouOIMMoexuJJ7PrtIHymV1E0EIAf8q3PntG0xRqAD7w 8DZIElrRQm87IQ==; From: Janneke Nieuwenhuizen Date: Sun, 10 Nov 2024 11:37:58 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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: -2.56 X-Spam-Score: -2.56 X-Migadu-Queue-Id: 8E65179932 X-Migadu-Scanner: mx10.migadu.com X-TUID: kJ5KwZEL61Zh * 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. Change-Id: I147c64021c2ee79dfc4cd4fd9a29529eef8890c5 --- gnu/local.mk | 1 + gnu/packages/hurd.scm | 9 ++++----- gnu/packages/patches/gnumach-version.patch | 23 ++++++++++++++++++++++ 3 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/gnumach-version.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2c810117eb..4d3ee9ea35 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1459,6 +1459,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/hurd.scm b/gnu/packages/hurd.scm index 0a7db31e1c..28f39cc448 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: + + +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@"; -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com