all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#69121] [PATCH] gnu: vpn-slice: Fix substitution paths for "ip" and "iptables".
@ 2024-02-14 11:29 Allan Adair
  0 siblings, 0 replies; only message in thread
From: Allan Adair @ 2024-02-14 11:29 UTC (permalink / raw)
  To: 69121; +Cc: Allan Adair

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





^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2024-02-14 11:31 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-14 11:29 [bug#69121] [PATCH] gnu: vpn-slice: Fix substitution paths for "ip" and "iptables" Allan Adair

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.