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-2.4.5.tar.bz2 b/ppp-2.4.5.tar.bz2 new file mode 100644 index 0000000..3c79f90 --- /dev/null +++ b/ppp-2.4.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b2fdfcde2e3bfdc490245527cd3e3d55165a0fe70c86ad7476d300535248ed2c +size 556115 diff --git a/ppp-2.4.5_git200910141435.tar.bz2 b/ppp-2.4.5_git200910141435.tar.bz2 deleted file mode 100644 index d8e4ffe..0000000 --- a/ppp-2.4.5_git200910141435.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f0691c1aea76a98138961d4e17aa1146a91db0864523a9c9f561d5174c474308 -size 556457 diff --git a/ppp-makedevice.patch b/ppp-makedevice.patch deleted file mode 100644 index 86c65fa..0000000 --- a/ppp-makedevice.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- pppd/sys-linux.c -+++ pppd/sys-linux.c -@@ -2104,8 +2104,7 @@ - sscanf(utsname.release, "%d.%d.%d", &osmaj, &osmin, &ospatch); - kernel_version = KVERSION(osmaj, osmin, ospatch); - - fd = open("/dev/ppp", O_RDWR); --#if 0 - if (fd < 0 && errno == ENOENT) { - /* try making it and see if that helps. */ - if (mknod("/dev/ppp", S_IFCHR | S_IRUSR | S_IWUSR, -@@ -2119,7 +2117,6 @@ - fd = open("/dev/ppp", O_RDWR); - } - } --#endif /* 0 */ - if (fd >= 0) { - new_style_driver = 1; - diff --git a/ppp.changes b/ppp.changes index cb02399..8ebb453 100644 --- a/ppp.changes +++ b/ppp.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Wed Jan 5 10:17:28 UTC 2011 - coolo@novell.com + +- refresh patch + +------------------------------------------------------------------- +Wed Jan 5 09:17:19 UTC 2011 - aj@suse.de + +- Fix build of pppol2tp - remove local copy of if_pppol2tp.h + that is out of sync with kernel definition. +- Remove ppp-makedevice.patch, it is obsolete. + +------------------------------------------------------------------- +Wed Jan 5 09:03:05 UTC 2011 - aj@suse.de + +- Update to final 2.4.5 version with these changes: + * Pppd now works better with 3G modems that do strange things such as + sending IPCP Configure-Naks with the same values over and over again. + * Bugfixes + ------------------------------------------------------------------- Tue Apr 6 05:40:20 UTC 2010 - coolo@novell.com diff --git a/ppp.spec b/ppp.spec index 65ed6b8..4457ea2 100644 --- a/ppp.spec +++ b/ppp.spec @@ -21,7 +21,7 @@ Name: ppp BuildRequires: libpcap-devel linux-atm-devel pam-devel Url: http://www.samba.org/ppp/ -Version: 2.4.5_git200910141435 +Version: 2.4.5 Release: 3 License: BSD3c(or similar) ; LGPLv2.1+ Group: Productivity/Networking/PPP @@ -63,7 +63,6 @@ Patch8: ppp-2.4.2-ifname.diff # Don't use __P from glibc (pppd uses it wrong) Patch9: ppp-2.4.2-__P.diff Patch10: ppp-2.4.3-pppoatm.diff -Patch11: ppp-makedevice.patch Patch12: ppp-2.4.2-pie.patch Patch13: ppp-2.4.3-demand-fix.diff Patch14: ppp-2.4.3-fork-fix.diff @@ -81,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 @@ -102,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 @@ -125,7 +102,6 @@ Authors: %patch8 %patch9 %patch10 -p1 -# %patch11 %patch12 -p1 %patch13 %patch14 @@ -139,6 +115,8 @@ Authors: sed -i -e '1s/local\///' scripts/secure-card %build +# Remove local copy that is out of sync and use the one from linux-header +rm -f include/linux/if_pppol2tp.h export MY_CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC $SP" ./configure --prefix=/usr make %{?_smp_mflags} CHAPMS=y CBCP=y USE_CRYPT=y HAS_SHADOW=y USE_PAM=y FILTER=y HAVE_INET6=y