Fri Sep 20 19:25:40 UTC 2024HEAD20240920192540master

a/dracut-103-x86_64-2.txz:  Rebuilt.
  Include /etc/dracut.conf.d/elogind.conf to handle uaccess rules correctly.
  Thanks to LuckyCyborg.
l/cairo-1.18.2-x86_64-2.txz:  Rebuilt.
  [PATCH] cff: Don't fail if no local subs.
  Fixes printing PDFs with CUPS. Thanks to pee_bee and reddog83.
l/glib2-2.82.1-x86_64-1.txz:  Upgraded.
l/pipewire-1.2.4-x86_64-1.txz:  Upgraded.
n/NetworkManager-1.48.10-x86_64-2.txz:  Rebuilt.
  Rebuilt to pick up the new plugin directory for ppp-2.5.1.
n/bind-9.20.2-x86_64-1.txz:  Upgraded.
n/openssh-9.9p1-x86_64-1.txz:  Upgraded.
  Future deprecation notice: OpenSSH plans to remove support for the DSA
  signature algorithm in early 2025. For now, this package retains DSA
  support, but plan accordingly.
n/ppp-2.5.1-x86_64-1.txz:  Upgraded.
n/rp-pppoe-4.0-x86_64-1.txz:  Upgraded.
  Upstream has removed "ancient crufty scripts," so see HOW-TO-CONNECT in the
  documentation if you were using those to connect previously.

21 files changed, 119 insertions, 644 deletions

