gentoo resync : 07.08.2021

7 files changed, 121 insertions, 2 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 14ec3333710d..1e74b43da63a 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/networkmanager-fortisslvpn/Manifest b/net-vpn/networkmanager-fortisslvpn/Manifest
index caa5dfba5929..d304716eb20d 100644
--- a/net-vpn/networkmanager-fortisslvpn/Manifest
+++ b/net-vpn/networkmanager-fortisslvpn/Manifest
@@ -1,5 +1,7 @@
 DIST NetworkManager-fortisslvpn-1.2.10.tar.xz 366700 BLAKE2B 5160d5947fe391b53a0293db4727baa0e6c453da0985abb999503a8f4c67a03c3159652c216e9982414d5db718af6c8a2aa6ac00aa627801949d4f96403f0ade SHA512 8b4d100403f3bdd557394a6cadd94e24afffd97a584f8c58cb4008be2834bd8c12c3f293c03c0f111ede54fe18058e3ef41218fd33d2dd564147f255d76e4252
 DIST NetworkManager-fortisslvpn-1.2.8.tar.xz 325100 BLAKE2B 9449bbec99ee50c2c0b9cc1a74d8714e71995c17d2c1fa206134b71a1ea448be8fd86711ce0743f38e86ccd330eb7bc7e4cb57c2093001ac1b301b00e5c8f25e SHA512 5a602b872b1efbd8d9ed2f32d05ec8560f0a923dfdf58e7a775010ee2182790b8cbe7c2a6c8d1198eba47c66fddecf178e1c454d1ac74c10a63c75c603eeafc8
+DIST NetworkManager-fortisslvpn-1.3.90.tar.xz 375416 BLAKE2B d2e07a2f79685cb600b6c0abca52a54911ff41534c152e9c5befe25d436757ba517d84cc474ff5c200ae62ca019296871fc29dc8342788295b3e59be55fa8198 SHA512 98b3e524cbb33c8dcdb325b10d227f88534948d98ca8009f770e48b87d42637762ba5343f081ac583b77c3387cb47f2660be0f60430ede237f812a2af8d9a7aa
 EBUILD networkmanager-fortisslvpn-1.2.10.ebuild 865 BLAKE2B ac01c51df4c7cd3f0026c7a303c6c81e84190a30549f40075eef2fb0870ba6fc36b8c3bc629f1b4029d40ac9e2002116357f392ce90adb75f793ba9f20455cd3 SHA512 f7330641874fee8b36f1cf95b08bb9ef5de95c4058d0debeae2ceafdf6b899885e76919f9075e1e6c7e1ffb7adf9f820f77abd1d34ef15b0a8dae840a16961af
 EBUILD networkmanager-fortisslvpn-1.2.8-r2.ebuild 884 BLAKE2B 52e053b236facdd5eb8ff392b40d7f90e95402b458d5eefacff9605dff8de252ac3a8d9cc6e7266e04a6e7f9588516da2cd8bb3e1cd6aef142a7d0380645e78a SHA512 1298ade8a40e7c0790b7682431f7895ad729c4bc94308a8851a6777f4b34d2691a1dbd52a3c9f804df918e60f5806da8177ff1a5f56aa298aed87293d2cc1c6a
+EBUILD networkmanager-fortisslvpn-1.3.90.ebuild 1072 BLAKE2B 57fec0072095a0e512c40c95a67ffdff5a1e3731ac6d9359ccf83eb6dbc1dbd9d09810721c150127cba42207eeace06a1501b84f33c215105028362b7eb0ebc6 SHA512 363d021128c9146c0c220761ac9cdf426cc99d5ff27075926db0d835e21994e5fdf0a530c402f3e9ec8dd1586d1cbb1421384873f80c5d6fa0d60acde0a54ee0
 MISC metadata.xml 410 BLAKE2B 611977709cb718457aa2b636d5bf2f1936a2c9035abb58ae7ff7397c72481ba4bd8e6ca156d4d5cde7797c508d39d6b62f2c2bc84be8eb7f27edd7dd978f5728 SHA512 5ce3ae870f955435b4ad18f62fde4af72c640bce9605f1d979ae6bf5c8c1a402e8e3ff265fe859554490e10a6a50d09a4e271d075a6ab4364a2882000eba9507
