diff --git a/network/connection/ppp/actions.py b/network/connection/ppp/actions.py index fb442cc4f5..6b13cd4611 100644 --- a/network/connection/ppp/actions.py +++ b/network/connection/ppp/actions.py @@ -15,24 +15,24 @@ def setup(): pisitools.dosed("pppd/plugins/dhcp/Makefile.linux", "^(CFLAGS=.+)\s-O2", "\\1 %s" % get.CFLAGS()) # Enable atm - pisitools.dosed("pppd/Makefile.linux", "^#(HAVE_LIBATM=yes)", "\\1") + # pisitools.dosed("pppd/Makefile.linux", "^#(HAVE_LIBATM=yes)", "\\1") # Enable pam - pisitools.dosed("pppd/Makefile.linux", "^#(USE_PAM=y)", "\\1") + # pisitools.dosed("pppd/Makefile.linux", "^#(USE_PAM=y)", "\\1") # Enable CBCP - pisitools.dosed("pppd/Makefile.linux", "^#(CBCP=y)", "\\1") + # pisitools.dosed("pppd/Makefile.linux", "^#(CBCP=y)", "\\1") # Enable IPv6 - pisitools.dosed("pppd/Makefile.linux", "^#(HAVE_INET6)", "\\1") + # pisitools.dosed("pppd/Makefile.linux", "^#(HAVE_INET6)", "\\1") # Enable dhcp - pisitools.dosed("pppd/plugins/Makefile.linux", "^(SUBDIRS\s:=.+)", "\\1 dhcp") + # pisitools.dosed("pppd/plugins/Makefile.linux", "^(SUBDIRS\s:=.+)", "\\1 dhcp") - autotools.configure() + autotools.configure("--enable-cbcp --enable-ipv6cp=yes") def build(): autotools.make() def install(): # The build mechanism is crap. Don't remove \/usr from DESTDIR or else the paths will fail - autotools.rawInstall("DESTDIR=%s/usr INSTROOT=%s install-etcppp" % ((get.installDIR(),)*2)) + autotools.rawInstall("DESTDIR=%s INSTROOT=%s" % ((get.installDIR(),)*2)) # No suid libraries shelltools.chmod("%s/usr/lib/pppd/%s/*.so" % (get.installDIR(),get.srcVERSION()), 0755) diff --git a/network/connection/ppp/pspec.xml b/network/connection/ppp/pspec.xml index c7b192a5d0..c4976b3b7b 100644 --- a/network/connection/ppp/pspec.xml +++ b/network/connection/ppp/pspec.xml @@ -13,26 +13,26 @@ service Point-to-point protocol - patched for PPPOE The Point-to-Point Protocol (PPP) provides a standard way to transmit datagrams over a serial link. - https://www.samba.org/ftp/ppp/ppp-2.4.9.tar.gz - http://distfiles.gentoo.org/distfiles/ppp-dhcpc.tgz + https://www.samba.org/ftp/ppp/ppp-2.5.0.tar.gz + http://distfiles.gentoo.org/distfiles/ppp-dhcpc.tgz libpcap-devel openssl-devel pam-devel - gentoo/0001-Change-Make-vars-to-work-in-Gentoo-builds.patch + gentoo/0002-Use-internal-implementation-of-logwtmp-function.patch - gentoo/0003-Add-MPLSCP-support.patch - gentoo/0004-smarter-killaddr.patch - gentoo/0005-Improve-waiting-for-children-on-exit.patch - gentoo/0006-Remove-one-of-the-2-pidfiles-pidfilename-or-linkpidf.patch - gentoo/0007-Run-etc-ppp-auth-fail-script-if-exists-and-authentic.patch + + + + + gentoo/0008-Try-to-create-dev-ppp-if-not-available.patch - gentoo/0009-passwordfd-read-early.patch - gentoo/0010-Add-option-to-ask-peer-for-WINS-address.patch - gentoo/0011-Log-connect-errors-to-var-log-ppp-connect-errors.patch - gentoo/0012-Don-t-hang-when-starting-pppoe-connection-without-se.patch + + + + gentoo/0013-Add-defaultmetric-as-compatibility-option-name.patch gentoo/0014-Warn-user-of-deprecated-option-defaultmetric.patch gentoo/85_all_dhcp-make-vars.patch @@ -81,6 +81,13 @@ + + 2023-04-04 + 2.5.0 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2021-02-25 2.4.9