[gentoo-commits] repo/gentoo:master commit in: net-vpn/openvpn/

["Sam James" <sam@gentoo.org>]

commit:     fa82e5ca6c5ccdee72b6c8373491b447f5a86807
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  5 07:36:29 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan  5 07:36:29 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa82e5ca

net-vpn/openvpn: add 2.6.8

Fixes a critical crash in 2.6.7.

Bug: https://bugs.gentoo.org/917272
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-vpn/openvpn/Manifest                                   |  1 +
 .../openvpn/{openvpn-9999.ebuild => openvpn-2.6.8.ebuild}  | 14 +++++++++-----
 net-vpn/openvpn/openvpn-9999.ebuild                        | 14 +++++++++-----
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/net-vpn/openvpn/Manifest b/net-vpn/openvpn/Manifest
index 0a76261da2d4..97687540f401 100644
--- a/net-vpn/openvpn/Manifest
+++ b/net-vpn/openvpn/Manifest
@@ -3,3 +3,4 @@ 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

diff --git a/net-vpn/openvpn/openvpn-9999.ebuild b/net-vpn/openvpn/openvpn-2.6.8.ebuild
similarity index 97%
copy from net-vpn/openvpn/openvpn-9999.ebuild
copy to net-vpn/openvpn/openvpn-2.6.8.ebuild
index 957b6246fb6c..ebad808e6e1f 100644
--- a/net-vpn/openvpn/openvpn-9999.ebuild
+++ b/net-vpn/openvpn/openvpn-2.6.8.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 )

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 )