From 752d6256e5204b958b0ef7905675a940b5e9172f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 12 May 2022 16:42:50 +0300 Subject: gentoo resync : 12.05.2022 --- net-dialup/ppp/Manifest | 4 +- .../ppp/files/ppp-2.4.9-fix-MPPE-sstpc.patch | 25 ++ net-dialup/ppp/ppp-2.4.9-r4.ebuild | 244 -------------------- net-dialup/ppp/ppp-2.4.9-r6.ebuild | 253 ++++++++++++++++++++ net-dialup/ppp/ppp-2.4.9-r7.ebuild | 254 +++++++++++++++++++++ 5 files changed, 535 insertions(+), 245 deletions(-) create mode 100644 net-dialup/ppp/files/ppp-2.4.9-fix-MPPE-sstpc.patch delete mode 100644 net-dialup/ppp/ppp-2.4.9-r4.ebuild create mode 100644 net-dialup/ppp/ppp-2.4.9-r6.ebuild create mode 100644 net-dialup/ppp/ppp-2.4.9-r7.ebuild (limited to 'net-dialup/ppp') diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest index fb86d4b4a14f..7264fcd81f39 100644 --- a/net-dialup/ppp/Manifest +++ b/net-dialup/ppp/Manifest @@ -1,8 +1,10 @@ AUX README.mpls 530 BLAKE2B 21d57668272eb02c994d0ae38a9895f095ad024bab1613995313480f5d314a5772c30bb0edb1032658993d897b58f5d2744abbc43e0416e63d8fe27dfc968819 SHA512 2b617365fce74cceeb14e53f476b454c4420273661050d25e1c524cf5d56a7554318a268f7b9ebb100592b61a01d274efaeed28abb9ca0adaeb71ef981201b36 AUX modules.ppp 299 BLAKE2B d5c0dcf135dd0a33288f27c95133d4dc980b84dc62bf8eca5b35040f4bfa5d0480cddc48263f390be8df0e0d8de704a62c490172b523612dd945a284e374372f SHA512 58bf5d6d286a08bd6dd595b39ee425efedd5745dddf33a9c90505891546eb46f4cf1306d83911bef61bc4611816aa0f6aef5d3e0f14c2f4ddd0a588780570041 +AUX ppp-2.4.9-fix-MPPE-sstpc.patch 1008 BLAKE2B 255ac4374ef4845220c8c0709a0582fbc9dbb6c423d11b8132607c9bd39517e4e2c830a75ba35b27bba975c245f2e86d08bd9280b4ab0bc184e30db15179118d SHA512 cb16688634e4b6332b728511e0a70f80e7e29fdcc6b0d737745200381cc272daae80ddadd9f5fe4259113453596fd261f52249f80521b63506095a312c5bff33 DIST ppp-2.4.9-patches-03.tar.xz 18520 BLAKE2B b3da095672fa57727ba11a5dba761ea3f24ee330f27252f0379dab5761d5381809176faafed86d97a6b89cc8a4cb958baa07f4900e22fe6e76b6c852e0703f0c SHA512 9a035acf1915225340c12e6242f0c5db399b5f5970888d7f1799a5f125cf97b95d9fcb8c9aa2f6bd56c1544d2b10585f772d4fc1025002e3e8403011e3d2c029 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.9-r4.ebuild 7384 BLAKE2B 405c4ec32ad0e0913addd6f23bbc82222fb2e58bfee35f6ed8ce3ccd09f694559e22186c66e980dec33ce636e3cd9188660502bb8512925c1abde9c08fc20fea SHA512 19830cae579f86a05a730536198f31b5f748f12a7aaf53b61922aa030fe4c8fd31599fd78c6eb27b917de291210573e7dc437a9c5c65949683f1a7909975457a EBUILD ppp-2.4.9-r5.ebuild 7546 BLAKE2B f3f5a24b4a0ee7d706e10e1f5283d09f5622737ece4e71444336244725ddf4893269689b0c7b7f5f7b8b070186a4012eec0b68ff1cdabfc3ce21ee67aeec130e SHA512 5f886041a674f9b0ed15f40ef93475345e64d2bdd9bba5f81a6dccdc406e96d824411901b13bb10d43359eb6e6eec80a8f01a53c31b2c7df9a6bb1d1a78c9ab2 +EBUILD ppp-2.4.9-r6.ebuild 7652 BLAKE2B f57e3410de49bc40aa9ab5655995653a4978ac23c7bb267b16a48e447c57b744646d1e2863fae6b7d7426ae019d51ffd1674412cc83471928ec648c5d06ff156 SHA512 5fe8afc84d2e44b191a9f3588088183ffa7b71eed733c6129e4b158f96840da2964fb9654042d41e21410ec607caef188da370ee853d9b8e696a10701e144231 +EBUILD ppp-2.4.9-r7.ebuild 7700 BLAKE2B 6c979e1644feda497488be063770a38029ba90998da15079e447facf075057388f601adbe34b037e12246d3153ebef6f934f7b3ec1a8645020a5599dcde91e0e SHA512 76f67451ab738424584c0f5d6edec4aa5713cdddeebe27dfad805277b2eedb9fe4e6d65601c3203f587597a3af4d087e9e250d579942faf7e801962f43eba82e MISC metadata.xml 1097 BLAKE2B 3d78c2f7a4c8e17834d8eb4f7763d1cc7f03154f8e5ccb5c7da948e01bc43467df928cdd0f946244d7c17bc53755962151a3e0247e802c4b42f713f415009e44 SHA512 0d1d82342808d9a599004e66874fe2b661857d0a55d2db56ef853011829dc8dc5924378364fc1069b666a9f0132617e0c00b822efecfbd82b9f54e6cee39f45c diff --git a/net-dialup/ppp/files/ppp-2.4.9-fix-MPPE-sstpc.patch b/net-dialup/ppp/files/ppp-2.4.9-fix-MPPE-sstpc.patch new file mode 100644 index 000000000000..15a1298ce303 --- /dev/null +++ b/net-dialup/ppp/files/ppp-2.4.9-fix-MPPE-sstpc.patch @@ -0,0 +1,25 @@ +https://github.com/ppp-project/ppp/commit/d7e62a8499c4032d79e05afbd8fd3efd51c5b148 +https://bugs.launchpad.net/ubuntu/+source/ppp/+bug/1958196 + +From: =?UTF-8?q?Eivind=20N=C3=A6ss?= +Date: Thu, 3 Feb 2022 14:28:22 -0800 +Subject: [PATCH] pppd/eap: Fix bug causing incorrect response length (#334) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Need to update the esp->ea_client.ea_namelen variable. A plugin can override the +name of the user, and the variable is passed onto the eap_chap2_response generating +the wrong response length. + +Signed-off-by: Eivind Næss +--- a/pppd/eap.c ++++ b/pppd/eap.c +@@ -2182,6 +2182,7 @@ eap_request(eap_state *esp, u_char *inp, int id, int len) + eap_send_nak(esp, id, EAPT_SRP); + break; + } ++ esp->es_client.ea_namelen = strlen(esp->es_client.ea_name); + + /* Create the MSCHAPv2 response (and add to cache) */ + unsigned char response[MS_CHAP2_RESPONSE_LEN+1]; // VLEN + VALUE diff --git a/net-dialup/ppp/ppp-2.4.9-r4.ebuild b/net-dialup/ppp/ppp-2.4.9-r4.ebuild deleted file mode 100644 index 6459f5145ad8..000000000000 --- a/net-dialup/ppp/ppp-2.4.9-r4.ebuild +++ /dev/null @@ -1,244 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-info pam toolchain-funcs - -PATCH_TARBALL_NAME="${PN}-2.4.9-patches-03" -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 +eap-tls gtk ipv6 pam radius" - -DEPEND=" - dev-libs/openssl:0= - virtual/libcrypt:= - activefilter? ( net-libs/libpcap ) - atm? ( net-dialup/linux-atm ) - gtk? ( x11-libs/gtk+:2 ) - pam? ( sys-libs/pam ) -" -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 - - if ! use eap-tls ; then - einfo "Disabling EAP-TLS pppd auth support" - sed -i '/^USE_EAPTLS=y/s:^:#:' pppd/Makefile.linux || die - einfo "Disabling EAP-TLS plugin support" - sed -i '/^CFLAGS += -DUSE_EAPTLS=1/s:^:#:' \ - 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 CC="${CC}" 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/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 -} diff --git a/net-dialup/ppp/ppp-2.4.9-r6.ebuild b/net-dialup/ppp/ppp-2.4.9-r6.ebuild new file mode 100644 index 000000000000..768c97c176e6 --- /dev/null +++ b/net-dialup/ppp/ppp-2.4.9-r6.ebuild @@ -0,0 +1,253 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit linux-info pam toolchain-funcs + +PATCH_TARBALL_NAME="${PN}-2.4.9-patches-03" +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 +eap-tls gtk ipv6 pam radius systemd" + +DEPEND=" + dev-libs/openssl:0= + virtual/libcrypt:= + activefilter? ( net-libs/libpcap ) + atm? ( net-dialup/linux-atm ) + gtk? ( x11-libs/gtk+:2 ) + pam? ( sys-libs/pam ) + systemd? ( sys-apps/systemd ) +" +RDEPEND="${DEPEND} + != 5.15 + sed -i 's/-DIPX_CHANGE //' pppd/Makefile.linux || die + + if use atm ; then + einfo "Enabling PPPoATM support" + sed -i '/^#HAVE_LIBATM=yes/s:#::' \ + pppd/plugins/pppoatm/Makefile.linux || die + fi + + if ! use activefilter ; then + einfo "Disabling active filter" + sed -i '/^FILTER=y/s:^:#:' pppd/Makefile.linux || die + fi + + if use pam ; then + einfo "Enabling PAM" + sed -i '/^#USE_PAM=y/s:^#::' pppd/Makefile.linux || die + fi + + if ! use ipv6 ; then + einfo "Disabling IPv6" + sed -i '/^HAVE_INET6/s:^:#:' pppd/Makefile.linux || die + else + echo "+ipv6" >> 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 + + if ! use eap-tls ; then + einfo "Disabling EAP-TLS pppd auth support" + sed -i '/^USE_EAPTLS=y/s:^:#:' pppd/Makefile.linux || die + einfo "Disabling EAP-TLS plugin support" + sed -i '/^CFLAGS += -DUSE_EAPTLS=1/s:^:#:' \ + 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 + + if use systemd ; then + einfo "Enabling systemd notification" + sed '/SYSTEMD=/s@^#@@' -i pppd/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 CC="${CC}" 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/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 +} diff --git a/net-dialup/ppp/ppp-2.4.9-r7.ebuild b/net-dialup/ppp/ppp-2.4.9-r7.ebuild new file mode 100644 index 000000000000..560d483d8dc4 --- /dev/null +++ b/net-dialup/ppp/ppp-2.4.9-r7.ebuild @@ -0,0 +1,254 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit linux-info pam toolchain-funcs + +PATCH_TARBALL_NAME="${PN}-2.4.9-patches-03" +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 +eap-tls gtk ipv6 pam radius systemd" + +DEPEND=" + dev-libs/openssl:0= + virtual/libcrypt:= + activefilter? ( net-libs/libpcap ) + atm? ( net-dialup/linux-atm ) + gtk? ( x11-libs/gtk+:2 ) + pam? ( sys-libs/pam ) + systemd? ( sys-apps/systemd ) +" +RDEPEND="${DEPEND} + != 5.15 + sed -i 's/-DIPX_CHANGE //' pppd/Makefile.linux || die + + if use atm ; then + einfo "Enabling PPPoATM support" + sed -i '/^#HAVE_LIBATM=yes/s:#::' \ + pppd/plugins/pppoatm/Makefile.linux || die + fi + + if ! use activefilter ; then + einfo "Disabling active filter" + sed -i '/^FILTER=y/s:^:#:' pppd/Makefile.linux || die + fi + + if use pam ; then + einfo "Enabling PAM" + sed -i '/^#USE_PAM=y/s:^#::' pppd/Makefile.linux || die + fi + + if ! use ipv6 ; then + einfo "Disabling IPv6" + sed -i '/^HAVE_INET6/s:^:#:' pppd/Makefile.linux || die + else + echo "+ipv6" >> 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 + + if ! use eap-tls ; then + einfo "Disabling EAP-TLS pppd auth support" + sed -i '/^USE_EAPTLS=y/s:^:#:' pppd/Makefile.linux || die + einfo "Disabling EAP-TLS plugin support" + sed -i '/^CFLAGS += -DUSE_EAPTLS=1/s:^:#:' \ + 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 + + if use systemd ; then + einfo "Enabling systemd notification" + sed '/SYSTEMD=/s@^#@@' -i pppd/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 CC="${CC}" 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/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