From 86f4d3bad6fbf9e589a1b6ca8b539f7ec0e7d78e Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sun, 3 Apr 2011 10:28:20 -0700 Subject: [PATCH] Revert "Set version RC1" This reverts commit ae9558c7c6e43993d9f35f62510b680749c6e5e2. --- 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/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 | 2 +- Shorewall6/shorewall6.spec | 4 +--- Shorewall6/uninstall.sh | 2 +- 15 files changed, 15 insertions(+), 25 deletions(-) diff --git a/Shorewall-init/install.sh b/Shorewall-init/install.sh index 2926e0a20..7aecf945a 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.19-RC1 +VERSION=4.4.19-Beta4 usage() # $1 = exit status { diff --git a/Shorewall-init/shorewall-init.spec b/Shorewall-init/shorewall-init.spec index e06167bc8..2edbcf81b 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.19 -%define release 0RC1 +%define release 0Beta4 Summary: Shorewall-init adds functionality to Shoreline Firewall (Shorewall). Name: %{name} @@ -119,8 +119,6 @@ fi %doc COPYING changelog.txt releasenotes.txt %changelog -* Sun Apr 03 2011 Tom Eastep tom@shorewall.net -- Updated to 4.4.19-0RC1 * Sat Apr 02 2011 Tom Eastep tom@shorewall.net - Updated to 4.4.19-0Beta4 * Sat Mar 26 2011 Tom Eastep tom@shorewall.net diff --git a/Shorewall-init/uninstall.sh b/Shorewall-init/uninstall.sh index dfd281484..4aef715d1 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.19-RC1 +VERSION=4.4.19-Beta4 usage() # $1 = exit status { diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh index 0d1ee8646..a9d4df16a 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.19-RC1 +VERSION=4.4.19-Beta4 usage() # $1 = exit status { diff --git a/Shorewall-lite/shorewall-lite.spec b/Shorewall-lite/shorewall-lite.spec index f5a149eff..6256fef62 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.19 -%define release 0RC1 +%define release 0Beta4 Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems. Name: %{name} @@ -103,8 +103,6 @@ fi %doc COPYING changelog.txt releasenotes.txt %changelog -* Sun Apr 03 2011 Tom Eastep tom@shorewall.net -- Updated to 4.4.19-0RC1 * Sat Apr 02 2011 Tom Eastep tom@shorewall.net - Updated to 4.4.19-0Beta4 * Sat Mar 26 2011 Tom Eastep tom@shorewall.net diff --git a/Shorewall-lite/uninstall.sh b/Shorewall-lite/uninstall.sh index 33226d13c..e8da63f5f 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.19-RC1 +VERSION=4.4.19-Beta4 usage() # $1 = exit status { diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm index 57b7d78cf..1efa4a3d9 100644 --- a/Shorewall/Perl/Shorewall/Config.pm +++ b/Shorewall/Perl/Shorewall/Config.pm @@ -411,7 +411,7 @@ sub initialize( $ ) { EXPORT => 0, STATEMATCH => '-m state --state', UNTRACKED => 0, - VERSION => "4.4.19-RC1", + VERSION => "4.4.19-Beta4", CAPVERSION => 40417 , ); # diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec index 980ad9b07..524829a5e 100644 --- a/Shorewall/shorewall.spec +++ b/Shorewall/shorewall.spec @@ -1,6 +1,6 @@ %define name shorewall %define version 4.4.19 -%define release 0RC1 +%define release 0Beta4 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems. Name: %{name} @@ -109,8 +109,6 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt Contrib/* Samples %changelog -* Sun Apr 03 2011 Tom Eastep tom@shorewall.net -- Updated to 4.4.19-0RC1 * Sat Apr 02 2011 Tom Eastep tom@shorewall.net - Updated to 4.4.19-0Beta4 * Sat Mar 26 2011 Tom Eastep tom@shorewall.net diff --git a/Shorewall/uninstall.sh b/Shorewall/uninstall.sh index 9d8e222a1..c1d02b70a 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.19-RC1 +VERSION=4.4.19-Beta4 usage() # $1 = exit status { diff --git a/Shorewall6-lite/install.sh b/Shorewall6-lite/install.sh index bd126e98e..8ed023c8b 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.19-RC1 +VERSION=4.4.19-Beta4 usage() # $1 = exit status { diff --git a/Shorewall6-lite/shorewall6-lite.spec b/Shorewall6-lite/shorewall6-lite.spec index c1bef5c7d..c7caf3c55 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.19 -%define release 0RC1 +%define release 0Beta4 Summary: Shoreline Firewall 6 Lite is an ip6tables-based firewall for Linux systems. Name: %{name} @@ -94,8 +94,6 @@ fi %doc COPYING changelog.txt releasenotes.txt %changelog -* Sun Apr 03 2011 Tom Eastep tom@shorewall.net -- Updated to 4.4.19-0RC1 * Sat Apr 02 2011 Tom Eastep tom@shorewall.net - Updated to 4.4.19-0Beta4 * Sat Mar 26 2011 Tom Eastep tom@shorewall.net diff --git a/Shorewall6-lite/uninstall.sh b/Shorewall6-lite/uninstall.sh index 2c9ea3ca2..20645d2ed 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.19-RC1 +VERSION=4.4.19-Beta4 usage() # $1 = exit status { diff --git a/Shorewall6/install.sh b/Shorewall6/install.sh index 3f8994e10..152ed269f 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.19-RC1 +VERSION=4.4.19-Beta4 usage() # $1 = exit status { diff --git a/Shorewall6/shorewall6.spec b/Shorewall6/shorewall6.spec index fe88a2636..de354b1e5 100644 --- a/Shorewall6/shorewall6.spec +++ b/Shorewall6/shorewall6.spec @@ -1,6 +1,6 @@ %define name shorewall6 %define version 4.4.19 -%define release 0RC1 +%define release 0Beta4 Summary: Shoreline Firewall 6 is an ip6tables-based firewall for Linux systems. Name: %{name} @@ -98,8 +98,6 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn ipv6 Samples6 %changelog -* Sun Apr 03 2011 Tom Eastep tom@shorewall.net -- Updated to 4.4.19-0RC1 * Sat Apr 02 2011 Tom Eastep tom@shorewall.net - Updated to 4.4.19-0Beta4 * Sat Mar 26 2011 Tom Eastep tom@shorewall.net diff --git a/Shorewall6/uninstall.sh b/Shorewall6/uninstall.sh index c7088a4b2..c874e241f 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.19-RC1 +VERSION=4.4.19-Beta4 usage() # $1 = exit status {