5 files changed, 0 insertions, 137 deletions
diff --git a/extra/ppp/0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch b/extra/ppp/0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch
deleted file mode 100644
index a99cc1c..0000000
--- a/extra/ppp/0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From b4ef433be936c90e356da7a590b032cdee219a3f Mon Sep 17 00:00:00 2001
-From: Michal Sekletar <msekleta@redhat.com>
-Date: Fri, 4 Apr 2014 19:06:05 +0200
-Subject: [PATCH 11/27] build-sys: don't put connect-errors log to /etc/ppp/
-
-Resolves: #118837
----
- chat/chat.8        | 2 +-
- linux/Makefile.top | 8 +++++++-
- pppd/pathnames.h   | 4 ++--
- 3 files changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/chat/chat.8 b/chat/chat.8
-index 6d10836..78d6939 100644
---- a/chat/chat.8
-+++ b/chat/chat.8
-@@ -200,7 +200,7 @@ The \fBSAY\fR directive allows the script to send strings to the user
- at the terminal via standard error.  If \fBchat\fR is being run by
- pppd, and pppd is running as a daemon (detached from its controlling
- terminal), standard error will normally be redirected to the file
--/etc/ppp/connect\-errors.
-+/var/log/ppp/connect\-errors.
- .LP
- \fBSAY\fR strings must be enclosed in single or double quotes. If
- carriage return and line feed are needed in the string to be output,
-diff --git a/linux/Makefile.top b/linux/Makefile.top
-index f63d45e..f42efd5 100644
---- a/linux/Makefile.top
-+++ b/linux/Makefile.top
-@@ -5,6 +5,8 @@ BINDIR = $(DESTDIR)/sbin
- INCDIR = $(DESTDIR)/include
- MANDIR = $(DESTDIR)/share/man
- ETCDIR = $(INSTROOT)@SYSCONF@/ppp
-+RUNDIR = $(INSTROOT)/var/run/ppp
-+LOGDIR = $(INSTROOT)/var/log/ppp
- 
- # uid 0 = root
- INSTALL= install
-@@ -16,7 +18,7 @@ all:
- 	cd pppstats; $(MAKE) $(MFLAGS) all
- 	cd pppdump; $(MAKE) $(MFLAGS) all
- 
--install: $(BINDIR) $(MANDIR)/man8 install-progs install-devel
-+install: $(BINDIR) $(RUNDIR) $(LOGDIR) $(MANDIR)/man8 install-progs install-devel
- 
- install-progs:
- 	cd chat; $(MAKE) $(MFLAGS) install
-@@ -44,6 +46,10 @@ $(MANDIR)/man8:
- 	$(INSTALL) -d -m 755 $@
- $(ETCDIR):
- 	$(INSTALL) -d -m 755 $@
-+$(RUNDIR):
-+	$(INSTALL) -d -m 755 $@
-+$(LOGDIR):
-+	$(INSTALL) -d -m 755 $@
- 
- clean:
- 	rm -f `find . -name '*.[oas]' -print`
-diff --git a/pppd/pathnames.h b/pppd/pathnames.h
-index a427cb8..bef3160 100644
---- a/pppd/pathnames.h
-+++ b/pppd/pathnames.h
-@@ -28,9 +28,9 @@
- #define _PATH_AUTHUP	 _ROOT_PATH "/etc/ppp/auth-up"
- #define _PATH_AUTHDOWN	 _ROOT_PATH "/etc/ppp/auth-down"
- #define _PATH_TTYOPT	 _ROOT_PATH "/etc/ppp/options."
--#define _PATH_CONNERRS	 _ROOT_PATH "/etc/ppp/connect-errors"
-+#define _PATH_CONNERRS	 _ROOT_PATH "/var/log/ppp/connect-errors"
- #define _PATH_PEERFILES	 _ROOT_PATH "/etc/ppp/peers/"
--#define _PATH_RESOLV	 _ROOT_PATH "/etc/ppp/resolv.conf"
-+#define _PATH_RESOLV	 _ROOT_PATH "/var/run/ppp/resolv.conf"
- 
- #define _PATH_USEROPT	 ".ppprc"
- #define	_PATH_PSEUDONYM	 ".ppp_pseudonym"
--- 
-1.8.3.1
-
diff --git a/extra/ppp/fix-paths.patch b/extra/ppp/fix-paths.patch
deleted file mode 100644
index 6914258..0000000
--- a/extra/ppp/fix-paths.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/pppd/plugins/radius/pathnames.h
-+++ b/pppd/plugins/radius/pathnames.h
-@@ -22,7 +22,7 @@
- 
- /* normally defined in the Makefile */
- #ifndef _PATH_ETC_RADIUSCLIENT_CONF
--#define _PATH_ETC_RADIUSCLIENT_CONF       "/etc/radiusclient.conf"
-+#define _PATH_ETC_RADIUSCLIENT_CONF       "/etc/radiusclient/radiusclient.conf"
- #endif
- 
- #endif /* PATHNAMES_H */
-
diff --git a/extra/ppp/fix-pppd-magic.h.patch b/extra/ppp/fix-pppd-magic.h.patch
deleted file mode 100644
index 01a89d5..0000000
--- a/extra/ppp/fix-pppd-magic.h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/pppd/magic.h	2019-12-31 02:31:26.000000000 +0100
-+++ b/pppd/magic.h	2020-02-06 20:52:49.263657502 +0100
-@@ -42,6 +42,8 @@
-  * $Id: magic.h,v 1.5 2003/06/11 23:56:26 paulus Exp $
-  */
- 
-+#include <sys/cdefs.h>
-+
- void magic_init (void);	/* Initialize the magic number generator */
- u_int32_t magic (void);	/* Returns the next magic number */
- 
diff --git a/extra/ppp/musl-fix-headers.patch b/extra/ppp/musl-fix-headers.patch
deleted file mode 100644
index 37ddbbb..0000000
--- a/extra/ppp/musl-fix-headers.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c
-index 6d71530..86d224e 100644
---- a/pppd/sys-linux.c
-+++ b/pppd/sys-linux.c
-@@ -102,19 +102,11 @@
- #define MAX_ADDR_LEN 7
- #endif
- 
--#if !defined(__GLIBC__) || __GLIBC__ >= 2
- #include <asm/types.h>		/* glibc 2 conflicts with linux/types.h */
- #include <net/if.h>
- #include <net/if_arp.h>
- #include <net/route.h>
- #include <netinet/if_ether.h>
--#else
--#include <linux/types.h>
--#include <linux/if.h>
--#include <linux/if_arp.h>
--#include <linux/route.h>
--#include <linux/if_ether.h>
--#endif
- #include <netinet/in.h>
- #include <arpa/inet.h>
- 
diff --git a/extra/ppp/pppd.initd b/extra/ppp/pppd.initd
deleted file mode 100644
index 30bd641..0000000
--- a/extra/ppp/pppd.initd
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/sbin/openrc-run
-
-name="pppd"
-command="/usr/sbin/${SVCNAME}"
-command_args="nodetach ${PPPD_OPTS}"
-pidfile="/var/run/$SVCNAME.pid"
-command_background=true
-
-start_pre() {
-	checkpath --directory /var/run/ppp
-	modprobe pptp
-}
-