Hello community,
here is the log from the commit of package rp-pppoe
checked in at Wed Jul 9 00:37:08 CEST 2008.
--------
--- rp-pppoe/rp-pppoe.changes 2008-02-22 00:47:09.000000000 +0100
+++ rp-pppoe/rp-pppoe.changes 2008-07-04 11:43:45.000000000 +0200
@@ -1,0 +2,10 @@
+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
+
+-------------------------------------------------------------------
Old:
----
no-ansi.diff
release.diff
rp-pppoe-3.8.tar.bz2
New:
----
rp-pppoe-3.10.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rp-pppoe.spec ++++++
--- /var/tmp/diff_new_pack.W18825/_old 2008-07-09 00:22:13.000000000 +0200
+++ /var/tmp/diff_new_pack.W18825/_new 2008-07-09 00:22:13.000000000 +0200
@@ -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 @@
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 @@
%patch1
%patch2
%patch3
-%if %suse_version > 810
%patch5
-%else
-%patch4
-%endif
%patch6
-%patch7
%patch8
%build
@@ -69,10 +62,10 @@
%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 @@
/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
++++++ release-buildsystem.diff ++++++
--- /var/tmp/diff_new_pack.W18825/_old 2008-07-09 00:22:13.000000000 +0200
+++ /var/tmp/diff_new_pack.W18825/_new 2008-07-09 00:22:13.000000000 +0200
@@ -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 ; \
++++++ rp-pppoe-3.8.tar.bz2 -> rp-pppoe-3.10.tar.bz2 ++++++
++++ 10178 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/configs/pppoe.conf new/rp-pppoe-3.10/configs/pppoe.conf
--- old/rp-pppoe-3.8/configs/pppoe.conf 2006-04-02 16:29:41.000000000 +0200
+++ new/rp-pppoe-3.10/configs/pppoe.conf 2008-06-30 16:00:42.000000000 +0200
@@ -15,7 +15,7 @@
# Public License.
#
# LIC: GPL
-# $Id: pppoe.conf,v 1.11 2005/08/09 02:49:12 dfs Exp $
+# $Id$
#***********************************************************************
# When you configure a variable, DO NOT leave spaces around the "=" sign.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/doc/CHANGES new/rp-pppoe-3.10/doc/CHANGES
--- old/rp-pppoe-3.8/doc/CHANGES 2006-04-02 16:29:42.000000000 +0200
+++ new/rp-pppoe-3.10/doc/CHANGES 2008-06-30 16:00:42.000000000 +0200
@@ -1,5 +1,30 @@
# LIC: GPL
+Changes from Version 3.9 to 3.10: (30 June 2008)
+
+- Fixed compilation problems on various platforms.
+
+- The Makefiles now use (standard) DESTDIR instead of (non-standard)
+ RPM_INSTALL_ROOT to relocate installed files.
+
+- Spec file has been updated (it had languished since 3.6.)
+
+Changes from Version 3.8 to 3.9: (21 June 2008)
+
+- 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 that move very quickly
+ into session mode (problem noted by Luigi Sgro)
+
+- Fixed compilation problem on BSD.
+
+- Fixed compilation problems with old versions of gcc
+
+- Remove superfluous options in scripts/pppoe-connect.in
+
Changes from Version 3.7 to 3.8: (2 April 2006)
- Adjusted code and made it possible to disable debugging code to shrink
@@ -311,4 +336,4 @@
- Made pppoe send a PADT frame if connection is terminated
-$Id: CHANGES,v 1.26 2006/04/02 14:29:25 dfs Exp $
+$Id$
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/doc/HOW-TO-CONNECT new/rp-pppoe-3.10/doc/HOW-TO-CONNECT
--- old/rp-pppoe-3.8/doc/HOW-TO-CONNECT 2006-04-02 16:29:42.000000000 +0200
+++ new/rp-pppoe-3.10/doc/HOW-TO-CONNECT 2008-06-30 16:00:42.000000000 +0200
@@ -1,11 +1,11 @@
# LIC: GPL
-$Id: HOW-TO-CONNECT,v 1.4 2005/08/09 02:49:13 dfs Exp $
+$Id$
-This package lets you connect a Linux machine to Sympatico HSE or Magma's
-high-speed service using a Nortel 1-meg modem.
+This package lets you connect a Linux machine to an ISP that uses PPPoE.
+PPPoE is used by many DSL providers and some wireless providers.
-Follow these steps and you should have your high-speed service up and running.
+Follow these steps and you should have your PPPoE service up and running.
0. Install the rp-pppoe-software
--------------------------------
@@ -25,7 +25,7 @@
should display something like this:
- eth0 Link encap:Ethernet HWaddr 00:60:67:62:31:D4
+ eth0 Link encap:Ethernet HWaddr 00:60:67:62:31:D4
plust some more lines. Your HWaddr will be different. As long as you see
the HWaddr line, your card should be working.
@@ -135,7 +135,7 @@
--
David F. Skoll | Roaring Penguin Software Inc.
-http://www.roaringpenguin.com | Linux and UNIX Specialists
+http://www.roaringpenguin.com |
PROBLEMS! DAVE, IT DOESN'T WORK!
---------------------------------
@@ -159,8 +159,9 @@
-----------------------------------------------------------------------------
C) Can't compile PPPoE
-I have only tested compilation on 2.2-kernel machines. Make sure you have
-"make", the C compiler and all development header files installed.
+Make sure you have "make", the C compiler and all development header
+files installed. I only test rp-pppoe on Linux. It might not work on
+*BSD and probably won't work on any other version of UNIX.
-----------------------------------------------------------------------------
D) pppd complains about (i) "unknown option pty" or (ii) "pty option precludes
@@ -265,33 +266,3 @@
ifconfig ethx up mtu 1500
which should reset things to sane values.
-
-#######################################################################
-# WHEN ALL ELSE FAILS: #
-#######################################################################
-
-If you are completely unable to connect, run the pppoe-start script in
-debugging mode. If you are using bash as your shell (if you don't
-know what your shell is, it's probably bash), type this:
-
- DEBUG=1 pppoe-start
-
-In tcsh or csh, use:
-
- setenv DEBUG 1; pppoe-start
-
-Then follow the instructions to mail the debugging file to me. PLEASE
-DON'T DO THIS until you have exhausted all other avenues; rp-pppoe is
-free software and it costs me time and money to help people with
-problems. While I don't mind doing this, I do mind it if you don't
-make an effort to fix the problem yourself first.
-
-WARNING: If you run pppoe-start in debugging mode and you manage to
-connect, your connection will be extremely slow and huge amounts of
-data will quickly fill your /tmp directory. Do not use debugging mode
-unless you really cannot get your connection to work.
-
-Be aware that debugging mode produces hex dumps which potentially reveal
-your user name and password. If the debugging output includes packets
-labeled "PPPoE Session", you may wish to remove these packets from the
-dump before mailing it to me.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/doc/KERNEL-MODE-PPPOE new/rp-pppoe-3.10/doc/KERNEL-MODE-PPPOE
--- old/rp-pppoe-3.8/doc/KERNEL-MODE-PPPOE 2006-04-02 16:29:42.000000000 +0200
+++ new/rp-pppoe-3.10/doc/KERNEL-MODE-PPPOE 2008-06-30 16:00:42.000000000 +0200
@@ -1,12 +1,14 @@
# LIC: GPL
-RP-PPPoE now supports kernel-mode PPPoE on Linux kernels 2.4.x. However,
-the default "./go" build procedure does not make kernel-mode support.
+RP-PPPoE now supports kernel-mode PPPoE on Linux kernels 2.4 or newer.
+However, the default "./go" build procedure does not make kernel-mode
+support.
Here's what you need to do:
-0) Make sure you are running kernel 2.4.x on the machine you will build
-rp-pppoe on. You must have the following kernel configuration settings:
+0) Make sure you are running kernel 2.4 or newer on the machine you
+will build rp-pppoe on. You must have the following kernel
+configuration settings:
CONFIG_PPP=m or CONFIG_PPP=y
CONFIG_PPP_ASYNC=m or CONFIG_PPP_ASYNC=y
@@ -65,6 +67,9 @@
./configure --enable-plugin
+This will work if the header pppd/pppd.h is located in /usr/include
+or /usr/local/include.
+
4) Type make; make install
5) Edit /etc/ppp/pppoe.conf to include this line:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/go new/rp-pppoe-3.10/go
--- old/rp-pppoe-3.8/go 2006-04-02 16:29:41.000000000 +0200
+++ new/rp-pppoe-3.10/go 2008-06-30 16:00:41.000000000 +0200
@@ -8,7 +8,7 @@
#
# Copyright (C) 2000 Roaring Penguin Software Inc.
#
-# $Id: go,v 1.5 2005/08/09 02:49:09 dfs Exp $
+# $Id$
#***********************************************************************
# Figure out directory of script
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/go-gui new/rp-pppoe-3.10/go-gui
--- old/rp-pppoe-3.8/go-gui 2006-04-02 16:29:41.000000000 +0200
+++ new/rp-pppoe-3.10/go-gui 2008-06-30 16:00:41.000000000 +0200
@@ -8,7 +8,7 @@
#
# Copyright (C) 2000 Roaring Penguin Software Inc.
#
-# $Id: go-gui,v 1.5 2005/08/09 02:49:09 dfs Exp $
+# $Id$
#***********************************************************************
# GUI only works on Linux
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/gui/pppoe-wrapper.1 new/rp-pppoe-3.10/gui/pppoe-wrapper.1
--- old/rp-pppoe-3.8/gui/pppoe-wrapper.1 2006-04-02 16:29:41.000000000 +0200
+++ new/rp-pppoe-3.10/gui/pppoe-wrapper.1 2008-06-30 16:00:41.000000000 +0200
@@ -1,4 +1,3 @@
-.\" $Id: pppoe-wrapper.1,v 1.3 2005/08/09 02:49:14 dfs Exp $
.\" LIC: GPL
.TH PPPOE-WRAPPER 1 "26 February 2001"
.UC 4
@@ -22,7 +21,7 @@
.TP
.B o
-Second, \fBpppoe-wrapper\fR opens the file \fB/etc/ppp/rp-pppoe-gui/\fR\fIlinkname\fR for reading. If that file does not contain the line:
+Second, \fBpppoe-wrapper\fR opens the file \fB/etc/ppp/rp-pppoe-gui/conf.\fR\fIlinkname\fR for reading. If that file does not contain the line:
.nf
NONROOT=OK
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/gui/tkpppoe.1 new/rp-pppoe-3.10/gui/tkpppoe.1
--- old/rp-pppoe-3.8/gui/tkpppoe.1 2006-04-02 16:29:41.000000000 +0200
+++ new/rp-pppoe-3.10/gui/tkpppoe.1 2008-06-30 16:00:41.000000000 +0200
@@ -1,4 +1,4 @@
-.\" $Id: tkpppoe.1,v 1.3 2005/08/09 02:49:14 dfs Exp $
+.\" $Id$
.\" LIC: GPL
.TH TKPPPOE 1 "26 February 2001"
.UC 4
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/gui/tkpppoe.in new/rp-pppoe-3.10/gui/tkpppoe.in
--- old/rp-pppoe-3.8/gui/tkpppoe.in 2006-04-02 16:29:41.000000000 +0200
+++ new/rp-pppoe-3.10/gui/tkpppoe.in 2008-06-30 16:00:41.000000000 +0200
@@ -17,7 +17,7 @@
#
#--------------------------------------------------------------
-# $Id: tkpppoe.in,v 1.48 2005/08/09 02:49:14 dfs Exp $
+# $Id$
# the next line restarts using wish \
umask 022; \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/gui/wrapper.c new/rp-pppoe-3.10/gui/wrapper.c
--- old/rp-pppoe-3.8/gui/wrapper.c 2006-04-02 16:29:41.000000000 +0200
+++ new/rp-pppoe-3.10/gui/wrapper.c 2008-06-30 16:00:41.000000000 +0200
@@ -14,9 +14,6 @@
* Public License, Version 2, or (at your option) any later version.
***********************************************************************/
-static char const RCSID[] =
-"$Id: wrapper.c,v 1.10 2005/08/09 02:49:15 dfs Exp $";
-
#define _SVID_SOURCE 1 /* For putenv */
#define _POSIX_SOURCE 1 /* For fileno */
#define _BSD_SOURCE 1 /* For setreuid */
@@ -146,7 +143,7 @@
/* Clean out environment */
CleanEnvironment(environ);
-
+
/* Are we root? */
amRoot = (getuid() == 0);
@@ -221,7 +218,7 @@
perror("setreuid");
exit(1);
}
-
+
/* It's OK -- do it. */
if (!strcmp(argv[1], "start")) {
if (!PathOK(pppoe_start)) exit(1);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/man/pppoe.8 new/rp-pppoe-3.10/man/pppoe.8
--- old/rp-pppoe-3.8/man/pppoe.8 2006-04-02 16:29:42.000000000 +0200
+++ new/rp-pppoe-3.10/man/pppoe.8 2008-06-30 16:00:42.000000000 +0200
@@ -1,4 +1,3 @@
-.\" $Id: pppoe.8,v 1.6 2005/08/09 02:49:16 dfs Exp $
.\" LIC: GPL
.TH PPPOE 8 "3 July 2000"
.UC 4
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/man/pppoe.conf.5 new/rp-pppoe-3.10/man/pppoe.conf.5
--- old/rp-pppoe-3.8/man/pppoe.conf.5 2006-04-02 16:29:42.000000000 +0200
+++ new/rp-pppoe-3.10/man/pppoe.conf.5 2008-06-30 16:00:42.000000000 +0200
@@ -1,6 +1,4 @@
-.\" $Id: pppoe.conf.5,v 1.7 2005/08/09 02:49:16 dfs Exp $
.\" LIC: GPL
-.\""
.TH PPPOE.CONF 5 "21 February 2000"
.UC 4
.SH NAME
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/man/pppoe-connect.8 new/rp-pppoe-3.10/man/pppoe-connect.8
--- old/rp-pppoe-3.8/man/pppoe-connect.8 2006-04-02 16:29:42.000000000 +0200
+++ new/rp-pppoe-3.10/man/pppoe-connect.8 2008-06-30 16:00:42.000000000 +0200
@@ -1,4 +1,3 @@
-.\" $Id: pppoe-connect.8,v 1.1 2005/08/09 02:29:58 dfs Exp $
.\" LIC: GPL
.TH PPPOE-CONNECT 8 "21 February 2000"
.UC 4
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/man/pppoe-relay.8 new/rp-pppoe-3.10/man/pppoe-relay.8
--- old/rp-pppoe-3.8/man/pppoe-relay.8 2006-04-02 16:29:42.000000000 +0200
+++ new/rp-pppoe-3.10/man/pppoe-relay.8 2008-06-30 16:00:42.000000000 +0200
@@ -1,4 +1,3 @@
-.\" $Id: pppoe-relay.8,v 1.7 2005/08/09 02:29:58 dfs Exp $
.\" LIC: GPL
.TH PPPOE-RELAY 8 "26 January 2001"
.\""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/man/pppoe-server.8 new/rp-pppoe-3.10/man/pppoe-server.8
--- old/rp-pppoe-3.8/man/pppoe-server.8 2006-04-02 16:29:42.000000000 +0200
+++ new/rp-pppoe-3.10/man/pppoe-server.8 2008-06-30 16:00:42.000000000 +0200
@@ -1,6 +1,5 @@
-.\" $Id: pppoe-server.8,v 1.11 2005/11/16 16:35:39 dfs Exp $
.\" LIC: GPL
-.TH PPPOE-SERVER 8 "3 July 2000"
+.TH PPPOE-SERVER 8 "21 June 2008"
.\""
.UC 4
.SH NAME
@@ -52,6 +51,13 @@
details. If you are using kernel-mode PPPoE, this option has \fIno effect\fR.
.TP
+.B \-x \fIn\fR
+Limit the number of sessions per peer MAC address to \fIn\fR. If a given
+MAC address attempts to create more than \fIn\fR sessions, then its
+PADI and PADR packets are ignored. If you set \fIn\fR to 0 (the default),
+then no limit is imposed on the number of sessions per peer MAC address.
+
+.TP
.B \-s
This option is passed directly to \fBpppoe\fR; see \fBpppoe\fR(8) for
details. In addition, it causes \fBpppd\fR to be invoked with the
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/man/pppoe-setup.8 new/rp-pppoe-3.10/man/pppoe-setup.8
--- old/rp-pppoe-3.8/man/pppoe-setup.8 2006-04-02 16:29:42.000000000 +0200
+++ new/rp-pppoe-3.10/man/pppoe-setup.8 2008-06-30 16:00:42.000000000 +0200
@@ -1,4 +1,3 @@
-.\" $Id: pppoe-setup.8,v 1.1 2005/08/09 02:29:58 dfs Exp $
.\" LIC: GPL
.TH PPPOE-SETUP 8 "21 February 2000"
.UC 4
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/man/pppoe-sniff.8 new/rp-pppoe-3.10/man/pppoe-sniff.8
--- old/rp-pppoe-3.8/man/pppoe-sniff.8 2006-04-02 16:29:42.000000000 +0200
+++ new/rp-pppoe-3.10/man/pppoe-sniff.8 2008-06-30 16:00:42.000000000 +0200
@@ -1,4 +1,3 @@
-.\" $Id: pppoe-sniff.8,v 1.4 2005/08/09 02:29:58 dfs Exp $
.\" LIC: GPL
.TH PPPOE-SNIFF 8 "3 July 2000"
.\""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/man/pppoe-start.8 new/rp-pppoe-3.10/man/pppoe-start.8
--- old/rp-pppoe-3.8/man/pppoe-start.8 2006-04-02 16:29:42.000000000 +0200
+++ new/rp-pppoe-3.10/man/pppoe-start.8 2008-06-30 16:00:42.000000000 +0200
@@ -1,4 +1,3 @@
-.\" $Id: pppoe-start.8,v 1.1 2005/08/09 02:29:58 dfs Exp $
.\" LIC: GPL
.TH PPPOE-START 8 "21 February 2000"
.UC 4
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/man/pppoe-status.8 new/rp-pppoe-3.10/man/pppoe-status.8
--- old/rp-pppoe-3.8/man/pppoe-status.8 2006-04-02 16:29:42.000000000 +0200
+++ new/rp-pppoe-3.10/man/pppoe-status.8 2008-06-30 16:00:42.000000000 +0200
@@ -1,4 +1,3 @@
-.\" $Id: pppoe-status.8,v 1.1 2005/08/09 02:29:58 dfs Exp $
.\" LIC: GPL
.TH PPPOE-STATUS 8 "16 March 2000"
.UC 4
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/man/pppoe-stop.8 new/rp-pppoe-3.10/man/pppoe-stop.8
--- old/rp-pppoe-3.8/man/pppoe-stop.8 2006-04-02 16:29:42.000000000 +0200
+++ new/rp-pppoe-3.10/man/pppoe-stop.8 2008-06-30 16:00:42.000000000 +0200
@@ -1,4 +1,3 @@
-.\" $Id: pppoe-stop.8,v 1.1 2005/08/09 02:29:58 dfs Exp $
.\" LIC: GPL
.TH PPPOE-STOP 8 "21 February 2000"
.UC 4
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/rp-pppoe.spec new/rp-pppoe-3.10/rp-pppoe.spec
--- old/rp-pppoe-3.8/rp-pppoe.spec 2006-04-02 16:29:41.000000000 +0200
+++ new/rp-pppoe-3.10/rp-pppoe.spec 2008-06-30 16:00:41.000000000 +0200
@@ -1,14 +1,14 @@
Summary: PPP Over Ethernet (xDSL support)
Name: rp-pppoe
-Version: 3.6
+Version: 3.10
%if %(%{expand:test %{_vendor} != mandrake ; echo $?})
Release: 1mdk
%else
Release: 1
%endif
-Copyright: GPL
+License: GPL
Group: System Environment/Daemons
-Source: http://www.roaringpenguin.com/penguin/pppoe/rp-pppoe-3.6.tar.gz
+Source: http://www.roaringpenguin.com/penguin/pppoe/rp-pppoe-3.10.tar.gz
Url: http://www.roaringpenguin.com/pppoe/
Packager: David F. Skoll
BuildRoot: /tmp/pppoe-build
@@ -37,10 +37,18 @@
make
%install
+umask 022
cd src
-make install RPM_INSTALL_ROOT=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/etc/init.d
+test -f $RPM_BUILD_ROOT/etc/init.d/pppoe || cp ../scripts/pppoe-init $RPM_BUILD_ROOT/etc/init.d/pppoe
+chmod 755 $RPM_BUILD_ROOT/etc/init.d/pppoe
cd ../gui
-make install RPM_INSTALL_ROOT=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT/etc/ppp/pppoe.conf-3.10
+rm -f $RPM_BUILD_ROOT/etc/ppp/firewall-masq-3.10
+rm -f $RPM_BUILD_ROOT/etc/ppp/firewall-standalone-3.10
+rm -f $RPM_BUILD_ROOT/etc/ppp/pppoe-server-options-example
%clean
rm -rf $RPM_BUILD_ROOT
@@ -72,8 +80,7 @@
%{_mandir}/man8/pppoe-stop.8*
%{_mandir}/man8/pppoe-status.8*
%{_mandir}/man8/pppoe-setup.8*
-/etc/rc.d/init.d/pppoe
-
+/etc/init.d/pppoe
%package gui
Summary: Tk PPP Over Ethernet Client (xDSL support)
Group: System Environment/Daemons
@@ -145,4 +152,4 @@
%changelog
* Thu Jul 21 2001 Shigechika AIKAWA
-- merged rp-pppeo.spec and rp-pppoe-gui.spec
+- merged rp-pppoe.spec and rp-pppoe-gui.spec
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/scripts/pppoe-connect.in new/rp-pppoe-3.10/scripts/pppoe-connect.in
--- old/rp-pppoe-3.8/scripts/pppoe-connect.in 2006-04-02 16:29:42.000000000 +0200
+++ new/rp-pppoe-3.10/scripts/pppoe-connect.in 2008-06-30 16:00:42.000000000 +0200
@@ -8,7 +8,7 @@
#
# Copyright (C) 2000 Roaring Penguin Software Inc.
#
-# $Id: pppoe-connect.in,v 1.3 2005/08/29 12:16:37 dfs Exp $
+# $Id$
#
# This file may be distributed under the terms of the GNU General
# Public License.
@@ -201,9 +201,6 @@
if test -n "$SERVICENAME" ; then
PLUGIN_OPTS="$PLUGIN_OPTS rp_pppoe_service $SERVICENAME"
fi
-
- # Interface name MUST BE LAST!!
- PLUGIN_OPTS="$PLUGIN_OPTS $ETH"
modprobe pppoe > /dev/null 2>&1
fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/scripts/pppoe-setup.in new/rp-pppoe-3.10/scripts/pppoe-setup.in
--- old/rp-pppoe-3.8/scripts/pppoe-setup.in 2006-04-02 16:29:42.000000000 +0200
+++ new/rp-pppoe-3.10/scripts/pppoe-setup.in 2008-06-30 16:00:42.000000000 +0200
@@ -9,7 +9,7 @@
#
# Copyright (C) 2000 Roaring Penguin Software Inc.
#
-# $Id: pppoe-setup.in,v 1.2 2005/08/10 00:25:18 dfs Exp $
+# $Id$
#***********************************************************************
# From AUTOCONF
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/scripts/pppoe-start.in new/rp-pppoe-3.10/scripts/pppoe-start.in
--- old/rp-pppoe-3.8/scripts/pppoe-start.in 2006-04-02 16:29:42.000000000 +0200
+++ new/rp-pppoe-3.10/scripts/pppoe-start.in 2008-06-30 16:00:42.000000000 +0200
@@ -8,7 +8,7 @@
#
# Copyright (C) 2000 Roaring Penguin Software Inc.
#
-# $Id: pppoe-start.in,v 1.2 2005/08/10 00:25:19 dfs Exp $
+# $Id$
#
# This file may be distributed under the terms of the GNU General
# Public License.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/scripts/pppoe-status new/rp-pppoe-3.10/scripts/pppoe-status
--- old/rp-pppoe-3.8/scripts/pppoe-status 2006-04-02 16:29:42.000000000 +0200
+++ new/rp-pppoe-3.10/scripts/pppoe-status 2008-06-30 16:00:42.000000000 +0200
@@ -7,7 +7,7 @@
#
# Copyright (C) 2000-2001 Roaring Penguin Software Inc.
#
-# $Id: pppoe-status,v 1.1 2005/08/09 02:49:18 dfs Exp $
+# $Id$
#
# This file may be distributed under the terms of the GNU General
# Public License.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/scripts/pppoe-stop.in new/rp-pppoe-3.10/scripts/pppoe-stop.in
--- old/rp-pppoe-3.8/scripts/pppoe-stop.in 2006-04-02 16:29:42.000000000 +0200
+++ new/rp-pppoe-3.10/scripts/pppoe-stop.in 2008-06-30 16:00:42.000000000 +0200
@@ -8,7 +8,7 @@
#
# Copyright (C) 2000 Roaring Penguin Software Inc.
#
-# $Id: pppoe-stop.in,v 1.2 2005/08/10 00:25:19 dfs Exp $
+# $Id$
#
# This file may be distributed under the terms of the GNU General
# Public License.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/src/common.c new/rp-pppoe-3.10/src/common.c
--- old/rp-pppoe-3.8/src/common.c 2006-04-02 16:29:42.000000000 +0200
+++ new/rp-pppoe-3.10/src/common.c 2008-06-30 16:00:42.000000000 +0200
@@ -16,7 +16,7 @@
***********************************************************************/
static char const RCSID[] =
-"$Id: common.c,v 1.21 2006/01/03 03:20:38 dfs Exp $";
+"$Id$";
/* For vsnprintf prototype */
#define _ISOC99_SOURCE 1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/src/configure.in new/rp-pppoe-3.10/src/configure.in
--- old/rp-pppoe-3.8/src/configure.in 2006-04-02 16:29:42.000000000 +0200
+++ new/rp-pppoe-3.10/src/configure.in 2008-06-30 16:00:42.000000000 +0200
@@ -25,6 +25,7 @@
#include
#include
#include
+#include
])
dnl Checks for typedefs, structures, and compiler characteristics.
@@ -64,13 +65,16 @@
dnl the pppd source code might be.
if test "$ac_cv_pluginpath" = "yes" ; then
- AC_PATH_PROG(PPPD_H, pppd/pppd.h, NOTFOUND, "/usr/include:/usr/local/include:$PATH:../../$PPPD_DIR")
- if test "$PPPD_H" = "NOTFOUND" ; then
- ac_cv_pluginpath=no
- else
- ac_cv_pluginpath=`dirname "$PPPD_H"`
- ac_cv_pluginpath=`dirname "$ac_cv_pluginpath"`
+ for i in /usr/include /usr/local/include ; do
+ if test -r $i/pppd/pppd.h; then
+ ac_cv_pluginpath=$i
fi
+ done
+fi
+
+if test "$ac_cv_pluginpath" = "yes" ; then
+ echo "*** Could not fined pppd/pppd.h anywhere... not building plugin"
+ ac_cv_pluginpath=no
fi
AC_ARG_ENABLE(licenses, [ --enable-licenses=lic_path build commercial version], ac_cv_licpath=$enableval, ac_cv_licpath=no)
@@ -105,12 +109,17 @@
fi
fi
+if test "$PPPD_INCDIR" = "" ; then
+ PPPD_INCDIR=/usr/include
+fi
+
if test "$ac_cv_debugging" = "yes" ; then
AC_DEFINE(DEBUGGING_ENABLED)
fi
AC_SUBST(LINUX_KERNELMODE_PLUGIN)
AC_SUBST(PPPD_INCDIR)
+AC_SUBST(PPPD_H)
dnl Determine whether or not to build PPPoE relay
PPPOE_RELAY=""
@@ -157,6 +166,7 @@
AC_TRY_RUN([#include
#include
#include
+#include
#include
int main()
{
@@ -180,7 +190,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
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/src/debug.c new/rp-pppoe-3.10/src/debug.c
--- old/rp-pppoe-3.8/src/debug.c 2006-04-02 16:29:42.000000000 +0200
+++ new/rp-pppoe-3.10/src/debug.c 2008-06-30 16:00:42.000000000 +0200
@@ -16,7 +16,7 @@
***********************************************************************/
static char const RCSID[] =
-"$Id: debug.c,v 1.6 2006/01/03 03:05:06 dfs Exp $";
+"$Id$";
#include "pppoe.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/src/discovery.c new/rp-pppoe-3.10/src/discovery.c
--- old/rp-pppoe-3.8/src/discovery.c 2006-04-02 16:29:42.000000000 +0200
+++ new/rp-pppoe-3.10/src/discovery.c 2008-06-30 16:00:42.000000000 +0200
@@ -11,7 +11,7 @@
***********************************************************************/
static char const RCSID[] =
-"$Id: discovery.c,v 1.25 2006/01/03 03:20:38 dfs Exp $";
+"$Id$";
#include "pppoe.h"
@@ -26,6 +26,7 @@
#ifdef HAVE_SYS_TIME_H
#include
#endif
+#include
#ifdef HAVE_SYS_UIO_H
#include
@@ -322,6 +323,9 @@
fd_set readable;
int r;
struct timeval tv;
+ struct timeval expire_at;
+ struct timeval now;
+
PPPoEPacket packet;
int len;
@@ -332,10 +336,31 @@
pc.seenACName = 0;
pc.seenServiceName = 0;
+ if (gettimeofday(&expire_at, NULL) < 0) {
+ fatalSys("gettimeofday (waitForPADO)");
+ }
+ expire_at.tv_sec += timeout;
+
do {
if (BPF_BUFFER_IS_EMPTY) {
- tv.tv_sec = timeout;
- tv.tv_usec = 0;
+ if (gettimeofday(&now, NULL) < 0) {
+ fatalSys("gettimeofday (waitForPADO)");
+ }
+ tv.tv_sec = expire_at.tv_sec - now.tv_sec;
+ tv.tv_usec = expire_at.tv_usec - now.tv_usec;
+ if (tv.tv_usec < 0) {
+ tv.tv_usec += 1000000;
+ if (tv.tv_sec) {
+ tv.tv_sec--;
+ } else {
+ /* Timed out */
+ return;
+ }
+ }
+ if (tv.tv_sec <= 0 && tv.tv_usec <= 0) {
+ /* Timed out */
+ return;
+ }
FD_ZERO(&readable);
FD_SET(conn->discoverySocket, &readable);
@@ -347,7 +372,10 @@
if (r < 0) {
fatalSys("select (waitForPADO)");
}
- if (r == 0) return; /* Timed out */
+ if (r == 0) {
+ /* Timed out */
+ return;
+ }
}
/* Get the packet */
@@ -508,13 +536,37 @@
fd_set readable;
int r;
struct timeval tv;
+ struct timeval expire_at;
+ struct timeval now;
+
PPPoEPacket packet;
int len;
+ if (gettimeofday(&expire_at, NULL) < 0) {
+ fatalSys("gettimeofday (waitForPADS)");
+ }
+ expire_at.tv_sec += timeout;
+
do {
if (BPF_BUFFER_IS_EMPTY) {
- tv.tv_sec = timeout;
- tv.tv_usec = 0;
+ if (gettimeofday(&now, NULL) < 0) {
+ fatalSys("gettimeofday (waitForPADS)");
+ }
+ tv.tv_sec = expire_at.tv_sec - now.tv_sec;
+ tv.tv_usec = expire_at.tv_usec - now.tv_usec;
+ if (tv.tv_usec < 0) {
+ tv.tv_usec += 1000000;
+ if (tv.tv_sec) {
+ tv.tv_sec--;
+ } else {
+ /* Timed out */
+ return;
+ }
+ }
+ if (tv.tv_sec <= 0 && tv.tv_usec <= 0) {
+ /* Timed out */
+ return;
+ }
FD_ZERO(&readable);
FD_SET(conn->discoverySocket, &readable);
@@ -526,7 +578,10 @@
if (r < 0) {
fatalSys("select (waitForPADS)");
}
- if (r == 0) return;
+ if (r == 0) {
+ /* Timed out */
+ return;
+ }
}
/* Get the packet */
@@ -596,15 +651,6 @@
int padrAttempts = 0;
int timeout = conn->discoveryTimeout;
- /* Skip discovery and don't open discovery socket? */
- if (conn->skipDiscovery && conn->noDiscoverySocket) {
- conn->discoveryState = STATE_SESSION;
- return;
- }
-
- conn->discoverySocket =
- openInterface(conn->ifName, Eth_PPPOE_Discovery, conn->myEth);
-
/* Skip discovery? */
if (conn->skipDiscovery) {
conn->discoveryState = STATE_SESSION;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/src/if.c new/rp-pppoe-3.10/src/if.c
--- old/rp-pppoe-3.8/src/if.c 2006-04-02 16:29:42.000000000 +0200
+++ new/rp-pppoe-3.10/src/if.c 2008-06-30 16:00:42.000000000 +0200
@@ -16,7 +16,7 @@
***********************************************************************/
static char const RCSID[] =
-"$Id: if.c,v 1.18 2006/01/03 03:05:06 dfs Exp $";
+"$Id$";
#include "pppoe.h"
@@ -99,7 +99,7 @@
static unsigned char *bpfBuffer; /* Packet filter buffer */
static int bpfLength = 0; /* Packet filter buffer length */
-static int bpfSize = 0; /* Number of unread bytes in buffer */
+ int bpfSize = 0; /* Number of unread bytes in buffer */
static int bpfOffset = 0; /* Current offset in bpfBuffer */
#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/src/libevent/event.c new/rp-pppoe-3.10/src/libevent/event.c
--- old/rp-pppoe-3.8/src/libevent/event.c 2006-04-02 16:29:42.000000000 +0200
+++ new/rp-pppoe-3.10/src/libevent/event.c 2008-06-30 16:00:43.000000000 +0200
@@ -15,7 +15,7 @@
***********************************************************************/
static char const RCSID[] =
-"$Id: event.c,v 1.3 2006/02/23 15:38:08 dfs Exp $";
+"$Id$";
#include "event.h"
#include
@@ -86,9 +86,6 @@
struct timeval abs_timeout, now;
- /* Avoid compiler warning */
- abs_timeout.tv_sec = 0;
- abs_timeout.tv_usec = 0;
struct timeval timeout;
struct timeval *tm;
EventHandler *eh;
@@ -101,6 +98,10 @@
int maxfd = -1;
int pastDue;
+ /* Avoid compiler warning */
+ abs_timeout.tv_sec = 0;
+ abs_timeout.tv_usec = 0;
+
EVENT_DEBUG(("Enter Event_HandleEvent(es=%p)\n", (void *) es));
/* Build the select sets */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/src/libevent/event.h new/rp-pppoe-3.10/src/libevent/event.h
--- old/rp-pppoe-3.8/src/libevent/event.h 2006-04-02 16:29:42.000000000 +0200
+++ new/rp-pppoe-3.10/src/libevent/event.h 2008-06-30 16:00:43.000000000 +0200
@@ -10,7 +10,7 @@
* This program may be distributed according to the terms of the GNU
* General Public License, version 2 or (at your option) any later version.
*
-* $Id: event.h,v 1.5 2002/07/05 19:37:26 dfs Exp $
+* $Id$
*
* LIC: GPL
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/src/libevent/eventpriv.h new/rp-pppoe-3.10/src/libevent/eventpriv.h
--- old/rp-pppoe-3.8/src/libevent/eventpriv.h 2006-04-02 16:29:43.000000000 +0200
+++ new/rp-pppoe-3.10/src/libevent/eventpriv.h 2008-06-30 16:00:43.000000000 +0200
@@ -11,7 +11,7 @@
* This program may be distributed according to the terms of the GNU
* General Public License, version 2 or (at your option) any later version.
*
-* $Id: eventpriv.h,v 1.3 2002/04/09 17:28:40 dfs Exp $
+* $Id$
*
* LIC: GPL
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/src/libevent/event_sig.c new/rp-pppoe-3.10/src/libevent/event_sig.c
--- old/rp-pppoe-3.8/src/libevent/event_sig.c 2006-04-02 16:29:43.000000000 +0200
+++ new/rp-pppoe-3.10/src/libevent/event_sig.c 2008-06-30 16:00:43.000000000 +0200
@@ -15,7 +15,7 @@
***********************************************************************/
static char const RCSID[] =
-"$Id: event_sig.c,v 1.5 2002/07/05 19:37:26 dfs Exp $";
+"$Id$";
#define _POSIX_SOURCE 1 /* For sigaction defines */
#define _BSD_SOURCE 1 /* For SA_RESTART */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/src/libevent/event_tcp.c new/rp-pppoe-3.10/src/libevent/event_tcp.c
--- old/rp-pppoe-3.8/src/libevent/event_tcp.c 2006-04-02 16:29:43.000000000 +0200
+++ new/rp-pppoe-3.10/src/libevent/event_tcp.c 2008-06-30 16:00:43.000000000 +0200
@@ -12,7 +12,7 @@
***********************************************************************/
static char const RCSID[] =
-"$Id: event_tcp.c,v 1.6 2002/05/08 13:54:24 dfs Exp $";
+"$Id$";
#include "event_tcp.h"
#include
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/src/libevent/event_tcp.h new/rp-pppoe-3.10/src/libevent/event_tcp.h
--- old/rp-pppoe-3.8/src/libevent/event_tcp.h 2006-04-02 16:29:43.000000000 +0200
+++ new/rp-pppoe-3.10/src/libevent/event_tcp.h 2008-06-30 16:00:43.000000000 +0200
@@ -7,7 +7,7 @@
*
* Copyright (C) 2001 Roaring Penguin Software Inc.
*
-* $Id: event_tcp.h,v 1.3 2002/04/09 20:52:03 dfs Exp $
+* $Id$
*
* This program may be distributed according to the terms of the GNU
* General Public License, version 2 or (at your option) any later version.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/src/libevent/hash.c new/rp-pppoe-3.10/src/libevent/hash.c
--- old/rp-pppoe-3.8/src/libevent/hash.c 2006-04-02 16:29:43.000000000 +0200
+++ new/rp-pppoe-3.10/src/libevent/hash.c 2008-06-30 16:00:43.000000000 +0200
@@ -15,7 +15,7 @@
***********************************************************************/
static char const RCSID[] =
-"$Id: hash.c,v 1.4 2002/06/12 20:15:51 dfs Exp $";
+"$Id$";
#include "hash.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/src/plugin.c new/rp-pppoe-3.10/src/plugin.c
--- old/rp-pppoe-3.8/src/plugin.c 2006-04-02 16:29:42.000000000 +0200
+++ new/rp-pppoe-3.10/src/plugin.c 2008-06-30 16:00:43.000000000 +0200
@@ -25,7 +25,7 @@
***********************************************************************/
static char const RCSID[] =
-"$Id: plugin.c,v 1.33 2005/08/09 14:19:02 dfs Exp $";
+"$Id$";
#define _GNU_SOURCE 1
#include "pppoe.h"
@@ -52,7 +52,6 @@
#include
#include
#include
-#include
#include
#ifndef _ROOT_PATH
@@ -136,6 +135,17 @@
{
struct sockaddr_pppox sp;
+ /* Open session socket before discovery phase, to avoid losing session */
+ /* packets sent by peer just after PADS packet (noted on some Cisco */
+ /* server equipment). */
+ /* Opening this socket just before waitForPADS in the discovery() */
+ /* function would be more appropriate, but it would mess-up the code */
+ conn->sessionSocket = socket(AF_PPPOX, SOCK_STREAM, PX_PROTO_OE);
+ if (conn->sessionSocket < 0) {
+ error("Failed to create PPPoE socket: %m");
+ return -1;
+ }
+
strlcpy(ppp_devnam, devnam, sizeof(ppp_devnam));
if (existingSession) {
unsigned int mac[ETH_ALEN];
@@ -150,7 +160,9 @@
conn->peerEth[i] = (unsigned char) mac[i];
}
} else {
- discovery(conn);
+ conn->discoverySocket =
+ openInterface(conn->ifName, Eth_PPPOE_Discovery, conn->myEth);
+ discovery(conn);
if (conn->discoveryState != STATE_SESSION) {
error("Unable to complete PPPoE Discovery");
return -1;
@@ -160,12 +172,6 @@
/* Set PPPoE session-number for further consumption */
ppp_session_number = ntohs(conn->session);
- /* Make the session socket */
- conn->sessionSocket = socket(AF_PPPOX, SOCK_STREAM, PX_PROTO_OE);
- if (conn->sessionSocket < 0) {
- error("Failed to create PPPoE socket: %m");
- return -1;
- }
sp.sa_family = AF_PPPOX;
sp.sa_protocol = PX_PROTO_OE;
sp.sa_addr.pppoe.sid = conn->session;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/src/ppp.c new/rp-pppoe-3.10/src/ppp.c
--- old/rp-pppoe-3.8/src/ppp.c 2006-04-02 16:29:42.000000000 +0200
+++ new/rp-pppoe-3.10/src/ppp.c 2008-06-30 16:00:42.000000000 +0200
@@ -16,7 +16,7 @@
***********************************************************************/
static char const RCSID[] =
-"$Id: ppp.c,v 1.7 2006/01/03 03:05:06 dfs Exp $";
+"$Id$";
#include "pppoe.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/src/pppoe.c new/rp-pppoe-3.10/src/pppoe.c
--- old/rp-pppoe-3.8/src/pppoe.c 2006-04-02 16:29:42.000000000 +0200
+++ new/rp-pppoe-3.10/src/pppoe.c 2008-06-30 16:00:43.000000000 +0200
@@ -14,7 +14,7 @@
***********************************************************************/
static char const RCSID[] =
-"$Id: pppoe.c,v 1.43 2006/02/23 15:40:42 dfs Exp $";
+"$Id$";
#include "pppoe.h"
@@ -232,9 +232,6 @@
int maxFD = 0;
int r;
- /* Open a session socket */
- conn->sessionSocket = openInterface(conn->ifName, Eth_PPPOE_Session, conn->myEth);
-
/* Drop privileges */
dropPrivs();
@@ -409,6 +406,7 @@
unsigned int s; /* Temporary to hold session */
FILE *pidfile;
unsigned int discoveryType, sessionType;
+ char const *options;
PPPoEConnection conn;
@@ -434,7 +432,6 @@
/* Initialize syslog */
openlog("pppoe", LOG_PID, LOG_DAEMON);
- char const *options;
#ifdef DEBUGGING_ENABLED
options = "I:VAT:D:hS:C:Usm:np:e:kdf:F:t:";
#else
@@ -617,6 +614,8 @@
if (conn.printACNames) {
fprintf(stderr, "Sending discovery flood %d\n", n+1);
}
+ conn.discoverySocket =
+ openInterface(conn.ifName, Eth_PPPOE_Discovery, conn.myEth);
discovery(&conn);
conn.discoveryState = STATE_SENT_PADI;
close(conn.discoverySocket);
@@ -624,7 +623,22 @@
exit(EXIT_SUCCESS);
}
- discovery(&conn);
+ /* Open session socket before discovery phase, to avoid losing session */
+ /* packets sent by peer just after PADS packet (noted on some Cisco */
+ /* server equipment). */
+ /* Opening this socket just before waitForPADS in the discovery() */
+ /* function would be more appropriate, but it would mess-up the code */
+ if (!optSkipSession)
+ conn.sessionSocket = openInterface(conn.ifName, Eth_PPPOE_Session, conn.myEth);
+
+ /* Skip discovery and don't open discovery socket? */
+ if (conn.skipDiscovery && conn.noDiscoverySocket) {
+ conn.discoveryState = STATE_SESSION;
+ } else {
+ conn.discoverySocket =
+ openInterface(conn.ifName, Eth_PPPOE_Discovery, conn.myEth);
+ discovery(&conn);
+ }
if (optSkipSession) {
printf("%u:%02x:%02x:%02x:%02x:%02x:%02x\n",
ntohs(conn.session),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/src/pppoe.h new/rp-pppoe-3.10/src/pppoe.h
--- old/rp-pppoe-3.8/src/pppoe.h 2006-04-02 16:29:42.000000000 +0200
+++ new/rp-pppoe-3.10/src/pppoe.h 2008-06-30 16:00:43.000000000 +0200
@@ -11,7 +11,7 @@
*
* LIC: GPL
*
-* $Id: pppoe.h,v 1.31 2006/02/21 00:13:14 dfs Exp $
+* $Id$
*
***********************************************************************/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/src/pppoe-server.c new/rp-pppoe-3.10/src/pppoe-server.c
--- old/rp-pppoe-3.8/src/pppoe-server.c 2006-04-02 16:29:42.000000000 +0200
+++ new/rp-pppoe-3.10/src/pppoe-server.c 2008-06-30 16:00:43.000000000 +0200
@@ -9,14 +9,14 @@
* This program may be distributed according to the terms of the GNU
* General Public License, version 2 or (at your option) any later version.
*
-* $Id: pppoe-server.c,v 1.96 2006/02/23 15:40:42 dfs Exp $
+* $Id$
*
* LIC: GPL
*
***********************************************************************/
static char const RCSID[] =
-"$Id: pppoe-server.c,v 1.96 2006/02/23 15:40:42 dfs Exp $";
+"$Id$";
#include "config.h"
@@ -117,6 +117,9 @@
/* The number of session slots */
size_t NumSessionSlots;
+/* Maximum number of sessions per MAC address */
+int MaxSessionsPerMac;
+
/* Number of active sessions */
size_t NumActiveSessions = 0;
@@ -176,6 +179,18 @@
#define HOSTNAMELEN 256
+static int
+count_sessions_from_mac(unsigned char *eth)
+{
+ int n=0;
+ ClientSession *s = BusySessions;
+ while(s) {
+ if (!memcmp(eth, s->eth, ETH_ALEN)) n++;
+ s = s->next;
+ }
+ return n;
+}
+
/**********************************************************************
*%FUNCTION: childHandler
*%ARGUMENTS:
@@ -581,6 +596,22 @@
return;
}
+ /* If number of sessions per MAC is limited, check here and don't
+ send PADO if already max number of sessions. */
+ if (MaxSessionsPerMac) {
+ if (count_sessions_from_mac(packet->ethHdr.h_source) >= MaxSessionsPerMac) {
+ syslog(LOG_INFO, "PADI: Client %02x:%02x:%02x:%02x:%02x:%02x attempted to create more than %d session(s)",
+ packet->ethHdr.h_source[0],
+ packet->ethHdr.h_source[1],
+ packet->ethHdr.h_source[2],
+ packet->ethHdr.h_source[3],
+ packet->ethHdr.h_source[4],
+ packet->ethHdr.h_source[5],
+ MaxSessionsPerMac);
+ return;
+ }
+ }
+
acname.type = htons(TAG_AC_NAME);
acname_len = strlen(ACName);
acname.length = htons(acname_len);
@@ -778,6 +809,21 @@
return;
}
+ /* If number of sessions per MAC is limited, check here and don't
+ send PADS if already max number of sessions. */
+ if (MaxSessionsPerMac) {
+ if (count_sessions_from_mac(packet->ethHdr.h_source) >= MaxSessionsPerMac) {
+ syslog(LOG_INFO, "PADR: Client %02x:%02x:%02x:%02x:%02x:%02x attempted to create more than %d session(s)",
+ packet->ethHdr.h_source[0],
+ packet->ethHdr.h_source[1],
+ packet->ethHdr.h_source[2],
+ packet->ethHdr.h_source[3],
+ packet->ethHdr.h_source[4],
+ packet->ethHdr.h_source[5],
+ MaxSessionsPerMac);
+ return;
+ }
+ }
parsePacket(packet, parsePADRTags, NULL);
/* Check that everything's cool */
@@ -1012,6 +1058,7 @@
fprintf(stderr, " -u -- Pass 'unit' option to pppd.\n");
fprintf(stderr, " -r -- Randomize session numbers.\n");
fprintf(stderr, " -d -- Debug session creation.\n");
+ fprintf(stderr, " -x n -- Limit to 'n' sessions/MAC address.\n");
fprintf(stderr, " -P -- Check pool file for correctness and exit.\n");
#ifdef HAVE_LICENSE
fprintf(stderr, " -c secret:if:port -- Enable clustering on interface 'if'.\n");
@@ -1056,9 +1103,9 @@
#endif
#ifndef HAVE_LINUX_KERNEL_PPPOE
- char *options = "hI:C:L:R:T:m:FN:f:O:o:sp:lrudPc:S:1";
+ char *options = "x:hI:C:L:R:T:m:FN:f:O:o:sp:lrudPc:S:1";
#else
- char *options = "hI:C:L:R:T:m:FN:f:O:o:skp:lrudPc:S:1";
+ char *options = "x:hI:C:L:R:T:m:FN:f:O:o:skp:lrudPc:S:1";
#endif
if (getuid() != geteuid() ||
@@ -1074,11 +1121,22 @@
/* Default number of session slots */
NumSessionSlots = DEFAULT_MAX_SESSIONS;
+ MaxSessionsPerMac = 0; /* No limit */
NumActiveSessions = 0;
/* Parse command-line options */
while((opt = getopt(argc, argv, options)) != -1) {
switch(opt) {
+ case 'x':
+ if (sscanf(optarg, "%d", &MaxSessionsPerMac) != 1) {
+ usage(argv[0]);
+ exit(EXIT_FAILURE);
+ }
+ if (MaxSessionsPerMac < 0) {
+ MaxSessionsPerMac = 0;
+ }
+ break;
+
#ifdef HAVE_LINUX_KERNEL_PPPOE
case 'k':
UseLinuxKernelModePPPoE = 1;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/src/pppoe-server.h new/rp-pppoe-3.10/src/pppoe-server.h
--- old/rp-pppoe-3.8/src/pppoe-server.h 2006-04-02 16:29:42.000000000 +0200
+++ new/rp-pppoe-3.10/src/pppoe-server.h 2008-06-30 16:00:43.000000000 +0200
@@ -11,7 +11,7 @@
*
* LIC: GPL
*
-* $Id: pppoe-server.h,v 1.29 2006/02/23 15:40:42 dfs Exp $
+* $Id$
*
***********************************************************************/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/src/pppoe-sniff.c new/rp-pppoe-3.10/src/pppoe-sniff.c
--- old/rp-pppoe-3.8/src/pppoe-sniff.c 2006-04-02 16:29:42.000000000 +0200
+++ new/rp-pppoe-3.10/src/pppoe-sniff.c 2008-06-30 16:00:43.000000000 +0200
@@ -15,7 +15,7 @@
***********************************************************************/
static char const RCSID[] =
-"$Id: pppoe-sniff.c,v 1.8 2004/10/04 15:08:29 dfs Exp $";
+"$Id$";
#include "pppoe.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/src/relay.c new/rp-pppoe-3.10/src/relay.c
--- old/rp-pppoe-3.8/src/relay.c 2006-04-02 16:29:42.000000000 +0200
+++ new/rp-pppoe-3.10/src/relay.c 2008-06-30 16:00:43.000000000 +0200
@@ -11,11 +11,11 @@
*
* LIC: GPL
*
-* $Id: relay.c,v 1.28 2006/02/23 15:40:42 dfs Exp $
+* $Id$
*
***********************************************************************/
static char const RCSID[] =
-"$Id: relay.c,v 1.28 2006/02/23 15:40:42 dfs Exp $";
+"$Id$";
#define _GNU_SOURCE 1 /* For SA_RESTART */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/rp-pppoe-3.8/src/relay.h new/rp-pppoe-3.10/src/relay.h
--- old/rp-pppoe-3.8/src/relay.h 2006-04-02 16:29:42.000000000 +0200
+++ new/rp-pppoe-3.10/src/relay.h 2008-06-30 16:00:43.000000000 +0200
@@ -11,7 +11,7 @@
*
* LIC: GPL
*
-* $Id: relay.h,v 1.13 2006/02/23 15:40:42 dfs Exp $
+* $Id$
*
***********************************************************************/
++++++ strip.diff ++++++
--- /var/tmp/diff_new_pack.W18825/_old 2008-07-09 00:22:14.000000000 +0200
+++ /var/tmp/diff_new_pack.W18825/_new 2008-07-09 00:22:14.000000000 +0200
@@ -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
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
