From 4505baafb8ed622a1f88ba19c5b1f889920f17ea3aab36e403cd5ecb96e8d9d3 Mon Sep 17 00:00:00 2001
From: Reinhard Max <max@suse.com>
Date: Mon, 3 Aug 2020 15:45:36 +0000
Subject: [PATCH] - New version 2.4.8.   * New pppd options have been added:   
  * ifname, to set the name for the PPP interface device     *
 defaultroute-metric, to set the metric for the default route     *
 defaultroute6, to add an IPv6 default route (with       nodefaultroute6 to
 prevent adding an IPv6 default route).     * up_sdnotify, to have pppd notify
 systemd when the link is up.   * The rp-pppoe plugin has new options:     *
 host-uniq, to set the Host-Uniq value to send     * pppoe-padi-timeout, to
 set the timeout for discovery packets     * pppoe-padi-attempts, to set the
 number of discovery attempts.   * Added the CLASS attribute in radius
 packets.   * Fixed warnings and issues found by static analysis. - Obsoleted
 patches:   [...] - Patches that got renamed, because they needed rediffing: 
 [...] - bsc#1172916: Fix an outdated comment for lcp-echo-interval.

OBS-URL: https://build.opensuse.org/package/show/network/ppp?expand=0&rev=60
---
 options                                       |   9 +-
 ppp-2.4.2-pie.patch                           |  43 -----
 ppp-2.4.3-pppoatm.diff                        |  13 --
 ppp-2.4.4-strncatfix.patch                    |  11 --
 ppp-2.4.6-ifname.diff                         | 126 ------------
 ppp-2.4.7-DES-openssl.patch                   |  79 --------
 ppp-2.4.7.tar.gz                              |   3 -
 ppp-2.4.7.tar.gz.asc                          |  17 --
 ppp-2.4.8.tar.gz                              |   3 +
 ppp-2.4.8.tar.gz.asc                          |  11 ++
 ppp-CVE-2015-3310.patch                       |   4 +-
 ppp-CVE-2020-8597.patch                       |   4 +-
 ppp-2.4.2-__P.diff => ppp-__P.patch           |   6 +-
 ...-cifdefroute.diff => ppp-cifdefroute.patch | 118 ++++++------
 ppp-2.4.3-filter.diff => ppp-filter.patch     |  16 +-
 ...x-bashisms.patch => ppp-fix-bashisms.patch |   0
 ppp-2.4.3-fork-fix.diff => ppp-fork-fix.patch |  10 +-
 ...her-speeds.diff => ppp-higher-speeds.patch |   4 +-
 ppp-2.4.6-lib64.patch => ppp-lib64.patch      |  58 ++----
 ppp-2.4.6-make.diff => ppp-make.patch         |  54 +++---
 ppp-2.4.6-misc.diff => ppp-misc.patch         |  12 +-
 ppp-pie.patch                                 |  33 ++++
 ppp-send-padt.patch                           |  13 --
 ppp-2.4.2-smpppd.diff => ppp-smpppd.patch     |   4 +-
 ...onf.patch => ppp-var_run_resolv_conf.patch |  16 +-
 ppp.changes                                   |  44 +++++
 ppp.keyring                                   | 179 +++++++++++++++---
 ppp.spec                                      |  41 ++--
 28 files changed, 405 insertions(+), 526 deletions(-)
 delete mode 100644 ppp-2.4.2-pie.patch
 delete mode 100644 ppp-2.4.3-pppoatm.diff
 delete mode 100644 ppp-2.4.4-strncatfix.patch
 delete mode 100644 ppp-2.4.6-ifname.diff
 delete mode 100644 ppp-2.4.7-DES-openssl.patch
 delete mode 100644 ppp-2.4.7.tar.gz
 delete mode 100644 ppp-2.4.7.tar.gz.asc
 create mode 100644 ppp-2.4.8.tar.gz
 create mode 100644 ppp-2.4.8.tar.gz.asc
 rename ppp-2.4.2-__P.diff => ppp-__P.patch (80%)
 rename ppp-2.4.2-cifdefroute.diff => ppp-cifdefroute.patch (75%)
 rename ppp-2.4.3-filter.diff => ppp-filter.patch (83%)
 rename ppp-2.4.7-fix-bashisms.patch => ppp-fix-bashisms.patch (100%)
 rename ppp-2.4.3-fork-fix.diff => ppp-fork-fix.patch (89%)
 rename ppp-2.4.1-higher-speeds.diff => ppp-higher-speeds.patch (77%)
 rename ppp-2.4.6-lib64.patch => ppp-lib64.patch (59%)
 rename ppp-2.4.6-make.diff => ppp-make.patch (75%)
 rename ppp-2.4.6-misc.diff => ppp-misc.patch (84%)
 create mode 100644 ppp-pie.patch
 delete mode 100644 ppp-send-padt.patch
 rename ppp-2.4.2-smpppd.diff => ppp-smpppd.patch (86%)
 rename ppp-2.4.4-var_run_resolv_conf.patch => ppp-var_run_resolv_conf.patch (87%)

diff --git a/options b/options
index dec79e3..0e175c8 100644
--- a/options
+++ b/options
@@ -114,11 +114,10 @@ asyncmap 0
 nodetach
 
 # 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
-# the peer should respond to the echo-request by sending an echo-reply.
-# This option can be used with the lcp-echo-failure option to detect
-# that the peer is no longer connected.
+# the peer every n seconds. Normally the peer should respond to the
+# echo-request by sending an echo-reply.  This option can be used with
+# the lcp-echo-failure option to detect that the peer is no longer
+# connected.
 lcp-echo-interval 30
 
 # If this option is given, pppd will presume the peer to be dead if n
