gentoo resync : 20.10.2021

16 files changed, 188 insertions, 20 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index fdda793b9f21..0ae684c6f121 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 fc4401fb9743..1ce7846a3d7a 100644
--- a/net-vpn/networkmanager-fortisslvpn/Manifest
+++ b/net-vpn/networkmanager-fortisslvpn/Manifest
@@ -3,5 +3,5 @@ DIST NetworkManager-fortisslvpn-1.2.8.tar.xz 325100 BLAKE2B 9449bbec99ee50c2c0b9
 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
+EBUILD networkmanager-fortisslvpn-1.3.90.ebuild 1071 BLAKE2B b4ba9a550c464b4b9f2e9e6468415b26645a002c2106346a48f2f6122a32bf44707956abfe0c8415ee3573325dfbb2b4a746a3d6c93b321da16ac9ac4a800e20 SHA512 ae8f948778c018a5ecda4e973935c3cba416a3596df01d9ebe59261e095115ccb78a7497c89b541a12ed9cc454a315e837da3cdd350a7d6af08f69e72942b916
 MISC metadata.xml 411 BLAKE2B 2a68544a08639f4ee73732a7c1663614694c6aeabd6fb93e9a25f94b4667cfa3470bea7e40f3da181d985775362e7122dcc64f96b3ee96879b2137c3722f105c SHA512 e490c46a95e3ad932a325519831cdc74a356137a014d02f8e602821955ec81a0e523022a80d9e1f1412dcaa9b1ef17a8e2a0ec608e67c0ee58aa02f9165fa40c
diff --git a/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.3.90.ebuild b/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.3.90.ebuild
index 81b8594e7f8e..ac552106e156 100644
--- a/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.3.90.ebuild
+++ b/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.3.90.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="gtk"
 
 DEPEND="
diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest
index 1e14ba2ba9bd..ea3ade64a98c 100644
--- a/net-vpn/openconnect/Manifest
+++ b/net-vpn/openconnect/Manifest
@@ -11,7 +11,7 @@ DIST openconnect-8.10.tar.gz 2084534 BLAKE2B 98ad0e24e09bc565f359139540f60eb9b6b
 DIST vpnc-scripts-20200226.tar.gz 21460 BLAKE2B 8f00ce3dc49725758abce27f3688946df1bbd4e92769ef02aa9ee66db8b9f41bef3442eaa5405ab1467476899c6d364dfea898ed924ca83497823a85515d48e5 SHA512 3a1eac4ccfaefb0f837189c8cef696b33ab8b8a68cb50a3ad29206b708d0aa479e8eed0c09bef6f60d056cd98d63cc898a1609d734030a63df3be2cfa6c00f9a
 DIST vpnc-scripts-20200930.tar.gz 22305 BLAKE2B 5db809ef674cb3cb8f1c775adc1e83debbda28fdcf47e0b0527efe6d1cea09781ef02b2827d9704140b884a85e7ec51fba497f47f6793520b471a7bba0dde6b6 SHA512 5f42bc7b168b5fdfc3ebd4bae52a42a654f102982852cc74240972e16e77fe0b54d82175e2a067e1d7e408bd14c3f465f7eb82b23b41885cb25a813d9587fd3d
 EBUILD openconnect-8.09-r3.ebuild 3079 BLAKE2B 030c6f46ebb04966924f6e51487608660e4d2157ae5364d413db5f8cf6c12d50b7b771c640a60047f14a2df1a33dbfc97ff6bf8e07916c496a844d47766aaef0 SHA512 5eabd5db4a6fff49744f8005a98f91f7b9eb0e1ad704cb63451fbd49b6564b294a2c39b3d8c887ebaaacfdaac780f4f255f0f46bba24186e31d9880524a156f1
