Update of /cvsroot/leaf/src/bering-uclibc4/source/shorewall
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv17991
Modified Files:
buildtool.cfg buildtool.mk shorewall-lrp.diff
Added Files:
shorewall-4.4.14.tgz
Log Message:
new upstream version 4.4.14
make /etc/init.d/shorewall aware of OPTIONS in /etc/default/shorewall
fix bug during boot (disable VERBOSITY)
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/shorewall/buildtool.cfg,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** buildtool.cfg 4 Oct 2010 18:33:02 -0000 1.10
--- buildtool.cfg 29 Oct 2010 15:08:35 -0000 1.11
***************
*** 1,3 ****
! <File shorewall-4.4.13.1.tgz>
Server = cvs4-sourceforge
Revision = HEAD
--- 1,3 ----
! <File shorewall-4.4.14.tgz>
Server = cvs4-sourceforge
Revision = HEAD
***************
*** 46,50 ****
<shorwall>
packagename=shorwall
! Version 4.4.13.1
Revision = 1
--- 46,50 ----
<shorwall>
packagename=shorwall
! Version 4.4.14
Revision = 1
Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/shorewall/buildtool.mk,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** buildtool.mk 27 Sep 2010 07:23:32 -0000 1.5
--- buildtool.mk 29 Oct 2010 15:08:35 -0000 1.6
***************
*** 9,13 ****
TARGET_DIR=$(BT_BUILD_DIR)/shorewall
! SHOREWALL_DIR:=shorewall-4.4.13.1
$(SHOREWALL_DIR)/.source:
--- 9,13 ----
TARGET_DIR=$(BT_BUILD_DIR)/shorewall
! SHOREWALL_DIR:=shorewall-4.4.14
$(SHOREWALL_DIR)/.source:
--- NEW FILE: shorewall-4.4.14.tgz ---
(This appears to be a binary file; contents omitted.)
Index: shorewall-lrp.diff
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/shorewall/shorewall-lrp.diff,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** shorewall-lrp.diff 22 Sep 2010 06:38:54 -0000 1.4
--- shorewall-lrp.diff 29 Oct 2010 15:08:35 -0000 1.5
***************
*** 62,69 ****
BRIDGING=No
! diff -urN shorewall-4.4.13.orig/init.debian.sh shorewall-4.4.13/init.debian.sh
! --- shorewall-4.4.13.orig/init.debian.sh 2010-09-21 16:50:13.000000000
+0200
! +++ shorewall-4.4.13/init.debian.sh 2010-09-22 07:59:17.281638089 +0200
! @@ -1,70 +1,16 @@
#!/bin/sh
-### BEGIN INIT INFO
--- 62,69 ----
BRIDGING=No
! diff -urN shorewall-4.4.14.orig/init.debian.sh shorewall-4.4.14/init.debian.sh
! --- shorewall-4.4.14.orig/init.debian.sh 2010-10-28 20:41:38.000000000
+0200
! +++ shorewall-4.4.14/init.debian.sh 2010-10-29 16:57:22.684567020 +0200
! @@ -1,70 +1,17 @@
#!/bin/sh
-### BEGIN INIT INFO
***************
*** 92,95 ****
--- 92,96 ----
- exit 1;
-}
+ +VERBOSE=
-if [ "$(id -u)" != "0" ]
***************
*** 140,144 ****
[ "$INITLOG" = "/dev/null" ] && SHOREWALL_INIT_SCRIPT=1 ||
SHOREWALL_INIT_SCRIPT=0
! @@ -75,10 +21,16 @@
wait_for_pppd () {
if [ "$wait_interface" != "" ]
--- 141,145 ----
[ "$INITLOG" = "/dev/null" ] && SHOREWALL_INIT_SCRIPT=1 ||
SHOREWALL_INIT_SCRIPT=0
! @@ -75,10 +22,16 @@
wait_for_pppd () {
if [ "$wait_interface" != "" ]
***************
*** 161,191 ****
}
! @@ -86,7 +38,7 @@
shorewall_start () {
echo -n "Starting \"Shorewall firewall\": "
wait_for_pppd
- $SRWL $SRWL_OPTS start >> $INITLOG 2>&1 && echo "done." || echo_notdone
! + $SRWL $SRWL_OPTIONS start 2>&1 && echo "done."
return 0
}
! @@ -94,9 +46,9 @@
shorewall_stop () {
echo -n "Stopping \"Shorewall firewall\": "
if [ "$SAFESTOP" = 1 ]; then
- $SRWL $SRWL_OPTS stop >> $INITLOG 2>&1 && echo "done." || echo_notdone
! + $SRWL $SRWL_OPTIONS stop 2>&1 && echo "done."
else
- $SRWL $SRWL_OPTS clear >> $INITLOG 2>&1 && echo "done." || echo_notdone
! + $SRWL $SRWL_OPTIONS clear 2>&1 && echo "done."
fi
return 0
}
! @@ -104,14 +56,14 @@
# restart the firewall
shorewall_restart () {
echo -n "Restarting \"Shorewall firewall\": "
- $SRWL $SRWL_OPTS restart >> $INITLOG 2>&1 && echo "done." || echo_notdone
! + $SRWL $SRWL_OPTIONS restart 2>&1 && echo "done."
return 0
}
--- 162,192 ----
}
! @@ -86,7 +39,7 @@
shorewall_start () {
echo -n "Starting \"Shorewall firewall\": "
wait_for_pppd
- $SRWL $SRWL_OPTS start >> $INITLOG 2>&1 && echo "done." || echo_notdone
! + $SRWL $OPTIONS start 2>&1 && echo "done."
return 0
}
! @@ -94,9 +47,9 @@
shorewall_stop () {
echo -n "Stopping \"Shorewall firewall\": "
if [ "$SAFESTOP" = 1 ]; then
- $SRWL $SRWL_OPTS stop >> $INITLOG 2>&1 && echo "done." || echo_notdone
! + $SRWL $OPTIONS stop 2>&1 && echo "done."
else
- $SRWL $SRWL_OPTS clear >> $INITLOG 2>&1 && echo "done." || echo_notdone
! + $SRWL $OPTIONS clear 2>&1 && echo "done."
fi
return 0
}
! @@ -104,14 +57,14 @@
# restart the firewall
shorewall_restart () {
echo -n "Restarting \"Shorewall firewall\": "
- $SRWL $SRWL_OPTS restart >> $INITLOG 2>&1 && echo "done." || echo_notdone
! + $SRWL $OPTIONS restart 2>&1 && echo "done."
return 0
}
***************
*** 195,199 ****
echo -n "Refreshing \"Shorewall firewall\": "
- $SRWL $SRWL_OPTS refresh >> $INITLOG 2>&1 && echo "done." || echo_notdone
! + $SRWL $SRWL_OPTIONS refresh 2>&1 && echo "done."
return 0
}
--- 196,200 ----
echo -n "Refreshing \"Shorewall firewall\": "
- $SRWL $SRWL_OPTS refresh >> $INITLOG 2>&1 && echo "done." || echo_notdone
! + $SRWL $OPTIONS refresh 2>&1 && echo "done."
return 0
}
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
leaf-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