diff --git a/source/a/dracut/doinst.sh b/source/a/dracut/doinst.sh
new file mode 100644
index 000000000..89ec66020
--- /dev/null
+++ b/source/a/dracut/doinst.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+config() {
+  NEW="$1"
+  OLD="`dirname $NEW`/`basename $NEW .new`"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/dracut.conf.d/elogind.conf.new
diff --git a/source/a/dracut/dracut.SlackBuild b/source/a/dracut/dracut.SlackBuild
index 0c4fcf873..182385a29 100755
--- a/source/a/dracut/dracut.SlackBuild
+++ b/source/a/dracut/dracut.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=dracut
 SRCNAM=dracut-ng
 VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -97,6 +97,9 @@ CXXFLAGS="$SLKCFLAGS" \
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
+# Include elogind-uaccess-command to allow processing uaccess rules correctly:
+cat $CWD/elogind.conf | sed "s#/lib/#/lib${LIBDIRSUFFIX}/#g" > $PKG/etc/dracut.conf.d/elogind.conf.new
+
 # Don't ship .la files:
 rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
@@ -117,6 +120,7 @@ cp -a \
   $PKG/usr/doc/${PKGNAM}-$VERSION
 
 mkdir -p $PKG/install
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
diff --git a/source/a/dracut/elogind.conf b/source/a/dracut/elogind.conf
new file mode 100644
index 000000000..f944528c2
--- /dev/null
+++ b/source/a/dracut/elogind.conf
@@ -0,0 +1 @@
+install_items="/lib/elogind/elogind-uaccess-command"
diff --git a/source/l/cairo/595.patch b/source/l/cairo/595.patch
new file mode 100644
index 000000000..ed1056a0c
--- /dev/null
+++ b/source/l/cairo/595.patch
@@ -0,0 +1,34 @@
+From f19e2fe080ddcfce93c8234a919fd882f3d63362 Mon Sep 17 00:00:00 2001
+From: Adrian Johnson <ajohnson@redneon.com>
+Date: Fri, 13 Sep 2024 06:28:39 +0930
+Subject: [PATCH] cff: Don't fail if no local subs
+
+Fixes: #870
+---
+ src/cairo-cff-subset.c | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/src/cairo-cff-subset.c b/src/cairo-cff-subset.c
+index 076cb2b0a..8a7de0065 100644
+--- a/src/cairo-cff-subset.c
++++ b/src/cairo-cff-subset.c
+@@ -952,9 +952,13 @@ cairo_cff_font_read_private_dict (cairo_cff_font_t   *font,
+ 	 decode_number (operand, nominal_width);
+ 
+     num_subs = _cairo_array_num_elements (local_sub_index);
+-    *local_subs_used = _cairo_calloc_ab (num_subs, sizeof (cairo_bool_t));
+-    if (unlikely (*local_subs_used == NULL))
+-	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
++    if (num_subs > 0) {
++	*local_subs_used = _cairo_calloc_ab (num_subs, sizeof (cairo_bool_t));
++	if (unlikely (*local_subs_used == NULL))
++	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
++    } else {
++	*local_subs_used = NULL;
++    }
+ 
+     if (num_subs < 1240)
+ 	*local_sub_bias = 107;
+-- 
+GitLab
+
diff --git a/source/l/cairo/cairo.SlackBuild b/source/l/cairo/cairo.SlackBuild
index 1da04d0e7..e3926ce64 100755
--- a/source/l/cairo/cairo.SlackBuild
+++ b/source/l/cairo/cairo.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=cairo
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -73,6 +73,9 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
+# Fix cups printing:
+cat $CWD/595.patch | patch -p1 --verbose || exit 1
+
 # Configure, build, and install:
 export CFLAGS="$SLKCFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
diff --git a/source/l/pipewire/pipewire.url b/source/l/pipewire/pipewire.url
index 2d87a1646..04ebedaf3 100644
--- a/source/l/pipewire/pipewire.url
+++ b/source/l/pipewire/pipewire.url
@@ -1,2 +1,2 @@
 https://gitlab.freedesktop.org/pipewire/pipewire
-https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/1.2.3/pipewire-1.2.3.tar.gz
+https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/1.2.4/pipewire-1.2.4.tar.gz
diff --git a/source/n/NetworkManager/NetworkManager.SlackBuild b/source/n/NetworkManager/NetworkManager.SlackBuild
index 6b1ff7cf5..200ea0242 100755
--- a/source/n/NetworkManager/NetworkManager.SlackBuild
+++ b/source/n/NetworkManager/NetworkManager.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=NetworkManager
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )
diff --git a/source/n/openssh/openssh.SlackBuild b/source/n/openssh/openssh.SlackBuild
index d5dd2cea3..9a53a6098 100755
--- a/source/n/openssh/openssh.SlackBuild
+++ b/source/n/openssh/openssh.SlackBuild
@@ -2,7 +2,7 @@
 
 # Copyright 2000 BSDi, Inc. Concord, CA, USA
 # Copyright 2001, 2002, 2003, 2004  Slackware Linux, Inc. Concord, CA, USA
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2018, 2020, 2021, 2023  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2018, 2020, 2021, 2023, 2024  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -30,14 +30,14 @@ PKG=$TMP/package-openssh
 
 PKGNAM=openssh
 VERSION=${VERSION:-$(echo openssh-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i586 ;;
+    i?86) export ARCH=i686 ;;
     arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
@@ -52,21 +52,12 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   exit 0
 fi
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
+if [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=pentium4 -mtune=generic"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC"
   LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "arm" ]; then
-  SLKCFLAGS="-O2 -march=armv4 -mtune=xscale"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "armel" ]; then
-  SLKCFLAGS="-O2 -march=armv4t"
-  LIBDIRSUFFIX=""
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
@@ -113,6 +104,7 @@ CFLAGS="$SLKCFLAGS" \
   --with-default-path=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin \
   --with-privsep-path=/var/empty \
   --with-privsep-user=sshd \
+  --enable-dsa-keys \
   --build=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || make || exit 1
diff --git a/source/n/ppp/doinst.sh b/source/n/ppp/doinst.sh
index 3a74db67c..fa67ed922 100644
--- a/source/n/ppp/doinst.sh
+++ b/source/n/ppp/doinst.sh
@@ -11,10 +11,7 @@ config() {
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
-if [ -r etc/pam.d/ppp.new ]; then
-  config etc/pam.d/ppp.new
-fi
-
+config etc/pam.d/ppp.new
 config etc/ppp/chap-secrets.new
 config etc/ppp/options.new
 config etc/ppp/pap-secrets.new
diff --git a/source/n/ppp/options.new b/source/n/ppp/options.new
index 2a0286576..a8f93365d 100644
--- a/source/n/ppp/options.new
+++ b/source/n/ppp/options.new
@@ -1,68 +1,15 @@
 # /etc/ppp/options
 # 
-# $Id: options,v 1.4 1996/05/01 18:57:04 alvar Exp $
-# 
-# Originally created by Jim Knoble <jmknoble@mercury.interpath.net>
-# Modified for Debian by alvar Bray <alvar@meiko.co.uk>
-# Modified for PPP Server setup by Christoph Lameter <clameter@debian.org>
-# Modified for Slackware by Pat Volkerding <volkerdi@slackware.com>
-#
-# Use the command  egrep -v '#|^ *$' /etc/ppp/options to quickly see what 
-# options are active in this file.
-
-# Specify which DNS Servers the incoming Win95 or WinNT Connection should use
-# Two Servers can be remotely configured
-# dns-addr 192.168.1.1
-# dns-addr 192.168.1.2
-
-# Specify which WINS Servers the incoming connection Win95 or WinNT should use
-# wins-addr 192.168.1.50
-# wins-addr 192.168.1.51
-
-# Run the executable or shell command specified after pppd has
-# terminated the link.  This script could, for example, issue commands
-# to the modem to cause it to hang up if hardware modem control signals
-# were not available.
-#disconnect "chat -- \d+++\d\c OK ath0 OK"
 
 # async character map -- 32-bit hex; each bit is a character
 # that needs to be escaped for pppd to receive it.  0x00000001
 # represents '\x01', and 0x80000000 represents '\x1f'.
 asyncmap 0
 
-# Require the peer to authenticate itself before allowing network
-# packets to be sent or received.
-# For a PPP Server with script based logins not using PAP or CHAP
-# you need to disable this setting.
-#auth
-
-# Do not require the other end of the connection to authenticate itself.
-# This option is dangerous if pppd is setuid.
-# If you also have ethernet and are having problems getting PPP to connect
-# over a modem, try this option.
-#noauth
-
 # Use hardware flow control (i.e. RTS/CTS) to control the flow of data
 # on the serial port.
 crtscts
 
-# Use software flow control (i.e. XON/XOFF) to control the flow of data
-# on the serial port.
-#xonxoff
-
-# Specifies that certain characters should be escaped on transmission
-# (regardless of whether the peer requests them to be escaped with its
-# async control character map).  The characters to be escaped are
-# specified as a list of hex numbers separated by commas.  Note that
-# almost any character can be specified for the escape option, unlike
-# the asyncmap option which only allows control characters to be
-# specified.  The characters which may not be escaped are those with hex
-# values 0x20 - 0x3f or 0x5e.
-#escape 11,13,ff
-
-# Don't use the modem control lines.
-#local
-
 # Specifies that pppd should use a UUCP-style lock on the serial device
 # to ensure exclusive access to the device.
 lock
@@ -72,131 +19,11 @@ lock
 # implemented.)
 modem
 
-# Set the MRU [Maximum Receive Unit] value to <n> for negotiation.  pppd
-# will ask the peer to send packets of no more than <n> bytes. The
-# minimum MRU value is 128.  The default MRU value is 1500.  A value of
-# 296 is recommended for slow links (40 bytes for TCP/IP header + 256
-# bytes of data).
-#mru 542
-
-# Set the interface netmask to <n>, a 32 bit netmask in "decimal dot"
-# notation (e.g. 255.255.255.0).
-#netmask 255.255.255.0
-
-# Disables the default behaviour when no local IP address is specified,
-# which is to determine (if possible) the local IP address from the
-# hostname. With this option, the peer will have to supply the local IP
-# address during IPCP negotiation (unless it specified explicitly on the
-# command line or in an options file).
-#noipdefault
-
-# Enables the "passive" option in the LCP.  With this option, pppd will
-# attempt to initiate a connection; if no reply is received from the
-# peer, pppd will then just wait passively for a valid LCP packet from
-# the peer (instead of exiting, as it does without this option).
-#passive
-
-# With this option, pppd will not transmit LCP packets to initiate a
-# connection until a valid LCP packet is received from the peer (as for
-# the "passive" option with old versions of pppd).
-#silent
-
-# Don't request or allow negotiation of any options for LCP and IPCP
-# (use default values).
-#-all
-
-# Disable Address/Control compression negotiation (use default, i.e.
-# address/control field disabled).
-#-ac
-
-# Disable asyncmap negotiation (use the default asyncmap, i.e. escape
-# all control characters).
-#-am
-
-# Don't fork to become a background process (otherwise pppd will do so
-# if a serial device is specified).
-#-detach
-
-# Disable IP address negotiation (with this option, the remote IP
-# address must be specified with an option on the command line or in an
-# options file).
-#-ip
-
-# Disable magic number negotiation.  With this option, pppd cannot
-# detect a looped-back line.
-#-mn
-
-# Disable MRU [Maximum Receive Unit] negotiation (use default, i.e.
-# 1500).
-#-mru
-
-# Disable protocol field compression negotiation (use default, i.e.
-# protocol field compression disabled).
-#-pc
-
-# Require the peer to authenticate itself using PAP.
-#+pap
-
-# Don't agree to authenticate using PAP.
-#-pap
-
-# Require the peer to authenticate itself using CHAP [Cryptographic
-# Handshake Authentication Protocol] authentication.
-#+chap
-
-# Don't agree to authenticate using CHAP.
-#-chap
-
-# Disable negotiation of Van Jacobson style IP header compression (use
-# default, i.e. no compression).
-#-vj
-
-# Increase debugging level (same as -d).  If this option is given, pppd
-# will log the contents of all control packets sent or received in a
-# readable form.  The packets are logged through syslog with facility
-# daemon and level debug. This information can be directed to a file by
-# setting up /etc/syslog.conf appropriately (see syslog.conf(5)).  (If
-# pppd is compiled with extra debugging enabled, it will log messages
-# using facility local2 instead of daemon).
-#debug
-
-# Append the domain name <d> to the local host name for authentication
-# purposes.  For example, if gethostname() returns the name porsche,
-# but the fully qualified domain name is porsche.Quotron.COM, you would
-# use the domain option to set the domain name to Quotron.COM.
-#domain <d>
-
-# Enable debugging code in the kernel-level PPP driver.  The argument n
-# is a number which is the sum of the following values: 1 to enable
-# general debug messages, 2 to request that the contents of received
-# packets be printed, and 4 to request that the contents of transmitted
-# packets be printed.
-#kdebug n
-
-# Set the MTU [Maximum Transmit Unit] value to <n>. Unless the peer
-# requests a smaller value via MRU negotiation, pppd will request that
-# the kernel networking code send data packets of no more than n bytes
-# through the PPP network interface.
-#mtu <n>
-
-# Enforce the use of the hostname as the name of the local system for
-# authentication purposes (overrides the name option).
-#usehostname
-
-# Set the assumed name of the remote system for authentication purposes
-# to <n>.
-#remotename <n>
-
 # Add an entry to this system's ARP [Address Resolution Protocol]
 # table with the IP address of the peer and the Ethernet address of this
 # system.
 proxyarp
 
-# Use the system password database for authenticating the peer using
-# PAP. Note: mgetty already provides this option. If this is specified
-# then dialin from users using a script under Linux to fire up ppp wont work.
-# login
-
 # If this option is given, pppd will send an LCP echo-request frame to
 # the peer every n seconds. Under Linux, the echo-request is sent when
 # no packets have been received from the peer for n seconds. Normally
@@ -213,64 +40,3 @@ lcp-echo-interval 30
 # connection has been broken (e.g., the modem has hung up) in
 # situations where no hardware modem control lines are available.
 lcp-echo-failure 4
-
-# Set the LCP restart interval (retransmission timeout) to <n> seconds
-# (default 3).
-#lcp-restart <n>
-
-# Set the maximum number of LCP terminate-request transmissions to <n>
-# (default 3).
-#lcp-max-terminate <n>
-
-# Set the maximum number of LCP configure-request transmissions to <n>
-# (default 10).
-#lcp-max-configure <n>
-
-# Set the maximum number of LCP configure-NAKs returned before starting
-# to send configure-Rejects instead to <n> (default 10).
-#lcp-max-failure <n>
-
-# Set the IPCP restart interval (retransmission timeout) to <n>
-# seconds (default 3).
-#ipcp-restart <n>
-
-# Set the maximum number of IPCP terminate-request transmissions to <n>
-# (default 3).
-#ipcp-max-terminate <n>
-
-# Set the maximum number of IPCP configure-request transmissions to <n>
-# (default 10).
-#ipcp-max-configure <n>
-
-# Set the maximum number of IPCP configure-NAKs returned before starting
-# to send configure-Rejects instead to <n> (default 10).
-#ipcp-max-failure <n>
-
-# Set the PAP restart interval (retransmission timeout) to <n> seconds
-# (default 3).
-#pap-restart <n>
-
-# Set the maximum number of PAP authenticate-request transmissions to
-# <n> (default 10).
-#pap-max-authreq <n>
-
-# Set the CHAP restart interval (retransmission timeout for
-# challenges) to <n> seconds (default 3).
-#chap-restart <n>
-
-# Set the maximum number of CHAP challenge transmissions to <n>
-# (default 10).
-#chap-max-challenge
-
-# If this option is given, pppd will rechallenge the peer every <n>
-# seconds.
-#chap-interval <n>
-
-# With this option, pppd will accept the peer's idea of our local IP
-# address, even if the local IP address was specified in an option.
-#ipcp-accept-local
-
-# With this option, pppd will accept the peer's idea of its (remote) IP
-# address, even if the remote IP address was specified in an option.
-#ipcp-accept-remote
-
diff --git a/source/n/ppp/ppp.CVE-2015-3310.diff b/source/n/ppp/ppp.CVE-2015-3310.diff
deleted file mode 100644
index ecf53ce49..000000000
--- a/source/n/ppp/ppp.CVE-2015-3310.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./pppd/plugins/radius/util.c.orig	2015-04-17 11:43:59.687374237 -0500
-+++ ./pppd/plugins/radius/util.c	2015-04-17 11:45:12.612379499 -0500
-@@ -77,7 +77,7 @@
-   static unsigned short int cnt = 0;
-   sprintf (buf, "%08lX%04X%02hX",
- 	   (unsigned long int) time (NULL),
--	   (unsigned int) getpid (),
-+	   (unsigned int) getpid () % 65535,
- 	   cnt & 0xFF);
-   cnt++;
-   return buf;
diff --git a/source/n/ppp/ppp.SlackBuild b/source/n/ppp/ppp.SlackBuild
index a71345dbd..c5ff8dd17 100755
--- a/source/n/ppp/ppp.SlackBuild
+++ b/source/n/ppp/ppp.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2013, 2015, 2018, 2020, 2021  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2013, 2015, 2018, 2020, 2021, 2024  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,17 +23,17 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=ppp
-VERSION=2.4.9
+VERSION=2.5.1
 RADVER=1.1.7
 PPPVER=1.98
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i586 ;;
+    i?86) export ARCH=i686 ;;
     arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
@@ -74,38 +74,37 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
-zcat $CWD/ppp.slack.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
 sed -i -e "s#lib/pppd#lib${LIBDIRSUFFIX}/pppd#g" $(grep -lr 'lib/pppd' *)
 
-# This conflicts with the header in 3.5+ kernels:
-rm -f include/linux/if_pppol2tp.h
-
-zcat $CWD/ppp.CVE-2015-3310.diff.gz | patch -p1 --verbose || exit 1
-
-cat $CWD/ppp.gcc14.diff | patch -p1 --verbose || exit 1
-
-# Choose correct options depending on whether PAM is installed:
-if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then
-  PAM_OPTIONS="USE_PAM=y"
-else
-  unset PAM_OPTIONS
+# Configure, build, and install:
+if [ ! -r configure ]; then
+  if [ -x ./autogen.sh ]; then
+    NOCONFIGURE=1 ./autogen.sh
+  else
+    autoreconf -vif
+  fi
 fi
-
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} || exit 1
-
-make $PAM_OPTIONS $NUMJOBS || make $PAM_OPTIONS || exit 1
-make $PAM_OPTIONS install DESTDIR=$PKG/usr || exit 1
-
-if [ ! -z "$PAM_OPTIONS" ]; then
-  mkdir -p $PKG/etc/pam.d
-  cat pppd/ppp.pam > $PKG/etc/pam.d/ppp.new
-fi
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --disable-static \
+  --build=$ARCH-slackware-linux || exit 1
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
 
 # Install PPP config files:
