gentoo auto-resync : 05:01:2024 - 14:04:25

3 files changed, 211 insertions, 6 deletions

diff --git a/net-vpn/openvpn/Manifest b/net-vpn/openvpn/Manifest
index db9fe299fd61..5d633582b241 100644
--- a/net-vpn/openvpn/Manifest
+++ b/net-vpn/openvpn/Manifest
@@ -9,10 +9,12 @@ DIST openvpn-2.5.6.tar.xz 1150352 BLAKE2B 509821eca9d40c5579700e05e560b906ddee5a
 DIST openvpn-2.5.7.tar.xz 1150476 BLAKE2B e8d24a8be8ff97072ef3b76dbec15cd6e7097ebe99f680d759f213cb5643d7b4a29664d2a96e6efe1d6ee858a6d6b3f23c6d12cf74f202fbe8cc48642f18dba6 SHA512 9a3234b479f5bab12b8c3af7691f175f8cd32f2929dd27efc16e96e14dbb8e07421e623869ad5ffc2d7e65f2266817d1583723033f3646b9913b10ec6d014b44
 DIST openvpn-2.6.4.tar.gz 1861178 BLAKE2B 584fc3950732d6a1db417811f6e330a154537207f6c9543ab03b1c1a886a98a0aee7d1649055a9f7944555ae8865602be15fd8e23b67258917f1adebde050099 SHA512 903ac41691c26e8e4ad65c9b6fb5e75db2caf2e4079d3c4cb61a44e51be9991508f53a1dd8b4b863b4ac86088ad1a705d22131df1e25612560c9f4276d8190ec
 DIST openvpn-2.6.7.tar.gz 1895682 BLAKE2B 58d5f2e16fc30f8533c9b18f8b63ead67782b50fdd7c09a903bd9a0d13762e4356f49393ebd7778ce68881fdd58c7564adf114230e46f811963b941a788e42e9 SHA512 759a2ba1d14425cab202b9c050b8f4452da61776d213de4c64c4f6e0b07313756865d97c152b26fcd334d238684ffdbf60ef28131df463f37fa318b9c8cb10b0
+DIST openvpn-2.6.8.tar.gz 1896563 BLAKE2B 70373bcfa29bbec17a94c3129ea030539a165be9626201e1f2827f8f37f114835f9a42a42adffd86e675977ac35076660de36ad76724b0f3cadaaba476a929fc SHA512 deff168f6c4988091eb8ab4d1ab525b5d0e94c4b9ce5cfec00fa9a1a87da338a198067d6386ccc3a7c84761a9e4250804cb3602fb4a2b1f016ba6102db86cfe7
 EBUILD openvpn-2.5.2-r3.ebuild 5031 BLAKE2B d12f5c9f7e102d1ee492f5ca880d397efa2b2c100009b41c9971e2c4d192ac04b6ab4f85bbd81d247393779a97b7d188356b2c53c315c033c73cf961537285ef SHA512 602a370b2addc4a14e5fdd64df2ec5f362b661781ad42c9a3ba5ba42ea0f3367dc0553a19a77a5b27bd17fdc6b26aa0caaa75f0cfd01b06195c799b82e5e5315
 EBUILD openvpn-2.5.6-r1.ebuild 4974 BLAKE2B ea3dc28381ff32ddb305527ae4d496f953f1389f59081bd7b442eb21ea0b48c07d982cc8000d0ebf2d6be1cf008bc988733e9ca1318fc67306b2bc4281ff51cf SHA512 8a29c9338681a8dec60e224008974b6e6ba0fa71e21867c7956f9d6a6c0ce4e39fb69181cb72ed66a06394604b2f684dbfdf12a6f389f1da61bf93f7c70d2eaa
 EBUILD openvpn-2.5.7-r1.ebuild 4909 BLAKE2B b81362c83a2896fb4a7bdd1e7c334bdbc7d4da3048cdc5a5ea672224e8ede39673726d4b951e0931275385d1df32a3d6fb678697099756eed436dadf6f11c60b SHA512 418860f853f4b426551e63a7e24cedd5840124e3fb1c62fa54ed1a45bad4aa41b59ebc80ec205ec89f5536a27457e798299b4cf778547b39d9530f9cdcb6709e
 EBUILD openvpn-2.6.4.ebuild 4957 BLAKE2B 97e78ba9121e7974d24a7c8f06c9771c6566f2a42be4b15ae6e99eaf87a3c342d05d2894666f4c39e3bf4dac202c8d9eaa2dba373c19a40a1ed570c809df4116 SHA512 f64ffed6f1bc2816afed183e8494e176398d8a57e055090bd3ac96e7b33f2b402db32f38f27346f9d5a8be4dd9258f01416919038830c017956241301444e8dc
 EBUILD openvpn-2.6.7.ebuild 4994 BLAKE2B 998a894a0778a46c8441f6cc91b21f5b4fc97c0a7c847ecc8257264c280c39471261268f18a1154d7720d8c44a201d228f746de84b996671b30bb7d3f04f19e6 SHA512 05cfc540079d55bcac14217dba665a4b9131a18f7a4fdc9eb496a5005024a2605ed9239856f66701e7c1707143015565c2290537f2ffdde796035d2f9931c381
