gentoo auto-resync : 29:06:2023 - 13:40:31

8 files changed, 107 insertions, 4 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 0b959586dc1b..c9a746c52457 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/networkmanager-openvpn/Manifest b/net-vpn/networkmanager-openvpn/Manifest
index e9ac685b0297..e377b5bf1fb4 100644
--- a/net-vpn/networkmanager-openvpn/Manifest
+++ b/net-vpn/networkmanager-openvpn/Manifest
@@ -1,3 +1,5 @@
+AUX networkmanager-openvpn-1.10.2-openvpn-2.6-compat.patch 1982 BLAKE2B 5446a16571eb482d542798476255fbd28209ae32e821eb275e255a5915c59f3c6798ed24e7c0163bed46c5c5f04fd40398ebc5ac072daa497b16f7f6b995eefb SHA512 99838460deb18a82f0ee8b4c4e7b0d88cbff958423cde82c29a89f7c276eeddfc8624c790ec1cee93913c89d5415cafb810fdcf14eea104667c3da93a9e6d5ab
 DIST NetworkManager-openvpn-1.10.2.tar.xz 701652 BLAKE2B c6cef27e57320dc68c168248981f54d2a8eb0a2b19524e11b2c25da04dc98f2a4e00e07b9b83d92d1654c26685d46d8f152c95462e4d73f853872fa3553735bb SHA512 469aa4eeab169ccabd04b18b425ab2f8ad095e19c80dfca528855e1c66314e3ac129145ce5e62f5ccbb7a01cd7ba7f657571c3f4ec57b15ecb95aeaa765f5c4a
+EBUILD networkmanager-openvpn-1.10.2-r1.ebuild 1053 BLAKE2B 912cfd4dcdfdd39b06fbd6ab9230be57301ca51bdb4f9dd46d6561fc48a0692d6e2a598104a126a47c620a9ef5977758276fa176328594b1f8d73c9fcf6b560b SHA512 fdb5a0c0f41301de80150d2e7897e903c68af7f2f998c8c60be456799d6c84783b8568403c7d10d84a6a07fbcc2c20542a7baf09995f9d2f2a755b3f3ec6d5cb
 EBUILD networkmanager-openvpn-1.10.2.ebuild 993 BLAKE2B 12d6e1c4a985bb5890c50e9e3c958a2e313b12a55ac074484157bc3b6d21029efd1e46b96bfe92ba42e3663c57ffe0adef243de0eadfd1b12f39fc2eebbc9cd0 SHA512 32a2d972794d5f70984d6d279ce3aa4bbca0e6a9797b22dac35e4fa29b41681151cd820423b762fae0af6302ddab4ca9e2d22dd1dd5437b0bf31074790f45358
 MISC metadata.xml 363 BLAKE2B 2ff0b1a3948001faad595b1e106a906aee729c0f576a6f7b66f766bcb309f4ef1f12ba3d24af1cf130db8e734d913402f74e9a12adef51bfcd77cdb532ab81ae SHA512 6b05e736c4c25efc495d219779f29c570a1e45ab6f259751c44e28a6c7fc94dae1b8d7ebd21d4297e11f64a591f8e72576e20711f52f3364e9fdbc727cf133e9
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
new file mode 100644
index 000000000000..2b8774b412e8
--- /dev/null
+++ b/net-vpn/networkmanager-openvpn/files/networkmanager-openvpn-1.10.2-openvpn-2.6-compat.patch
@@ -0,0 +1,43 @@
+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 <bgalvani@redhat.com>
+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
new file mode 100644
index 000000000000..d1c4cbfc07ea
--- /dev/null
+++ b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.10.2-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+
+inherit 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() {
+	# --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)
+}
diff --git a/net-vpn/openvpn/Manifest b/net-vpn/openvpn/Manifest
index 560bcc785b95..b97bc75eb9f9 100644
--- a/net-vpn/openvpn/Manifest
+++ b/net-vpn/openvpn/Manifest
@@ -11,6 +11,6 @@ DIST openvpn-2.6.4.tar.gz 1861178 BLAKE2B 584fc3950732d6a1db417811f6e330a1545372
 EBUILD openvpn-2.5.2-r3.ebuild 5031 BLAKE2B d12f5c9f7e102d1ee492f5ca880d397efa2b2c100009b41c9971e2c4d192ac04b6ab4f85bbd81d247393779a97b7d188356b2c53c315c033c73cf961537285ef SHA512 602a370b2addc4a14e5fdd64df2ec5f362b661781ad42c9a3ba5ba42ea0f3367dc0553a19a77a5b27bd17fdc6b26aa0caaa75f0cfd01b06195c799b82e5e5315
 EBUILD openvpn-2.5.6-r1.ebuild 4974 BLAKE2B ea3dc28381ff32ddb305527ae4d496f953f1389f59081bd7b442eb21ea0b48c07d982cc8000d0ebf2d6be1cf008bc988733e9ca1318fc67306b2bc4281ff51cf SHA512 8a29c9338681a8dec60e224008974b6e6ba0fa71e21867c7956f9d6a6c0ce4e39fb69181cb72ed66a06394604b2f684dbfdf12a6f389f1da61bf93f7c70d2eaa
 EBUILD openvpn-2.5.7-r1.ebuild 4909 BLAKE2B b81362c83a2896fb4a7bdd1e7c334bdbc7d4da3048cdc5a5ea672224e8ede39673726d4b951e0931275385d1df32a3d6fb678697099756eed436dadf6f11c60b SHA512 418860f853f4b426551e63a7e24cedd5840124e3fb1c62fa54ed1a45bad4aa41b59ebc80ec205ec89f5536a27457e798299b4cf778547b39d9530f9cdcb6709e
