GNU bug report logs - #69121
[PATCH] gnu: vpn-slice: Fix substitution paths for "ip" and "iptables".

Previous Next

To reply to this bug, email your comments to 69121 AT debbugs.gnu.org.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Allan Adair <allan <at> adair.no>
To: guix-patches <at> gnu.org
Cc: Allan Adair <allan <at> adair.no>
Subject: [PATCH] gnu: vpn-slice: Fix substitution paths for "ip" and
 "iptables".
Date: Wed, 14 Feb 2024 12:29:25 +0100

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

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.