From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org>
Received: from mp0.migadu.com ([2001:41d0:403:58f0::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by ms13.migadu.com with LMTPS
	id uE5+OcCCM2cCuwAAqHPOHw:P1
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Tue, 12 Nov 2024 16:30:57 +0000
Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp0.migadu.com with LMTPS
	id uE5+OcCCM2cCuwAAqHPOHw
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Tue, 12 Nov 2024 17:30:57 +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=QKuJNR3V;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=mFw7tPj+;
	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";
	dmarc=pass (policy=none) header.from=gnu.org
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org;
	s=key1; t=1731429056;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc: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=a9ZwL+e9Y+9YzZi/ZahcTsVYU+gtk/QJq5X5N2Z3Iow=;
	b=FINFA2b8rHtGHBdxV0UKzoZsGYIDOdPnQYISI8Jv4YWKdfcDYEoCuDd/mL9elMy/TM/ezr
	nfeABZCwSWr3AwOC691hWDMcnaFEFxrzlXA5q5HABxk3AKVU56V66KIHcVM4nt/RC0e2YT
	hlZ3WthOn9TyCcKnrcmqMtiFlzozMc+QsuosP+UyC7tcofVR0NNAZbUfmZjk4GfmjZRmcW
	3MmETX89dnaNsTEJQWR8r2AsUj9fL20pB5eP5LlebX4rirqeof4RO6w2mRDhjtSxkmPyyZ
	Jak6lzxghyx3d0BagnGALMrAZCilxW+DPhYceEiB+10uvE4DNE+IOFvGsTQxMw==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=QKuJNR3V;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=mFw7tPj+;
	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";
	dmarc=pass (policy=none) header.from=gnu.org
ARC-Seal: i=1; s=key1; d=yhetil.org; t=1731429056; a=rsa-sha256; cv=none;
	b=LwhELF3ZN1V87T85Rrqy7wLneRMCZISz++OieZyDsbeIDOth/FdgMr2eNqdrrxGv/XJGWv
	f5hsXwoiCj51kMtC4hIbLKGfiv7Qv7DI6lcevboAJK5kM6yP28Z/EuGZuSXXo2PSCbpika
	t4A3HRkU6mzx1PyyJ0lJRtgZLH0b06/NxwBwXu31QygXQn1ur+/k9IOSyuDErUjgKVlGM3
	DyfEdEH0lOAW60m7P7uSYq9gOB5S+UOgdFLD/AhF46lGtogO4XO56DmAxL7Pu75BKbcAsi
	Nn7LOkhLeSq5Q2QkQ+fw0qh1Aw5ZwR9Zxf3eufUoPugvxTVuitm/X9hKjk3pZQ==
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 7C7D882D4D
	for <larch@yhetil.org>; Tue, 12 Nov 2024 17:30:56 +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 1tAtmb-00046C-6R; Tue, 12 Nov 2024 11:30:25 -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 1tAtmY-00043X-N4
 for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:22 -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 1tAtmY-0005yg-B3
 for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:22 -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=a9ZwL+e9Y+9YzZi/ZahcTsVYU+gtk/QJq5X5N2Z3Iow=; 
 b=QKuJNR3VXZo5Os1jdNM0MrpFWPczN8JuJNfyM7trgawAzCiwAH81KlaOW7jO9EOr+mpKWgEAQQCNuvFGqTFB8y38iuplXH9XezHU0cMW83MP8d27C4ut4CvjK42wdMW6o2j3ObGiyFx64N7tuBxNpwl5KIJ6Azti4+TaSa9vUEXeF32K1WsFY8UbL/3E4ODomlyrQoIlb4Ykb82Ve0WzkgVJAvVayKJ/giARy1CkX+oJckBNtADhCkFRtqC4/i+Fs613qmEFu66mLR+jMN2u6bks4bPN2wn/TgHPEGGEwRMJRE9v63Xyql+rZ0Pyq/ZWAtFeazfLaN0yo8KO+Wy+kA==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tAtmY-0000Z2-5u; Tue, 12 Nov 2024 11:30:22 -0500
X-Loop: help-debbugs@gnu.org
Subject: [bug#74290] [PATCH v2 28/40] gnu: inetutils: Fix build for the 64bit
 Hurd.
Resent-From: Janneke Nieuwenhuizen <janneke@gnu.org>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: rekado@elephly.net, guix-patches@gnu.org
Resent-Date: Tue, 12 Nov 2024 16:30:22 +0000
Resent-Message-ID: <handler.74290.B74290.17314290111867@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: Ricardo Wurmus <rekado@elephly.net>
X-Debbugs-Original-Xcc: Ricardo Wurmus <rekado@elephly.net>
Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314290111867
 (code B ref 74290); Tue, 12 Nov 2024 16:30:22 +0000
Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:30:11 +0000
Received: from localhost ([127.0.0.1]:39194 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1tAtmL-0000Sc-VX
 for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:30:11 -0500
Received: from eggs.gnu.org ([209.51.188.92]:43178)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <janneke@gnu.org>) id 1tAtln-0000JW-OV
 for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:37 -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 1tAtjd-0005PC-6e; Tue, 12 Nov 2024 11:27:21 -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=a9ZwL+e9Y+9YzZi/ZahcTsVYU+gtk/QJq5X5N2Z3Iow=; b=mFw7tPj+DtRBldH4tWse
 4huudwerrPr8luXxDZJaHrRt2DUe6N4O3tHz7KvzljgVhdWGmgItQrjj5HyiCRNTxlwovyrkjy/Zf
 w+37ppiuTlLNwI70zaFKmXu5Bbud9xw3j7UxCLEdsnHhEVcg135WeUqk+xp5EqWI6pIO7kdpuqykg
 njscyguq2Xom1c4uDwepL8LfGPr5862whuBp/JDFrJ9Na+W3DW9P7khalW+31mquPXZnWfAaC7EK1
 rJ4EPiT9K1lWEyNlfAktBuj2iRV4IZNYq5yCTZS0zZdipw/kQY9A6BEY5nBcccDRxONM7rrsdE5It
 FoD7QrLjb5CWKQ==;
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 12 Nov 2024 17:25:37 +0100
Message-ID: <1f456c4d97b5d0e1e017b2048daa8af5680fea13.1731427612.git.janneke@gnu.org>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <cover.1731427612.git.janneke@gnu.org>
References: <cover.1731427612.git.janneke@gnu.org>
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: <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-Scanner: mx11.migadu.com
X-Migadu-Spam-Score: 0.88
X-Spam-Score: 0.88
X-Migadu-Queue-Id: 7C7D882D4D
X-TUID: VzegtkeZmwz0

* gnu/packages/patches/inetutils-hurd64.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/admin.scm (inetutils)[arguments]: When building for the 64bit
Hurd, use it in new "apply-hurd64-patch" stage.

Change-Id: I780f6a92418b49e5fe0d23eb1c90e155216f1428
---
 gnu/local.mk                                |  1 +
 gnu/packages/admin.scm                      | 14 ++++-
 gnu/packages/patches/inetutils-hurd64.patch | 65 +++++++++++++++++++++
 3 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 gnu/packages/patches/inetutils-hurd64.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 948fc4ba73..0759555494 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1570,6 +1570,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/indent-CVE-2024-0911.patch	\
   %D%/packages/patches/instead-use-games-path.patch		\
   %D%/packages/patches/intltool-perl-compatibility.patch	\
+  %D%/packages/patches/inetutils-hurd64.patch			\
   %D%/packages/patches/irrlicht-use-system-libs.patch		\
   %D%/packages/patches/irrlicht-link-against-needed-libs.patch	\
   %D%/packages/patches/isl-0.11.1-aarch64-support.patch	\
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 9c765b51a9..311d613b68 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -31,7 +31,7 @@
 ;;; Copyright © 2019, 2021, 2022 Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2019, 2020, 2021 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
-;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020, 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2020, 2021, 2022 Michael Rohleder <mike@rohleder.de>
 ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
 ;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
@@ -1044,7 +1044,17 @@ (define-public inetutils
                              "\\\""))
       ;; On some systems, 'libls.sh' may fail with an error such as:
       ;; "Failed to tell switch -a apart from -A".
-      #:parallel-tests? #f))
+      #:parallel-tests? #f
+      #:phases (if (target-hurd64?)
+                   #~(modify-phases %standard-phases
+                       (add-after 'unpack 'apply-hurd64-patch
+                         (lambda _
+                           (let ((patch
+                                  #$(local-file
+                                     (search-patch
+                                      "inetutils-hurd64.patch"))))
+                             (invoke "patch" "--force" "-p1" "-i" patch)))))
+                   #~%standard-phases)))
     (inputs
      (list coreutils
            shadow                     ;for login (used in telnetd and rlogind)
diff --git a/gnu/packages/patches/inetutils-hurd64.patch b/gnu/packages/patches/inetutils-hurd64.patch
new file mode 100644
index 0000000000..3fb238bcdc
--- /dev/null
+++ b/gnu/packages/patches/inetutils-hurd64.patch
@@ -0,0 +1,65 @@
+Upstream-status: Not presented upstream.
+
+From 0804e655a7abfd22dc3a053f03fab8f811405f84 Mon Sep 17 00:00:00 2001
+From: Janneke Nieuwenhuizen <janneke@gnu.org>
+Date: Fri, 8 Nov 2024 11:07:56 +0100
+Subject: [PATCH] ifconfig hurd: Build fix for the 64bit HUrd.
+Content-Transfer-Encoding: 8bit
+Content-Type: text/plain; charset=UTF-8
+
+* ifconfig/system/hurd.c (check_driving): Use mach_msg_type_number_t
+instead of size_t for file_get_fs_options.
+---
+ ifconfig/system/hurd.c | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/ifconfig/system/hurd.c b/ifconfig/system/hurd.c
+index 70b2ed27..86fe6375 100644
+--- a/ifconfig/system/hurd.c
++++ b/ifconfig/system/hurd.c
+@@ -47,7 +47,7 @@ check_driving (const char *name)
+   error_t err;
+ 
+   char *argz = 0, *new_argz = 0;
+-  size_t argz_len = 0;
++  mach_msg_type_number_t argz_len = 0;
+   char *entry = 0;
+   const char *socket = _SERVERS_SOCKET "/2";
+ 
+@@ -106,7 +106,9 @@ check_driving (const char *name)
+   new_argz = malloc (argz_len);
+   memcpy (new_argz, argz, argz_len);
+ 
+-  err = argz_insert (&new_argz, &argz_len, new_argz, name);
++  size_t new_argz_len = 0;
++
++  err = argz_insert (&new_argz, &new_argz_len, new_argz, name);
+   if (err)
+     {
+       error (0, err, "Could not prepend name %s to '%s' for %s", name,
+@@ -114,7 +116,7 @@ check_driving (const char *name)
+       goto out;
+     }
+ 
+-  err = argz_insert (&new_argz, &argz_len, new_argz, "-i");
++  err = argz_insert (&new_argz, &new_argz_len, new_argz, "-i");
+   if (err)
+     {
+       argz_stringify (new_argz, argz_len, ' ');
+@@ -122,10 +124,10 @@ check_driving (const char *name)
+       goto out;
+     }
+ 
+-  err = fsys_set_options (fsys, new_argz, argz_len, 1);
++  err = fsys_set_options (fsys, new_argz, new_argz_len, 1);
+   if (err)
+     {
+-      argz_stringify (new_argz, argz_len, ' ');
++      argz_stringify (new_argz, new_argz_len, ' ');
+       error (0, err, "Could not make pfinet %s drive %s with '%s'", socket,
+ 	     name, new_argz);
+       goto out;
+-- 
+Janneke Nieuwenhuizen <janneke@gnu.org>  | GNU LilyPond https://LilyPond.org
+Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com
+
-- 
Janneke Nieuwenhuizen <janneke@gnu.org>  | GNU LilyPond https://LilyPond.org
Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com