From 6ce4d51fff102101a7b6dbc91b4ef859f671bc60 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Wed, 31 Mar 2004 20:40:49 +0000
Subject: [PATCH] Shorewall-2.0.1-rc3

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1235 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall2/changelog.txt    | 5 ++++-
 Shorewall2/fallback.sh      | 2 +-
 Shorewall2/firewall         | 4 ++--
 Shorewall2/install.sh       | 2 +-
 Shorewall2/releasenotes.txt | 2 +-
 Shorewall2/shorewall.spec   | 4 +++-
 Shorewall2/uninstall.sh     | 2 +-
 7 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Shorewall2/changelog.txt b/Shorewall2/changelog.txt
index c098b803a..212c26cf2 100644
--- a/Shorewall2/changelog.txt
+++ b/Shorewall2/changelog.txt
@@ -26,4 +26,7 @@ Changes since 2.0.0
 
 13) Replace good code with crap to satisfy 'ash'.
 
-14) Fix if_match to only do wild-card matches on patterns ending in "+".
+14) Fix if_match to only do wild-card matches on patterns ending in
+    "+".
+
+15) Tighten edits on bridge port names.
diff --git a/Shorewall2/fallback.sh b/Shorewall2/fallback.sh
index e46df31a3..74f714967 100755
--- a/Shorewall2/fallback.sh
+++ b/Shorewall2/fallback.sh
@@ -28,7 +28,7 @@
 #       shown below. Simply run this script to revert to your prior version of
 #       Shoreline Firewall.
 
-VERSION=2.0.1-RC2
+VERSION=2.0.1-RC3
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall2/firewall b/Shorewall2/firewall
index a07108dd1..e75f5ac96 100755
--- a/Shorewall2/firewall
+++ b/Shorewall2/firewall
@@ -744,7 +744,7 @@ validate_hosts_file() {
 
 	    [ -n "$BRIDGING" ] && case $host in
 		*:*)
-		    list_search ${host%:*} $all_interfaces && \
+		    known_interface ${host%:*} && \
 			startup_error "Bridged interfaces may not be defined in /etc/shorewall/interfaces: $host"
 		    port=${host%%:*}
 		    list_search $port $ports || ports="$ports $port"
@@ -752,7 +752,7 @@ validate_hosts_file() {
 		*.*.*.*)
 		    ;;
 		*)
-		    list_search $host $all_interfaces && \
+		    known_interface $host && \
 			startup_error "Bridged interfaces may not be defined in /etc/shorewall/interfaces: $host"
 		    list_search $host $ports || ports="$ports $host"
 		    ;;
diff --git a/Shorewall2/install.sh b/Shorewall2/install.sh
index b07a1f3b7..c99d93170 100755
--- a/Shorewall2/install.sh
+++ b/Shorewall2/install.sh
@@ -22,7 +22,7 @@
 #       Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
 #
 
-VERSION=2.0.1-RC2
+VERSION=2.0.1-RC3
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall2/releasenotes.txt b/Shorewall2/releasenotes.txt
index d428c06d0..07948621d 100755
--- a/Shorewall2/releasenotes.txt
+++ b/Shorewall2/releasenotes.txt
@@ -1,4 +1,4 @@
-Shorewall 2.0.1-RC2
+Shorewall 2.0.1-RC3
 
 ----------------------------------------------------------------------
 Problems Corrected since 2.0.0
diff --git a/Shorewall2/shorewall.spec b/Shorewall2/shorewall.spec
index c7da83b28..84c3f659d 100644
--- a/Shorewall2/shorewall.spec
+++ b/Shorewall2/shorewall.spec
@@ -1,6 +1,6 @@
 %define name shorewall
 %define version 2.0.1
-%define release 0RC2
+%define release 0RC3
 %define prefix /usr
 
 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems.
@@ -139,6 +139,8 @@ fi
 %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel
 
 %changelog
+* Sun Mar 28 2004 Tom Eastep tom@shorewall.net
+- Updated for 2.0.1 RC3
 * Thu Mar 25 2004 Tom Eastep tom@shorewall.net
 - Updated for 2.0.1 RC2
 * Wed Mar 24 2004 Tom Eastep tom@shorewall.net
diff --git a/Shorewall2/uninstall.sh b/Shorewall2/uninstall.sh
index 2cb586b90..43b933347 100755
--- a/Shorewall2/uninstall.sh
+++ b/Shorewall2/uninstall.sh
@@ -26,7 +26,7 @@
 #       You may only use this script to uninstall the version
 #       shown below. Simply run this script to remove Seattle Firewall
 
-VERSION=2.0.1-RC2
+VERSION=2.0.1-RC3
 
 usage() # $1 = exit status
 {