gentoo auto-resync : 27:06:2023 - 13:35:02

4 files changed, 128 insertions, 16 deletions

diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 56e9fff97e29..4a4cc0780219 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest
index b31af470355a..2c155c9f70a9 100644
--- a/net-dialup/accel-ppp/Manifest
+++ b/net-dialup/accel-ppp/Manifest
@@ -2,6 +2,8 @@ AUX accel-ppp-1.11.1-socklen.patch 483 BLAKE2B efdcc5b2826ab2d45bcd6914efbc65a3e
 AUX accel-ppp.confd 437 BLAKE2B 6b418f528877a46b4b8aba3728405459a567c264b5bb73da79a08649f604f99f6b9d5a665599836b902c554b9fa5c62b8e399cb60bf4e0bcf85e21a0d4959b54 SHA512 66dad6b7b4497c5768206e7990e4034f1de03d9608e1470888e061ba0ff6be934f1dd329336fd3978a43a99a8e3971a00be4da327bfc01a64dadfe91da2cea30
 AUX accel-ppp.initd 998 BLAKE2B 974407e0e974fb79b3ea17bd1526d1f6343d7284cb10a93bcb2713f955244a91a664fd7187287a7b090edee340f76181f88645b2d4bf0e5470d825407ddebe83 SHA512 ebee03f6c448f1158831bb563568ce027b2824c185852d380f079456f25dcb69e0fe5c6d6235eed33f028825786f091853c05fcba5eb3c287790353629823764
 DIST accel-ppp-1.12.0_p20220830.tar.bz2 1667889 BLAKE2B a6432e29953214202dc67822f358c12ade36eda3e1aaa24e8a2f427ac00ae8192216c76620f3c2946bcf88c95f6167ae9c27ce4a1895c36232110cd73c575a36 SHA512 f6e0baf7dcbf66d3d9eadffeb33216d73d6aa9eef461487d51a3811f042229b38bfec5f192742eb51cc7cfedd0a64ad02a3431bfac91ae37a9aab8c910fdcfa4
+DIST accel-ppp-1.12.0_p20230609.tar.bz2 1679570 BLAKE2B 3af713135f755215dc6cd4484ca02f182a17c5240b0b6edf2627412391396ccc1de41dc0098b10e2359ea6d9737c6ff177dc753209a50bdc6989103332453d93 SHA512 c78b8accf74e0f047a9c07b1259f18c7cba3a4e5ecdc594bb4fde4bbbc7b33eeac28265da879bdb17f935628f58f0828eebac0e08ec8ca079ac95911e3851ac2
 EBUILD accel-ppp-1.12.0_p20220830-r1.ebuild 2788 BLAKE2B c21a48d9d6c9c7ffe15d228257d5bc118e5cd84274806a8e5577cbca240de43f5d346a2e4c65852a25c08239d8778c222fc628fc9e2b2cc8ce0d6c8a30143c92 SHA512 588733b06d5909f691e55e7e5fd82838f2a256060488b6448854396b39494455a451fb6ba4fd4cb53651b6538cd99646d8e7ec5894fa4ea14dd9f76f6db3cfb5
-EBUILD accel-ppp-9999.ebuild 2575 BLAKE2B 2ab0487c0be89f9df19e09a8f5d097f77fcc7e8e0c3a537885e823beb47499be7bbbfcee329062236a90de70bdb1a886bb5fb9eb1697cbc59498b6c2ab42ee08 SHA512 f31e5a48dba48944fa0d89b7713a07be27f8a5ebd52757deca7d0500cd5930668630273f6b8a0ef9f9c3c0c7ee50d511713f5a6f2ad75ec085a8511d7bf1f07a
+EBUILD accel-ppp-1.12.0_p20230609.ebuild 2797 BLAKE2B ad39e6cc836038514f1a93fa76604227596af894199b349a1624fa2ef3716d86723212e5d48e0a7431e80f0ae87b7210c2bfa0cac57d18e7728cff701fa160ac SHA512 75be66bc28933c0ff51e0083978a0a496ca926320f731fb2fd3957a840d80c1c5a0c91c93ef05696b02ae3fba98cec35928eebedbe7124f1b91de2feb371ee91
+EBUILD accel-ppp-9999.ebuild 2588 BLAKE2B 068f48a7b86aac192778d2c7383897d91432696216b60140822a3cf90edc24cc8eac651fe844a181a4cdbb035016bfcb50cf45cabe270e27cef42affd9257137 SHA512 791364815d15fc78d9809fe4c050affb5dd87026989c3eb7ea08295221066ca678689959461c59255816e1816a9bab8d5600db549f3039eac9e1bd157d9f846a
 MISC metadata.xml 644 BLAKE2B db340b3f5850e550544683548a2e863b96176ca5e0b9984fcfb67979f88ae5ce79b403fe56328e986e752e67e6ed9fa08e71ead24c9d645c0f7ab0ea9796cd4e SHA512 2a81f8ceee0cd6c1dcc2396386b2e98b72736f7485c0426c8a893eb4e4a8f32978938df8727aa2719d339b81c54a5a34fea3e8429052fa9808da87c25e1647b7
