Update of /cvsroot/leaf/src/The_UnNamed_One/apps/shorewall
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv395
Modified Files:
buildtool.cfg buildtool.mk shorewall-config.diff
shorewall-lrp.diff
Log Message:
build shorewall 4.2.10
Index: shorewall-config.diff
===================================================================
RCS file:
/cvsroot/leaf/src/The_UnNamed_One/apps/shorewall/shorewall-config.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** shorewall-config.diff 17 Mar 2008 20:17:10 -0000 1.2
--- shorewall-config.diff 19 Aug 2009 08:52:37 -0000 1.3
***************
*** 9,29 ****
+loc eth1 detect dhcp
#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE
- diff -urN shorewall-common-4.0.9.org/policy shorewall-common-4.0.9/policy
- --- shorewall-common-4.0.9.org/policy 2007-08-30 17:40:17.000000000 +0200
- +++ shorewall-common-4.0.9/policy 2008-03-17 15:35:12.000000000 +0100
- @@ -9,4 +9,13 @@
-
###############################################################################
- #SOURCE DEST POLICY LOG
LIMIT:BURST
- # LEVEL
- +loc net ACCEPT
- +net all DROP ULOG
- +# If you want open access to the Internet from your Firewall
- +# remove the comment from the following line.
- +#fw net ACCEPT
- +#
- +# THE FOLLOWING POLICY MUST BE LAST
- +#
- +all
- #LAST LINE -- DO NOT REMOVE
diff -urN shorewall-common-4.0.9.org/zones shorewall-common-4.0.9/zones
--- shorewall-common-4.0.9.org/zones 2007-08-30 17:40:17.000000000 +0200
--- 9,12 ----
***************
*** 78,79 ****
--- 61,79 ----
+eth0 eth1
#LAST LINE -- ADD YOUR ENTRIES ABOVE THIS LINE -- DO NOT REMOVE
+ diff -urN shorewall-common-4.2.10.orig/policy shorewall-common-4.2.10/policy
+ --- shorewall-common-4.2.10.orig/policy 2008-10-28 16:53:50.000000000
+0100
+ +++ shorewall-common-4.2.10/policy 2009-08-09 13:10:38.000000000 +0200
+ @@ -9,4 +9,13 @@
+
###############################################################################
+ #SOURCE DEST POLICY LOG LIMIT: CONNLIMIT:
+ # LEVEL BURST MASK
+ +loc net ACCEPT
+ +net all DROP ULOG
+ +# If you want open access to the Internet from your Firewall
+ +# remove the comment from the following line.
+ +#fw net ACCEPT
+ +#
+ +# THE FOLLOWING POLICY MUST BE LAST
+ +#
+all
+ +all all REJECT ULOG
+ #LAST LINE -- DO NOT REMOVE
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/The_UnNamed_One/apps/shorewall/buildtool.cfg,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** buildtool.cfg 17 Mar 2008 20:17:10 -0000 1.3
--- buildtool.cfg 19 Aug 2009 08:52:37 -0000 1.4
***************
*** 5,26 ****
</Server>
! <File shorewall-common-4.0.9.tgz>
Server = shorewall-net
! Directory = 4.0/shorewall-4.0.9
Envname = SHOREWALL_COMMON_SOURCE
</File>
! <File shorewall-shell-4.0.9.1.tgz>
Server = shorewall-net
! Directory = 4.0/shorewall-4.0.9
Envname = SHOREWALL_SHELL_SOURCE
</File>
- #3.4.x errata
- #<File compiler>
- # Server = shorewall-net
- # Directory = 3.4/shorewall-3.4.5/errata/Shorewall
- #</File>
-
<File buildtool.mk>
Server = cvs-sourceforge
--- 5,20 ----
</Server>
! <File shorewall-common-4.2.10.tgz>
Server = shorewall-net
! Directory = 4.2/shorewall-4.2.10
Envname = SHOREWALL_COMMON_SOURCE
</File>
! <File shorewall-shell-4.2.10.tgz>
Server = shorewall-net
! Directory = 4.2/shorewall-4.2.10
Envname = SHOREWALL_SHELL_SOURCE
</File>
<File buildtool.mk>
Server = cvs-sourceforge
***************
*** 118,122 ****
<shorwall-basic>
packagename=shorwall
! Version 4.0.9
Revision = 1
--- 112,116 ----
<shorwall-basic>
packagename=shorwall
! Version 4.2.10
Revision = 1
***************
*** 144,148 ****
</shorwall-basic>
<shorwall-maclist>
! Version 4.0.9
Revision = 1
--- 138,142 ----
</shorwall-basic>
<shorwall-maclist>
! Version 4.2.10
Revision = 1
***************
*** 170,174 ****
<shorwall-accounting>
! Version 4.0.9
Revision = 1
--- 164,168 ----
<shorwall-accounting>
! Version 4.2.10
Revision = 1
***************
*** 196,200 ****
<shorwall-providers>
! Version 4.0.9
Revision = 1
--- 190,194 ----
<shorwall-providers>
! Version 4.2.10
Revision = 1
***************
*** 221,225 ****
</shorwall-providers>
<shorwall-dynamiczones>
! Version 4.0.9
Revision = 1
--- 215,219 ----
</shorwall-providers>
<shorwall-dynamiczones>
! Version 4.2.10
Revision = 1
***************
*** 246,250 ****
</shorwall-dynamiczones>
<shorwall-proxyarp>
! Version 4.0.9
Revision = 1
--- 240,244 ----
</shorwall-dynamiczones>
<shorwall-proxyarp>
! Version 4.2.10
Revision = 1
***************
*** 271,275 ****
</shorwall-proxyarp>
<shorwall-tunnels>
! Version 4.0.9
Revision = 1
--- 265,269 ----
</shorwall-proxyarp>
<shorwall-tunnels>
! Version 4.2.10
Revision = 1
***************
*** 296,300 ****
</shorwall-tunnels>
<shorwall-tcrules>
! Version 4.0.9
Revision = 1
--- 290,294 ----
</shorwall-tunnels>
<shorwall-tcrules>
! Version 4.2.10
Revision = 1
***************
*** 321,325 ****
</shorwall-tcrules>
<shorwall-tc>
! Version 4.0.9
Revision = 1
--- 315,319 ----
</shorwall-tcrules>
<shorwall-tc>
! Version 4.2.10
Revision = 1
***************
*** 348,352 ****
<shorwall>
packagename=shorwall
! Version 4.0.9
Revision = 1
--- 342,346 ----
<shorwall>
packagename=shorwall
! Version 4.2.10
Revision = 1
Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/The_UnNamed_One/apps/shorewall/buildtool.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** buildtool.mk 17 Mar 2008 20:17:10 -0000 1.3
--- buildtool.mk 19 Aug 2009 08:52:37 -0000 1.4
***************
*** 9,14 ****
TARGET_DIR=$(BT_BUILD_DIR)/shorewall
! SHOREWALL_C_DIR:=shorewall-common-4.0.9
! SHOREWALL_SH_DIR:=shorewall-shell-4.0.9.1
$(SHOREWALL_C_DIR)/.source:
--- 9,14 ----
TARGET_DIR=$(BT_BUILD_DIR)/shorewall
! SHOREWALL_C_DIR:=shorewall-common-4.2.10
! SHOREWALL_SH_DIR:=shorewall-shell-4.2.10
$(SHOREWALL_C_DIR)/.source:
Index: shorewall-lrp.diff
===================================================================
RCS file: /cvsroot/leaf/src/The_UnNamed_One/apps/shorewall/shorewall-lrp.diff,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** shorewall-lrp.diff 26 Mar 2008 16:33:31 -0000 1.4
--- shorewall-lrp.diff 19 Aug 2009 08:52:37 -0000 1.5
***************
*** 85,96 ****
BRIDGING=No
! diff -urN shorewall-common-4.0.9.org/install.sh
shorewall-common-4.0.9/install.sh
! --- shorewall-common-4.0.9.org/install.sh 2008-02-15 19:47:42.000000000
+0100
! +++ shorewall-common-4.0.9/install.sh 2008-03-17 13:13:58.000000000 +0100
! @@ -677,27 +677,7 @@
! ln -s ${DEST}/${INIT} /usr/share/shorewall/init
fi
! -#
-# Install the Man Pages
-#
--- 85,95 ----
BRIDGING=No
! diff -urN shorewall-common-4.2.10.orig/install.sh
shorewall-common-4.2.10/install.sh
! --- shorewall-common-4.2.10.orig/install.sh 2009-05-30 03:34:08.000000000
+0200
! +++ shorewall-common-4.2.10/install.sh 2009-08-09 12:40:49.000000000
+0200
! @@ -731,28 +731,6 @@
fi
! #
-# Install the Man Pages
-#
***************
*** 100,123 ****
-for f in *.5; do
- gzip -c $f > $f.gz
! - run_install -D -m 0644 $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 0644 $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
! diff -urN shorewall-common-4.0.9.org/init.debian.sh
shorewall-common-4.0.9/init.debian.sh
! --- shorewall-common-4.0.9.org/init.debian.sh 2007-10-22 17:45:44.000000000
+0200
! +++ shorewall-common-4.0.9/init.debian.sh 2008-03-17 15:23:10.000000000
+0100
! @@ -1,80 +1,33 @@
#!/bin/sh
-### BEGIN INIT INFO
--- 99,124 ----
-for f in *.5; do
- gzip -c $f > $f.gz
! - run_install -D -m 0644 $f.gz ${PREFIX}${MANDIR}/man5/$f.gz
! - echo "Man page $f.gz installed to ${PREFIX}${MANDIR}/man5/$f.gz"
-done
-
-for f in *.8; do
- gzip -c $f > $f.gz
! - run_install -D -m 0644 $f.gz ${PREFIX}${MANDIR}/man8/$f.gz
! - echo "Man page $f.gz installed to ${PREFIX}${MANDIR}/man8/$f.gz"
-done
-
-cd ..
! -
-echo "Man Pages Installed"
! -
! -#
# Install the firewall script
! #
! install_file firewall ${PREFIX}/usr/share/shorewall/firewall 0755
! diff -urN shorewall-common-4.2.10.orig/init.debian.sh
shorewall-common-4.2.10/init.debian.sh
! --- shorewall-common-4.2.10.orig/init.debian.sh 2008-09-23
01:40:10.000000000 +0200
! +++ shorewall-common-4.2.10/init.debian.sh 2009-08-10 11:59:33.000000000
+0200
! @@ -1,16 +1,6 @@
#!/bin/sh
-### BEGIN INIT INFO
***************
*** 137,167 ****
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;
! -}
! -
! -if [ "$(id -u)" != "0" ]
! -then
! - echo "You must be root to start, stop or restart \"Shorewall firewall\"."
! - exit 1
! -fi
! -
! -echo_notdone () {
! -
! - if [ "$INITLOG" = "/dev/null" ] ; then
! - echo "not done."
! - else
! - echo "not done (check $INITLOG)."
! - fi
! -}
-not_configured () {
--- 138,144 ----
SRWL=/sbin/shorewall
SRWL_OPTS="-tvv"
! @@ -42,32 +32,6 @@
! }
-not_configured () {
***************
*** 179,187 ****
-
-# 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
! . /etc/default/shorewall
- if [ "$startup" != "1" ]
- then
--- 156,163 ----
-
-# check if shorewall is configured or not
! -if [ -f "/etc/default/shorewall" ]
! -then
! - . /etc/default/shorewall
! - SRWL_OPTS="$SRWL_OPTS $OPTIONS"
- if [ "$startup" != "1" ]
- then
***************
*** 190,243 ****
-else
- not_configured
! fi
!
! # 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 +35,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
- }
-
- # stop the firewall
- 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
- }
-
- # 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
- }
-
- # refresh the firewall
- 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
- }
-
--- 166,172 ----
-else
- not_configured
! -fi
! -
! # wait for an unconfigured interface
wait_for_pppd () {
if [ "$wait_interface" != "" ]
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
leaf-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
