gentoo resync : 23.03.2018

6 files changed, 37 insertions, 23 deletions

diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest
index d708b1c71096..0794cd8bd0d0 100644
--- a/net-dialup/accel-ppp/Manifest
+++ b/net-dialup/accel-ppp/Manifest
@@ -1,11 +1,11 @@
 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 212 BLAKE2B 4c1b6b67bc8169676df03c8d3738899edf32392a370c320095604d344f176b3592eb5f6f2a0305d6ac386032f615e98f8cc006ed445e71a478dd07e63377ac68 SHA512 39b3fa3e9dbbdfa2e4ea43cdff704924b5da7eef5881488df039b973e828dd08ca9329c4f81343db62f0bf6730ea902708398273dc73d23586bad50e5c0ae441
-AUX accel-ppp.initd 975 BLAKE2B f7b2abe225f9c2f03a9c4b5ad33d150ccfe59c994f404ca3fc0ccc29399de26decc680292880c100ec8c593b17abaca8c2a596d818c0709ffc090c9995dbe380 SHA512 bb4a59f14bf254620925adef1822c8311bdb890f5f8ad296e4b8ee46a7bc6f49536da9e970f2171fe9f24a9b0d50801bc07b5912b44a14b00c4479eda6699c45
-DIST accel-ppp-1.11.0.tar.bz2 1594327 BLAKE2B f23d8e4f68837e6394136013ce3e65705990f7cf15822a2939c36d00eae49d33c8b88db56629d78a5092b994256fee9859dbb3547484b8800f7fad8d0866e45f SHA512 907b484e73a4d70757a3991e6f33873aad5f10f6d5180307ee2f3eb0caacc576795d0e9c7666172a00842e6d31563503250f0e8165f6adb2bc88a1270814ea3c
+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
-EBUILD accel-ppp-1.11.0.ebuild 2282 BLAKE2B ce55282dd8fde9308d586a3fa53a855eacdffb52a06af183015ece347295e02b6ad7ba130205a79d68323bf4c2dec4ec7afb1798b48840e5cf1da7244b378812 SHA512 200ab0e64d650ee47726dfbc0033a860316fbe7828defb5d725e23d0586a9016bc19f3929fe4d6a46e16a6dec60f79f47062a8fb9baa99e97114968bdaabfe94
+DIST accel-ppp-1.11.1_p20180320.tar.bz2 1634359 BLAKE2B 97ca709ef3740c2ac1d75f6fba3acbf9229c3cb48f3a55735eaa14b74c2b0af96d637cbb145bc9e98a5b245704806cdc3d8f9d8692809626e0f73d73702c4a0a SHA512 a8a2420332c02087e45bbaab25831ae5d2d370fd56b29db77c267083badc22b90ca4b0ec7335e13250ac8f150002b2a3c343cfba6c2378932778777dc936d914
 EBUILD accel-ppp-1.11.1_p20170508.ebuild 2475 BLAKE2B e42cec14e1510b2aea990ddb6b6887349cb844fd83ab448d51f158808a430116504f74d4526d6b9496d97304441a098d1bfed32eb6764f845da87fbf204dba65 SHA512 b624a2a986d5f08a8a7b1b1e0a215f1ea112979281ebe28e83690ffc3b9ec7c167b7763259eed3e2cd61949cbdd5e0c34e59ceee850c907fd21111993e7e55e4
-EBUILD accel-ppp-1.11.9999.ebuild 2342 BLAKE2B 0838e254551ec725e8854592784604241d15ede41aa5327f549780844c286e1b5d806df4da7ebd6aafe32107aa319b410b397622fdafe41f3495e6cea7a43093 SHA512 b8c749745acc321ee77b2b87eea1af70de2c60fc17288fed9998db7d55d773e0926dd24dce166371875a81f92e09251bdd4c9831ae01103eda1e9aadfe85452b
-EBUILD accel-ppp-9999.ebuild 2323 BLAKE2B d9fec27e6025884728029a533ae39ae943108f4e40757c1b1f84c3a6dd247e1bd92d68554581375d0ed26fd3a3b60ac90556b4b4ee9d51ffd3496fb35f481456 SHA512 0978564d9ec8cd4870db60f2c269e291d62074eb755a2765ab43a9b7d2523bcf9606ff8b79cba74fdaccc2d5d00758ddec65bb40d30da56079d002a9391124fe
+EBUILD accel-ppp-1.11.1_p20180320.ebuild 2429 BLAKE2B bbd3a4cbd446125ef99e34ee23578210e724820cae98b4272a33eb14b5d51cbe8054936a129bc60258214502df2f761b98e2d22d348ef52d8e75bf1315571217 SHA512 ba3b37861b8d3414476341af7ea20a45012bf3ff0f84f434edacb518d610dccc9bbee370c86b9d4075495dec4240937e50776fdbde6bbcc681d6a85e3328cc63
+EBUILD accel-ppp-1.11.9999.ebuild 2363 BLAKE2B 3089a984135304959cefd2acf40d73499c1b782056cd213dfeb358c1f9d3d34bc5645b18bbcd5974b86e7cb828d56cbf907e23948bbed239905dcc362c340394 SHA512 07b45ecebc0971e42b4e2aad256e11ff7df6c77e357650dd0a95b744c456d8608fcc16fb9661d9f7a7eb615d54f78940877221dffde02d8e893fc29ca15acc5f
+EBUILD accel-ppp-9999.ebuild 2344 BLAKE2B 4348a803df66dad92d16aa4b0a6e08f65d71009541aec08ddb61a693d145ff8893c7243e20b6bdda6ef2c0779cd108be658a237e8309448302e021efc63b1aec SHA512 a738aa5069291b7f82c187a51054fb8d11100d33b96f185a230cc772b0072c4eda50fa272a304c9fca221cd6f99c8ca50bda998eef692eca2e4c99466d33e1dd
 MISC metadata.xml 507 BLAKE2B 7c0a985830c791f5fe40ed8b624f366eb8e39505fe128b46153740f77ce9c5bd05bf8bf7ffb8939aa42550c9ea08de8f2498d444ef2e930121bbe7f404bf88dd SHA512 6b60c890f172501225ed3da4a229298c2b05601606d047bbe46dbea88246bcce8c15695259063daf73574c9d24048b04d2422c83e2e934015768338120e9154e
