From abaa75b10f899ada8dd05b23cc03205064394bc6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 22 Jan 2021 20:28:19 +0000 Subject: gentoo resync : 22.01.2021 --- net-dialup/ppp/Manifest | 4 +- net-dialup/ppp/ppp-2.4.8-r1.ebuild | 233 ++++++++++++++++++++++++++++++++++++ net-dialup/ppp/ppp-2.4.8.ebuild | 231 ------------------------------------ net-dialup/ppp/ppp-2.4.9-r1.ebuild | 233 ------------------------------------ net-dialup/ppp/ppp-2.4.9-r2.ebuild | 235 +++++++++++++++++++++++++++++++++++++ 5 files changed, 470 insertions(+), 466 deletions(-) create mode 100644 net-dialup/ppp/ppp-2.4.8-r1.ebuild delete mode 100644 net-dialup/ppp/ppp-2.4.8.ebuild delete mode 100644 net-dialup/ppp/ppp-2.4.9-r1.ebuild create mode 100644 net-dialup/ppp/ppp-2.4.9-r2.ebuild (limited to 'net-dialup/ppp') diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest index 775ac085ead7..11ca4b45b3e0 100644 --- a/net-dialup/ppp/Manifest +++ b/net-dialup/ppp/Manifest @@ -5,6 +5,6 @@ DIST ppp-2.4.8.tar.gz 697530 BLAKE2B 235114288699db45501bc7d9ce8f36c0b5684ab0dab 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.ebuild 7051 BLAKE2B c366a86fb0509ba9634d3ecd8011018042850cb7b29af4cd5c0343c6842fb52a20d9cd1b7b814ab4070f755d82e589d22923b2f103c0b60816db7d9ae200fa0a SHA512 4a3c9dbb47efa18342a7231b510d569a7489ec33d6140d8ae6248e4ddc2127c83a079ce32e8a3f5a21be7c9bdc95edd780e2ad1ee11d91f048ca77bad17db604 -EBUILD ppp-2.4.9-r1.ebuild 7116 BLAKE2B 925471d85a4529c5daee4e7ac91f1662ae7b4f931b28a13e5f878cc58c2f53a98c8281adc02bf1fa52a7a0aec3b497b2944d6b12ba777b384e898a7f17970e73 SHA512 c4da72cbad3d110e7c259f9fb3cfb7aa249119cff1d88cef977e6f6e80adfd8afa1e88abd663cceb332b692e57679a3c9816f8ce4fbbbc99c44d76eaf1647787 +EBUILD ppp-2.4.8-r1.ebuild 7074 BLAKE2B 9558373d9c3085d467129a7db9e5cd71e4152db277bee60f2fed3e38fb5984161f3376d0984784780cd5f2b655cb3010f49e48bcb51f50ba1a75f4b5a79c84ce SHA512 417915cce1745ced30a0a1c0e443b42069b1fee3949ddd55e88bab5540d74ce4db08d8aac02c43d32db23b6d38886410c478262a1f16c3731037710305024b5d +EBUILD ppp-2.4.9-r2.ebuild 7139 BLAKE2B 9bcb37f8a5f24d64b6930558c303a348a9c3b41ade3b37d542c6d41250e7fcb6456e21b67431ef310dc3bbde72274cd6ee83bcff2d9531b9e9f78539684be5d0 SHA512 28e58fabab0f5e6655d7c1242d2b05013692101e57f6a4d31ec6eceb88666187f9d999ca7869d8d9338e493c961ccfa7d126ce2a5889d695e4f10dd9d0ce6f5e 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 new file mode 100644 index 000000000000..387ac5a6dbd3 --- /dev/null +++ b/net-dialup/ppp/ppp-2.4.8-r1.ebuild @@ -0,0 +1,233 @@ +# 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 libressl pam radius" + +DEPEND=" + activefilter? ( net-libs/libpcap ) + atm? ( net-dialup/linux-atm ) + pam? ( sys-libs/pam ) + gtk? ( x11-libs/gtk+:2 ) + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) +" +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.8.ebuild b/net-dialup/ppp/ppp-2.4.8.ebuild deleted file mode 100644 index e0bd7d646d70..000000000000 --- a/net-dialup/ppp/ppp-2.4.8.ebuild +++ /dev/null @@ -1,231 +0,0 @@ -# Copyright 1999-2020 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 libressl pam radius" - -DEPEND=" - activefilter? ( net-libs/libpcap ) - atm? ( net-dialup/linux-atm ) - pam? ( sys-libs/pam ) - gtk? ( x11-libs/gtk+:2 ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) -" -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 - - pamd_mimic_system ppp auth account session - - 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-r1.ebuild b/net-dialup/ppp/ppp-2.4.9-r1.ebuild deleted file mode 100644 index 89627e1475da..000000000000 --- a/net-dialup/ppp/ppp-2.4.9-r1.ebuild +++ /dev/null @@ -1,233 +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_TARBALL_NAME="${PN}-2.4.9-patches-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/${PATCH_TARBALL_NAME}.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 gtk ipv6 libressl pam radius" - -DEPEND=" - activefilter? ( net-libs/libpcap ) - atm? ( net-dialup/linux-atm ) - pam? ( sys-libs/pam ) - gtk? ( x11-libs/gtk+:2 ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) -" -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 PKG_CONFIG - emake COPTS="${CFLAGS} -D_GNU_SOURCE" CC="$(tc-getCC)" - - # 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/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 - - pamd_mimic_system ppp auth account session - - 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/pppoe/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 pppoe plugin)" - local WARNING_PACKET="CONFIG_PACKET:\t missing AF_PACKET support (optional, used by 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:^rp-\(pppoe.so\):\1:" "${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." - - if [[ -n ${REPLACING_VERSIONS} ]] ; then - ewarn '"rp-pppoe.so" plugin has been renamed to "pppoe.so"' - fi -} diff --git a/net-dialup/ppp/ppp-2.4.9-r2.ebuild b/net-dialup/ppp/ppp-2.4.9-r2.ebuild new file mode 100644 index 000000000000..ac481c696fb5 --- /dev/null +++ b/net-dialup/ppp/ppp-2.4.9-r2.ebuild @@ -0,0 +1,235 @@ +# 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_TARBALL_NAME="${PN}-2.4.9-patches-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/${PATCH_TARBALL_NAME}.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 gtk ipv6 libressl pam radius" + +DEPEND=" + activefilter? ( net-libs/libpcap ) + atm? ( net-dialup/linux-atm ) + pam? ( sys-libs/pam ) + gtk? ( x11-libs/gtk+:2 ) + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) +" +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 PKG_CONFIG + emake COPTS="${CFLAGS} -D_GNU_SOURCE" CC="$(tc-getCC)" + + # 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/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/pppoe/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 pppoe plugin)" + local WARNING_PACKET="CONFIG_PACKET:\t missing AF_PACKET support (optional, used by 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:^rp-\(pppoe.so\):\1:" "${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." + + if [[ -n ${REPLACING_VERSIONS} ]] ; then + ewarn '"rp-pppoe.so" plugin has been renamed to "pppoe.so"' + fi +} -- cgit v1.2.3