From patchwork Tue Nov 19 06:54:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70512 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 41E7627BBE9; Tue, 19 Nov 2024 06:59:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DFBC627BBEB for ; Tue, 19 Nov 2024 06:59:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tDICc-0008Jp-NV; Tue, 19 Nov 2024 01:59:10 -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 1tDICa-0008IC-D3 for guix-patches@gnu.org; Tue, 19 Nov 2024 01:59:08 -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 1tDICa-0004IE-3l; Tue, 19 Nov 2024 01:59:08 -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=BZ4C3eQZiCQGpZ+IzrtOY0D2IQNtzfVfQkk4aGYk/cw=; b=kmeBS4ZMMbBeefg9akg4DdczcCqYKw4YzH8OWJ2CDGVGmrjggs66A7/gBcxyZ06hkCQ96rE+BowiQN+L/0RkAKm/mbGOcgGv+yKAZIbZRI33hMmfVfSMNzX3fq5npbWiVGU3fmHiBtGa6Cz9xaqZOehvcmnMTvAIVIhPXuubNqN2hFKq3xL1NOm3itATPaSd44Tjuo3UY8og4OSJUbSmBdoPP3A8uJUJYHXSn8nPZS/nEAGe6IMV37ztPsNgOvtr/jbrPLYG2XjmCO/qTa3efUfRWJX9335gEnn+IIUGqO1WoCNU9T9A6Q75nM82GaN8Qr5NnTvWtQeU8DI14zg+Rg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tDICU-0005DW-QX; Tue, 19 Nov 2024 01:59:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 01/51] gnu: gnumach: Update to v1.8+git20240714. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, ekaitz@elenq.tech, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 06:59: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 Cc: Andreas Enge , Efraim Flashner , Ekaitz Zarraga , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Ekaitz Zarraga , Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173199948419538 (code B ref 74290); Tue, 19 Nov 2024 06:59:02 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:58:04 +0000 Received: from localhost ([127.0.0.1]:40407 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBY-000553-66 for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49804) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBU-00054N-VE for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:02 -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 1tDI9J-0003v9-Sh; Tue, 19 Nov 2024 01:55:45 -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=BZ4C3eQZiCQGpZ+IzrtOY0D2IQNtzfVfQkk4aGYk/cw=; b=ksPu6PeQReCkol1QsTyC RsYh0dfNq/zTkiG5RE20PzJ3d8trTChnrH1AuM1mloLl7iPVCpRJlKnyEozoE9tOQtAkP+qoQjMwq RbFlllK6f4sCh/PxRMBIYUfwu0q+Re0kHI1EJdQ1X5CQc3xUkK3XBOx2BQve5jhPtDVEpxlRN6/ST yaaAQByjis5tGWu35uGkjLjn7NJ2fM+A1yvp3phkoeOQ9YWlnUDdsU9w3Gd13Q3RJ/DVI0aGzI2H0 8YizInJl3m5Yx3cGcMgZyCLuV39pYEtiRWVGnRBWlAWBbnCbK93S9C/EvJPFq01HpqZtcBs07yqD9 uEtpO3tAILH5/w==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:31 +0100 Message-ID: <763d643429bb1b89628f6dd6261a6b35cbc1df5a.1731999203.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 ff6c6be5f0..cd9ad3aebb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1463,6 +1463,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: + + +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@";