From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id EMcyD3mkzGUwGAAAe85BDQ:P1 (envelope-from ) for ; Wed, 14 Feb 2024 12:31:05 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id EMcyD3mkzGUwGAAAe85BDQ (envelope-from ) for ; Wed, 14 Feb 2024 12:31:05 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; 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=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1707910265; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=REE9/w/+ymKiJDy+hKX5INHUu9iH3aPbjAp/37q2fN0=; b=JWVIj6BulKg5DZlavHAl6hPpWHrUjw/ZzySU3axf9CDrT521DOUFjHR/NuNXwbaCq8gJzH qIXjMWKuJwYXAvSOnnl/RAro47UBv3C9MrCJqeH7g3PDwxkOopHkqKUg1a9KiTiCT26sSX NOd2lXFjdsOecyg82Ho8dTfs1C5hS8x2gOR7XdLBQNvhePiODCnLL6rlWXZhbtmnhoY+un dlK9evlWZwGqySxQMtoTqb/8qIO06gx3nUpJQKohJk5qYWfUGWJoPk3sKlN9d/LOjpjojH R2FZIyNuPER65OWpIFRwX54P02WplmN/OcBcq76GuP1HtlITMMWBf48wr/K3sA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; 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=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1707910265; a=rsa-sha256; cv=none; b=OodLVFV1MhhSqVilMigju+/0hRwsTQ7AdCdtPvUC9BCzXnuFgKeY48dVYv8fyo04imCAgO b0AKTvQ9bU5NPjugflVnUDHkn2AKcMn/W87Q5Ddot2UGUjtIRWozZYRNAOp+vQvt8ZVidl YI8KakNZXtg9iCiuhHs9IVec5wJsaWC31nnR226Quhlm+n+nrUt0qKb4l26iMaYhu+rB90 r0FdXqmJ8zwaNdOOWpYq6nZtmmfMMX8k26uzy6W23ZjRkZs4u/9kS0/C+jLLLALqJz5XkV TShpjQeJoKFSHTggEFR2xebhpeZBEXFwlYtIXsOGFoZWOaWR/iPTcabgvA7aCw== 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 EB9F160E0A for ; Wed, 14 Feb 2024 12:31:04 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1raDTR-0003us-Pr; Wed, 14 Feb 2024 06:30:45 -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 1raDTQ-0003uk-44 for guix-patches@gnu.org; Wed, 14 Feb 2024 06:30:44 -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 1raDTP-0002dV-Rh for guix-patches@gnu.org; Wed, 14 Feb 2024 06:30:43 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1raDTh-0007j3-P6 for guix-patches@gnu.org; Wed, 14 Feb 2024 06:31:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69121] [PATCH] gnu: vpn-slice: Fix substitution paths for "ip" and "iptables". Resent-From: Allan Adair Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Feb 2024 11:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69121 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69121@debbugs.gnu.org Cc: Allan Adair X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170791025029675 (code B ref -1); Wed, 14 Feb 2024 11:31:01 +0000 Received: (at submit) by debbugs.gnu.org; 14 Feb 2024 11:30:50 +0000 Received: from localhost ([127.0.0.1]:50613 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raDTW-0007iZ-11 for submit@debbugs.gnu.org; Wed, 14 Feb 2024 06:30:50 -0500 Received: from lists.gnu.org ([209.51.188.17]:33532) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raDTT-0007iQ-BA for submit@debbugs.gnu.org; Wed, 14 Feb 2024 06:30:48 -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 1raDTB-0003uA-1f for guix-patches@gnu.org; Wed, 14 Feb 2024 06:30:29 -0500 Received: from relay7-d.mail.gandi.net ([2001:4b98:dc4:8::227]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1raDT8-0002aw-BN for guix-patches@gnu.org; Wed, 14 Feb 2024 06:30:28 -0500 Received: by mail.gandi.net (Postfix) with ESMTPSA id E599620002; Wed, 14 Feb 2024 11:30:18 +0000 (UTC) From: Allan Adair Date: Wed, 14 Feb 2024 12:29:25 +0100 Message-ID: <49af58fd668de419521436b4c9e6e181be57d2dc.1707910165.git.allan@adair.no> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-GND-Sasl: allan@adair.no Received-SPF: pass client-ip=2001:4b98:dc4:8::227; envelope-from=allan@adair.no; helo=relay7-d.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx13.migadu.com X-Spam-Score: -5.27 X-Migadu-Queue-Id: EB9F160E0A X-Migadu-Spam-Score: -5.27 X-TUID: Wji4kBnj1n87 vpn-slice expects commands "ip" and "iptables" to be found according to FHS paths. A previous patch introduced an incorrect path for iptables because of overlapping matches for "/sbin/ip" and "/sbin/iptables". * gnu/packages/vpn.scm (vpn-slice)[arguments]: Fix substitution paths in "vpn_slice/linux.py" for "ip" and "iptables" commands. Change-Id: I68ffc002a3aa5ebcdff2fa6ecc64b6b1231a17e7 --- gnu/packages/vpn.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 7823ef19eb..758356f404 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -1261,10 +1261,10 @@ (define-public vpn-slice (add-after 'unpack 'patch-FHS-file-names (lambda _ (substitute* "vpn_slice/linux.py" - (("/sbin/iptables") - (which "iptables")) - (("/sbin/ip") - (which "ip")))))))) + (("'/sbin/iptables'") + (string-append "'" (which "iptables") "'")) + (("'/sbin/ip'") + (string-append "'" (which "ip") "'")))))))) (inputs (list python-dnspython python-setproctitle iproute iptables)) (home-page "https://github.com/dlenski/vpn-slice") (synopsis "Split tunneling replacement for vpnc-script") base-commit: 2ba2875dbda4b080fcad4e6d672bb4104d59dd0c -- 2.41.0