Hi Simon, Simon Matter wrote:
> > The patch-3.4.0-RC1-1.diff doesn't apply without errors for me and diffing > the two compiler files shows something different. Is this the wrong patch > for 3.4.0-RC1? Ouch. When I tagged 3.4.0 RC1, I did so on a system that didn't have a current copy of the main branch. As a consequence, the patch that I generated was against the wrong version of the code. I've attached the correct patch and have posted it to www1.shorewall.net. Sorry for the inconvenience. -Tom -- Tom Eastep \ Nothing is foolproof to a sufficiently talented fool Shoreline, \ http://shorewall.net Washington USA \ [EMAIL PROTECTED] PGP Public Key \ https://lists.shorewall.net/teastep.pgp.key
--- /home/teastep/shorewall-3.4.0-RC1/compiler 2007-01-31 12:52:20.000000000 -0800
+++ compiler 2007-02-03 17:00:15.000000000 -0800
@@ -121,16 +121,6 @@
fi
}
-#
-# Echo the contents of the passed file indented by $INDENT and perform INCLUDE processing.
-#
-indent2() {
- if [ -n "$INDENT" ]; then
- read_file $1 0 | eval sed \'s\/^/"$INDENT"\/\'
- else
- read_file $1 0
- fi
-}
#
# Append a file to the compiler's output with indentation.
@@ -156,20 +146,6 @@
}
#
-# Append a file to the compiler's output with indentation and INCLUDE expansion.
-#
-append_file1() # $1 = File Name
-{
- local user_exit=$(find_file $1)
-
- if [ -f $user_exit ]; then
- save_progress_message "Processing $user_exit ..."
- indent2 $user_exit >&3
- save_command
- fi
-}
-
-#
# Generate a command to run iptables
#
do_iptables() {
@@ -5115,8 +5091,6 @@
__EOF__
fi
- append_file1 params
-
cat >&3 << __EOF__
STOPPING=
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier. Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________ Shorewall-users mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/shorewall-users
