[leaf-commits] src/bering-uclibc4/source/shorewall buildtool.cfg, 1.5, 1.6 buildtool.mk, 1.3, 1.4 shorewall-lrp.diff, 1.3, 1.4
KP Kirchd?rfer <[email protected]>
| Newsgroups | gmane.linux.leaf.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/leaf/src/bering-uclibc4/source/shorewall
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv3463
Modified Files:
buildtool.cfg buildtool.mk shorewall-lrp.diff
Log Message:
new upstream version 4.4.13
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/shorewall/buildtool.cfg,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** buildtool.cfg 7 Jul 2010 09:39:43 -0000 1.5
--- buildtool.cfg 22 Sep 2010 06:38:54 -0000 1.6
***************
*** 5,11 ****
</Server>
! <File shorewall-4.4.10.2.tgz>
Server = shorewall-net
! Directory = 4.4/shorewall-4.4.10/superceded
Envname = SHOREWALL_SOURCE
</File>
--- 5,11 ----
</Server>
! <File shorewall-4.4.13.tgz>
Server = shorewall-net
! Directory = 4.4/shorewall-4.4.13
Envname = SHOREWALL_SOURCE
</File>
***************
*** 51,56 ****
<shorwall>
packagename=shorwall
! Version 4.4.10.2
! Revision = 2
Help <<EOF
--- 51,56 ----
<shorwall>
packagename=shorwall
! Version 4.4.13
! Revision = 1
Help <<EOF
Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/shorewall/buildtool.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** buildtool.mk 26 Jun 2010 19:50:58 -0000 1.3
--- buildtool.mk 22 Sep 2010 06:38:54 -0000 1.4
***************
*** 9,13 ****
TARGET_DIR=$(BT_BUILD_DIR)/shorewall
! SHOREWALL_DIR:=shorewall-4.4.10.2
$(SHOREWALL_DIR)/.source:
--- 9,13 ----
TARGET_DIR=$(BT_BUILD_DIR)/shorewall
! SHOREWALL_DIR:=shorewall-4.4.13
$(SHOREWALL_DIR)/.source:
Index: shorewall-lrp.diff
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/shorewall/shorewall-lrp.diff,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** shorewall-lrp.diff 26 Jun 2010 19:50:58 -0000 1.3
--- shorewall-lrp.diff 22 Sep 2010 06:38:54 -0000 1.4
***************
*** 1,26 ****
! diff -urN shorewall-4.4.10.orig/configfiles/start shorewall-4.4.10/configfiles/start
! --- shorewall-4.4.10.orig/configfiles/start 2010-06-09 00:57:45.000000000 +0200
! +++ shorewall-4.4.10/configfiles/start 2010-06-18 14:42:38.000000000 +0200
@@ -10,4 +10,7 @@
# information.
#
###############################################################################
! +for file in /etc/shorewall/start.d/* ; do
! + run_user_exit $file
+done
return 0
! diff -urN shorewall-4.4.10.orig/configfiles/stop shorewall-4.4.10/configfiles/stop
! --- shorewall-4.4.10.orig/configfiles/stop 2010-06-09 00:57:45.000000000 +0200
! +++ shorewall-4.4.10/configfiles/stop 2010-06-18 14:43:18.000000000 +0200
@@ -10,3 +10,6 @@
# information.
#
###############################################################################
! +for file in /etc/shorewall/stop.d/* ; do
! + run_user_exit $file
! +done
! diff -urN shorewall-4.4.10.orig/configfiles/shorewall.conf shorewall-4.4.10/configfiles/shorewall.conf
! --- shorewall-4.4.10.orig/configfiles/shorewall.conf 2010-06-09 00:57:45.000000000 +0200
! +++ shorewall-4.4.10/configfiles/shorewall.conf 2010-06-18 14:47:29.000000000 +0200
@@ -9,7 +9,7 @@
# S T A R T U P E N A B L E D
--- 1,26 ----
! diff -urN shorewall-4.4.13.orig/configfiles/start shorewall-4.4.13/configfiles/start
! --- shorewall-4.4.13.orig/configfiles/start 2010-09-21 16:50:13.000000000 +0200
! +++ shorewall-4.4.13/configfiles/start 2010-09-22 07:52:30.457642562 +0200
@@ -10,4 +10,7 @@
# information.
#
###############################################################################
! +for file in /etc/shorewall/start.d/* ; do
! + run_user_exit $file
+done
return 0
! diff -urN shorewall-4.4.13.orig/configfiles/stop shorewall-4.4.13/configfiles/stop
! --- shorewall-4.4.13.orig/configfiles/stop 2010-09-21 16:50:13.000000000 +0200
! +++ shorewall-4.4.13/configfiles/stop 2010-09-22 07:52:51.898139541 +0200
@@ -10,3 +10,6 @@
# information.
#
###############################################################################
! +for file in /etc/shorewall/stop.d/* ; do
! + run_user_exit $file
! +done
! diff -urN shorewall-4.4.13.orig/configfiles/shorewall.conf shorewall-4.4.13/configfiles/shorewall.conf
! --- shorewall-4.4.13.orig/configfiles/shorewall.conf 2010-09-21 16:50:13.000000000 +0200
! +++ shorewall-4.4.13/configfiles/shorewall.conf 2010-09-22 07:54:09.905643924 +0200
@@ -9,7 +9,7 @@
# S T A R T U P E N A B L E D
***************
*** 62,68 ****
BRIDGING=No
! diff -urN shorewall-4.4.10.orig/init.debian.sh shorewall-4.4.10/init.debian.sh
! --- shorewall-4.4.10.orig/init.debian.sh 2010-06-09 00:57:45.000000000 +0200
! +++ shorewall-4.4.10/init.debian.sh 2010-06-18 14:56:53.000000000 +0200
@@ -1,70 +1,16 @@
#!/bin/sh
--- 62,68 ----
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
***************
*** 78,87 ****
-### END INIT INFO
-
!
+RCDLINKS="2,S19 3,S19 4,S19 5,S19 0,K91 6,K91"
SRWL=/sbin/shorewall
-SRWL_OPTS="-tvv"
! WAIT_FOR_IFUP=/usr/share/shorewall/wait4ifup
-test -n ${INITLOG:=/var/log/shorewall-init.log}
-
--- 78,87 ----
-### END INIT INFO
-
! -
+RCDLINKS="2,S19 3,S19 4,S19 5,S19 0,K91 6,K91"
SRWL=/sbin/shorewall
-SRWL_OPTS="-tvv"
! -WAIT_FOR_IFUP=/usr/share/shorewall/wait4ifup
-test -n ${INITLOG:=/var/log/shorewall-init.log}
-
***************
*** 89,96 ****
-test -x $WAIT_FOR_IFUP || exit 0
-test -n "$INITLOG" || {
! - echo "INITLOG cannot be empty, please configure $0" ;
- exit 1;
-}
! -
-if [ "$(id -u)" != "0" ]
-then
--- 89,96 ----
-test -x $WAIT_FOR_IFUP || exit 0
-test -n "$INITLOG" || {
! - echo "INITLOG cannot be empty, please configure $0" ;
- exit 1;
-}
!
-if [ "$(id -u)" != "0" ]
-then
***************
*** 98,115 ****
- exit 1
-fi
!
-echo_notdone () {
! +# parse the shorewall params file in order to use params in
! +# /etc/default/shorewall
!
! - if [ "$INITLOG" = "/dev/null" ] ; then
- echo "not done."
! - else
- echo "not done (check $INITLOG)."
- fi
! -
- exit 1
-}
! -
-not_configured () {
- echo "#### WARNING ####"
--- 98,116 ----
- exit 1
-fi
! -
-echo_notdone () {
! -
! - if [ "$INITLOG" = "/dev/null" ] ; then
- echo "not done."
! - else
- echo "not done (check $INITLOG)."
- fi
! +WAIT_FOR_IFUP=/usr/share/shorewall/wait4ifup
!
- exit 1
-}
! +# parse the shorewall params file in order to use params in
! +# /etc/default/shorewall
!
-not_configured () {
- echo "#### WARNING ####"
***************
*** 143,156 ****
if [ "$wait_interface" != "" ]
then
! + if [ -f $WAIT_FOR_IFUP ]
! + then
! for i in $wait_interface
! do
! $WAIT_FOR_IFUP $i 90
! done
! + else
! + echo "$WAIT_FOR_IFUP: File not found"
! + exit 2
! + fi
fi
}
--- 144,161 ----
if [ "$wait_interface" != "" ]
then
! - for i in $wait_interface
! - do
! - $WAIT_FOR_IFUP $i 90
! - done
! + if [ -f $WAIT_FOR_IFUP ]
! + then
! + for i in $wait_interface
! + do
! + $WAIT_FOR_IFUP $i 90
! + done
! + else
! + echo "$WAIT_FOR_IFUP: File not found"
! + exit 2
! + fi
fi
}
***************
*** 161,187 ****
wait_for_pppd
- $SRWL $SRWL_OPTS start >> $INITLOG 2>&1 && echo "done." || echo_notdone
! + $SRWL $OPTIONS start 2>&1 && echo "done."
return 0
}
! @@ -94,24 +46,24 @@
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
! - fi
! + $SRWL $OPTIONS clear 2>&1 && echo "done."
! + fi
return 0
}
!
# restart the firewall
shorewall_restart () {
echo -n "Restarting \"Shorewall firewall\": "
- $SRWL $SRWL_OPTS restart >> $INITLOG 2>&1 && echo "done." || echo_notdone
! + $SRWL $OPTIONS start 2>&1 && echo "done."
return 0
}
--- 166,191 ----
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
}
***************
*** 191,195 ****
echo -n "Refreshing \"Shorewall firewall\": "
- $SRWL $SRWL_OPTS refresh >> $INITLOG 2>&1 && echo "done." || echo_notdone
! + $SRWL refresh 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
}
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev