[gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/files/
commit: 2741de3d15cf1c7422f46551a06b4841a49f0918
Author: Sergey Popov gentoo org>
AuthorDate: Thu May 5 14:50:22 2016 +
Commit: Sergey Popov gentoo org>
CommitDate: Thu May 5 15:16:00 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2741de3d
net-dialup/accel-ppp: improve stop sequence in initscript
Package-Manager: portage-2.2.28
net-dialup/accel-ppp/files/accel-ppp.initd | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/net-dialup/accel-ppp/files/accel-ppp.initd
b/net-dialup/accel-ppp/files/accel-ppp.initd
index fd9cbad..df98efb 100644
--- a/net-dialup/accel-ppp/files/accel-ppp.initd
+++ b/net-dialup/accel-ppp/files/accel-ppp.initd
@@ -24,8 +24,14 @@ start() {
stop() {
ebegin "Stopping accel-pppd"
- start-stop-daemon --stop --quiet --pidfile ${ACCEL_PPPD_PID}
- eend $?
+ accel-cmd shutdown
+ [ $? -ne 0 ] && kill -9 $(pidof accel-pppd)
+ PID="$(cat ${ACCEL_PPPD_PID})"
+ while [ -n "${PID}" -a -d "/proc/${PID}" ]; do
+ sleep 1
+ done
+ rm -f ${ACCEL_PPPD_PID}
+ eend 0
}
reload() {
[gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/files/
commit: dd6e7028de6652829f79b7c2bb0e16269474bda4
Author: Sergey Popov gentoo org>
AuthorDate: Wed Mar 21 12:51:01 2018 +
Commit: Sergey Popov gentoo org>
CommitDate: Wed Mar 21 12:51:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd6e7028
net-dialup/accel-ppp: change default shutdown mode
Package-Manager: Portage-2.3.19, Repoman-2.3.6
net-dialup/accel-ppp/files/accel-ppp.confd | 7 +++
net-dialup/accel-ppp/files/accel-ppp.initd | 4 ++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/net-dialup/accel-ppp/files/accel-ppp.confd
b/net-dialup/accel-ppp/files/accel-ppp.confd
index 41073c6529c..7a4d2d3712b 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 abbc4286228..357ae424edc 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
[gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/files/, net-dialup/accel-ppp/
commit: 7ff14d70ffe25bdf0053c5764ff07a4b723a6fe1
Author: Sergey Popov gentoo org>
AuthorDate: Wed May 17 13:04:26 2017 +
Commit: Sergey Popov gentoo org>
CommitDate: Wed May 17 13:04:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ff14d70
net-dialup/accel-ppp: version bump
Fix vlan handling.
Fix building with kernel 4.10.
Fix building postgresql log driver.
Gentoo-Bug: 591572
Package-Manager: Portage-2.3.5, Repoman-2.3.1
net-dialup/accel-ppp/Manifest | 1 +
.../accel-ppp/accel-ppp-1.11.1_p20170508.ebuild| 107 +
.../files/accel-ppp-1.11.1-linux-4.10.patch| 80 +++
.../accel-ppp/files/accel-ppp-1.11.1-socklen.patch | 18
4 files changed, 206 insertions(+)
diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest
index 386a2331579..10bbee8ec99 100644
--- a/net-dialup/accel-ppp/Manifest
+++ b/net-dialup/accel-ppp/Manifest
@@ -1 +1,2 @@
DIST accel-ppp-1.11.0.tar.bz2 1594327 SHA256
1b4f02fb0b264d7144c2b3f81c002983aae5b26bcf26af9cd2cd849efffe SHA512
907b484e73a4d70757a3991e6f33873aad5f10f6d5180307ee2f3eb0caacc576795d0e9c7666172a00842e6d31563503250f0e8165f6adb2bc88a1270814ea3c
WHIRLPOOL
3975b076961c8ed7e3f207309e941785de26452f6ef5490f0668aca19e404e9f2b4ffa978b2af95897fdb339289d578c52f24493a8130ea38ccabe6846363587
+DIST accel-ppp-1.11.1_p20170508.tar.bz2 1609904 SHA256
672a32b990afd970e21188d65b68b1fa067cb272a35686808f21ac66d74e66c3 SHA512
79f928c9d07891957d12443eaf32e96e826d5bebf241dcfcb31afbce2332078bf0c1dd1e1a55cf96154be1fec610f1afd088fc018f54ebd5d265c037c07a
WHIRLPOOL
47faf7ee243385c135766a018a51f322b6a1ea2a522d4d0aad674e157ef86e9aa0c1feb1778f17e5c69e89b944652e45f7631fdae48161290fb1a7e4ee66ccd2
diff --git a/net-dialup/accel-ppp/accel-ppp-1.11.1_p20170508.ebuild
b/net-dialup/accel-ppp/accel-ppp-1.11.1_p20170508.ebuild
new file mode 100644
index 000..9bfa8e3834d
--- /dev/null
+++ b/net-dialup/accel-ppp/accel-ppp-1.11.1_p20170508.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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="http://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-linux-4.10.patch"
+ "${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 "/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!
+ 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_PATH_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)"
+ )
+ 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
+
+
[gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/files/, net-dialup/accel-ppp/
commit: 81452b25d5c94c5da502af040d7b546dbc61dfdc
Author: Sergey Popov gentoo org>
AuthorDate: Wed Mar 23 10:31:25 2016 +
Commit: Sergey Popov gentoo org>
CommitDate: Wed Mar 23 10:31:25 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81452b25
net-dialup/accel-ppp: version bump to 1.10.1
Port to EAPI 6, simplify init script,
unify variable names in conf.d file
Gentoo-Bug: 574414
Package-Manager: portage-2.2.28
net-dialup/accel-ppp/Manifest| 1 +
net-dialup/accel-ppp/accel-ppp-1.10.1.ebuild | 85
net-dialup/accel-ppp/files/accel-ppp.confd | 6 +-
net-dialup/accel-ppp/files/accel-ppp.initd | 34 ---
4 files changed, 99 insertions(+), 27 deletions(-)
diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest
index d1570a7..57b222e 100644
--- a/net-dialup/accel-ppp/Manifest
+++ b/net-dialup/accel-ppp/Manifest
@@ -1,2 +1,3 @@
DIST accel-ppp-1.10.0.tar.bz2 1585702 SHA256
c990cc195e286d3c0f8063881489608e14f3f826d25ca4c0a4812c261fd9ef14 SHA512
140ff3cf9fb684624c1419946010701d902125ba02a1e931fd5a0083d706ffd32a88d491400e82661a17bd4aacfa07ad620acea0cf4f49816c1060ae184f1084
WHIRLPOOL
749b821e1fc3189f4e2a6979e3ee6e00890a3b72311502a42142f75d5f5afe7c913d2ac7b7bcff39de2b4e3c451c783d42a04be72fe37bec8803f8159845f4e2
+DIST accel-ppp-1.10.1.tar.bz2 1587117 SHA256
2333897563925d719b1b5e6fd05238fe769b967a9bac73d3b1daa1b8ff274b7d SHA512
43dc01992a8298970911d202736af0dcd3b46744d18ecce5d4987bab8d312cfb75d5a72a6f5c1b91ad7943c2c66371063402688cce57106db116b407205f142b
WHIRLPOOL
0ce66a3a0daf6f4902baf7bf8ace545c1a2e8e9105bb62dc7dad96d3da131a215da17d6e722488fc9388acfb4a7f028bf9904e62c8c7a43fa7d2cb3aa9a7ca81
DIST accel-ppp-1.8.0.tar.bz2 1566401 SHA256
a90becf1d8a579b55a95d927a35f6f83ce9a3ee1f6a6d67128a29b2fa4fd71b7 SHA512
d78c0ed4a3c51ae5f07c580b813694376fc42484a907d65164bb14409392365e2d8a876b16b15e55a7a7178cf9e573d42e578e6739f1fe9d62887e7316c816c0
WHIRLPOOL
cfeb6807e2b8734a263ad3450dce07859e12783015d6f315e09d6868c06dc8680da55df8e06a4b5ddb3c014f8423ca0b08b877f465a2649167955b7c4790f648
diff --git a/net-dialup/accel-ppp/accel-ppp-1.10.1.ebuild
b/net-dialup/accel-ppp/accel-ppp-1.10.1.ebuild
new file mode 100644
index 000..4ea714a
--- /dev/null
+++ b/net-dialup/accel-ppp/accel-ppp-1.10.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils 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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc ipoe postgres radius shaper snmp valgrind"
+
+RDEPEND="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 "/echo/d" \
+ -e "s: RENAME accel-ppp.conf.dist::" accel-pppd/CMakeLists.txt
|| die 'sed on accel-pppd/CMakeLists.txt failed'
+
+ eapply_user
+}
+
+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}"
+ -DBUILD_IPOE_DRIVER="$(usex ipoe)"
+ -DBUILD_PPTP_DRIVER=no
+ -DCRYPTO=OPENSSL
+ -DLOG_PGSQL="$(usex postgres)"
+ -DMEMDEBUG="$(usex debug)"
+ -DNETSNMP="$(usex snmp)"
+ -DRADIUS="$(usex radius)"
+ -DSHAPER="$(usex shaper)"
+ -DVALGRIND="$(usex valgrind)"
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+}
+
+src_install() {
+ 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/files/accel-ppp.confd
b/net-dialup/accel-ppp/files/accel-ppp.confd
index 7b95dfa..41073c6 100644
--- a/net-dialup/accel-ppp/files/accel-ppp.confd
+++ b/net-dialup/accel-ppp/files/accel-ppp.confd
@@ -1,10 +1,10 @@
-# Config file for /etc/init.d/accel-pppd
+# Config file for accel-pppd
# Pid file
-PID="/var/run/accel-ppp/a
[gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/files/, net-dialup/accel-ppp/
commit: d38ae7dcf2f474c2c6b057dc3a5fb2e7fd50c43a
Author: Sergey Popov gentoo org>
AuthorDate: Wed Oct 9 12:38:13 2019 +
Commit: Sergey Popov gentoo org>
CommitDate: Wed Oct 9 12:38:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d38ae7dc
net-dialup/accel-ppp: drop old versions
Signed-off-by: Sergey Popov gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
net-dialup/accel-ppp/Manifest | 1 -
.../accel-ppp/accel-ppp-1.11.1_p20170508.ebuild| 107 -
net-dialup/accel-ppp/accel-ppp-1.11..ebuild| 101 ---
.../files/accel-ppp-1.11.1-linux-4.10.patch| 80 ---
4 files changed, 289 deletions(-)
diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest
index 23f9de0f93a..8cd346959bb 100644
--- a/net-dialup/accel-ppp/Manifest
+++ b/net-dialup/accel-ppp/Manifest
@@ -1,2 +1 @@
-DIST accel-ppp-1.11.1_p20170508.tar.bz2 1609904 BLAKE2B
5993e25e09e84fa62fde28e6c79b11514eb5e0c365a8cc1a36c4e3e56ac868725b14049e28184188330ac78cb6c128429f2cc89241d871c02e4154c6882a89e2
SHA512
79f928c9d07891957d12443eaf32e96e826d5bebf241dcfcb31afbce2332078bf0c1dd1e1a55cf96154be1fec610f1afd088fc018f54ebd5d265c037c07a
DIST accel-ppp-1.11.1_p20180320.tar.bz2 1634359 BLAKE2B
97ca709ef3740c2ac1d75f6fba3acbf9229c3cb48f3a55735eaa14b74c2b0af96d637cbb145bc9e98a5b245704806cdc3d8f9d8692809626e0f73d73702c4a0a
SHA512
a8a2420332c02087e45bbaab25831ae5d2d370fd56b29db77c267083badc22b90ca4b0ec7335e13250ac8f150002b2a3c343cfba6c2378932778777dc936d914
diff --git a/net-dialup/accel-ppp/accel-ppp-1.11.1_p20170508.ebuild
b/net-dialup/accel-ppp/accel-ppp-1.11.1_p20170508.ebuild
deleted file mode 100644
index 07366eb315c..000
--- a/net-dialup/accel-ppp/accel-ppp-1.11.1_p20170508.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2019 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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";
-
-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-linux-4.10.patch"
- "${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 "/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!
- 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_PATH_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)"
- )
- 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
[gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/files/, net-dialup/accel-ppp/
commit: 8405112f9e37d099beb627a54af37cae60647ec3
Author: Sergey Popov gentoo org>
AuthorDate: Thu Jan 9 12:22:49 2020 +
Commit: Sergey Popov gentoo org>
CommitDate: Thu Jan 9 12:25:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8405112f
net-dialup/accel-ppp: backport compatibility patch for new kernels
Closes: https://bugs.gentoo.org/704306
Signed-off-by: Sergey Popov gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
net-dialup/accel-ppp/Manifest | 1 -
net-dialup/accel-ppp/accel-ppp-1.12.0.ebuild | 3 +-
.../files/accel-ppp-1.12.0-kernel-5.2.patch| 282 +
3 files changed, 284 insertions(+), 2 deletions(-)
diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest
index e8ecf5cc9a3..2272c95bf67 100644
--- a/net-dialup/accel-ppp/Manifest
+++ b/net-dialup/accel-ppp/Manifest
@@ -1,2 +1 @@
-DIST accel-ppp-1.11.1_p20180320.tar.bz2 1634359 BLAKE2B
97ca709ef3740c2ac1d75f6fba3acbf9229c3cb48f3a55735eaa14b74c2b0af96d637cbb145bc9e98a5b245704806cdc3d8f9d8692809626e0f73d73702c4a0a
SHA512
a8a2420332c02087e45bbaab25831ae5d2d370fd56b29db77c267083badc22b90ca4b0ec7335e13250ac8f150002b2a3c343cfba6c2378932778777dc936d914
DIST accel-ppp-1.12.0.tar 6758400 BLAKE2B
776c0946decec2d88a0dfeb8e840573ae8d53d53d0fe921604667eaf4a5658e7d0cfa57f0b54eb61fcdf62b7a62a94ee405a01ad2a66ab76042d59cc3f79d42b
SHA512
f1d3b31ca36395a429214b7599a43755317d89391c5631dfd02df79ed8dd51c39f75fc56ac625fbc6e7d5b0f9c85699c5da612eb4e8af9eae8ad2d9b13a187ba
diff --git a/net-dialup/accel-ppp/accel-ppp-1.12.0.ebuild
b/net-dialup/accel-ppp/accel-ppp-1.12.0.ebuild
index f2e7d2b54cc..e60b57f2e25 100644
--- a/net-dialup/accel-ppp/accel-ppp-1.12.0.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-1.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -31,6 +31,7 @@ REQUIRED_USE="valgrind? ( debug )"
PATCHES=(
"${FILESDIR}/${PN}-1.11.1-socklen.patch"
+ "${FILESDIR}/${PV}-kernel-5.2.patch"
)
pkg_setup() {
diff --git a/net-dialup/accel-ppp/files/accel-ppp-1.12.0-kernel-5.2.patch
b/net-dialup/accel-ppp/files/accel-ppp-1.12.0-kernel-5.2.patch
new file mode 100644
index 000..8300908a2d2
--- /dev/null
+++ b/net-dialup/accel-ppp/files/accel-ppp-1.12.0-kernel-5.2.patch
@@ -0,0 +1,282 @@
+From 4d837cc3bd92493732f2c598560e9e83c82f9b9e Mon Sep 17 00:00:00 2001
+From: Dmitry Kozlov
+Date: Tue, 24 Dec 2019 14:50:04 +0300
+Subject: [PATCH] ipoe,vlan_mon: add support for kernels 5.2+
+
+---
+ drivers/ipoe/ipoe.c | 58 +
+ drivers/vlan_mon/vlan_mon.c | 37 +--
+ 2 files changed, 74 insertions(+), 21 deletions(-)
+
+diff --git a/drivers/ipoe/ipoe.c b/drivers/ipoe/ipoe.c
+index f3acb3f5..6ac6d77a 100644
+--- a/drivers/ipoe/ipoe.c
b/drivers/ipoe/ipoe.c
+@@ -174,6 +174,10 @@ static struct genl_multicast_group ipoe_nl_mcg;
+ #define NETIF_F_HW_VLAN_FILTER NETIF_F_HW_VLAN_CTAG_FILTER
+ #endif
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0)
++#define nla_nest_start_noflag(skb, attr) nla_nest_start(skb, attr)
++#endif
++
+ static inline int hash_addr(__be32 addr)
+ {
+ #ifdef __LITTLE_ENDIAN
+@@ -255,8 +259,13 @@ static int check_nat_required(struct sk_buff *skb, struct
net_device *link)
+ if (IS_ERR(rt))
+ return 0;
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0)
+ if (rt->rt_gateway || (rt->dst.dev != link && rt->dst.dev != skb->dev))
+ r = 1;
++#else
++ if (rt->rt_gw4 || (rt->dst.dev != link && rt->dst.dev != skb->dev))
++ r = 1;
++#endif
+
+ ip_rt_put(rt);
+
+@@ -616,7 +625,7 @@ static void ipoe_process_queue(struct work_struct *w)
+ }
+
+ if (report_skb) {
+- ns = nla_nest_start(report_skb, id++);
++ ns = nla_nest_start_noflag(report_skb, id++);
+ if (!ns)
+ goto nl_err;
+
+@@ -1729,7 +1738,7 @@ static int ipoe_nl_cmd_del_net(struct sk_buff *skb,
struct genl_info *info)
+ return 0;
+ }
+
+-static struct nla_policy ipoe_nl_policy[IPOE_ATTR_MAX + 1] = {
++static const struct nla_policy ipoe_nl_policy[IPOE_ATTR_MAX + 1] = {
+ [IPOE_ATTR_NONE]= { .type = NLA_UNSPEC,
},
+ [IPOE_ATTR_ADDR] = { .type = NLA_U32,
},
+ [IPOE_ATTR_PEER_ADDR] = { .type = NLA_U32,},
+@@ -1741,71 +1750,93 @@ static struct nla_policy ipoe_nl_policy[IPOE_ATTR_MAX
+ 1] = {
+ [IPOE_ATTR_LINK_IFINDEX]= { .type = NLA_U32,},
+ };
+
+-static struct genl_ops ipoe_nl_ops[] = {
++static const struct genl_ops ipoe_nl_ops[] = {
+ {
+ .c
