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

5 files changed, 39 insertions, 177 deletions

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