From 169d7016b846af8dfc080b4e571e89d00a06a33d Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Tue, 4 May 2004 18:42:34 +0000
Subject: [PATCH] Apply patches from Stefan Engel and Alex Wilms

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1308 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 STABLE2/changelog.txt    | 6 +++++-
 STABLE2/firewall         | 2 +-
 STABLE2/install.sh       | 2 +-
 STABLE2/releasenotes.txt | 6 ++++++
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/STABLE2/changelog.txt b/STABLE2/changelog.txt
index 7c1d31154..d2bce5a48 100644
--- a/STABLE2/changelog.txt
+++ b/STABLE2/changelog.txt
@@ -45,4 +45,8 @@ Changes since 2.0.0
 
 22) Fix module loading on Mandrake.
 
-23) Eliminate confusing IPV6 warnings.
\ No newline at end of file
+23) Eliminate confusing IPV6 warnings.
+
+24) Apply Stefan Engel's fix for "shorewall delete"
+
+25) Apply the install.sh fix from Alex Wilms
\ No newline at end of file
diff --git a/STABLE2/firewall b/STABLE2/firewall
index 19b41232b..07f8b4e54 100755
--- a/STABLE2/firewall
+++ b/STABLE2/firewall
@@ -5655,7 +5655,7 @@ delete_from_zone() # $1 = <interface>[:<hosts>] $2 = zone
 		    hosts=${h#*:}
 
 		    if [ "$iface" != "$interface" -o "$hosts" != "$host" ]; then
-			qt iptables -D $source_chain -s $host -o $iface $(match_source_hosts $hosts) -j $chain
+			qt iptables -D $source_chain -s $host -o $iface $(match_dest_hosts $hosts) -j $chain
 		    fi
 		done
 	    fi
diff --git a/STABLE2/install.sh b/STABLE2/install.sh
index 69d82b463..5964ba191 100755
--- a/STABLE2/install.sh
+++ b/STABLE2/install.sh
@@ -525,7 +525,7 @@ if [ -z "$PREFIX" -a -n "$first_install" ]; then
 	echo "Set startup=1 in /etc/default/shorewall to enable"
     else
 	if [ -x /sbin/insserv -o -x /usr/sbin/insserv ]; then
-	    if insserv /etc/init.d/shorewalls ; then
+	    if insserv /etc/init.d/shorewall ; then
 		echo
 		echo "shorewall will start automatically at boot"
 		echo "Remove /etc/shorewall/startup_disabled in /etc/default/shorewall to enable"
diff --git a/STABLE2/releasenotes.txt b/STABLE2/releasenotes.txt
index 573b07605..e65c7a185 100644
--- a/STABLE2/releasenotes.txt
+++ b/STABLE2/releasenotes.txt
@@ -24,6 +24,12 @@ Problems Corrected since 2.0.0
 7) Modules listed in /etc/shorewall/modules don't load on Mandrake
    10.0 final.
 
+8) "shorewall delete" now correctly deletes dynamic rules from
+   the ruleset. Thanks to Stefan Engel for this fix.
+
+9) The install.sh script now works correctly on SuSE. Thanks to Alex
+   Wilms for this correction.
+
 -----------------------------------------------------------------------
 Issues when migrating from Shorewall 2.0.0 to Shorewall 2.0.1: