gentoo resync : 16.04.2022

3 files changed, 102 insertions, 3 deletions

diff --git a/net-vpn/ocserv/Manifest b/net-vpn/ocserv/Manifest
index 34defc48c47e..a67fb047ba36 100644
--- a/net-vpn/ocserv/Manifest
+++ b/net-vpn/ocserv/Manifest
@@ -1,7 +1,9 @@
 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-9999.ebuild 1952 BLAKE2B 805c924f59b472aa5cae1ca88f609667cdc3b2927fe180085168ea03d59f7aef7da4a6eb920c9bff8a364bf33375c71183de6970a4069e07a58ae77cf0ea76bc SHA512 a40d7c52d805ebed5210717a27b372fae595d91333ce269f35528fbaee2dc483c162b8d01dbe1f87929bb71312707dffef75eb0fe5e30e0f13b767c631b7f823
+EBUILD ocserv-1.1.6.ebuild 1984 BLAKE2B ed531bfe9ab769bb6d0627295afdc230efd2451f1c131196ffabbc88823a34828db7457587639e29a38530d9cadc835420846490b128f66821a821c35b7572a7 SHA512 acbe2d34e0fe2e61026cad725ac746147b5d4f4351bba530c3c45421bc01b979edf4ee3c1270548407397ef995b6fda75b969b57b794b1140cf6e71d1b29e802
+EBUILD ocserv-9999.ebuild 1984 BLAKE2B ed531bfe9ab769bb6d0627295afdc230efd2451f1c131196ffabbc88823a34828db7457587639e29a38530d9cadc835420846490b128f66821a821c35b7572a7 SHA512 acbe2d34e0fe2e61026cad725ac746147b5d4f4351bba530c3c45421bc01b979edf4ee3c1270548407397ef995b6fda75b969b57b794b1140cf6e71d1b29e802
 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
new file mode 100644
index 000000000000..b28feddc1b05
--- /dev/null
+++ b/net-vpn/ocserv/ocserv-1.1.6.ebuild
@@ -0,0 +1,96 @@
+# Copyright 2019-2022 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
+	SRC_URI="ftp://ftp.infradead.org/pub/ocserv/${P}.tar.xz"
+	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_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 1dd59ce1a337..b28feddc1b05 100644
--- a/net-vpn/ocserv/ocserv-9999.ebuild
+++ b/net-vpn/ocserv/ocserv-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit systemd
 
@@ -29,6 +29,7 @@ BDEPEND="
 		net-vpn/openconnect
 		sys-libs/nss_wrapper
 		sys-libs/uid_wrapper
+		pam? ( sys-libs/pam_wrapper )
 	)
 "
 DEPEND="