100 lines
4.0 KiB
Diff
100 lines
4.0 KiB
Diff
diff -Nur ppp-2.4.9/pppd/Makefile.linux new/pppd/Makefile.linux
|
|
--- ppp-2.4.9/pppd/Makefile.linux 2021-01-05 00:06:37.000000000 +0100
|
|
+++ new/pppd/Makefile.linux 2022-05-23 17:42:04.835599374 +0200
|
|
@@ -112,7 +112,7 @@
|
|
# EAP SRP-SHA1
|
|
ifdef USE_SRP
|
|
CFLAGS += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
|
|
-LIBS += -lsrp -L/usr/local/ssl/lib
|
|
+LIBS += -lsrp -L/usr/local/ssl/lib6464
|
|
NEEDCRYPTOLIB = y
|
|
TARGETS += srp-entry
|
|
EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry
|
|
diff -Nur ppp-2.4.9/pppd/pathnames.h new/pppd/pathnames.h
|
|
--- ppp-2.4.9/pppd/pathnames.h 2021-01-05 00:06:37.000000000 +0100
|
|
+++ new/pppd/pathnames.h 2022-05-23 17:42:04.835599374 +0200
|
|
@@ -62,9 +62,9 @@
|
|
|
|
#ifdef PLUGIN
|
|
#ifdef __STDC__
|
|
-#define _PATH_PLUGIN DESTDIR "/lib/pppd/" VERSION
|
|
+#define _PATH_PLUGIN DESTDIR "/lib64/pppd/" VERSION
|
|
#else /* __STDC__ */
|
|
-#define _PATH_PLUGIN "/usr/lib/pppd"
|
|
+#define _PATH_PLUGIN "/usr/lib64/pppd"
|
|
#endif /* __STDC__ */
|
|
|
|
#endif /* PLUGIN */
|
|
diff -Nur ppp-2.4.9/pppd/plugins/Makefile.linux new/pppd/plugins/Makefile.linux
|
|
--- ppp-2.4.9/pppd/plugins/Makefile.linux 2021-01-05 00:06:37.000000000 +0100
|
|
+++ new/pppd/plugins/Makefile.linux 2022-05-23 17:42:04.835599374 +0200
|
|
@@ -5,7 +5,7 @@
|
|
DESTDIR = $(INSTROOT)@DESTDIR@
|
|
BINDIR = $(DESTDIR)/sbin
|
|
MANDIR = $(DESTDIR)/share/man/man8
|
|
-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
|
|
+LIBDIR = $(DESTDIR)/lib64/pppd/$(VERSION)
|
|
|
|
CFLAGS = $(COPTS) -I.. -I../../include -fPIC
|
|
LDFLAGS_SHARED = -shared
|
|
diff -Nur ppp-2.4.9/pppd/plugins/pppoatm/Makefile.linux new/pppd/plugins/pppoatm/Makefile.linux
|
|
--- ppp-2.4.9/pppd/plugins/pppoatm/Makefile.linux 2021-01-05 00:06:37.000000000 +0100
|
|
+++ new/pppd/plugins/pppoatm/Makefile.linux 2022-05-23 17:42:04.835599374 +0200
|
|
@@ -4,7 +4,7 @@
|
|
COPTS=@CFLAGS@
|
|
|
|
DESTDIR = $(INSTROOT)@DESTDIR@
|
|
-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
|
|
+LIBDIR = $(DESTDIR)/lib64/pppd/$(VERSION)
|
|
|
|
VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
|
|
|
|
diff -Nur ppp-2.4.9/pppd/plugins/pppoe/Makefile.linux new/pppd/plugins/pppoe/Makefile.linux
|
|
--- ppp-2.4.9/pppd/plugins/pppoe/Makefile.linux 2021-01-05 00:06:37.000000000 +0100
|
|
+++ new/pppd/plugins/pppoe/Makefile.linux 2022-05-23 17:42:04.835599374 +0200
|
|
@@ -18,7 +18,7 @@
|
|
|
|
DESTDIR = $(INSTROOT)@DESTDIR@
|
|
BINDIR = $(DESTDIR)/sbin
|
|
-LIBDIR = $(DESTDIR)/lib/pppd/$(PPPDVERSION)
|
|
+LIBDIR = $(DESTDIR)/lib64/pppd/$(PPPDVERSION)
|
|
|
|
PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
|
|
|
|
diff -Nur ppp-2.4.9/pppd/plugins/pppol2tp/Makefile.linux new/pppd/plugins/pppol2tp/Makefile.linux
|
|
--- ppp-2.4.9/pppd/plugins/pppol2tp/Makefile.linux 2021-01-05 00:06:37.000000000 +0100
|
|
+++ new/pppd/plugins/pppol2tp/Makefile.linux 2022-05-23 17:42:04.835599374 +0200
|
|
@@ -4,7 +4,7 @@
|
|
COPTS=@CFLAGS@
|
|
|
|
DESTDIR = $(INSTROOT)/@DESTDIR@
|
|
-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
|
|
+LIBDIR = $(DESTDIR)/lib64/pppd/$(VERSION)
|
|
|
|
VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
|
|
|
|
diff -Nur ppp-2.4.9/pppd/plugins/radius/Makefile.linux new/pppd/plugins/radius/Makefile.linux
|
|
--- ppp-2.4.9/pppd/plugins/radius/Makefile.linux 2021-01-05 00:06:37.000000000 +0100
|
|
+++ new/pppd/plugins/radius/Makefile.linux 2022-05-23 17:42:04.835599374 +0200
|
|
@@ -9,7 +9,7 @@
|
|
|
|
DESTDIR = $(INSTROOT)@DESTDIR@
|
|
MANDIR = $(DESTDIR)/share/man/man8
|
|
-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
|
|
+LIBDIR = $(DESTDIR)/lib64/pppd/$(VERSION)
|
|
|
|
VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
|
|
|
|
diff -Nur ppp-2.4.9/pppd/pppd.8 new/pppd/pppd.8
|
|
--- ppp-2.4.9/pppd/pppd.8 2021-01-05 00:06:37.000000000 +0100
|
|
+++ new/pppd/pppd.8 2022-05-23 17:42:04.835599374 +0200
|
|
@@ -995,7 +995,7 @@
|
|
.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
|
|
-(/), pppd will look in the \fB/usr/lib/pppd/\fIversion\fR directory
|
|
+(/), pppd will look in the \fB/usr/lib64/pppd/\fIversion\fR directory
|
|
for the plugin, where
|
|
\fIversion\fR is the version number of pppd (for example, 2.4.2).
|
|
.TP
|