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/Manifest.gz | Bin 5722 -> 5722 bytes 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 + net-dialup/ppp/Manifest | 5 +- net-dialup/ppp/ppp-2.4.8-r1.ebuild | 232 --------------------- net-dialup/ppp/ppp-2.4.9-r2.ebuild | 7 +- net-dialup/rp-pppoe/Manifest | 3 + net-dialup/rp-pppoe/rp-pppoe-3.15.ebuild | 99 +++++++++ 11 files changed, 233 insertions(+), 363 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 delete mode 100644 net-dialup/ppp/ppp-2.4.8-r1.ebuild create mode 100644 net-dialup/rp-pppoe/rp-pppoe-3.15.ebuild (limited to 'net-dialup') diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz index f9f61209366d..87c75872c172 100644 Binary files a/net-dialup/Manifest.gz and b/net-dialup/Manifest.gz differ 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 diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest index 9dc4c4b4b2ce..01773dc24acc 100644 --- a/net-dialup/ppp/Manifest +++ b/net-dialup/ppp/Manifest @@ -1,10 +1,7 @@ AUX README.mpls 530 BLAKE2B 21d57668272eb02c994d0ae38a9895f095ad024bab1613995313480f5d314a5772c30bb0edb1032658993d897b58f5d2744abbc43e0416e63d8fe27dfc968819 SHA512 2b617365fce74cceeb14e53f476b454c4420273661050d25e1c524cf5d56a7554318a268f7b9ebb100592b61a01d274efaeed28abb9ca0adaeb71ef981201b36 AUX modules.ppp 299 BLAKE2B d5c0dcf135dd0a33288f27c95133d4dc980b84dc62bf8eca5b35040f4bfa5d0480cddc48263f390be8df0e0d8de704a62c490172b523612dd945a284e374372f SHA512 58bf5d6d286a08bd6dd595b39ee425efedd5745dddf33a9c90505891546eb46f4cf1306d83911bef61bc4611816aa0f6aef5d3e0f14c2f4ddd0a588780570041 -DIST ppp-2.4.8-patches-02.tar.xz 39868 BLAKE2B b933bbdabb7ace06cb20b77012a21621f2be7b78c2bf6a57c99e4feef0e22828406ea46046f7f7c80a52821105da45f65b1d82d7bb98f6431946b3f3eaca99f7 SHA512 f987d755bb9d10b2ce7f9bc7ee9242af46dae24c5d964ec9b130d56ab818940ed5f45fa25e3323ec2eefad7d3a487d8dc49406b7534738952430cb8c4a409591 -DIST ppp-2.4.8.tar.gz 697530 BLAKE2B 235114288699db45501bc7d9ce8f36c0b5684ab0dab09da93d7f2b4f7c3eca030ae26e34dfff25efa971374fbd7fde62f121ea6aa69872658f44c5ac8c7850a2 SHA512 a99b3b6c7bd80cd133bda4e29d33c793a76f3b67e1f8db774547e88932ce29564fad390a4f51d3fe30a75e006499b95000b042ae0f64cd360548426f8091a478 DIST ppp-2.4.9-patches-02.tar.xz 18056 BLAKE2B d2632811b7146214ad4cf59bee2834abda59b04c44990d5c135d85fad883371b4813e145e11a6bdff449670acda2e2ef3647c54387800f23111e975b54c5e08c SHA512 5978aa12cd669f858acf2ca9d604d9e830c4d2bd21ed1473823d4da02866d693724d0682c0d65fa4569b89d6b6e430505d307556a61f4ff927590d1357d52e93 DIST ppp-2.4.9.tar.gz 719904 BLAKE2B 7ba3eb8c98fec5599635dbd302399617e1075f3a1df090f1a94ce2bb8a5c7631e6eea82246adc33711aba5fe95e7ba7c982e2cbf1fb0d71e45f877d9b092ffb7 SHA512 c309f8f69f534c05547cd2f66dade0e0f198ea4c2928a7e899e660280786b3e965437a67b8c5bb81c59d0fa1818b4eb7b701d2dce015a420d380422d2bca4e1a DIST ppp-dhcpc.tgz 33497 BLAKE2B ca59130012f007cf45af6bcfa468c112b0d521c8b11f42d42c566dd9de55bd6d6f1b1ceb83cbae18cfe79cb5cb36ba6c6858a4718915acc6987295008aca53da SHA512 aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738 -EBUILD ppp-2.4.8-r1.ebuild 7015 BLAKE2B 7a7126901db6011fd17456491e9b06265efdd7fd24a2840def858231676effc5a190495170d2d189cad12629439253ef758a65a76a79bc33c25031339633fd03 SHA512 9aa9ae8f861b7928b21757a1c82129da3a0177d70ce36f5c73f1dd713ba746a9aecb719151b07701034aee98646a3ecb58e23206d4e86a4b43278dfe573e4687 -EBUILD ppp-2.4.9-r2.ebuild 7346 BLAKE2B 502b35a70f9becc6734844853791b45f8bace36b5a51314c93667465ce55a3444b2db1355e9a4b0c8202323b651255d62c9eff78c1d59f32b115fa4d5e0b453b SHA512 73bb88f7d27acdcea9e3cebe521f83c2159e41d0e312bc760b68c7951a153a861a8cb2890e122c3103f899b7652ccf514d645bf2a434f2e133a99d5851cccdb6 +EBUILD ppp-2.4.9-r2.ebuild 7367 BLAKE2B c63ebfeab0a0de84bfe796dbebf5d13910426611156db553de79cb61644956dee4aff9476fc3140cfd2806c1842fc19a71ae0e4316a6e98b68ee889213a613b6 SHA512 59890b24adda02cc49cd74adb7542b6228188d89a64ae851f3bed01605adf1508d7a99cb58c9cda41abeeb0b33b73bd4aa8efab4c9bb768e76508af5c19a62d7 MISC metadata.xml 1248 BLAKE2B 2c0facefb3f71aa967481dbd0b0f212d17bf2827b94ed40a9a253c053c9e9d3700aa1bdf8610abead16f290f93551139f4a9022b38e3c6dcbcc5ed61fba7f34b SHA512 e309d63a5611ee607b820803e82e9b4da4ebb33cd010660ce701d261726c4f635b0c4ad98bd80c20d01eb1d9004dfa076fbd59521a2bbe66d7dae78eeae65f6e diff --git a/net-dialup/ppp/ppp-2.4.8-r1.ebuild b/net-dialup/ppp/ppp-2.4.8-r1.ebuild deleted file mode 100644 index 94962cff0306..000000000000 --- a/net-dialup/ppp/ppp-2.4.8-r1.ebuild +++ /dev/null @@ -1,232 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-info multilib pam toolchain-funcs - -PATCH_VER="02" -DESCRIPTION="Point-to-Point Protocol (PPP)" -HOMEPAGE="https://ppp.samba.org/" -SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz - https://dev.gentoo.org/~polynomial-c/${P}-patches-${PATCH_VER}.tar.xz - http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz" - -LICENSE="BSD GPL-2" -SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="activefilter atm dhcp eap-tls gtk ipv6 pam radius" - -DEPEND=" - activefilter? ( net-libs/libpcap ) - atm? ( net-dialup/linux-atm ) - pam? ( sys-libs/pam ) - gtk? ( x11-libs/gtk+:2 ) - dev-libs/openssl:0= -" -RDEPEND="${DEPEND} - !> etc.ppp/options || die - fi - - einfo "Enabling CBCP" - sed -i '/^#CBCP=y/s:#::' pppd/Makefile.linux || die - - if use dhcp ; then - einfo "Adding ppp-dhcp plugin files" - sed \ - -e '/^SUBDIRS :=/s:$: dhcp:' \ - -i pppd/plugins/Makefile.linux || die - fi - - # Set correct libdir - sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \ - pppd/{pathnames.h,pppd.8} || die - - if use radius ; then - #set the right paths in radiusclient.conf - sed -e "s:/usr/local/etc:/etc:" \ - -e "s:/usr/local/sbin:/usr/sbin:" \ - -i pppd/plugins/radius/etc/radiusclient.conf || die - #set config dir to /etc/ppp/radius - sed -i -e "s:/etc/radiusclient:/etc/ppp/radius:g" \ - pppd/plugins/radius/{*.8,*.c,*.h} \ - pppd/plugins/radius/etc/* || die - else - einfo "Disabling radius" - sed -i -e '/+= radius/s:^:#:' pppd/plugins/Makefile.linux || die - fi - - # Respect our pkg-config settings. - sed -i \ - -e 's:pkg-config:$(PKG_CONFIG):' \ - contrib/pppgetpass/Makefile.linux || die - sed -i \ - -e '/^LIBS/{s:-L/usr/local/ssl/lib::;s:-lcrypto:`$(PKG_CONFIG) --libs libcrypto`:}' \ - pppd/Makefile.linux || die - - eapply_user #549588 -} - -src_compile() { - tc-export AR CC PKG_CONFIG - emake COPTS="${CFLAGS} -D_GNU_SOURCE" - - # build pppgetpass - cd contrib/pppgetpass || die - if use gtk ; then - emake -f Makefile.linux - else - emake pppgetpass.vt - fi -} - -src_install() { - local i - for i in chat pppd pppdump pppstats ; do - doman ${i}/${i}.8 - dosbin ${i}/${i} - done - fperms u+s-w /usr/sbin/pppd - - # Install pppd header files - emake -C pppd INSTROOT="${D}" install-devel - - dosbin pppd/plugins/rp-pppoe/pppoe-discovery - - dodir /etc/ppp/peers - insinto /etc/ppp - insopts -m0600 - newins etc.ppp/pap-secrets pap-secrets.example - newins etc.ppp/chap-secrets chap-secrets.example - - insopts -m0644 - doins etc.ppp/options - - if use pam; then - pamd_mimic_system ppp auth account session - fi - - local PLUGINS_DIR="/usr/$(get_libdir)/pppd/${PV}" - insinto "${PLUGINS_DIR}" - insopts -m0755 - doins pppd/plugins/minconn.so - doins pppd/plugins/passprompt.so - doins pppd/plugins/passwordfd.so - doins pppd/plugins/winbind.so - doins pppd/plugins/rp-pppoe/rp-pppoe.so - doins pppd/plugins/pppol2tp/openl2tp.so - doins pppd/plugins/pppol2tp/pppol2tp.so - if use atm ; then - doins pppd/plugins/pppoatm/pppoatm.so - fi - if use dhcp ; then - doins pppd/plugins/dhcp/dhcpc.so - fi - if use radius ; then - doins pppd/plugins/radius/rad{ius,attr,realms}.so - - #Copy radiusclient configuration files (#92878) - insinto /etc/ppp/radius - insopts -m0644 - doins pppd/plugins/radius/etc/{dictionary*,issue,port-id-map,radiusclient.conf,realms,servers} - - doman pppd/plugins/radius/pppd-rad{ius,attr}.8 - fi - - insinto /etc/modprobe.d - insopts -m0644 - newins "${FILESDIR}/modules.ppp" ppp.conf - - dodoc PLUGINS README* SETUP Changes-2.3 FAQ - dodoc "${FILESDIR}/README.mpls" - - dosbin scripts/p{on,off,log} - doman scripts/pon.1 - - # Adding misc. specialized scripts to doc dir - dodoc -r scripts - docinto scripts - dodoc -r scripts/chatchat - - if use gtk ; then - dosbin contrib/pppgetpass/{pppgetpass.vt,pppgetpass.gtk} - newsbin contrib/pppgetpass/pppgetpass.sh pppgetpass - else - newsbin contrib/pppgetpass/pppgetpass.vt pppgetpass - fi - doman contrib/pppgetpass/pppgetpass.8 -} - -pkg_postinst() { - if linux-info_get_any_version && linux_config_src_exists ; then - echo - ewarn "If the following test report contains a missing kernel configuration option that you need," - ewarn "you should reconfigure and rebuild your kernel before running pppd." - CONFIG_CHECK="~PPP ~PPP_ASYNC ~PPP_SYNC_TTY" - local ERROR_PPP="CONFIG_PPP:\t missing PPP support (REQUIRED)" - local ERROR_PPP_ASYNC="CONFIG_PPP_ASYNC:\t missing asynchronous serial line discipline (optional, but highly recommended)" - local WARNING_PPP_SYNC_TTY="CONFIG_PPP_SYNC_TTY:\t missing synchronous serial line discipline (optional; used by 'sync' pppd option)" - if use activefilter ; then - CONFIG_CHECK="${CONFIG_CHECK} ~PPP_FILTER" - local ERROR_PPP_FILTER="CONFIG_PPP_FILTER:\t missing PPP filtering support (REQUIRED)" - fi - CONFIG_CHECK="${CONFIG_CHECK} ~PPP_DEFLATE ~PPP_BSDCOMP ~PPP_MPPE" - local ERROR_PPP_DEFLATE="CONFIG_PPP_DEFLATE:\t missing Deflate compression (optional, but highly recommended)" - local ERROR_PPP_BSDCOMP="CONFIG_PPP_BSDCOMP:\t missing BSD-Compress compression (optional, but highly recommended)" - local WARNING_PPP_MPPE="CONFIG_PPP_MPPE:\t missing MPPE encryption (optional, mostly used by PPTP links)" - CONFIG_CHECK="${CONFIG_CHECK} ~PPPOE ~PACKET" - local WARNING_PPPOE="CONFIG_PPPOE:\t missing PPPoE support (optional, needed by rp-pppoe plugin)" - local WARNING_PACKET="CONFIG_PACKET:\t missing AF_PACKET support (optional, used by rp-pppoe and dhcpc plugins)" - if use atm ; then - CONFIG_CHECK="${CONFIG_CHECK} ~PPPOATM" - local WARNING_PPPOATM="CONFIG_PPPOATM:\t missing PPPoA support (optional, needed by pppoatm plugin)" - fi - check_extra_config - fi - - # create *-secrets files if not exists - [[ -f "${EROOT}/etc/ppp/pap-secrets" ]] || \ - cp -pP "${EROOT}/etc/ppp/pap-secrets.example" "${EROOT}/etc/ppp/pap-secrets" - [[ -f "${EROOT}/etc/ppp/chap-secrets" ]] || \ - cp -pP "${EROOT}/etc/ppp/chap-secrets.example" "${EROOT}/etc/ppp/chap-secrets" - - # lib name has changed - sed -i -e "s:^pppoe.so:rp-pppoe.so:" "${EROOT}/etc/ppp/options" || die - - echo - elog "Pon, poff and plog scripts have been supplied for experienced users." - elog "Users needing particular scripts (ssh,rsh,etc.) should check out the" - elog "/usr/share/doc/${PF}/scripts directory." -} diff --git a/net-dialup/ppp/ppp-2.4.9-r2.ebuild b/net-dialup/ppp/ppp-2.4.9-r2.ebuild index e09649890def..61bbe8a89062 100644 --- a/net-dialup/ppp/ppp-2.4.9-r2.ebuild +++ b/net-dialup/ppp/ppp-2.4.9-r2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit linux-info multilib pam toolchain-funcs +inherit linux-info pam toolchain-funcs PATCH_TARBALL_NAME="${PN}-2.4.9-patches-02" DESCRIPTION="Point-to-Point Protocol (PPP)" @@ -26,6 +26,7 @@ DEPEND=" " RDEPEND="${DEPEND} !