commit: e1c0da9dc33ab18d1909ed8969a73507efc6ec2f Author: Mattéo Rossillol‑‑Laruelle <beatussum <AT> protonmail <DOT> com> AuthorDate: Fri Apr 25 13:26:48 2025 +0000 Commit: Mattéo Rossillol‑‑Laruelle <beatussum <AT> protonmail <DOT> com> CommitDate: Fri Apr 25 13:26:48 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e1c0da9d
dev-python/proton-vpn-network-manager: remove missing call to `apt` Signed-off-by: Mattéo Rossillol‑‑Laruelle <beatussum <AT> protonmail.com> ...etwork-manager-0.12.13-remove-call-to-apt.patch | 37 ++++++++++++++++++++-- ...> proton-vpn-network-manager-0.12.13-r2.ebuild} | 0 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dev-python/proton-vpn-network-manager/files/proton-vpn-network-manager-0.12.13-remove-call-to-apt.patch b/dev-python/proton-vpn-network-manager/files/proton-vpn-network-manager-0.12.13-remove-call-to-apt.patch index 48913bccc..e6258c312 100644 --- a/dev-python/proton-vpn-network-manager/files/proton-vpn-network-manager-0.12.13-remove-call-to-apt.patch +++ b/dev-python/proton-vpn-network-manager/files/proton-vpn-network-manager-0.12.13-remove-call-to-apt.patch @@ -1,7 +1,7 @@ -From c4e7ffaaf2d9ef97051875d96e426b03b5d33607 Mon Sep 17 00:00:00 2001 +From a58f2e046f2e7dcb008158b54db2f0bdace0cc1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matt=C3=A9o=20Rossillol=E2=80=91=E2=80=91Laruelle?= <[email protected]> -Date: Fri, 25 Apr 2025 11:40:29 +0200 +Date: Fri, 25 Apr 2025 15:14:48 +0200 Subject: [PATCH] remove call to `apt` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -14,7 +14,8 @@ Debian. Its call has to be removed to avoid an annoying notification. Signed-off-by: Mattéo Rossillol‑‑Laruelle <[email protected]> --- .../killswitch/default/nmkillswitch.py | 21 ------------------- - 1 file changed, 21 deletions(-) + .../killswitch/wireguard/wgkillswitch.py | 21 ------------------- + 2 files changed, 42 deletions(-) diff --git a/proton/vpn/backend/linux/networkmanager/killswitch/default/nmkillswitch.py b/proton/vpn/backend/linux/networkmanager/killswitch/default/nmkillswitch.py index 6650a97..a2e2cfd 100644 @@ -24,6 +25,36 @@ index 6650a97..a2e2cfd 100644 logger.error("NetworkManager is not running.") return False +- # libnetplan0 is the first version that is present in Ubuntu 22.04. In Ubuntu 24.04 +- # the package name changes to libnetplan1, and it's not compatible with this kill +- # switch implementation when IPv6 is disabled via the ipv6.disabled kernel option. +- try: +- result = subprocess.run( +- ["/usr/bin/apt", "show", "libnetplan1"], +- capture_output=True, +- check=True, shell=False +- ) # nosec B603:subprocess_without_shell_equals_true +- except (FileNotFoundError, subprocess.CalledProcessError): +- pass +- else: +- stdout_decoded = result.stdout.decode("utf8").split("\n") +- for package_info_line in stdout_decoded: +- if package_info_line.startswith("Version: 1.0.0"): +- logger.warning( +- "Kill switch is not compatible with libnetplan1 v1.0.0. " +- "Please upgrade libnetplan1 package to v1.1.1" +- ) +- break +- + return True +diff --git a/proton/vpn/backend/linux/networkmanager/killswitch/wireguard/wgkillswitch.py b/proton/vpn/backend/linux/networkmanager/killswitch/wireguard/wgkillswitch.py +index aff3cd4..0123b43 100644 +--- a/proton/vpn/backend/linux/networkmanager/killswitch/wireguard/wgkillswitch.py ++++ b/proton/vpn/backend/linux/networkmanager/killswitch/wireguard/wgkillswitch.py +@@ -104,25 +104,4 @@ class WGKillSwitch(KillSwitch): + logger.error("NetworkManager is not running.") + return False + - # libnetplan0 is the first version that is present in Ubuntu 22.04. In Ubuntu 24.04 - # the package name changes to libnetplan1, and it's not compatible with this kill - # switch implementation when IPv6 is disabled via the ipv6.disabled kernel option. diff --git a/dev-python/proton-vpn-network-manager/proton-vpn-network-manager-0.12.13-r1.ebuild b/dev-python/proton-vpn-network-manager/proton-vpn-network-manager-0.12.13-r2.ebuild similarity index 100% rename from dev-python/proton-vpn-network-manager/proton-vpn-network-manager-0.12.13-r1.ebuild rename to dev-python/proton-vpn-network-manager/proton-vpn-network-manager-0.12.13-r2.ebuild