-EBUILD openconnect-8.10-r4.ebuild 2777 BLAKE2B d621381a1a18c76e2276a5e5b6a18e4e1aa5bb95d0feca1ad6dc4a893e0a5b17943393ba25ca618be3f317b96f487b0de0c6db78c1f46d7a2b58542424437ebc SHA512 d200381113555b49deb99600df0e99c6c568ecb4b532c6e34fdf10fa76c78a9abc0d79f1858cdba6e6d080fb791cd653c3e6f4d49e0b26305ddf1d1b7236c469
+EBUILD openconnect-8.10-r5.ebuild 2778 BLAKE2B d92b86c623f8added6049222af6dd26083f83ced603bdf8cab34a3681e47928f9999d7518b48ed1ad92e9243db4f10a25df11eb2cbb34934bdaddf3c28dcb71d SHA512 5d778bef6808f0f0dc6ea5ba83ad515dc14de58fdca74a9c051507c7b7b4303a1da38c0c7dc736eaaf3b20181f2e40dd149dbc68f037db78e8561aec1f388ab5
 EBUILD openconnect-8.10.ebuild 3014 BLAKE2B ef2a3c2d603c2bfc155fc502009d49e0b6240e625ad7655dba2efb807531767d49ffdbc258ea24ebbd1654b36b36d156c52e3c9e900e1baad942243b74e686f7 SHA512 4c5afe5f42e3befa0aa5e5fc8a788ab1c7c637f1e7981102df9b51aff685f18a9302164edc8c2b5365ed439d2f605a3b74ec6392b61f2c19b0f4fe8c54ed8ae8
-EBUILD openconnect-9999.ebuild 2777 BLAKE2B d621381a1a18c76e2276a5e5b6a18e4e1aa5bb95d0feca1ad6dc4a893e0a5b17943393ba25ca618be3f317b96f487b0de0c6db78c1f46d7a2b58542424437ebc SHA512 d200381113555b49deb99600df0e99c6c568ecb4b532c6e34fdf10fa76c78a9abc0d79f1858cdba6e6d080fb791cd653c3e6f4d49e0b26305ddf1d1b7236c469
+EBUILD openconnect-9999.ebuild 2783 BLAKE2B 2e78bffa405e1d6a010abcdfdf4b7182c1189c3d5402aa8cc4f954b9a58efd48a9153ea7ab2c7a6e39da38fe7e863df9edf50f4840237aed852e08846d988567 SHA512 d3a65bbd01236738bd499ba13abd1d9b7cb752ed5e51de0582617828fd83109899ce55885c8ed8f359d9a3b2ae62cc6cb51f912b7a1c62e5e5cbb7aa67ce46dd
 MISC metadata.xml 524 BLAKE2B 8c9fc21b88e3dac2cd58d754d25dca9f12c835937c6265536767d242670ed6e12240ba2d9fc54e87ea265edd637c923eb97d03414f5846733076535126748cf4 SHA512 08d9d5104712ad4c311e87b18013868168f8fe5fc46f555c70e1bbfd8c066918ec1fa7f46ecd09b3b40db485da7f0155b1dde336e8baf48eccd5ea95abeabe79
diff --git a/net-vpn/openconnect/openconnect-8.10-r4.ebuild b/net-vpn/openconnect/openconnect-8.10-r5.ebuild
index 13c3da231bad..d8210a2b00ad 100644
--- a/net-vpn/openconnect/openconnect-8.10-r4.ebuild
+++ b/net-vpn/openconnect/openconnect-8.10-r5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3 autotools
 else
 	SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
@@ -47,7 +47,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	sys-apps/iproute2
-	net-vpn/vpnc-scripts
+	>=net-vpn/vpnc-scripts-20210402-r1
 "
 BDEPEND="
 	virtual/pkgconfig
@@ -105,7 +105,7 @@ src_configure() {
 		$(use_with gssapi)
 		$(use_with smartcard libpcsclite)
 		$(use_with stoken)
-		--with-vpnc-script="${EPREFIX}/etc/vpnc-scripts/vpnc-script"
+		--with-vpnc-script="${EPREFIX}/etc/vpnc/vpnc-script"
 		--without-java
 	)
 
