From patchwork Sun May 4 14:27:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: yelninei--- via Guix-patches via X-Patchwork-Id: 42287 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 0706727BC4A; Sun, 4 May 2025 15:29:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AE11727BC49 for ; Sun, 4 May 2025 15:29:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uBaL2-00072y-ON; Sun, 04 May 2025 10:29:04 -0400 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 1uBaL1-00072p-DO for guix-patches@gnu.org; Sun, 04 May 2025 10:29:03 -0400 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 1uBaL1-0007VN-3S for guix-patches@gnu.org; Sun, 04 May 2025 10:29:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:From:Date:To:Subject; bh=vOih/ioj/bKVBPpRFiy61KLj2P/Ra4FhUddBptrgHCI=; b=aBbI3pKkl1jXMcJqv9538NBexlKWLiMr1kLWYWf3+/v1HIy4Cp8CMs0aXaFWkpkeGnOcdtvhLgRwYhmRNjYArKli49w5wxw4k+pni5E+ftw/VHMgZdVlJsDRE3F0k2bk+6XIP6B/X0gOwrG7PGnOPm/IiGqahT97eUvI+vBkMvEAozEWWUxoriCkA84d5Rt7MP4wBrmpicjHCX2nWvGcPb2IIoJsq0wWkRvNCyT/Is09IYI9VIRGJSKawBt6sVFu51hVAf4WveWm165/+dEeUIMr5QlLJpCY3MmTkQpCJ/z7Bd/TljFRqWlAQsxAl8V67ZDTaS+M5tXIn9xfZLj/VQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uBaL0-0002gM-Ig for guix-patches@gnu.org; Sun, 04 May 2025 10:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78241] [PATCH core-packages-team] Update Hurd and Mach Resent-From: yelninei@tutamail.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 May 2025 14:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78241 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78241@debbugs.gnu.org Cc: Ekaitz Zarraga , Ludovic =?utf-8?q?Court=C3=A8s?= , Efraim Flashner , Andreas Enge , Z572 , Janneke Nieuwenhuizen X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17463688929955 (code B ref -1); Sun, 04 May 2025 14:29:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 May 2025 14:28:12 +0000 Received: from localhost ([127.0.0.1]:56788 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uBaK9-0002a4-Cx for submit@debbugs.gnu.org; Sun, 04 May 2025 10:28:12 -0400 Received: from lists.gnu.org ([2001:470:142::17]:41892) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uBaK1-0002Xq-BI for submit@debbugs.gnu.org; Sun, 04 May 2025 10:28:05 -0400 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 1uBaJs-0006mh-Cw for guix-patches@gnu.org; Sun, 04 May 2025 10:27:52 -0400 Received: from mail.w13.tutanota.de ([185.205.69.213]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uBaJo-0007R5-9C for guix-patches@gnu.org; Sun, 04 May 2025 10:27:52 -0400 Received: from tutadb.w10.tutanota.de (w10.api.tuta.com [IPv6:fd:ac::d:10]) by mail.w13.tutanota.de (Postfix) with ESMTP id C28F78320C95 for ; Sun, 4 May 2025 16:27:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1746368863; s=s1; d=tutamail.com; h=From:From:To:To:Subject:Subject:Content-Description:Content-ID:Content-Type:Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:In-Reply-To:MIME-Version:MIME-Version:Message-ID:Message-ID:Reply-To:References:Sender; bh=vOih/ioj/bKVBPpRFiy61KLj2P/Ra4FhUddBptrgHCI=; b=2HAP9B2rjIpTlNTC0UDR8zU43UaOONLOumN8JHbIYO8KG5c3PKJRiiT2+71/OT0D M1FRrwYzE8NZH+rO4JSx2Bu0ayoX7s2oYV4pfL7OdPIhWZs8U71ZduSFGUhNa8rAuuT c7FdPae8Ipy0kbvYQjd11quIYWnqoXh/VG0ICM3FYNHunNqGxgXhqu7avNbnion3Zim DRw7VkE3537adVR++9YmgmZmQgkCunMC1G0mvAOs9QMunQTLcC1KE1kZdaZNSZzCds+ o4f1KywYFFOiHGdHA+yg65Cb2/dq+c6xMvHah7ThU2ZqBcEu685k/X/nv4mRqgujTJb RzR+K70r8Q== Date: Sun, 4 May 2025 16:27:43 +0200 (CEST) Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=185.205.69.213; envelope-from=yelninei@tutamail.com; helo=mail.w13.tutanota.de X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.01, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Reply-to: yelninei@tutamail.com X-ACL-Warn: , yelninei--- via Guix-patches X-Patchwork-Original-From: yelninei--- via Guix-patches via From: yelninei--- via Guix-patches via 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 Hello, This updates hurd and mach for core-packages-team branch to their latest available snapshots. The gnumach update fixes the build of gnumach-headers-boot0 (see https://issues.guix.gnu.org/77709). I also changed everything to automake@1.17 and the regular texinfo. Should these be separate commits? Also should I separate the commencement.scm part from the hurd.scm part? Please ignore the prerequisite patch-ids, these are part of WIP fixes for glibc/hurd and other packages to fix more things (again see #77709 for more info). I hope I did the hashes in commencement.scm correctly, it was a bit tricky to download the sources with the ongoing savannah issues. I have successfully built these with my WIP glibc patches and "-s i586-gnu" (ignoring some other test failures and adding -Wno-implicit-function-declaration in rumpkernel) and am currently waiting on the cross compiled variants. Are there additional things that need testing for the 64bit hurd and are there other hurd specific packages that should be updated as well?  Thanks. From 59f3b41dd8e27cb18fe864e3b962eff516fb9c24 Mon Sep 17 00:00:00 2001 Message-ID: <59f3b41dd8e27cb18fe864e3b962eff516fb9c24.1746357912.git.yelninei@tutamail.com> In-Reply-To: <7bb361aa6e70f8746745b7a875ac28e3aad3733b.1746357912.git.yelninei@tutamail.com> References: <7bb361aa6e70f8746745b7a875ac28e3aad3733b.1746357912.git.yelninei@tutamail.com> From: Yelninei Date: Sun, 4 May 2025 11:25:02 +0000 Subject: [PATCH 2/2] gnu: hurd: Update to 0.9.git20250420. * gnu/packages/commencement.scm (hurd-headers-boot0): Update to 0.9.git20250420. * gnu/packages/hurd.scm (hurd-headers): Same. (hurd): Remove hurd-64bit.patch. [native-inputs]: Use texinfo instead of texinfo@4. * gnu/packages/patches/hurd-64bit.patch: Remove patch. gnu/local.mk: Deregister patch. Change-Id: Id62664983b2b5e2d6f2791f3290a9129fbf5f1c5 --- gnu/local.mk | 1 - gnu/packages/commencement.scm | 4 +- gnu/packages/hurd.scm | 11 +++--- gnu/packages/patches/hurd-64bit.patch | 56 --------------------------- 4 files changed, 7 insertions(+), 65 deletions(-) delete mode 100644 gnu/packages/patches/hurd-64bit.patch diff --git a/gnu/local.mk b/gnu/local.mk index 22b3e6b738..3755fe75bb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1595,7 +1595,6 @@ 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-64bit.patch \ %D%/packages/patches/hurd-refcounts-assert.patch \ %D%/packages/patches/hurd-rumpdisk-no-hd.patch \ %D%/packages/patches/hurd-startup.patch \ diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 99c3b3833f..eaed8f9d73 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2797,7 +2797,7 @@ (define hurd-headers-boot0 (package (inherit hurd-headers) (name "hurd-headers-boot0") - (version "0.9.git20240714") + (version "0.9.git20250420") (source (origin (inherit (package-source hurd-headers)) @@ -2810,7 +2810,7 @@ (define hurd-headers-boot0 "hurd-v" version ".tar.gz")) (sha256 (base32 - "0wcihffclwijjamx4cjbr8i92yg780538ipg2z208ahg96jjrmgq"))))))) + "14ldrijzgqkvnii873vjlsmrjr3kvs1aksyc5b4ha8anlnnvdkg1"))))))) (native-inputs (list autoconf-boot0 automake-boot0 mig-boot0)) (inputs '())))) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 61ccd19b37..4794c8c376 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -131,8 +131,8 @@ (define-public mig (license gpl2+))) (define-public hurd-headers - (let ((revision "3") - (commit "v0.9.git20240714")) + (let ((revision "4") + (commit "v0.9.git20250420")) (package (name "hurd-headers") (version (string-drop commit 1)) @@ -143,7 +143,7 @@ (define-public hurd-headers (commit commit))) (sha256 (base32 - "0wvzil3llmrjg7ymwqs86d11bm5fl771jwncv7kk679lsvqca0ll")) + "09z9gj1z11wswmxy7jdzrbjmlplpy0fpbc6gaj09hh34j4y6yr91")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs @@ -318,8 +318,7 @@ (define-public hurd (inherit (package-source hurd-headers)) (patches (search-patches "hurd-refcounts-assert.patch" "hurd-rumpdisk-no-hd.patch" - "hurd-startup.patch" - "hurd-64bit.patch")))) + "hurd-startup.patch")))) (version (package-version hurd-headers)) (arguments `(#:tests? #f ;no "check" target @@ -595,7 +594,7 @@ (define-public hurd mig)) ("pkg-config" ,pkg-config) ("perl" ,perl) - ("texinfo" ,texinfo-4) + ("texinfo" ,texinfo) ("dde-sources" ,dde-sources))) (supported-systems %hurd-systems) (home-page "https://www.gnu.org/software/hurd/hurd.html") diff --git a/gnu/packages/patches/hurd-64bit.patch b/gnu/packages/patches/hurd-64bit.patch deleted file mode 100644 index 643550ad68..0000000000 --- a/gnu/packages/patches/hurd-64bit.patch +++ /dev/null @@ -1,56 +0,0 @@ -Upstream-status: Taken from upstream: - . - -From d494333e7607ea03819adcfb69d89f8248ec2044 Mon Sep 17 00:00:00 2001 -From: Flavio Cruz -Date: Sun, 21 Jul 2024 17:20:55 -0400 -Subject: [PATCH] nfsd: fix -Werror=incompatible-pointer-types issues for - x86_64 -Content-Transfer-Encoding: 8bit -Content-Type: text/plain; charset=UTF-8 - -Message-ID: <3pmgbk2myx4phdb6wcso54solmybulrvbytols5md3nri2p2qp@xjmfmpvwjp6t> ---- - nfsd/cache.c | 2 +- - nfsd/ops.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/nfsd/cache.c b/nfsd/cache.c -index cd5524af..864739c0 100644 ---- a/nfsd/cache.c -+++ b/nfsd/cache.c -@@ -387,7 +387,7 @@ create_cached_handle (int fs, struct cache_handle *credc, file_t userport) - struct cache_handle *c; - int hash; - char *bp = fhandle.array + sizeof (int); -- size_t handlelen = NFS2_FHSIZE - sizeof (int); -+ mach_msg_type_number_t handlelen = NFS2_FHSIZE - sizeof (int); - mach_port_t newport, ref; - - /* Authenticate USERPORT so that we can call file_getfh on it. */ -diff --git a/nfsd/ops.c b/nfsd/ops.c -index 463a9c87..64e94b93 100644 ---- a/nfsd/ops.c -+++ b/nfsd/ops.c -@@ -292,7 +292,7 @@ op_write (struct cache_handle *c, - off_t offset; - size_t count; - error_t err; -- mach_msg_type_number_t amt; -+ vm_size_t amt; - char *bp; - struct stat st; - -@@ -583,7 +583,7 @@ op_readdir (struct cache_handle *c, - error_t err; - char *buf; - struct dirent *dp; -- size_t bufsize; -+ mach_msg_type_number_t bufsize; - int nentries; - int i; - int *replystart; --- -Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org -Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com - -- 2.49.0