From c1b64e0ddd5cc4ce26a24da8957964dd565b16a4 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Mon, 4 Jul 2011 07:17:59 -0700 Subject: [PATCH] Version to RC 3 Signed-off-by: Tom Eastep --- Shorewall-init/install.sh | 2 +- Shorewall-init/shorewall-init.spec | 6 +++--- Shorewall-init/uninstall.sh | 2 +- Shorewall-lite/install.sh | 2 +- Shorewall-lite/shorewall-lite.spec | 6 +++--- Shorewall-lite/uninstall.sh | 2 +- Shorewall/Perl/Shorewall/Config.pm | 2 +- Shorewall/changelog.txt | 4 +++- Shorewall/install.sh | 2 +- Shorewall/releasenotes.txt | 2 +- Shorewall/shorewall.spec | 6 +++--- Shorewall/uninstall.sh | 2 +- Shorewall6-lite/install.sh | 2 +- Shorewall6-lite/shorewall6-lite.spec | 6 +++--- Shorewall6-lite/uninstall.sh | 2 +- Shorewall6/install.sh | 2 +- Shorewall6/shorewall6.spec | 6 +++--- Shorewall6/uninstall.sh | 2 +- 18 files changed, 30 insertions(+), 28 deletions(-) diff --git a/Shorewall-init/install.sh b/Shorewall-init/install.sh index 21a055b8a..3e057e1c9 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.21 +VERSION=4.4.21-RC3 usage() # $1 = exit status { diff --git a/Shorewall-init/shorewall-init.spec b/Shorewall-init/shorewall-init.spec index 5e9ea1a7b..876bd2c44 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.21 -%define release 0base +%define release 0RC3 Summary: Shorewall-init adds functionality to Shoreline Firewall (Shorewall). Name: %{name} @@ -119,8 +119,8 @@ fi %doc COPYING changelog.txt releasenotes.txt %changelog -* Sun Jul 03 2011 Tom Eastep tom@shorewall.net -- Updated to 4.4.21-0base +* Mon Jul 04 2011 Tom Eastep tom@shorewall.net +- Updated to 4.4.21-0RC3 * Sun Jul 03 2011 Tom Eastep tom@shorewall.net - Updated to 4.4.21-0RC2 * Thu Jun 23 2011 Tom Eastep tom@shorewall.net diff --git a/Shorewall-init/uninstall.sh b/Shorewall-init/uninstall.sh index 4fca0dd6d..70794c565 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.21 +VERSION=4.4.21-RC3 usage() # $1 = exit status { diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh index 1718ab402..3fd7268e6 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.21 +VERSION=4.4.21-RC3 usage() # $1 = exit status { diff --git a/Shorewall-lite/shorewall-lite.spec b/Shorewall-lite/shorewall-lite.spec index 3e3b7a566..38fc2295f 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.21 -%define release 0base +%define release 0RC3 Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems. Name: %{name} @@ -103,8 +103,8 @@ fi %doc COPYING changelog.txt releasenotes.txt %changelog -* Sun Jul 03 2011 Tom Eastep tom@shorewall.net -- Updated to 4.4.21-0base +* Mon Jul 04 2011 Tom Eastep tom@shorewall.net +- Updated to 4.4.21-0RC3 * Sun Jul 03 2011 Tom Eastep tom@shorewall.net - Updated to 4.4.21-0RC2 * Thu Jun 23 2011 Tom Eastep tom@shorewall.net diff --git a/Shorewall-lite/uninstall.sh b/Shorewall-lite/uninstall.sh index 958a8c970..1696a44a4 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.21 +VERSION=4.4.21-RC3 usage() # $1 = exit status { diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm index fe835b6e7..77c410229 100644 --- a/Shorewall/Perl/Shorewall/Config.pm +++ b/Shorewall/Perl/Shorewall/Config.pm @@ -433,7 +433,7 @@ sub initialize( $ ) { EXPORT => 0, STATEMATCH => '-m state --state', UNTRACKED => 0, - VERSION => "4.4.21", + VERSION => "4.4.21-RC3", CAPVERSION => 40421 , ); # diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index add9894fa..110c080b1 100644 --- a/Shorewall/changelog.txt +++ b/Shorewall/changelog.txt @@ -1,7 +1,9 @@ -Changes in Shorewall 4.4.21 Final +Changes in Shorewall 4.4.21 RC 3 1) Make shorewall[6].conf quoting consistent with 'update'. +2) Implement parameterized default actions in IPv6 + Changes in Shorewall 4.4.21 RC 2 1) Correct code generated by TPROXY. diff --git a/Shorewall/install.sh b/Shorewall/install.sh index 38e92e07d..b6fad364a 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.21 +VERSION=4.4.21-RC3 usage() # $1 = exit status { diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index e18e7eab7..b510df87e 100644 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -1,5 +1,5 @@ ---------------------------------------------------------------------------- - S H O R E W A L L 4 . 4 . 2 1 + S H O R E W A L L 4 . 4 . 2 1 R C 3 ---------------------------------------------------------------------------- I. PROBLEMS CORRECTED IN THIS RELEASE diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec index 59c7929fb..9a809f0dc 100644 --- a/Shorewall/shorewall.spec +++ b/Shorewall/shorewall.spec @@ -1,6 +1,6 @@ %define name shorewall %define version 4.4.21 -%define release 0base +%define release 0RC3 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems. Name: %{name} @@ -111,8 +111,8 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt Contrib/* Samples %changelog -* Sun Jul 03 2011 Tom Eastep tom@shorewall.net -- Updated to 4.4.21-0base +* Mon Jul 04 2011 Tom Eastep tom@shorewall.net +- Updated to 4.4.21-0RC3 * Sun Jul 03 2011 Tom Eastep tom@shorewall.net - Updated to 4.4.21-0RC2 * Thu Jun 23 2011 Tom Eastep tom@shorewall.net diff --git a/Shorewall/uninstall.sh b/Shorewall/uninstall.sh index 27d9d5fab..a046b6dc7 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.21 +VERSION=4.4.21-RC3 usage() # $1 = exit status { diff --git a/Shorewall6-lite/install.sh b/Shorewall6-lite/install.sh index a6fa3a481..6261e7159 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.21 +VERSION=4.4.21-RC3 usage() # $1 = exit status { diff --git a/Shorewall6-lite/shorewall6-lite.spec b/Shorewall6-lite/shorewall6-lite.spec index f8ee76965..f68ead090 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.21 -%define release 0base +%define release 0RC3 Summary: Shoreline Firewall 6 Lite is an ip6tables-based firewall for Linux systems. Name: %{name} @@ -94,8 +94,8 @@ fi %doc COPYING changelog.txt releasenotes.txt %changelog -* Sun Jul 03 2011 Tom Eastep tom@shorewall.net -- Updated to 4.4.21-0base +* Mon Jul 04 2011 Tom Eastep tom@shorewall.net +- Updated to 4.4.21-0RC3 * Sun Jul 03 2011 Tom Eastep tom@shorewall.net - Updated to 4.4.21-0RC2 * Thu Jun 23 2011 Tom Eastep tom@shorewall.net diff --git a/Shorewall6-lite/uninstall.sh b/Shorewall6-lite/uninstall.sh index 12258ab63..a511c6d44 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.21 +VERSION=4.4.21-RC3 usage() # $1 = exit status { diff --git a/Shorewall6/install.sh b/Shorewall6/install.sh index 871e116b4..306f55743 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.21 +VERSION=4.4.21-RC3 usage() # $1 = exit status { diff --git a/Shorewall6/shorewall6.spec b/Shorewall6/shorewall6.spec index 4d9865b39..730630eda 100644 --- a/Shorewall6/shorewall6.spec +++ b/Shorewall6/shorewall6.spec @@ -1,6 +1,6 @@ %define name shorewall6 %define version 4.4.21 -%define release 0base +%define release 0RC3 Summary: Shoreline Firewall 6 is an ip6tables-based firewall for Linux systems. Name: %{name} @@ -101,8 +101,8 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn ipv6 Samples6 %changelog -* Sun Jul 03 2011 Tom Eastep tom@shorewall.net -- Updated to 4.4.21-0base +* Mon Jul 04 2011 Tom Eastep tom@shorewall.net +- Updated to 4.4.21-0RC3 * Sun Jul 03 2011 Tom Eastep tom@shorewall.net - Updated to 4.4.21-0RC2 * Thu Jun 23 2011 Tom Eastep tom@shorewall.net diff --git a/Shorewall6/uninstall.sh b/Shorewall6/uninstall.sh index a7d1eece8..92c73bd9e 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.21 +VERSION=4.4.21-RC3 usage() # $1 = exit status {