Update of /cvsroot/leaf/src/The_UnNamed_One/apps/shorewall
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23649
Modified Files:
accounting.file buildtool.cfg buildtool.mk common.cfg
maclist.file providers.file proxyarp.file
shorewall-config.diff shorewall-lrp.diff tc.file tcrules.file
tunnels.file
Log Message:
upgrade to shorewall version 4.x
this setup provides shorewall v4.0.9 and the shell compiler v4.0.9.1
and packages all in the usual shorwall.lrp
Index: tcrules.file
===================================================================
RCS file: /cvsroot/leaf/src/The_UnNamed_One/apps/shorewall/tcrules.file,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tcrules.file 1 Mar 2008 16:23:38 -0000 1.1
--- tcrules.file 17 Mar 2008 20:17:10 -0000 1.2
***************
*** 1,5 ****
<File>
! Filename = usr/share/shorewall/lib.tcrules
! Source = usr/share/shorewall/lib.tcrules
Type = binary
</File>
--- 1,5 ----
<File>
! Filename =
usr/share/shorewall-shell/lib.tcrules
! Source =
usr/share/shorewall-shell/lib.tcrules
Type = binary
</File>
Index: providers.file
===================================================================
RCS file: /cvsroot/leaf/src/The_UnNamed_One/apps/shorewall/providers.file,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** providers.file 1 Mar 2008 16:23:38 -0000 1.1
--- providers.file 17 Mar 2008 20:17:10 -0000 1.2
***************
*** 1,5 ****
<File>
! Filename = usr/share/shorewall/lib.providers
! Source = usr/share/shorewall/lib.providers
Type = binary
</File>
--- 1,5 ----
<File>
! Filename =
usr/share/shorewall-shell/lib.providers
! Source =
usr/share/shorewall-shell/lib.providers
Type = binary
</File>
Index: tunnels.file
===================================================================
RCS file: /cvsroot/leaf/src/The_UnNamed_One/apps/shorewall/tunnels.file,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tunnels.file 1 Mar 2008 16:23:38 -0000 1.1
--- tunnels.file 17 Mar 2008 20:17:10 -0000 1.2
***************
*** 1,5 ****
<File>
! Filename = usr/share/shorewall/lib.tunnels
! Source = usr/share/shorewall/lib.tunnels
Type = binary
</File>
--- 1,5 ----
<File>
! Filename =
usr/share/shorewall-shell/lib.tunnels
! Source =
usr/share/shorewall-shell/lib.tunnels
Type = binary
</File>
Index: maclist.file
===================================================================
RCS file: /cvsroot/leaf/src/The_UnNamed_One/apps/shorewall/maclist.file,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** maclist.file 1 Mar 2008 16:23:38 -0000 1.1
--- maclist.file 17 Mar 2008 20:17:10 -0000 1.2
***************
*** 1,5 ****
<File>
! Filename = usr/share/shorewall/lib.maclist
! Source = usr/share/shorewall/lib.maclist
Type = binary
</File>
--- 1,5 ----
<File>
! Filename =
usr/share/shorewall-shell/lib.maclist
! Source =
usr/share/shorewall-shell/lib.maclist
Type = binary
</File>
Index: proxyarp.file
===================================================================
RCS file: /cvsroot/leaf/src/The_UnNamed_One/apps/shorewall/proxyarp.file,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** proxyarp.file 1 Mar 2008 16:23:38 -0000 1.1
--- proxyarp.file 17 Mar 2008 20:17:10 -0000 1.2
***************
*** 1,5 ****
<File>
! Filename = usr/share/shorewall/lib.proxyarp
! Source = usr/share/shorewall/lib.proxyarp
Type = binary
</File>
--- 1,5 ----
<File>
! Filename =
usr/share/shorewall-shell/lib.proxyarp
! Source =
usr/share/shorewall-shell/lib.proxyarp
Type = binary
</File>
Index: accounting.file
===================================================================
RCS file: /cvsroot/leaf/src/The_UnNamed_One/apps/shorewall/accounting.file,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** accounting.file 1 Mar 2008 16:23:37 -0000 1.1
--- accounting.file 17 Mar 2008 20:17:10 -0000 1.2
***************
*** 1,5 ****
<File>
! Filename = usr/share/shorewall/lib.accounting
! Source = usr/share/shorewall/lib.accounting
Type = binary
</File>
--- 1,5 ----
<File>
! Filename =
usr/share/shorewall-shell/lib.accounting
! Source =
usr/share/shorewall-shell/lib.accounting
Type = binary
</File>
Index: shorewall-lrp.diff
===================================================================
RCS file: /cvsroot/leaf/src/The_UnNamed_One/apps/shorewall/shorewall-lrp.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** shorewall-lrp.diff 2 Mar 2008 19:26:20 -0000 1.2
--- shorewall-lrp.diff 17 Mar 2008 20:17:10 -0000 1.3
***************
*** 1,5 ****
! diff -urN shorewall-3.4.0-Beta3.orig/start shorewall-3.4.0-Beta3/start
! --- shorewall-3.4.0-Beta3.orig/start 2006-12-18 22:57:44.000000000 +0100
! +++ shorewall-3.4.0-Beta3/start 2007-01-22 22:15:34.000000000 +0100
@@ -10,4 +10,7 @@
# information.
--- 1,5 ----
! diff -urN shorewall-common-4.0.9.org/start shorewall-common-4.0.9/start
! --- shorewall-common-4.0.9.org/start 2007-07-09 16:01:07.000000000 +0200
! +++ shorewall-common-4.0.9/start 2008-03-17 13:08:30.000000000 +0100
@@ -10,4 +10,7 @@
# information.
***************
*** 10,16 ****
+done
#LAST LINE - ADD YOUR ENTRIES ABOVE THIS ONE - DO NOT REMOVE
! diff -urN shorewall-3.4.0-Beta3.orig/stop shorewall-3.4.0-Beta3/stop
! --- shorewall-3.4.0-Beta3.orig/stop 2006-12-18 22:57:44.000000000 +0100
! +++ shorewall-3.4.0-Beta3/stop 2007-01-22 22:16:02.000000000 +0100
@@ -10,4 +10,7 @@
# information.
--- 10,16 ----
+done
#LAST LINE - ADD YOUR ENTRIES ABOVE THIS ONE - DO NOT REMOVE
! diff -urN shorewall-common-4.0.9.org/stop shorewall-common-4.0.9/stop
! --- shorewall-common-4.0.9.org/stop 2007-07-09 16:01:07.000000000 +0200
! +++ shorewall-common-4.0.9/stop 2008-03-17 13:09:03.000000000 +0100
@@ -10,4 +10,7 @@
# information.
***************
*** 21,28 ****
+done
#LAST LINE - ADD YOUR ENTRIES ABOVE THIS ONE - DO NOT REMOVE
! diff -urN shorewall-3.4.0-Beta3.orig/shorewall.conf
shorewall-3.4.0-Beta3/shorewall.conf
! --- shorewall-3.4.0-Beta3.orig/shorewall.conf 2006-12-18 22:57:44.000000000
+0100
! +++ shorewall-3.4.0-Beta3/shorewall.conf 2007-01-22 22:17:40.000000000
+0100
! @@ -16,7 +16,7 @@
# S T A R T U P E N A B L E D
###############################################################################
--- 21,28 ----
+done
#LAST LINE - ADD YOUR ENTRIES ABOVE THIS ONE - DO NOT REMOVE
! diff -urN shorewall-common-4.0.9.org/shorewall.conf
shorewall-common-4.0.9/shorewall.conf
! --- shorewall-common-4.0.9.org/shorewall.conf 2008-01-21 16:51:59.000000000
+0100
! +++ shorewall-common-4.0.9/shorewall.conf 2008-03-17 13:12:07.000000000
+0100
! @@ -18,7 +18,7 @@
# S T A R T U P E N A B L E D
###############################################################################
***************
*** 33,37 ****
###############################################################################
# V E R B O S I T Y
! @@ -28,7 +28,7 @@
# L O G G I N G
###############################################################################
--- 33,44 ----
###############################################################################
# V E R B O S I T Y
! @@ -31,13 +31,13 @@
! # (setting this to 'perl' requires installation of Shorewall-perl)
!
###############################################################################
!
! -SHOREWALL_COMPILER=
! +SHOREWALL_COMPILER=shell
!
!
###############################################################################
# L O G G I N G
###############################################################################
***************
*** 42,46 ****
LOGFORMAT="Shorewall:%s:%s:"
! @@ -42,13 +42,13 @@
BLACKLIST_LOGLEVEL=
--- 49,53 ----
LOGFORMAT="Shorewall:%s:%s:"
! @@ -51,13 +51,13 @@
BLACKLIST_LOGLEVEL=
***************
*** 60,64 ****
LOG_MARTIANS=No
! @@ -62,7 +62,7 @@
SHOREWALL_SHELL=/bin/sh
--- 67,71 ----
LOG_MARTIANS=No
! @@ -71,7 +71,7 @@
SHOREWALL_SHELL=/bin/sh
***************
*** 69,73 ****
MODULESDIR=
! @@ -117,7 +117,7 @@
MODULE_SUFFIX=
--- 76,80 ----
MODULESDIR=
! @@ -136,7 +136,7 @@
MODULE_SUFFIX=
***************
*** 78,88 ****
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
-#
--- 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
-#
***************
*** 92,96 ****
-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
--- 100,104 ----
-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
***************
*** 98,117 ****
-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
--- 106,123 ----
-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
***************
*** 126,134 ****
-### 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
--- 132,140 ----
-### 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
***************
*** 158,162 ****
-}
! -
-not_configured () {
- echo "#### WARNING ####"
--- 164,168 ----
-}
!
-not_configured () {
- echo "#### WARNING ####"
***************
*** 186,208 ****
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\": "
--- 192,213 ----
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
}
! @@ -82,28 +35,28 @@
shorewall_start () {
echo -n "Starting \"Shorewall firewall\": "
Index: shorewall-config.diff
===================================================================
RCS file:
/cvsroot/leaf/src/The_UnNamed_One/apps/shorewall/shorewall-config.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** shorewall-config.diff 1 Mar 2008 16:23:38 -0000 1.1
--- shorewall-config.diff 17 Mar 2008 20:17:10 -0000 1.2
***************
*** 1,5 ****
! diff -urN shorewall-3.4.0-Beta3.orig/interfaces
shorewall-3.4.0-Beta3/interfaces
! --- shorewall-3.4.0-Beta3.orig/interfaces 2006-12-18 22:57:44.000000000
+0100
! +++ shorewall-3.4.0-Beta3/interfaces 2007-01-22 22:20:25.000000000 +0100
@@ -8,4 +8,6 @@
#
--- 1,5 ----
! diff -urN shorewall-common-4.0.9.org/interfaces
shorewall-common-4.0.9/interfaces
! --- shorewall-common-4.0.9.org/interfaces 2007-08-30 17:40:17.000000000
+0200
! +++ shorewall-common-4.0.9/interfaces 2008-03-17 15:34:22.000000000 +0100
@@ -8,4 +8,6 @@
#
***************
*** 9,16 ****
+loc eth1 detect dhcp
#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE
! diff -urN shorewall-3.4.0-Beta3.orig/policy shorewall-3.4.0-Beta3/policy
! --- shorewall-3.4.0-Beta3.orig/policy 2006-12-18 22:57:44.000000000 +0100
! +++ shorewall-3.4.0-Beta3/policy 2007-01-22 22:21:08.000000000 +0100
! @@ -8,4 +8,13 @@
###############################################################################
#SOURCE DEST POLICY LOG
LIMIT:BURST
--- 9,16 ----
+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
***************
*** 24,33 ****
+# THE FOLLOWING POLICY MUST BE LAST
+#
! +all all REJECT ULOG
#LAST LINE -- DO NOT REMOVE
! diff -urN shorewall-3.4.0-Beta3.orig/zones shorewall-3.4.0-Beta3/zones
! --- shorewall-3.4.0-Beta3.orig/zones 2006-12-18 22:57:44.000000000 +0100
! +++ shorewall-3.4.0-Beta3/zones 2007-01-22 22:24:05.000000000 +0100
! @@ -9,4 +9,7 @@
#ZONE TYPE OPTIONS IN OUT
# OPTIONS OPTIONS
--- 24,33 ----
+# 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
! +++ shorewall-common-4.0.9/zones 2008-03-17 15:35:46.000000000 +0100
! @@ -10,4 +10,7 @@
#ZONE TYPE OPTIONS IN OUT
# OPTIONS OPTIONS
***************
*** 37,44 ****
+#dmz ipv4
#LAST LINE - ADD YOUR ENTRIES ABOVE THIS ONE - DO NOT REMOVE
! diff -urN shorewall-3.4.0-Beta3.orig/rules shorewall-3.4.0-Beta3/rules
! --- shorewall-3.4.0-Beta3.orig/rules 2006-12-18 22:57:44.000000000 +0100
! +++ shorewall-3.4.0-Beta3/rules 2007-02-03 14:09:44.000000000 +0100
! @@ -11,4 +11,29 @@
#SECTION ESTABLISHED
#SECTION RELATED
--- 37,44 ----
+#dmz ipv4
#LAST LINE - ADD YOUR ENTRIES ABOVE THIS ONE - DO NOT REMOVE
! diff -urN shorewall-common-4.0.9.org/rules shorewall-common-4.0.9/rules
! --- shorewall-common-4.0.9.org/rules 2007-08-30 17:40:17.000000000 +0200
! +++ shorewall-common-4.0.9/rules 2008-03-17 15:36:53.000000000 +0100
! @@ -12,4 +12,28 @@
#SECTION ESTABLISHED
#SECTION RELATED
***************
*** 57,61 ****
+Ping/ACCEPT net fw
+Ping/ACCEPT loc fw
- +
+#
+# Allow all ICMP types (including ping) from firewall
--- 57,60 ----
***************
*** 70,77 ****
+# NTP/ACCEPT loc fw
#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE
! diff -urN shorewall-3.4.4-orig/masq shorewall-3.4.4/masq
! --- shorewall-3.4.4-orig/masq 2007-05-01 23:14:47.000000000 +0200
! +++ shorewall-3.4.4/masq 2007-06-22 15:28:14.000000000 +0200
! @@ -7,4 +7,5 @@
#
###############################################################################
--- 69,76 ----
+# NTP/ACCEPT loc fw
#LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE
! diff -urN shorewall-common-4.0.9.org/masq shorewall-common-4.0.9/masq
! --- shorewall-common-4.0.9.org/masq 2007-08-30 17:40:17.000000000 +0200
! +++ shorewall-common-4.0.9/masq 2008-03-17 15:37:10.000000000 +0100
! @@ -8,4 +8,5 @@
#
###############################################################################
Index: common.cfg
===================================================================
RCS file: /cvsroot/leaf/src/The_UnNamed_One/apps/shorewall/common.cfg,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** common.cfg 1 Mar 2008 16:23:38 -0000 1.1
--- common.cfg 17 Mar 2008 20:17:10 -0000 1.2
***************
*** 45,55 ****
</File>
<File>
! Filename = usr/share/shorewall/prog.footer
! Source = usr/share/shorewall/prog.footer
Type = binary
</File>
<File>
! Filename = usr/share/shorewall/prog.header
! Source = usr/share/shorewall/prog.header
Type = binary
</File>
--- 45,55 ----
</File>
<File>
! Filename =
usr/share/shorewall-shell/prog.footer
! Source =
usr/share/shorewall-shell/prog.footer
Type = binary
</File>
<File>
! Filename =
usr/share/shorewall-shell/prog.header
! Source =
usr/share/shorewall-shell/prog.header
Type = binary
</File>
***************
*** 65,70 ****
</File>
<File>
! Filename = usr/share/shorewall/lib.nat
! Source = usr/share/shorewall/lib.nat
Type = binary
</File>
--- 65,76 ----
</File>
<File>
! Filename = usr/share/shorewall-shell/version
! Source = usr/share/shorewall-shell/version
! Type = binary
! </File>
!
! <File>
! Filename = usr/share/shorewall-shell/lib.nat
! Source = usr/share/shorewall-shell/lib.nat
Type = binary
</File>
***************
*** 85,90 ****
</File>
<File>
! Filename = usr/share/shorewall/lib.actions
! Source = usr/share/shorewall/lib.actions
Type = binary
</File>
--- 91,96 ----
</File>
<File>
! Filename =
usr/share/shorewall-shell/lib.actions
! Source =
usr/share/shorewall-shell/lib.actions
Type = binary
</File>
***************
*** 100,105 ****
</File>
<File>
! Filename = usr/share/shorewall/compiler
! Source = usr/share/shorewall/compiler
Permissions = 755
Type = binary
--- 106,111 ----
</File>
<File>
! Filename = usr/share/shorewall-shell/compiler
! Source = usr/share/shorewall-shell/compiler
Permissions = 755
Type = binary
Index: tc.file
===================================================================
RCS file: /cvsroot/leaf/src/The_UnNamed_One/apps/shorewall/tc.file,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tc.file 1 Mar 2008 16:23:38 -0000 1.1
--- tc.file 17 Mar 2008 20:17:10 -0000 1.2
***************
*** 1,5 ****
<File>
! Filename = usr/share/shorewall/lib.tc
! Source = usr/share/shorewall/lib.tc
Type = binary
</File>
--- 1,5 ----
<File>
! Filename = usr/share/shorewall-shell/lib.tc
! Source = usr/share/shorewall-shell/lib.tc
Type = binary
</File>
Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/The_UnNamed_One/apps/shorewall/buildtool.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** buildtool.mk 2 Mar 2008 19:26:20 -0000 1.2
--- buildtool.mk 17 Mar 2008 20:17:10 -0000 1.3
***************
*** 9,33 ****
TARGET_DIR=$(BT_BUILD_DIR)/shorewall
! SHOREWALL_DIR:=shorewall-3.4.8
! $(SHOREWALL_DIR)/.source:
! zcat $(SHOREWALL_SOURCE) | tar -xvf -
! cat $(SHOREWALL_LRP_DIFF) | patch -d $(SHOREWALL_DIR) -p1
! cat $(SHOREWALL_CONFIG_DIFF) | patch -d $(SHOREWALL_DIR) -p1
! touch $(SHOREWALL_DIR)/.source
! $(SHOREWALL_DIR)/.build: $(SHOREWALL_DIR)/.source
chmod 755 ./stripscript.pl
#errata
# cp compiler $(SHOREWALL_DIR)
! ./stripscript.pl $(SHOREWALL_DIR)/firewall
! ./stripscript.pl $(SHOREWALL_DIR)/compiler
! # ./stripscript.pl $(SHOREWALL_DIR)/functions
! ./stripscript.pl $(SHOREWALL_DIR)/shorewall
! ./stripscript.pl $(SHOREWALL_DIR)/lib.*
! cp $(SHOREWALL_DIR)/init.debian.sh $(SHOREWALL_DIR)/init.sh
mkdir -p $(TARGET_DIR)
! (cd $(SHOREWALL_DIR); env PREFIX=$(TARGET_DIR) ./install.sh)
chmod 755 $(TARGET_DIR)/usr/share/shorewall/firewall
mkdir -p $(TARGET_DIR)/etc/default
--- 9,39 ----
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:
! zcat $(SHOREWALL_COMMON_SOURCE) | tar -xvf -
! zcat $(SHOREWALL_SHELL_SOURCE) | tar -xvf -
! cat $(SHOREWALL_LRP_DIFF) | patch -d $(SHOREWALL_C_DIR) -p1
! cat $(SHOREWALL_CONFIG_DIFF) | patch -d $(SHOREWALL_C_DIR) -p1
! touch $(SHOREWALL_C_DIR)/.source
! $(SHOREWALL_C_DIR)/.build: $(SHOREWALL_C_DIR)/.source
chmod 755 ./stripscript.pl
#errata
# cp compiler $(SHOREWALL_DIR)
! ./stripscript.pl $(SHOREWALL_C_DIR)/firewall
! ./stripscript.pl $(SHOREWALL_C_DIR)/shorewall
! ./stripscript.pl $(SHOREWALL_C_DIR)/lib.*
! ./stripscript.pl $(SHOREWALL_SH_DIR)/compiler
! ./stripscript.pl $(SHOREWALL_SH_DIR)/lib.*
!
!
! cp $(SHOREWALL_C_DIR)/init.debian.sh $(SHOREWALL_C_DIR)/init.sh
mkdir -p $(TARGET_DIR)
! (cd $(SHOREWALL_C_DIR); env PREFIX=$(TARGET_DIR) ./install.sh)
! (cd $(SHOREWALL_SH_DIR); env PREFIX=$(TARGET_DIR) ./install.sh)
!
chmod 755 $(TARGET_DIR)/usr/share/shorewall/firewall
mkdir -p $(TARGET_DIR)/etc/default
***************
*** 39,52 ****
rm -rf $(TARGET_DIR)/etc/shorewall/Documentation
rm -rf $(TARGET_DIR)/usr/share/shorewall/xmodules
! touch $(SHOREWALL_DIR)/.build
! source: $(SHOREWALL_DIR)/.source
! build: $(SHOREWALL_DIR)/.build
! cp -af $(TARGET_DIR)/* $(BT_STAGING_DIR)
clean: stageclean
rm -rf $(TARGET_DIR)
! rm -f $(SHOREWALL_DIR)/.build
stageclean:
--- 45,59 ----
rm -rf $(TARGET_DIR)/etc/shorewall/Documentation
rm -rf $(TARGET_DIR)/usr/share/shorewall/xmodules
! touch $(SHOREWALL_C_DIR)/.build
! source: $(SHOREWALL_C_DIR)/.source
! build: $(SHOREWALL_C_DIR)/.build
! cp -afv $(TARGET_DIR)/* $(BT_STAGING_DIR)
! # cp -afv $(TARGET_DIR)-shell/* $(BT_STAGING_DIR)
clean: stageclean
rm -rf $(TARGET_DIR)
! rm -f $(SHOREWALL_C_DIR)/.build
stageclean:
***************
*** 60,62 ****
srcclean: clean
! rm -rf $(SHOREWALL_DIR)
--- 67,70 ----
srcclean: clean
! rm -rf $(SHOREWALL_C_DIR)
! rm -rf $(SHOREWALL_SH_DIR)
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/The_UnNamed_One/apps/shorewall/buildtool.cfg,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** buildtool.cfg 2 Mar 2008 19:26:20 -0000 1.2
--- buildtool.cfg 17 Mar 2008 20:17:10 -0000 1.3
***************
*** 5,12 ****
</Server>
! <File shorewall-3.4.8.tgz>
Server = shorewall-net
! Directory = 3.4/shorewall-3.4.8
! Envname = SHOREWALL_SOURCE
</File>
--- 5,18 ----
</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>
***************
*** 78,82 ****
</File>
! # This patch provides generic changes to run under Bering uClibc
<File shorewall-lrp.diff>
Server = cvs-sourceforge
--- 84,88 ----
</File>
! This patch provides generic changes to run under Bering uClibc
<File shorewall-lrp.diff>
Server = cvs-sourceforge
***************
*** 86,90 ****
</File>
! # This patch provides the Bering-uClibc specific configuration defaults
<File shorewall-config.diff>
Server = cvs-sourceforge
--- 92,96 ----
</File>
! This patch provides the Bering-uClibc specific configuration defaults
<File shorewall-config.diff>
Server = cvs-sourceforge
***************
*** 112,116 ****
<shorwall-basic>
packagename=shorwall
! Version 3.4.8
Revision = 1
--- 118,122 ----
<shorwall-basic>
packagename=shorwall
! Version 4.0.9
Revision = 1
***************
*** 138,142 ****
</shorwall-basic>
<shorwall-maclist>
! Version 3.4.8
Revision = 1
--- 144,148 ----
</shorwall-basic>
<shorwall-maclist>
! Version 4.0.9
Revision = 1
***************
*** 164,168 ****
<shorwall-accounting>
! Version 3.4.8
Revision = 1
--- 170,174 ----
<shorwall-accounting>
! Version 4.0.9
Revision = 1
***************
*** 190,194 ****
<shorwall-providers>
! Version 3.4.8
Revision = 1
--- 196,200 ----
<shorwall-providers>
! Version 4.0.9
Revision = 1
***************
*** 215,219 ****
</shorwall-providers>
<shorwall-dynamiczones>
! Version 3.4.8
Revision = 1
--- 221,225 ----
</shorwall-providers>
<shorwall-dynamiczones>
! Version 4.0.9
Revision = 1
***************
*** 240,244 ****
</shorwall-dynamiczones>
<shorwall-proxyarp>
! Version 3.4.8
Revision = 1
--- 246,250 ----
</shorwall-dynamiczones>
<shorwall-proxyarp>
! Version 4.0.9
Revision = 1
***************
*** 265,269 ****
</shorwall-proxyarp>
<shorwall-tunnels>
! Version 3.4.8
Revision = 1
--- 271,275 ----
</shorwall-proxyarp>
<shorwall-tunnels>
! Version 4.0.9
Revision = 1
***************
*** 290,294 ****
</shorwall-tunnels>
<shorwall-tcrules>
! Version 3.4.8
Revision = 1
--- 296,300 ----
</shorwall-tunnels>
<shorwall-tcrules>
! Version 4.0.9
Revision = 1
***************
*** 315,319 ****
</shorwall-tcrules>
<shorwall-tc>
! Version 3.4.8
Revision = 1
--- 321,325 ----
</shorwall-tcrules>
<shorwall-tc>
! Version 4.0.9
Revision = 1
***************
*** 342,346 ****
<shorwall>
packagename=shorwall
! Version 3.4.8
Revision = 1
--- 348,352 ----
<shorwall>
packagename=shorwall
! Version 4.0.9
Revision = 1
-------------------------------------------------------------------------
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