diff --git a/net-vpn/openconnect/openconnect-9999.ebuild b/net-vpn/openconnect/openconnect-9999.ebuild
index 13c3da231bad..b2332da693ea 100644
--- a/net-vpn/openconnect/openconnect-9999.ebuild
+++ b/net-vpn/openconnect/openconnect-9999.ebuild
@@ -47,7 +47,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	sys-apps/iproute2
-	net-vpn/vpnc-scripts
+	>=net-vpn/vpnc-scripts-20210402-r1
 "
 BDEPEND="
 	virtual/pkgconfig
@@ -105,7 +105,7 @@ src_configure() {
 		$(use_with gssapi)
 		$(use_with smartcard libpcsclite)
 		$(use_with stoken)
-		--with-vpnc-script="${EPREFIX}/etc/vpnc-scripts/vpnc-script"
+		--with-vpnc-script="${EPREFIX}/etc/vpnc/vpnc-script"
 		--without-java
 	)
 
diff --git a/net-vpn/openfortivpn/Manifest b/net-vpn/openfortivpn/Manifest
index 353d9ed79ac1..a8431dfe2768 100644
--- a/net-vpn/openfortivpn/Manifest
+++ b/net-vpn/openfortivpn/Manifest
@@ -1,7 +1,12 @@
+AUX systemd_substitute_bin_and_sysconfig_dirs.patch 490 BLAKE2B 071747a713f2b155959768d827b9b256842a6f587d23992a06be9ab7a701a6b4bc6b86b56fe0853f04ff81dc43f739d07f8cf60ba37c0bc9da2712a23d8a7f5a SHA512 511e8179a7f36a5e5bd2b4a07e62812aac8065b34b767992b823b5f4135addaf662f8a6061215898281dc128b8386b166f614307680416aaeba183db3ef5e2cb
 DIST openfortivpn-1.13.2.tar.gz 82977 BLAKE2B 5daf2fdacaf2f9c3bc0a4bc3fc26543ed0ab424b70d2795e7b3d74b38cba53b1a8a9823564198ea5292b63f872c12f17ed3f65111a7024faee19640fff765cd7 SHA512 6be456784618d0af26190bad4af20a5f7163d3d984e3317fa3aac04b605ddd39f8973b192cf35fc8a371bf5ca4cbff8f644991b0cc031f558bf7881066fe8ec2
 DIST openfortivpn-1.15.0.tar.gz 157951 BLAKE2B 051dbc5ab5c003926fa4424b9c69e899bc9602aabab7749953743d1d81e0ebd90ebdf157921cabc016cf93263279eab111ed1b9763fb4ba50a11f463659be2dd SHA512 8ec6454c197925a031a454e3983ed98d93d48514d86ebb09483157872e299d9c6b36a966ac6c67cd85d203223460998cdc0e6af9d5389357d4a55789aa5e2083
 DIST openfortivpn-1.16.0.tar.gz 163878 BLAKE2B 003460ca6012b90ddea41b1fe533c3b6899fa8528ef656e6d1b4a200f01d3a476749405294fc2c3c4ba489a41d7e72738d540632922fe2ae2d2344f5fc5750e3 SHA512 bd57bc076f89604077c0c6f538090b33707e2534f83ae7e01ee0604b044b2f1083b65f7d0241fb4fc38eabe8462689137c66bf59dac12b21408b8453f5b2cc5a
