From 349ef7215e2fd97fa0023b883d067e7688e2865c Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@hotmail.com>
Date: Wed, 28 Jun 2023 19:03:56 +0300
Subject: [PATCH] ppp ver. bump

---
 network/connection/ppp/actions.py | 14 +++++++-------
 network/connection/ppp/pspec.xml  | 30 ++++++++++++------------------
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/network/connection/ppp/actions.py b/network/connection/ppp/actions.py
index fb442cc4f5..2f347386dc 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-multilink")
 
 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 install" % ((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 d8e519ef04..406082da3b 100644
--- a/network/connection/ppp/pspec.xml
+++ b/network/connection/ppp/pspec.xml
@@ -13,30 +13,17 @@
         <IsA>service</IsA>
         <Summary>Point-to-point protocol - patched for PPPOE</Summary>
         <Description>The Point-to-Point Protocol (PPP) provides a standard way to transmit datagrams over a serial link.</Description>
-        <Archive sha1sum="56ba143f331f6436efa3a1d41c75691c828833ba" type="targz">https://www.samba.org/ftp/ppp/ppp-2.4.9.tar.gz</Archive>
-        <Archive sha1sum="1a0b02788d522f2137d0b66c749ffe6c96cceb94" type="targz" target="ppp-2.4.9/pppd/plugins">http://distfiles.gentoo.org/distfiles/ppp-dhcpc.tgz</Archive>
+        <Archive sha1sum="ba61ad4abc310a7fae32f3440c239a39cba1b5b1" type="targz">https://www.samba.org/ftp/ppp/ppp-2.5.0.tar.gz</Archive>
+        <Archive sha1sum="1a0b02788d522f2137d0b66c749ffe6c96cceb94" type="targz" target="ppp-2.5.0/pppd/plugins">http://distfiles.gentoo.org/distfiles/ppp-dhcpc.tgz</Archive>
         <BuildDependencies>
             <Dependency>libpcap-devel</Dependency>
             <Dependency>openssl-devel</Dependency>
             <Dependency>pam-devel</Dependency>
         </BuildDependencies>
         <Patches>
-            <Patch level="1">gentoo/0001-Change-Make-vars-to-work-in-Gentoo-builds.patch</Patch>
-            <Patch level="1">gentoo/0002-Use-internal-implementation-of-logwtmp-function.patch</Patch>
-            <Patch level="1">gentoo/0003-Add-MPLSCP-support.patch</Patch>
-            <Patch level="1">gentoo/0004-smarter-killaddr.patch</Patch>
-            <Patch level="1">gentoo/0005-Improve-waiting-for-children-on-exit.patch</Patch>
-            <Patch level="1">gentoo/0006-Remove-one-of-the-2-pidfiles-pidfilename-or-linkpidf.patch</Patch>
-            <Patch level="1">gentoo/0007-Run-etc-ppp-auth-fail-script-if-exists-and-authentic.patch</Patch>
-            <Patch level="1">gentoo/0008-Try-to-create-dev-ppp-if-not-available.patch</Patch>
-            <Patch level="1">gentoo/0009-passwordfd-read-early.patch</Patch>
-            <Patch level="1">gentoo/0010-Add-option-to-ask-peer-for-WINS-address.patch</Patch>
-            <Patch level="1">gentoo/0011-Log-connect-errors-to-var-log-ppp-connect-errors.patch</Patch>
-            <Patch level="1">gentoo/0012-Don-t-hang-when-starting-pppoe-connection-without-se.patch</Patch>
-            <Patch level="1">gentoo/0013-Add-defaultmetric-as-compatibility-option-name.patch</Patch>
-            <Patch level="1">gentoo/0014-Warn-user-of-deprecated-option-defaultmetric.patch</Patch>
-            <Patch level="1">gentoo/85_all_dhcp-make-vars.patch</Patch>
-            <Patch level="1">gentoo/86_all_dhcp-sys_error_to_strerror.patch</Patch>
+<!--             <Patch level="1">gentoo/0001-Change-Make-vars-to-work-in-Gentoo-builds.patch</Patch> -->
+<!--             <Patch level="1">gentoo/0002-Use-internal-implementation-of-logwtmp-function.patch</Patch> -->
+<!--             <Patch level="1">gentoo/0003-Add-MPLSCP-support.patch</Patch> -->
         </Patches>
     </Source>
 
@@ -81,6 +68,13 @@
     </Package>
 
     <History>
+        <Update release="9">
+            <Date>2023-06-23</Date>
+            <Version>2.5.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="8">
             <Date>2023-04-19</Date>
             <Version>2.4.9</Version>