From 06bffef281433be790304ac8e295c994b06a88fb Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sun, 22 Feb 2009 18:53:08 +0000
Subject: [PATCH] Update Version

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9492 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-lite/fallback.sh           | 2 +-
 Shorewall-lite/install.sh            | 2 +-
 Shorewall-lite/shorewall-lite.spec   | 4 +++-
 Shorewall-lite/uninstall.sh          | 2 +-
 Shorewall-perl/Shorewall/Config.pm   | 2 +-
 Shorewall-perl/install.sh            | 2 +-
 Shorewall-perl/shorewall-perl.spec   | 4 +++-
 Shorewall/Shorewall/Config.pm        | 2 +-
 Shorewall/install.sh                 | 2 +-
 Shorewall/shorewall.spec             | 4 +++-
 Shorewall/uninstall.sh               | 2 +-
 Shorewall6-lite/fallback.sh          | 2 +-
 Shorewall6-lite/install.sh           | 2 +-
 Shorewall6-lite/shorewall6-lite.spec | 4 +++-
 Shorewall6-lite/uninstall.sh         | 2 +-
 Shorewall6/fallback.sh               | 2 +-
 Shorewall6/install.sh                | 2 +-
 Shorewall6/shorewall6.spec           | 4 +++-
 Shorewall6/uninstall.sh              | 2 +-
 tools/build/setversion               | 5 ++++-
 20 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/Shorewall-lite/fallback.sh b/Shorewall-lite/fallback.sh
index 4d148f1c3..7fab08d73 100755
--- a/Shorewall-lite/fallback.sh
+++ b/Shorewall-lite/fallback.sh
@@ -28,7 +28,7 @@
 #       shown below. Simply run this script to revert to your prior version of
 #       Shoreline Firewall.
 
-VERSION=4.2.6
+VERSION=4.3.5
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh
index 1275c3c20..60601026d 100755
--- a/Shorewall-lite/install.sh
+++ b/Shorewall-lite/install.sh
@@ -22,7 +22,7 @@
 #       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-VERSION=4.2.6
+VERSION=4.3.5
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-lite/shorewall-lite.spec b/Shorewall-lite/shorewall-lite.spec
index 6c029b030..f711d2adb 100644
--- a/Shorewall-lite/shorewall-lite.spec
+++ b/Shorewall-lite/shorewall-lite.spec
@@ -1,5 +1,5 @@
 %define name shorewall-lite
-%define version 4.2.6
+%define version 4.3.5
 %define release 0base
 
 Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems.
@@ -98,6 +98,8 @@ fi
 %doc COPYING changelog.txt releasenotes.txt
 
 %changelog
+* Sun Feb 22 2009 Tom Eastep tom@shorewall.net
+- Updated to 4.3.5-0base
 * Wed Feb 04 2009 Tom Eastep tom@shorewall.net
 - Updated to 4.2.6-0base
 * Thu Jan 29 2009 Tom Eastep tom@shorewall.net
diff --git a/Shorewall-lite/uninstall.sh b/Shorewall-lite/uninstall.sh
index f43f8d063..1684b9f7a 100755
--- a/Shorewall-lite/uninstall.sh
+++ b/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=4.2.6
+VERSION=4.3.5
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-perl/Shorewall/Config.pm b/Shorewall-perl/Shorewall/Config.pm
index c5bef952d..5e380586b 100644
--- a/Shorewall-perl/Shorewall/Config.pm
+++ b/Shorewall-perl/Shorewall/Config.pm
@@ -317,7 +317,7 @@ sub initialize( $ ) {
 		    TC_SCRIPT => '',
 		    EXPORT => 0,
 		    UNTRACKED => 0,
-		    VERSION => "4.2.7",
+		    VERSION => "4.3.5",
 		    CAPVERSION => 40205 ,
 		  );
 