-EBUILD openvpn-2.6.4.ebuild 4949 BLAKE2B 7808a789cb1923b5ecd714acc439c543b3ddfcd292852b32f72cad92f74e84bacf82086a9e42c9c4ee392dd0c1931af612bca59b3377c80fa0d84b53561c95e7 SHA512 3ccf63f9238415e6481e099d9673e93ab293a4a63ac1c6fd89fda5418e540af6c063193121b1287b8f48d3c4c9956971c6899cce37bb4a276db51ae025916e04
+EBUILD openvpn-2.6.4.ebuild 4961 BLAKE2B 12e4f57fffd5d5c7018092637fa660d0a3e8cd45f29f730e6b2dabdfd82b268a3a69328d3eaee7f69f248ea5555735d2b0e44d04904002587236778a81064216 SHA512 55ccd3fd616d3397f78bfc57246f5b822fcdb3d0b6e1d7dda5a25088cf807d1630bfeb870448665b21b14ff1d6ab79c263b2a760bba0bff33ac9487c6fc24559
 EBUILD openvpn-9999.ebuild 4987 BLAKE2B a6895320678af9b6722908ca40be9dc9a5b7392fad5da5e06c27356749f0219ed4ffc4570c63dea73d3bc081beed871a4bc0fb3702d2a0a66f6d4b8da7d092f4 SHA512 ddbf0f70e4c3719e7a3d38efc1d1c58a663fa25b819ee84157077a9e9d9a581fff3cd007d2a60f7f4e47c54c73d15135e79b16dca9f73d3b04c6aa75454fb01d
 MISC metadata.xml 1216 BLAKE2B c776b53a6590657d9c38f4d27da052d558b3fa706a944d07ff29de7fa6745e1e474a6110056dbe8c19fd03373644347054f8b7b4f2dd9d7171f3bc25ca21fe4f SHA512 1a62049e24f92d5519b1eaefa1649df23a515165e41b87e399170d1e2e140174fee5e8887f7e8589e68301093d1c2b6f76f6868db302ad7de2da911f0df3bb6d
