From 6b30b3a70994708de0439914d356faad4d3af512 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sat, 18 Feb 2006 04:11:38 +0000
Subject: [PATCH] Update for 3.1.6

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3489 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/fallback.sh      | 2 +-
 Shorewall/install.sh       | 2 +-
 Shorewall/releasenotes.txt | 7 +++----
 Shorewall/shorecap         | 2 +-
 Shorewall/shorewall.spec   | 4 +++-
 Shorewall/uninstall.sh     | 2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Shorewall/fallback.sh b/Shorewall/fallback.sh
index a3c948ed3..a1bedc11a 100755
--- a/Shorewall/fallback.sh
+++ b/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.6
+VERSION=3.1.7
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index 848e93c47..610a1cec1 100755
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -22,7 +22,7 @@
 #       Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
 #
 
-VERSION=3.1.6
+VERSION=3.1.7
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index b01aad825..024795a2a 100755
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -27,7 +27,7 @@ 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.6
+Problems Corrected in 3.1.7
 
 1)  Extra rules in maclist verification have been removed. The superfluous
     rules were present when MACLIST_DISPOSITION=ACCEPT and
@@ -40,7 +40,7 @@ Problems Corrected in 3.1.6
 3)  Log messages for "started", "restarted" and "restored" are once again
     generated.
 
-Other changes in 3.1.7
+Other changes in 3.1.6
 
 1)  'tcpsyn' has been changed to 'tcp:syn' (tcpsyn was added in 3.1.6).
     This new syntax is easier to extend in the future than was the old.
@@ -105,8 +105,7 @@ New Features:
 
 1)  A new 'shorewall compile' command has been added.
 
-     shorewall compile [ -e ] [ -d <distro> ] [ <config directory> ] <script
-file>
+     shorewall compile [ -e ] [ -d <distro> ] [ <config directory> ] <script file>
 
     where:
 
diff --git a/Shorewall/shorecap b/Shorewall/shorecap
index 4fe635742..52bf53f64 100755
--- a/Shorewall/shorecap
+++ b/Shorewall/shorecap
@@ -44,7 +44,7 @@
 #    used during firewall compilation, then the generated firewall program will likewise not
 #    require Shorewall to be installed.
 
-VERSION=3.1.6
+VERSION=3.1.7
 
 #
 # Suppress all output for a command
diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec
index 1d4b14098..d4cb87401 100644
--- a/Shorewall/shorewall.spec
+++ b/Shorewall/shorewall.spec
@@ -1,5 +1,5 @@
 %define name shorewall
-%define version 3.1.6
+%define version 3.1.7
 %define release 1
 %define prefix /usr
 
@@ -175,6 +175,8 @@ fi
 
 %changelog
 * Fri Feb 10 2006 Tom Eastep tom@shorewall.net
+- Updated to 3.1.7-1
+* Fri Feb 10 2006 Tom Eastep tom@shorewall.net
 - Added shorecap
 - Updated to 3.1.6-1
 * Fri Feb 03 2006 Tom Eastep tom@shorewall.net
diff --git a/Shorewall/uninstall.sh b/Shorewall/uninstall.sh
index e10dfeef2..18ff99eeb 100755
--- a/Shorewall/uninstall.sh
+++ b/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.6
+VERSION=3.1.7
 
 usage() # $1 = exit status
 {