diff --git a/resolve-conf.diff b/resolve-conf.diff index 0dfecef..2bcba66 100644 --- a/resolve-conf.diff +++ b/resolve-conf.diff @@ -1,7 +1,9 @@ ---- scripts/pppoe-connect.in +Index: scripts/pppoe-connect.in +=================================================================== +--- scripts/pppoe-connect.in.orig +++ scripts/pppoe-connect.in -@@ -217,11 +217,12 @@ - PPP_STD_OPTIONS="$PLUGIN_OPTS noipdefault noauth default-asyncmap $DEFAULTROUTE hide-password nodetach $PEERDNS mtu 1492 mru 1492 noaccomp noccp nobsdcomp nodeflate nopcomp novj novjccomp user $USER lcp-echo-interval $LCP_INTERVAL lcp-echo-failure $LCP_FAILURE $PPPD_EXTRA" +@@ -214,11 +214,12 @@ fi + PPP_STD_OPTIONS="$PLUGIN_OPTS noipdefault noauth default-asyncmap $DEFAULTROUTE hide-password nodetach $PEERDNS mtu 1492 mru 1492 noaccomp nodeflate nopcomp novj novjccomp user $USER lcp-echo-interval $LCP_INTERVAL lcp-echo-failure $LCP_FAILURE $PPPD_EXTRA" # Jigger DNS if required... -if test "$DNSTYPE" = "SERVER" ; then diff --git a/rp-pppoe.changes b/rp-pppoe.changes index 913096a..581a4c9 100644 --- a/rp-pppoe.changes +++ b/rp-pppoe.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 3 19:09:43 UTC 2009 - coolo@novell.com + +- updated patches to apply with fuzz=0 + ------------------------------------------------------------------- Fri May 8 02:15:32 CEST 2009 - chris@computersalat.de diff --git a/rp-pppoe.spec b/rp-pppoe.spec index 84b9dfd..e436daa 100644 --- a/rp-pppoe.spec +++ b/rp-pppoe.spec @@ -24,7 +24,7 @@ Name: rp-pppoe Summary: A PPP Over Ethernet Redirector for PPPD Version: 3.10 -Release: 27 +Release: 28 License: GPL v2 or later Group: Productivity/Networking/PPP Source: http://www.roaringpenguin.com/pppoe/rp-pppoe-%{version}.tar.bz2 @@ -159,123 +159,6 @@ cd ../gui /usr/share/tkpppoe/en.msg /usr/share/tkpppoe/ja.msg #---------------------------------------------------------------------------------- - #---------------------------------------------------------------------------------- + %changelog -* Fri May 08 2009 chris@computersalat.de -- new patch for init script - o added reload - o rework of status -- added config patch -* Wed Apr 15 2009 chris@computersalat.de -- beautify spec -* Fri Jul 04 2008 hvogel@suse.de -- update to version 3.10 - * some compilation fixes - * pppoe-server has new "-x" option to limit the number of sessions - per MAC address. - * Added proper timeout handling while waiting for PADO/PADS. - * Fix race condition with some access concentrators -* Fri Feb 22 2008 crrodriguez@suse.de -- add missing remote_fs dependency in the init script -- fix/add missing calls to restart_on_update and stop_on_removal macros -* Thu Jul 13 2006 mskibbe@suse.de -- update to version 3.8 which - o Adjusted code and made it possible to disable debugging code - to shrink size of pppoe executable. - o Fixed bug in MD5 code that caused pppoe-server to segfault on - 64-bit machines. - o Made various functions and variables static that didn't need - to be visible outside their source files. -* Fri May 26 2006 schwab@suse.de -- Use RPM_OPT_FLAGS. -- Don't strip binaries. -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Thu Nov 17 2005 arvin@suse.de -- updated to version 3.7 - - pppoe-server prepends "nic-" to interface name if used with - kernel-mode plugin - - added -O option to pppoe-server that specify a different - default options file for pppd -* Wed Sep 21 2005 arvin@suse.de -- updated to version 3.6: - - Changed the names of commands from adsl-* to pppoe-* to - more logically name the scripts (incompatibility) - - Changed sample firewall scripts to use iptables instead of - the old ipchains command -* Wed Jan 19 2005 arvin@suse.de -- fixed build on s390 by compiling without -ansi -* Sat Jan 10 2004 adrian@suse.de -- build as user -* Fri Sep 05 2003 ro@suse.de -- fix typo in specfile -* Fri Sep 05 2003 kukuk@suse.de -- Add %%attr to get filelist in sync with /etc/permissions* -* Fri Jun 13 2003 nashif@suse.de -- Added %%dir to created directories -* Fri May 16 2003 nashif@suse.de -- Fixed init script syntax (bug #26248) -- Fixed file list -* Mon Mar 10 2003 nashif@suse.de -- dont link /etc/resolv.conf, done by ip-up ( #15707) -* Wed Oct 02 2002 nashif@suse.de -- Don't check for release file -* Mon Sep 30 2002 nashif@suse.de -- fixed bug #20327: wrong path to logger in scripts -* Mon Aug 19 2002 kukuk@suse.de -- fixed compilation on UL -* Mon Aug 19 2002 nashif@suse.de -- Fixed bug #17866: Added PreReq -* Sat Aug 10 2002 nashif@suse.de -- Fix bug #17465: detect non-rfc modems -- Fix bug #17466: use netfilter instead of ipchains -* Mon Jul 29 2002 nashif@suse.de -- update to 3.5 -* Mon Jan 14 2002 ro@suse.de -- removed START_ADSL -* Sat Oct 20 2001 nashif@suse.de -- Update to 3.3 - * Client works on Solaris again. It was broken in 3.2. - * Added DEFAULTROUTE=yes|no option to configuration file. - * Server parses address pool file better. - * Server address pool allows ranges of addresses on a line: a.b.c.d-e - * Added "-d" (=debug) and "-P" (=check pool file syntax) options to - pppoe-server. -* Fri Aug 03 2001 nashif@suse.de -- Update to version 3.2 -* Thu Jun 28 2001 nashif@suse.de -- Fixed bug #8966 -- bzipped sources -* Sat Apr 21 2001 nashif@suse.de -- Fixed documentation path in GUI -- Added GUI documentation -* Thu Apr 05 2001 nashif@suse.de -- Fixed init script (Use rc_status) -* Tue Apr 03 2001 nashif@suse.de -- Update to version 3.0 -* Thu Mar 01 2001 nashif@suse.de -- Update to version 2.8 -- Fixed headers -* Fri Dec 22 2000 nashif@suse.de -- Added obosletes and provides tags -* Wed Dec 13 2000 nashif@suse.de -- Update to 2.5 (Fixes security problem) -* Sat Dec 09 2000 nashif@suse.de -- Update to 2.4 -- Fix rcadsl link -- Changed name tp rp-pppoe -* Wed Nov 29 2000 nashif@suse.de -- Use insserv -* Fri Sep 22 2000 nashif@suse.de -- Updated to 2.3 -* Thu May 25 2000 nashif@suse.de -- Updated to 1.9 -- Added init script -* Sun May 07 2000 nashif@suse.de -- Update to version 1.8 -* Wed Mar 29 2000 nashif@suse.de -- Update to version 1.7 -- Fixed Group & Buildroot tag -* Wed Feb 23 2000 nashif@suse.de -- Initial Release (Version 1.3)