diff options
Diffstat (limited to 'source/n/ppp/ppp.slack.diff')
| -rw-r--r-- | source/n/ppp/ppp.slack.diff | 85 |
1 files changed, 35 insertions, 50 deletions
diff --git a/source/n/ppp/ppp.slack.diff b/source/n/ppp/ppp.slack.diff index 6332324a7..585247d7c 100644 --- a/source/n/ppp/ppp.slack.diff +++ b/source/n/ppp/ppp.slack.diff @@ -1,7 +1,6 @@ -diff -Nur ppp-2.4.7.orig/chat/Makefile.linux ppp-2.4.7/chat/Makefile.linux ---- ppp-2.4.7.orig/chat/Makefile.linux 2014-08-09 07:31:39.000000000 -0500 -+++ ppp-2.4.7/chat/Makefile.linux 2014-08-09 17:10:27.423374415 -0500 -@@ -2,7 +2,7 @@ +--- ./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 @@ -10,22 +9,20 @@ diff -Nur ppp-2.4.7.orig/chat/Makefile.linux ppp-2.4.7/chat/Makefile.linux CDEF1= -DTERMIOS # Use the termios structure CDEF2= -DSIGTYPE=void # Standard definition -diff -Nur ppp-2.4.7.orig/linux/Makefile.top ppp-2.4.7/linux/Makefile.top ---- ppp-2.4.7.orig/linux/Makefile.top 2014-08-09 07:31:39.000000000 -0500 -+++ ppp-2.4.7/linux/Makefile.top 2014-08-09 17:11:14.156384165 -0500 -@@ -3,7 +3,7 @@ +--- ./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 - INCDIR = $(DESTDIR)/include --MANDIR = $(DESTDIR)/share/man -+MANDIR = $(DESTDIR)/man - ETCDIR = $(INSTROOT)@SYSCONF@/ppp +-MANDIR = $(DESTDIR)/share/man/man8 ++MANDIR = $(DESTDIR)/man/man8 - # uid 0 = root -diff -Nur ppp-2.4.7.orig/pppd/Makefile.linux ppp-2.4.7/pppd/Makefile.linux ---- ppp-2.4.7.orig/pppd/Makefile.linux 2014-08-09 07:31:39.000000000 -0500 -+++ ppp-2.4.7/pppd/Makefile.linux 2014-08-09 17:07:27.458308345 -0500 -@@ -6,7 +6,7 @@ + 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 @@ -34,16 +31,7 @@ diff -Nur ppp-2.4.7.orig/pppd/Makefile.linux ppp-2.4.7/pppd/Makefile.linux INCDIR = $(DESTDIR)/include TARGETS = pppd -@@ -32,7 +32,7 @@ - - # CC = gcc - # --COPTS = -O2 -pipe -Wall -g -+COPTS = -O2 -pipe -Wall - LIBS = - - # Uncomment the next 2 lines to include support for Microsoft's -@@ -68,7 +68,7 @@ +@@ -74,7 +74,7 @@ PLUGIN=y # Enable Microsoft proprietary Callback Control Protocol @@ -52,10 +40,9 @@ diff -Nur ppp-2.4.7.orig/pppd/Makefile.linux ppp-2.4.7/pppd/Makefile.linux # Enable EAP SRP-SHA1 authentication (requires libsrp) #USE_SRP=y -diff -Nur ppp-2.4.7.orig/pppd/plugins/Makefile.linux ppp-2.4.7/pppd/plugins/Makefile.linux ---- ppp-2.4.7.orig/pppd/plugins/Makefile.linux 2014-08-09 07:31:39.000000000 -0500 -+++ ppp-2.4.7/pppd/plugins/Makefile.linux 2014-08-09 17:11:10.734383553 -0500 -@@ -6,7 +6,7 @@ +--- ./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 @@ -63,12 +50,11 @@ diff -Nur ppp-2.4.7.orig/pppd/plugins/Makefile.linux ppp-2.4.7/pppd/plugins/Make +MANDIR = $(DESTDIR)/man/man8 LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION) - SUBDIRS := rp-pppoe pppoatm pppol2tp -diff -Nur ppp-2.4.7.orig/pppd/plugins/radius/Makefile.linux ppp-2.4.7/pppd/plugins/radius/Makefile.linux ---- ppp-2.4.7.orig/pppd/plugins/radius/Makefile.linux 2014-08-09 07:31:39.000000000 -0500 -+++ ppp-2.4.7/pppd/plugins/radius/Makefile.linux 2014-08-09 17:11:08.470383139 -0500 -@@ -4,7 +4,7 @@ - # + 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 @@ -76,22 +62,21 @@ diff -Nur ppp-2.4.7.orig/pppd/plugins/radius/Makefile.linux ppp-2.4.7/pppd/plugi LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION) VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) -diff -Nur ppp-2.4.7.orig/pppdump/Makefile.linux ppp-2.4.7/pppdump/Makefile.linux ---- ppp-2.4.7.orig/pppdump/Makefile.linux 2014-08-09 07:31:39.000000000 -0500 -+++ ppp-2.4.7/pppdump/Makefile.linux 2014-08-09 17:10:35.672376354 -0500 -@@ -1,6 +1,6 @@ +--- ./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 --MANDIR = $(DESTDIR)/share/man/man8 -+MANDIR = $(DESTDIR)/man/man8 + 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 @@ - CFLAGS= -O -I../include/net - OBJS = pppdump.o bsd-comp.o deflate.o zlib.o -diff -Nur ppp-2.4.7.orig/pppstats/Makefile.linux ppp-2.4.7/pppstats/Makefile.linux ---- ppp-2.4.7.orig/pppstats/Makefile.linux 2014-08-09 07:31:39.000000000 -0500 -+++ ppp-2.4.7/pppstats/Makefile.linux 2014-08-09 17:10:42.293377843 -0500 -@@ -4,7 +4,7 @@ - # DESTDIR = $(INSTROOT)@DESTDIR@ BINDIR = $(DESTDIR)/sbin -MANDIR = $(DESTDIR)/share/man/man8 |