From 6e9fc125172eb04b51c48f941ed1fc38f06d2eb7 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Fri, 1 Oct 2010 09:31:11 -0700
Subject: [PATCH] Update version to Beta 4
Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
Shorewall-init/install.sh | 2 +-
Shorewall-init/shorewall-init.spec | 4 +++-
Shorewall-init/uninstall.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/install.sh | 2 +-
Shorewall/shorewall.spec | 4 +++-
Shorewall/uninstall.sh | 2 +-
Shorewall6-lite/install.sh | 2 +-
Shorewall6-lite/shorewall6-lite.spec | 4 +++-
Shorewall6-lite/uninstall.sh | 2 +-
Shorewall6/install.sh | 4 ++--
Shorewall6/shorewall6.spec | 4 +++-
Shorewall6/uninstall.sh | 2 +-
16 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/Shorewall-init/install.sh b/Shorewall-init/install.sh
index 9f12b5031..d89231dc4 100755
--- a/Shorewall-init/install.sh
+++ b/Shorewall-init/install.sh
@@ -23,7 +23,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
-VERSION=4.4.14-Beta3
+VERSION=4.4.14-Beta4
usage() # $1 = exit status
{
diff --git a/Shorewall-init/shorewall-init.spec b/Shorewall-init/shorewall-init.spec
index ff404813a..03dcec33f 100644
--- a/Shorewall-init/shorewall-init.spec
+++ b/Shorewall-init/shorewall-init.spec
@@ -1,6 +1,6 @@
%define name shorewall-init
%define version 4.4.14
-%define release 0Beta3
+%define release 0Beta4
Summary: Shorewall-init adds functionality to Shoreline Firewall (Shorewall).
Name: %{name}
@@ -99,6 +99,8 @@ fi
%doc COPYING changelog.txt releasenotes.txt
%changelog
+* Fri Oct 01 2010 Tom Eastep tom@shorewall.net
+- Updated to 4.4.14-0Beta4
* Sun Sep 26 2010 Tom Eastep tom@shorewall.net
- Updated to 4.4.14-0Beta3
* Thu Sep 23 2010 Tom Eastep tom@shorewall.net
diff --git a/Shorewall-init/uninstall.sh b/Shorewall-init/uninstall.sh
index dd941d9b3..6a95ddf00 100755
--- a/Shorewall-init/uninstall.sh
+++ b/Shorewall-init/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.4.14-Beta3
+VERSION=4.4.14-Beta4
usage() # $1 = exit status
{
diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh
index ee6cb070f..eecc46e8a 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.4.14-Beta3
+VERSION=4.4.14-Beta4
usage() # $1 = exit status
{
diff --git a/Shorewall-lite/shorewall-lite.spec b/Shorewall-lite/shorewall-lite.spec
index b28c0d382..fc126c95f 100644
--- a/Shorewall-lite/shorewall-lite.spec
+++ b/Shorewall-lite/shorewall-lite.spec
@@ -1,6 +1,6 @@
%define name shorewall-lite
%define version 4.4.14
-%define release 0Beta3
+%define release 0Beta4
Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems.
Name: %{name}
@@ -102,6 +102,8 @@ fi
%doc COPYING changelog.txt releasenotes.txt
%changelog
+* Fri Oct 01 2010 Tom Eastep tom@shorewall.net
+- Updated to 4.4.14-0Beta4
* Sun Sep 26 2010 Tom Eastep tom@shorewall.net
- Updated to 4.4.14-0Beta3
* Thu Sep 23 2010 Tom Eastep tom@shorewall.net
diff --git a/Shorewall-lite/uninstall.sh b/Shorewall-lite/uninstall.sh
index c558ea8d9..33222649f 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.4.14-Beta3
+VERSION=4.4.14-Beta4
usage() # $1 = exit status
{
diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm
index f15f3b4df..c030e0979 100644
--- a/Shorewall/Perl/Shorewall/Config.pm
+++ b/Shorewall/Perl/Shorewall/Config.pm
@@ -347,7 +347,7 @@ sub initialize( $ ) {
EXPORT => 0,
STATEMATCH => '-m state --state',
UNTRACKED => 0,
- VERSION => "4.4.14-Beta3",
+ VERSION => "4.4.14-Beta4",
CAPVERSION => 40413 ,
);
diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index 58839e764..8e2e4c6a0 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.4.14-Beta3
+VERSION=4.4.14-Beta4
usage() # $1 = exit status
{
diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec
index 950ac2c05..0c93d4641 100644
--- a/Shorewall/shorewall.spec
+++ b/Shorewall/shorewall.spec
@@ -1,6 +1,6 @@
%define name shorewall
%define version 4.4.14
-%define release 0Beta3
+%define release 0Beta4
Summary: Shoreline Firewall is an iptables-based firewall for Linux systems.
Name: %{name}
@@ -108,6 +108,8 @@ fi
%doc COPYING INSTALL changelog.txt releasenotes.txt Contrib/* Samples
%changelog
+* Fri Oct 01 2010 Tom Eastep tom@shorewall.net
+- Updated to 4.4.14-0Beta4
* Sun Sep 26 2010 Tom Eastep tom@shorewall.net
- Updated to 4.4.14-0Beta3
* Thu Sep 23 2010 Tom Eastep tom@shorewall.net
diff --git a/Shorewall/uninstall.sh b/Shorewall/uninstall.sh
index 9258a8016..8d82e657b 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.4.14-Beta3
+VERSION=4.4.14-Beta4
usage() # $1 = exit status
{
diff --git a/Shorewall6-lite/install.sh b/Shorewall6-lite/install.sh
index e953a4699..e5efeb84d 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.4.14-Beta3
+VERSION=4.4.14-Beta4
usage() # $1 = exit status
{
diff --git a/Shorewall6-lite/shorewall6-lite.spec b/Shorewall6-lite/shorewall6-lite.spec
index e3bd4a105..098b502c4 100644
--- a/Shorewall6-lite/shorewall6-lite.spec
+++ b/Shorewall6-lite/shorewall6-lite.spec
@@ -1,6 +1,6 @@
%define name shorewall6-lite
%define version 4.4.14
-%define release 0Beta3
+%define release 0Beta4
Summary: Shoreline Firewall 6 Lite is an ip6tables-based firewall for Linux systems.
Name: %{name}
@@ -93,6 +93,8 @@ fi
%doc COPYING changelog.txt releasenotes.txt
%changelog
+* Fri Oct 01 2010 Tom Eastep tom@shorewall.net
+- Updated to 4.4.14-0Beta4
* Sun Sep 26 2010 Tom Eastep tom@shorewall.net
- Updated to 4.4.14-0Beta3
* Thu Sep 23 2010 Tom Eastep tom@shorewall.net
diff --git a/Shorewall6-lite/uninstall.sh b/Shorewall6-lite/uninstall.sh
index c88226abf..a5646d7af 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.4.14-Beta3
+VERSION=4.4.14-Beta4
usage() # $1 = exit status
{
diff --git a/Shorewall6/install.sh b/Shorewall6/install.sh
index fd636f03b..8b775edef 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.4.14-Beta3
+VERSION=4.4.14-Beta4
usage() # $1 = exit status
{
@@ -249,7 +249,7 @@ fi
[ -n "$INIT" ] && echo "Shorewall6 script installed in ${DESTDIR}${DEST}/$INIT"
#
-# Create /etc/shorewall, /usr/share/shorewall and /var/shorewall if needed
+# Create /etc/shorewall, /usr/share/shorewall and /var/lib/shorewall6 if needed
#
mkdir -p ${DESTDIR}/etc/shorewall6
mkdir -p ${DESTDIR}/usr/share/shorewall6
diff --git a/Shorewall6/shorewall6.spec b/Shorewall6/shorewall6.spec
index 6fcb9deee..d4ef52a76 100644
--- a/Shorewall6/shorewall6.spec
+++ b/Shorewall6/shorewall6.spec
@@ -1,6 +1,6 @@
%define name shorewall6
%define version 4.4.14
-%define release 0Beta3
+%define release 0Beta4
Summary: Shoreline Firewall 6 is an ip6tables-based firewall for Linux systems.
Name: %{name}
@@ -98,6 +98,8 @@ fi
%doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn ipv6 Samples6
%changelog
+* Fri Oct 01 2010 Tom Eastep tom@shorewall.net
+- Updated to 4.4.14-0Beta4
* Sun Sep 26 2010 Tom Eastep tom@shorewall.net
- Updated to 4.4.14-0Beta3
* Thu Sep 23 2010 Tom Eastep tom@shorewall.net
diff --git a/Shorewall6/uninstall.sh b/Shorewall6/uninstall.sh
index f0319c1c7..a9a612ac9 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.4.14-Beta3
+VERSION=4.4.14-Beta4
usage() # $1 = exit status
{