diff --git a/net-dialup/accel-ppp/accel-ppp-1.11.0.ebuild b/net-dialup/accel-ppp/accel-ppp-1.11.1_p20180320.ebuild
index 03107ba307d5..c8c6d3cd86f8 100644
--- a/net-dialup/accel-ppp/accel-ppp-1.11.0.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-1.11.1_p20180320.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,14 +7,15 @@ inherit cmake-utils flag-o-matic linux-info linux-mod
 
 DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
 HOMEPAGE="http://accel-ppp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug doc ipoe postgres radius shaper snmp valgrind"
+IUSE="debug doc ipoe lua postgres radius shaper snmp valgrind"
 
-RDEPEND="postgres? ( dev-db/postgresql:* )
+RDEPEND="lua? ( dev-lang/lua:0 )
+	postgres? ( dev-db/postgresql:* )
 	snmp? ( net-analyzer/net-snmp )
 	dev-libs/libpcre
 	dev-libs/openssl:0"
@@ -28,6 +29,12 @@ 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
@@ -39,7 +46,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!
@@ -57,17 +63,18 @@ 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)"
 		-DCRYPTO=OPENSSL
 		-DLOG_PGSQL="$(usex postgres)"
+		-DLUA="$(usex lua)"
 		-DMEMDEBUG="$(usex debug)"
 		-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-1.11.9999.ebuild b/net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild
index f4c53dbb43ea..fa1729fe0897 100644
--- a/net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -42,7 +42,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!
@@ -60,17 +59,18 @@ 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)"
 		-DCRYPTO=OPENSSL
 		-DLOG_PGSQL="$(usex postgres)"
+		-DLUA="$(usex lua)"
 		-DMEMDEBUG="$(usex debug)"
 		-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 0630264eef34..cbb628950c23 100644
--- a/net-dialup/accel-ppp/accel-ppp-9999.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -41,7 +41,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!
@@ -59,17 +58,18 @@ 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)"
 		-DCRYPTO=OPENSSL
 		-DLOG_PGSQL="$(usex postgres)"
+		-DLUA="$(usex lua)"
 		-DMEMDEBUG="$(usex debug)"
 		-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/files/accel-ppp.confd b/net-dialup/accel-ppp/files/accel-ppp.confd
index 41073c6529c6..7a4d2d3712bd 100644
--- a/net-dialup/accel-ppp/files/accel-ppp.confd
+++ b/net-dialup/accel-ppp/files/accel-ppp.confd
@@ -8,3 +8,10 @@ RADATTR_DIR="/run/radattr"
 
 # Daemon options
 ACCEL_PPPD_OPTS="-d -c /etc/accel-ppp.conf"
+
+# Set type of shutdown for accel-ppp daemon
+# Default is 'hard' shutdown due to freezes
+# when using upstream default('soft') with
+# hundreds of sessions.
+# Uncomment and set different mode if you wish
+#SHUTDOWN_MODE="hard"
diff --git a/net-dialup/accel-ppp/files/accel-ppp.initd b/net-dialup/accel-ppp/files/accel-ppp.initd
index abbc4286228a..357ae424edc9 100644
--- a/net-dialup/accel-ppp/files/accel-ppp.initd
+++ b/net-dialup/accel-ppp/files/accel-ppp.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
 
 extra_started_commands="reload"
@@ -23,7 +23,7 @@ start() {
 
 stop() {
 	ebegin "Stopping accel-pppd"
-	accel-cmd shutdown
+	accel-cmd shutdown ${SHUTDOWN_MODE:-hard}
 	[ $? -ne 0 ] && kill -9 $(pidof accel-pppd)
 	PID="$(cat ${ACCEL_PPPD_PID})"
 	while [ -n "${PID}" -a -d "/proc/${PID}" ]; do