diff --git a/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.3.90.ebuild b/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.3.90.ebuild
new file mode 100644
index 000000000000..81b8594e7f8e
--- /dev/null
+++ b/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.3.90.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2
+
+DESCRIPTION="NetworkManager Fortinet SSLVPN compatible plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gtk"
+
+DEPEND="
+	>=dev-libs/glib-2.32:2
+	>=net-misc/networkmanager-1.2:=
+	gtk? (
+		>=app-crypt/libsecret-0.18
+		media-libs/harfbuzz
+		>=net-libs/libnma-1.2.0
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf
+		>=x11-libs/gtk+-3.4:3
+		x11-libs/pango
+	)
+"
+RDEPEND="${RDEPEND}
+	net-dialup/ppp
+	>=net-vpn/openfortivpn-1.2.0"
+BDEPEND="dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.19
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# Fix deprecated location, #709450
+	sed -i 's|/appdata|/metainfo|g' Makefile.{in,am} || die
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--with-dist-version=Gentoo \
+		--localstatedir=/var \
+		$(use_with gtk gnome) \
+		--without-libnm-glib
+}
diff --git a/net-vpn/networkmanager-openvpn/Manifest b/net-vpn/networkmanager-openvpn/Manifest
index 5b455b79a936..915295835a3e 100644
--- a/net-vpn/networkmanager-openvpn/Manifest
+++ b/net-vpn/networkmanager-openvpn/Manifest
@@ -1,3 +1,5 @@
 DIST NetworkManager-openvpn-1.8.12.tar.xz 597216 BLAKE2B 55ccb3139b1be9d1894d3651d60ce0f2167a24efbb24a9870eb4bb683a91603ae5f5149ed9aca8307cf608140c075a7b19bdfef68b1dbfe0729c117f084bb904 SHA512 1b8adf926426f866f7509a07c24203d6b584627aba4f8e2b1b00fa897bf0d7155009d566c3440565d1ee0e938694dd8d6746f37f62d493864d16eae007590b22
+DIST NetworkManager-openvpn-1.8.14.tar.xz 611084 BLAKE2B c986f85a6af93b88bc73a0e111cf712948e1434aff35b1df5c86a7afa6092acfc637e0e9031f170107c2856cf4f907bcc36543769ee531a1407bef69a9fbd0a3 SHA512 6775be9667c722cb2eec23354b950ff29b739119615a3f8c9730ad597427def716e9911a4232d014df78e88f5e4968f359e0aecacd81183db65586e2bc6ca0e7
 EBUILD networkmanager-openvpn-1.8.12-r1.ebuild 1285 BLAKE2B c4faf61c0046a69574c734cfa7d993f64e130ca57b18280b45595968b48cbafb99d38423c4faf2694b2fcda81fdf38ffab9489d390d6340c842444daf302f325 SHA512 94e87c8733b4295892a180afc3495a62834373a90ba18f3d19dade67cb4d2768413c59c01c0223c0133b518260cb595c098771b7b20c5524e908f7a1a67b5e6a
+EBUILD networkmanager-openvpn-1.8.14.ebuild 1287 BLAKE2B b0d6874180cf20d3056168b930d5d3a50fec6b33f0e9ea05cd2ea513735fd7d9a82b199f3770bac163d8175d0d4ce85d9b8bd48e1504b0c1c769d38e1c3e65b2 SHA512 a3b13bf69560df4eea2aff2683ee30ec0a58a006563110f020ac57f4db0a8a469236322d32459b463b97a29e145f19e14fe772034390c4d7dbe54556f7bdc28f
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.14.ebuild b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.14.ebuild
new file mode 100644
index 000000000000..1f43b0b4c2e5
--- /dev/null
+++ b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.14.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+
+inherit gnome2
+
+DESCRIPTION="NetworkManager OpenVPN plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="gtk test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/glib-2.32:2
+	dev-libs/libxml2:2
+	>=net-misc/networkmanager-1.7.0:=
+	>=net-vpn/openvpn-2.1
+	gtk? (
+		>=app-crypt/libsecret-0.18
+		>=net-libs/libnma-1.7.0
+		>=x11-libs/gtk+-3.4:3
+	)
+"
+
+RDEPEND="
+	${DEPEND}
+	acct-group/nm-openvpn
+	acct-user/nm-openvpn
+"
+
+BDEPEND="
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Test will fail if the machine doesn't have a particular locale installed
+	# FAIL: (tls-import-data) unexpected 'ca' secret value, upstream bug #742708
+	sed '/test_non_utf8_import (plugin, test_dir)/ d' \
+		-i properties/tests/test-import-export.c || die "sed failed"
+
+	gnome2_src_prepare
+}
+
+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) \
+		--without-libnm-glib
+}
diff --git a/net-vpn/ocserv/Manifest b/net-vpn/ocserv/Manifest
index 991edfdb8b3d..4fff789ef367 100644
--- a/net-vpn/ocserv/Manifest
+++ b/net-vpn/ocserv/Manifest
@@ -1,6 +1,6 @@
 AUX ocserv 182 BLAKE2B b7ea6c381fed7406bda8fae3638445d6cd2e2acaf5f5c310227fc56f62e3286df6bb49063db8d2ab8dce2c6d5e8487b50085875f2af057b662aeb37b5adfe77a SHA512 9e0dcc3668e5e7584b4f01f56c0b48c7a1099b3658ee2387cd899050030328c497e64f9409a1af589ab42f8b6b1e7f13828a50b478906721ccad9d3013f3b06a
 DIST ocserv-1.0.1.tar.xz 787800 BLAKE2B 655a2a6e1434a5b31b157e0f73df3d6d04011c06fd5a1f39f1152752abdc837974c739bc0694a804a1e96b4e219c78c5cf1a58040bbcdcad3e326d0c9e584c7b SHA512 953e1b6084f68f8627b5383e28b5fcde987881e66feac645a40fa37d895f0711b171c9029c3703773dfbd5432d747f92c71af9240c2df3381599902a7d5fe880