-mkdir -p $PKG/etc/ppp
+rm -f $PKG/etc/ppp/*
 cp -a etc.ppp/* $PKG/etc/ppp
+for file in $PKG/etc/ppp/*.example ; do
+  mv $file $(dirname $file)/$(basename $file .example)
+done
 chmod 600 $PKG/etc/ppp/*secrets
 ( cd $PKG/etc/ppp
   mv chap-secrets chap-secrets.new
@@ -113,22 +112,21 @@ chmod 600 $PKG/etc/ppp/*secrets
   mv pap-secrets pap-secrets.new
 )
 zcat $CWD/options.new.gz > $PKG/etc/ppp/options.new
+mkdir -p $PKG/etc/pam.d
+cat pppd/ppp.pam > $PKG/etc/pam.d/ppp.new
 
-# Fix what seems like an insecure default setting.
-# Feel free to "chmod 4750 pppoatm.so rp-pppoe.so" at your own risk.
-# Since they are only runnable by group root, the risk really isn't much...
-chmod 755 $PKG/usr/lib${LIBDIRSUFFIX}/pppd/*/*.so
-
-# The Makefile doesn't error out if building rp-pppoe.so fails, so check for it:
-if [ ! -r $PKG/usr/lib${LIBDIRSUFFIX}/pppd/${VERSION}/rp-pppoe.so ]; then
-  echo "FATAL: /usr/lib${LIBDIRSUFFIX}/pppd/${VERSION}/rp-pppoe.so failed to build."
+# The Makefile doesn't error out if building pppoe.so fails, so check for it:
+if [ ! -r $PKG/usr/lib${LIBDIRSUFFIX}/pppd/${VERSION}/pppoe.so ]; then
+  echo "FATAL: /usr/lib${LIBDIRSUFFIX}/pppd/${VERSION}/pppoe.so failed to build."
   exit 1
 fi
 
 mkdir -p $PKG/usr/doc/ppp-$VERSION
 cp -a \
