commit:     b1b2708c26923dfa6472089af5172495951ae3a5
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  5 12:25:49 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Jan  5 15:20:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1b2708c

net-dialup/ppp: Bump to version 2.4.9

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net-dialup/ppp/Manifest         |   2 +
 net-dialup/ppp/ppp-2.4.9.ebuild | 233 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 235 insertions(+)

diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 93b9820023d..5ac15a69943 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,3 +1,5 @@
 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-01.tar.xz 17856 BLAKE2B 
f344f0a17b98c87414bd5b3050da32f00812792bcb0b59fe88622c9bbff8f5919529628f4bd218ead9f243f7664673e9b83f2557698759f1253fd8d7bbbc7fb1
 SHA512 
be2b17400420829451a7c42f7d89e3349cc26830ce3e816852a25faba1ea4585a5b2c5c727df957a746b800eb7f9c44a00ab5cff93d61793933cadfc8202fbf1
+DIST ppp-2.4.9.tar.gz 719904 BLAKE2B 
7ba3eb8c98fec5599635dbd302399617e1075f3a1df090f1a94ce2bb8a5c7631e6eea82246adc33711aba5fe95e7ba7c982e2cbf1fb0d71e45f877d9b092ffb7
 SHA512 
c309f8f69f534c05547cd2f66dade0e0f198ea4c2928a7e899e660280786b3e965437a67b8c5bb81c59d0fa1818b4eb7b701d2dce015a420d380422d2bca4e1a
 DIST ppp-dhcpc.tgz 33497 BLAKE2B 
ca59130012f007cf45af6bcfa468c112b0d521c8b11f42d42c566dd9de55bd6d6f1b1ceb83cbae18cfe79cb5cb36ba6c6858a4718915acc6987295008aca53da
 SHA512 
aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738

diff --git a/net-dialup/ppp/ppp-2.4.9.ebuild b/net-dialup/ppp/ppp-2.4.9.ebuild
new file mode 100644
index 00000000000..bf179996e7a
--- /dev/null
+++ b/net-dialup/ppp/ppp-2.4.9.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_TARBALL_NAME="${PN}-2.4.9-patches-01"
+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}
+       !<net-misc/netifrc-0.7.1"
+PDEPEND="net-dialup/ppp-scripts"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare() {
+       mv "${WORKDIR}/dhcp" "${S}/pppd/plugins" || die
+
+       eapply "${WORKDIR}"/patches
+
+       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
+
+       # 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/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
+}

Reply via email to