+DIST openfortivpn-1.17.0.tar.gz 166943 BLAKE2B f6372eac056ce0b9c1d3ea46d6af3d5da2323ecc96273b37efb9eccb13d31f607b1bc5843b2d33b3a722901530109a6cf0b270d6d4e31433045e6bca6041279a SHA512 fb92e07468c6a4232977506eb42e416a32612a0bd78b705588c66e7ae68c712e2d245ee4eac6806dfb7cab5fcf10739ed9002358a425a8dbb75fb1cdc15e4c98
+DIST openfortivpn-1.17.1.tar.gz 167127 BLAKE2B 4b8f9fb82c4f7c8ffcecf9f14c576d73c999712b7b183b74f9d60d59c67017080a3d16d95ae74fa7f07188e9b28bdf8384f9b41ea7a4ce8e24813044d27216b9 SHA512 9d8be1043833bfa0eba6e4032c767946e88d079d329f8039964ea659c4dffb54a5a3b2a6431b66bd86590eaca8bf598a110c368714ecd7ea00312ee97f329085
 EBUILD openfortivpn-1.13.2.ebuild 694 BLAKE2B f64b845c7ad2e3b71757e0ed2c0ec8dce68cf144e201979ac3a89cb9bf1267fc0e34277b1233c44ccd3e9f62e4f6c2189abf44815207c19c4bd98c15c858a80f SHA512 4d92182d916e1b732b9a973429a63d5dd66aa74dc43188da1795e4f80575adc286cf7b45af5401c8ed7d50f9f6dcaba036a4a31c42a086462378933601f6971f
 EBUILD openfortivpn-1.15.0.ebuild 695 BLAKE2B 3454dcfd7632f8754b0867ec187b4d36049c59ebbb9147493e3c2f499b0ac49f2e347916f229bea18ca235c4432fe7ace8477c37e9bc2c1957068b5b2c41eae4 SHA512 5d54c16219eea51d4700749cc635b6be09727cffb858695dfca028e8ef2ac979b1f64486387dc43e53b5a24d01c8312d6fa2e1a9fb982274e3d1ed847e8b3885
 EBUILD openfortivpn-1.16.0.ebuild 695 BLAKE2B 3454dcfd7632f8754b0867ec187b4d36049c59ebbb9147493e3c2f499b0ac49f2e347916f229bea18ca235c4432fe7ace8477c37e9bc2c1957068b5b2c41eae4 SHA512 5d54c16219eea51d4700749cc635b6be09727cffb858695dfca028e8ef2ac979b1f64486387dc43e53b5a24d01c8312d6fa2e1a9fb982274e3d1ed847e8b3885