diff --git a/Shorewall-perl/install.sh b/Shorewall-perl/install.sh
index ff3c8b9c6..8a27124f8 100755
--- a/Shorewall-perl/install.sh
+++ b/Shorewall-perl/install.sh
@@ -22,7 +22,7 @@
 #       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-VERSION=4.2.7
+VERSION=4.3.5
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-perl/shorewall-perl.spec b/Shorewall-perl/shorewall-perl.spec
index 833d0ad9b..07204d671 100644
--- a/Shorewall-perl/shorewall-perl.spec
+++ b/Shorewall-perl/shorewall-perl.spec
@@ -1,5 +1,5 @@
 %define name shorewall-perl
-%define version 4.2.7
+%define version 4.3.5
 %define release 0base
 
 Summary: Shoreline Firewall Perl-based compiler.
@@ -62,6 +62,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING releasenotes.txt
 
 %changelog
+* Sun Feb 22 2009 Tom Eastep tom@shorewall.net
+- Updated to 4.3.5-0base
 * Sat Feb 21 2009 Tom Eastep tom@shorewall.net
 - Updated to 4.2.7-0base
 * Wed Feb 04 2009 Tom Eastep tom@shorewall.net
diff --git a/Shorewall/Shorewall/Config.pm b/Shorewall/Shorewall/Config.pm
index 9d0029533..32987d81f 100644
--- a/Shorewall/Shorewall/Config.pm
+++ b/Shorewall/Shorewall/Config.pm
@@ -316,7 +316,7 @@ sub initialize( $ ) {
 		    TC_SCRIPT => '',
 		    EXPORT => 0,
 		    UNTRACKED => 0,
-		    VERSION => "4.2.7",
+		    VERSION => "4.3.5",
 		    CAPVERSION => 40205 ,
 		  );
 
diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index c9540d41d..79b5d113a 100755
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -22,7 +22,7 @@
 #       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-VERSION=4.2.7
+VERSION=4.3.5
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec
index cd4aed053..25a682ce0 100644
--- a/Shorewall/shorewall.spec
+++ b/Shorewall/shorewall.spec
@@ -1,5 +1,5 @@
 %define name shorewall
-%define version 4.2.7
+%define version 4.3.5
 %define release 0base
 
 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems.
@@ -174,6 +174,8 @@ fi
 %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn Samples swping swping.init isusable
 
 %changelog
+* Sun Feb 22 2009 Tom Eastep tom@shorewall.net
+- Updated to 4.3.5-0base
 * Sat Feb 21 2009 Tom Eastep tom@shorewall.net
 - Updated to 4.2.7-0base
 * Thu Feb 05 2009 Tom Eastep tom@shorewall.net
diff --git a/Shorewall/uninstall.sh b/Shorewall/uninstall.sh
index 1649d46f5..86dbbe82d 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=4.2.7
+VERSION=4.3.5
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall6-lite/fallback.sh b/Shorewall6-lite/fallback.sh
index 4d148f1c3..7fab08d73 100755
--- a/Shorewall6-lite/fallback.sh
+++ b/Shorewall6-lite/fallback.sh
@@ -28,7 +28,7 @@
 #       shown below. Simply run this script to revert to your prior version of
 #       Shoreline Firewall.
 
-VERSION=4.2.6
+VERSION=4.3.5
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall6-lite/install.sh b/Shorewall6-lite/install.sh
index b25149d32..9079a51f4 100755
--- a/Shorewall6-lite/install.sh
+++ b/Shorewall6-lite/install.sh
@@ -22,7 +22,7 @@
 #       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-VERSION=4.2.6
+VERSION=4.3.5
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall6-lite/shorewall6-lite.spec b/Shorewall6-lite/shorewall6-lite.spec
index eeb68ac28..bfa27bc37 100644
--- a/Shorewall6-lite/shorewall6-lite.spec
+++ b/Shorewall6-lite/shorewall6-lite.spec
@@ -1,5 +1,5 @@
 %define name shorewall6-lite
