dev-python/proton-vpn-network-manager: remove call to apt

Signed-off-by: Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com>
This commit is contained in:
Mattéo Rossillol‑‑Laruelle
2025-04-25 11:53:55 +02:00
parent 59ec039c37
commit 300dc16ab1
2 changed files with 52 additions and 0 deletions

View File

@@ -0,0 +1,51 @@
From c4e7ffaaf2d9ef97051875d96e426b03b5d33607 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matt=C3=A9o=20Rossillol=E2=80=91=E2=80=91Laruelle?=
<beatussum@protonmail.com>
Date: Fri, 25 Apr 2025 11:40:29 +0200
Subject: [PATCH] remove call to `apt`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
In Gentoo, `apt` is a part of the Java upstream and is installed by
`app-eselect/eselect-java`. This executable is not the `apt` package manager of
Debian. Its call has to be removed to avoid an annoying notification.
Signed-off-by: Mattéo RossillolLaruelle <beatussum@protonmail.com>
---
.../killswitch/default/nmkillswitch.py | 21 -------------------
1 file changed, 21 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
--- a/proton/vpn/backend/linux/networkmanager/killswitch/default/nmkillswitch.py
+++ b/proton/vpn/backend/linux/networkmanager/killswitch/default/nmkillswitch.py
@@ -101,25 +101,4 @@ class NMKillSwitch(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.
- 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
--
2.49.0

View File

@@ -32,6 +32,7 @@ RDEPEND="
"
CONFIG_CHECK="~DUMMY ~WIREGUARD"
PATCHES=( "${FILESDIR}/${P}-remove-call-to-apt.patch" )
distutils_enable_tests pytest