-MISC metadata.xml 335 BLAKE2B 6ff1bb309e2742b91289aad7fa5b0c6968452b99e922140f4dc0bb7614fc05daf251ed059fae3a16366c16e4722d151749928b4e658af36f01bdd12b8c2d485a SHA512 9a42d2b0eb2c8b9c67b9288211e2751521e459a08c16663088295aed2194add1ce2da7d4621f6b9d987221a34beb87514907c7cf3d0fd0b500691ca390cd0f69
+EBUILD openfortivpn-1.17.0.ebuild 695 BLAKE2B 3454dcfd7632f8754b0867ec187b4d36049c59ebbb9147493e3c2f499b0ac49f2e347916f229bea18ca235c4432fe7ace8477c37e9bc2c1957068b5b2c41eae4 SHA512 5d54c16219eea51d4700749cc635b6be09727cffb858695dfca028e8ef2ac979b1f64486387dc43e53b5a24d01c8312d6fa2e1a9fb982274e3d1ed847e8b3885
+EBUILD openfortivpn-1.17.1.ebuild 771 BLAKE2B 52693a48ffcc0c89f6043b7d0acc15a817a8881bd0f1613a926fd469626285f4399cece75935e71a67bad4ed7702ed1e2fb1c4fef33a105237c9575d90e8530a SHA512 c0bcc220a493d91c20d5be104a205cfa68a4081784b5fa9b1b8aca88cae26e1a31697d009d75d228fdf1a9bdba625647786eb662d45ed7b923daa0be6d9bff2c
+MISC metadata.xml 257 BLAKE2B f87135c9aedf98ef822404eb43e8214ed1e6d3cfc71db8d1aece9c3f8c30fda5b63f1de77b8d8d98b9b6b8d671e164199bcd810a34fe71939b836b164261ec2e SHA512 7719a7bd4abd3115b6279c4446e87c0c552f8b7dadd7429cbd8844ee2fe2509b712287f2d2e5926d6711dbe21efaebb289d187ebc297be770bb538f8bf799d31
diff --git a/net-vpn/openfortivpn/files/systemd_substitute_bin_and_sysconfig_dirs.patch b/net-vpn/openfortivpn/files/systemd_substitute_bin_and_sysconfig_dirs.patch
new file mode 100644
index 000000000000..4cfe57c46545
--- /dev/null
+++ b/net-vpn/openfortivpn/files/systemd_substitute_bin_and_sysconfig_dirs.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/systemd/system/openfortivpn@.service.in b/lib/systemd/system/openfortivpn@.service.in
+index 6c30230..3ff3d7c 100644
+--- a/lib/systemd/system/openfortivpn@.service.in
++++ b/lib/systemd/system/openfortivpn@.service.in
+@@ -6,7 +6,7 @@ Documentation=man:openfortivpn(1)
+ [Service]
+ Type=simple
+ PrivateTmp=true
+-ExecStart=@BINDIR@/openfortivpn -c @SYSCONFDIR@/openfortivpn/%I.conf
++ExecStart=/usr/bin/openfortivpn -c /etc/openfortivpn/%I.conf
+ OOMScoreAdjust=-100
+ 
+ [Install]
diff --git a/net-vpn/openfortivpn/metadata.xml b/net-vpn/openfortivpn/metadata.xml
index 6670f0c556ba..592ca36a0245 100644
--- a/net-vpn/openfortivpn/metadata.xml
+++ b/net-vpn/openfortivpn/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">adrienverge/openfortivpn</remote-id>
 	</upstream>
diff --git a/net-vpn/openfortivpn/openfortivpn-1.17.0.ebuild b/net-vpn/openfortivpn/openfortivpn-1.17.0.ebuild
new file mode 100644
index 000000000000..0c64cdfd137f
--- /dev/null
+++ b/net-vpn/openfortivpn/openfortivpn-1.17.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info
+
+DESCRIPTION="Fortinet compatible VPN client"
+HOMEPAGE="https://github.com/adrienverge/openfortivpn"
+SRC_URI="https://github.com/adrienverge/openfortivpn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3-with-openssl-exception openssl"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	net-dialup/ppp
+	dev-libs/openssl:0=
+"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~PPP ~PPP_ASYNC"
+
+src_prepare() {
+	default
+
+	sed -i 's/-Werror//g' Makefile.am || die "Failed to remove -Werror from Makefile.am"
+
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	keepdir /etc/openfortivpn
+}
diff --git a/net-vpn/openfortivpn/openfortivpn-1.17.1.ebuild b/net-vpn/openfortivpn/openfortivpn-1.17.1.ebuild
new file mode 100644
index 000000000000..634f0884bc80
--- /dev/null
+++ b/net-vpn/openfortivpn/openfortivpn-1.17.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info
+
+DESCRIPTION="Fortinet compatible VPN client"
+HOMEPAGE="https://github.com/adrienverge/openfortivpn"
+SRC_URI="https://github.com/adrienverge/openfortivpn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3-with-openssl-exception openssl"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	net-dialup/ppp
+	dev-libs/openssl:0=
+"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~PPP ~PPP_ASYNC"
+
+PATCHES=(
+	"${FILESDIR}/systemd_substitute_bin_and_sysconfig_dirs.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -i 's/-Werror//g' Makefile.am || die "Failed to remove -Werror from Makefile.am"
+
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	keepdir /etc/openfortivpn
+}
diff --git a/net-vpn/vpnc-scripts/Manifest b/net-vpn/vpnc-scripts/Manifest
index 5b0aeb256a5e..78ba4eb74af0 100644
--- a/net-vpn/vpnc-scripts/Manifest
+++ b/net-vpn/vpnc-scripts/Manifest
@@ -1,4 +1,4 @@
 DIST vpnc-scripts-20210402.tar.gz 39925 BLAKE2B 2bc8a274773e51ba48e402588fdf5b51d20360f610afe5608f91dfe2466644b68d891a60c27e4c6938b4ed5da1f193ddb7a8ac955c8f02e6bf91437dc5c47620 SHA512 5f9fc5ab1a5a2607f807700536c4a8e71c551052e72979c1cdd02b15906615be33a297b873b0806f269e51645f10f1c02a7acfed2501148bfa2797250582920d
