gentoo resync : 13.10.2019

6 files changed, 19 insertions, 202 deletions

diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest
index bf97aa4e1856..3a337f089154 100644
--- a/net-dialup/accel-ppp/Manifest
+++ b/net-dialup/accel-ppp/Manifest
@@ -1,11 +1,9 @@
-AUX accel-ppp-1.11.1-linux-4.10.patch 2373 BLAKE2B eab95d65e4214413b4c67561c0dfef562a0e2ee62386da13d23f06cca2390adfcf2620616dcab2f77418bc23d26a3650777283948704bc9f42bd4c1c1057dd7a SHA512 5915500f67aad2c956c7a65bc9716e2f32fca6bf51010d8905f025a0386578bcf63613f3b195b47c1a06c01ce68c88a69af2bfed94b3ca76fdb324279f8acfdb
 AUX accel-ppp-1.11.1-socklen.patch 483 BLAKE2B efdcc5b2826ab2d45bcd6914efbc65a3ef0ac6987663f8888d2168d61f941de9bd047a30673ee0114955faa121de701f93c1564b2cb8e2c843cfa7ff2030b309 SHA512 6561b95c8cc0ec642c12895426c5b0b8290da9c7e3c9207beb837e50218fec70ead92a680e131f2967d3281a273cc920ccfebbd66aed4579feec61a759b36dd5
 AUX accel-ppp.confd 437 BLAKE2B 6b418f528877a46b4b8aba3728405459a567c264b5bb73da79a08649f604f99f6b9d5a665599836b902c554b9fa5c62b8e399cb60bf4e0bcf85e21a0d4959b54 SHA512 66dad6b7b4497c5768206e7990e4034f1de03d9608e1470888e061ba0ff6be934f1dd329336fd3978a43a99a8e3971a00be4da327bfc01a64dadfe91da2cea30
 AUX accel-ppp.initd 998 BLAKE2B 974407e0e974fb79b3ea17bd1526d1f6343d7284cb10a93bcb2713f955244a91a664fd7187287a7b090edee340f76181f88645b2d4bf0e5470d825407ddebe83 SHA512 ebee03f6c448f1158831bb563568ce027b2824c185852d380f079456f25dcb69e0fe5c6d6235eed33f028825786f091853c05fcba5eb3c287790353629823764
-DIST accel-ppp-1.11.1_p20170508.tar.bz2 1609904 BLAKE2B 5993e25e09e84fa62fde28e6c79b11514eb5e0c365a8cc1a36c4e3e56ac868725b14049e28184188330ac78cb6c128429f2cc89241d871c02e4154c6882a89e2 SHA512 79f928c9d07891957d12443eaf32e96e826d5bebf241dcfcb31a7777fbce2332078bf0c1dd1e1a55cf96154be1fec610f1afd088fc018f54ebd5d265c037c07a
 DIST accel-ppp-1.11.1_p20180320.tar.bz2 1634359 BLAKE2B 97ca709ef3740c2ac1d75f6fba3acbf9229c3cb48f3a55735eaa14b74c2b0af96d637cbb145bc9e98a5b245704806cdc3d8f9d8692809626e0f73d73702c4a0a SHA512 a8a2420332c02087e45bbaab25831ae5d2d370fd56b29db77c267083badc22b90ca4b0ec7335e13250ac8f150002b2a3c343cfba6c2378932778777dc936d914
