Update of /cvsroot/leaf/src/bering-uclibc4/source/pppoesrv
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7091
Modified Files:
buildtool.cfg buildtool.mk
Added Files:
pppoe-relay.default pppoe-relay.init rp-pppoe-3.10.tar.gz
Log Message:
Updated rp_pppoe to latest version; added pppoe relay daemon
Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/pppoesrv/buildtool.mk,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** buildtool.mk 26 Apr 2010 09:02:47 -0000 1.1.1.1
--- buildtool.mk 1 Jan 2011 17:50:47 -0000 1.2
***************
*** 1,4 ****
include $(MASTERMAKEFILE)
! PPPOESRV_DIR:=rp-pppoe-3.8
$(PPPOESRV_DIR)/.source:
--- 1,4 ----
include $(MASTERMAKEFILE)
! PPPOESRV_DIR:=rp-pppoe-3.10
$(PPPOESRV_DIR)/.source:
***************
*** 20,29 ****
mkdir -p $(BT_STAGING_DIR)/etc/init.d
$(MAKE) -C $(PPPOESRV_DIR)/src PLUGIN_DIR=/usr/lib/pppd \
! DEFINES="-DHAVE_LINUX_KERNEL_PPPOE" pppoe-server
cp $(PPPOESRV_DIR)/src/pppoe-server $(BT_STAGING_DIR)/usr/sbin/
cp $(PPPOESRV_OPTIONS) $(BT_STAGING_DIR)/etc/ppp/
cp $(PPPOESRV_DEFAULT) $(BT_STAGING_DIR)/etc/default/pppoe-server
cp $(PPPOESRV_INITD) $(BT_STAGING_DIR)/etc/init.d/pppoe-server
$(BT_STRIP) $(BT_STRIP_BINOPTS) $(BT_STAGING_DIR)/usr/sbin/pppoe-server
touch $(PPPOESRV_DIR)/.build
--- 20,33 ----
mkdir -p $(BT_STAGING_DIR)/etc/init.d
$(MAKE) -C $(PPPOESRV_DIR)/src PLUGIN_DIR=/usr/lib/pppd \
! DEFINES="-DHAVE_LINUX_KERNEL_PPPOE" pppoe-server pppoe-relay
cp $(PPPOESRV_DIR)/src/pppoe-server $(BT_STAGING_DIR)/usr/sbin/
+ cp $(PPPOESRV_DIR)/src/pppoe-relay $(BT_STAGING_DIR)/usr/sbin/
cp $(PPPOESRV_OPTIONS) $(BT_STAGING_DIR)/etc/ppp/
cp $(PPPOESRV_DEFAULT) $(BT_STAGING_DIR)/etc/default/pppoe-server
cp $(PPPOESRV_INITD) $(BT_STAGING_DIR)/etc/init.d/pppoe-server
+ cp $(PPPOERLY_DEFAULT) $(BT_STAGING_DIR)/etc/default/pppoe-relay
+ cp $(PPPOERLY_INITD) $(BT_STAGING_DIR)/etc/init.d/pppoe-relay
$(BT_STRIP) $(BT_STRIP_BINOPTS) $(BT_STAGING_DIR)/usr/sbin/pppoe-server
+ $(BT_STRIP) $(BT_STRIP_BINOPTS) $(BT_STAGING_DIR)/usr/sbin/pppoe-relay
touch $(PPPOESRV_DIR)/.build
***************
*** 36,39 ****
--- 40,46 ----
rm -f $(BT_STAGING_DIR)/etc/default/pppoe-server
rm -f $(BT_STAGING_DIR)/etc/init.d/pppoe-server
+ rm -f $(BT_STAGING_DIR)/usr/sbin/pppoe-relay
+ rm -f $(BT_STAGING_DIR)/etc/default/pppoe-relay
+ rm -f $(BT_STAGING_DIR)/etc/init.d/pppoe-relay
-rmdir $(BT_STAGING_DIR)/etc/init.d
-rmdir $(BT_STAGING_DIR)/etc/ppp
--- NEW FILE: pppoe-relay.default ---
# Interfaces for clients
CIFACES="eth1"
# Interface for server
SIFACE=eth0
# Interfaces for both server and cliant
#BIFACES="eth0"
# Interface to use; on blank - use default (eth0)
#IFACES="eth0"
# mawk regexp for selecting ifaces among present in system
# can be combined with CIFACES option
#CIFREGEXP="vlan[1-3][0-9][0-9][0-9]"
# Inactivity timeout (in seconds)
#TIMEOUT=180
# Max concurrent sessions (default - 64)
#SESSIONS=5
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/pppoesrv/buildtool.cfg,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** buildtool.cfg 20 Dec 2010 23:25:58 -0000 1.3
--- buildtool.cfg 1 Jan 2011 17:50:47 -0000 1.4
***************
*** 5,9 ****
</File>
! <File rp-pppoe-3.8.tar.gz>
Server = cvs4-sourceforge
Directory = pppoesrv
--- 5,9 ----
</File>
! <File rp-pppoe-3.10.tar.gz>
Server = cvs4-sourceforge
Directory = pppoesrv
***************
*** 12,15 ****
--- 12,29 ----
</File>
+ <File pppoe-relay.init>
+ Server = cvs4-sourceforge
+ Directory = pppoesrv
+ Revision = HEAD
+ envname = PPPOERLY_INITD
+ </File>
+
+ <File pppoe-relay.default>
+ Server = cvs4-sourceforge
+ Directory = pppoesrv
+ Revision = HEAD
+ envname = PPPOERLY_DEFAULT
+ </File>
+
<File pppoesrv.init>
Server = cvs4-sourceforge
***************
*** 35,40 ****
<Package>
<pppoesrv>
! Version = 3.8
! Revision = 6
Help <<EOF
--- 49,54 ----
<Package>
<pppoesrv>
! Version = 3.10
! Revision = 1
Help <<EOF
***************
*** 89,91 ****
--- 103,152 ----
</Contents>
</pppoesrv>
+ <pppoerly>
+ Version = 3.10
+ Revision = 1
+
+ Help <<EOF
+ PPPoE relay daemon
+ Homepage: http://www.roaringpenguin.com/pppoe
+ Requires: ppp pppoe
+ LRP package by __PACKAGER__, __BUILDDATE__
+ EOF
+
+ <Permissions>
+ Files = 644
+ Directories = 755
+ </Permissions>
+
+ <Owner>
+ Files = root:root
+ Directories = root:root
+ </Owner>
+
+ <Contents>
+ <File>
+ Filename = usr/sbin/pppoe-relay
+ Source = usr/sbin/pppoe-relay
+ Type = binary
+ Permissions = 755
+ </File>
+ <File>
+ Filename = etc/init.d/pppoe-relay
+ Source = etc/init.d/pppoe-relay
+ Description = PPPoE relay init file
+ Type = conf
+ Type = local
+ Type = binary
+ Permissions = 755
+ </File>
+ <File>
+ Filename = etc/default/pppoe-relay
+ Source = etc/default/pppoe-relay
+ Description = PPPoE relay default startup options
+ Type = conf
+ Type = local
+ Type = binary
+ </File>
+ </Contents>
+ </pppoery>
</Package>
--- NEW FILE: pppoe-relay.init ---
#!/bin/sh
RCDLINKS="0,K41 1,K41 2,S43 3,S43 4,S43 5,S43 6,K41"
test -x /usr/sbin/pppoe-relay || exit 0
IFACES=""
[ -f /etc/default/pppoe-relay ] && . /etc/default/pppoe-relay
ARGS=""
check_arg () {
[ -n "$(eval echo \$$2)" ] && ARGS="$ARGS -$1 $(eval echo \$$2)"
}
if [ -n "$CIFREGEXP" ]; then
for i in `ip l | awk '$2 ~ '"/$CIFREGEXP/"'{split($2,A,"(@|:)"); print
A[1]}' | sort`; do
CIFACES="$CIFACES $i"
done
fi
check_arg i TIMEOUT
check_arg S SIFACE
check_arg n SESSIONS
for i in $CIFACES; do
ARGS="$ARGS -C $i"
done
for i in $BIFACES; do
ARGS="$ARGS -B $i"
done
case "$1" in
start)
echo -n "Starting PPPoE relay daemon... "
if start-stop-daemon --start --quiet --exec /usr/sbin/pppoe-relay -- $ARGS
; then
echo "."
else
echo "failed!"
fi
;;
stop)
echo -n "Stopping PPPoE relay daemon... "
if start-stop-daemon --stop --quiet --oknodo --exec /usr/sbin/pppoe-relay
then
echo "."
else
echo "failed!"
fi
;;
restart)
$0 stop
$0 start
;;
*)
echo "Usage: $0 {start|stop|restart}"
exit 1
;;
esac
exit 0
--- NEW FILE: rp-pppoe-3.10.tar.gz ---
(This appears to be a binary file; contents omitted.)
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
leaf-cvs-commits mailing list
leaf-cvs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