-  FAQ PLUGINS README* SETUP scripts \
+  AUTHORS* COPYING* ChangeLog* FAQ* LICENSE* NEWS* PLUGINS* README* SECURITY* SETUP* Submitting-patches* \
+  scripts \
   $PKG/usr/doc/ppp-$VERSION
+rm -f $PKG/usr/doc/ppp-$VERSION/scripts/Makefile*
 
 echo "+====================+"
 echo "| freeradius-client-$RADVER |"
@@ -182,7 +180,7 @@ cp -a \
   $PKG/usr/doc/pppsetup
 
 # Don't ship .la files:
-rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+find $PKG -name "*.la" -exec rm -f "{}" \;
 
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
diff --git a/source/n/ppp/ppp.gcc14.diff b/source/n/ppp/ppp.gcc14.diff
deleted file mode 100644
index a8c12efc8..000000000
--- a/source/n/ppp/ppp.gcc14.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./configure.orig	2021-01-04 17:06:37.000000000 -0600
-+++ ./configure	2024-05-10 20:18:35.477503626 -0500
-@@ -20,7 +20,7 @@
-     makext="linux";
-     ksrc="linux";
-     state="known";
--    CFLAGS="-O2 -g -pipe";;
-+    CFLAGS="-O2 -g -pipe -Wno-error=incompatible-pointer-types";;
-   SunOS)
-     karch=`/usr/bin/isainfo -k`
-     case $release in
diff --git a/source/n/ppp/ppp.slack.diff b/source/n/ppp/ppp.slack.diff
deleted file mode 100644
index 585247d7c..000000000
--- a/source/n/ppp/ppp.slack.diff
+++ /dev/null
@@ -1,86 +0,0 @@
---- ./chat/Makefile.linux.orig	2021-01-04 17:06:37.000000000 -0600
-+++ ./chat/Makefile.linux	2021-01-25 12:56:35.570645743 -0600
-@@ -4,7 +4,7 @@
- 
- DESTDIR = $(INSTROOT)@DESTDIR@
- BINDIR = $(DESTDIR)/sbin
--MANDIR = $(DESTDIR)/share/man/man8
-+MANDIR = $(DESTDIR)/man/man8
- 
- CDEF1=	-DTERMIOS			# Use the termios structure
- CDEF2=	-DSIGTYPE=void			# Standard definition
---- ./pppdump/Makefile.linux.orig	2021-01-04 17:06:37.000000000 -0600
-+++ ./pppdump/Makefile.linux	2021-01-25 12:56:35.570645743 -0600
-@@ -4,7 +4,7 @@
- 
- DESTDIR = $(INSTROOT)@DESTDIR@
- BINDIR = $(DESTDIR)/sbin
--MANDIR = $(DESTDIR)/share/man/man8
-+MANDIR = $(DESTDIR)/man/man8
- 
- CFLAGS = $(COPTS) -I../include/net
- OBJS = pppdump.o bsd-comp.o deflate.o zlib.o
---- ./pppd/Makefile.linux.orig	2021-01-04 17:06:37.000000000 -0600
-+++ ./pppd/Makefile.linux	2021-01-25 12:56:35.570645743 -0600
-@@ -10,7 +10,7 @@
- # Default installation locations
- DESTDIR = $(INSTROOT)@DESTDIR@
- BINDIR = $(DESTDIR)/sbin
--MANDIR = $(DESTDIR)/share/man/man8
-+MANDIR = $(DESTDIR)/man/man8
- INCDIR = $(DESTDIR)/include
- 
- TARGETS = pppd
-@@ -74,7 +74,7 @@
- PLUGIN=y
- 
- # Enable Microsoft proprietary Callback Control Protocol
--#CBCP=y
-+CBCP=y
- 
- # Enable EAP SRP-SHA1 authentication (requires libsrp)
- #USE_SRP=y
---- ./pppd/plugins/Makefile.linux.orig	2021-01-04 17:06:37.000000000 -0600
-+++ ./pppd/plugins/Makefile.linux	2021-01-25 12:56:35.570645743 -0600
-@@ -4,7 +4,7 @@
- 
- DESTDIR = $(INSTROOT)@DESTDIR@
- BINDIR = $(DESTDIR)/sbin
--MANDIR = $(DESTDIR)/share/man/man8
-+MANDIR = $(DESTDIR)/man/man8
- LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
- 
- CFLAGS	= $(COPTS) -I.. -I../../include -fPIC
---- ./pppd/plugins/radius/Makefile.linux.orig	2021-01-04 17:06:37.000000000 -0600
-+++ ./pppd/plugins/radius/Makefile.linux	2021-01-25 12:56:35.570645743 -0600
-@@ -8,7 +8,7 @@
- COPTS=@CFLAGS@
- 
- DESTDIR = $(INSTROOT)@DESTDIR@
--MANDIR = $(DESTDIR)/share/man/man8
-+MANDIR = $(DESTDIR)/man/man8
- LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
- 
- VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
---- ./linux/Makefile.top.orig	2021-01-04 17:06:37.000000000 -0600
-+++ ./linux/Makefile.top	2021-01-25 12:56:35.570645743 -0600
-@@ -3,7 +3,7 @@
- DESTDIR = $(INSTROOT)@DESTDIR@
- BINDIR = $(DESTDIR)/sbin
- INCDIR = $(DESTDIR)/include
--MANDIR = $(DESTDIR)/share/man
-+MANDIR = $(DESTDIR)/man
- ETCDIR = $(INSTROOT)@SYSCONF@/ppp
- 
- # uid 0 = root
---- ./pppstats/Makefile.linux.orig	2021-01-04 17:06:37.000000000 -0600
-+++ ./pppstats/Makefile.linux	2021-01-25 12:56:35.570645743 -0600
-@@ -7,7 +7,7 @@
- 
- DESTDIR = $(INSTROOT)@DESTDIR@
- BINDIR = $(DESTDIR)/sbin
--MANDIR = $(DESTDIR)/share/man/man8
-+MANDIR = $(DESTDIR)/man/man8
- 
- PPPSTATSRCS = pppstats.c
- PPPSTATOBJS = pppstats.o
diff --git a/source/n/rp-pppoe/doinst.sh b/source/n/rp-pppoe/doinst.sh
index 527dfa903..dd0fdd6a9 100644
--- a/source/n/rp-pppoe/doinst.sh
+++ b/source/n/rp-pppoe/doinst.sh
@@ -10,7 +10,4 @@ config() {
   fi
   # Otherwise, we leave the .new copy for the admin to consider...
 }
