From 908778078736bd36f7a60a2d576d415cb8e000fa Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 22 May 2021 07:31:18 +0100 Subject: gentoo resync : 22.05.2021 --- net-dialup/accel-ppp/Manifest | 8 +- .../accel-ppp-1.12.0_p20200913-r100.ebuild | 113 --------------------- .../accel-ppp/accel-ppp-1.12.0_p20210430.ebuild | 113 +++++++++++++++++++++ net-dialup/accel-ppp/accel-ppp-9999.ebuild | 14 +-- net-dialup/accel-ppp/metadata.xml | 2 + 5 files changed, 126 insertions(+), 124 deletions(-) delete mode 100644 net-dialup/accel-ppp/accel-ppp-1.12.0_p20200913-r100.ebuild create mode 100644 net-dialup/accel-ppp/accel-ppp-1.12.0_p20210430.ebuild (limited to 'net-dialup/accel-ppp') diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest index 284c4e595104..03b6347e16fd 100644 --- a/net-dialup/accel-ppp/Manifest +++ b/net-dialup/accel-ppp/Manifest @@ -1,7 +1,7 @@ AUX accel-ppp-1.11.1-socklen.patch 483 BLAKE2B efdcc5b2826ab2d45bcd6914efbc65a3ef0ac6987663f8888d2168d61f941de9bd047a30673ee0114955faa121de701f93c1564b2cb8e2c843cfa7ff2030b309 SHA512 6561b95c8cc0ec642c12895426c5b0b8290da9c7e3c9207beb837e50218fec70ead92a680e131f2967d3281a273cc920ccfebbd66aed4579feec61a759b36dd5 AUX accel-ppp.confd 437 BLAKE2B 6b418f528877a46b4b8aba3728405459a567c264b5bb73da79a08649f604f99f6b9d5a665599836b902c554b9fa5c62b8e399cb60bf4e0bcf85e21a0d4959b54 SHA512 66dad6b7b4497c5768206e7990e4034f1de03d9608e1470888e061ba0ff6be934f1dd329336fd3978a43a99a8e3971a00be4da327bfc01a64dadfe91da2cea30 AUX accel-ppp.initd 998 BLAKE2B 974407e0e974fb79b3ea17bd1526d1f6343d7284cb10a93bcb2713f955244a91a664fd7187287a7b090edee340f76181f88645b2d4bf0e5470d825407ddebe83 SHA512 ebee03f6c448f1158831bb563568ce027b2824c185852d380f079456f25dcb69e0fe5c6d6235eed33f028825786f091853c05fcba5eb3c287790353629823764 -DIST accel-ppp-1.12.0_p20200913.tar.bz2 1661195 BLAKE2B 6ffdb140486e98c19c981999873f94e767682bec1a2bea1f2feb7bed6ce9d8b15a824605da0b60897501773f4ece9d71612385dd1eff61483fff5daadad9713d SHA512 ecf325774507a8ddb1c6fe3c90aa2e25c72d006e9d96eabf66c7f1b67cfa70fc1073cf120c195d0823ad2532fa3504f6ab482d1842eb8b3e3dbafdb8b16a2ac6 -EBUILD accel-ppp-1.12.0_p20200913-r100.ebuild 2646 BLAKE2B 71066002c7ce8823e26f0bf54973d4603f922e34cf9253b2fa6e67aad320a466bb82bcad20a6ad657a338dcc9cea704953fc327a286f7d2489f04a54b10a1717 SHA512 90d880f0053d0208757734f2400a69c262b7e7c26223107533f6fdec5ac616611b3bd3f11159a0f3a3ee17241c7938cc61ab33db737bb7117363904312f910a7 -EBUILD accel-ppp-9999.ebuild 2433 BLAKE2B 84ded7583d6ea94280eeb642adc46804a996bfebe61e1067cab8c3c3a2b30199af62ddd4bd7ee86fc63e2a76c4ced93efb0ca82e6202b6f7d89cf2b2a3222222 SHA512 90547337a4466cf4916c296149f7e7f59a82ee507dfb30bf292a798cb9712f9f8600e7cd3825b47892bf33793e6a126cd50a13f66253999a10239d19eafc1b4c -MISC metadata.xml 507 BLAKE2B 7c0a985830c791f5fe40ed8b624f366eb8e39505fe128b46153740f77ce9c5bd05bf8bf7ffb8939aa42550c9ea08de8f2498d444ef2e930121bbe7f404bf88dd SHA512 6b60c890f172501225ed3da4a229298c2b05601606d047bbe46dbea88246bcce8c15695259063daf73574c9d24048b04d2422c83e2e934015768338120e9154e +DIST accel-ppp-1.12.0_p20210430.tar.bz2 1662172 BLAKE2B 7c9da06ca704d63afb16bc8d2bc64541e25d31a062a948c3014f340684a38c7ba55d15eba3458ced90b088788228f97553105fd5d0aebbb1e61fb1b1075ae521 SHA512 de690a44ebaad31c63ec604c306e3d5bc63bd02ea2c17a435c2166ddcc8a3c06b86d72d6ebd88d906093583345962569493231e1657f222d4e66d93bf1d0ca41 +EBUILD accel-ppp-1.12.0_p20210430.ebuild 2665 BLAKE2B 1a9ae46cd9a56dab6fbec578f6fbe7243a52fd244e28aa4c13f88aeaa78399a7b3b3a8a2c54ec2b95aad376defa9001b7c1788672d03bf6cad2390c46e18f121 SHA512 a1be07406114c7031877fa58265cdc6c28e47c9ba84a5081cfa29c96ef37e627a387f20a564124e976fab3d3353ac838f10474d2485ee5513d63f7619834ef24 +EBUILD accel-ppp-9999.ebuild 2452 BLAKE2B de8383e3fa9034b498e9eea830e00f60c500cadbf2e2aaa6d219cd5c6402774399b128a40232594c72d84141235e399657837c276710c54d182fb6bd1ed6e2cd SHA512 2d76eccbf71df64704a5793dab3f1635073d6f3a16d47268bdd93e6d7ebbe87f9c779c57e8769437b3cc9f7d0c9f0f94fae7d9e7bb607e28cf2ccc8e86f9ba6c +MISC metadata.xml 700 BLAKE2B de7470beb81a5cf966d84c838c5727f3c2e9d37512901342e2cac3fc19316987757aa8bbadc7cb2bd232fe8b46b967789d848eca99d683335487995f6f9bc89c SHA512 7b06e425f2679ff5ba92b8d60eaee78f68c2c4c170ef7caba7e98d61bd6e38074761cb03f611a20e917f91f77b51b9f0ef1de8828b5f252ca0bd93e140bd3ace 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 deleted file mode 100644 index 7443db976804..000000000000 --- a/net-dialup/accel-ppp/accel-ppp-1.12.0_p20200913-r100.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# 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-1.12.0_p20210430.ebuild b/net-dialup/accel-ppp/accel-ppp-1.12.0_p20210430.ebuild new file mode 100644 index 000000000000..e36b6e068503 --- /dev/null +++ b/net-dialup/accel-ppp/accel-ppp-1.12.0_p20210430.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2021 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 libtomcrypt lua postgres radius shaper snmp valgrind" + +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" +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)" + local mycmakeargs=( + -DLIB_SUFFIX="${libdir#lib}" + -DBUILD_IPOE_DRIVER="$(usex ipoe)" + -DBUILD_PPTP_DRIVER=no + -DBUILD_VLAN_MON_DRIVER="$(usex ipoe)" + -DCRYPTO="$(usex libtomcrypt TOMCRYPT 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 fd43b44ecd20..f517be83f27b 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 138dfdc41815..20e35c390d9b 100644 --- a/net-dialup/accel-ppp/metadata.xml +++ b/net-dialup/accel-ppp/metadata.xml @@ -7,10 +7,12 @@ Build IPoE kernel module + Support crypto algorithms through dev-libs/libtomcrypt instead of dev-libs/openssl Support for traffic shaping Compile in valgrind hints + xebd/accel-ppp accel-ppp -- cgit v1.2.3