commit: 5f5601126811de0285e0a83c31bb2d203af1eb37 Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> AuthorDate: Mon May 17 08:47:18 2021 +0000 Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> CommitDate: Mon May 17 08:57:47 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f560112
net-dialup/accel-ppp: version bump - add new snapshot - add support for dev-libs/libtomcrypt - sync live ebuild Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Sergey Popov <pinkbyte <AT> gentoo.org> net-dialup/accel-ppp/Manifest | 1 + ...99.ebuild => accel-ppp-1.12.0_p20210430.ebuild} | 31 ++++++++++++++-------- net-dialup/accel-ppp/accel-ppp-9999.ebuild | 14 +++++----- net-dialup/accel-ppp/metadata.xml | 2 ++ 4 files changed, 30 insertions(+), 18 deletions(-) diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest index 03fa3a5ef15..070c8e705ac 100644 --- a/net-dialup/accel-ppp/Manifest +++ b/net-dialup/accel-ppp/Manifest @@ -1 +1,2 @@ DIST accel-ppp-1.12.0_p20200913.tar.bz2 1661195 BLAKE2B 6ffdb140486e98c19c981999873f94e767682bec1a2bea1f2feb7bed6ce9d8b15a824605da0b60897501773f4ece9d71612385dd1eff61483fff5daadad9713d SHA512 ecf325774507a8ddb1c6fe3c90aa2e25c72d006e9d96eabf66c7f1b67cfa70fc1073cf120c195d0823ad2532fa3504f6ab482d1842eb8b3e3dbafdb8b16a2ac6 +DIST accel-ppp-1.12.0_p20210430.tar.bz2 1662172 BLAKE2B 7c9da06ca704d63afb16bc8d2bc64541e25d31a062a948c3014f340684a38c7ba55d15eba3458ced90b088788228f97553105fd5d0aebbb1e61fb1b1075ae521 SHA512 de690a44ebaad31c63ec604c306e3d5bc63bd02ea2c17a435c2166ddcc8a3c06b86d72d6ebd88d906093583345962569493231e1657f222d4e66d93bf1d0ca41 diff --git a/net-dialup/accel-ppp/accel-ppp-9999.ebuild b/net-dialup/accel-ppp/accel-ppp-1.12.0_p20210430.ebuild similarity index 75% copy from net-dialup/accel-ppp/accel-ppp-9999.ebuild copy to net-dialup/accel-ppp/accel-ppp-1.12.0_p20210430.ebuild index fd43b44ecd2..e36b6e06850 100644 --- a/net-dialup/accel-ppp/accel-ppp-9999.ebuild +++ b/net-dialup/accel-ppp/accel-ppp-1.12.0_p20210430.ebuild @@ -1,27 +1,27 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 LUA_COMPAT=( lua5-1 ) -EGIT_REPO_URI="https://github.com/accel-ppp/accel-ppp.git"; -inherit cmake flag-o-matic git-r3 linux-info linux-mod lua-single +inherit cmake flag-o-matic linux-info linux-mod lua-single DESCRIPTION="High performance PPTP, PPPoE and L2TP server" HOMEPAGE="https://sourceforge.net/projects/accel-ppp/"; -SRC_URI="" +SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.bz2"; LICENSE="GPL-2" SLOT="0" -KEYWORDS="" -IUSE="debug doc ipoe lua postgres radius shaper snmp valgrind" +KEYWORDS="~amd64 ~x86" +IUSE="debug doc ipoe libtomcrypt lua postgres radius shaper snmp valgrind" -RDEPEND="lua? ( ${LUA_DEPS} ) +RDEPEND="!libtomcrypt? ( dev-libs/openssl:0= ) + libtomcrypt? ( dev-libs/libtomcrypt:0= ) + lua? ( ${LUA_DEPS} ) postgres? ( dev-db/postgresql:* ) snmp? ( net-analyzer/net-snmp ) - dev-libs/libpcre - dev-libs/openssl:0=" + dev-libs/libpcre" DEPEND="${RDEPEND} valgrind? ( dev-util/valgrind )" PDEPEND="net-dialup/ppp-scripts" @@ -33,6 +33,12 @@ CONFIG_CHECK="~L2TP ~PPPOE ~PPTP" REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) valgrind? ( debug )" +PATCHES=( + "${FILESDIR}/${PN}-1.11.1-socklen.patch" +) + +S="${WORKDIR}" + pkg_setup() { if use ipoe; then linux-mod_pkg_setup @@ -52,6 +58,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 @@ -60,13 +70,12 @@ 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 + -DCRYPTO="$(usex libtomcrypt TOMCRYPT OPENSSL)" -DLOG_PGSQL="$(usex postgres)" -DLUA="$(usex lua TRUE FALSE)" -DMEMDEBUG="$(usex debug)" diff --git a/net-dialup/accel-ppp/accel-ppp-9999.ebuild b/net-dialup/accel-ppp/accel-ppp-9999.ebuild index fd43b44ecd2..f517be83f27 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-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,13 +15,14 @@ SRC_URI="" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="debug doc ipoe lua postgres radius shaper snmp valgrind" +IUSE="debug doc ipoe libtomcrypt lua postgres radius shaper snmp valgrind" -RDEPEND="lua? ( ${LUA_DEPS} ) +RDEPEND="!libtomcrypt? ( dev-libs/openssl:0= ) + libtomcrypt? ( dev-libs/libtomcrypt:0= ) + lua? ( ${LUA_DEPS} ) postgres? ( dev-db/postgresql:* ) snmp? ( net-analyzer/net-snmp ) - dev-libs/libpcre - dev-libs/openssl:0=" + dev-libs/libpcre" DEPEND="${RDEPEND} valgrind? ( dev-util/valgrind )" PDEPEND="net-dialup/ppp-scripts" @@ -60,13 +61,12 @@ 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 + -DCRYPTO="$(usex libtomcrypt TOMCRYPT OPENSSL)" -DLOG_PGSQL="$(usex postgres)" -DLUA="$(usex lua TRUE FALSE)" -DMEMDEBUG="$(usex debug)" diff --git a/net-dialup/accel-ppp/metadata.xml b/net-dialup/accel-ppp/metadata.xml index 138dfdc4181..20e35c390d9 100644 --- a/net-dialup/accel-ppp/metadata.xml +++ b/net-dialup/accel-ppp/metadata.xml @@ -7,10 +7,12 @@ </maintainer> <use> <flag name="ipoe">Build IPoE kernel module</flag> + <flag name="libtomcrypt">Support crypto algorithms through <pkg>dev-libs/libtomcrypt</pkg> instead of <pkg>dev-libs/openssl</pkg></flag> <flag name="shaper">Support for traffic shaping</flag> <flag name="valgrind">Compile in valgrind hints</flag> </use> <upstream> + <remote-id type="github">xebd/accel-ppp</remote-id> <remote-id type="sourceforge">accel-ppp</remote-id> </upstream> </pkgmetadata>