-config etc/ppp/firewall-masq.new
-config etc/ppp/firewall-standalone.new
 config etc/ppp/pppoe-server-options.new
-config etc/ppp/pppoe.conf.new
diff --git a/source/n/rp-pppoe/rp-pppoe-3.12-doc.patch b/source/n/rp-pppoe/rp-pppoe-3.12-doc.patch
deleted file mode 100644
index e6e1b117d..000000000
--- a/source/n/rp-pppoe/rp-pppoe-3.12-doc.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -up rp-pppoe-3.12/src/Makefile.in.than rp-pppoe-3.12/src/Makefile.in
---- rp-pppoe-3.12/src/Makefile.in.than	2015-11-16 17:25:40.566618656 +0100
-+++ rp-pppoe-3.12/src/Makefile.in	2015-11-16 17:25:57.749517019 +0100
-@@ -165,14 +165,6 @@ install: all
- 	$(install) -m 755 ../scripts/pppoe-status $(DESTDIR)$(sbindir)
- 	$(install) -m 755 ../scripts/pppoe-stop $(DESTDIR)$(sbindir)
- 	$(install) -m 755 ../scripts/pppoe-setup $(DESTDIR)$(sbindir)
--	-mkdir -p $(DESTDIR)$(docdir)
--	$(install) -m 644 ../doc/CHANGES $(DESTDIR)$(docdir)
--	$(install) -m 644 ../doc/KERNEL-MODE-PPPOE $(DESTDIR)$(docdir)
--	$(install) -m 644 ../doc/HOW-TO-CONNECT $(DESTDIR)$(docdir)
--	$(install) -m 644 ../doc/LICENSE $(DESTDIR)$(docdir)
--	$(install) -m 644 ../README $(DESTDIR)$(docdir)
--	$(install) -m 644 ../SERVPOET $(DESTDIR)$(docdir)
--	$(install) -m 644 ../configs/pap-secrets $(DESTDIR)$(docdir)
- 	-mkdir -p $(DESTDIR)$(mandir)/man8
- 	for i in $(TARGETS) ; do \
- 		if test -f ../man/$$i.8 ; then \
diff --git a/source/n/rp-pppoe/rp-pppoe-3.12-plugin.patch b/source/n/rp-pppoe/rp-pppoe-3.12-plugin.patch
deleted file mode 100644
index 5b7671724..000000000
--- a/source/n/rp-pppoe/rp-pppoe-3.12-plugin.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up rp-pppoe-3.12/src/configure.in.than rp-pppoe-3.12/src/configure.in
---- rp-pppoe-3.12/src/configure.in.than	2015-12-11 16:19:38.700092797 +0100
-+++ rp-pppoe-3.12/src/configure.in	2015-12-11 16:20:15.670875690 +0100
-@@ -26,6 +26,7 @@ AC_CHECK_HEADERS(linux/if_pppox.h, [], [
- #include<net/ethernet.h>
- #include<linux/if.h>
- #include<linux/in.h>
-+#include<linux/in6.h>
- ])
- 
- dnl Checks for typedefs, structures, and compiler characteristics.
-diff -up rp-pppoe-3.12/src/configure.than rp-pppoe-3.12/src/configure
diff --git a/source/n/rp-pppoe/rp-pppoe-3.12-pluginpath.patch b/source/n/rp-pppoe/rp-pppoe-3.12-pluginpath.patch
deleted file mode 100644
index c322b00a3..000000000
--- a/source/n/rp-pppoe/rp-pppoe-3.12-pluginpath.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up rp-pppoe-3.12/src/pppoe-server.c.than rp-pppoe-3.12/src/pppoe-server.c
---- rp-pppoe-3.12/src/pppoe-server.c.than	2015-12-17 11:17:30.257775608 +0100
-+++ rp-pppoe-3.12/src/pppoe-server.c	2015-12-17 11:18:44.276951643 +0100
-@@ -2014,7 +2014,7 @@ startPPPDLinuxKernelMode(ClientSession *
- 
-     argv[c++] = "pppd";
-     argv[c++] = "plugin";
--    argv[c++] = PLUGIN_PATH;
-+    argv[c++] = "rp-pppoe.so";
- 
-     /* Add "nic-" to interface name */
-     snprintf(buffer, SMALLBUF, "nic-%s", session->ethif->name);
diff --git a/source/n/rp-pppoe/rp-pppoe-3.14-ip-allocation.patch b/source/n/rp-pppoe/rp-pppoe-3.14-ip-allocation.patch
deleted file mode 100644
index 0fc03e753..000000000
--- a/source/n/rp-pppoe/rp-pppoe-3.14-ip-allocation.patch
+++ /dev/null
@@ -1,109 +0,0 @@
---- ./man/pppoe-server.8.orig	2020-05-26 19:29:37.000000000 -0500
-+++ ./man/pppoe-server.8	2020-05-27 17:54:43.214892590 -0500
-@@ -96,6 +96,11 @@
- of 10.67.15.1 is used.
- 
- .TP
-+.B \-D
-+Delegate the allocation of IP addresses to \fBpppd\fR.  If specified, no
-+local and remote addresses passed to pppd.
-+
-+.TP
- .B \-N \fInum\fR
- Allows at most \fInum\fR concurrent PPPoE sessions.  If not specified,
- the default is 64.
---- ./src/pppoe-server.c.orig	2020-05-26 19:29:37.000000000 -0500
-+++ ./src/pppoe-server.c	2020-05-27 17:56:43.228890338 -0500
-@@ -182,6 +182,9 @@
- unsigned char LocalIP[IPV4ALEN] = {10, 0, 0, 1}; /* Counter optionally STARTS here */
- unsigned char RemoteIP[IPV4ALEN] = {10, 67, 15, 1}; /* Counter STARTS here */
- 
-+/* Delegates the allocation of IP addresses to pppd (as the pptpd doing) */
-+int DelegateIPAllocation = 0;
-+
- /* Do we increment local IP for each connection? */
- int IncrLocalIP = 0;
- 
-@@ -247,8 +250,8 @@
- 
-     memset(&conn, 0, sizeof(conn));
-     conn.hostUniq = NULL;
--
--    syslog(LOG_INFO,
-+    if (!DelegateIPAllocation) {
-+     syslog(LOG_INFO,
- 	   "Session %u closed for client "
- 	   "%02x:%02x:%02x:%02x:%02x:%02x (%d.%d.%d.%d) on %s",
- 	   (unsigned int) ntohs(session->sess),
-@@ -257,6 +260,15 @@
- 	   (int) session->realpeerip[0], (int) session->realpeerip[1],
- 	   (int) session->realpeerip[2], (int) session->realpeerip[3],
- 	   session->ethif->name);
-+    } else {
-+		syslog(LOG_INFO,
-+      "Session %u closed for client "
-+      "%02x:%02x:%02x:%02x:%02x:%02x on %s",
-+      (unsigned int) ntohs(session->sess),
-+      session->eth[0], session->eth[1], session->eth[2],
-+      session->eth[3], session->eth[4], session->eth[5],
-+      session->ethif->name);
-+    }
-     memcpy(conn.myEth, session->ethif->mac, ETH_ALEN);
-     conn.discoverySocket = session->ethif->sock;
-     conn.session = session->sess;
-@@ -1155,6 +1167,7 @@
-     fprintf(stderr, "   -L ip          -- Set local IP address.\n");
-     fprintf(stderr, "   -l             -- Increment local IP address for each session.\n");
-     fprintf(stderr, "   -R ip          -- Set start address of remote IP pool.\n");
-+    fprintf(stderr, "   -D             -- Delegates the allocation of IP addresses to pppd.\n");
-     fprintf(stderr, "   -S name        -- Advertise specified service-name.\n");
-     fprintf(stderr, "   -O fname       -- Use PPPD options from specified file\n");
-     fprintf(stderr, "                     (default %s).\n", PPPOE_SERVER_OPTIONS);
-@@ -1224,9 +1237,9 @@
- #endif
- 
- #ifndef HAVE_LINUX_KERNEL_PPPOE
--    char *options = "X:ix:hI:C:L:R:T:m:FN:f:O:o:sp:lrudPc:S:1q:Q:H:M:";
-+    char *options = "X:ix:hI:C:L:R:DT:m:FN:f:O:o:sp:lrudPc:S:1q:Q:H:M:";
- #else
--    char *options = "X:ix:hI:C:L:R:T:m:FN:f:O:o:skp:lrudPc:S:1q:Q:H:M:";
-+    char *options = "X:ix:hI:C:L:R:DT:m:FN:f:O:o:skp:lrudPc:S:1q:Q:H:M:";
- #endif
- 
-     if (getuid() != geteuid() ||
-@@ -1448,6 +1461,10 @@
- 	    }
- 	    break;
- 
-+	case 'D':
-+	    DelegateIPAllocation = 1;
-+	    break;
-+
- 	case 'T':
- 	case 'm':
- 	    /* These just get passed to pppoe */
-@@ -2056,6 +2073,7 @@
-     argv[c++] = "file";
-     argv[c++] = pppoptfile;
- 
-+    if (!DelegateIPAllocation) {
-     snprintf(buffer, SMALLBUF, "%d.%d.%d.%d:%d.%d.%d.%d",
- 	    (int) session->myip[0], (int) session->myip[1],
- 	    (int) session->myip[2], (int) session->myip[3],
-@@ -2071,6 +2089,16 @@
- 	   session->ethif->name,
- 	   session->serviceName);
-     argv[c++] = strdup(buffer);
-+    } else {
-+	syslog(LOG_INFO,
-+	    "Session %u created for client %02x:%02x:%02x:%02x:%02x:%02x on %s using Service-Name '%s'",
-+	    (unsigned int) ntohs(session->sess),
-+	    session->eth[0], session->eth[1], session->eth[2],
-+	    session->eth[3], session->eth[4], session->eth[5],
-+	    session->ethif->name,
-+	    session->serviceName);
-+    }
-+    
-     if (!argv[c-1]) {
- 	/* TODO: Send a PADT */
- 	exit(EXIT_FAILURE);
diff --git a/source/n/rp-pppoe/rp-pppoe-manpages.patch b/source/n/rp-pppoe/rp-pppoe-manpages.patch
deleted file mode 100644
index fd0f24009..000000000
--- a/source/n/rp-pppoe/rp-pppoe-manpages.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -up rp-pppoe-3.12/man/pppoe.8.than rp-pppoe-3.12/man/pppoe.8
---- rp-pppoe-3.12/man/pppoe.8.than	2015-11-11 16:10:01.000000000 +0100
-+++ rp-pppoe-3.12/man/pppoe.8	2016-06-03 17:24:49.649336285 +0200
-@@ -32,6 +32,10 @@ triggered.  The best way to do this is t
- PPPoE timeout to be about four times the LCP echo interval.
- 
- .TP
-+.B \-t \fItimeout\fR
-+The \fB\-t\fR option sets the initial timeout for discovery packets in seconds.
-+
-+.TP
- .B \-D \fIfile_name\fR
- The \fB\-D\fR option causes every packet to be dumped to the specified
- \fIfile_name\fR.  This is intended for debugging only; it produces huge
-@@ -147,6 +151,10 @@ the peer you are dealing with uses non-s
- ISP uses non-standard frame types, complain!
- 
- .TP
-+.B \-F numfloods
-+The \fB\-F\fR option sets the discovery flood, only used for stress-testing.
-+
-+.TP
- .B \-h
- The \fB\-h\fR option causes \fBpppoe\fR to print usage information and
- exit.
-diff -up rp-pppoe-3.12/man/pppoe-server.8.than rp-pppoe-3.12/man/pppoe-server.8
---- rp-pppoe-3.12/man/pppoe-server.8.than	2016-06-03 17:24:49.641336586 +0200
-+++ rp-pppoe-3.12/man/pppoe-server.8	2016-06-03 17:24:49.650336248 +0200
-@@ -77,12 +77,20 @@ PADI and PADR packets are ignored.  If y
- then no limit is imposed on the number of sessions per peer MAC address.
- 
- .TP
-+.B \-P
-+Check pool file for correctness and exit.
-+
-+.TP
- .B \-s
- This option is passed directly to \fBpppoe\fR; see \fBpppoe\fR(8) for
- details.  In addition, it causes \fBpppd\fR to be invoked with the
- \fIsync\fR option.
- 
- .TP
-+.B \-l
-+Increment local IP address for each session.
-+
-+.TP
- .B \-L \fIip\fR
- Sets the local IP address.  This is passed to spawned \fBpppd\fR processes.
- If not specified, the default is 10.0.0.1.
-@@ -147,6 +155,10 @@ handing out sessions in order, the sessi
- unpredictable order.
- 
- .TP
-+.B \-d
-+Debug session creation.
-+
-+.TP
- .B \-u
- Tells the server to invoke \fBpppd\fR with the \fIunit\fR option.  Note
- that this option only works for \fBpppd\fR version 2.4.0 or newer.
-diff -up rp-pppoe-3.12/src/pppoe.c.than rp-pppoe-3.12/src/pppoe.c
---- rp-pppoe-3.12/src/pppoe.c.than	2016-06-03 17:24:49.650336248 +0200
-+++ rp-pppoe-3.12/src/pppoe.c	2016-06-03 17:27:40.888903213 +0200
-@@ -380,6 +380,7 @@ usage(char const *argv0)
- 	    "   -k             -- Kill a session with PADT (requires -e)\n"
- 	    "   -d             -- Perform discovery, print session info and exit.\n"
- 	    "   -f disc:sess   -- Set Ethernet frame types (hex).\n"
-+       "   -F numfloods   -- Set the discovery flood, only used for stress-testing.\n"
- 	    "   -h             -- Print usage information.\n\n"
- 	    "PPPoE Version %s, Copyright (C) 2001-2015 Roaring Penguin Software Inc.\n"
- 	    "PPPoE comes with ABSOLUTELY NO WARRANTY.\n"
diff --git a/source/n/rp-pppoe/rp-pppoe.SlackBuild b/source/n/rp-pppoe/rp-pppoe.SlackBuild
index a0e0d04b0..05eb2720f 100755
--- a/source/n/rp-pppoe/rp-pppoe.SlackBuild
+++ b/source/n/rp-pppoe/rp-pppoe.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2012, 2015, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2012, 2015, 2018, 2024  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -29,7 +29,7 @@ BUILD=${BUILD:-1}
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i586 ;;
+    i?86) export ARCH=i686 ;;
     arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
@@ -46,12 +46,10 @@ fi
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-elif [ "$ARCH" = "s390" ]; then
-  SLKCFLAGS="-O2"
+if [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=pentium4 -mtune=generic"
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC"
 else
   SLKCFLAGS="-O2"
 fi
@@ -75,28 +73,29 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
-zcat $CWD/rp-pppoe-3.14-ip-allocation.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/rp-pppoe-3.12-plugin.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/rp-pppoe-3.12-pluginpath.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/rp-pppoe-manpages.patch.gz | patch -p1 --verbose || exit 1
-
 cd src
 
 CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
 ./configure \
-  --enable-plugin=/ppp-2.4.4 \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --docdir=/usr/doc/$PKGNAM-$VERSION \
   --mandir=/usr/man \
+  --infodir=/usr/info \
+  --disable-static \
+  --enable-plugin \
   --build=$ARCH-slackware-linux || exit 1
-
 make $NUMJOBS || make || exit 1
-make install docdir=/usr/doc/rp-pppoe-$VERSION DESTDIR=$PKG install || exit 1
+make install docdir=/usr/doc/rp-pppoe-$VERSION DESTDIR=$PKG || exit 1
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
 ( cd $PKG/etc/ppp
-  for config in firewall-masq firewall-standalone pppoe-server-options pppoe.conf ; do
+  for config in pppoe-server-options ; do
     mv $config ${config}.new
   done
 )