Update of /cvsroot/leaf/src/bering-uclibc/apps/shorewall
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16413
Modified Files:
buildtool.cfg buildtool.mk shorewall-lrp.diff
Log Message:
new upstream version 3.4.8
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/shorewall/buildtool.cfg,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** buildtool.cfg 13 Oct 2007 07:44:15 -0000 1.28
--- buildtool.cfg 2 Mar 2008 16:23:32 -0000 1.29
***************
*** 5,11 ****
</Server>
! <File shorewall-3.4.7.tgz>
Server = shorewall-net
! Directory = 3.4/shorewall-3.4.7
Envname = SHOREWALL_SOURCE
</File>
--- 5,11 ----
</Server>
! <File shorewall-3.4.8.tgz>
Server = shorewall-net
! Directory = 3.4/shorewall-3.4.8
Envname = SHOREWALL_SOURCE
</File>
***************
*** 112,116 ****
<shorwall-basic>
packagename=shorwall
! Version 3.4.7
Revision = 1
--- 112,116 ----
<shorwall-basic>
packagename=shorwall
! Version 3.4.8
Revision = 1
***************
*** 138,142 ****
</shorwall-basic>
<shorwall-maclist>
! Version 3.4.7
Revision = 1
--- 138,142 ----
</shorwall-basic>
<shorwall-maclist>
! Version 3.4.8
Revision = 1
***************
*** 164,168 ****
<shorwall-accounting>
! Version 3.4.7
Revision = 1
--- 164,168 ----
<shorwall-accounting>
! Version 3.4.8
Revision = 1
***************
*** 190,194 ****
<shorwall-providers>
! Version 3.4.7
Revision = 1
--- 190,194 ----
<shorwall-providers>
! Version 3.4.8
Revision = 1
***************
*** 215,219 ****
</shorwall-providers>
<shorwall-dynamiczones>
! Version 3.4.7
Revision = 1
--- 215,219 ----
</shorwall-providers>
<shorwall-dynamiczones>
! Version 3.4.8
Revision = 1
***************
*** 240,244 ****
</shorwall-dynamiczones>
<shorwall-proxyarp>
! Version 3.4.7
Revision = 1
--- 240,244 ----
</shorwall-dynamiczones>
<shorwall-proxyarp>
! Version 3.4.8
Revision = 1
***************
*** 265,269 ****
</shorwall-proxyarp>
<shorwall-tunnels>
! Version 3.4.7
Revision = 1
--- 265,269 ----
</shorwall-proxyarp>
<shorwall-tunnels>
! Version 3.4.8
Revision = 1
***************
*** 290,294 ****
</shorwall-tunnels>
<shorwall-tcrules>
! Version 3.4.7
Revision = 1
--- 290,294 ----
</shorwall-tunnels>
<shorwall-tcrules>
! Version 3.4.8
Revision = 1
***************
*** 315,319 ****
</shorwall-tcrules>
<shorwall-tc>
! Version 3.4.7
Revision = 1
--- 315,319 ----
</shorwall-tcrules>
<shorwall-tc>
! Version 3.4.8
Revision = 1
***************
*** 342,346 ****
<shorwall>
packagename=shorwall
! Version 3.4.7
Revision = 1
--- 342,346 ----
<shorwall>
packagename=shorwall
! Version 3.4.8
Revision = 1
Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/shorewall/buildtool.mk,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** buildtool.mk 13 Oct 2007 07:44:15 -0000 1.28
--- buildtool.mk 2 Mar 2008 16:23:32 -0000 1.29
***************
*** 9,13 ****
TARGET_DIR=$(BT_BUILD_DIR)/shorewall
! SHOREWALL_DIR:=shorewall-3.4.7
$(SHOREWALL_DIR)/.source:
--- 9,13 ----
TARGET_DIR=$(BT_BUILD_DIR)/shorewall
! SHOREWALL_DIR:=shorewall-3.4.8
$(SHOREWALL_DIR)/.source:
Index: shorewall-lrp.diff
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/shorewall/shorewall-lrp.diff,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** shorewall-lrp.diff 18 Jul 2007 09:37:29 -0000 1.4
--- shorewall-lrp.diff 2 Mar 2008 16:23:32 -0000 1.5
***************
*** 78,98 ****
BRIDGING=No
! diff -urN shorewall-3.4.0-Beta3.orig/init.debian.sh
shorewall-3.4.0-Beta3/init.debian.sh
! --- shorewall-3.4.0-Beta3.orig/init.debian.sh 2006-06-12 19:48:20.000000000
+0200
! +++ shorewall-3.4.0-Beta3/init.debian.sh 2007-01-22 22:19:01.000000000
+0100
! @@ -1,65 +1,13 @@
#!/bin/sh
-
+RCDLINKS="2,S19 3,S19 4,S19 5,S19 0,K91 6,K91"
SRWL=/sbin/shorewall
WAIT_FOR_IFUP=/usr/share/shorewall/wait4ifup
-# Note, set INITLOG to /dev/null if you do not want to
-# keep logs of the firewall (not recommended)
-INITLOG=/var/log/shorewall-init.log
- -OPTIONS="-f"
-
-test -x $SRWL || exit 0
-test -n $INITLOG || {
! - echo "INITLOG cannot be empty, please configure $0" ;
- exit 1;
-}
--- 78,143 ----
BRIDGING=No
! diff -urN shorewall-3.4.5.orig/install.sh shorewall-3.4.5/install.sh
! --- shorewall-3.4.5.orig/install.sh 2007-07-13 18:32:57.000000000 +0200
! +++ shorewall-3.4.5/install.sh 2007-07-18 11:30:05.000000000 +0200
! @@ -676,28 +676,6 @@
! fi
!
! #
! -# Install the Man Pages
! -#
! -
! -cd manpages
! -
! -for f in *.5; do
! - gzip -c $f > $f.gz
! - run_install -D -m 0444 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz
! - echo "Man page $f.gz installed to /usr/share/man/man5/$f.gz"
! -done
! -
! -for f in *.8; do
! - gzip -c $f > $f.gz
! - run_install -D -m 0444 $f.gz ${PREFIX}/usr/share/man/man8/$f.gz
! - echo "Man page $f.gz installed to /usr/share/man/man8/$f.gz"
! -done
! -
! -cd ..
! -
! -echo "Man Pages Installed"
! -
! -#
! # Install the firewall script
! #
! install_file firewall ${PREFIX}/usr/share/shorewall/firewall 0555
! diff -urN shorewall-3.4.8.orig/init.debian.sh shorewall-3.4.8/init.debian.sh
! --- shorewall-3.4.8.orig/init.debian.sh 2007-10-22 17:34:10.000000000
+0200
! +++ shorewall-3.4.8/init.debian.sh 2008-03-02 16:04:10.000000000 +0100
! @@ -1,80 +1,29 @@
#!/bin/sh
+ -### BEGIN INIT INFO
+ -# Provides: shorewall
+ -# Required-Start: $network
+ -# Required-Stop: $network
+ -# Default-Start: S
+ -# Default-Stop: 0 6
+ -# Short-Description: Configure the firewall at boot time
+ -# Description: Configure the firewall according to the rules specified
in
+ -# /etc/shorewall
+ -### 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
-# Note, set INITLOG to /dev/null if you do not want to
-# keep logs of the firewall (not recommended)
-INITLOG=/var/log/shorewall-init.log
-
-test -x $SRWL || exit 0
+ -test -x $WAIT_FOR_IFUP || exit 0
-test -n $INITLOG || {
! - echo "INITLOG cannot be empty, please configure $0" ;
- exit 1;
-}
***************
*** 106,139 ****
-echo_notdone () {
-
! - if [ "$INITLOG" = "/dev/null" ] ; then
! - "not done."
! - else
! - "not done (check $INITLOG)."
- fi
! -
-}
-
-not_configured () {
- echo "#### WARNING ####"
! - echo "the firewall won't be started/stopped unless it is configured"
- if [ "$1" != "stop" ]
- then
- echo ""
! - echo "please configure it and then edit /etc/default/shorewall"
! - echo "and set the \"startup\" variable to 1 in order to allow "
! - echo "shorewall to start"
- fi
- echo "#################"
- exit 0
-}
-
- # parse the shorewall params file in order to use params in
- # /etc/default/shorewall
- -if [ -f "/etc/shorewall/params" ]
- -then
- - . /etc/shorewall/params
- -fi
-
-# check if shorewall is configured or not
if [ -f "/etc/default/shorewall" ]
then
--- 151,178 ----
-echo_notdone () {
-
! - if [ "$INITLOG" = "/dev/null" ] ; then
! - echo "not done."
! - else
! - echo "not done (check $INITLOG)."
- fi
!
-}
-
-not_configured () {
- echo "#### WARNING ####"
! - echo "The firewall won't be started/stopped unless it is configured"
- if [ "$1" != "stop" ]
- then
- echo ""
! - echo "Please read about Debian specific customization in"
! - echo "/usr/share/doc/shorewall-common/README.Debian.gz."
- fi
- echo "#################"
- exit 0
-}
-
-# check if shorewall is configured or not
+ +# parse the shorewall params file in order to use params in
+ +# /etc/default/shorewall
if [ -f "/etc/default/shorewall" ]
then
***************
*** 147,166 ****
fi
! # wait an unconfigured interface
! @@ -73,8 +21,7 @@
$WAIT_FOR_IFUP $i 90
done
! else
! - echo "$WAIT_FOR_IFUP: File not found" >> $INITLOG
! - echo_notdone
+ echo "$WAIT_FOR_IFUP: File not found"
! exit 2
! fi
fi
! @@ -84,28 +31,28 @@
shorewall_start () {
echo -n "Starting \"Shorewall firewall\": "
wait_for_pppd
! - $SRWL $OPTIONS start >> $INITLOG 2>&1 && echo "done." || echo_notdone
+ $SRWL $OPTIONS start 2>&1 && echo "done."
return 0
--- 186,212 ----
fi
! -# wait an unconfigured interface
! +# wait an unconfigured interface
! wait_for_pppd () {
! 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
! }
!
! @@ -82,28 +31,28 @@
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
***************
*** 170,174 ****
shorewall_stop () {
echo -n "Stopping \"Shorewall firewall\": "
! - $SRWL stop >> $INITLOG 2>&1 && echo "done." || echo_notdone
+ $SRWL stop 2>&1 && echo "done."
return 0
--- 216,220 ----
shorewall_stop () {
echo -n "Stopping \"Shorewall firewall\": "
! - $SRWL $SRWL_OPTS clear >> $INITLOG 2>&1 && echo "done." || echo_notdone
+ $SRWL stop 2>&1 && echo "done."
return 0
***************
*** 178,182 ****
shorewall_restart () {
echo -n "Restarting \"Shorewall firewall\": "
! - $SRWL restart >> $INITLOG 2>&1 && echo "done." || echo_notdone
+ $SRWL $OPTIONS restart 2>&1 && echo "done."
return 0
--- 224,228 ----
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
***************
*** 186,224 ****
shorewall_refresh () {
echo -n "Refreshing \"Shorewall firewall\": "
! - $SRWL refresh >> $INITLOG 2>&1 && echo "done." || echo_notdone
+ $SRWL refresh 2>&1 && echo "done."
return 0
}
- diff -urN shorewall-3.4.5.orig/install.sh shorewall-3.4.5/install.sh
- --- shorewall-3.4.5.orig/install.sh 2007-07-13 18:32:57.000000000 +0200
- +++ shorewall-3.4.5/install.sh 2007-07-18 11:30:05.000000000 +0200
- @@ -676,28 +676,6 @@
- fi
-
- #
- -# Install the Man Pages
- -#
- -
- -cd manpages
- -
- -for f in *.5; do
- - gzip -c $f > $f.gz
- - run_install -D -m 0444 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz
- - echo "Man page $f.gz installed to /usr/share/man/man5/$f.gz"
- -done
- -
- -for f in *.8; do
- - gzip -c $f > $f.gz
- - run_install -D -m 0444 $f.gz ${PREFIX}/usr/share/man/man8/$f.gz
- - echo "Man page $f.gz installed to /usr/share/man/man8/$f.gz"
- -done
- -
- -cd ..
- -
- -echo "Man Pages Installed"
- -
- -#
- # Install the firewall script
- #
- install_file firewall ${PREFIX}/usr/share/shorewall/firewall 0555
--- 232,238 ----
shorewall_refresh () {
echo -n "Refreshing \"Shorewall firewall\": "
! - $SRWL $SRWL_OPTS refresh >> $INITLOG 2>&1 && echo "done." || echo_notdone
+ $SRWL refresh 2>&1 && echo "done."
return 0
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
leaf-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
