From 3747d3a5973165620b490956ccb320d4260fb98eaabf98b916c10313c333aa65 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 23 Aug 2007 23:57:20 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ppp?expand=0&rev=3 --- ppp-2.4.2-pppoatm-mtu.patch | 28 ++++++++++++++++++++++++++++ ppp.changes | 5 +++++ ppp.spec | 6 +++++- 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 ppp-2.4.2-pppoatm-mtu.patch diff --git a/ppp-2.4.2-pppoatm-mtu.patch b/ppp-2.4.2-pppoatm-mtu.patch new file mode 100644 index 0000000..7bec528 --- /dev/null +++ b/ppp-2.4.2-pppoatm-mtu.patch @@ -0,0 +1,28 @@ +--- ppp-2.4.2/pppd/plugins/pppoatm/pppoatm.c.mtu 2004-10-07 13:32:05.660910432 +0100 ++++ ppp-2.4.2/pppd/plugins/pppoatm/pppoatm.c 2004-10-07 13:58:20.096559832 +0100 +@@ -175,8 +175,10 @@ + { + int sock; + struct ifreq ifr; +- if (mtu > pppoatm_max_mtu) +- error("Couldn't increase MTU to %d", mtu); ++ if (pppoatm_max_mtu && mtu > pppoatm_max_mtu) { ++ warn("Couldn't increase MTU to %d. Using %d", mtu, pppoatm_max_mtu); ++ mtu = pppoatm_max_mtu; ++ } + sock = socket(AF_INET, SOCK_DGRAM, 0); + if (sock < 0) + fatal("Couldn't create IP socket: %m"); +@@ -192,8 +194,10 @@ + int pcomp, + int accomp) + { +- if (mru > pppoatm_max_mru) +- error("Couldn't increase MRU to %d", mru); ++ if (pppoatm_max_mru && mru > pppoatm_max_mru) { ++ warn("Couldn't increase MRU to %d. Using %d", mru, pppoatm_max_mru); ++ mru = pppoatm_max_mru; ++ } + } + + void plugin_init(void) diff --git a/ppp.changes b/ppp.changes index 4f5ac87..24d1bd0 100644 --- a/ppp.changes +++ b/ppp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 23 16:21:21 CEST 2007 - hvogel@suse.de + +- Work around pppoatm MTU problems. [#301678] + ------------------------------------------------------------------- Thu Jul 26 16:56:40 CEST 2007 - prusnak@suse.cz diff --git a/ppp.spec b/ppp.spec index 7a2ea46..2db22de 100644 --- a/ppp.spec +++ b/ppp.spec @@ -14,7 +14,7 @@ Name: ppp BuildRequires: libpcap-devel linux-atm-devel pam-devel URL: http://www.samba.org/ppp/ Version: 2.4.4 -Release: 57 +Release: 64 License: BSD 3-Clause, LGPL v2 or later Group: Productivity/Networking/PPP Autoreqprov: on @@ -65,6 +65,7 @@ Patch16: ppp-2.4.3-no-strict-aliasing.patch Patch17: ppp-2.4.3-strip.diff Patch18: ppp-2.4.3-winbind-setuidfix.patch Patch19: ppp-2.4.4-strncatfix.patch +Patch20: ppp-2.4.2-pppoatm-mtu.patch %description The ppp package contains the PPP (Point-to-Point Protocol) daemon, @@ -126,6 +127,7 @@ Authors: %patch17 %patch18 %patch19 -p1 +%patch20 -p1 %build %if %suse_version > 1000 @@ -179,6 +181,8 @@ rm -rf %{buildroot} /usr/include/pppd %changelog +* Thu Aug 23 2007 - hvogel@suse.de +- Work around pppoatm MTU problems. [#301678] * Thu Jul 26 2007 - prusnak@suse.cz - changed libpcap to libpcap-devel in BuildRequires * Tue Dec 19 2006 - meissner@suse.de