Fix 'shorewall add/delete <interface> <zone>'

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6339 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb

Shorewall-common/changelog.txt

@@ -1,5 +1,3 @@
-Changes in 3.9.8
-
 Changes in 3.9.7
 
 1)  Clean up release notes.
@@ -14,13 +12,6 @@ Changes in 3.9.7
 
 6)  Fix 'detect' in GATEWAY column of providers file.
 
-8)  Other bug fixes (see release notes).
-
-7)  Fix action in 'logreject'.
-
-8)  Allow macros to invoke macros outside of action bodies.
-
-
 Changes in 3.9.6
 
 1)  Fix parsing problems in protocol handling.

Shorewall-common/fallback.sh

@@ -28,7 +28,7 @@
 #       shown below. Simply run this script to revert to your prior version of
 #       Shoreline Firewall.
 
-VERSION=3.9.7
+VERSION=3.9.6
 
 usage() # $1 = exit status
 {

Shorewall-common/install.sh

@@ -22,7 +22,7 @@
 #       Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
 #
 
-VERSION=3.9.7
+VERSION=3.9.6
 
 usage() # $1 = exit status
 {

Shorewall-common/lib.dynamiczones

@@ -76,6 +76,7 @@ add_to_zone() # $1...${n-1} = <interface>[:<hosts>] $n = zone
     while [ $# -gt 1 ]; do
 	interface=${1%%:*}
 	host=${1#*:}
+	[ "$host" = "$1" ] && host=
         #
         # Be sure that the interface was dynamic at last [re]start
         #
@@ -258,6 +259,7 @@ delete_from_zone() # $1 = <interface>[:<hosts>] $2 = zone
     while [ $# -gt 1 ]; do
 	interface=${1%%:*}
 	host=${1#*:}
+	[ "$host" = "$1" ] && host=
         #
         # Be sure that the interface was dynamic at last [re]start
         #

Shorewall-common/releasenotes.txt

@@ -60,30 +60,6 @@ Other changes in Shorewall 3.9.7.
     in rules. DNS names are resolved and an error is issued for any
     name that cannot be resolved.
 
-2)  Shorewall-perl now checks configuration files for the presense of
-    characters that can cause problems if they are allowed into the
-    generated firewall script:
-
-    -	Double Quotes. These are prohibited except in the
-        shorewall.conf and params files.
-
-    -	Single Quotes. These are prohibited except in the
-        shorewall.conf and params files and in COMMENT lines.
-
-    -   Single back quotes. These are prohibited except in the 
-	shorewall.conf and params files.
-
-    -   Backslash. Probibited except as the last character on a line to
-        denote line continuation.
-
-3)  Macros may now invoke other macros with the restriction that such
-    macros may not be invoked within an action body.
-
-    When marcros are invoked recursively, the parameter passed to an
-    invocation are automatically propagated to lower level macros.
-
-    Macro invocations may be nested to a maximum level of 5.
-
 Migration Considerations:
 
 1)  You cannot simply upgrade your existing Shorewall package. You must

Shorewall-common/shorewall.spec

@@ -1,5 +1,5 @@
 %define name shorewall
-%define version 3.9.7
+%define version 3.9.6
 %define release 1
 %define prefix /usr
 
@@ -252,9 +252,7 @@ fi
 %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn Samples
 
 %changelog
-* Fri May 11 2007 Tom Eastep tom@shorewall.net
+* Mon May 05 2007 Tom Eastep tom@shorewall.net
-- Updated to 3.9.7-1
-* Sat May 05 2007 Tom Eastep tom@shorewall.net
 - Updated to 3.9.6-1
 * Mon Apr 30 2007 Tom Eastep tom@shorewall.net
 - Updated to 3.9.5-1

Shorewall-common/uninstall.sh

@@ -26,7 +26,7 @@
 #       You may only use this script to uninstall the version
 #       shown below. Simply run this script to remove Shorewall Firewall
 
-VERSION=3.9.7
+VERSION=3.9.6
 
 usage() # $1 = exit status
 {

Shorewall-lite/fallback.sh

@@ -28,7 +28,7 @@
 #       shown below. Simply run this script to revert to your prior version of
 #       Shoreline Firewall.
 
-VERSION=3.9.7
+VERSION=3.9.6
 
 usage() # $1 = exit status
 {

Shorewall-lite/install.sh

@@ -22,7 +22,7 @@
 #       Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
 #
 
-VERSION=3.9.7
+VERSION=3.9.6
 
 usage() # $1 = exit status
 {

Shorewall-lite/shorewall-lite.spec

@@ -1,5 +1,5 @@
 %define name shorewall-lite
-%define version 3.9.7
+%define version 3.9.6
 %define release 1
 %define prefix /usr
 
@@ -99,9 +99,7 @@ fi
 %doc COPYING changelog.txt releasenotes.txt
 
 %changelog
-* Fri May 11 2007 Tom Eastep tom@shorewall.net
+* Mon May 05 2007 Tom Eastep tom@shorewall.net
-- Updated to 3.9.7-1
-* Sat May 05 2007 Tom Eastep tom@shorewall.net
 - Updated to 3.9.6-1
 * Mon Apr 30 2007 Tom Eastep tom@shorewall.net
 - Updated to 3.9.5-1

Shorewall-lite/uninstall.sh

@@ -26,7 +26,7 @@
 #       You may only use this script to uninstall the version
 #       shown below. Simply run this script to remove Shorewall Firewall
 
-VERSION=3.9.7
+VERSION=3.9.6
 
 usage() # $1 = exit status
 {

Shorewall-shell/install.sh

@@ -22,7 +22,7 @@
 #       Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
 #
 
-VERSION=3.9.7
+VERSION=3.9.6
 
 usage() # $1 = exit status
 {

Shorewall-shell/shorewall-shell.spec

@@ -1,5 +1,5 @@
 %define name shorewall-shell
-%define version 3.9.7
+%define version 3.9.6
 %define release 1
 %define prefix /usr
 
@@ -63,9 +63,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING INSTALL 
 
 %changelog
-* Fri May 11 2007 Tom Eastep tom@shorewall.net
+* Mon May 05 2007 Tom Eastep tom@shorewall.net
-- Updated to 3.9.6-1
-* Sat May 05 2007 Tom Eastep tom@shorewall.net
 - Updated to 3.9.6-1
 * Mon Apr 30 2007 Tom Eastep tom@shorewall.net
 - Updated to 3.9.5-1

web/shorewall_index.htm

@@ -21,7 +21,7 @@ Sections, with no Front-Cover, and with no Back-Cover Texts. A copy of the
 license is included in the section entitled “<a href="GnuCopyright.htm"
 target="_self">GNU Free Documentation License</a>”.</p>
 
-<p>2007-04-30</p>
+<p>2007-05-05</p>
 <hr style="width: 100%; height: 2px;">
 
 <h2>Table of Contents</h2>
@@ -133,15 +133,15 @@ is 3.2.10<br>
     href="http://www1.shorewall.net/pub/shorewall/3.2/shorewall-3.2.10/errata/">updates</a>.</li>
 </ul>
 The <span style="font-weight: bold;">current Development Release</span> is
-3.9.5<br>
+3.9.6<br>
 
 <ul>
   <li>Here are the <a
-    href="http://www1.shorewall.net/pub/shorewall/development/3.9/shorewall-3.9.5/releasenotes.txt">release
+    href="http://www1.shorewall.net/pub/shorewall/development/3.9/shorewall-3.9.6/releasenotes.txt">release
     notes</a> <br>
   </li>
   <li>Here are the <a
-    href="http://www1.shorewall.net/pub/shorewall/development/3.9/shorewall-3.9.5/known_problems.txt">known
+    href="http://www1.shorewall.net/pub/shorewall/development/3.9/shorewall-3.9.6/known_problems.txt">known
     problems</a>.</li>
 </ul>