From: Allan Adair <allan@adair.no>
To: 69121@debbugs.gnu.org
Cc: Allan Adair <allan@adair.no>
Subject: [bug#69121] [PATCH] gnu: vpn-slice: Fix substitution paths for "ip" and "iptables".
Date: Wed, 14 Feb 2024 12:29:25 +0100 [thread overview]
Message-ID: <49af58fd668de419521436b4c9e6e181be57d2dc.1707910165.git.allan@adair.no> (raw)
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
reply other threads:[~2024-02-14 11:31 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=49af58fd668de419521436b4c9e6e181be57d2dc.1707910165.git.allan@adair.no \
--to=allan@adair.no \
--cc=69121@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.