8c5154bcc1
New upstream release 2.4.6 OBS-URL: https://build.opensuse.org/request/show/226897 OBS-URL: https://build.opensuse.org/package/show/network/ppp?expand=0&rev=22
123 lines
5.3 KiB
Diff
123 lines
5.3 KiB
Diff
Index: PLUGINS
|
|
===================================================================
|
|
--- PLUGINS.orig 2009-11-16 23:26:07.000000000 +0100
|
|
+++ PLUGINS 2011-01-05 11:03:50.806314592 +0100
|
|
@@ -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
|
|
a privileged option. If the name given does not contain a slash, pppd
|
|
-will look in the /usr/lib/pppd/<version> directory for the file, where
|
|
+will look in the /usr/lib64/pppd/<version> directory for the file, where
|
|
<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.
|
|
per-tty options file are parsed correctly, and don't override values
|
|
from the command line in most cases.
|
|
|
|
-* The plugin option now looks in /usr/lib/pppd/<pppd-version> (for
|
|
- example, /usr/lib/pppd/2.4.1b1) for shared objects for plugins if
|
|
+* The plugin option now looks in /usr/lib64/pppd/<pppd-version> (for
|
|
+ example, /usr/lib64/pppd/2.4.1b1) for shared objects for plugins if
|
|
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
|
|
@@ -57,9 +57,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 */
|
|
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
|
|
@@ -7,7 +7,7 @@ INSTALL = install
|
|
DESTDIR = $(INSTROOT)@DESTDIR@
|
|
BINDIR = $(DESTDIR)/sbin
|
|
MANDIR = $(DESTDIR)/share/man/man8
|
|
-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
|
|
+LIBDIR = $(DESTDIR)/lib64/pppd/$(VERSION)
|
|
|
|
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
|
|
@@ -7,7 +7,7 @@ INSTALL = install
|
|
#***********************************************************************
|
|
|
|
DESTDIR = $(INSTROOT)@DESTDIR@
|
|
-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
|
|
+LIBDIR = $(DESTDIR)/lib64/pppd/$(VERSION)
|
|
|
|
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
|
|
@@ -7,7 +7,7 @@ INSTALL = install
|
|
#***********************************************************************
|
|
|
|
DESTDIR = @DESTDIR@
|
|
-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
|
|
+LIBDIR = $(DESTDIR)/lib64/pppd/$(VERSION)
|
|
|
|
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
|
|
@@ -5,7 +5,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)
|
|
|
|
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
|
|
@@ -16,7 +16,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)
|
|
|
|
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.
|
|
.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
|