Update version to 3.3.1; fix USE_ACTIONS=No with DROP/REJECT_DEFAULT

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

Shorewall-lite/changelog.txt

@@ -1,3 +1,7 @@
+Changes in 3.3.1
+
+1)  Update Versions.
+
 Changes in 3.3.0
 
 1)  Fix output of 'hits' command under busybox 1.2.0.

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.3.0
+VERSION=3.3.1
 
 usage() # $1 = exit status
 {

Shorewall-lite/install.sh

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

Shorewall-lite/releasenotes.txt

@@ -1,16 +1,8 @@
-Shorewall Lite 3.3.0
+Shorewall Lite 3.3.1
 
 Problems Corrected in 3.3.0
 
-1) The output formatting of the 'hits' command under BusyBox 1.2.0 has
+None.
-   been corrected.
-
-2) The output of the 'hits' command was previously scrambled if
-   /etc/services contained spaces as column delimiters rather than
-   tabs.
-
-3) The /etc/shorewall/xmodules file was the same as the
-   /etc/shorewall/modules file.
 
 Other changes in 3.3.0
 

Shorewall-lite/shorewall-lite.spec

@@ -1,5 +1,5 @@
 %define name shorewall-lite
-%define version 3.3.0
+%define version 3.3.1
 %define release 1
 %define prefix /usr
 
@@ -84,24 +84,11 @@ fi
 %doc COPYING changelog.txt releasenotes.txt
 
 %changelog
+* Wed Aug 30 2006 Tom Eastep tom@shorewall.net
+- Updated to 3.3.1-1
+* Wed Aug 09 2006 Tom Eastep tom@shorewall.net
+- Updated to 3.3.0-1
 * Wed Aug 09 2006 Tom Eastep tom@shorewall.net
 - Updated to 3.3.0-1
-* Sat Jul 08 2006 Tom Eastep tom@shorewall.net
-- Updated to 3.2.0-1
-* Thu Jun 29 2006 Tom Eastep tom@shorewall.net
-- Updated to 3.2.0-0RC6
-* Mon Jun 19 2006 Tom Eastep tom@shorewall.net
-- Version 3.2.0-RC5
-* Sun Jun 18 2006 Tom Eastep tom@shorewall.net
-- Version 3.2.0-RC4
-* Mon Jun 12 2006 Tom Eastep tom@shorewall.net
-- Change control program to /sbin/shorewall-lite
-- Version 3.2.0-RC3
-* Fri Jun 09 2006 Tom Eastep tom@shorewall.net
-- Install Shorewall-lite in its own directories
-* Wed Jun 07 2006 Tom Eastep tom@shorewall.net
-- Version 3.2.0-RC2
-* Tue Apr 18 2006 Tom Eastep tom@shorewall.net
-- Initial Version
 
 

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.3.0
+VERSION=3.3.1
 
 usage() # $1 = exit status
 {

Shorewall/compiler

@@ -445,8 +445,11 @@ validate_policy()
 		;;
 	    *)
 		if ! list_search $default USEDACTIONS; then
-		    if [ ! -f $(find_file macro.$default) ]; then
+		    if ! list_search $default $DEFAULT_MACROS; then
-			fatal_error "Default Action/Macro $var=$default not found"
+			if [ ! -f $(find_file macro.$default) ]; then
+			    fatal_error "Default Action/Macro $var=$default not found"
+			fi
+			DEFAULT_MACROS="$DEFAULT_MACROS $default"
 		    fi
 		fi
 	esac

Shorewall/fallback.sh

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

Shorewall/install.sh

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

Shorewall/shorewall.spec

@@ -1,5 +1,5 @@
 %define name shorewall
-%define version 3.3.0
+%define version 3.3.1
 %define release 1
 %define prefix /usr
 
@@ -218,6 +218,8 @@ fi
 %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn Samples
 
 %changelog
+* Wed Aug 30 2006 Tom Eastep tom@shorewall.net
+- Updated to 3.3.1-1
 * Sun Aug 27 2006 Tom Eastep tom@shorewall.net
 - Updated to 3.3.0-1
 * Fri Aug 25 2006 Tom Eastep tom@shorewall.net

Shorewall/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.3.0
+VERSION=3.3.1
 
 usage() # $1 = exit status
 {

web/shorewall_index.htm

@@ -18,8 +18,14 @@ notes</a> and here are the <a
  href="http://www.shorewall.net/pub/shorewall/3.2/shorewall-3.2.3/known_problems.txt">known
 problems</a> and <a
  href="http://www.shorewall.net/pub/shorewall/3.2/shorewall-3.2.3/errata/">updates</a>.</p>
-<p>The current Development Version is 3.3.0 -- No releases of that
+<p>The current Development Version is 3.3.0 -- Get it from the
-version are available yet.<span style="text-decoration: underline;"></span><br>
+<a href="download.htm">download sites</a>. Here are the <a
+ href="http://www1.shorewall.net/pub/shorewall/development/3.3/shorewall-3.3.0/releasenotes.txt">release
+notes</a> and here are the <a
+ href="http://www.shorewall.net/pub/shorewall/development/3.3/shorewall-3.3.0/known_problems.txt">known
+problems</a> and <a
+ href="http://www.shorewall.net/pub/shorewall/development/3.3/shorewall-3.3.0/errata/">updates</a>.<span
+ style="text-decoration: underline;"></span><br>
 <br>
 Copyright
 © 2001-2006 Thomas M. Eastep</p>
@@ -30,7 +36,7 @@ Foundation; with no Invariant 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>2006-08-26</p>
+<p>2006-08-28</p>
 <hr>
 <h3>Table of Contents</h3>
 <p style="margin-left: 0.42in; margin-bottom: 0in;"><a href="#Intro">Introduction