-EBUILD openvpn-9999.ebuild 4987 BLAKE2B a6895320678af9b6722908ca40be9dc9a5b7392fad5da5e06c27356749f0219ed4ffc4570c63dea73d3bc081beed871a4bc0fb3702d2a0a66f6d4b8da7d092f4 SHA512 ddbf0f70e4c3719e7a3d38efc1d1c58a663fa25b819ee84157077a9e9d9a581fff3cd007d2a60f7f4e47c54c73d15135e79b16dca9f73d3b04c6aa75454fb01d
+EBUILD openvpn-2.6.8.ebuild 5012 BLAKE2B 5964072b2a6cc3018dcf415c667b3eda18982c725ce53c4e97b5e59da9473e69b48cebe9c37b867d4ff250a16721f2bce5d4b755cd7a8a54ac59e31bc8473789 SHA512 7e94c9e2c09e6d6249a5213856b8dc482f908a915239aa4f20d65a5ed3f134b8ab07aefa63a2e3e4bd221480de8a460936946c5763331aaba25bc08635447a99
+EBUILD openvpn-9999.ebuild 5012 BLAKE2B 5964072b2a6cc3018dcf415c667b3eda18982c725ce53c4e97b5e59da9473e69b48cebe9c37b867d4ff250a16721f2bce5d4b755cd7a8a54ac59e31bc8473789 SHA512 7e94c9e2c09e6d6249a5213856b8dc482f908a915239aa4f20d65a5ed3f134b8ab07aefa63a2e3e4bd221480de8a460936946c5763331aaba25bc08635447a99
 MISC metadata.xml 1216 BLAKE2B c776b53a6590657d9c38f4d27da052d558b3fa706a944d07ff29de7fa6745e1e474a6110056dbe8c19fd03373644347054f8b7b4f2dd9d7171f3bc25ca21fe4f SHA512 1a62049e24f92d5519b1eaefa1649df23a515165e41b87e399170d1e2e140174fee5e8887f7e8589e68301093d1c2b6f76f6868db302ad7de2da911f0df3bb6d
