gentoo auto-resync : 05:05:2023 - 17:31:39

9 files changed, 221 insertions, 181 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 03461372dfcf..81e9cc8bf2bf 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/ocserv/Manifest b/net-vpn/ocserv/Manifest
index cf9e64d32e11..2d537374d858 100644
--- a/net-vpn/ocserv/Manifest
+++ b/net-vpn/ocserv/Manifest
@@ -1,9 +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.3.tar.xz 833320 BLAKE2B bdf92683df55cd26bc102327b233703eefd58ea18ef71ccfc383e06b7fdd78ca59d605ef3517f430f3a20e8d4ab2c3f8abf2684cedd2eb0aeefe10c688faab15 SHA512 1138bd530e41f215f75e967aa293e80504a0ffc3384184832910b7bf8dc2049a637c1d8bef0221b6abb3e6510e51fba3c45d43901c0d2e4c0f180e72c0804628
 DIST ocserv-1.1.6.tar.xz 839744 BLAKE2B 3b3591588d9a5be4e723df739a5d8b4c33d78d536ecb169263c83cf8bedfdaab1a3d06e6dc11544acbede135626d37d98f2bc26b95ff80abb3f0e99f4688b7f6 SHA512 d1c5e5cf0e84aab168ed51516534df8b2968194dd1421f33563c61b3e47d5d79ebe9e6ffbf7cbcc9ff1242fae05151024f70ef586d063bec0b3eec00050bfdfa
-EBUILD ocserv-1.0.1-r1.ebuild 1764 BLAKE2B 7d70d482356ab6cd8d3023c1473a7e0a9df670156fb6ac73fe2ed3553238629b109f475ca3503ec14bf3dcb19693be0cc492fef36253fff52df62922fcc847ef SHA512 fe17989107f3e3fb08663c66b49f4c87664b033ddb3094743fa939e5940d723718ce862d292cbed1176e2a5669e73973789f02ef7212d624a26fa96d8fdc6bb6
-EBUILD ocserv-1.1.3.ebuild 1751 BLAKE2B b9746f11601f1d3879c912e024f0122fb13e2a4f242b7b83629e6faf13a8f77fa97faeb5ccc6537e48e5c07d7abc8341419f012dfc9a0fd93ba2f2305c83eb67 SHA512 ae0e337be65aae1f114ecac874e46bfa64d7c98d540366ea716e47abdce8176b0621e4df03a0dc7ac1f3fdf2d5b3d47c07d1f4d1eebb39de93978e9b6b68b06a
-EBUILD ocserv-1.1.6.ebuild 1979 BLAKE2B 231e915b7f55e57a01bc211146cea5f87d728cbc3130a5fd0877df068ead5ea00a6425c8dd1eaec10352ac5da304a9c3c20cff0d3c47b7f150ee7f7439535d98 SHA512 143f991864b806ff0e1969b3a1980b55f416e0d58b43a37d92440cb24dcd641225a52c23693bc49b643d3b48d86946f5d63f2a6d2c9ad2a5d21c60c645592428
-EBUILD ocserv-9999.ebuild 1984 BLAKE2B ed531bfe9ab769bb6d0627295afdc230efd2451f1c131196ffabbc88823a34828db7457587639e29a38530d9cadc835420846490b128f66821a821c35b7572a7 SHA512 acbe2d34e0fe2e61026cad725ac746147b5d4f4351bba530c3c45421bc01b979edf4ee3c1270548407397ef995b6fda75b969b57b794b1140cf6e71d1b29e802
+DIST ocserv-1.1.6.tar.xz.sig 442 BLAKE2B d24c46783f273bd329267cb3ba4effe0280655867e619bf0a3e4191386fa8851541fcd8768b0b1068e594caaf510ceeccfc30641169679ec394706fdf1ebe319 SHA512 2a87768ad63d40053732fa011bbeb3532c9673296b9be299bf8f7d8dd3dd35571eee96c0b4fa9bf5a30633b4c844337ab3d562d6ea2b6ad8efca084eb5e6f502
+EBUILD ocserv-1.1.6.ebuild 2407 BLAKE2B a2910b5a2c1ad956c4759d96f68ce99c241aaad73137256ee4d60907a4b2fa1b9c34db8c3b42e27e940aed2dcdb6554502d87344325e29bc07953df74a8ca3cf SHA512 75e07987ac750d17b79d41ffc193baf557369ada1b1acdb57f4513f584b28cfc3f5ce40f6a5ef3039070bb4239866ac26fe12855ad7e2b0569031349fea35318
+EBUILD ocserv-9999.ebuild 2412 BLAKE2B ad8bb0735e5e4398c55129f5fae4c9e04a0a76f7fbe827fdf13c53c9ce6d06cd101ea6460989babe644ad6ef244ffa52e7bea5d4d6a8833b6ff8d1e2988880a2 SHA512 53f786938ab2de28c411af264811c4e792a48cdce33e2a4750826bd161d80f0579233c4598ed8ff3f0b9c3adb02fe3c46cd1a8522e11d688d744c13f49fe83a9
 MISC metadata.xml 326 BLAKE2B 72d04a451a052190079aaceb838f59191053f6c62bc8b39cc6d914f2b6f1083e6192235865d1ac9afd2569fb71441db028534abbf74666ccf063be2fd55522d0 SHA512 2a0ad00196df1cf38f02bf6de7232ac6d8886a85592c712e255bc4f7ec100ec1712c22f29f52c7b9b6c1d8f7473c5a4ab94e1f0e74c6eca0aa4563c3597a1798
