From 03dee9706c3d62f430d18ae1a073c0a221724f7de7a9bcc0b11cd31f8f10d11e Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 5 Jan 2011 10:17:37 +0000 Subject: [PATCH] - refresh patch OBS-URL: https://build.opensuse.org/package/show/network/ppp?expand=0&rev=11 --- ppp-2.4.4-lib64.patch | 66 +++++++++++++++++++++++++++---------------- ppp.changes | 5 ++++ ppp.spec | 23 --------------- 3 files changed, 47 insertions(+), 47 deletions(-) diff --git a/ppp-2.4.4-lib64.patch b/ppp-2.4.4-lib64.patch index f676611..5c4c982 100644 --- a/ppp-2.4.4-lib64.patch +++ b/ppp-2.4.4-lib64.patch @@ -1,6 +1,8 @@ ---- PLUGINS -+++ PLUGINS -@@ -14,7 +14,7 @@ +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 @@ -9,9 +11,11 @@ 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 ---- README -+++ README -@@ -200,8 +200,8 @@ +Index: README +=================================================================== +--- README.orig 2009-11-16 23:26:07.000000000 +0100 ++++ README 2011-01-05 11:03:50.806314592 +0100 +@@ -207,8 +207,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. @@ -22,8 +26,10 @@ there is no slash in the plugin name. * When loading a plugin, pppd will now check the version of pppd for ---- pppd/pathnames.h -+++ pppd/pathnames.h +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 @@ -36,9 +42,11 @@ #endif /* __STDC__ */ #endif /* PLUGIN */ ---- pppd/plugins/Makefile.linux -+++ pppd/plugins/Makefile.linux -@@ -7,7 +7,7 @@ +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 @@ -47,9 +55,11 @@ SUBDIRS := rp-pppoe pppoatm pppol2tp # Uncomment the next line to include the radius authentication plugin ---- pppd/plugins/pppoatm/Makefile.linux -+++ pppd/plugins/pppoatm/Makefile.linux -@@ -7,7 +7,7 @@ +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@ @@ -58,9 +68,11 @@ VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) ---- pppd/plugins/pppol2tp/Makefile.linux -+++ pppd/plugins/pppol2tp/Makefile.linux -@@ -7,7 +7,7 @@ +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@ @@ -69,8 +81,10 @@ VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) ---- pppd/plugins/radius/Makefile.linux -+++ pppd/plugins/radius/Makefile.linux +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@ @@ -80,8 +94,10 @@ VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) ---- pppd/plugins/rp-pppoe/Makefile.linux -+++ pppd/plugins/rp-pppoe/Makefile.linux +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@ @@ -91,9 +107,11 @@ PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) ---- pppd/pppd.8 -+++ pppd/pppd.8 -@@ -911,7 +911,7 @@ +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 diff --git a/ppp.changes b/ppp.changes index 0170914..8ebb453 100644 --- a/ppp.changes +++ b/ppp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 5 10:17:28 UTC 2011 - coolo@novell.com + +- refresh patch + ------------------------------------------------------------------- Wed Jan 5 09:17:19 UTC 2011 - aj@suse.de diff --git a/ppp.spec b/ppp.spec index 58a2391..4457ea2 100644 --- a/ppp.spec +++ b/ppp.spec @@ -80,17 +80,6 @@ point-to-point links, for example over a modem. The PPP daemon handles the details of setting up a PPP link including configuring the network interface and performing the PPP negotiations. - - -Authors: --------- - Paul Mackerras - Michael Callahan - Al Longyear - Brad Parker - Greg Christy - Michal Ostrowski - %package devel License: BSD3c(or similar) ; LGPLv2.1+ Summary: Header Files Required for Developing Plugins for pppd @@ -101,17 +90,6 @@ Requires: ppp = %version The package ppp-devel contains C header files required for developing plugins for the pppd. - - -Authors: --------- - Paul Mackerras - Michael Callahan - Al Longyear - Brad Parker - Greg Christy - Michal Ostrowski - %prep %setup -q %patch0 @@ -144,7 +122,6 @@ export MY_CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC $SP" make %{?_smp_mflags} CHAPMS=y CBCP=y USE_CRYPT=y HAS_SHADOW=y USE_PAM=y FILTER=y HAVE_INET6=y %install -rm README.orig make install DESTDIR=%{buildroot}%_prefix install -d -m 750 %{buildroot}/etc/ppp install -m 644 %{S:5} %{buildroot}/etc/ppp/options