gentoo auto-resync : 20:05:2024 - 00:02:15

4 files changed, 120 insertions, 7 deletions

diff --git a/net-vpn/ocserv/Manifest b/net-vpn/ocserv/Manifest
index 1dd4ad49579c..f17c2aea891d 100644
--- a/net-vpn/ocserv/Manifest
+++ b/net-vpn/ocserv/Manifest
@@ -3,7 +3,10 @@ DIST ocserv-1.1.6.tar.xz 839744 BLAKE2B 3b3591588d9a5be4e723df739a5d8b4c33d78d53
 DIST ocserv-1.1.6.tar.xz.sig 442 BLAKE2B d24c46783f273bd329267cb3ba4effe0280655867e619bf0a3e4191386fa8851541fcd8768b0b1068e594caaf510ceeccfc30641169679ec394706fdf1ebe319 SHA512 2a87768ad63d40053732fa011bbeb3532c9673296b9be299bf8f7d8dd3dd35571eee96c0b4fa9bf5a30633b4c844337ab3d562d6ea2b6ad8efca084eb5e6f502
 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
+DIST ocserv-1.3.0.tar.xz 770596 BLAKE2B b45c528ca0d12602ae05cebf469a4be2efa846a49540375b258901620a9b95135297fdbb6553cec2cf63b506bcfc9355df8b519bcd6d52684b3b7432dbe66380 SHA512 24c3129b389fa767ad14f158580d8abd6830e697162b8fcfe3df6a4d21d543460c1955c3e0c63fecb8b4b01bd2492254d3eea8d5ba60d864cea314325badda7e
+DIST ocserv-1.3.0.tar.xz.sig 442 BLAKE2B f73b98c71a0c3fe18bf540e84871a51d28b8993ba9ae719f89fa345412a609d062b2041cd9b0e4b6aae8eecf8a117c68d408153b0ea15c7b1277f3d2ebcec567 SHA512 dd6a2e6f28a512bda19e758b32149cfe7951151edab8c34ac371dbcd17eed4a8b10fdfee306629c1d42c2a3e22bcfe523ee2aafb84d59181d5be719c399cfb7d
 EBUILD ocserv-1.1.6.ebuild 2205 BLAKE2B ee79d90e9277d6fdba6e090f91203fec92642e1c216bcdc9f920209fe4e4f3a494f054b3a39d6c87789492703f819fc3d2ccfe9ee3951acfdfa5fa8226af5e07 SHA512 ed2063b5059198983b045524b774d3701f5c460c4401ddf3219d6ff4f3e982a0bfdc0540913c505a2997dbadb74baa3d7b758ceaf892b852472581796a8c8b18
