From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org> 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 mOrKEaWNMGcOIwEAe85BDQ:P1 (envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>) for <larch@yhetil.org>; Sun, 10 Nov 2024 10:40:37 +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 mOrKEaWNMGcOIwEAe85BDQ (envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>) for <larch@yhetil.org>; Sun, 10 Nov 2024 11:40:37 +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=rJ8jfnhC; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b="Fe9o/xOG"; 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=1731235236; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=80sCmpNqr6PvDwf+acu2S14tH5ZyUFodXiRCx7yuzM0=; b=HR/JZYYpX0TlpLcqIlcovPB7nr34v+yltO0Mx1/BR1ZWVdUmGEM3MqThGQ9BtdvYLUTZ5Z BU1/6Z3tn8Ca1nKG3x5B/vwVzuqIcpUXRqOD9n7BPDqTgFf+0n478BPD5mP1L3LinSCwBr nlpt4C4e1bYkzKNctRtcQNUiuhGry5Jw5vrxF82qeeHCQ1j5WW5V1tX55DnyfisU+WCWw5 SKBI//obW2IoTPuGm5vooKrNpFaNt/1oNBLikn9+sgX1bAmu/2UpBmtfY296jHhq4vEib7 +bH0Ffk8uAOPCNKHAZiHXPc79tfehcD8GBhimm06Y9erud8MU/42/alFmAaBsw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=rJ8jfnhC; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b="Fe9o/xOG"; 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=1731235236; a=rsa-sha256; cv=none; b=IY71nq1+mNdD5UtTmgI6v74pTaT11HbgwxMCdFaV53TJxdCZ8gt4cKU7FYzoSJSADXZZ5m wzHBHgTRKtCrMJhwyhFOR0olDnGvrvDO47onrB8w5ubeaHtMuZTrXt/yJgwkYiSQpdz4xP rIY+KPCp6jlVCsUMoth9v0ezeUbCsdvVa05bNCxJR2nmYiAAWslub8fFugyE9oeh0A6zh6 C4cngf+6kYnD39TOdtuzc+U5h39bHeScrDQdUHS86swQ9PkVUpIlM/k6K7n6Wb/j/siuPX AWYBnukXNjN6/N4gPu4F5BLAOd2XPYHptReLYNodEao550pibFwgLe2H75LJIQ== 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 C871B7BCD4 for <larch@yhetil.org>; Sun, 10 Nov 2024 11:40:36 +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 1tA5Mf-000196-NK; Sun, 10 Nov 2024 05:40:17 -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 1tA5MZ-00012f-GJ for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40:11 -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 1tA5MZ-0008Hl-28 for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40:11 -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=80sCmpNqr6PvDwf+acu2S14tH5ZyUFodXiRCx7yuzM0=; b=rJ8jfnhCeoVV+x/9o+NL7WQIQ8xlahB8wzLvJo0VmqWYxM0nkY9S1w2fNttYyft6a0d9BfpgzUvINw++XasAfRIPxLmWFS71ZUmYpikCyXrW6T7nVOLP8XjtFx0bNqD1/yYOrH6NDy2PET+iALB2aKF/Gra0uImiAXYDFctc6P7Ei4N1t9XK3VFjaf+3TnTVa8Jq7pGLh76qcbg7/qdzSrbd707oPVhYyxV0Mzjx5zgR+EyrckRT4UT2SSljzB/2sKOCXDokr/XiGOV37Dn0tbkUzjHAK8YUyh9ggnlwEKzy6HQ2nuP4XfbupllTaGSlf4zb+ctZEbT15d8eb5ikmA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tA5MY-0002nh-TW for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH 28/31] 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: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:40:10 +0000 Resent-Message-ID: <handler.74290.B74290.173123516910302@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 Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173123516910302 (code B ref 74290); Sun, 10 Nov 2024 10:40:10 +0000 Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:29 +0000 Received: from localhost ([127.0.0.1]:55809 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1tA5Ls-0002g3-6J for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35762) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <janneke@gnu.org>) id 1tA5Lj-0002dH-Tu for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:20 -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 1tA5Le-0007vT-Mp; Sun, 10 Nov 2024 05:39:14 -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=80sCmpNqr6PvDwf+acu2S14tH5ZyUFodXiRCx7yuzM0=; b=Fe9o/xOG/aT4UVnj7AaS MMD66ejxsz7e0ax0GsL8p5JQ8tCHuo13OGdoChga2nYO7KKvgxoqnOuVuBdxV5fYAmIqYJ6+JnUrj 4WWCjKS0DHayOXNQP5JcvhVDnQu3w2S9hUljCgjStrVY12spF1NXMcwfugU3V2cWmhnWJqhVRPL96 WqKgV1u17kQBaPqxFyEG81cxaqo4q8ljILsLUT0K5nymutyYY/uEBinL5gXtScLZPTkG214DMar1Y zkaDrsCfCJETOLzVxNiiouSD3i0lQoUJ6ZNxHnPXoZGlAX/JfC650/TZZ8E3sCj0YXi/m14UIICuI U6DEH8cvhS4s0Q==; From: Janneke Nieuwenhuizen <janneke@gnu.org> Date: Sun, 10 Nov 2024 11:38:24 +0100 Message-ID: <e84d13c6690c6d23f0b96738eed7548c5487934c.1731232753.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <cover.1731232753.git.janneke@gnu.org> References: <cover.1731232753.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: C871B7BCD4 X-TUID: Jx43McU5ECtW * 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 cf0de3d92e..6a46241e5f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1568,6 +1568,7 @@ dist_patch_DATA = \ %D%/packages/patches/ilmbase-fix-tests.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 db9aea31a5..f0dde60d6a 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> @@ -1000,7 +1000,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