gentoo resync : 16.09.2020

4 files changed, 121 insertions, 10 deletions

diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest
index 0d7aced6333f..1dbeddc5cebf 100644
--- a/net-dialup/accel-ppp/Manifest
+++ b/net-dialup/accel-ppp/Manifest
@@ -3,6 +3,8 @@ AUX accel-ppp-1.12.0-kernel-5.2.patch 8304 BLAKE2B f28a0720dd9d99948cd4552986fdd
 AUX accel-ppp.confd 437 BLAKE2B 6b418f528877a46b4b8aba3728405459a567c264b5bb73da79a08649f604f99f6b9d5a665599836b902c554b9fa5c62b8e399cb60bf4e0bcf85e21a0d4959b54 SHA512 66dad6b7b4497c5768206e7990e4034f1de03d9608e1470888e061ba0ff6be934f1dd329336fd3978a43a99a8e3971a00be4da327bfc01a64dadfe91da2cea30
 AUX accel-ppp.initd 998 BLAKE2B 974407e0e974fb79b3ea17bd1526d1f6343d7284cb10a93bcb2713f955244a91a664fd7187287a7b090edee340f76181f88645b2d4bf0e5470d825407ddebe83 SHA512 ebee03f6c448f1158831bb563568ce027b2824c185852d380f079456f25dcb69e0fe5c6d6235eed33f028825786f091853c05fcba5eb3c287790353629823764
 DIST accel-ppp-1.12.0.tar 6758400 BLAKE2B 776c0946decec2d88a0dfeb8e840573ae8d53d53d0fe921604667eaf4a5658e7d0cfa57f0b54eb61fcdf62b7a62a94ee405a01ad2a66ab76042d59cc3f79d42b SHA512 f1d3b31ca36395a429214b7599a43755317d89391c5631dfd02df79ed8dd51c39f75fc56ac625fbc6e7d5b0f9c85699c5da612eb4e8af9eae8ad2d9b13a187ba
-EBUILD accel-ppp-1.12.0-r1.ebuild 2603 BLAKE2B 2c1ff7d6cc55db2f3aceba681d068f9d6751a4d0a99d31661f969724e9bf7b8c043a26b773652f93ce10e45c1512942468c26440f39e703d14a2a133c75ccaa7 SHA512 e6611236f6281cb866f8c6b2747b0bff74e67e7bd578862ff88d6df11e7542682a3736cf9cd18bbca080ec1ea095751abfe390d3d88f204f96f4c7e0beae3ed9
-EBUILD accel-ppp-9999.ebuild 2365 BLAKE2B be66ab5ddf4691777a23fdf370f998b4c5c525b50ea266ba9ea1f0cafc90a78917fa2917599dcfca138514e23eca1fd17484addfa8a3cac036c61f12a23a6022 SHA512 470f9fbfee509aa7e425400a76eed23830a208d4d2b05b79acec54160b1796551d1214bce3e61d6dbbee7f2048b23b3ce936cb0578262c747d465c47a70e589e
+DIST accel-ppp-1.12.0_p20200913.tar.bz2 1661195 BLAKE2B 6ffdb140486e98c19c981999873f94e767682bec1a2bea1f2feb7bed6ce9d8b15a824605da0b60897501773f4ece9d71612385dd1eff61483fff5daadad9713d SHA512 ecf325774507a8ddb1c6fe3c90aa2e25c72d006e9d96eabf66c7f1b67cfa70fc1073cf120c195d0823ad2532fa3504f6ab482d1842eb8b3e3dbafdb8b16a2ac6
+EBUILD accel-ppp-1.12.0-r1.ebuild 2605 BLAKE2B d0b0d44969d655546aadf0d5ce567055dfb427ed2a0822ee8b8c0c5af6241ff03f36a7cc235789b8fe474d3d981609978c98c1c20b524b1466fdd2d2d4baf2c4 SHA512 6a26a93f5ff1e12fb4a6d93ec06be22544e7bcef3bfaa36081b169fdf4d9fe77e92389610379a99abe14bd5f031330fb46f79ac793b96a07f667ecbc8b3329c5
+EBUILD accel-ppp-1.12.0_p20200913.ebuild 2552 BLAKE2B 65b6d290ba6cf136b0fc6e4c3c99737c951303054b882bd00cbcade908ceaa0a5b9e1135ebbd326e8517ae6333c63353b63fb504a36c3d52b8b20ee630fc7187 SHA512 383e8599243b59125fe1a0063511244235130e91dbb207a9ccaab80fb3b54fde7ca9bd94f9549bdd1d54bc424c599b180e9b7fc0791a5e86520b6f0a71712e37
+EBUILD accel-ppp-9999.ebuild 2339 BLAKE2B 50c5f3d4a5daf59e5af62580c4ccd6ebc24d7754d69b1c58096c02b46204519706de7bba1bf0e6214b968f0ca37220e25c54e03417ba37d5eca95eca76c4c2d9 SHA512 998b01a8b96f2371a0dfe669830b994030dd2bd3fb2cad787ada047b32c87f689548a9a972d834c7b266454ed728a0408872d03e191f3e11b5dba14d179344f5
 MISC metadata.xml 507 BLAKE2B 7c0a985830c791f5fe40ed8b624f366eb8e39505fe128b46153740f77ce9c5bd05bf8bf7ffb8939aa42550c9ea08de8f2498d444ef2e930121bbe7f404bf88dd SHA512 6b60c890f172501225ed3da4a229298c2b05601606d047bbe46dbea88246bcce8c15695259063daf73574c9d24048b04d2422c83e2e934015768338120e9154e
