From f30432270c2addd36581dc483df38308ef34e6b980994003216c8c93d1974c36 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 8 Jul 2008 22:37:09 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rp-pppoe?expand=0&rev=3 --- no-ansi.diff | 22 ---------------------- release-buildsystem.diff | 22 +++++++++++----------- release.diff | 17 ----------------- rp-pppoe-3.10.tar.bz2 | 3 +++ rp-pppoe-3.8.tar.bz2 | 3 --- rp-pppoe.changes | 10 ++++++++++ rp-pppoe.spec | 24 ++++++++++++------------ strip.diff | 16 ++++++++-------- 8 files changed, 44 insertions(+), 73 deletions(-) delete mode 100644 no-ansi.diff delete mode 100644 release.diff create mode 100644 rp-pppoe-3.10.tar.bz2 delete mode 100644 rp-pppoe-3.8.tar.bz2 diff --git a/no-ansi.diff b/no-ansi.diff deleted file mode 100644 index 41cfced..0000000 --- a/no-ansi.diff +++ /dev/null @@ -1,22 +0,0 @@ ---- ./src/configure.in.orig 2005-09-21 14:29:21.100503169 +0000 -+++ ./src/configure.in 2005-09-21 14:47:23.236467921 +0000 -@@ -169,7 +169,7 @@ - - dnl GCC warning level - if test "$GCC" = yes; then -- CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -ansi" -+ CFLAGS="$CFLAGS -Wall -Wstrict-prototypes" - fi - - dnl If we couldn't find pppd, die ---- ./src/configure.orig 2005-09-21 14:29:27.210435054 +0000 -+++ ./src/configure 2005-09-21 14:47:33.081751070 +0000 -@@ -5557,7 +5557,7 @@ - fi - - if test "$GCC" = yes; then -- CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -ansi" -+ CFLAGS="$CFLAGS -Wall -Wstrict-prototypes" - fi - - if test "$PPPD" = "NOTFOUND"; then diff --git a/release-buildsystem.diff b/release-buildsystem.diff index 6d0979f..071b5ec 100644 --- a/release-buildsystem.diff +++ b/release-buildsystem.diff @@ -1,17 +1,17 @@ ---- src/Makefile.in 2002/10/01 16:36:57 1.1 -+++ src/Makefile.in 2002/10/01 16:39:27 +--- src/Makefile.in ++++ src/Makefile.in @@ -194,11 +194,9 @@ - mkdir -p $(RPM_INSTALL_ROOT)/etc/rc.d/init.d ;\ - $(install) -m 755 ../scripts/adsl-init-turbolinux $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/adsl ; \ + mkdir -p $(DESTDIR)/etc/rc.d/init.d ;\ + $(install) -m 755 ../scripts/pppoe-init-turbolinux $(DESTDIR)/etc/rc.d/init.d/pppoe ; \ fi - @if [ -f /etc/SuSE-release ] ; then \ -- echo "Looks like a SuSE Linux system; installing $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/pppoe" ; \ -- mkdir -p $(RPM_INSTALL_ROOT)/etc/rc.d/init.d ;\ -- $(install) -m 755 ../scripts/pppoe-init-suse $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/pppoe ; \ +- echo "Looks like a SuSE Linux system; installing $(DESTDIR)/etc/rc.d/init.d/pppoe" ; \ +- mkdir -p $(DESTDIR)/etc/rc.d/init.d ;\ +- $(install) -m 755 ../scripts/pppoe-init-suse $(DESTDIR)/etc/rc.d/init.d/pppoe ; \ - fi -+ echo "Looks like a SuSE Linux system; installing $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/pppoe" ; \ -+ mkdir -p $(RPM_INSTALL_ROOT)/etc/init.d ;\ -+ $(install) -m 755 ../scripts/pppoe-init-suse $(RPM_INSTALL_ROOT)/etc/init.d/pppoe ; \ ++ echo "Looks like a SuSE Linux system; installing $(DESTDIR)/etc/init.d/pppoe" ; \ ++ mkdir -p $(DESTDIR)/etc/init.d ;\ ++ $(install) -m 755 ../scripts/pppoe-init-suse $(DESTDIR)/etc/init.d/pppoe ; \ - # L2TP @if [ -f l2tp/handlers/sync-pppd.so ] ; then \ + mkdir -p $(DESTDIR)/usr/lib/l2tp/plugins ; \ diff --git a/release.diff b/release.diff deleted file mode 100644 index 629504b..0000000 --- a/release.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- src/Makefile.in -+++ src/Makefile.in -@@ -194,10 +194,10 @@ - mkdir -p $(RPM_INSTALL_ROOT)/etc/rc.d/init.d ;\ - $(install) -m 755 ../scripts/pppoe-init-turbolinux $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/pppoe ; \ - fi -- @if [ -f /etc/SuSE-release ] ; then \ -- echo "Looks like a SuSE Linux system; installing $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/pppoe" ; \ -- mkdir -p $(RPM_INSTALL_ROOT)/etc/rc.d/init.d ;\ -- $(install) -m 755 ../scripts/pppoe-init-suse $(RPM_INSTALL_ROOT)/etc/rc.d/init.d/pppoe ; \ -+ @if [ -f /etc/SuSE-release -o -f /etc/UnitedLinux-release ] ; then \ -+ echo "Looks like a SuSE Linux/UnitedLinux system; installing $(RPM_INSTALL_ROOT)/etc/init.d/pppoe" ; \ -+ mkdir -p $(RPM_INSTALL_ROOT)/etc/init.d ;\ -+ $(install) -m 755 ../scripts/pppoe-init-suse $(RPM_INSTALL_ROOT)/etc/init.d/pppoe ; \ - fi - - # L2TP diff --git a/rp-pppoe-3.10.tar.bz2 b/rp-pppoe-3.10.tar.bz2 new file mode 100644 index 0000000..87dfe44 --- /dev/null +++ b/rp-pppoe-3.10.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7256f4a68dfc0aafe637dcf515c51b9ccc53cee264f04931113ea460fd409299 +size 185624 diff --git a/rp-pppoe-3.8.tar.bz2 b/rp-pppoe-3.8.tar.bz2 deleted file mode 100644 index 2b7c55f..0000000 --- a/rp-pppoe-3.8.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d1cd1a8ff67c4981ea861094582875c8e66e48a001f778f4f2ea44ea53ef90e3 -size 183203 diff --git a/rp-pppoe.changes b/rp-pppoe.changes index 73a8bf4..5f14437 100644 --- a/rp-pppoe.changes +++ b/rp-pppoe.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Jul 4 11:40:26 CEST 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 00:46:26 CET 2008 - crrodriguez@suse.de diff --git a/rp-pppoe.spec b/rp-pppoe.spec index 2d992da..47103df 100644 --- a/rp-pppoe.spec +++ b/rp-pppoe.spec @@ -1,5 +1,5 @@ # -# spec file for package rp-pppoe (Version 3.8) +# spec file for package rp-pppoe (Version 3.10) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,8 +14,8 @@ Name: rp-pppoe BuildRequires: ppp Summary: A PPP Over Ethernet Redirector for PPPD -Version: 3.8 -Release: 89 +Version: 3.10 +Release: 1 License: GPL v2 or later Group: Productivity/Networking/PPP Source: http://www.roaringpenguin.com/pppoe/rp-pppoe-%{version}.tar.bz2 @@ -24,10 +24,8 @@ Patch0: init-suse.diff Patch1: docdir.diff Patch2: nonrfc-modems.diff Patch3: logger-path.diff -Patch4: release.diff Patch5: release-buildsystem.diff Patch6: resolve-conf.diff -Patch7: no-ansi.diff Patch8: strip.diff Requires: ppp >= 2.3.7 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -50,13 +48,8 @@ Authors: %patch1 %patch2 %patch3 -%if %suse_version > 810 %patch5 -%else -%patch4 -%endif %patch6 -%patch7 %patch8 %build @@ -69,10 +62,10 @@ make %install cd src -make install RPM_INSTALL_ROOT=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT ln -sf ../../etc/init.d/pppoe $RPM_BUILD_ROOT/usr/sbin/rcpppoe cd ../gui -make install RPM_INSTALL_ROOT=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%_defaultdocdir/rp-pppoe mv $RPM_BUILD_ROOT/etc/ppp/plugins/README $RPM_BUILD_ROOT%_defaultdocdir/rp-pppoe/README.plugins rm -rf $RPM_BUILD_ROOT/etc/ppp/plugins @@ -137,6 +130,13 @@ rm -rf $RPM_BUILD_ROOT /usr/share/tkpppoe/ja.msg %changelog +* 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 diff --git a/strip.diff b/strip.diff index 8b617d9..935b220 100644 --- a/strip.diff +++ b/strip.diff @@ -1,11 +1,11 @@ --- gui/Makefile.in +++ gui/Makefile.in @@ -46,7 +46,7 @@ - -mkdir -p $(RPM_INSTALL_ROOT)$(sbindir) - -mkdir -p $(RPM_INSTALL_ROOT)$(bindir) - -mkdir -p $(RPM_INSTALL_ROOT)/etc/ppp/rp-pppoe-gui -- $(install) -m 4755 -s pppoe-wrapper $(RPM_INSTALL_ROOT)$(sbindir) -+ $(install) -m 4755 pppoe-wrapper $(RPM_INSTALL_ROOT)$(sbindir) - $(install) -m 755 tkpppoe $(RPM_INSTALL_ROOT)$(bindir) - -mkdir -p $(RPM_INSTALL_ROOT)$(mandir)/man1 - $(install) -m 644 pppoe-wrapper.1 $(RPM_INSTALL_ROOT)$(mandir)/man1 + -mkdir -p $(DESTDIR)$(sbindir) + -mkdir -p $(DESTDIR)$(bindir) + -mkdir -p $(DESTDIR)/etc/ppp/rp-pppoe-gui +- $(install) -m 4755 -s pppoe-wrapper $(DESTDIR)$(sbindir) ++ $(install) -m 4755 pppoe-wrapper $(DESTDIR)$(sbindir) + $(install) -m 755 tkpppoe $(DESTDIR)$(bindir) + -mkdir -p $(DESTDIR)$(mandir)/man1 + $(install) -m 644 pppoe-wrapper.1 $(DESTDIR)$(mandir)/man1