Update for 3.1.2

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

Shorewall/fallback.sh

@@ -28,7 +28,7 @@
 #       shown below. Simply run this script to revert to your prior version of
 #       Shoreline Firewall.
 
-VERSION=3.1.1
+VERSION=3.1.2
 usage() # $1 = exit status
 {
     echo "usage: $(basename $0)"

Shorewall/firewall

@@ -4,7 +4,7 @@
 #
 #     This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
 #
-#     (c) 1999,2000,2001,2002,2003,2004,2005 - Tom Eastep (teastep@shorewall.net)
+#     (c) 1999,2000,2001,2002,2003,2004,2005,2006 - Tom Eastep (teastep@shorewall.net)
 #
 #     tcstart from tc4shorewall       Version 0.5
 #     (c) 2005 Arne Bernin <arne@ucbering.de>

Shorewall/install.sh

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

Shorewall/releasenotes.txt

@@ -26,10 +26,18 @@ Note to users upgrading from Shorewall 2.x or 3.0
    Please see the "Migration Considerations" below for additional upgrade
    information.
 
-Problems corrected in 3.1.0
+Changes in 3.1.2
 
-1) If /etc/shorewall/ipsets exists, it is processed during [re]start but not
+1) With the execption of 'detectnets', the restrictions on remote compilation
-   during 'shorewall restore'.
+   (compile on one system and execute on nother) have been removed. It is
+   doubtful that the 'detectnets' restriction will ever be lifted.
+
+2) The compiled script now contains the same error checking as would be done
+   during "shorewall [re]start" -- if an error occurs, a 'restore' or 'stop'
+   is done (requires that Shorewall be installed on the target system).
+
+3) The '-e' option now follows "compile" or "generate" on the command line
+   (it is specific to those commands).
 
 Migration Considerations:
 
@@ -39,7 +47,7 @@ New Features:
 
 1)  A new 'shorewall generate' command has been added.
 
-	shorewall [ -q ] [ -e ] generate [ <config directory> ] <script file>
+	shorewall generate [ -q ] [ -e ] [ <config directory> ] <script file>
 
     where:
 
@@ -62,7 +70,7 @@ New Features:
 
     'compile' is a synonym for 'generate':
 
-	shorewall [ -q ] [ -e ] compile [ <config directory> ] <script file>
+	shorewall compile [ -q ] [ -e ] [ <config directory> ] <script file>
 
     The generated script contains error checking and will terminate if an
     important command fails. Before terminating:

Shorewall/shorewall

@@ -4,7 +4,7 @@
 #
 #     This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
 #
-#     (c) 1999,2000,2001,2002,2003,2004,2005 - Tom Eastep (teastep@shorewall.net)
+#     (c) 1999,2000,2001,2002,2003,2004,2005,2006 - Tom Eastep (teastep@shorewall.net)
 #
 #	This file should be placed in /sbin/shorewall.
 #

Shorewall/shorewall.spec

@@ -1,5 +1,5 @@
 %define name shorewall
-%define version 3.1.1
+%define version 3.1.2
 %define release 1
 %define prefix /usr
 
@@ -160,6 +160,8 @@ fi
 %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn Samples
 
 %changelog
+* Sun Jan 15 2006 Tom Eastep tom@shorewall.net
+- Updated to 3.1.2-1
 * Thu Jan 12 2006 Tom Eastep tom@shorewall.net
 - Updated to 3.1.1-1
 * Sat Dec 24 2005 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.1.1
+VERSION=3.1.2
 
 usage() # $1 = exit status
 {