diff --git a/net-vpn/ocserv/ocserv-1.0.1-r1.ebuild b/net-vpn/ocserv/ocserv-1.0.1-r1.ebuild
deleted file mode 100644
index 30ecafc2b9cc..000000000000
--- a/net-vpn/ocserv/ocserv-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="Openconnect SSL VPN server"
-HOMEPAGE="https://ocserv.gitlab.io/www/index.html"
-SRC_URI="ftp://ftp.infradead.org/pub/ocserv/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
-IUSE="geoip kerberos +lz4 otp pam radius +seccomp systemd tcpd test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		net-libs/gnutls[tools(+)]
-		net-libs/socket_wrapper
-		net-vpn/openconnect
-		sys-libs/nss_wrapper
-		sys-libs/uid_wrapper
-	)
-"
-DEPEND="
-	dev-libs/libnl:3=
-	dev-libs/libev:0=
-	>=dev-libs/nettle-2.7:0=
-	dev-libs/pcl:0=
-	dev-libs/protobuf-c:0=
-	>=net-libs/gnutls-3.3.0:0=
-	net-libs/http-parser:0=
-	sys-libs/readline:0=
-	sys-libs/talloc:0=
-	virtual/libcrypt:=
-	geoip? ( dev-libs/geoip:0= )
-	kerberos? ( virtual/krb5 )
-	lz4? ( app-arch/lz4:0= )
-	otp? ( sys-auth/oath-toolkit:0= )
-	pam? ( sys-libs/pam:0= )
-	radius? ( net-dialup/freeradius-client:0= )
-	seccomp? ( sys-libs/libseccomp:0= )
-	systemd? ( sys-apps/systemd:0= )
-	tcpd? ( sys-apps/tcp-wrappers:0= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local myconf=(
-		--without-root-tests
-		--without-docker-tests
-		--without-nuttcp-tests
-
-		$(use_enable seccomp)
-		$(use_enable systemd)
-
-		$(use_with geoip)
-		$(use_with kerberos gssapi)
-		$(use_with lz4)
-		$(use_with otp liboath)
-		$(use_with radius)
-		$(use_with tcpd libwrap)
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	dodoc doc/sample.{config,passwd}
-	use otp && dodoc doc/sample.otp
-
-	doinitd "${FILESDIR}"/ocserv
-
-	if use systemd; then
-		systemd_dounit doc/systemd/socket-activated/ocserv.{service,socket}
-	else
-		systemd_dounit doc/systemd/standalone/ocserv.service
-	fi
-}
diff --git a/net-vpn/ocserv/ocserv-1.1.3.ebuild b/net-vpn/ocserv/ocserv-1.1.3.ebuild
deleted file mode 100644
index 459da4219219..000000000000
--- a/net-vpn/ocserv/ocserv-1.1.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="Openconnect SSL VPN server"
-HOMEPAGE="https://ocserv.gitlab.io/www/index.html"
-SRC_URI="ftp://ftp.infradead.org/pub/ocserv/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="geoip kerberos +lz4 otp pam radius +seccomp systemd tcpd test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		net-libs/gnutls[tools(+)]
-		net-libs/socket_wrapper
-		net-vpn/openconnect
-		sys-libs/nss_wrapper
-		sys-libs/uid_wrapper
-	)
-"
-DEPEND="
-	dev-libs/libnl:3=
-	dev-libs/libev:0=
-	>=dev-libs/nettle-2.7:0=
-	dev-libs/pcl:0=
-	dev-libs/protobuf-c:0=
-	>=net-libs/gnutls-3.3.0:0=
-	net-libs/http-parser:0=
-	sys-libs/readline:0=
-	sys-libs/talloc:0=
-	virtual/libcrypt:=
-	geoip? ( dev-libs/geoip:0= )
-	kerberos? ( virtual/krb5 )
-	lz4? ( app-arch/lz4:0= )
-	otp? ( sys-auth/oath-toolkit:0= )
-	pam? ( sys-libs/pam:0= )
-	radius? ( net-dialup/freeradius-client:0= )
-	seccomp? ( sys-libs/libseccomp:0= )
-	systemd? ( sys-apps/systemd:0= )
-	tcpd? ( sys-apps/tcp-wrappers:0= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local myconf=(
-		--without-root-tests
-		--without-nuttcp-tests
-
-		$(use_enable seccomp)
-		$(use_enable systemd)
-
-		$(use_with geoip)
-		$(use_with kerberos gssapi)
-		$(use_with lz4)
-		$(use_with otp liboath)
-		$(use_with radius)
-		$(use_with tcpd libwrap)
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	dodoc doc/sample.{config,passwd}
-	use otp && dodoc doc/sample.otp
-
-	doinitd "${FILESDIR}"/ocserv
-
-	if use systemd; then
-		systemd_dounit doc/systemd/socket-activated/ocserv.{service,socket}
-	else
-		systemd_dounit doc/systemd/standalone/ocserv.service
-	fi
-}
diff --git a/net-vpn/ocserv/ocserv-1.1.6.ebuild b/net-vpn/ocserv/ocserv-1.1.6.ebuild
index 85c409912412..cb0b28a4a458 100644
--- a/net-vpn/ocserv/ocserv-1.1.6.ebuild
+++ b/net-vpn/ocserv/ocserv-1.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2022 Gentoo Authors
+# Copyright 2019-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,11 @@ if [[ ${PV} == 9999 ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://gitlab.com/openconnect/ocserv.git"
 else
-	SRC_URI="ftp://ftp.infradead.org/pub/ocserv/${P}.tar.xz"
+	inherit verify-sig
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/ocserv.asc"
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-ocserv )"
+	SRC_URI="https://www.infradead.org/ocserv/download/${P}.tar.xz
+		verify-sig? ( https://www.infradead.org/ocserv/download/${P}.tar.xz.sig )"
 	KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
 fi
 
@@ -21,7 +25,7 @@ SLOT="0"
 IUSE="geoip kerberos +lz4 otp pam radius +seccomp systemd tcpd test"
 RESTRICT="!test? ( test )"
 
-BDEPEND="
+BDEPEND+="
 	virtual/pkgconfig
 	test? (
 		net-libs/gnutls[tools(+)]
@@ -55,6 +59,17 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	else
+		if use verify-sig; then
+			verify-sig_verify_detached "${DISTDIR}/${P}.tar.xz"{,.sig}
+		fi
+		unpack "${P}.tar.xz"
+	fi
+}
+
 src_prepare() {
 	default
 	if [[ ${PV} == 9999 ]]; then
diff --git a/net-vpn/ocserv/ocserv-9999.ebuild b/net-vpn/ocserv/ocserv-9999.ebuild
index b28feddc1b05..ae6884026608 100644
--- a/net-vpn/ocserv/ocserv-9999.ebuild
+++ b/net-vpn/ocserv/ocserv-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2022 Gentoo Authors
+# Copyright 2019-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,11 @@ if [[ ${PV} == 9999 ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://gitlab.com/openconnect/ocserv.git"
 else
-	SRC_URI="ftp://ftp.infradead.org/pub/ocserv/${P}.tar.xz"
+	inherit verify-sig
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/ocserv.asc"
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-ocserv )"
+	SRC_URI="https://www.infradead.org/ocserv/download/${P}.tar.xz
+		verify-sig? ( https://www.infradead.org/ocserv/download/${P}.tar.xz.sig )"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
@@ -21,7 +25,7 @@ SLOT="0"
 IUSE="geoip kerberos +lz4 otp pam radius +seccomp systemd tcpd test"
 RESTRICT="!test? ( test )"
 
-BDEPEND="
+BDEPEND+="
 	virtual/pkgconfig
 	test? (
 		net-libs/gnutls[tools(+)]
@@ -55,6 +59,17 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	else
+		if use verify-sig; then
+			verify-sig_verify_detached "${DISTDIR}/${P}.tar.xz"{,.sig}
+		fi
+		unpack "${P}.tar.xz"
+	fi
+}
+
 src_prepare() {
 	default
 	if [[ ${PV} == 9999 ]]; then
diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest
index 5a92b3b5ba6f..264030aba2a1 100644
--- a/net-vpn/openconnect/Manifest
+++ b/net-vpn/openconnect/Manifest
@@ -4,7 +4,10 @@ AUX openconnect.confd 230 BLAKE2B 6013d6e415ad37f5c4b0d31df011c207978c2f266d94bc
 AUX openconnect.initd 664 BLAKE2B 5fcf983c474ccb10c2b785f1af161e6f85efcb19fe13abc9710a797633496a48ced470cac73cb9c51e3ad66f5efc9e5c559961cfb4213b12684133410614203c SHA512 5c75143e61fd215e13888b647357cf5626902b74cc4af2a8c147c95412ef9393572a8eb34cd5d86babedf2674ca5c3aa35991101a730a033b5af5c8ee9cc4ad9
 AUX openconnect.logrotate 116 BLAKE2B 308d088f7c06239ec68831e415df420362c1825ae279fa6f736f36df0bf2e7efc8ea6a4ab43d9b53680dd0ab5028c92bf70a0597b56a20da06b302457e7d5f07 SHA512 ea1b6caf6278fea515c299072ee799ab3676014784703d7fa8e4f4d7bfc4599650c386d9706a3e6d92c195c9e5e1628fa6efc1124e1ae72875cc9eaab73cb077
 DIST openconnect-9.01.tar.gz 2718526 BLAKE2B e346b30ed8a299bcdd1fc88868d59b4d501c48bc5c02092e92e7ded0cd36e4de6a5b65aae4f6bf8c9aa60cf70f5466b110b64889df8d286016c9a1b4d9f46ff7 SHA512 b7428847a90f8ca9d1f1f61653c1f2486f0a07989f3b7435b746c5e901998194f4ee2b4f9569a548a23bba368bb1e9f273674c0759aac9df30208d2a6a303c34
+DIST openconnect-9.10.tar.gz 2843858 BLAKE2B 03349acaf2420fc1acb4e5787159a7185708e9e2fe8f7e3b54141342da361b304967a27d60ea3b3bede62b9e74718cbcc734c33c36bf49a7ab4ca8ee5d96bbbf SHA512 64d10ad67fccd11d1aaae23a77c6cfd8200bbba0eae21a7d01c604688ec9c35b5f19eeb9a47de14d383780eba64a2f6c06daccd4c1fae6289efdb0dc2fb7c536
+DIST openconnect-9.10.tar.gz.asc 833 BLAKE2B 37ac92d70b415ba4d80c6a9028610e5660eecf7bd826d8ea708c8c59b60ff2fc8dcdc583dbc163ad5929c34b034e44273dc91d966b81397daaa8edda6407f5bc SHA512 4ed8be3a8aa1a0bdedff94910b2de792c93025498f83b50033df9ef25fd0a9dd86ab3011183657b49bbc3c2b70a5acb9605bdfa722e2bb2f2318540d1047f730
 EBUILD openconnect-9.01-r2.ebuild 3132 BLAKE2B 08ba64720cf15eb6598172e04b27d4424150b9cb9709449e5bb3192923dcd9126cd8bd4ec3fa688cc2fa1b633dda734164c1453e0f38976b463399b422670247 SHA512 24e9038a035afdffb1f95f0c6e9701d1c212aa60667d359a4a1f3ee5e7a705653ec92ee917bd20ec293a204b3c4e4b10d9cec13e65b194d683b22bcd43ca758f
 EBUILD openconnect-9.01-r3.ebuild 3172 BLAKE2B f9d7ad23f49089bbd521cbc64b06939dea570e8b56e93b1cc528227759100555040eb8768292e6538c656d64220d5b1a35be0efe1f2972064980e3a41084c762 SHA512 cf13ffd11a2929b50c68be116613700f6bb975e0b29121fa448bf347e5856fee8211971d25cd257f42c94cfa93934298fcf080759c5ee669584d03187fe12514
-EBUILD openconnect-9999.ebuild 3097 BLAKE2B c46efb0baece93d642539d985daa25b73c78f2436fbd726c87704e8b85fa976eb1954e00cdb5bb54565a7c47c246ae2630c30223609b235add214bce4ea8efd2 SHA512 0bd8fb05700e62d374286cf3f99f44373e11013ad5d58ed53767f20faa854d4aa55f995ed98ee12403422ab713ad0fbcf4661ce4db2807763f41b25849cc7b08
+EBUILD openconnect-9.10.ebuild 3521 BLAKE2B beb23a4e41be56bacb9612d3e3850a6561e3e1b8f09295b50d5dd8294430ff4be2a52a9e46ae47b3c99abf263b93ac920dc34ace51fdb72940622786943ebd56 SHA512 bfeb005367eca23f053ca4e12ed4e93fc8c7d71414074ccf0c50dfb05d01b27cbf4dc5e9a2ce635ffcc397473207871a821c3d72c230c680f23d057a3bc1ef65
+EBUILD openconnect-9999.ebuild 3521 BLAKE2B beb23a4e41be56bacb9612d3e3850a6561e3e1b8f09295b50d5dd8294430ff4be2a52a9e46ae47b3c99abf263b93ac920dc34ace51fdb72940622786943ebd56 SHA512 bfeb005367eca23f053ca4e12ed4e93fc8c7d71414074ccf0c50dfb05d01b27cbf4dc5e9a2ce635ffcc397473207871a821c3d72c230c680f23d057a3bc1ef65
 MISC metadata.xml 594 BLAKE2B 63b24f0d189e935368858b3f7f4160d9121847dc598ee6fb0cd8ed313d51e03de983584a48a799553349f779c6a18d1f080a906449fe0f4d05cec0f43c4a2c70 SHA512 6a474d13019ee9a325c3b262220a41b1faeaa3315500a2e73670bfea2cb2778036d107fcf783f89d286ec4125460b0cf7a19b85155f9b6b9f9d9459cbf87e070
diff --git a/net-vpn/openconnect/openconnect-9.10.ebuild b/net-vpn/openconnect/openconnect-9.10.ebuild
new file mode 100644
index 000000000000..bda422a32553
--- /dev/null
+++ b/net-vpn/openconnect/openconnect-9.10.ebuild
@@ -0,0 +1,163 @@
+# Copyright 2011-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit linux-info python-any-r1
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git"
+	inherit git-r3 autotools
+else
+	inherit verify-sig
+	SRC_URI="https://www.infradead.org/openconnect/download/${P}.tar.gz
+		verify-sig? ( https://www.infradead.org/openconnect/download/${P}.tar.gz.asc )"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
+HOMEPAGE="https://www.infradead.org/openconnect/"
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5"
+IUSE="doc +gnutls gssapi libproxy lz4 nls pskc selinux smartcard stoken test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/json-parser:0=
+	dev-libs/libxml2
+	sys-libs/zlib
+	app-crypt/p11-kit
+	!gnutls? (
+		>=dev-libs/openssl-1.0.1h:0=
+		dev-libs/libp11
+	)
+	gnutls? (
+		app-crypt/trousers
+		app-misc/ca-certificates
+		dev-libs/nettle
+		>=net-libs/gnutls-3.6.13:0=
+		dev-libs/libtasn1:0=
+		app-crypt/tpm2-tss:=
+	)
+	gssapi? ( virtual/krb5 )
+	libproxy? ( net-libs/libproxy )
+	lz4? ( app-arch/lz4:= )
+	nls? ( virtual/libintl )
+	pskc? ( sys-auth/oath-toolkit[pskc(+)] )
+	smartcard? ( sys-apps/pcsc-lite:0= )
+	stoken? ( app-crypt/stoken )
+"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		net-libs/socket_wrapper
+		sys-libs/uid_wrapper
+		!gnutls? ( dev-libs/openssl:0[weak-ssl-ciphers(-)] )
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2
+	>=net-vpn/vpnc-scripts-20210402-r1
+	selinux? ( sec-policy/selinux-vpn )
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( ${PYTHON_DEPS} sys-apps/groff )
+	nls? ( sys-devel/gettext )
+	test? ( net-vpn/ocserv )
+"
+
+if [[ ${PV} != 9999 ]]; then
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-dwmw2 )"
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/dwmw2@kernel.org.key"
+fi
+
+CONFIG_CHECK="~TUN"
+
+pkg_pretend() {
+	check_extra_config
+}
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	else
+		if use verify-sig; then
+			verify-sig_verify_detached "${DISTDIR}/${P}".tar.gz{,.asc}
+		fi
+		unpack "${P}.tar.gz"
+	fi
+}
+
+src_prepare() {
+	default
+	if [[ ${PV} == 9999 ]]; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	if use doc; then
+		python_setup
+	else
+		export ac_cv_path_PYTHON=
+	fi
+
+	# Used by tests if userpriv is disabled
+	addwrite /run/netns
+
+	local myconf=(
+		--disable-dsa-tests
+		$(use_enable nls)
+		--disable-static
+		$(use_with !gnutls openssl)
+		$(use_with gnutls)
+		$(use_with libproxy)
+		$(use_with lz4)
+		$(use_with gssapi)
+		$(use_with pskc libpskc)
+		$(use_with smartcard libpcsclite)
+		$(use_with stoken)
+		--with-vpnc-script="${EPREFIX}/etc/vpnc/vpnc-script"
+		--without-builtin-json
+		--without-java
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	local charset
+	for charset in UTF-8 ISO-8859-2; do
+		if [[ $(LC_ALL=cs_CZ.${charset} locale charmap 2>/dev/null) != ${charset} ]]; then
+			# If we don't have valid cs_CZ locale data, auth-nonascii will fail.
+			# Force a test skip by exiting with status 77.
+			sed -i -e '2i exit 77' tests/auth-nonascii || die
+			break
+		fi
+	done
+	addwrite /proc
+	default
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	dodoc "${FILESDIR}"/README.OpenRC
+
+	newconfd "${FILESDIR}"/openconnect.confd openconnect
+	newinitd "${FILESDIR}"/openconnect.initd openconnect
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openconnect.logrotate openconnect
+
+	keepdir /var/log/openconnect
+}
diff --git a/net-vpn/openconnect/openconnect-9999.ebuild b/net-vpn/openconnect/openconnect-9999.ebuild
index 1128cd29c582..bda422a32553 100644
--- a/net-vpn/openconnect/openconnect-9999.ebuild
+++ b/net-vpn/openconnect/openconnect-9999.ebuild
@@ -12,8 +12,10 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git"
 	inherit git-r3 autotools
 else
-	SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	inherit verify-sig
+	SRC_URI="https://www.infradead.org/openconnect/download/${P}.tar.gz
+		verify-sig? ( https://www.infradead.org/openconnect/download/${P}.tar.gz.asc )"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
@@ -68,6 +70,11 @@ BDEPEND="
 	test? ( net-vpn/ocserv )
 "
 
+if [[ ${PV} != 9999 ]]; then
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-dwmw2 )"
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/dwmw2@kernel.org.key"
+fi
+
 CONFIG_CHECK="~TUN"
 
 pkg_pretend() {
@@ -81,8 +88,12 @@ pkg_setup() {
 src_unpack() {
 	if [[ ${PV} == 9999 ]]; then
 		git-r3_src_unpack
+	else
+		if use verify-sig; then
+			verify-sig_verify_detached "${DISTDIR}/${P}".tar.gz{,.asc}
+		fi
+		unpack "${P}.tar.gz"
 	fi
-	default
 }
 
 src_prepare() {
@@ -132,6 +143,7 @@ src_test() {
 			break
 		fi
 	done
+	addwrite /proc
 	default
 }