From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id GOUDO69CPGeubwEAqHPOHw:P1 (envelope-from ) for ; Tue, 19 Nov 2024 07:48:00 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id GOUDO69CPGeubwEAqHPOHw (envelope-from ) for ; Tue, 19 Nov 2024 08:48:00 +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="eaG/0YA0"; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=evmoruiv; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1732002479; a=rsa-sha256; cv=none; b=NjkXLbEdvWQSJZ3cfdMks19meNassPJ385CIEy8i3mfjrysSQYnpDGMP7ubdN1wGwaeYwM 1EhPSb40f700Ft9aK+ha0O2aWj/X+2fwXiWri9LGNB1yUGPxOas5csqd2SuE3Opu4627Yf r8IQE3Gl7UA6IdEAoYjuItruRJC2xvPbbdFCg0eyq6pmbGg3jhegP47dj28mbyZago7sL1 2CWttdR/p6lCzFK6hQHqD3ecNoY4XH+RALbN7+Bqs6fVAd+i7H1DhO2Z5G713L55uBkczw yGDVNbrAxpRxzZ4AXuKnM7gK/Y/dVFst8tQSwUTspo2MVPRU6aLb48bq09E1Cw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="eaG/0YA0"; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=evmoruiv; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1732002479; 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=VB42GMco4qrpKykieVzHxQv6yc8s12IUhc59oK/i9uc=; b=et+J+5MXtEpbZTlfxPIQwWZMa7GSpYuGHPpzwaIFaoChiLkUKA8GM97AaF99zND476mm/M oij54tRExD/eGUT28xiulNJHywQln/gKCmWhQwV9zp3ijkxS6b689qgRNZyK8luwyBoggV 2c1tfiOZn7ZnpLqZM3M4iBNe9nXbVqr22hoLtk8eYxy+yJVt0PAdFGNsU3i0lIdHarY3DZ hfsU0uV+wec9/ffb/vIYBIx80glG/5AQGOtsKd2aIc9Qlhljia0irvkPU1jVTGIRmIfXUA nbAkjK0aMD3wqm6HTNZeuCUDhyNNIlERETMcQbF+Jxz3KkB7NqpMpiqUqal1Eg== 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 AD1081D0E2 for ; Tue, 19 Nov 2024 08:47:59 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tDICz-00007l-IS; Tue, 19 Nov 2024 01:59:33 -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 1tDICx-0008WD-Ha for guix-patches@gnu.org; Tue, 19 Nov 2024 01:59:31 -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 1tDICs-0004M9-RR for guix-patches@gnu.org; Tue, 19 Nov 2024 01:59:30 -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=VB42GMco4qrpKykieVzHxQv6yc8s12IUhc59oK/i9uc=; b=eaG/0YA0bLXeayI89CfJrGZ/6qGwkWpBHEbzuK6806OVK4M0o2UF+m5v+FAEJV0argkpWrogqhNyYhMGiOy2F3TH8Srkk2GxIghG5yXQCHc/yNIfrMe3dvDiDWpTyvdFc52B40GditydF1Rx6d/iioHej8Zs0ompxPiXmKSBnlpucEBjdMxAcPDdPEsflVp5zg4LkUN/apvvxSibmOo9dI7q6wqv7nZdR+SYJ9808JHjM/V+ZeCoGolgsoku7xTBWuJ0yYcCZVAHk5SWv4nKzdk3UbaVOSLcWELuSZRMkvEQtcjvq1+tnitqNGv8mg92KNxq2QqtLAphtQasNrhXdg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tDICr-0005KW-HU; Tue, 19 Nov 2024 01:59:25 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 37/51] gnu: inetutils: Fix build for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: rekado@elephly.net, guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 06:59:25 +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: Ricardo Wurmus X-Debbugs-Original-Xcc: Ricardo Wurmus Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173199955520329 (code B ref 74290); Tue, 19 Nov 2024 06:59:25 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:15 +0000 Received: from localhost ([127.0.0.1]:40616 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICg-0005Hb-Bd for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52160) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICE-0005BM-1Q for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:46 -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 1tDIA3-000440-50; Tue, 19 Nov 2024 01:56:31 -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=VB42GMco4qrpKykieVzHxQv6yc8s12IUhc59oK/i9uc=; b=evmoruivZRhpp5aitffu X9ngrEp8m35vu8v87qi6qk1Ls2PHknCn5zIpDyvjxGVlAuU/bu6eaoPbPl3yevuSuhLJtIYHG5GCL 9FE7KhcrjQjNcINIvXPKdQ/4+zT3ZacR9CqnbbT4L2gpa1VtZoGnyURHehAX/sftI2/Z0J8694kuf ECW2GPMEgkD1sMbHM1W9WCAg4qfwn+wBBO+udLUZHj9NC2os6eDSieyhcSyHNqlbb6gnwqvVLhySu SuvL+Ft3XPNIRKicOV7VsLOJmiMp1PDcP+vFUth3JFdf8jNc5aPCEK7fIcLoS2yWUPzEFLtroER7y zrOE6eSHqrKuLQ==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:55:07 +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-Spam-Score: -4.64 X-Spam-Score: -4.64 X-Migadu-Queue-Id: AD1081D0E2 X-Migadu-Scanner: mx10.migadu.com X-TUID: xxjZ8JO0mc8w * 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 8a607e5df7..0979414ec2 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 9c765b51a9..311d613b68 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