-EBUILD ocserv-1.1.7.ebuild 2251 BLAKE2B e8167910a102bbc0a120bfa04b163110f81cba0c899d4b413616af03ae0b6fa9607178b56928d4724d18607b4caf6ddf852feb36b32b74cb4acadc0970cfd904 SHA512 38d03e783e16d6375bc73cdb394a8121fd1abb346c5b78dc19a5c1996598f6d3f86c39b6d5025477a5909a506051257331cc02159f10d41080877ab325600543
-EBUILD ocserv-9999.ebuild 2210 BLAKE2B 3d718516f2a59330a82154fb263e83061d3c74bb903ed59836240f31328bbdbf5de8938a35a9655091b3fbe281437201a068d990bf8a892e1a3e3ea4855cb433 SHA512 c74d4a39ee5868cf09e231d6bbf458b2c4b05a5b2689cdde32aff890561feae4bb36f34cd8f79b7acd7e63442f2f51482df2de9d766c160ba4ef4df447e26939
+EBUILD ocserv-1.1.7.ebuild 2240 BLAKE2B 4226309b0e3e9975f53acce2a3896b3c8bbc62f7049f98936922b6901cc1b031aeb1da38d6b412381bc1b5d2422c2c744d7eb90f12ee9db309761fefbccc613b SHA512 b8ac24bd5a4904801eeb1e7e37bbb93f6996813efd3532ce354795221527f25ccfd12b0060651a06ebae62d367dd49eee5feccc6dcb61d8b7cf7591d9ed7eedf
+EBUILD ocserv-1.3.0.ebuild 2238 BLAKE2B be8fabca754f1f4bcc67fad37675aa7a509573e8334c424c5e7b40c5092cdedcc8c13afcd1d12469193cf5affe51582d29c80674a86b50a20f402b8c6b55e6e1 SHA512 0063da423dac1919e5eafdf24cab32dba67905fd7f8ef7b790b586ac269cf28806b9df68287d7afec738006cfa1f477009459fa30921b4ee7b32ab2255112d70
+EBUILD ocserv-9999.ebuild 2238 BLAKE2B be8fabca754f1f4bcc67fad37675aa7a509573e8334c424c5e7b40c5092cdedcc8c13afcd1d12469193cf5affe51582d29c80674a86b50a20f402b8c6b55e6e1 SHA512 0063da423dac1919e5eafdf24cab32dba67905fd7f8ef7b790b586ac269cf28806b9df68287d7afec738006cfa1f477009459fa30921b4ee7b32ab2255112d70
 MISC metadata.xml 326 BLAKE2B 72d04a451a052190079aaceb838f59191053f6c62bc8b39cc6d914f2b6f1083e6192235865d1ac9afd2569fb71441db028534abbf74666ccf063be2fd55522d0 SHA512 2a0ad00196df1cf38f02bf6de7232ac6d8886a85592c712e255bc4f7ec100ec1712c22f29f52c7b9b6c1d8f7473c5a4ab94e1f0e74c6eca0aa4563c3597a1798
diff --git a/net-vpn/ocserv/ocserv-1.1.7.ebuild b/net-vpn/ocserv/ocserv-1.1.7.ebuild
index 1b35605dac3b..9255a9952a09 100644
--- a/net-vpn/ocserv/ocserv-1.1.7.ebuild
+++ b/net-vpn/ocserv/ocserv-1.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,7 +23,7 @@ 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 )"
+RESTRICT="test"
 
 BDEPEND+="
 	virtual/pkgconfig
diff --git a/net-vpn/ocserv/ocserv-1.3.0.ebuild b/net-vpn/ocserv/ocserv-1.3.0.ebuild
new file mode 100644
index 000000000000..52512265f732
--- /dev/null
+++ b/net-vpn/ocserv/ocserv-1.3.0.ebuild
@@ -0,0 +1,105 @@
+# Copyright 2019-2024 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="/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-misc/ipcalc
+		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=
+	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
+
+		$(use_enable seccomp)
+		$(use_enable systemd)
+
+		$(use_with geoip)
+		$(use_with kerberos gssapi)
+		--without-llhttp
+		$(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 9ff9e3fd75a7..52512265f732 100644
--- a/net-vpn/ocserv/ocserv-9999.ebuild
+++ b/net-vpn/ocserv/ocserv-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -30,6 +30,7 @@ BDEPEND+="
 	test? (
 		net-libs/gnutls[tools(+)]
 		net-libs/socket_wrapper
+		net-misc/ipcalc
 		net-vpn/openconnect
 		sys-libs/nss_wrapper
 		sys-libs/uid_wrapper
@@ -43,7 +44,6 @@ DEPEND="
 	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:=
@@ -69,13 +69,13 @@ src_prepare() {
 src_configure() {
 	local myconf=(
 		--without-root-tests
-		--without-nuttcp-tests
 
 		$(use_enable seccomp)
 		$(use_enable systemd)
 
 		$(use_with geoip)
 		$(use_with kerberos gssapi)
+		--without-llhttp
 		$(use_with lz4)
 		$(use_with otp liboath)
 		$(use_with radius)
@@ -84,6 +84,11 @@ src_configure() {
 	econf "${myconf[@]}"
 }
 
+src_test() {
+	addwrite /proc
+	default
+}
+
 src_install() {
 	default