diff --git a/net-dialup/accel-ppp/accel-ppp-1.12.0-r1.ebuild b/net-dialup/accel-ppp/accel-ppp-1.12.0-r1.ebuild
index 61e4c0092c83..7c3f0f8b2be4 100644
--- a/net-dialup/accel-ppp/accel-ppp-1.12.0-r1.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-1.12.0-r1.ebuild
@@ -104,5 +104,5 @@ src_install() {
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}d
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}d
 
-	dodir /var/log/accel-ppp
+	keepdir /var/log/accel-ppp
 }
diff --git a/net-dialup/accel-ppp/accel-ppp-1.12.0_p20200913.ebuild b/net-dialup/accel-ppp/accel-ppp-1.12.0_p20200913.ebuild
new file mode 100644
index 000000000000..43549ba9cb33
--- /dev/null
+++ b/net-dialup/accel-ppp/accel-ppp-1.12.0_p20200913.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic linux-info linux-mod
+
+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 ipoe lua postgres radius shaper snmp valgrind"
+
+RDEPEND="lua? ( dev-lang/lua:0 )
+	postgres? ( dev-db/postgresql:* )
+	snmp? ( net-analyzer/net-snmp )
+	dev-libs/libpcre
+	dev-libs/openssl:0="
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )"
+PDEPEND="net-dialup/ppp-scripts"
+
+DOCS=( README )
+
+CONFIG_CHECK="~L2TP ~PPPOE ~PPTP"
+
+REQUIRED_USE="valgrind? ( debug )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.11.1-socklen.patch"
+)
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	if use ipoe; then
+		linux-mod_pkg_setup
+		set_arch_to_kernel
+	else
+		linux-info_pkg_setup
+	fi
+}
+
+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)"
+	# There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative to OpenSSL
+	local mycmakeargs=(
+		-DLIB_SUFFIX="${libdir#lib}"
+		-DBUILD_IPOE_DRIVER="$(usex ipoe)"
+		-DBUILD_PPTP_DRIVER=no
+		-DBUILD_VLAN_MON_DRIVER="$(usex ipoe)"
+		-DCRYPTO=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() {
+	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
+
+	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/log/accel-ppp
+}
diff --git a/net-dialup/accel-ppp/accel-ppp-9999.ebuild b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
index 68e1f642d6f6..3f8aec7348a9 100644
--- a/net-dialup/accel-ppp/accel-ppp-9999.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-EGIT_REPO_URI="https://git.code.sf.net/p/accel-ppp/code"
-inherit cmake-utils flag-o-matic git-r3 linux-info linux-mod
+EGIT_REPO_URI="https://github.com/accel-ppp/accel-ppp.git"
+inherit cmake flag-o-matic git-r3 linux-info linux-mod
 
 DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
 HOMEPAGE="https://sourceforge.net/projects/accel-ppp/"
@@ -51,7 +51,7 @@ src_prepare() {
 	# Bug #549918
 	append-ldflags -Wl,-z,lazy
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -71,11 +71,11 @@ src_configure() {
 		-DSHAPER="$(usex shaper)"
 		$(use debug && echo "-DVALGRIND=$(usex valgrind)")
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 }
 
 src_install() {
@@ -84,7 +84,7 @@ src_install() {
 		linux-mod_src_install
 	fi
 
-	cmake-utils_src_install
+	cmake_src_install
 
 	use doc && dodoc -r rfc
 
@@ -96,5 +96,5 @@ src_install() {
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}d
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}d
 
-	dodir /var/log/accel-ppp
+	keepdir /var/log/accel-ppp
 }