gentoo auto-resync : 06:06:2023 - 03:38:26

4 files changed, 110 insertions, 24 deletions

diff --git a/net-vpn/ocserv/Manifest b/net-vpn/ocserv/Manifest
index 2d537374d858..11bb797aa8b6 100644
--- a/net-vpn/ocserv/Manifest
+++ b/net-vpn/ocserv/Manifest
@@ -1,6 +1,9 @@
 AUX ocserv 182 BLAKE2B b7ea6c381fed7406bda8fae3638445d6cd2e2acaf5f5c310227fc56f62e3286df6bb49063db8d2ab8dce2c6d5e8487b50085875f2af057b662aeb37b5adfe77a SHA512 9e0dcc3668e5e7584b4f01f56c0b48c7a1099b3658ee2387cd899050030328c497e64f9409a1af589ab42f8b6b1e7f13828a50b478906721ccad9d3013f3b06a
 DIST ocserv-1.1.6.tar.xz 839744 BLAKE2B 3b3591588d9a5be4e723df739a5d8b4c33d78d536ecb169263c83cf8bedfdaab1a3d06e6dc11544acbede135626d37d98f2bc26b95ff80abb3f0e99f4688b7f6 SHA512 d1c5e5cf0e84aab168ed51516534df8b2968194dd1421f33563c61b3e47d5d79ebe9e6ffbf7cbcc9ff1242fae05151024f70ef586d063bec0b3eec00050bfdfa
 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
+DIST ocserv-1.1.7.tar.xz 844140 BLAKE2B 0b89937ce74fcf83d6423458462b3a419f9604407c80e2fc4a732b3e481dfd98cc76f062e112bf93ee392b3f4cdf5fdd271997c878bbe4165f11fa282852ff90 SHA512 5b6182b98c0406a27dae7121ec0d8771b158e0d8ce2056bd35451c8ed087a8b7f7d40035f9db5c19aa9a9a3b2c6b07be8f0bad4b6b96569584815a5358202ba4
+DIST ocserv-1.1.7.tar.xz.sig 442 BLAKE2B f5c40ef16f3bd4fb3dadff0459a6ecf8fadae01733a3d718ec00f35980b08860f7947c04a99386209a391185590edaedc349e9cb6684159178cd91caaf2f11fd SHA512 96d2562fdf918f2b6ea829d747330a3be2e015ab25897e01bd0d387cb69ef3592aacabbeec9612e95eca1fbce6178a176dbf76d553b7626c09d453d216ddd63d
+EBUILD ocserv-1.1.6.ebuild 2213 BLAKE2B da59b1f5b4557697609a23269564174a80c8a777db341fd53b373984f53affb734bfc5fd8c68f277cc6d8c49130e8a3ebb4666fb8933f29b79f5a2c58c7dd2ca SHA512 ae8ac6b33eae4658e0d1267635b0ed8d421a49c344444744ef5304f7921353a6c507ae035229a33960c3f374ac0610a42332c7d00d9e1400635a2ecf18239dda
+EBUILD ocserv-1.1.7.ebuild 2259 BLAKE2B 671e826757a581f3e9f4b45f0583dded47e4307c1112c6636f17c992c1d5e8020051ef9109f8dbe240a27c4454d8cb6ed3ee3730c5b376d7c9bf75413a02699b SHA512 d73d4e8f79b1d2d151c773572d6e9d6af3e1130417b7c4210949a0fd7d31841b100361f3d440154663241abfaf8c33bb370fd3cb16c2c855191585e87449b68b
+EBUILD ocserv-9999.ebuild 2218 BLAKE2B 8bfde6bdcd33ec6da70e22f9eb5ea703812c55bf609b3d57b5d675656970b27ef42260c287afa1472d0176c9b21442028ae263d93c959b6ed25eb85120aee2c4 SHA512 b99f375bd9083f5af8364d88ab44152dcd2cd83720e2dd3258573b0cb96626fe14410e2208bd621b5a8e17f1ae1adc1ad1106443a08266696c209867d14c2197
 MISC metadata.xml 326 BLAKE2B 72d04a451a052190079aaceb838f59191053f6c62bc8b39cc6d914f2b6f1083e6192235865d1ac9afd2569fb71441db028534abbf74666ccf063be2fd55522d0 SHA512 2a0ad00196df1cf38f02bf6de7232ac6d8886a85592c712e255bc4f7ec100ec1712c22f29f52c7b9b6c1d8f7473c5a4ab94e1f0e74c6eca0aa4563c3597a1798
diff --git a/net-vpn/ocserv/ocserv-1.1.6.ebuild b/net-vpn/ocserv/ocserv-1.1.6.ebuild
index cb0b28a4a458..7b41838cadc2 100644
--- a/net-vpn/ocserv/ocserv-1.1.6.ebuild
+++ b/net-vpn/ocserv/ocserv-1.1.6.ebuild
@@ -59,17 +59,6 @@ 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-1.1.7.ebuild b/net-vpn/ocserv/ocserv-1.1.7.ebuild
new file mode 100644
index 000000000000..06f0edf60a0d
--- /dev/null
+++ b/net-vpn/ocserv/ocserv-1.1.7.ebuild
@@ -0,0 +1,105 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+if [[ ${PV} == 9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://gitlab.com/openconnect/ocserv.git"
+else
+	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
+
+DESCRIPTION="Openconnect SSL VPN server"
+HOMEPAGE="https://ocserv.gitlab.io/www/index.html"
+
+LICENSE="GPL-2"
+SLOT="0"
+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
+		pam? ( sys-libs/pam_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_prepare() {
+	default
+	if [[ ${PV} == 9999 ]]; then
+		eautoreconf
+	fi
+}
+
+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_test() {
+	addwrite /proc
+	default
+}
+
+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-9999.ebuild b/net-vpn/ocserv/ocserv-9999.ebuild
index ae6884026608..f2240dd6718d 100644
--- a/net-vpn/ocserv/ocserv-9999.ebuild
+++ b/net-vpn/ocserv/ocserv-9999.ebuild
@@ -59,17 +59,6 @@ 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