From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.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 oJesJZDfQmcSewAAe85BDQ:P1 (envelope-from ) for ; Sun, 24 Nov 2024 08:10:56 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id oJesJZDfQmcSewAAe85BDQ (envelope-from ) for ; Sun, 24 Nov 2024 09:10:56 +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=EVQtiI4o; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=BnSMrDvC; 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=1732435856; 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=xW+ypXkl5kj3M4z5ruQ2pZCfstkeK+XCraIR6PrrVO4=; b=NnGUQuW1fOle1x4pw4Rs/sUGgWWvTfHEqsERIKF4ByIMzEAbBZU7KIPWWcAI6OYl1aJxRW uivZoOaG2y4LoCu5PDkiQnToIKpeODASe61lo2I5nR1IqnXxKdjHugHuqudUHkPzUcIz5N rPNzTqfuywmYabAzjYSO+AnBObgvshR5nKp+ndl8Fod6CuEjPhYYEQMd/u11xSGBrnGv/D 88RHC0JtoUjMz7LL1DzbobiRv2ycgtux5RsSy17AODBihFw//NGlWlpvj71FLoU9Thbt4C GVKOMZtu9j64+SW8c9zbKjeDi9ViqH5eiPeybvQ+rK/nxXwEuRkSa1FybaHhFQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=EVQtiI4o; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=BnSMrDvC; 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=1732435856; a=rsa-sha256; cv=none; b=Cb2NK0IG0ofzF+Df4RnjgsyLBK0CmQy7pA0fu9qKh60N0vVhgsMXbpzulMP9/WaRS0JKbs aA0z2Y1mnlRbNcn6aTgXQcf0TI8dap8oHYL/8BsFNgyrMMNR8iGf3PZb3AYLpZgIyTQmz1 gnoBEevX092FPkYuALv6rUe71opT3ifFA2uYl8MsGgjMhoYgbyowiUGdlFEv4cQEkpSMD8 hKPkiZv2fF5iRtjovm3tu57PpKPsdl6pdfZMRWqjPC1NGGMXdepFMDg/oEqvxTdujDUG7V oMg3B3Erb7cbDOg5UQ+hGCq5BVqolT927sCLZYqSmBo33JhBUP5QdDRHPDE/zA== 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 6AFC47B6D4 for ; Sun, 24 Nov 2024 09:10:56 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7Vu-0001YY-Rg; Sun, 24 Nov 2024 02:58:39 -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 1tF7Ul-0000RP-6v for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:32 -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 1tF7Uk-0002Pe-UE for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:26 -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=xW+ypXkl5kj3M4z5ruQ2pZCfstkeK+XCraIR6PrrVO4=; b=EVQtiI4oQYLUzFRP+c4+YjSSrp/LmWEEess5slGp9sH8SW0S2cqHKNIqtcnK4Ge2893y7qrSfzk9Hh+um8e04OK1YQpjyaG/1aVGSd7OG4mnw92kXqyAR3ABj7t9IA/cs4USWJXcXl8kXUx2dtLHdIQs/bA1BPsC5VGxwX+uozyiQKb0ubnDa5imA5Cuk+tlpI2uIPnUM7PCHkiDAYFy01u7BrW93KtkgmwM8ERBwcq+x2+vGHF0oAJluWPCEqzNq1BiiDYV4Llc9tv8RUqqeNpXWbUsyKjfiMxnBnQtUhLl3DE0L+Btxd+aWR8qcBs8y+0dPdpMBL6mbfF0HtGGzA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7Uk-0004mY-OB; Sun, 24 Nov 2024 02:57:26 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 39/58] gnu: inetutils: Fix build for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:26 +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: Sharlatan Hellseher X-Debbugs-Original-Xcc: Sharlatan Hellseher Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243503518165 (code B ref 74290); Sun, 24 Nov 2024 07:57:26 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:57:15 +0000 Received: from localhost ([127.0.0.1]:60847 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7UY-0004ib-Ki for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55748) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7Ty-0004aX-T8 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:39 -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 1tF7Tt-0002FF-Mc; Sun, 24 Nov 2024 02:56:33 -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=xW+ypXkl5kj3M4z5ruQ2pZCfstkeK+XCraIR6PrrVO4=; b=BnSMrDvCppt5tcFEzfx3 8XwVCacgPA4LCDRP3HGjJjzvxe9/noMQVCbIi2+roVsjqNBNgqsxbIF0Jkh4azJkWr4Fl91FEoMZT voRZutli7jSZX6lI7Wy7jsU+CvpLj2ud6LjgD2VmIPMQEc2C0Y+TfjcXQTP2EEj81jfufuctqVVO7 1NE2OkKrJqc42/PbU14GGV13XUYxmno5M1s2XN96goszZ963a/9S6TtZzupEPecLPkC8MrEX6BUDk XDO1iLfoxkJS2ekbvZIr1DLQ832d12EYRO5k1ylVVK3fH9f0Qib7DdGEnkLcRrjdLPlQjuopLaK8k CaqSEwo/7sToqw==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:55:02 +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-Scanner: mx11.migadu.com X-Migadu-Spam-Score: -3.53 X-Spam-Score: -3.53 X-Migadu-Queue-Id: 6AFC47B6D4 X-TUID: 6nig+1dF99nf * 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 eb1bc43276..c8fbae91fc 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1577,6 +1577,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 46282da67e..fbf3e26a3f 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -31,7 +31,7 @@ ;;; Copyright © 2019, 2021, 2022 Guillaume Le Vaillant ;;; Copyright © 2019, 2020, 2021 Mathieu Othacehe ;;; Copyright © 2020 Oleg Pykhalov -;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen +;;; Copyright © 2020, 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2020, 2021, 2022 Michael Rohleder ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Morgan Smith @@ -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 +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 | GNU LilyPond https://LilyPond.org +Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com + -- 2.46.0