From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id gBPBI4Vq219MfQAA0tVLHw (envelope-from ) for ; Thu, 17 Dec 2020 14:26:13 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id MAyQH4Vq21+HNgAA1q6Kng (envelope-from ) for ; Thu, 17 Dec 2020 14:26:13 +0000 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 1D3829403C9 for ; Thu, 17 Dec 2020 14:26:13 +0000 (UTC) Received: from localhost ([::1]:35840 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpuEN-0002Qr-T1 for larch@yhetil.org; Thu, 17 Dec 2020 09:26:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55522) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpuEE-0002Ob-IW for guix-patches@gnu.org; Thu, 17 Dec 2020 09:26:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51831) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kpuEE-0003zf-AJ for guix-patches@gnu.org; Thu, 17 Dec 2020 09:26:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kpuEE-0003e8-6o for guix-patches@gnu.org; Thu, 17 Dec 2020 09:26:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45296] [PATCH] gnu: miredo: Fix to use iproute2 from the store. Resent-From: John Doe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 17 Dec 2020 14:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 45296 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45296@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160821510313925 (code B ref -1); Thu, 17 Dec 2020 14:26:02 +0000 Received: (at submit) by debbugs.gnu.org; 17 Dec 2020 14:25:03 +0000 Received: from localhost ([127.0.0.1]:35141 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kpuD3-0003c3-8u for submit@debbugs.gnu.org; Thu, 17 Dec 2020 09:25:03 -0500 Received: from lists.gnu.org ([209.51.188.17]:56186) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kpuD1-0003bt-FM for submit@debbugs.gnu.org; Thu, 17 Dec 2020 09:24:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55212) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpuD1-0001Wf-8p for guix-patches@gnu.org; Thu, 17 Dec 2020 09:24:47 -0500 Received: from smtp2-g21.free.fr ([2a01:e0c:1:1599::11]:60396) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpuCz-0003Tc-3a for guix-patches@gnu.org; Thu, 17 Dec 2020 09:24:46 -0500 Received: from localhost.localdomain (unknown [IPv6:2a01:e0a:2a2:1350:cd10:777c:7b57:3bb6]) (Authenticated sender: dftxbs3e) by smtp2-g21.free.fr (Postfix) with ESMTPSA id 596352003C6; Thu, 17 Dec 2020 15:24:37 +0100 (CET) From: John Doe Date: Thu, 17 Dec 2020 15:24:18 +0100 Message-Id: <20201217142418.4497-1-dftxbs3e@free.fr> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: none client-ip=2a01:e0c:1:1599::11; envelope-from=dftxbs3e@free.fr; helo=smtp2-g21.free.fr X-Spam_score_int: 10 X-Spam_score: 1.0 X-Spam_bar: + X-Spam_report: (1.0 / 5.0 requ) BAYES_00=-1.9, FREEMAIL_FROM=0.001, HK_RANDOM_ENVFROM=0.001, HK_RANDOM_FROM=0.852, SPF_HELO_NONE=0.001, SPF_NONE=0.001, SPOOFED_FREEMAIL=1.999 autolearn=no autolearn_force=no X-Spam_action: no action 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: , Cc: John Doe Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 2.69 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 1D3829403C9 X-Spam-Score: 2.69 X-Migadu-Scanner: scn0.migadu.com X-TUID: IYhrY8tF/ofI * gnu/packages/networking.scm (miredo): [inputs]: Add iproute. [arguments]: New phase 'patch-iproute2 that patches sources to use iproute2 from the store. --- gnu/packages/networking.scm | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 1226b8606f..281c4a0179 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -688,13 +688,22 @@ or, more generally, MAC addresses of the same category of hardware.") (arguments '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-iproute2 + (lambda* (#:key inputs #:allow-other-keys) + (let* ((iproute (assoc-ref inputs "iproute")) + (ip (string-append iproute "/sbin/ip"))) + (substitute* "misc/client-hook.iproute" + (("/sbin/ip") ip)) + #t))) ;; The checkconf test in src/ requires network access. (add-before - 'check 'disable-checkconf-test - (lambda _ - (substitute* "src/Makefile" - (("^TESTS = .*") "TESTS = \n")) - #t))))) + 'check 'disable-checkconf-test + (lambda _ + (substitute* "src/Makefile" + (("^TESTS = .*") "TESTS = \n")) + #t))))) + (inputs + `(("iproute" ,iproute))) (home-page "https://www.remlab.net/miredo/") (synopsis "Teredo IPv6 tunneling software") (description -- 2.29.2