-EBUILD accel-ppp-1.11.1_p20170508.ebuild 2485 BLAKE2B 1f7db5a427b4a7d0f8fb8c12f5d8d574445ae9156a78064b99d141047e6928933e35e7dd9a9ecfe77c675a51ea048a084fa69e2b145801ff6380acc0a3ed25e8 SHA512 6c067863978066abd3dfe02e2c4cb5ab3004c158e8339537a75eb79ac93d9f8ffd9c5c3af17cd55c35db1271997a6d95e90a9f268fa49b3478250921562755bd
-EBUILD accel-ppp-1.11.1_p20180320.ebuild 2439 BLAKE2B 5c9760bd87ce0f2846d3feb7b7f3f04d694a53a686eaeb823b2dcb880f5fd21ec8bb8a4a89d841793b465971c37712fb3f0a9a137bc3bdc2d7698d6ff882c78a SHA512 a701ee9c875f760ba0326eab8746038f6f59907fbd383e232215c181f647c4ff11fd633aa821fe62e8f29bf893d84cf55cd684797a9b263a17ce064c2352f589
-EBUILD accel-ppp-1.11.9999.ebuild 2373 BLAKE2B 5b809927209b7a624c0223555b8aa2b559a598e1abc98ef66da1f729527f17405606a971540b40dfded98cbdb657bde2e7703b224c0872d7299d0cf70ec7669d SHA512 d8325db8ca569ffa3b3f54ec90b544baac77bdcb3086e054ea3eaf02acf947b4a81d59080d989025767f0ac794af11f6c16abb47ad91eabd5503ccedb3a42896
-EBUILD accel-ppp-9999.ebuild 2354 BLAKE2B 314b9713caa79adb5a8e57c6f1edc673a7ed4cc8f54cc455b10094afd032b392c4a3cef3959cba8ee74963e2a7ee506880e8aaaa739048ed23eacc501124de01 SHA512 04b4ab35ed359eb028fb601bc65e90fb5b5a588b3d304e8bba5c980a5ee5ae014df1cc54d77979a3a3f5d1e9ee7d784eb3bf2798716d497ce024f7482237f0dd
+DIST accel-ppp-1.12.0.tar 6758400 BLAKE2B 776c0946decec2d88a0dfeb8e840573ae8d53d53d0fe921604667eaf4a5658e7d0cfa57f0b54eb61fcdf62b7a62a94ee405a01ad2a66ab76042d59cc3f79d42b SHA512 f1d3b31ca36395a429214b7599a43755317d89391c5631dfd02df79ed8dd51c39f75fc56ac625fbc6e7d5b0f9c85699c5da612eb4e8af9eae8ad2d9b13a187ba
+EBUILD accel-ppp-1.11.1_p20180320.ebuild 2436 BLAKE2B 0d024f60748291e5e3bad0640f472950088abecaddb9ad46dcefa100ea8fa9a70837871c577cdabc87e984c2c066a66aa8dc18441b2d403ec2cee393d423891d SHA512 cabce32b55c148a02df91e3612002d17b349a0c1da5ca6e72ba610e99d123ce3be2c42a65b6a7ba66cb34a6cbe83d7dc9f1b964494e661e02f90fcdef55d53cf
+EBUILD accel-ppp-1.12.0.ebuild 2555 BLAKE2B e897fd34c01d95efcfd786953766e7da01d1c8b3ab271377a7b2e64460376ee46035182e8dbe4a70bc1dca8be6a04fb6f78752ee86b03ef3aef24161e62ba3d7 SHA512 021b116c2b45908a165a79a2e7654489c741cc4f4616048e42d7de2359ecd38c47a597ca82b3c9e7c02a03436454693955d3bcd90905d221c8ada95d48127fa7
+EBUILD accel-ppp-9999.ebuild 2354 BLAKE2B 95c9c459f2845f5fa5c96530b9b9f47e4cd77e0e5a5fb18da6048973c8d701f8c861bbeab458c9a2226307a7492e9c857da8f6b6d4cfc95cb113f60ebb586315 SHA512 0eeafee53bac5a8e2b377e994cef95588e492a14c822603dc78a79d46a126dd577190349c0d31ff693b613d5d059d1fc923d233b82e40cc1f69c038020cd797d
 MISC metadata.xml 507 BLAKE2B 7c0a985830c791f5fe40ed8b624f366eb8e39505fe128b46153740f77ce9c5bd05bf8bf7ffb8939aa42550c9ea08de8f2498d444ef2e930121bbe7f404bf88dd SHA512 6b60c890f172501225ed3da4a229298c2b05601606d047bbe46dbea88246bcce8c15695259063daf73574c9d24048b04d2422c83e2e934015768338120e9154e
