commit: cd7bdd8a269e0a22dad2a80991a1f4752867fc9b Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> AuthorDate: Wed Oct 9 13:13:35 2019 +0000 Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> CommitDate: Wed Oct 9 13:15:47 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd7bdd8a
net-dialup/accel-ppp: version bump, update live ebuild Signed-off-by: Sergey Popov <pinkbyte <AT> gentoo.org> Package-Manager: Portage-2.3.66, Repoman-2.3.11 net-dialup/accel-ppp/Manifest | 1 + ...ccel-ppp-9999.ebuild => accel-ppp-1.12.0.ebuild} | 21 ++++++++++++++------- net-dialup/accel-ppp/accel-ppp-9999.ebuild | 8 ++++---- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest index 8cd346959bb..e8ecf5cc9a3 100644 --- a/net-dialup/accel-ppp/Manifest +++ b/net-dialup/accel-ppp/Manifest @@ -1 +1,2 @@ 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-9999.ebuild b/net-dialup/accel-ppp/accel-ppp-1.12.0.ebuild similarity index 84% copy from net-dialup/accel-ppp/accel-ppp-9999.ebuild copy to net-dialup/accel-ppp/accel-ppp-1.12.0.ebuild index ff874dac881..f2e7d2b54cc 100644 --- a/net-dialup/accel-ppp/accel-ppp-9999.ebuild +++ b/net-dialup/accel-ppp/accel-ppp-1.12.0.ebuild @@ -1,25 +1,24 @@ -# 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" -inherit cmake-utils flag-o-matic git-r3 linux-info linux-mod +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="" +SRC_URI="https://download.sourceforge.net/accel-ppp/${P}.tar.bz2 -> ${P}.tar" LICENSE="GPL-2" SLOT="0" -KEYWORDS="" +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" + dev-libs/openssl:0=" DEPEND="${RDEPEND} valgrind? ( dev-util/valgrind )" PDEPEND="net-dialup/ppp-scripts" @@ -30,6 +29,10 @@ CONFIG_CHECK="~L2TP ~PPPOE ~PPTP" REQUIRED_USE="valgrind? ( debug )" +PATCHES=( + "${FILESDIR}/${PN}-1.11.1-socklen.patch" +) + pkg_setup() { if use ipoe; then linux-mod_pkg_setup @@ -48,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 diff --git a/net-dialup/accel-ppp/accel-ppp-9999.ebuild b/net-dialup/accel-ppp/accel-ppp-9999.ebuild index ff874dac881..a05fd2d9a09 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"
