bug#68683: closed ([PATCH] gnu: vpn-slice: Include required inputs "iproute" and "iptables".)

[GNU bug Tracking System]

Your message dated Mon, 12 Feb 2024 09:10:43 +0100
with message-id <878r3qrtjx.fsf@elephly.net>
and subject line [PATCH] gnu: vpn-slice: Include required inputs "iproute" and 
"iptables".
has caused the debbugs.gnu.org bug report #68683,
regarding [PATCH] gnu: vpn-slice: Include required inputs "iproute" and 
"iptables".
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
68683: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=68683
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] gnu: vpn-slice: Include required inputs "iproute" and "iptables".
>
>
>
>
> Date: 
>
> Wed, 24 Jan 2024 10:18:39 +0100
>
>
>
>
> vpn-slice expects commands "ip" and "iptables" to be found according to FHS
> paths.
>
> * gnu/packages/vpn.scm (vpn-slice)[arguments]: Include inputs "iproute" and
> "iptables" and patch "vpn_slice/linux.py" to use correct locations in the
> store.
>
> Change-Id: Ia06e2bb99f060108cc0758e89174294bcbb2848d
> ---
>  gnu/packages/vpn.scm | 28 ++++++++++++++++++++--------
>  1 file changed, 20 insertions(+), 8 deletions(-)
>
> diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
> index 02c1ee1043..a6a83c9145 100644
> --- a/gnu/packages/vpn.scm
> +++ b/gnu/packages/vpn.scm
> @@ -23,6 +23,7 @@
>  ;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
>  ;;; Copyright © 2022 Jean-Pierre De Jesus DIAZ <me@jeandudey.tech>
>  ;;; Copyright © 2022 Arun Isaac <arunisaac@systemreboot.net>
> +;;; Copyright © 2024 Allan Adair <allan@adair.no>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -1245,17 +1246,28 @@ (define-public vpn-slice
>    (package
>      (name "vpn-slice")
>      (version "0.16.1")
> -    (source (origin
> -              (method url-fetch)
> -              (uri (pypi-uri "vpn-slice" version))
> -              (sha256
> -               (base32
> -                "1anfx4hn2ggm6sbwqmqx68s3l2rjcy4z4l038xqb440jnk8jvl18"))))
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "vpn-slice" version))
> +       (sha256
> +        (base32 "1anfx4hn2ggm6sbwqmqx68s3l2rjcy4z4l038xqb440jnk8jvl18"))))
>      (build-system python-build-system)
> -    (inputs (list python-dnspython python-setproctitle))
> +    (arguments
> +     `(#:phases (modify-phases %standard-phases
> +                  (add-after 'unpack 'patch-FHS-file-names
> +                    (lambda _
> +                      (substitute* "vpn_slice/linux.py"
> +                        (("/sbin/iptables")
> +                         (which "iptables")))
> +                      (substitute* "vpn_slice/linux.py"
> +                        (("/sbin/ip")
> +                         (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")
> -    (description "vpn-slice is a replacement for @command{vpnc-script} used by
> +    (description
> +     "vpn-slice is a replacement for @command{vpnc-script} used by
>  @code{openconnect} and @code{vpnc}.  Instead of trying to copy the behavior of
>  standard corporate VPN clients, which normally reroute all your network
>  traffic through the VPN, vpn-slice tries to minimize your contact with an
>
> base-commit: 3419c216b485532dd3c3ed7959553d7900eb1fea
> -- 
> 2.41.0
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] gnu: vpn-slice: Include required inputs "iproute" and "iptables".
>
>
>
>
> Date: 
>
> Mon, 12 Feb 2024 09:10:43 +0100
>
>
>
>
> User-agent: 
>
> mu4e 1.10.8; emacs 29.1
>
>
>
>
> Thanks for the patch!  I simplified it just a bit and pushed it with
> commit bd9da702123ab746bd43de5b0fc0c129874b15aa.
>
> -- 
> Ricardo
>
>
> --- End Message ---