From patchwork Wed Jan 24 09:18:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Allan Adair X-Patchwork-Id: 59358 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id AB1B327BBE9; Wed, 24 Jan 2024 09:20:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B6F8327BBE2 for ; Wed, 24 Jan 2024 09:20:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rSZQM-0004X7-Nk; Wed, 24 Jan 2024 04:19:58 -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 1rSZQL-0004Vq-G5 for guix-patches@gnu.org; Wed, 24 Jan 2024 04:19:57 -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 1rSZQL-00029B-7G for guix-patches@gnu.org; Wed, 24 Jan 2024 04:19:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rSZQQ-0002ya-3V for guix-patches@gnu.org; Wed, 24 Jan 2024 04:20:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68683] [PATCH] gnu: vpn-slice: Include required inputs "iproute" and "iptables". Resent-From: Allan Adair Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 24 Jan 2024 09:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68683 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68683@debbugs.gnu.org Cc: Allan Adair X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170608799311415 (code B ref -1); Wed, 24 Jan 2024 09:20:02 +0000 Received: (at submit) by debbugs.gnu.org; 24 Jan 2024 09:19:53 +0000 Received: from localhost ([127.0.0.1]:44461 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSZQH-0002y3-7S for submit@debbugs.gnu.org; Wed, 24 Jan 2024 04:19:53 -0500 Received: from lists.gnu.org ([2001:470:142::17]:35298) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSZQE-0002xq-Jr for submit@debbugs.gnu.org; Wed, 24 Jan 2024 04:19:51 -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 1rSZQ3-0004SE-Ht for guix-patches@gnu.org; Wed, 24 Jan 2024 04:19:39 -0500 Received: from relay3-d.mail.gandi.net ([2001:4b98:dc4:8::223]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rSZQ1-000260-QN for guix-patches@gnu.org; Wed, 24 Jan 2024 04:19:39 -0500 Received: by mail.gandi.net (Postfix) with ESMTPSA id 0685F6000C; Wed, 24 Jan 2024 09:19:32 +0000 (UTC) From: Allan Adair Date: Wed, 24 Jan 2024 10:18:39 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-GND-Sasl: allan@adair.no Received-SPF: pass client-ip=2001:4b98:dc4:8::223; envelope-from=allan@adair.no; helo=relay3-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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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(-) base-commit: 3419c216b485532dd3c3ed7959553d7900eb1fea 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 ;;; Copyright © 2022 Jean-Pierre De Jesus DIAZ ;;; Copyright © 2022 Arun Isaac +;;; Copyright © 2024 Allan Adair ;;; ;;; 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