diff --git a/ppp-2.4.2-pie.patch b/ppp-2.4.2-pie.patch
deleted file mode 100644
index d660818..0000000
--- a/ppp-2.4.2-pie.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: ppp-2.4.7/pppd/Makefile.linux
-===================================================================
---- ppp-2.4.7.orig/pppd/Makefile.linux
-+++ ppp-2.4.7/pppd/Makefile.linux
-@@ -213,10 +213,10 @@ install: pppd
- 	$(INSTALL) -m 644 pppd.8 $(MANDIR)
- 
- pppd: $(PPPDOBJS)
--	$(CC) $(CFLAGS) $(LDFLAGS) -o pppd $(PPPDOBJS) $(LIBS)
-+	$(CC) $(CFLAGS) -pie $(LDFLAGS) -o pppd $(PPPDOBJS) $(LIBS)
- 
- srp-entry:	srp-entry.c
--	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ srp-entry.c $(LIBS)
-+	$(CC) $(CFLAGS) -pie -fPIE $(LDFLAGS) -o $@ srp-entry.c $(LIBS)
- 
- install-devel:
- 	mkdir -p $(INCDIR)/pppd
-Index: ppp-2.4.7/chat/Makefile.linux
-===================================================================
---- ppp-2.4.7.orig/chat/Makefile.linux
-+++ ppp-2.4.7/chat/Makefile.linux
-@@ -18,7 +18,7 @@ INSTALL= install
- all:	chat
- 
- chat:	chat.o
--	$(CC) -o chat chat.o
-+	$(CC) -pie -o chat chat.o
- 
- chat.o:	chat.c
- 	$(CC) -c $(CFLAGS) -o chat.o chat.c
-Index: ppp-2.4.7/pppstats/Makefile.linux
-===================================================================
---- ppp-2.4.7.orig/pppstats/Makefile.linux
-+++ ppp-2.4.7/pppstats/Makefile.linux
-@@ -26,7 +26,7 @@ install: pppstats
- 	$(INSTALL) -m 444 pppstats.8 $(MANDIR)
- 
- pppstats: $(PPPSTATSRCS)
--	$(CC) $(CFLAGS) -o pppstats pppstats.c $(LIBS)
-+	$(CC) $(CFLAGS) -pie -fPIE -o pppstats pppstats.c $(LIBS)
- 
- clean:
- 	rm -f pppstats *~ #* core
diff --git a/ppp-2.4.3-pppoatm.diff b/ppp-2.4.3-pppoatm.diff
deleted file mode 100644
index 46f3ed6..0000000
--- a/ppp-2.4.3-pppoatm.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- ppp-2.4.3/pppd/plugins/pppoatm/Makefile.linux
-+++ ppp-2.4.3/pppd/plugins/pppoatm/Makefile.linux
-@@ -36,8 +36,8 @@
- 	$(CC) $(CFLAGS) -o $@ -shared $^ $(LIBS)
- 
- install: all
--	$(INSTALL) -d -m 755 $(LIBDIR)
--	$(INSTALL) -c -m 4550 $(PLUGIN) $(LIBDIR)
-+	$(INSTALL) -m 755 $(PLUGIN) $(LIBDIR)
-+	$(INSTALL) $? $(LIBDIR)
- 
- clean:
- 	rm -f *.o *.so
diff --git a/ppp-2.4.4-strncatfix.patch b/ppp-2.4.4-strncatfix.patch
deleted file mode 100644
index 46604b2..0000000
--- a/ppp-2.4.4-strncatfix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ppp-2.4.4/pppd/plugins/radius/clientid.c.xx	2006-12-19 10:25:19.000000000 +0100
-+++ ppp-2.4.4/pppd/plugins/radius/clientid.c	2006-12-19 10:25:45.000000000 +0100
-@@ -110,7 +110,7 @@
- 	if (*name != '/')
- 		strcpy(ttyname, "/dev/");
- 
--	strncat(ttyname, name, sizeof(ttyname));
-+	strncat(ttyname, name, sizeof(ttyname)-strlen(ttyname)-1);
- 
- 	for(p = map2id_list; p; p = p->next)
- 		if (!strcmp(ttyname, p->name)) return p->id;
diff --git a/ppp-2.4.6-ifname.diff b/ppp-2.4.6-ifname.diff
deleted file mode 100644
index 0250b4b..0000000
--- a/ppp-2.4.6-ifname.diff
+++ /dev/null
@@ -1,126 +0,0 @@
---- ./pppd/main.c.orig	2004-07-19 12:35:22.000000000 +0000
-+++ ./pppd/main.c	2004-07-19 14:34:38.542120946 +0000
-@@ -124,7 +124,7 @@
- static const char rcsid[] = RCSID;
- 
- /* interface vars */
--char ifname[32];		/* Interface name */
-+char ifname[MAXIFNAMELEN];	/* Interface name */
- int ifunit;			/* Interface unit number */
- 
- struct channel *the_channel;
-@@ -298,13 +298,6 @@
-     NULL
- };
- 
--/*
-- * If PPP_DRV_NAME is not defined, use the default "ppp" as the device name.
-- */
--#if !defined(PPP_DRV_NAME)
--#define PPP_DRV_NAME	"ppp"
--#endif /* !defined(PPP_DRV_NAME) */
--
- int
- main(argc, argv)
-     int argc;
-@@ -737,8 +730,11 @@
- set_ifunit(iskey)
-     int iskey;
- {
--    info("Using interface %s%d", PPP_DRV_NAME, ifunit);
-+    if (req_ifname[0] != '\0')
-+	slprintf(ifname, sizeof(ifname), req_ifname);
-+    else
-     slprintf(ifname, sizeof(ifname), "%s%d", PPP_DRV_NAME, ifunit);
-+    info("Using interface %s", ifname);
-     script_setenv("IFNAME", ifname, iskey);
-     if (iskey) {
- 	create_pidfile(getpid());	/* write pid to file */
---- ./pppd/options.c.orig	2004-07-19 12:59:21.000000000 +0000
-+++ ./pppd/options.c	2004-07-19 14:35:04.253865964 +0000
-@@ -114,6 +114,7 @@
- bool	tune_kernel;		/* may alter kernel settings */
- int	connect_delay = 1000;	/* wait this many ms after connect script */
- int	req_unit = -1;		/* requested interface unit */
-+char	req_ifname[MAXIFNAMELEN];	/* requested interface name */
- bool	multilink = 0;		/* Enable multilink operation */
- char	*bundle_name = NULL;	/* bundle name for multilink */
- bool	dump_options;		/* print out option values */
-@@ -283,6 +284,10 @@
-       "PPP interface unit number to use if possible",
-       OPT_PRIO | OPT_LLIMIT, 0, 0 },
- 
-+    { "ifname", o_string, req_ifname,
-+      "Set PPP interface name",
-+      OPT_PRIO | OPT_PRIV | OPT_STATIC, NULL, MAXIFNAMELEN },
-+
-     { "dump", o_bool, &dump_options,
-       "Print out option values after parsing all options", 1 },
-     { "dryrun", o_bool, &dryrun,
---- ./pppd/pppd.8.orig	2004-07-19 14:39:06.639320497 +0000
-+++ ./pppd/pppd.8	2004-07-19 15:00:37.339448432 +0000
-@@ -1085,7 +1085,12 @@
- .TP
- .B unit \fInum
- Sets the ppp unit number (for a ppp0 or ppp1 etc interface name) for outbound
--connections.
-+connections.  If the unit is already in use a dynamically allocated will be
-+used.
-+.TP
-+.B ifname \fIstring
-+Set the ppp interface name for outbound connections.  A failure to set the
-+name will terminate the pppd.
- .TP
- .B unset \fIname
- Remove a variable from the environment variable for scripts that are
---- ./pppd/pppd.h.orig	2004-07-19 12:59:16.000000000 +0000
-+++ ./pppd/pppd.h	2004-07-19 15:02:08.792752747 +0000
-@@ -80,6 +80,16 @@
- #define MAXARGS		1	/* max # args to a command */
- #define MAXNAMELEN	256	/* max length of hostname or name for auth */
- #define MAXSECRETLEN	256	/* max length of password or secret */
-+#define MAXIFNAMELEN	32	/* max length of interface name; or use IFNAMSIZ, can we
-+				   always include net/if.h? */
-+
-+/*
-+ * If PPP_DRV_NAME is not defined, use the default "ppp" as the device name.
-+ * Where should PPP_DRV_NAME come from? Do we include it here?
-+ */
-+#if !defined(PPP_DRV_NAME)
-+#define PPP_DRV_NAME	"ppp"
-+#endif /* !defined(PPP_DRV_NAME) */
- 
- /*
-  * Option descriptor structure.
-@@ -317,6 +327,7 @@
- extern int	connect_delay;	/* Time to delay after connect script */
- extern int	max_data_rate;	/* max bytes/sec through charshunt */
- extern int	req_unit;	/* interface unit number to use */
-+extern char	req_ifname[MAXIFNAMELEN];	/* interface name to use */
- extern bool	multilink;	/* enable multilink operation */
- extern bool	noendpoint;	/* don't send or accept endpt. discrim. */
- extern char	*bundle_name;	/* bundle name for multilink */
---- ./pppd/sys-linux.c.orig	2004-07-19 12:33:29.000000000 +0000
-+++ ./pppd/sys-linux.c	2004-07-19 14:37:36.463754450 +0000
-@@ -638,6 +638,21 @@
- 	}
- 	if (x < 0)
- 		error("Couldn't create new ppp unit: %m");
-+
-+	if (x == 0 && req_ifname[0] != '\0') {
-+		struct ifreq ifr;
-+		char t[MAXIFNAMELEN];
-+		memset(&ifr, 0, sizeof(struct ifreq));
-+		slprintf(t, sizeof(t), "%s%d", PPP_DRV_NAME, ifunit);
-+		strncpy(ifr.ifr_name, t, IF_NAMESIZE);
-+		strncpy(ifr.ifr_newname, req_ifname, IF_NAMESIZE);
-+		x = ioctl(sock_fd, SIOCSIFNAME, &ifr);
-+		if (x < 0)
-+		    error("Couldn't rename interface %s to %s: %m", t, req_ifname);
-+		else
-+		    info("Renamed interface %s to %s", t, req_ifname);
-+	}
-+
- 	return x;
- }
- 
diff --git a/ppp-2.4.7-DES-openssl.patch b/ppp-2.4.7-DES-openssl.patch
deleted file mode 100644
index 93338da..0000000
--- a/ppp-2.4.7-DES-openssl.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-Index: ppp-2.4.7/pppd/Makefile.linux
-===================================================================
---- ppp-2.4.7.orig/pppd/Makefile.linux
-+++ ppp-2.4.7/pppd/Makefile.linux
-@@ -39,7 +39,7 @@ LIBS = -lutil
- # Uncomment the next 2 lines to include support for Microsoft's
- # MS-CHAP authentication protocol.  Also, edit plugins/radius/Makefile.linux.
- CHAPMS=y
--USE_CRYPT=y
-+#USE_CRYPT=y
- # Don't use MSLANMAN unless you really know what you're doing.
- #MSLANMAN=y
- # Uncomment the next line to include support for MPPE.  CHAPMS (above) must
-@@ -133,7 +133,8 @@ endif
- 
- ifdef NEEDDES
- ifndef USE_CRYPT
--LIBS     += -ldes $(LIBS)
-+CFLAGS   += -I/usr/include/openssl
-+LIBS     += -lcrypto
- else
- CFLAGS   += -DUSE_CRYPT=1
- endif
-Index: ppp-2.4.7/pppd/pppcrypt.c
-===================================================================
---- ppp-2.4.7.orig/pppd/pppcrypt.c
-+++ ppp-2.4.7/pppd/pppcrypt.c
-@@ -64,7 +64,7 @@ u_char *des_key;	/* OUT 64 bit DES key w
- 	des_key[7] = Get7Bits(key, 49);
- 
- #ifndef USE_CRYPT
--	des_set_odd_parity((des_cblock *)des_key);
-+	DES_set_odd_parity((DES_cblock *)des_key);
- #endif
- }
- 
-@@ -158,25 +158,25 @@ u_char *clear;	/* OUT 8 octets */
- }
- 
- #else /* USE_CRYPT */
--static des_key_schedule	key_schedule;
-+static DES_key_schedule	key_schedule;
- 
- bool
- DesSetkey(key)
- u_char *key;
- {
--	des_cblock des_key;
-+	DES_cblock des_key;
- 	MakeKey(key, des_key);
--	des_set_key(&des_key, key_schedule);
-+	DES_set_key(&des_key, &key_schedule);
- 	return (1);
- }
- 
- bool
--DesEncrypt(clear, key, cipher)
-+DesEncrypt(clear, cipher)
- u_char *clear;	/* IN  8 octets */
- u_char *cipher;	/* OUT 8 octets */
- {
--	des_ecb_encrypt((des_cblock *)clear, (des_cblock *)cipher,
--	    key_schedule, 1);
-+	DES_ecb_encrypt((DES_cblock *)clear, (DES_cblock *)cipher,
-+	    &key_schedule, 1);
- 	return (1);
- }
- 
-@@ -185,8 +185,8 @@ DesDecrypt(cipher, clear)
- u_char *cipher;	/* IN  8 octets */
- u_char *clear;	/* OUT 8 octets */
- {
--	des_ecb_encrypt((des_cblock *)cipher, (des_cblock *)clear,
--	    key_schedule, 0);
-+	DES_ecb_encrypt((DES_cblock *)cipher, (DES_cblock *)clear,
-+	    &key_schedule, 0);
- 	return (1);
- }
- 
diff --git a/ppp-2.4.7.tar.gz b/ppp-2.4.7.tar.gz
deleted file mode 100644
index 0760705..0000000
--- a/ppp-2.4.7.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:02e0a3dd3e4799e33103f70ec7df75348c8540966ee7c948e4ed8a42bbccfb30
-size 688117
diff --git a/ppp-2.4.7.tar.gz.asc b/ppp-2.4.7.tar.gz.asc
deleted file mode 100644
index edf3d29..0000000
--- a/ppp-2.4.7.tar.gz.asc
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIcBAABAgAGBQJT5hf0AAoJEJ5CldYF9mzpFnUP/3C/Pf7rcc3+zyQKPMFVWyW8
-FKbG4ByKCHGEHk6k65ahQeVpLJQNMxpTXA2BFZYihSlBd6/Zix06o1e/aMaJNbyD
-NcOX8y8A7vmnygu1ouM9eeGjdMVZqt1ArkFMMSyFs1KnWuJpdF7wxStPMDq+DMRV
-mfzm1tAZGpO1OUneqa5lA0w5GKBh01yP6j7FflTg14jpthGVNKhVOKmOJHEtV2Sv
-+/MJnWjvo3GH16qcYwrRjj7TGvKIWZ3xAKZvUkCk+WgNa2EkmwQlAREk2pVlnf39
-ZaNkVjA3fCstY+2rPojuBCktroMnkfuSvejGxgMNerjmLLzcTo+/28vUs2wc36m5
-4+ptSesIqfyQ72rglley2FVvXRxPo/2p/5GWejmm0UHSRdwPWwJ6MRwJ3o3JvUkA
-qlxgilOKg8AqlpWCCrgEJXUkJwoqtVlf0Ub/nMZesY0OaFxCYnvWBlLFmMOtWvtu
-wCjDGnB4w3Zw+XAT2CCzOKBUwCcZCQiV83M/gW6lZRQ8lfS9Wr6ZoMhtrh87p7UU
-2YVzy4z12ZUkSuwe29eC6HHh7sZRKH75RGHG0Op8lehLy9+AhqDn9ULQyxfhscYI
-yZELF4njU2g7Jy6GPuRVbWqfbWOfbjtk09VFCGi9jq+fTkpQOiIy6k2FGuf2iuNo
-KM1rslBP8quFdkPdfyd4
-=+x3E
------END PGP SIGNATURE-----
diff --git a/ppp-2.4.8.tar.gz b/ppp-2.4.8.tar.gz
new file mode 100644
index 0000000..8a1c169
--- /dev/null
+++ b/ppp-2.4.8.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f6bf89beae26b2943dff8f1003533d6a5a4909a0fa6edfbec44fe039bbe61bc6
+size 693809
diff --git a/ppp-2.4.8.tar.gz.asc b/ppp-2.4.8.tar.gz.asc
new file mode 100644
index 0000000..ca4071f
--- /dev/null
+++ b/ppp-2.4.8.tar.gz.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCgAdFiEEv0VLfXa2m9eKuaRpnZrqdyxjcZ8FAl4KsmsACgkQnZrqdyxj
+cZ9mKAgAyT0zJgK60apFRaCKO03cVVb3ND5g1AgY3tXbtSIl1sDHPFo3Az+HIX2S
+F7kl/Qi/wAZD87y6Pt9nN6yqF/F5SrERwAELkx5teTGjqsIj97u8mILP+B9TzMu0
+TGTDQ01Gm3m5m0km2h1DMpEahGDCl3LwXHsanu8XYdedVZAxTJzeO7Kqh/OJ7xaP
+IELhG38zdDSP4BHcwEIHEi2NWGyNCY5XwswpHmhZi5JupP+f2iQ+7fIbIKRHyX0f
+yVtRv1ekaNB8eLjiiR2uMoFgV/fLPxCDVuLyOaYa77nqeaCL97ZzBe/0L7TPwOIG
+Q58eDqqL0wqn2Mg2jZ9N6j+YcF5iLg==
+=mBYc
+-----END PGP SIGNATURE-----
diff --git a/ppp-CVE-2015-3310.patch b/ppp-CVE-2015-3310.patch
index 942edf1..357469c 100644
--- a/ppp-CVE-2015-3310.patch
+++ b/ppp-CVE-2015-3310.patch
@@ -1,4 +1,4 @@
---- pppd/plugins/radius/util.c
+--- pppd/plugins/radius/util.c.orig
 +++ pppd/plugins/radius/util.c
 @@ -77,7 +77,7 @@ rc_mksid (void)
    static unsigned short int cnt = 0;
