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 <yelninei@tutamail.com>
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:
-    <https://git.savannah.gnu.org/cgit/hurd/hurd.git/commit/?id=d494333e7607ea03819adcfb69d89f8248ec2044>.
-
-From d494333e7607ea03819adcfb69d89f8248ec2044 Mon Sep 17 00:00:00 2001
-From: Flavio Cruz <flaviocruz@gmail.com>
-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 <janneke@gnu.org>  | GNU LilyPond https://LilyPond.org
-Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com
-
-- 
2.49.0