-%define version 4.2.6
+%define version 4.3.5
 %define release 0base
 
 Summary: Shoreline Firewall 6 Lite is an ip6tables-based firewall for Linux systems.
@@ -89,6 +89,8 @@ fi
 %doc COPYING changelog.txt releasenotes.txt
 
 %changelog
+* Sun Feb 22 2009 Tom Eastep tom@shorewall.net
+- Updated to 4.3.5-0base
 * Wed Feb 04 2009 Tom Eastep tom@shorewall.net
 - Updated to 4.2.6-0base
 * Thu Jan 29 2009 Tom Eastep tom@shorewall.net
diff --git a/Shorewall6-lite/uninstall.sh b/Shorewall6-lite/uninstall.sh
index 8673320ff..901d3bcb4 100755
--- a/Shorewall6-lite/uninstall.sh
+++ b/Shorewall6-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=4.2.6
+VERSION=4.3.5
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall6/fallback.sh b/Shorewall6/fallback.sh
index f32b69316..325d6f0d6 100755
--- a/Shorewall6/fallback.sh
+++ b/Shorewall6/fallback.sh
@@ -28,7 +28,7 @@
 #       shown below. Simply run this script to revert to your prior version of
 #       Shoreline Firewall.
 
-VERSION=4.2.6
+VERSION=4.3.5
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall6/install.sh b/Shorewall6/install.sh
index e22a9ca1a..7f5bcef3f 100755
--- a/Shorewall6/install.sh
+++ b/Shorewall6/install.sh
@@ -22,7 +22,7 @@
 #       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
-VERSION=4.2.7
+VERSION=4.3.5
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall6/shorewall6.spec b/Shorewall6/shorewall6.spec
index 46c39044c..89a20b383 100644
--- a/Shorewall6/shorewall6.spec
+++ b/Shorewall6/shorewall6.spec
@@ -1,5 +1,5 @@
 %define name shorewall6
-%define version 4.2.7
+%define version 4.3.5
 %define release 0base
 
 Summary: Shoreline Firewall 6 is an ip6tables-based firewall for Linux systems.
@@ -144,6 +144,8 @@ fi
 %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn ipv6 Samples6
 
 %changelog
+* Sun Feb 22 2009 Tom Eastep tom@shorewall.net
+- Updated to 4.3.5-0base
 * Sat Feb 21 2009 Tom Eastep tom@shorewall.net
 - Updated to 4.2.7-0base
 * Wed Feb 05 2009 Tom Eastep tom@shorewall.net
diff --git a/Shorewall6/uninstall.sh b/Shorewall6/uninstall.sh
index 607a1fe6a..486b96029 100755
--- a/Shorewall6/uninstall.sh
+++ b/Shorewall6/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=4.2.6
+VERSION=4.3.5
 
 usage() # $1 = exit status
 {
diff --git a/tools/build/setversion b/tools/build/setversion
index 4ffd785c8..8efe34a63 100755
--- a/tools/build/setversion
+++ b/tools/build/setversion
@@ -45,7 +45,7 @@ case $VERSION in
 	;;
 esac
 
-for product in -common 6 -lite 6-lite -shell -perl; do
+for product in "" -common 6 -lite 6-lite -shell -perl; do
     dir=Shorewall${product}${SUFFIX}
 
     for file in $dir/install.sh $dir/uninstall.sh $dir/fallback.sh; do
@@ -64,3 +64,6 @@ done
 
 file=Shorewall-perl${SUFFIX}/Shorewall/Config.pm
 [ -f $file ] && eval perl -p -i -e "'s/^(\s+)VERSION => .*/\$1VERSION => \"${VERSION}\",/'" $file
+
+file=Shorewall${SUFFIX}/Shorewall/Config.pm
+[ -f $file ] && eval perl -p -i -e "'s/^(\s+)VERSION => .*/\$1VERSION => \"${VERSION}\",/'" $file