commit: 930a8fa506ab16c6ed0e96d1b6f425b712b1dc43 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Sun Oct 12 09:36:43 2025 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Sun Oct 12 09:48:15 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=930a8fa5
net-vpn/networkmanager-openvpn: drop 1.10.2-r1 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> net-vpn/networkmanager-openvpn/Manifest | 1 - ...manager-openvpn-1.10.2-openvpn-2.6-compat.patch | 43 ---------------- .../networkmanager-openvpn-1.10.2-r1.ebuild | 60 ---------------------- 3 files changed, 104 deletions(-) diff --git a/net-vpn/networkmanager-openvpn/Manifest b/net-vpn/networkmanager-openvpn/Manifest index b435786a1e04..d1c6a4fe882b 100644 --- a/net-vpn/networkmanager-openvpn/Manifest +++ b/net-vpn/networkmanager-openvpn/Manifest @@ -1,3 +1,2 @@ -DIST NetworkManager-openvpn-1.10.2.tar.xz 701652 BLAKE2B c6cef27e57320dc68c168248981f54d2a8eb0a2b19524e11b2c25da04dc98f2a4e00e07b9b83d92d1654c26685d46d8f152c95462e4d73f853872fa3553735bb SHA512 469aa4eeab169ccabd04b18b425ab2f8ad095e19c80dfca528855e1c66314e3ac129145ce5e62f5ccbb7a01cd7ba7f657571c3f4ec57b15ecb95aeaa765f5c4a DIST NetworkManager-openvpn-1.12.0.tar.xz 707720 BLAKE2B 7a26e0f8277d22ec960dc2489dabd39271afd6692da66a74f92049b313226f370365767890c3f11fc9f14320a6e749ea8883c265a0dc0f8c776673c5a5d2d9c8 SHA512 106b2bc594fe8903382f6b25d7cc8b9263ce071f4edf2dd222bd9692e0aa86f01fcb1e340f1c0fdb75133c5a9e0a319c0a8002f4ca9477a74bec869fcc448faf DIST NetworkManager-openvpn-1.12.3.tar.xz 724904 BLAKE2B 3dfe1ec8425e9b38b506bac0d55940ca1db8270b2608b74547384cdd62355abd1bbfc3a23996eb851916d80d591a64c3401032249f2040152b32828c18ccbc9a SHA512 6fc22ae2397af9d8edb7210e80f0ee23a838cc3449028d3209dfb8d0f18d7d037329ef621b4a811526931c449fa5d3950fc608037f393f4c8f822874f7791123 diff --git a/net-vpn/networkmanager-openvpn/files/networkmanager-openvpn-1.10.2-openvpn-2.6-compat.patch b/net-vpn/networkmanager-openvpn/files/networkmanager-openvpn-1.10.2-openvpn-2.6-compat.patch deleted file mode 100644 index 2b8774b412e8..000000000000 --- a/net-vpn/networkmanager-openvpn/files/networkmanager-openvpn-1.10.2-openvpn-2.6-compat.patch +++ /dev/null @@ -1,43 +0,0 @@ -https://bugs.gentoo.org/909361 -https://gitlab.gnome.org/GNOME/NetworkManager-openvpn/-/commit/a790374f4c2e9e1657cbb8470357d72d4bd87916 - -From a790374f4c2e9e1657cbb8470357d72d4bd87916 Mon Sep 17 00:00:00 2001 -From: Beniamino Galvani <[email protected]> -Date: Mon, 28 Nov 2022 17:31:38 +0100 -Subject: [PATCH] Revert "service: automatically add the "cipher" to the - "data-ciphers"" - -`--data-ciphers` has a default value of `AES-256-GCM:AES-128-GCM`. If -we overwrite it with the value of `--cipher` we are diverging from -openvpn behavior and this can cause authentication problems. - -https://gitlab.gnome.org/GNOME/NetworkManager-openvpn/-/issues/112 - -This reverts commit 020ab0c4b872fa5415ed1a5e682acb3343c7b9f3. ---- a/src/nm-openvpn-service.c -+++ b/src/nm-openvpn-service.c -@@ -1676,22 +1676,6 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin, - - args_add_vpn_data (args, s_vpn, NM_OPENVPN_KEY_DATA_CIPHERS, "--data-ciphers"); - -- if (nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_CIPHER) && -- !nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_DATA_CIPHERS) && -- openvpn_binary_detect_version_cached (openvpn_binary, &openvpn_binary_version) >= -- nmovpn_version_encode (2, 5, 0)) { -- /* Since 2.5, openvpn will warn if "cipher" is set but "data-ciphers" doesn't -- * contain the cipher. It still used to automatically add the cipher. -- * Since 2.6, the cipher is no longer automatically added, which is unlikely -- * what the user wants. -- * -- * We automatically add it, so if the user only sets cipher (e.g. when -- * having an old profile or targeting 2.4) it still works. So ciphers -- * means something slightly different for the plugin, unless you set -- * data-ciphers to anything. */ -- args_add_vpn_data (args, s_vpn, NM_OPENVPN_KEY_CIPHER, "--data-ciphers"); -- } -- - args_add_vpn_data (args, s_vpn, NM_OPENVPN_KEY_TLS_CIPHER, "--tls-cipher"); - - tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_KEYSIZE); --- -GitLab diff --git a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.10.2-r1.ebuild b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.10.2-r1.ebuild deleted file mode 100644 index a45e22ccb7bc..000000000000 --- a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.10.2-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -GNOME_ORG_MODULE="NetworkManager-${PN##*-}" - -inherit flag-o-matic gnome2 - -DESCRIPTION="NetworkManager OpenVPN plugin" -HOMEPAGE="https://gitlab.gnome.org/GNOME/NetworkManager-openvpn"; - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" -IUSE="gtk test" -RESTRICT="!test? ( test )" - -DEPEND=" - >=dev-libs/glib-2.34:2 - >=net-misc/networkmanager-1.7.0 - >=net-vpn/openvpn-2.1 - gtk? ( - >=app-crypt/libsecret-0.18 - - >=net-libs/libnma-1.8.0 - >=x11-libs/gtk+-3.4:3 - - >=gui-libs/gtk-4.0:4 - >=net-libs/libnma-1.8.36 - ) -" - -RDEPEND=" - ${DEPEND} - acct-group/nm-openvpn - acct-user/nm-openvpn -" - -BDEPEND=" - >=sys-devel/gettext-0.19 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${P}-openvpn-2.6-compat.patch -) - -src_configure() { - # Workaround for LLD on musl systems (bug #947147) - append-ldflags $(test-flags-CCLD -Wl,--undefined-version) - # --localstatedir=/var needed per bug #536248 - gnome2_src_configure \ - --localstatedir=/var \ - --disable-more-warnings \ - --disable-static \ - --with-dist-version=Gentoo \ - $(use_with gtk gnome) \ - $(use_with gtk gtk4) -}