-DIST ocserv-1.1.1.tar.xz 818988 BLAKE2B 06fdc47fcabea162ddd417f315c53e85f4ccdc1dc9b60b624c06ee4adae9d6f0ee96f94c15daafa0633b4925720519da7220914008c64c5771f61416208a570e SHA512 1173416f0d32f9faf98e539c8e73316a50ac93b519d1ade19374a3df865d10d975e13ac53e0c5a5e77c80f3605d7a810287b18b85b798887d227389761b54220
+DIST ocserv-1.1.3.tar.xz 833320 BLAKE2B bdf92683df55cd26bc102327b233703eefd58ea18ef71ccfc383e06b7fdd78ca59d605ef3517f430f3a20e8d4ab2c3f8abf2684cedd2eb0aeefe10c688faab15 SHA512 1138bd530e41f215f75e967aa293e80504a0ffc3384184832910b7bf8dc2049a637c1d8bef0221b6abb3e6510e51fba3c45d43901c0d2e4c0f180e72c0804628
 EBUILD ocserv-1.0.1-r1.ebuild 1764 BLAKE2B 7d70d482356ab6cd8d3023c1473a7e0a9df670156fb6ac73fe2ed3553238629b109f475ca3503ec14bf3dcb19693be0cc492fef36253fff52df62922fcc847ef SHA512 fe17989107f3e3fb08663c66b49f4c87664b033ddb3094743fa939e5940d723718ce862d292cbed1176e2a5669e73973789f02ef7212d624a26fa96d8fdc6bb6
-EBUILD ocserv-1.1.1-r1.ebuild 1751 BLAKE2B b9746f11601f1d3879c912e024f0122fb13e2a4f242b7b83629e6faf13a8f77fa97faeb5ccc6537e48e5c07d7abc8341419f012dfc9a0fd93ba2f2305c83eb67 SHA512 ae0e337be65aae1f114ecac874e46bfa64d7c98d540366ea716e47abdce8176b0621e4df03a0dc7ac1f3fdf2d5b3d47c07d1f4d1eebb39de93978e9b6b68b06a
+EBUILD ocserv-1.1.3.ebuild 1751 BLAKE2B b9746f11601f1d3879c912e024f0122fb13e2a4f242b7b83629e6faf13a8f77fa97faeb5ccc6537e48e5c07d7abc8341419f012dfc9a0fd93ba2f2305c83eb67 SHA512 ae0e337be65aae1f114ecac874e46bfa64d7c98d540366ea716e47abdce8176b0621e4df03a0dc7ac1f3fdf2d5b3d47c07d1f4d1eebb39de93978e9b6b68b06a
 MISC metadata.xml 325 BLAKE2B 1bb6068aff761fbf40d489d5d60bcbf295a079a2fffbb99af64abfcecaedf7cb5407b3f94b6823b58690912f43dc4427cd8d7a658d2f809b45462702ba5f0aeb SHA512 4fb35360034ac9639198ebd1e0917848b807e0a53ec10eb2d4e1a90a4f3f631b582e6f3d6e3a7d50f2f284ff47dc1a2ec4d362fa73f6b5a1834ef531bb2bc5ca
diff --git a/net-vpn/ocserv/ocserv-1.1.1-r1.ebuild b/net-vpn/ocserv/ocserv-1.1.3.ebuild
index 459da4219219..459da4219219 100644
--- a/net-vpn/ocserv/ocserv-1.1.1-r1.ebuild
+++ b/net-vpn/ocserv/ocserv-1.1.3.ebuild