Hello community, here is the log from the commit of package ppp for openSUSE:Factory checked in at Wed Jan 5 15:57:44 CET 2011. -------- --- ppp/ppp.changes 2010-04-06 07:40:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/ppp/ppp.changes 2011-01-05 11:17:37.000000000 +0100 @@ -1,0 +2,20 @@ +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 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ppp-2.4.5_git200910141435.tar.bz2 ppp-makedevice.patch New: ---- ppp-2.4.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ppp.spec ++++++ --- /var/tmp/diff_new_pack.uPSzRx/_old 2011-01-05 15:56:36.000000000 +0100 +++ /var/tmp/diff_new_pack.uPSzRx/_new 2011-01-05 15:56:36.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package ppp (Version 2.4.5_git200910141435) +# spec file for package ppp (Version 2.4.5) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,8 +21,8 @@ Name: ppp BuildRequires: libpcap-devel linux-atm-devel pam-devel Url: http://www.samba.org/ppp/ -Version: 2.4.5_git200910141435 -Release: 3 +Version: 2.4.5 +Release: 1 License: BSD3c(or similar) ; LGPLv2.1+ Group: Productivity/Networking/PPP AutoReqProv: on @@ -63,7 +63,6 @@ # 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 @@ the details of setting up a PPP link including configuring the network interface and performing the PPP negotiations. - - -Authors: --------- - Paul Mackerras <paul.mackerras@cs.anu.edu.au> - Michael Callahan <callahan@maths.ox.ac.uk> - Al Longyear <longyear@netcom.com> - Brad Parker <brad@faster.fcr.com> - Greg Christy <gmc@premises1.Qutoron.COM> - Michal Ostrowski <mostrows@styx.uwaterloo.ca> - %package devel License: BSD3c(or similar) ; LGPLv2.1+ Summary: Header Files Required for Developing Plugins for pppd @@ -102,17 +90,6 @@ The package ppp-devel contains C header files required for developing plugins for the pppd. - - -Authors: --------- - Paul Mackerras <paul.mackerras@cs.anu.edu.au> - Michael Callahan <callahan@maths.ox.ac.uk> - Al Longyear <longyear@netcom.com> - Brad Parker <brad@faster.fcr.com> - Greg Christy <gmc@premises1.Qutoron.COM> - Michal Ostrowski <mostrows@styx.uwaterloo.ca> - %prep %setup -q %patch0 @@ -125,7 +102,6 @@ %patch8 %patch9 %patch10 -p1 -# %patch11 %patch12 -p1 %patch13 %patch14 @@ -139,6 +115,8 @@ 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 ++++++ ppp-2.4.4-lib64.patch ++++++ --- /var/tmp/diff_new_pack.uPSzRx/_old 2011-01-05 15:56:36.000000000 +0100 +++ /var/tmp/diff_new_pack.uPSzRx/_new 2011-01-05 15:56:36.000000000 +0100 @@ -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 @@ <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 ---- 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 ++++++ ppp-2.4.5_git200910141435.tar.bz2 -> ppp-2.4.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ppp-2.4.5_git200910141435/pppd/ipcp.c new/ppp-2.4.5/pppd/ipcp.c --- old/ppp-2.4.5_git200910141435/pppd/ipcp.c 2008-11-26 11:02:29.000000000 +0100 +++ new/ppp-2.4.5/pppd/ipcp.c 2009-11-16 23:26:07.000000000 +0100 @@ -575,6 +575,14 @@ f->callbacks = &ipcp_callbacks; fsm_init(&ipcp_fsm[unit]); + /* + * Some 3G modems use repeated IPCP NAKs as a way of stalling + * until they can contact a server on the network, so we increase + * the default number of NAKs we accept before we start treating + * them as rejects. + */ + f->maxnakloops = 100; + memset(wo, 0, sizeof(*wo)); memset(ao, 0, sizeof(*ao)); @@ -723,7 +731,8 @@ #define LENCIADDRS(neg) (neg ? CILEN_ADDRS : 0) #define LENCIVJ(neg, old) (neg ? (old? CILEN_COMPRESS : CILEN_VJ) : 0) #define LENCIADDR(neg) (neg ? CILEN_ADDR : 0) -#define LENCIDNS(neg) (neg ? (CILEN_ADDR) : 0) +#define LENCIDNS(neg) LENCIADDR(neg) +#define LENCIWINS(neg) LENCIADDR(neg) /* * First see if we want to change our options to the old @@ -745,7 +754,9 @@ LENCIVJ(go->neg_vj, go->old_vj) + LENCIADDR(go->neg_addr) + LENCIDNS(go->req_dns1) + - LENCIDNS(go->req_dns2)) ; + LENCIDNS(go->req_dns2) + + LENCIWINS(go->winsaddr[0]) + + LENCIWINS(go->winsaddr[1])) ; } @@ -819,6 +830,19 @@ neg = 0; \ } +#define ADDCIWINS(opt, addr) \ + if (addr) { \ + if (len >= CILEN_ADDR) { \ + u_int32_t l; \ + PUTCHAR(opt, ucp); \ + PUTCHAR(CILEN_ADDR, ucp); \ + l = ntohl(addr); \ + PUTLONG(l, ucp); \ + len -= CILEN_ADDR; \ + } else \ + addr = 0; \ + } + ADDCIADDRS(CI_ADDRS, !go->neg_addr && go->old_addrs, go->ouraddr, go->hisaddr); @@ -831,6 +855,10 @@ ADDCIDNS(CI_MS_DNS2, go->req_dns2, go->dnsaddr[1]); + ADDCIWINS(CI_MS_WINS1, go->winsaddr[0]); + + ADDCIWINS(CI_MS_WINS2, go->winsaddr[1]); + *lenp -= len; } @@ -1185,6 +1213,15 @@ try.req_dns2 = 1; no.req_dns2 = 1; break; + case CI_MS_WINS1: + case CI_MS_WINS2: + if (cilen != CILEN_ADDR) + goto bad; + GETLONG(l, p); + ciaddr1 = htonl(l); + if (ciaddr1) + try.winsaddr[citype == CI_MS_WINS2] = ciaddr1; + break; } p = next; } @@ -1301,6 +1338,21 @@ try.neg = 0; \ } +#define REJCIWINS(opt, addr) \ + if (addr && \ + ((cilen = p[1]) == CILEN_ADDR) && \ + len >= cilen && \ + p[0] == opt) { \ + u_int32_t l; \ + len -= cilen; \ + INCPTR(2, p); \ + GETLONG(l, p); \ + cilong = htonl(l); \ + /* Check rejected value. */ \ + if (cilong != addr) \ + goto bad; \ + try.winsaddr[opt == CI_MS_WINS2] = 0; \ + } REJCIADDRS(CI_ADDRS, !go->neg_addr && go->old_addrs, go->ouraddr, go->hisaddr); @@ -1314,6 +1366,10 @@ REJCIDNS(CI_MS_DNS2, req_dns2, go->dnsaddr[1]); + REJCIWINS(CI_MS_WINS1, go->winsaddr[0]); + + REJCIWINS(CI_MS_WINS2, go->winsaddr[1]); + /* * If there are any remaining CIs, then this packet is bad. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ppp-2.4.5_git200910141435/pppd/main.c new/ppp-2.4.5/pppd/main.c --- old/ppp-2.4.5_git200910141435/pppd/main.c 2008-11-26 11:02:29.000000000 +0100 +++ new/ppp-2.4.5/pppd/main.c 2009-11-16 23:26:07.000000000 +0100 @@ -964,7 +964,7 @@ { 0x8051, "KNX Bridging Control Protocol" }, { 0x8053, "Encryption Control Protocol" }, { 0x8055, "Individual Link Encryption Control Protocol" }, - { 0x8057, "IPv6 Control Protovol" }, + { 0x8057, "IPv6 Control Protocol" }, { 0x8059, "PPP Muxing Control Protocol" }, { 0x805b, "Vendor-Specific Network Control Protocol (VSNCP)" }, { 0x806f, "Stampede Bridging Control Protocol" }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ppp-2.4.5_git200910141435/pppd/patchlevel.h new/ppp-2.4.5/pppd/patchlevel.h --- old/ppp-2.4.5_git200910141435/pppd/patchlevel.h 2008-11-26 11:02:29.000000000 +0100 +++ new/ppp-2.4.5/pppd/patchlevel.h 2009-11-16 23:26:07.000000000 +0100 @@ -1,2 +1,2 @@ #define VERSION "2.4.5" -#define DATE "6 September 2008" +#define DATE "17 November 2009" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ppp-2.4.5_git200910141435/pppd/sys-linux.c new/ppp-2.4.5/pppd/sys-linux.c --- old/ppp-2.4.5_git200910141435/pppd/sys-linux.c 2008-11-26 11:02:29.000000000 +0100 +++ new/ppp-2.4.5/pppd/sys-linux.c 2009-11-16 23:26:07.000000000 +0100 @@ -1658,6 +1658,8 @@ SET_SA_FAMILY (rt.rt_dst, AF_INET); SET_SA_FAMILY (rt.rt_gateway, AF_INET); + rt.rt_dev = ifname; + if (kernel_version > KVERSION(2,1,0)) { SET_SA_FAMILY (rt.rt_genmask, AF_INET); SIN_ADDR(rt.rt_genmask) = 0L; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ppp-2.4.5_git200910141435/README new/ppp-2.4.5/README --- old/ppp-2.4.5_git200910141435/README 2008-11-26 11:02:29.000000000 +0100 +++ new/ppp-2.4.5/README 2009-11-16 23:26:07.000000000 +0100 @@ -70,10 +70,17 @@ possible to have no remote IP address assigned to the ppp interface and still route traffic over it. +* 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. + * The PPP over L2TP plugin is included, which works with the pppol2tp PPP channel code in the Linux kernel. This allows pppd to be used to set up tunnels using the Layer 2 Tunneling Protocol. +* A new 'enable-session' option has been added, which enables session + accounting via PAM or wtwp/wtmpx, as appropriate. See the pppd man + page for details. + * Several bugs have been fixed. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org