diff options
author | Marek Szuba <marecki@gentoo.org> | 2020-12-22 19:54:28 +0000 |
---|---|---|
committer | Marek Szuba <marecki@gentoo.org> | 2020-12-22 19:56:12 +0000 |
commit | 292933c82b06f3a1a3a64716476ab1287846aafd (patch) | |
tree | b6493a5bc04d0c5bcbc271f8810779f60aeac12e /net-dialup/accel-ppp | |
parent | media-video/obs-studio: python bump (diff) | |
download | gentoo-292933c82b06f3a1a3a64716476ab1287846aafd.tar.gz gentoo-292933c82b06f3a1a3a64716476ab1287846aafd.tar.bz2 gentoo-292933c82b06f3a1a3a64716476ab1287846aafd.zip |
net-dialup/accel-ppp: migrate to lua-single.eclass
Locked to lua5.1 by upstream build scripts.
Closes: https://bugs.gentoo.org/752792
Signed-off-by: Marek Szuba <marecki@gentoo.org>
Diffstat (limited to 'net-dialup/accel-ppp')
-rw-r--r-- | net-dialup/accel-ppp/accel-ppp-1.12.0_p20200913-r100.ebuild | 113 | ||||
-rw-r--r-- | net-dialup/accel-ppp/accel-ppp-9999.ebuild | 10 |
2 files changed, 120 insertions, 3 deletions
diff --git a/net-dialup/accel-ppp/accel-ppp-1.12.0_p20200913-r100.ebuild b/net-dialup/accel-ppp/accel-ppp-1.12.0_p20200913-r100.ebuild new file mode 100644 index 000000000000..7443db976804 --- /dev/null +++ b/net-dialup/accel-ppp/accel-ppp-1.12.0_p20200913-r100.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-1 ) + +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="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? ( ${LUA_DEPS} ) + 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="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 + set_arch_to_kernel + else + linux-info_pkg_setup + fi + use lua && lua-single_pkg_setup +} + +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 + + # 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 + + cmake_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 TRUE FALSE)" + -DMEMDEBUG="$(usex debug)" + -DNETSNMP="$(usex snmp)" + -DRADIUS="$(usex radius)" + -DSHAPER="$(usex shaper)" + $(use debug && echo "-DVALGRIND=$(usex valgrind)") + ) + cmake_src_configure +} + +src_compile() { + cmake_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_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 + + keepdir /var/log/accel-ppp +} diff --git a/net-dialup/accel-ppp/accel-ppp-9999.ebuild b/net-dialup/accel-ppp/accel-ppp-9999.ebuild index 3f8aec7348a9..fd43b44ecd20 100644 --- a/net-dialup/accel-ppp/accel-ppp-9999.ebuild +++ b/net-dialup/accel-ppp/accel-ppp-9999.ebuild @@ -3,8 +3,10 @@ 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 +inherit cmake flag-o-matic git-r3 linux-info linux-mod lua-single DESCRIPTION="High performance PPTP, PPPoE and L2TP server" HOMEPAGE="https://sourceforge.net/projects/accel-ppp/" @@ -15,7 +17,7 @@ SLOT="0" KEYWORDS="" IUSE="debug doc ipoe lua postgres radius shaper snmp valgrind" -RDEPEND="lua? ( dev-lang/lua:0 ) +RDEPEND="lua? ( ${LUA_DEPS} ) postgres? ( dev-db/postgresql:* ) snmp? ( net-analyzer/net-snmp ) dev-libs/libpcre @@ -28,7 +30,8 @@ DOCS=( README ) CONFIG_CHECK="~L2TP ~PPPOE ~PPTP" -REQUIRED_USE="valgrind? ( debug )" +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) + valgrind? ( debug )" pkg_setup() { if use ipoe; then @@ -37,6 +40,7 @@ pkg_setup() { else linux-info_pkg_setup fi + use lua && lua-single_pkg_setup } src_prepare() { |