@@ -9,5 +9,3 @@
  	   cnt & 0xFF);
    cnt++;
    return buf;
-
-
diff --git a/ppp-CVE-2020-8597.patch b/ppp-CVE-2020-8597.patch
index 57bc1fa..4dcf753 100644
--- a/ppp-CVE-2020-8597.patch
+++ b/ppp-CVE-2020-8597.patch
@@ -15,7 +15,7 @@ Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
 
 --- pppd/eap.c.orig
 +++ pppd/eap.c
-@@ -1421,7 +1421,7 @@ int len;
+@@ -1420,7 +1420,7 @@ int len;
  		}
  
  		/* Not so likely to happen. */
@@ -24,7 +24,7 @@ Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
  			dbglog("EAP: trimming really long peer name down");
  			BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1);
  			rhostname[sizeof (rhostname) - 1] = '\0';
-@@ -1847,7 +1847,7 @@ int len;
+@@ -1846,7 +1846,7 @@ int len;
  		}
  
  		/* Not so likely to happen. */
diff --git a/ppp-2.4.2-__P.diff b/ppp-__P.patch
similarity index 80%
rename from ppp-2.4.2-__P.diff
rename to ppp-__P.patch
index dbb957d..8b6b0db 100644
--- a/ppp-2.4.2-__P.diff
+++ b/ppp-__P.patch
@@ -1,6 +1,6 @@
---- pppd/pppd.h
-+++ pppd/pppd.h	2004/09/12 07:31:44
-@@ -57,14 +57,17 @@
+--- pppd/pppd.h.orig
++++ pppd/pppd.h
+@@ -59,14 +59,17 @@
  #include <net/ppp_defs.h>
  #include "patchlevel.h"
  
diff --git a/ppp-2.4.2-cifdefroute.diff b/ppp-cifdefroute.patch
similarity index 75%
rename from ppp-2.4.2-cifdefroute.diff
rename to ppp-cifdefroute.patch
index 53928f4..54e713a 100644
--- a/ppp-2.4.2-cifdefroute.diff
+++ b/ppp-cifdefroute.patch
@@ -1,6 +1,6 @@
---- pppd/ipcp.c
+--- pppd/ipcp.c.orig
 +++ pppd/ipcp.c
-@@ -197,6 +197,16 @@
+@@ -197,6 +197,16 @@ static option_t ipcp_option_list[] = {
        "disable defaultroute option", OPT_ALIAS | OPT_A2CLR,
        &ipcp_wantoptions[0].default_route },
  