diff --git a/net-dialup/accel-ppp/accel-ppp-1.11.1_p20180320.ebuild b/net-dialup/accel-ppp/accel-ppp-1.11.1_p20180320.ebuild
index d583a303be53..0d27e032077b 100644
--- a/net-dialup/accel-ppp/accel-ppp-1.11.1_p20180320.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-1.11.1_p20180320.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild b/net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild
deleted file mode 100644
index 817a5e3058f7..000000000000
--- a/net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2019 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="git://git.code.sf.net/p/accel-ppp/code"
-EGIT_BRANCH="1.11"
-inherit cmake-utils flag-o-matic git-r3 linux-info linux-mod
-
-DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
-HOMEPAGE="https://sourceforge.net/projects/accel-ppp/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-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 )"
-
-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
-
-	# Bug #549918
-	append-ldflags -Wl,-z,lazy
-
-	cmake-utils_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)"
-		-DMEMDEBUG="$(usex debug)"
-		-DNETSNMP="$(usex snmp)"
-		-DRADIUS="$(usex radius)"
-		-DSHAPER="$(usex shaper)"
-		$(use debug && echo "-DVALGRIND=$(usex valgrind)")
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_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-utils_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
-
-	dodir /var/log/accel-ppp
-}
diff --git a/net-dialup/accel-ppp/accel-ppp-1.11.1_p20170508.ebuild b/net-dialup/accel-ppp/accel-ppp-1.12.0.ebuild
index 07366eb315c8..f2e7d2b54cce 100644
--- a/net-dialup/accel-ppp/accel-ppp-1.11.1_p20170508.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-1.12.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils 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"
+SRC_URI="https://download.sourceforge.net/accel-ppp/${P}.tar.bz2 -> ${P}.tar"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,7 +18,7 @@ RDEPEND="lua? ( dev-lang/lua:0 )
 	postgres? ( dev-db/postgresql:* )
 	snmp? ( net-analyzer/net-snmp )
 	dev-libs/libpcre
-	dev-libs/openssl:0"
+	dev-libs/openssl:0="
 DEPEND="${RDEPEND}
 	valgrind? ( dev-util/valgrind )"
 PDEPEND="net-dialup/ppp-scripts"
@@ -30,12 +30,9 @@ CONFIG_CHECK="~L2TP ~PPPOE ~PPTP"
 REQUIRED_USE="valgrind? ( debug )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.11.1-linux-4.10.patch"
 	"${FILESDIR}/${PN}-1.11.1-socklen.patch"
 )
 
