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 80d1e93..0170914 100644 --- a/ppp.changes +++ b/ppp.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +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 + +- replace %PACKAGE_VERSION with %version to fix build + ------------------------------------------------------------------- Tue Jan 5 17:21:23 CET 2010 - jengelh@medozas.de diff --git a/ppp.spec b/ppp.spec index 33fcab7..58a2391 100644 --- a/ppp.spec +++ b/ppp.spec @@ -21,14 +21,14 @@ Name: ppp BuildRequires: libpcap-devel linux-atm-devel pam-devel Url: http://www.samba.org/ppp/ -Version: 2.4.5_git200910141435 -Release: 2 +Version: 2.4.5 +Release: 3 License: BSD3c(or similar) ; LGPLv2.1+ Group: Productivity/Networking/PPP AutoReqProv: on Summary: The Point to Point Protocol for Linux BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: ftp://ftp.samba.org:/pub/ppp/ppp-%{PACKAGE_VERSION}.tar.bz2 +Source0: ftp://ftp.samba.org:/pub/ppp/ppp-%{version}.tar.bz2 # config for pam Source1: ppp.pamd # templates for secrets @@ -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 @@ -125,7 +124,6 @@ Authors: %patch8 %patch9 %patch10 -p1 -# %patch11 %patch12 -p1 %patch13 %patch14 @@ -139,11 +137,14 @@ 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 %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