diff --git a/net-dialup/accel-ppp/accel-ppp-1.12.0_p20230609.ebuild b/net-dialup/accel-ppp/accel-ppp-1.12.0_p20230609.ebuild
new file mode 100644
index 000000000000..a1ae8dea417b
--- /dev/null
+++ b/net-dialup/accel-ppp/accel-ppp-1.12.0_p20230609.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 )
+MODULES_OPTIONAL_IUSE="ipoe"
+inherit cmake flag-o-matic linux-mod-r1 lua-single
+
+DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
+HOMEPAGE="https://sourceforge.net/projects/accel-ppp/"
+SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc libtomcrypt lua postgres radius shaper snmp valgrind"
+
+RDEPEND="!libtomcrypt? ( dev-libs/openssl:0= )
+	libtomcrypt? ( dev-libs/libtomcrypt:0= )
+	lua? ( ${LUA_DEPS} )
+	postgres? ( dev-db/postgresql:* )
+	snmp? ( net-analyzer/net-snmp )
+	dev-libs/libpcre"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )"
+PDEPEND="net-dialup/ppp-scripts"
+
+DOCS=( README )
+
+CONFIG_CHECK="~L2TP ~PPPOE ~PPTP"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	valgrind? ( debug )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.11.1-socklen.patch"
+)
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	linux-mod-r1_pkg_setup
+	set_arch_to_kernel
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	sed -i  -e "/mkdir/d" \
+		-e "s: RENAME accel-ppp.conf.dist::" accel-pppd/CMakeLists.txt || die 'sed on accel-pppd/CMakeLists.txt failed'
+
+	# Do not install kernel modules like that - breaks sandbox!
+	sed -i -e '/modules_install/d' \
+		drivers/ipoe/CMakeLists.txt \
+		drivers/vlan_mon/CMakeLists.txt || die
+
+	# Fix version
+	sed -i -e "s/1.11/${PV}/" drivers/ipoe/ipoe.c || die
+	sed -i -e "s/1.11/${PV}/" drivers/vlan_mon/vlan_mon.c || die
+
+	# Bug #549918
+	append-ldflags -Wl,-z,lazy
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local libdir="$(get_libdir)"
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var"
+		-DLIB_SUFFIX="${libdir#lib}"
+		-DBUILD_IPOE_DRIVER="$(usex ipoe)"
+		-DBUILD_PPTP_DRIVER=no
+		-DBUILD_VLAN_MON_DRIVER="$(usex ipoe)"
+		-DCRYPTO="$(usex libtomcrypt TOMCRYPT OPENSSL)"
+		-DLOG_PGSQL="$(usex postgres)"
+		-DLUA="$(usex lua TRUE FALSE)"
+		-DMEMDEBUG="$(usex debug)"
+		-DNETSNMP="$(usex snmp)"
+		-DRADIUS="$(usex radius)"
+		-DSHAPER="$(usex shaper)"
+		$(use debug && echo "-DVALGRIND=$(usex valgrind)")
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	local modlist=( ipoe=accel-ppp:${BUILD_DIR}/drivers/ipoe/driver vlan_mon=accel-ppp:${BUILD_DIR}/drivers/vlan_mon/driver )
+	MODULES_MAKEARGS+=(
+		KDIR="${KV_OUT_DIR}"
+	)
+	linux-mod-r1_src_compile
+	cmake_src_compile
+}
+
+src_install() {
+	linux-mod-r1_src_install
+	cmake_src_install
+
+	use doc && dodoc -r rfc
+
+	if use snmp; then
+		insinto /usr/share/snmp/mibs
+		doins accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt
+	fi
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}d
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}d
+
+	keepdir /var/lib/accel-ppp
+	keepdir /var/log/accel-ppp
+}
diff --git a/net-dialup/accel-ppp/accel-ppp-9999.ebuild b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
index 587d14401f18..82f2ef6bca74 100644
--- a/net-dialup/accel-ppp/accel-ppp-9999.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 LUA_COMPAT=( lua5-1 )
-
 EGIT_REPO_URI="https://github.com/accel-ppp/accel-ppp.git"
-inherit cmake flag-o-matic git-r3 linux-info linux-mod lua-single
+MODULES_OPTIONAL_IUSE="ipoe"
+inherit cmake flag-o-matic git-r3 linux-mod-r1 lua-single
 
 DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
 HOMEPAGE="https://sourceforge.net/projects/accel-ppp/"
@@ -15,7 +15,7 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug doc ipoe libtomcrypt lua postgres radius shaper snmp valgrind"
+IUSE="debug doc libtomcrypt lua postgres radius shaper snmp valgrind"
 
 RDEPEND="!libtomcrypt? ( dev-libs/openssl:0= )
 	libtomcrypt? ( dev-libs/libtomcrypt:0= )
@@ -35,12 +35,8 @@ REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
 	valgrind? ( debug )"
 
 pkg_setup() {
-	if use ipoe; then
-		linux-mod_pkg_setup
-		set_arch_to_kernel
-	else
-		linux-info_pkg_setup
-	fi
+	linux-mod-r1_pkg_setup
+	set_arch_to_kernel
 	use lua && lua-single_pkg_setup
 }
 
@@ -81,15 +77,16 @@ src_configure() {
 }
 
 src_compile() {
+	local modlist=( ipoe=accel-ppp:"${BUILD_DIR}/drivers/ipoe/driver" vlan_mon=accel-ppp:"${BUILD_DIR}/drivers/vlan_mon/driver" )
+	MODULES_MAKEARGS+=(
+		KDIR="${KV_OUT_DIR}"
+	)
+	linux-mod-r1_src_compile
 	cmake_src_compile
 }
 
 src_install() {
-	if use ipoe; then
-		local MODULE_NAMES="ipoe(accel-ppp:${BUILD_DIR}/drivers/ipoe/driver) vlan_mon(accel-ppp:${BUILD_DIR}/drivers/vlan_mon/driver)"
-		linux-mod_src_install
-	fi
-
+	linux-mod-r1_src_install
 	cmake_src_install
 
 	use doc && dodoc -r rfc