diff --git a/net-vpn/openvpn/openvpn-2.6.4.ebuild b/net-vpn/openvpn/openvpn-2.6.4.ebuild
index 91dab5b17769..2e3a4971d7e6 100644
--- a/net-vpn/openvpn/openvpn-2.6.4.ebuild
+++ b/net-vpn/openvpn/openvpn-2.6.4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://build.openvpn.net/downloads/releases/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-vpn/ovpn-dco/Manifest b/net-vpn/ovpn-dco/Manifest
index aa7bc6019b65..da41e3e38146 100644
--- a/net-vpn/ovpn-dco/Manifest
+++ b/net-vpn/ovpn-dco/Manifest
@@ -1,4 +1,4 @@
 DIST ovpn-dco-0.2.20230426.tar.gz 70341 BLAKE2B 95d468212a161f13659185d7e96b11afac63a8dd40aaf42a41463927a7f75b1d1ab2388bab5749c0127a07a8bf5d4a5a97626c0d782595f3d0561be4063d931c SHA512 929333fd0668008be77b57b3a0955c260770d91402e02d93a460569b8b17763ebe23eb6159bfefe04fa16fad2672d6a6c76e2f3c2e6b864593bef59ef3cfa29f
-EBUILD ovpn-dco-0.2.20230426.ebuild 1181 BLAKE2B ecd613e57f0fe11af4b10e4fc7c14e1bd72afc7644a604caaf0b2e2a3ec0e76faa0a5576f41967bf9b021f0a1dd2d79f0e3093034bdb3c4133f7bd9a36999335 SHA512 28821df9b74b399fc70ad743fcace8e0b6b28b906cadf033efb91b3e564a0f6815fa6603a84389592029e57d338f32ca000d8df7d416dcdaa6a4365fd5449494
+EBUILD ovpn-dco-0.2.20230426.ebuild 1193 BLAKE2B 43a657bda05d51a078df82d9d4ee0fd4f4cf26e4cd5dcc4938a407c877d766f8245450a7d0e41f760ba5bbbb65748e4567272a15a6505f34c5ac84406db714ca SHA512 18652aecd54f0a8118476d412b4150cb66c84ad482bf95bc9ba70c59d19b64897e2fb8757b9a7d7b7c7ae28e325df822357676146099509698e76529ddb8cf1d
 EBUILD ovpn-dco-9999.ebuild 1249 BLAKE2B d129cbed8ee245cd9b924d573952c5c6782e68202c1611bdeba2a0ae58feb50e57f7a175236c61711e202b4a2fc9dc53f46200afb4bcdde6b93f67aa86b5d041 SHA512 db6f7e7eaf805ec563b97bc778c9a0a23cacb7efae0f2b054e3d405dfe6b76c8c849fc7748a83b970d1f2d09958372ba81b9f50f0487adb652911e1c444cbdf6
 MISC metadata.xml 686 BLAKE2B c667b8740abf00a436a4043878ded6a9420298f21c38af2aef9d6336075df4c56ec3f99fdd71c6d53f2c66947f838af154f3f84258782c623f81b389b6289458 SHA512 d500104d1853b953cc3433e7185db707da162a5322f8e0433ead46211f95aea0a809f30a08d340c942b4844d5f1310873ea6d018112712eb2f3e6a2c59228dae
diff --git a/net-vpn/ovpn-dco/ovpn-dco-0.2.20230426.ebuild b/net-vpn/ovpn-dco/ovpn-dco-0.2.20230426.ebuild
index 052a831943fb..083a68eed640 100644
--- a/net-vpn/ovpn-dco/ovpn-dco-0.2.20230426.ebuild
+++ b/net-vpn/ovpn-dco/ovpn-dco-0.2.20230426.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/OpenVPN/ovpn-dco"
 
 if [[ ${PV} != 9999 ]]; then
 	SRC_URI="https://github.com/OpenVPN/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/OpenVPN/${PN}.git"