Update of /cvsroot/leaf/src/bering-uclibc/contrib/shorewall
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22759
Modified Files:
buildtool.cfg buildtool.mk shorewall-config.diff
shorewall-lrp.diff
Log Message:
new upstream version 2.4.6
Index: shorewall-config.diff
===================================================================
RCS file:
/cvsroot/leaf/src/bering-uclibc/contrib/shorewall/shorewall-config.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** shorewall-config.diff 20 Jun 2005 18:34:31 -0000 1.1
--- shorewall-config.diff 13 Nov 2005 14:10:58 -0000 1.2
***************
*** 1,20 ****
! diff -urN shorewall-2.4.0.orig/interfaces shorewall-2.4.0/interfaces
! --- shorewall-2.4.0.orig/interfaces 2005-05-17 21:02:12.000000000 +0200
! +++ shorewall-2.4.0/interfaces 2005-06-19 12:36:14.000000000 +0200
! @@ -214,4 +214,6 @@
!
##############################################################################
! #ZONE INTERFACE BROADCAST OPTIONS GATEWAY
#
+net eth0 detect dhcp,routefilter,norfc1918
+loc eth1 detect dhcp
#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE
! diff -urN shorewall-2.4.0.orig/masq shorewall-2.4.0/masq
! --- shorewall-2.4.0.orig/masq 2005-05-02 22:54:43.000000000 +0200
! +++ shorewall-2.4.0/masq 2005-06-19 12:36:14.000000000 +0200
! @@ -213,4 +213,5 @@
#
###############################################################################
! #INTERFACE SUBNET ADDRESS PROTO PORT(S) IPSEC
! +eth0 eth1
#LAST LINE -- ADD YOUR ENTRIES ABOVE THIS LINE -- DO NOT REMOVE
diff -urN shorewall-2.4.0.orig/policy shorewall-2.4.0/policy
--- 1,20 ----
! diff -urN shorewall-2.4.6.orig/interfaces shorewall-2.4.6/interfaces
! --- shorewall-2.4.6.orig/interfaces 2005-08-09 15:37:26.000000000 +0200
! +++ shorewall-2.4.6/interfaces 2005-11-13 15:00:10.000000000 +0100
! @@ -215,4 +215,6 @@
#
+
###############################################################################
+ #ZONE INTERFACE BROADCAST OPTIONS GATEWAY
+net eth0 detect dhcp,routefilter,norfc1918
+loc eth1 detect dhcp
#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE
! diff -urN shorewall-2.4.6.orig/masq shorewall-2.4.6/masq
! --- shorewall-2.4.6.orig/masq 2005-08-02 15:58:34.000000000 +0200
! +++ shorewall-2.4.6/masq 2005-11-13 15:02:25.000000000 +0100
! @@ -217,4 +217,5 @@
#
###############################################################################
! #INTERFACE SUBNET ADDRESS PROTO PORT(S) IPSEC
! ++eth0 eth1
#LAST LINE -- ADD YOUR ENTRIES ABOVE THIS LINE -- DO NOT REMOVE
diff -urN shorewall-2.4.0.orig/policy shorewall-2.4.0/policy
***************
*** 36,46 ****
+all all REJECT ULOG
#LAST LINE -- DO NOT REMOVE
! diff -urN shorewall-2.4.0.orig/rules shorewall-2.4.0/rules
! --- shorewall-2.4.0.orig/rules 2005-06-02 16:08:57.000000000 +0200
! +++ shorewall-2.4.0/rules 2005-06-19 12:36:14.000000000 +0200
! @@ -368,4 +368,28 @@
!
####################################################################################################
! #ACTION SOURCE DEST PROTO DEST SOURCE
ORIGINAL RATE USER/
! # PORT PORT(S) DEST
LIMIT GROUP
+
+# Accept DNS connections from the firewall to the network
--- 36,46 ----
+all all REJECT ULOG
#LAST LINE -- DO NOT REMOVE
! diff -urN shorewall-2.4.6.orig/rules shorewall-2.4.6/rules
! --- shorewall-2.4.6.orig/rules 2005-08-02 15:58:34.000000000 +0200
! +++ shorewall-2.4.6/rules 2005-11-13 14:54:47.000000000 +0100
! @@ -369,4 +369,27 @@
!
#############################################################################################################
! #ACTION SOURCE DEST PROTO DEST SOURCE
ORIGINAL RATE USER/
! # PORT PORT(S) DEST
LIMIT GROUP
+
+# Accept DNS connections from the firewall to the network
***************
*** 66,82 ****
+#
+AllowWeb loc fw
- +
#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE
! diff -urN shorewall-2.4.0.orig/zones shorewall-2.4.0/zones
! --- shorewall-2.4.0.orig/zones 2005-05-02 22:59:48.000000000 +0200
! +++ shorewall-2.4.0/zones 2005-06-19 12:36:14.000000000 +0200
! @@ -24,4 +24,9 @@
! # dmz DMZ Demilitarized zone.
#
! #ZONE DISPLAY COMMENTS
! +
! +net Net Internet
! +loc Local Local networks
! +#dmz DMZ Demilitarized zone
+
#LAST LINE - ADD YOUR ENTRIES ABOVE THIS ONE - DO NOT REMOVE
--- 66,80 ----
+#
+AllowWeb loc fw
#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE
! diff -urN shorewall-2.4.6.orig/zones shorewall-2.4.6/zones
! --- shorewall-2.4.6.orig/zones 2005-08-02 15:58:34.000000000 +0200
! +++ shorewall-2.4.6/zones 2005-11-13 14:43:31.000000000 +0100
! @@ -31,4 +31,8 @@
#
!
###############################################################################
! #ZONE DISPLAY COMMENTS
+
+ +net Net Internet
+ +loc Local Local networks
+ +#dmz DMZ Demilitarized zone
#LAST LINE - ADD YOUR ENTRIES ABOVE THIS ONE - DO NOT REMOVE
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/contrib/shorewall/buildtool.cfg,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** buildtool.cfg 27 Jul 2005 17:41:50 -0000 1.4
--- buildtool.cfg 13 Nov 2005 14:10:58 -0000 1.5
***************
*** 5,11 ****
</Server>
! <File shorewall-2.4.2.tgz>
Server = shorewall-net
! Directory = 2.4/shorewall-2.4.2
Envname = SHOREWALL_SOURCE
</File>
--- 5,11 ----
</Server>
! <File shorewall-2.4.6.tgz>
Server = shorewall-net
! Directory = 2.4/shorewall-2.4.6
Envname = SHOREWALL_SOURCE
</File>
***************
*** 45,49 ****
<Package>
<shorwall>
! Version 2.4.2
Revision = 1
--- 45,49 ----
<Package>
<shorwall>
! Version 2.4.6
Revision = 1
Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/contrib/shorewall/buildtool.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** buildtool.mk 27 Jul 2005 17:41:50 -0000 1.2
--- buildtool.mk 13 Nov 2005 14:10:58 -0000 1.3
***************
*** 9,13 ****
TARGET_DIR=$(BT_BUILD_DIR)/shorewall
! SHOREWALL_DIR:=shorewall-2.4.2
$(SHOREWALL_DIR)/.source:
--- 9,13 ----
TARGET_DIR=$(BT_BUILD_DIR)/shorewall
! SHOREWALL_DIR:=shorewall-2.4.6
$(SHOREWALL_DIR)/.source:
Index: shorewall-lrp.diff
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/contrib/shorewall/shorewall-lrp.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** shorewall-lrp.diff 27 Jul 2005 17:41:50 -0000 1.2
--- shorewall-lrp.diff 13 Nov 2005 14:10:58 -0000 1.3
***************
*** 120,153 ****
#
# BRIDGING
! diff -urN shorewall-2.4.0.orig/start shorewall-2.4.0/start
! --- shorewall-2.4.0.orig/start 2005-05-02 22:54:43.000000000 +0200
! +++ shorewall-2.4.0/start 2005-06-19 12:32:41.000000000 +0200
! @@ -6,3 +6,6 @@
! #
! # See http://shorewall.net/shorewall_extension_scripts.htm for additional
# information.
! +for file in /etc/shorewall/start.d/* ; do
+ run_user_exit $file
+done
! diff -urN shorewall-2.4.0.orig/stop shorewall-2.4.0/stop
! --- shorewall-2.4.0.orig/stop 2005-05-02 22:54:43.000000000 +0200
! +++ shorewall-2.4.0/stop 2005-06-19 12:32:41.000000000 +0200
! @@ -6,3 +6,6 @@
! #
! # See http://shorewall.net/shorewall_extension_scripts.htm for additional
# information.
! +for file in /etc/shorewall/stop.d/* ; do
+ run_user_exit $file
+done
!
! --- shorewall-2.4.2.orig/firewall 2005-07-20 23:47:24.000000000 +0200
! +++ shorewall-2.4.2/firewall 2005-07-27 16:11:56.748628424 +0200
! @@ -1208,7 +1208,7 @@
!
! for table in $PROVIDERS; do
! eval number=\$${table}_number
! - /bin/echo -e "$number\t$table" >> /etc/iproute2/rt_tables
! + echo -e "$number\t$table" >> /etc/iproute2/rt_tables
! done
!
! save_command "cat > /etc/iproute2/rt_tables << __EOF__"
--- 120,143 ----
#
# BRIDGING
! diff -urN shorewall-2.4.6.orig/stop shorewall-2.4.6/stop
! --- shorewall-2.4.6.orig/stop 2005-08-02 15:58:34.000000000 +0200
! +++ shorewall-2.4.6/stop 2005-11-12 18:44:53.000000000 +0100
! @@ -10,4 +10,7 @@
# information.
! #
!
###############################################################################
! +for file in /etc/shorewall/stop.d/* ; do
+ run_user_exit $file
+done
! #LAST LINE - ADD YOUR ENTRIES ABOVE THIS ONE - DO NOT REMOVE
! diff -urN shorewall-2.4.6.orig/start shorewall-2.4.6/start
! --- shorewall-2.4.6.orig/start 2005-08-02 15:58:34.000000000 +0200
! +++ shorewall-2.4.6/start 2005-11-12 18:45:13.000000000 +0100
! @@ -10,4 +10,7 @@
# information.
! #
!
###############################################################################
! +for file in /etc/shorewall/start.d/* ; do
+ run_user_exit $file
+done
! #LAST LINE - ADD YOUR ENTRIES ABOVE THIS ONE - DO NOT REMOVE
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
leaf-cvs-commits mailing list
leaf-cvs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