@@ -17,7 +17,7 @@
      { "proxyarp", o_bool, &ipcp_wantoptions[0].proxy_arp,
        "Add proxy ARP entry", OPT_ENABLE|1, &ipcp_allowoptions[0].proxy_arp },
      { "noproxyarp", o_bool, &ipcp_allowoptions[0].proxy_arp,
-@@ -263,7 +273,7 @@
+@@ -270,7 +280,7 @@ struct protent ipcp_protent = {
      ip_active_pkt
  };
  
@@ -26,7 +26,7 @@
  static void ipcp_script __P((char *, int));	/* Run an up/down script */
  static void ipcp_script_done __P((void *));
  
-@@ -1660,7 +1670,12 @@
+@@ -1760,7 +1770,12 @@ ip_demand_conf(u)
      if (!sifnpmode(u, PPP_IP, NPMODE_QUEUE))
  	return 0;
      if (wo->default_route)
@@ -39,7 +39,7 @@
  	    default_route_set[u] = 1;
      if (wo->proxy_arp)
  	if (sifproxyarp(u, wo->hisaddr))
-@@ -1742,7 +1757,8 @@
+@@ -1848,7 +1863,8 @@ ipcp_up(f)
       */
      if (demand) {
  	if (go->ouraddr != wo->ouraddr || ho->hisaddr != wo->hisaddr) {
@@ -49,7 +49,7 @@
  	    if (go->ouraddr != wo->ouraddr) {
  		warn("Local IP address changed to %I", go->ouraddr);
  		script_setenv("OLDIPLOCAL", ip_ntoa(wo->ouraddr), 0);
-@@ -1767,7 +1783,12 @@
+@@ -1873,7 +1889,12 @@ ipcp_up(f)
  
  	    /* assign a default route through the interface if required */
  	    if (ipcp_wantoptions[f->unit].default_route) 
@@ -62,7 +62,7 @@
  		    default_route_set[f->unit] = 1;
  
  	    /* Make a proxy ARP entry if requested. */
-@@ -1817,7 +1838,12 @@
+@@ -1923,7 +1944,12 @@ ipcp_up(f)
  
  	/* assign a default route through the interface if required */
  	if (ipcp_wantoptions[f->unit].default_route) 
@@ -75,7 +75,7 @@
  		default_route_set[f->unit] = 1;
  
  	/* Make a proxy ARP entry if requested. */
-@@ -1894,7 +1920,7 @@
+@@ -2001,7 +2027,7 @@ ipcp_down(f)
  	sifnpmode(f->unit, PPP_IP, NPMODE_DROP);
  	sifdown(f->unit);
  	ipcp_clear_addrs(f->unit, ipcp_gotoptions[f->unit].ouraddr,
@@ -84,7 +84,7 @@
      }
  
      /* Execute the ip-down script */
-@@ -1910,16 +1936,25 @@
+@@ -2017,16 +2043,25 @@ ipcp_down(f)
   * proxy arp entries, etc.
   */
  static void
@@ -112,9 +112,9 @@
  	cifdefaultroute(unit, ouraddr, hisaddr);
  	default_route_set[unit] = 0;
      }
---- pppd/ipcp.h
+--- pppd/ipcp.h.orig
 +++ pppd/ipcp.h
-@@ -70,6 +70,7 @@
+@@ -70,6 +70,7 @@ typedef struct ipcp_options {
      bool old_addrs;		/* Use old (IP-Addresses) option? */
      bool req_addr;		/* Ask peer to send IP address? */
      bool default_route;		/* Assign default route through interface? */
@@ -122,11 +122,11 @@
      bool proxy_arp;		/* Make proxy ARP entry for peer? */
      bool neg_vj;		/* Van Jacobson Compression? */
      bool old_vj;		/* use old (short) form of VJ option? */
---- pppd/pppd.8
+--- pppd/pppd.8.orig
 +++ pppd/pppd.8
-@@ -121,6 +121,13 @@
+@@ -133,6 +133,13 @@ the gateway, when IPv6CP negotiation is
  This entry is removed when the PPP connection is broken.  This option
- is privileged if the \fInodefaultroute\fR option has been specified.
+ is privileged if the \fInodefaultroute6\fR option has been specified.
  .TP
 +.B replacedefaultroute
 +This option is a flag to the defaultroute option. If defaultroute is
@@ -138,7 +138,7 @@
  .B disconnect \fIscript
  Execute the command specified by \fIscript\fR, by passing it to a
  shell, after
-@@ -706,7 +713,12 @@
+@@ -746,7 +753,12 @@ disable both forms of hardware flow cont
  .TP
  .B nodefaultroute
  Disable the \fIdefaultroute\fR option.  The system administrator who
@@ -151,10 +151,10 @@
 +wishes to prevent users from replacing a default route with pppd
  can do so by placing this option in the /etc/ppp/options file.
  .TP
- .B nodeflate
---- pppd/pppd.h
+ .B nodefaultroute6
+--- pppd/pppd.h.orig
 +++ pppd/pppd.h
-@@ -642,7 +642,11 @@
+@@ -681,7 +681,11 @@ int  sif6addr __P((int, eui64_t, eui64_t
  int  cif6addr __P((int, eui64_t, eui64_t));
  				/* Remove an IPv6 address from i/f */
  #endif
@@ -166,18 +166,18 @@
  				/* Create default route through i/f */
  int  cifdefaultroute __P((int, u_int32_t, u_int32_t));
  				/* Delete default route through i/f */
---- pppd/sys-linux.c
+--- pppd/sys-linux.c.orig
 +++ pppd/sys-linux.c
-@@ -206,6 +206,8 @@
- static int	if_is_up;	/* Interface has been marked up */
+@@ -209,6 +209,8 @@ static int	if_is_up;	/* Interface has be
  static int	if6_is_up;	/* Interface has been marked up for IPv6, to help differentiate */
  static int	have_default_route;	/* Gateway for default route added */
-+static struct rtentry old_def_rt;       /* Old default route */
-+static int       default_rt_repl_rest;  /* replace and restore old default rt */
+ static int	have_default_route6;	/* Gateway for default IPv6 route added */
++static struct rtentry old_def_rt;	/* Old default route */
++static int	default_rt_repl_rest;	/* replace and restore old default rt */
  static u_int32_t proxy_arp_addr;	/* Addr for proxy arp entry added */
  static char proxy_arp_dev[16];		/* Device for proxy arp entry */
  static u_int32_t our_old_addr;		/* for detecting address changes */
-@@ -1513,6 +1515,9 @@
+@@ -1570,6 +1572,9 @@ static int read_route_table(struct rtent
  	p = NULL;
      }
  
@@ -187,7 +187,7 @@
      SIN_ADDR(rt->rt_dst) = strtoul(cols[route_dest_col], NULL, 16);
      SIN_ADDR(rt->rt_gateway) = strtoul(cols[route_gw_col], NULL, 16);
      SIN_ADDR(rt->rt_genmask) = strtoul(cols[route_mask_col], NULL, 16);
-@@ -1582,22 +1587,53 @@
+@@ -1642,20 +1647,52 @@ int have_route_to(u_int32_t addr)
  /********************************************************************
   *
   * sifdefaultroute - assign a default route through the address given.
@@ -197,13 +197,13 @@
 -{
 -    struct rtentry rt;
 -
--    if (defaultroute_exists(&rt) && strcmp(rt.rt_dev, ifname) != 0) {
+-    if (defaultroute_exists(&rt, dfl_route_metric) && strcmp(rt.rt_dev, ifname) != 0) {
 -	if (rt.rt_flags & RTF_GATEWAY)
--	    error("not replacing existing default route via %I",
--		  SIN_ADDR(rt.rt_gateway));
+-	    error("not replacing existing default route via %I with metric %d",
+-		  SIN_ADDR(rt.rt_gateway), dfl_route_metric);
 -	else
--	    error("not replacing existing default route through %s",
--		  rt.rt_dev);
+-	    error("not replacing existing default route through %s with metric %d",
+-		  rt.rt_dev, dfl_route_metric);
 -	return 0;
 + *
 + * If the global default_rt_repl_rest flag is set, then this function
@@ -221,42 +221,40 @@
 +    struct rtentry *del_rt = NULL;
 +
 +    if (default_rt_repl_rest) {
-+       /* We have already reclaced the original defaultroute, if we
++	/* We have already reclaced the original defaultroute, if we
 +         * are called again, we will delete the current default route
 +         * and set the new default route in this function.
-+         * - this is normally only the case the doing demand: */
-+       if (defaultroute_exists( &tmp_rt ))
-+               del_rt = &tmp_rt;
-+    } else if ( defaultroute_exists( &old_def_rt                ) &&
-+                            strcmp(  old_def_rt.rt_dev, ifname ) != 0) {
-+       /* We did not yet replace an existing default route, let's
-+        * check if we should save and replace a default route:
++	 * - this is normally only the case the doing demand: */
++      if (defaultroute_exists( &tmp_rt, dfl_route_metric ))
++	    del_rt = &tmp_rt;
++    } else if ( defaultroute_exists( &old_def_rt, dfl_route_metric ) &&
++		strcmp(  old_def_rt.rt_dev, ifname ) != 0) {
++	/* We did not yet replace an existing default route, let's
++	 * check if we should save and replace a default route:
 +         */
-+       u_int32_t old_gateway = SIN_ADDR(old_def_rt.rt_gateway);
++	u_int32_t old_gateway = SIN_ADDR(old_def_rt.rt_gateway);
 +
-+       if (old_gateway != gateway) {
-+           if (!replace) {
-+               error("not replacing default route to %s [%I]",
-+                       old_def_rt.rt_dev, old_gateway);
-+               return 0;
-+           } else {
-+               // we need to copy rt_dev because we need it permanent too:
-+               char * tmp_dev = malloc(strlen(old_def_rt.rt_dev)+1);
-+               strcpy(tmp_dev, old_def_rt.rt_dev);
-+               old_def_rt.rt_dev = tmp_dev;
++	if (old_gateway != gateway) {
++	    if (!replace) {
++		error("not replacing default route to %s [%I] with metric %d",
++		      old_def_rt.rt_dev, old_gateway, dfl_route_metric);
++		return 0;
++	    } else {
++		// we need to copy rt_dev because we need it permanent too:
++		char * tmp_dev = malloc(strlen(old_def_rt.rt_dev)+1);
++		strcpy(tmp_dev, old_def_rt.rt_dev);
++		old_def_rt.rt_dev = tmp_dev;
 +
-+               notice("replacing old default route to %s [%I]",
-+                       old_def_rt.rt_dev, old_gateway);
-+               default_rt_repl_rest = 1;
-+               del_rt = &old_def_rt;
-+           }
-+       }
++		notice("replacing old default route to %s [%I] with metric $d",
++                       old_def_rt.rt_dev, old_gateway, dfl_route_metric);
++		default_rt_repl_rest = 1;
++		del_rt = &old_def_rt;
++	    }
++	}
      }
--
-     memset (&rt, 0, sizeof (rt));
-     SET_SA_FAMILY (rt.rt_dst, AF_INET);
  
-@@ -1614,6 +1650,12 @@
+     memset (&rt, 0, sizeof (rt));
+@@ -1675,6 +1712,12 @@ int sifdefaultroute (int unit, u_int32_t
  	    error("default route ioctl(SIOCADDRT): %m");
  	return 0;
      }
@@ -269,7 +267,7 @@
  
      have_default_route = 1;
      return 1;
-@@ -1647,6 +1689,16 @@
+@@ -1713,6 +1756,16 @@ int cifdefaultroute (int unit, u_int32_t
  	    return 0;
  	}
      }
diff --git a/ppp-2.4.3-filter.diff b/ppp-filter.patch
similarity index 83%
rename from ppp-2.4.3-filter.diff
rename to ppp-filter.patch
index 30931ea..3c32402 100644
--- a/ppp-2.4.3-filter.diff
+++ b/ppp-filter.patch
@@ -1,5 +1,5 @@
---- ppp-2.4.4/pppd/demand.c
-+++ ppp-2.4.4/pppd/demand.c
+--- pppd/demand.c.orig
++++ pppd/demand.c
 @@ -45,6 +45,7 @@
  #include <sys/socket.h>
  #ifdef PPP_FILTER
@@ -8,7 +8,7 @@
  #endif
  
  #include "pppd.h"
-@@ -341,6 +342,7 @@
+@@ -340,6 +341,7 @@ active_packet(p, len)
  	return 0;
      proto = PPP_PROTOCOL(p);
  #ifdef PPP_FILTER
@@ -16,7 +16,7 @@
      p[0] = 1;		/* outbound packet indicator */
      if ((pass_filter.bf_len != 0
  	 && bpf_filter(pass_filter.bf_insns, p, len, len) == 0)
-@@ -350,6 +352,7 @@
+@@ -349,6 +351,7 @@ active_packet(p, len)
  	return 0;
      }
      p[0] = 0xff;
@@ -24,9 +24,9 @@
  #endif
      for (i = 0; (protp = protocols[i]) != NULL; ++i) {
  	if (protp->protocol < 0xC000 && (protp->protocol & ~0x8000) == proto) {
---- ppp-2.4.4/pppd/options.c
-+++ ppp-2.4.4/pppd/options.c
-@@ -1459,6 +1459,10 @@
+--- pppd/options.c.orig
++++ pppd/options.c
+@@ -1505,6 +1505,10 @@ setpassfilter(argv)
      int ret = 1;
  
      pc = pcap_open_dead(DLT_PPP_PPPD, 65535);
@@ -37,7 +37,7 @@
      if (pcap_compile(pc, &pass_filter, *argv, 1, netmask) == -1) {
  	option_error("error in pass-filter expression: %s\n",
  		     pcap_geterr(pc));
-@@ -1480,6 +1484,11 @@
+@@ -1526,6 +1530,11 @@ setactivefilter(argv)
      int ret = 1;
  
      pc = pcap_open_dead(DLT_PPP_PPPD, 65535);
diff --git a/ppp-2.4.7-fix-bashisms.patch b/ppp-fix-bashisms.patch
similarity index 100%
rename from ppp-2.4.7-fix-bashisms.patch
rename to ppp-fix-bashisms.patch
diff --git a/ppp-2.4.3-fork-fix.diff b/ppp-fork-fix.patch
similarity index 89%
rename from ppp-2.4.3-fork-fix.diff
rename to ppp-fork-fix.patch
index 1f21624..1201791 100644
--- a/ppp-2.4.3-fork-fix.diff
+++ b/ppp-fork-fix.patch
@@ -1,6 +1,6 @@
---- pppd/main.c
+--- pppd/main.c.orig
 +++ pppd/main.c
-@@ -1540,14 +1540,6 @@
+@@ -1551,14 +1551,6 @@ safe_fork(int infd, int outfd, int errfd
  	int fd, pipefd[2];
  	char buf[1];
  
@@ -15,8 +15,8 @@
  	if (pipe(pipefd) == -1)
  		pipefd[0] = pipefd[1] = -1;
  	pid = fork();
-@@ -1570,25 +1562,31 @@
- 	tdb_close(pppdb);
+@@ -1582,25 +1574,31 @@ safe_fork(int infd, int outfd, int errfd
+ 		tdb_close(pppdb);
  #endif
  
 -	/* make sure infd, outfd and errfd won't get tromped on below */
@@ -64,7 +64,7 @@
  		close(log_to_fd);
  	if (the_channel->close)
  		(*the_channel->close)();
-@@ -1596,12 +1594,18 @@
+@@ -1608,12 +1606,18 @@ safe_fork(int infd, int outfd, int errfd
  		close(devfd);	/* some plugins don't have a close function */
  	close(fd_ppp);
  	close(fd_devnull);
diff --git a/ppp-2.4.1-higher-speeds.diff b/ppp-higher-speeds.patch
similarity index 77%
rename from ppp-2.4.1-higher-speeds.diff
rename to ppp-higher-speeds.patch
index 9e481ce..cc7121a 100644
--- a/ppp-2.4.1-higher-speeds.diff
+++ b/ppp-higher-speeds.patch
@@ -1,8 +1,6 @@
-Index: pppd/sys-linux.c
-===================================================================
 --- pppd/sys-linux.c.orig
 +++ pppd/sys-linux.c
-@@ -875,6 +875,24 @@ struct speed {
+@@ -904,6 +904,24 @@ struct speed {
  #ifdef B4000000
      { 4000000, B4000000 },
  #endif
diff --git a/ppp-2.4.6-lib64.patch b/ppp-lib64.patch
similarity index 59%
rename from ppp-2.4.6-lib64.patch
rename to ppp-lib64.patch
index 6aeacb2..c02978f 100644
--- a/ppp-2.4.6-lib64.patch
+++ b/ppp-lib64.patch
@@ -1,7 +1,5 @@
-Index: PLUGINS
-===================================================================
---- PLUGINS.orig	2009-11-16 23:26:07.000000000 +0100
-+++ PLUGINS	2011-01-05 11:03:50.806314592 +0100
+--- PLUGINS.orig
++++ PLUGINS
 @@ -14,7 +14,7 @@ plugin support only under Linux and Sola
  Plugins are loaded into pppd using the `plugin' option, which takes
  one argument, the name of a shared object file.  The plugin option is
@@ -11,11 +9,9 @@ Index: PLUGINS
  <version> is the version number of pppd, for example, 2.4.2.  I
  suggest that you either give the full path name of the shared object
  file or just the base name; if you don't, it may be possible for
-Index: README
-===================================================================
---- README.orig	2009-11-16 23:26:07.000000000 +0100
-+++ README	2011-01-05 11:03:50.806314592 +0100
-@@ -226,8 +226,8 @@ What was new in ppp-2.4.1.
+--- README.orig
++++ README
+@@ -261,8 +261,8 @@ What was new in ppp-2.4.1.
    per-tty options file are parsed correctly, and don't override values
    from the command line in most cases.
  
@@ -26,10 +22,8 @@ Index: README
    there is no slash in the plugin name.
  
  * When loading a plugin, pppd will now check the version of pppd for
-Index: pppd/pathnames.h
-===================================================================
---- pppd/pathnames.h.orig	2009-11-16 23:26:07.000000000 +0100
-+++ pppd/pathnames.h	2011-01-05 11:03:53.888316500 +0100
+--- pppd/pathnames.h.orig
++++ pppd/pathnames.h
 @@ -57,9 +57,9 @@
  
  #ifdef PLUGIN
@@ -42,10 +36,8 @@ Index: pppd/pathnames.h
  #endif /* __STDC__ */
  
  #endif /* PLUGIN */
-Index: pppd/plugins/Makefile.linux
-===================================================================
---- pppd/plugins/Makefile.linux.orig	2011-01-05 11:03:50.000000000 +0100
-+++ pppd/plugins/Makefile.linux	2011-01-05 11:03:50.821313579 +0100
+--- pppd/plugins/Makefile.linux.orig
++++ pppd/plugins/Makefile.linux
 @@ -7,7 +7,7 @@ INSTALL	= install
  DESTDIR = $(INSTROOT)@DESTDIR@
  BINDIR = $(DESTDIR)/sbin
@@ -55,10 +47,8 @@ Index: pppd/plugins/Makefile.linux
  
  SUBDIRS := rp-pppoe pppoatm pppol2tp
  # Uncomment the next line to include the radius authentication plugin
-Index: pppd/plugins/pppoatm/Makefile.linux
-===================================================================
---- pppd/plugins/pppoatm/Makefile.linux.orig	2011-01-05 11:03:50.000000000 +0100
-+++ pppd/plugins/pppoatm/Makefile.linux	2011-01-05 11:03:50.829313471 +0100
+--- pppd/plugins/pppoatm/Makefile.linux.orig
++++ pppd/plugins/pppoatm/Makefile.linux
 @@ -7,7 +7,7 @@ INSTALL	= install
  #***********************************************************************
  
@@ -68,10 +58,8 @@ Index: pppd/plugins/pppoatm/Makefile.linux
  
  VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
  
-Index: pppd/plugins/pppol2tp/Makefile.linux
-===================================================================
---- pppd/plugins/pppol2tp/Makefile.linux.orig	2011-01-05 11:03:50.000000000 +0100
-+++ pppd/plugins/pppol2tp/Makefile.linux	2011-01-05 11:03:50.829313471 +0100
+--- pppd/plugins/pppol2tp/Makefile.linux.orig
++++ pppd/plugins/pppol2tp/Makefile.linux
 @@ -7,7 +7,7 @@ INSTALL	= install
  #***********************************************************************
  
@@ -81,10 +69,8 @@ Index: pppd/plugins/pppol2tp/Makefile.linux
  
  VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
  
-Index: pppd/plugins/radius/Makefile.linux
-===================================================================
---- pppd/plugins/radius/Makefile.linux.orig	2011-01-05 11:03:50.000000000 +0100
-+++ pppd/plugins/radius/Makefile.linux	2011-01-05 11:03:50.830314899 +0100
+--- pppd/plugins/radius/Makefile.linux.orig
++++ pppd/plugins/radius/Makefile.linux
 @@ -5,7 +5,7 @@
  
  DESTDIR = $(INSTROOT)@DESTDIR@
@@ -94,10 +80,8 @@ Index: pppd/plugins/radius/Makefile.linux
  
  VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
  
-Index: pppd/plugins/rp-pppoe/Makefile.linux
-===================================================================
---- pppd/plugins/rp-pppoe/Makefile.linux.orig	2011-01-05 11:03:50.000000000 +0100
-+++ pppd/plugins/rp-pppoe/Makefile.linux	2011-01-05 11:03:50.838313490 +0100
+--- pppd/plugins/rp-pppoe/Makefile.linux.orig
++++ pppd/plugins/rp-pppoe/Makefile.linux
 @@ -16,7 +16,7 @@
  
  DESTDIR = $(INSTROOT)@DESTDIR@
@@ -107,11 +91,9 @@ Index: pppd/plugins/rp-pppoe/Makefile.linux
  
  PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
  
-Index: pppd/pppd.8
-===================================================================
---- pppd/pppd.8.orig	2011-01-05 11:03:50.000000000 +0100
-+++ pppd/pppd.8	2011-01-05 11:03:53.888316500 +0100
-@@ -911,7 +911,7 @@ persistent connections.
+--- pppd/pppd.8.orig
++++ pppd/pppd.8
+@@ -946,7 +946,7 @@ persistent connections.
  .B plugin \fIfilename
  Load the shared library object file \fIfilename\fR as a plugin.  This
  is a privileged option.  If \fIfilename\fR does not contain a slash
diff --git a/ppp-2.4.6-make.diff b/ppp-make.patch
similarity index 75%
rename from ppp-2.4.6-make.diff
rename to ppp-make.patch
index d241691..bdc6192 100644
--- a/ppp-2.4.6-make.diff
+++ b/ppp-make.patch
@@ -1,6 +1,6 @@
---- chat/Makefile.linux
+--- chat/Makefile.linux.orig
 +++ chat/Makefile.linux
-@@ -11,7 +11,7 @@
+@@ -11,7 +11,7 @@ CDEF4=	-DFNDELAY=O_NDELAY		# Old name va
  CDEFS=	$(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4)
  
  COPTS=	-O2 -g -pipe
@@ -9,7 +9,7 @@
  
  INSTALL= install
  
-@@ -25,8 +25,8 @@
+@@ -25,8 +25,8 @@ chat.o:	chat.c
  
  install: chat
  	mkdir -p $(BINDIR) $(MANDIR)
@@ -20,9 +20,9 @@
  
  clean:
  	rm -f chat.o chat *~
---- pppd/Makefile.linux
+--- pppd/Makefile.linux.orig
 +++ pppd/Makefile.linux
-@@ -32,8 +32,9 @@
+@@ -32,8 +32,9 @@ endif
  
  # CC = gcc
  #
@@ -32,9 +32,9 @@
 +COPTS = $(MY_CFLAGS) -O2 -pipe -Wall -fno-strict-aliasing
 +LIBS = -lutil
  
- # Uncomment the next 2 lines to include support for Microsoft's
+ # Uncomment the next line to include support for Microsoft's
  # MS-CHAP authentication protocol.  Also, edit plugins/radius/Makefile.linux.
-@@ -208,10 +209,8 @@
+@@ -219,10 +220,8 @@ all: $(TARGETS)
  install: pppd
  	mkdir -p $(BINDIR) $(MANDIR)
  	$(EXTRAINSTALL)
@@ -46,8 +46,8 @@
 +	$(INSTALL) -m 644 pppd.8 $(MANDIR)
  
  pppd: $(PPPDOBJS)
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o pppd $(PPPDOBJS) $(LIBS)
---- pppd/plugins/Makefile.linux
+ 	$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_PLUGIN) -o pppd $(PPPDOBJS) $(LIBS)
+--- pppd/plugins/Makefile.linux.orig
 +++ pppd/plugins/Makefile.linux
 @@ -1,5 +1,5 @@
 -#CC	= gcc
@@ -55,18 +55,18 @@
 +CC	= gcc
 +COPTS	= $(MY_CFLAGS) -O2 -g -Wall
  CFLAGS	= $(COPTS) -I.. -I../../include -fPIC
- LDFLAGS	= -shared
+ LDFLAGS_SHARED	= -shared
  INSTALL	= install
---- pppd/plugins/pppoatm/Makefile.linux
+--- pppd/plugins/pppoatm/Makefile.linux.orig
 +++ pppd/plugins/pppoatm/Makefile.linux
 @@ -1,5 +1,5 @@
  #CC	= gcc
 -COPTS	= -O2 -g
 +COPTS	= $(MY_CFLAGS) -O2 -g
  CFLAGS	= $(COPTS) -I../.. -I../../../include -fPIC
- LDFLAGS	= -shared
+ LDFLAGS_SHARED	= -shared
  INSTALL	= install
---- pppd/plugins/pppol2tp/Makefile.linux
+--- pppd/plugins/pppol2tp/Makefile.linux.orig
 +++ pppd/plugins/pppol2tp/Makefile.linux
 @@ -1,5 +1,5 @@
 -#CC	= gcc
@@ -74,9 +74,9 @@
 +CC	= gcc
 +COPTS	= $(MY_CFLAGS) -O2 -pipe -Wall
  CFLAGS	= $(COPTS) -I. -I../.. -I../../../include -fPIC
- LDFLAGS	= -shared
+ LDFLAGS_SHARED	= -shared
  INSTALL	= install
-@@ -20,7 +20,7 @@
+@@ -20,7 +20,7 @@ all: $(PLUGINS)
  
  install: all
  	$(INSTALL) -d -m 755 $(LIBDIR)
@@ -85,9 +85,9 @@
  
  clean:
  	rm -f *.o *.so
---- pppd/plugins/radius/Makefile.linux
+--- pppd/plugins/radius/Makefile.linux.orig
 +++ pppd/plugins/radius/Makefile.linux
-@@ -12,7 +12,8 @@
+@@ -12,7 +12,8 @@ VERSION = $(shell awk -F '"' '/VERSION/
  INSTALL	= install
  
  PLUGIN=radius.so radattr.so radrealms.so
@@ -97,9 +97,9 @@
  
  # Uncomment the next line to include support for Microsoft's
  # MS-CHAP authentication protocol.
---- pppd/plugins/rp-pppoe/Makefile.linux
+--- pppd/plugins/rp-pppoe/Makefile.linux.orig
 +++ pppd/plugins/rp-pppoe/Makefile.linux
-@@ -25,7 +25,7 @@
+@@ -25,7 +25,7 @@ INSTALL	= install
  # Version is set ONLY IN THE MAKEFILE!  Don't delete this!
  RP_VERSION=3.8p
  
@@ -108,7 +108,7 @@
  CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"'
  all: rp-pppoe.so pppoe-discovery
  
-@@ -43,7 +43,7 @@
+@@ -43,7 +43,7 @@ rp-pppoe.so: plugin.o discovery.o if.o c
  
  install: all
  	$(INSTALL) -d -m 755 $(LIBDIR)
@@ -117,9 +117,9 @@
  	$(INSTALL) -d -m 755 $(BINDIR)
  	$(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR)
  
---- pppdump/Makefile.linux
+--- pppdump/Makefile.linux.orig
 +++ pppdump/Makefile.linux
-@@ -2,7 +2,7 @@
+@@ -2,7 +2,7 @@ DESTDIR = $(INSTROOT)@DESTDIR@
  BINDIR = $(DESTDIR)/sbin
  MANDIR = $(DESTDIR)/share/man/man8
  
@@ -128,7 +128,7 @@
  OBJS = pppdump.o bsd-comp.o deflate.o zlib.o
  
  INSTALL= install
-@@ -17,5 +17,5 @@
+@@ -17,5 +17,5 @@ clean:
  
  install:
  	mkdir -p $(BINDIR) $(MANDIR)
@@ -136,9 +136,9 @@
 -	$(INSTALL) -c -m 444 pppdump.8 $(MANDIR)
 +	$(INSTALL) pppdump $(BINDIR)
 +	$(INSTALL) -m 444 pppdump.8 $(MANDIR)
---- pppstats/Makefile.linux
+--- pppstats/Makefile.linux.orig
 +++ pppstats/Makefile.linux
-@@ -9,8 +9,8 @@
+@@ -9,8 +9,8 @@ MANDIR = $(DESTDIR)/share/man/man8
  PPPSTATSRCS = pppstats.c
  PPPSTATOBJS = pppstats.o
  
@@ -149,7 +149,7 @@
  COMPILE_FLAGS = -I../include
  LIBS =
  
-@@ -22,8 +22,8 @@
+@@ -22,8 +22,8 @@ all: pppstats
  
  install: pppstats
  	-mkdir -p $(MANDIR)
@@ -159,4 +159,4 @@
 +	$(INSTALL) -m 444 pppstats.8 $(MANDIR)
  
  pppstats: $(PPPSTATSRCS)
- 	$(CC) $(CFLAGS) -o pppstats pppstats.c $(LIBS)
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o pppstats pppstats.c $(LIBS)
diff --git a/ppp-2.4.6-misc.diff b/ppp-misc.patch
similarity index 84%
rename from ppp-2.4.6-misc.diff
rename to ppp-misc.patch
index 2ca796b..b21d3b9 100644
--- a/ppp-2.4.6-misc.diff
+++ b/ppp-misc.patch
@@ -1,6 +1,6 @@
---- pppd/auth.c
+--- pppd/auth.c.orig
 +++ pppd/auth.c
-@@ -2091,9 +2091,10 @@
+@@ -2105,9 +2105,10 @@ check_access(f, filename)
  
      if (fstat(fileno(f), &sbuf) < 0) {
  	warn("cannot stat secret file %s: %m", filename);
@@ -14,9 +14,9 @@
      }
  }
  
---- pppd/lcp.c
+--- pppd/lcp.c.orig
 +++ pppd/lcp.c
-@@ -2303,7 +2303,7 @@
+@@ -2302,7 +2302,7 @@ lcp_received_echo_reply (f, id, inp, len
      if (lcp_gotoptions[f->unit].neg_magicnumber
  	&& magic == lcp_gotoptions[f->unit].magicnumber) {
  	warn("appear to have received our own echo-reply!");
@@ -25,9 +25,9 @@
      }
  
      /* Reset the number of outstanding echo frames */
---- pppd/pppd.h
+--- pppd/pppd.h.orig
 +++ pppd/pppd.h
-@@ -848,15 +848,7 @@
+@@ -873,15 +873,7 @@ extern void (*snoop_send_hook) __P((unsi
  #define DEBUGCHAP	1
  #endif
  
diff --git a/ppp-pie.patch b/ppp-pie.patch
new file mode 100644
index 0000000..cbea0a8
--- /dev/null
+++ b/ppp-pie.patch
@@ -0,0 +1,33 @@
+--- pppd/Makefile.linux.orig
++++ pppd/Makefile.linux
+@@ -224,7 +224,7 @@ install: pppd
+ 	$(INSTALL) -m 644 pppd.8 $(MANDIR)
+ 
+ pppd: $(PPPDOBJS)
+-	$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_PLUGIN) -o pppd $(PPPDOBJS) $(LIBS)
++	$(CC) $(CFLAGS) -pie -fPIC $(LDFLAGS) $(LDFLAGS_PLUGIN) -o pppd $(PPPDOBJS) $(LIBS)
+ 
+ srp-entry:	srp-entry.c
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ srp-entry.c $(LIBS)
+--- chat/Makefile.linux.orig
++++ chat/Makefile.linux
+@@ -18,7 +18,7 @@ INSTALL= install
+ all:	chat
+ 
+ chat:	chat.o
+-	$(CC) $(LDFLAGS) -o chat chat.o
++	$(CC) -pie $(LDFLAGS) -o chat chat.o
+ 
+ chat.o:	chat.c
+ 	$(CC) -c $(CFLAGS) -o chat.o chat.c
+--- pppstats/Makefile.linux.orig
++++ pppstats/Makefile.linux
+@@ -26,7 +26,7 @@ install: pppstats
+ 	$(INSTALL) -m 444 pppstats.8 $(MANDIR)
+ 
+ pppstats: $(PPPSTATSRCS)
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o pppstats pppstats.c $(LIBS)
++	$(CC) $(CFLAGS) -pie -fPIE $(LDFLAGS) -o pppstats pppstats.c $(LIBS)
+ 
+ clean:
+ 	rm -f pppstats *~ #* core
diff --git a/ppp-send-padt.patch b/ppp-send-padt.patch
deleted file mode 100644
index 2b79987..0000000
--- a/ppp-send-padt.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: ppp-2.4.5/pppd/plugins/rp-pppoe/plugin.c
-===================================================================
---- ppp-2.4.5.orig/pppd/plugins/rp-pppoe/plugin.c	2009-11-16 23:26:07.000000000 +0100
-+++ ppp-2.4.5/pppd/plugins/rp-pppoe/plugin.c	2013-07-24 12:36:08.433729757 +0200
-@@ -242,7 +242,7 @@
- 		sizeof(struct sockaddr_pppox)) < 0)
- 	error("Failed to disconnect PPPoE socket: %d %m", errno);
-     close(conn->sessionSocket);
--    /* don't send PADT?? */
-+    sendPADT(conn, NULL);
-     if (conn->discoverySocket >= 0)
- 	close(conn->discoverySocket);
- }
diff --git a/ppp-2.4.2-smpppd.diff b/ppp-smpppd.patch
similarity index 86%
rename from ppp-2.4.2-smpppd.diff
rename to ppp-smpppd.patch
index 5195634..04708b0 100644
--- a/ppp-2.4.2-smpppd.diff
+++ b/ppp-smpppd.patch
@@ -1,6 +1,6 @@
---- pppd/main.c
+--- pppd/main.c.orig
 +++ pppd/main.c
-@@ -1808,8 +1808,8 @@
+@@ -1920,8 +1920,8 @@ forget_child(pid, status)
      if (WIFSIGNALED(status)) {
          warn("Child process %s (pid %d) terminated with signal %d",
  	     (chp? chp->prog: "??"), pid, WTERMSIG(status));
diff --git a/ppp-2.4.4-var_run_resolv_conf.patch b/ppp-var_run_resolv_conf.patch
similarity index 87%
rename from ppp-2.4.4-var_run_resolv_conf.patch
rename to ppp-var_run_resolv_conf.patch
index 8d1041e..7e7db8a 100644
--- a/ppp-2.4.4-var_run_resolv_conf.patch
+++ b/ppp-var_run_resolv_conf.patch
@@ -1,6 +1,6 @@
---- Changes-2.3
+--- Changes-2.3.orig
 +++ Changes-2.3
-@@ -262,10 +262,10 @@
+@@ -262,10 +262,10 @@ What was new in ppp-2.3.6.
  
  * Added new option `usepeerdns', thanks to Nick Walker
    <nickwalker@email.com>.  If the peer supplies DNS addresses, these
@@ -15,9 +15,9 @@
  
  * The Solaris ppp driver should now work correctly on SMP systems.
  
---- pppd/ipcp.c
+--- pppd/ipcp.c.orig
 +++ pppd/ipcp.c
-@@ -2041,10 +2041,13 @@
+@@ -2148,10 +2148,13 @@ create_resolv(peerdns1, peerdns2)
      u_int32_t peerdns1, peerdns2;
  {
      FILE *f;
@@ -33,7 +33,7 @@
  	return;
      }
  
-@@ -2055,7 +2058,7 @@
+@@ -2162,7 +2165,7 @@ create_resolv(peerdns1, peerdns2)
  	fprintf(f, "nameserver %s\n", ip_ntoa(peerdns2));
  
      if (ferror(f))
@@ -42,7 +42,7 @@
  
      fclose(f);
  }
---- pppd/pathnames.h
+--- pppd/pathnames.h.orig
 +++ pppd/pathnames.h
 @@ -30,7 +30,7 @@
  #define _PATH_TTYOPT	 _ROOT_PATH "/etc/ppp/options."
@@ -53,9 +53,9 @@
  
  #define _PATH_USEROPT	 ".ppprc"
  #define	_PATH_PSEUDONYM	 ".ppp_pseudonym"
---- pppd/pppd.8
+--- pppd/pppd.8.orig
 +++ pppd/pppd.8
-@@ -1062,8 +1062,8 @@
+@@ -1143,8 +1143,8 @@ Ask the peer for up to 2 DNS server addr
  by the peer (if any) are passed to the /etc/ppp/ip\-up script in the
  environment variables DNS1 and DNS2, and the environment variable
  USEPEERDNS will be set to 1.  In addition, pppd will create an
diff --git a/ppp.changes b/ppp.changes
index 99a5d65..cf724e6 100644
--- a/ppp.changes
+++ b/ppp.changes
@@ -1,3 +1,47 @@
+-------------------------------------------------------------------
+Mon Aug  3 14:52:55 UTC 2020 - Reinhard Max <max@suse.com>
+
+- New version 2.4.8.
+  * New pppd options have been added:
+    * ifname, to set the name for the PPP interface device
+    * defaultroute-metric, to set the metric for the default route
+    * defaultroute6, to add an IPv6 default route (with
+      nodefaultroute6 to prevent adding an IPv6 default route).
+    * up_sdnotify, to have pppd notify systemd when the link is up.
+
+  * The rp-pppoe plugin has new options:
+    * host-uniq, to set the Host-Uniq value to send
+    * pppoe-padi-timeout, to set the timeout for discovery packets
+    * pppoe-padi-attempts, to set the number of discovery attempts.
+
+  * Added the CLASS attribute in radius packets.
+
+  * Fixed warnings and issues found by static analysis.
+
+- Obsoleted patches:
+  * ppp-2.4.3-pppoatm.diff
+  * ppp-2.4.4-strncatfix.patch
+  * ppp-2.4.6-ifname.diff
+  * ppp-2.4.7-DES-openssl.patch
+  * ppp-2.4.7.tar.gz.asc
+  * ppp-send-padt.patch
+
+- Patches that got renamed, because they needed rediffing:
+  * ppp-2.4.1-higher-speeds.diff -> ppp-higher-speeds.patch
+  * ppp-2.4.1-higher-speeds.diff -> ppp-higher-speeds.patch
+  * ppp-2.4.2-__P.diff -> ppp-__P.patch
+  * ppp-2.4.2-cifdefroute.diff -> ppp-cifdefroute.patch
+  * ppp-2.4.2-pie.patch -> ppp-pie.patch
+  * ppp-2.4.2-smpppd.diff -> ppp-smpppd.patch
+  * ppp-2.4.3-filter.diff -> ppp-filter.patch
+  * ppp-2.4.3-fork-fix.diff -> ppp-fork-fix.patch
+  * ppp-2.4.4-var_run_resolv_conf.patch -> ppp-var_run_resolv_conf.patch
+  * ppp-2.4.6-lib64.patch -> ppp-lib64.patch
+  * ppp-2.4.6-make.diff -> ppp-make.patch
+  * ppp-2.4.6-misc.diff -> ppp-misc.patch
+
+- bsc#1172916: Fix an outdated comment for lcp-echo-interval.
+
 -------------------------------------------------------------------
 Tue May 19 15:40:26 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/ppp.keyring b/ppp.keyring
index 4e34958..c8ca1e9 100644
--- a/ppp.keyring
+++ b/ppp.keyring
@@ -1,28 +1,157 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: SKS 1.1.6
+Comment: Hostname: sks.pod02.fleetstreetops.com
 
-mQINBE6U85gBEACYU+BDUOcO7uG3S2JilDFgHjr0i9bpoHjvEiFp63i6SDXPtWl4
-QtOVXM+f3uahAHyzfrJ0xe9Jx0hDDVNZqsk3jnEj5siAMAm80atoST5h4bk5TE9w
-5fIOqUuKWh4i7bJOnUzmGoIF9N0xVCfcSaU4+kzRtnBnTPon+q+brDc79Tyk7PVj
-P/2YTa5Vjzx1zqrHTOFBwXRk1RyVSATDAvqkA8vVw1odhmCP7EhKKT7nLBh8swz4
-DVk8ylVCkB+6UFlAXlq8c0cbFMB8Zjr9gYJaQ4nxJVQcSFizS67EalathxeHOjjg
-QUK9kCWExOfkcf3zAfKxFUM6oq/iH+A1O0ieVYKxbGHYDZLmMAgkJweDhbyWzSoZ
-WeWneuIIxaPvxH3wHDf5NLlsHaiTxoR08zq2PN5IHEmYgR6nvYxAd3ZXLEojWXZB
-AbOIZxPUvbB+DHF+7WYMKPdBLWvY6W8w0t4EYOt5N0W+/+AL2ZTCYJjZCHvhZxhC
-ki8grkIcShPf6BQLe3UJc/maJGu0Co1mhiCYx2a3AAkq8E1NZ0nzEP9+eoGohjvF
-ht5P/omDpU/VrZOBrgCFBDHUymvBsKw9ofaLUIplH4gJRHB47pLLFob3LDzbXyb4
-GB3LrOuioqLaVgrjz6lymzxXVTzHlQkAYayN4jvve6jauFQF/QAZg1gotwARAQAB
-tC9QYXVsIE1hY2tlcnJhcyAoU2lnbmluZyBrZXkpIDxwYXVsdXNAc2FtYmEub3Jn
-PokCOAQTAQIAIgUCTpTzmAIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQ
-nkKV1gX2bOmPOA/9Eom5EbPMPYjj7ejB3pHm3Sbz/F93NYfvKcCa/wGjrvwXegLG
-7HONztAyD2ftr81LfiSTE+9iPcbEmjcvJrWaO+Id3LuTVTvNe7Nyzu/SpM2DUVDI
-suqKDpVrXO5FUjAU3JRxTyPscaC7BJJFoksbwXEuNyCtZ8jCxb+Z7nxnVJrxh4p6
-Z5DucisiQbgVuMcM2LBtZz8CTeAOIwUgmNVuKnRJzvyPEiC7xMN8ilka/A5XHDbc
-J8MEuWSb2cK3ETA4OU2h/xYS6hK2eHij2KOSlWbwBbtpAAy73+wku1v2KEulsC1Y
-aRYCJE1lyZ9Wkvg0ErWxYml7HDluA7swWDxu+J4PyxfWood+8eEAs4kb8WCY1KTX
-EhooIoX7Xo6CCu4FxUH1Qa0jdtqE/we9L0NNXul+AfhPUTDykWAXYGlNgFnDzJ4l
-WsGlRK21Ku6a4RFrK9O1bvl3B3wAH57kWKcYVgDe1i/C/oHLDaWKQ+e/g2g07ooT
-9gzJIyFbT8DHfFYAP5a5oCLKnR2tAfmtqWxuSoGX02IcBY2bmjZ1qEeiWOvz+WQb
-MAx/1l0e42NODvUOHK2SInz+EPLyroQ/uaSSTnlR3yNgyhmr0Cllll5gqFIwVscs
-TTzDLoR3NYb5IPRbye9aL8BDO6o/+TFaWQ7YYGAdQUABIqiirEWU6wu62xk=
-=lGHU
+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
+=lvBd
 -----END PGP PUBLIC KEY BLOCK-----
+
diff --git a/ppp.spec b/ppp.spec
index 37f257e..6ca28ca 100644
--- a/ppp.spec
+++ b/ppp.spec
@@ -18,7 +18,7 @@
 
 %define _group dialout
 Name:           ppp
-Version:        2.4.7
+Version:        2.4.8
 Release:        0
 Summary:        The Point to Point Protocol for Linux
 License:        BSD-3-Clause AND LGPL-2.1-or-later AND GPL-2.0-or-later
@@ -49,35 +49,29 @@ Source16:       modem.rules
 Source17:       %{name}.keyring
 Source18:       https://download.samba.org/pub/%{name}/%{name}-%{version}.tar.gz.asc
 # Makefile changes
-Patch0:         ppp-2.4.6-make.diff
+Patch0:         ppp-make.patch
 # replacedefaultroute option
-Patch2:         ppp-2.4.2-cifdefroute.diff
+Patch2:         ppp-cifdefroute.patch
 # misc tiny stuff
-Patch3:         ppp-2.4.6-misc.diff
+Patch3:         ppp-misc.patch
 # more log output for smpppd
-Patch4:         ppp-2.4.2-smpppd.diff
+Patch4:         ppp-smpppd.patch
 # allow higher serial speeds
-Patch5:         ppp-2.4.1-higher-speeds.diff
+Patch5:         ppp-higher-speeds.patch
 # fixed use of libpcap including dial on demand
-Patch6:         ppp-2.4.3-filter.diff
-# option to rename ppp interface
-Patch8:         ppp-2.4.6-ifname.diff
+Patch6:         ppp-filter.patch
 # Don't use __P from glibc (pppd uses it wrong)
-Patch9:         ppp-2.4.2-__P.diff
-Patch10:        ppp-2.4.3-pppoatm.diff
-Patch11:        ppp-2.4.7-fix-bashisms.patch
-Patch12:        ppp-2.4.2-pie.patch
-Patch14:        ppp-2.4.3-fork-fix.diff
+Patch9:         ppp-__P.patch
+Patch11:        ppp-fix-bashisms.patch
+Patch12:        ppp-pie.patch
+Patch14:        ppp-fork-fix.patch
 Patch17:        ppp-2.4.3-strip.diff
 Patch18:        ppp-2.4.3-winbind-setuidfix.patch
-Patch19:        ppp-2.4.4-strncatfix.patch
-Patch21:        ppp-2.4.6-lib64.patch
-Patch22:        ppp-2.4.4-var_run_resolv_conf.patch
-Patch23:        ppp-send-padt.patch
+Patch21:        ppp-lib64.patch
+Patch22:        ppp-var_run_resolv_conf.patch
 # PATCH-FIX-UPSTREAM -- Patch for CVE-2015-3310
 Patch24:        ppp-CVE-2015-3310.patch
 Patch25:        fix-header-conflict.patch
-Patch26:        ppp-2.4.7-DES-openssl.patch
 Patch27:        ppp-CVE-2020-8597.patch
 BuildRequires:  libpcap-devel
 BuildRequires:  linux-atm-devel
@@ -132,24 +126,19 @@ you can disable unnecessary or disable everything.
 %patch3
 %patch4
 %patch5
-%patch6 -p1
-%patch8
+%patch6
 %patch9
-%patch10 -p1
 %patch11 -p1
-%patch12 -p1
+%patch12
 %patch14
 %patch17
 %patch18
-%patch19 -p1
 %if %{_lib} == lib64
 %patch21
 %endif
 %patch22
-%patch23 -p1
 %patch24
 %patch25 -p1
-%patch26 -p1
 %patch27
 sed -i -e '1s/local\///' scripts/secure-card
 find scripts -type f | xargs chmod a-x