-EBUILD vpnc-scripts-20210402.ebuild 594 BLAKE2B fe8d8a629332563b792285af44ef9b4199200cba23471ee3deeb5dc748ca55f009cebf35d024a22b5b0b1a4b7ddaf9be3ea4b68bb1cafcbbfab0954957d54dbb SHA512 4dea57427a334d1c6a349c3461a6ee50e5202475e218435ba5d6fb4d6ca15cbdd2e8317fcde4a2aca8a4a766e4729c43caf552aa1d0e262b609fe688e8710630
-EBUILD vpnc-scripts-99999999.ebuild 594 BLAKE2B fe8d8a629332563b792285af44ef9b4199200cba23471ee3deeb5dc748ca55f009cebf35d024a22b5b0b1a4b7ddaf9be3ea4b68bb1cafcbbfab0954957d54dbb SHA512 4dea57427a334d1c6a349c3461a6ee50e5202475e218435ba5d6fb4d6ca15cbdd2e8317fcde4a2aca8a4a766e4729c43caf552aa1d0e262b609fe688e8710630
+EBUILD vpnc-scripts-20210402-r1.ebuild 631 BLAKE2B 507c97ac7045f64c8bb3967764460c7b32eb1c59a2e9862658df5e33486d3bc96e554b54d22e0c9487ba538ca047b859ff160847dc4ed9bb18c8c60bfd40ca45 SHA512 8981765b5faf7aff9624d5d818f0537e0612ab9956ec53839d847dd5e519f06a598416acc2ec3b0674b5b27ab7f9009fa318b8c86b74b04d2bee6ca082a5974d
+EBUILD vpnc-scripts-99999999.ebuild 638 BLAKE2B 97d210225c16d3b48309e172d14d239a999f8f7f9ebd74166aae22f36e6d72c9c6c6ec66ff77d60b5e06a9f01affab6df88a1e8f71e8147eb83015d7cbc52308 SHA512 e63e68a7e4b7673f090eda3e4044d9109a8b772bee5e5ca0ac03fcb33638ec5d480b00e5ad12b2a6f5c65d23e082e897fbce557f27cd02d1b82e7270783b359b
 MISC metadata.xml 246 BLAKE2B f94a229d0ffd7220f14c23ca2b0b6b84128338b5af27cd18ddb0c9e2f95f51c943fdfbc368c03b4a87d7bb381c668158fdc169fd067cc0cd8cd35852acc29d62 SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b
diff --git a/net-vpn/vpnc-scripts/vpnc-scripts-20210402.ebuild b/net-vpn/vpnc-scripts/vpnc-scripts-20210402-r1.ebuild
index 83fa0467d1d8..ebab1afc4cac 100644
--- a/net-vpn/vpnc-scripts/vpnc-scripts-20210402.ebuild
+++ b/net-vpn/vpnc-scripts/vpnc-scripts-20210402-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 99999999 ]]; then
 	EGIT_REPO_URI="https://gitlab.com/openconnect/vpnc-scripts.git"
 else
 	SRC_URI="ftp://ftp.infradead.org/pub/vpnc-scripts/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 fi
 
 DESCRIPTION="Connect scripts for use with vpnc and openconnect (and similar clients)"
