From 36f95f1a89199d80adc56e0588d9dfbdb52de00a Mon Sep 17 00:00:00 2001 From: Sergey Popov Date: Thu, 5 May 2016 18:11:37 +0300 Subject: net-dialup/accel-ppp: version bump to 1.10.2 Properly install ipoe kernel module, add necessary LDFLAGS to properly handle lazy linking. Drop old version. Reported-by: Christian Roessner Gentoo-Bug: 549918 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/accel-ppp-1.10.2.ebuild | 94 ++++++++++++++++++++++++++++ 3 files changed, 95 insertions(+), 85 deletions(-) delete mode 100644 net-dialup/accel-ppp/accel-ppp-1.10.1.ebuild create mode 100644 net-dialup/accel-ppp/accel-ppp-1.10.2.ebuild (limited to 'net-dialup/accel-ppp') diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest index 697888a33f90..fe9feea82ea4 100644 --- a/net-dialup/accel-ppp/Manifest +++ b/net-dialup/accel-ppp/Manifest @@ -1 +1,2 @@ DIST accel-ppp-1.10.1.tar.bz2 1587117 SHA256 2333897563925d719b1b5e6fd05238fe769b967a9bac73d3b1daa1b8ff274b7d SHA512 43dc01992a8298970911d202736af0dcd3b46744d18ecce5d4987bab8d312cfb75d5a72a6f5c1b91ad7943c2c66371063402688cce57106db116b407205f142b WHIRLPOOL 0ce66a3a0daf6f4902baf7bf8ace545c1a2e8e9105bb62dc7dad96d3da131a215da17d6e722488fc9388acfb4a7f028bf9904e62c8c7a43fa7d2cb3aa9a7ca81 +DIST accel-ppp-1.10.2.tar.bz2 1587850 SHA256 ffd339ff1589c8b9e306028844e7156ee6d2b019b1219f1b8b62314c835e8a7d SHA512 6cc1d5f0786196fbbebc0f04830f780c1f2d2995bc7fb6384729b64820c74d0fb53f052bdaa71fa3b6165ab13cd7c137bfdc3ef717f6e866a329b893d7375ce1 WHIRLPOOL 050a5fe5eafba1e90f7b200a476e2edfbb878039a8e4ac5d06fdc195ad72720d7382267b7181e2a8ec47c2db8da4664b1315dff75ffcbc087c0e7e035577862c diff --git a/net-dialup/accel-ppp/accel-ppp-1.10.1.ebuild b/net-dialup/accel-ppp/accel-ppp-1.10.1.ebuild deleted file mode 100644 index 4ea714a5a734..000000000000 --- a/net-dialup/accel-ppp/accel-ppp-1.10.1.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# 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/accel-ppp-1.10.2.ebuild b/net-dialup/accel-ppp/accel-ppp-1.10.2.ebuild new file mode 100644 index 000000000000..e711ab22c87b --- /dev/null +++ b/net-dialup/accel-ppp/accel-ppp-1.10.2.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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="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' + sed -i -e '/modules_install/d' drivers/ipoe/CMakeLists.txt || die 'sed on drivers/ipoe/CMakeLists.txt failed' + + # 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 + -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() { + if use ipoe; then + local MODULE_NAMES="ipoe(accel-ppp:${BUILD_DIR}/drivers/ipoe/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 +} -- cgit v1.2.3-65-gdbad