[Astlinux-commits] SF.net SVN: astlinux: [1776] trunk

[<ppr...@us...>]

Revision: 1776
          http://astlinux.svn.sourceforge.net/astlinux/?rev=1776&view=rev
Author:   pprindeville
Date:     2008-05-20 13:36:48 -0700 (Tue, 20 May 2008)

Log Message:
-----------
Version bump for Wanpipe plus PPP fix for Arno's firewall

Modified Paths:
--------------
    trunk/package/arno-fw/arnofw.wrapper
    trunk/package/wanpipe/wanpipe.mk
    trunk/target/generic/target_skeleton/stat/etc/rc.conf

Modified: trunk/package/arno-fw/arnofw.wrapper
===================================================================
--- trunk/package/arno-fw/arnofw.wrapper	2008-05-20 16:18:15 UTC (rev 1775)
+++ trunk/package/arno-fw/arnofw.wrapper	2008-05-20 20:36:48 UTC (rev 1776)
@@ -27,10 +27,14 @@
   INT_IF="$INT_IF${INT_IF:+ }$intf"
 done
 
-EXT_IF=""
-for intf in $EXTIF $EXT2IF; do
-  EXT_IF="$EXT_IF${EXT_IF:+ }$intf"
-done
+if [ -z "$PPPOEIF" ]; then
+  EXT_IF=""
+  for intf in $EXTIF $EXT2IF; do
+    EXT_IF="$EXT_IF${EXT_IF:+ }$intf"
+  done
+else
+  EXT_IF="ppp+"
+fi
 
 INTERNAL_NET=""
 for pair in ${INTIP:+$INTIP/$INTNM} ${INT2IP:+$INT2IP/$INT2NM} \

Modified: trunk/package/wanpipe/wanpipe.mk
===================================================================
--- trunk/package/wanpipe/wanpipe.mk	2008-05-20 16:18:15 UTC (rev 1775)
+++ trunk/package/wanpipe/wanpipe.mk	2008-05-20 20:36:48 UTC (rev 1776)
@@ -3,7 +3,7 @@
 # wanpipe
 #
 #############################################################
-WANPIPE_VER:=3.2.3
+WANPIPE_VER:=3.3.10
 WANPIPE_SOURCE:=wanpipe-$(WANPIPE_VER).tgz
 WANPIPE_SITE:= ftp://ftp.sangoma.com/linux/current_wanpipe
 WANPIPE_DIR:=$(BUILD_DIR)/wanpipe-$(WANPIPE_VER)

Modified: trunk/target/generic/target_skeleton/stat/etc/rc.conf
===================================================================
--- trunk/target/generic/target_skeleton/stat/etc/rc.conf	2008-05-20 16:18:15 UTC (rev 1775)
+++ trunk/target/generic/target_skeleton/stat/etc/rc.conf	2008-05-20 20:36:48 UTC (rev 1776)
@@ -249,7 +249,8 @@
 #PPPOEUSER="us...@is..."
 #PPPOEPASS="mypassword"
 #PPPOEIF="w1ad"
-PPPOEKERNEL="YES"
+##PPPOEKERNEL and PPPOEDEBUG are mutually exclusive
+PPPOEKERNEL="yes"
 #PPPOEDEBUG="yes"
 
 ### Firewall support.  Two firewall scripts are now available.  Set that variable


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.