@@ -17,7 +17,9 @@ HOMEPAGE="https://gitlab.com/openconnect/vpnc-scripts"
 LICENSE="GPL-2+"
 SLOT="0"
 
+RDEPEND="!<net-vpn/vpnc-0.5.3_p550-r3"
+
 src_install() {
-	exeinto /etc/vpnc-scripts
+	exeinto /etc/vpnc
 	doexe vpnc-script{,-{ptrtd,sshd}}
 }
diff --git a/net-vpn/vpnc-scripts/vpnc-scripts-99999999.ebuild b/net-vpn/vpnc-scripts/vpnc-scripts-99999999.ebuild
index 83fa0467d1d8..99aefb4e0087 100644
--- a/net-vpn/vpnc-scripts/vpnc-scripts-99999999.ebuild
+++ b/net-vpn/vpnc-scripts/vpnc-scripts-99999999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 99999999 ]]; then
 	EGIT_REPO_URI="https://gitlab.com/openconnect/vpnc-scripts.git"
 else
 	SRC_URI="ftp://ftp.infradead.org/pub/vpnc-scripts/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="Connect scripts for use with vpnc and openconnect (and similar clients)"
@@ -17,7 +17,9 @@ HOMEPAGE="https://gitlab.com/openconnect/vpnc-scripts"
 LICENSE="GPL-2+"
 SLOT="0"
 
+RDEPEND="!<net-vpn/vpnc-0.5.3_p550-r3"
+
 src_install() {
-	exeinto /etc/vpnc-scripts
+	exeinto /etc/vpnc
 	doexe vpnc-script{,-{ptrtd,sshd}}
 }
diff --git a/net-vpn/vpnc/Manifest b/net-vpn/vpnc/Manifest
index c2fcad65087e..951ff93a4bef 100644
--- a/net-vpn/vpnc/Manifest
+++ b/net-vpn/vpnc/Manifest
@@ -5,4 +5,5 @@ AUX vpnc.confd 123 BLAKE2B 313d5999586f56b3b88f8473d1f6f07e69994c620ddf3d8cfb9e2
 AUX vpnc.service 517 BLAKE2B 3fa2eaeea6a28fdf8826d936e1fe93dccade383411df395d69971312c9e062299af8b9f7514875a79a7d4e916efa4b4cf83ab0fb29eedbf52da31af3bc0fff63 SHA512 d580ad4fadbe6ea733f42eda53516e1766ba028f610653c62ba211d4a9ee05a6bf1d8676405a7a3ffede3432d75f9c4dcc72d1fab2a9215150f41a74269850c5
 DIST vpnc-0.5.3_p550-r2.tar.gz 133339 BLAKE2B d4f09a62edbe3b4014c4903d908eecf27ee09705017f715aadc869592fb80d7f4482f08e4681dd9e9c22ae16ae185404e09572800de8cb76419c20f5bf8e17d1 SHA512 3adaf4c73c14c328ca9702c1e3d3c333b0a589f99b52990febf7b22ac87f666f1fc0a1d62e9831ec645567ca01425ea476a7bb62fee214012c97651e0e99b732
 EBUILD vpnc-0.5.3_p550-r2.ebuild 2229 BLAKE2B fcd7c82681987e3f766980bb8b7cccfb069b1c51234518a750a074eb73fa3734eac52e84aaa1a385d8c36f2f4a2bc049fd45fa9e1f2fb46778a251ee5b8e04ef SHA512 71b10eea902d6bcb4f472b4e80f0597f697bee4aea45a1900c4e85a33894ed9e46e5e31db516d468954ac854e2f0ec250527c5592461e28ca461ed06c44e32eb