diff --git a/net-vpn/openvpn/openvpn-2.6.8.ebuild b/net-vpn/openvpn/openvpn-2.6.8.ebuild
new file mode 100644
index 000000000000..ebad808e6e1f
--- /dev/null
+++ b/net-vpn/openvpn/openvpn-2.6.8.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd linux-info tmpfiles
+
+DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
+HOMEPAGE="https://openvpn.net/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/OpenVPN/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://build.openvpn.net/downloads/releases/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="dco down-root examples inotify iproute2 +lz4 +lzo mbedtls +openssl"
+IUSE+=" pam pkcs11 +plugins selinux systemd test"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	^^ ( openssl mbedtls )
+	pkcs11? ( !mbedtls )
+	!plugins? ( !pam !down-root )
+	inotify? ( plugins )
+	dco? ( !iproute2 )
+"
+
+COMMON_DEPEND="
+	kernel_linux? (
+		iproute2? ( sys-apps/iproute2[-minimal] )
+	)
+	lz4? ( app-arch/lz4 )
+	lzo? ( >=dev-libs/lzo-1.07 )
+	mbedtls? ( net-libs/mbedtls:= )
+	openssl? ( >=dev-libs/openssl-1.0.2:0= )
+	pam? ( sys-libs/pam )
+	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
+	systemd? ( sys-apps/systemd )
+	dco? ( >=net-vpn/ovpn-dco-0.2 >=dev-libs/libnl-3.2.29:= )
+	sys-libs/libcap-ng:=
+"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( dev-util/cmocka )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	acct-group/openvpn
+	acct-user/openvpn
+	selinux? ( sec-policy/selinux-openvpn )
+"
+
+if [[ ${PV} = "9999" ]]; then
+	BDEPEND+=" dev-python/docutils"
+fi
+
+pkg_setup() {
+	local CONFIG_CHECK="~TUN"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local -a myeconfargs
+
+	if ! use mbedtls; then
+		myeconfargs+=(
+			$(use_enable pkcs11)
+		)
+	fi
+
+	myeconfargs+=(
+		$(use_enable inotify async-push)
+		--with-crypto-library=$(usex mbedtls mbedtls openssl)
+		$(use_enable lz4)
+		$(use_enable lzo)
+		$(use_enable plugins)
+		$(use_enable iproute2)
+		$(use_enable pam plugin-auth-pam)
+		$(use_enable down-root plugin-down-root)
+		$(use_enable systemd)
+		$(use_enable dco)
+	)
+
+	SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \
+		TMPFILES_DIR="/usr/lib/tmpfiles.d" \
+		IPROUTE=$(usex iproute2 '/bin/ip' '') \
+		econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	local -x RUN_SUDO=false
+
+	elog "Running top-level tests"
+	emake check
+
+	pushd tests/unit_tests &>/dev/null || die
+	elog "Running unit tests"
+	emake check
+	popd &>/dev/null || die
+}
+
+src_install() {
+	default
+
+	find "${ED}/usr" -name '*.la' -delete || die
+
+	# install documentation
+	dodoc AUTHORS ChangeLog PORTS README
+
+	# Install some helper scripts
+	keepdir /etc/openvpn
+	exeinto /etc/openvpn
+	doexe "${FILESDIR}/up.sh"
+	doexe "${FILESDIR}/down.sh"
+
+	# Install the init script and config file
+	newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
+	newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
+
+	# install examples, controlled by the respective useflag
+	if use examples ; then
+		# (is the below comment relevant anymore?)
+		## dodoc does not supportly support directory traversal, #15193
+		docinto examples
+		dodoc -r sample contrib
+	fi
+
+	# https://bugs.gentoo.org/755680#c3
+	doman doc/openvpn.8
+}
+
+pkg_postinst() {
+	tmpfiles_process openvpn.conf
+
+	if use x64-macos ; then
+		elog "You might want to install tuntaposx for TAP interface support:"
+		elog "http://tuntaposx.sourceforge.net"
+	fi
+
+	if systemd_is_booted || has_version sys-apps/systemd ; then
+		elog "In order to use OpenVPN with systemd please use the correct systemd service file."
+		elog  ""
+		elog "server:"
+		elog ""
+		elog "- Place your server configuration file in /etc/openvpn/server"
+		elog "- Use the openvpn-server@.service like so"
+		elog "systemctl start openvpn-server@{Server-config}"
+		elog ""
+		elog "client:"
+		elog ""
+		elog "- Place your client configuration file in /etc/openvpn/client"
+		elog "- Use the openvpn-client@.service like so:"
+		elog "systemctl start openvpn-client@{Client-config}"
+	else
+		elog "The openvpn init script expects to find the configuration file"
+		elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
+		elog ""
+		elog "To create more VPNs, simply create a new .conf file for it and"
+		elog "then create a symlink to the openvpn init script from a link called"
+		elog "openvpn.newconfname - like so"
+		elog "	 cd /etc/openvpn"
+		elog "	 ${EDITOR##*/} foo.conf"
+		elog "	 cd /etc/init.d"
+		elog "	 ln -s openvpn openvpn.foo"
+		elog ""
+		elog "You can then treat openvpn.foo as any other service, so you can"
+		elog "stop one vpn and start another if you need to."
+	fi
+
+	if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
+		ewarn ""
+		ewarn "WARNING: If you use the remote keyword then you are deemed to be"
+		ewarn "a client by our init script and as such we force up,down scripts."
+		ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
+		ewarn "can move your scripts to."
+	fi
+
+	if use plugins ; then
+		einfo ""
+		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}/plugins"
+	fi
+}
diff --git a/net-vpn/openvpn/openvpn-9999.ebuild b/net-vpn/openvpn/openvpn-9999.ebuild
index 957b6246fb6c..ebad808e6e1f 100644
--- a/net-vpn/openvpn/openvpn-9999.ebuild
+++ b/net-vpn/openvpn/openvpn-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -31,7 +31,7 @@ REQUIRED_USE="
 	dco? ( !iproute2 )
 "
 
-CDEPEND="
+COMMON_DEPEND="
 	kernel_linux? (
 		iproute2? ( sys-apps/iproute2[-minimal] )
 	)
@@ -46,12 +46,16 @@ CDEPEND="
 	sys-libs/libcap-ng:=
 "
 
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+	virtual/pkgconfig
+"
 
-DEPEND="${CDEPEND}
+DEPEND="
+	${COMMON_DEPEND}
 	test? ( dev-util/cmocka )
 "
-RDEPEND="${CDEPEND}
+RDEPEND="
+	${COMMON_DEPEND}
 	acct-group/openvpn
 	acct-user/openvpn
 	selinux? ( sec-policy/selinux-openvpn )