-S="${WORKDIR}"
-
 pkg_setup() {
 	if use ipoe; then
 		linux-mod_pkg_setup
@@ -47,7 +44,6 @@ pkg_setup() {
 
 src_prepare() {
 	sed -i  -e "/mkdir/d" \
-		-e "/echo/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!
@@ -55,6 +51,10 @@ src_prepare() {
 		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
 
@@ -65,7 +65,7 @@ src_configure() {
 	local libdir="$(get_libdir)"
 	# There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative to OpenSSL
 	local mycmakeargs=(
-		-DLIB_PATH_SUFFIX="${libdir#lib}"
+		-DLIB_SUFFIX="${libdir#lib}"
 		-DBUILD_IPOE_DRIVER="$(usex ipoe)"
 		-DBUILD_PPTP_DRIVER=no
 		-DBUILD_VLAN_MON_DRIVER="$(usex ipoe)"
@@ -76,7 +76,7 @@ src_configure() {
 		-DNETSNMP="$(usex snmp)"
 		-DRADIUS="$(usex radius)"
 		-DSHAPER="$(usex shaper)"
-		-DVALGRIND="$(usex valgrind)"
+		$(use debug && echo "-DVALGRIND=$(usex valgrind)")
 	)
 	cmake-utils_src_configure
 }
diff --git a/net-dialup/accel-ppp/accel-ppp-9999.ebuild b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
index ff874dac8811..a05fd2d9a09d 100644
--- a/net-dialup/accel-ppp/accel-ppp-9999.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-EGIT_REPO_URI="git://git.code.sf.net/p/accel-ppp/code"
+EGIT_REPO_URI="https://git.code.sf.net/p/accel-ppp/code"
 inherit cmake-utils flag-o-matic git-r3 linux-info linux-mod
 
 DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
@@ -19,7 +19,7 @@ RDEPEND="lua? ( dev-lang/lua:0 )
 	postgres? ( dev-db/postgresql:* )
 	snmp? ( net-analyzer/net-snmp )
 	dev-libs/libpcre
-	dev-libs/openssl:0"
+	dev-libs/openssl:0="
 DEPEND="${RDEPEND}
 	valgrind? ( dev-util/valgrind )"
 PDEPEND="net-dialup/ppp-scripts"
diff --git a/net-dialup/accel-ppp/files/accel-ppp-1.11.1-linux-4.10.patch b/net-dialup/accel-ppp/files/accel-ppp-1.11.1-linux-4.10.patch
deleted file mode 100644
index 568a405fd69c..000000000000
--- a/net-dialup/accel-ppp/files/accel-ppp-1.11.1-linux-4.10.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- ./drivers/ipoe/ipoe.c.orig	2016-11-28 14:28:33.000000000 +0300
-+++ ./drivers/ipoe/ipoe.c	2017-05-17 11:27:42.030000000 +0300
-@@ -52,6 +52,27 @@
- #define DEFINE_SEMAPHORE(name) struct semaphore name = __SEMAPHORE_INITIALIZER(name, 1)
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)
-+static inline int
-+_genl_register_family_with_ops_grps(struct genl_family *family,
-+				    const struct genl_ops *ops, size_t n_ops,
-+				    const struct genl_multicast_group *mcgrps,
-+				    size_t n_mcgrps)
-+{
-+	family->module = THIS_MODULE;
-+	family->ops = ops;
-+	family->n_ops = n_ops;
-+	family->mcgrps = mcgrps;
-+	family->n_mcgrps = n_mcgrps;
-+	return genl_register_family(family);
-+}
-+
-+#define genl_register_family_with_ops_groups(family, ops, grps)	\
-+	_genl_register_family_with_ops_grps((family),			\
-+					    (ops), ARRAY_SIZE(ops),	\
-+					    (grps), ARRAY_SIZE(grps))
-+#endif
-+
- struct ipoe_stats {
- 	struct u64_stats_sync sync;
- 	u64 packets;
-@@ -1668,7 +1689,9 @@
- };
- 
- static struct genl_family ipoe_nl_family = {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,10,0)
- 	.id		= GENL_ID_GENERATE,
-+#endif
- 	.name		= IPOE_GENL_NAME,
- 	.version	= IPOE_GENL_VERSION,
- 	.hdrsize	= 0,
---- ./drivers/vlan_mon/vlan_mon.c.orig	2017-05-17 11:28:23.320000000 +0300
-+++ ./drivers/vlan_mon/vlan_mon.c	2017-05-17 11:29:41.660000000 +0300
-@@ -39,6 +39,27 @@
- #define vlan_tx_tag_present(skb) skb_vlan_tag_present(skb)
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)
-+static inline int
-+_genl_register_family_with_ops_grps(struct genl_family *family,
-+				    const struct genl_ops *ops, size_t n_ops,
-+				    const struct genl_multicast_group *mcgrps,
-+				    size_t n_mcgrps)
-+{
-+	family->module = THIS_MODULE;
-+	family->ops = ops;
-+	family->n_ops = n_ops;
-+	family->mcgrps = mcgrps;
-+	family->n_mcgrps = n_mcgrps;
-+	return genl_register_family(family);
-+}
-+
-+#define genl_register_family_with_ops_groups(family, ops, grps)	\
-+	_genl_register_family_with_ops_grps((family),			\
-+					    (ops), ARRAY_SIZE(ops),	\
-+					    (grps), ARRAY_SIZE(grps))
-+#endif
-+
- struct vlan_dev {
- 	unsigned int magic;
- 	int ifindex;
-@@ -660,7 +681,9 @@
- };
- 
- static struct genl_family vlan_mon_nl_family = {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,10,0)
- 	.id		= GENL_ID_GENERATE,
-+#endif
- 	.name		= VLAN_MON_GENL_NAME,
- 	.version	= VLAN_MON_GENL_VERSION,
- 	.hdrsize	= 0,