+EBUILD vpnc-0.5.3_p550-r3.ebuild 2299 BLAKE2B f16d4c12cb5ae5373a2017ab2220bd9f52bac52e13d9ca43c54184d395f50b4d4bc9481606bcf4c1fd41a666c09362fdd68bdd69b35ec93faf603113aa149c07 SHA512 0d37011d53ed0acf1b9768ed544511d543c8299e01b5c565ae00897e12fec297b36b9cd135265aa0ff36040a0367659088642e58202fd1ceeba7f9f0ad2a8272
 MISC metadata.xml 365 BLAKE2B 9505bbae63099cc965f4eb072819ef593e9d5d564002f550db6bfc277f12201dc1ac7cfd9d511d5ceaae501b308755004b2a2618059e122bd64e7b6d5109bd76 SHA512 d0925c0a1863f6de571a81ebbbc6b59eabaa73aa88c73162c4ea735a3cafcaac7c3ecacf05b9038f4aeb07e911865dc5c72f5ead3c1b2861dd3cf4c2cd3a2d84
diff --git a/net-vpn/vpnc/vpnc-0.5.3_p550-r3.ebuild b/net-vpn/vpnc/vpnc-0.5.3_p550-r3.ebuild
new file mode 100644
index 000000000000..ffead8b84325
--- /dev/null
+++ b/net-vpn/vpnc/vpnc-0.5.3_p550-r3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info systemd tmpfiles toolchain-funcs vcs-snapshot
+
+DESCRIPTION="Free client for Cisco VPN routing software"
+HOMEPAGE="https://www.unix-ag.uni-kl.de/~massar/vpnc/"
+MY_P="${P}-r2"
+SRC_URI="https://github.com/streambinder/vpnc/archive/fa0689c.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
+IUSE="resolvconf +gnutls selinux"
+RESTRICT="!gnutls? ( bindist )"
+
+DEPEND="
+	dev-lang/perl
+	dev-libs/libgcrypt:0=
+	>=sys-apps/iproute2-2.6.19.20061214[-minimal]
+	gnutls? ( net-libs/gnutls:0= )
+	!gnutls? ( dev-libs/openssl:0= )"
+RDEPEND="${DEPEND}
+	>=net-vpn/vpnc-scripts-20210402-r1
+	resolvconf? ( virtual/resolvconf )
+	selinux? ( sec-policy/selinux-vpn )"
+
+CONFIG_CHECK="~TUN"
+
+S="${WORKDIR}/${MY_P}"
+PATCHES=( "${FILESDIR}"/${MY_P}-var-run-fhs-3.0.patch )
+
+src_configure() {
+	tc-export CC
+	export OPENSSL_GPL_VIOLATION=$(usex !gnutls)
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${ED}" install
+	dodoc README.md TODO VERSION
+
+	keepdir /etc/vpnc/scripts.d
+	newinitd "${FILESDIR}"/vpnc-3.init vpnc
+	newconfd "${FILESDIR}"/vpnc.confd vpnc
+	# Use the newer version from net-vpn/vpnc-scripts
+	rm "${ED}"/etc/vpnc/vpnc-script || die
+
+	dotmpfiles "${FILESDIR}"/vpnc-tmpfiles.conf
+	systemd_newunit "${FILESDIR}"/vpnc.service vpnc@.service
+
+	# COPYING file resides here, should not be installed
+	rm -r "${ED}"/usr/share/doc/vpnc/ || die
+}
+
+pkg_postinst() {
+	tmpfiles_process vpnc-tmpfiles.conf
+
+	elog "You can generate a configuration file from the original Cisco profiles of your"
+	elog "connection by using /usr/bin/pcf2vpnc to convert the .pcf file"
+	elog "A guide is available at https://wiki.gentoo.org/wiki/Vpnc"
+
+	if use gnutls; then
+		elog "Will build with GnuTLS (default) instead of OpenSSL so you may even redistribute binaries."
+		elog "See the Makefile itself and https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318"
+	else
+		ewarn "Building SSL support with OpenSSL instead of GnuTLS. This means that"
+		ewarn "you are not allowed to re-distibute the binaries due to conflicts between BSD license and GPL,"
+		ewarn "see the vpnc Makefile and https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440318"
+	fi
+}