From cbeebb6bf890faf0e9ee025c94d6f595f1c77fb4 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Wed, 29 Jun 2011 11:36:04 -0700 Subject: [PATCH] Bump version to 4.4.21. Signed-off-by: Tom Eastep --- 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/changelog.txt | 4 ++++ Shorewall/install.sh | 2 +- Shorewall/releasenotes.txt | 23 ++++++++++++----------- 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 +- 18 files changed, 42 insertions(+), 27 deletions(-) diff --git a/Shorewall-init/install.sh b/Shorewall-init/install.sh index 6729c8e13..21a055b8a 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-RC1 +VERSION=4.4.21 usage() # $1 = exit status { diff --git a/Shorewall-init/shorewall-init.spec b/Shorewall-init/shorewall-init.spec index d20aa2d80..16cc524e8 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 0RC1 +%define release 0base Summary: Shorewall-init adds functionality to Shoreline Firewall (Shorewall). Name: %{name} @@ -119,6 +119,8 @@ fi %doc COPYING changelog.txt releasenotes.txt %changelog +* Wed Jun 29 2011 Tom Eastep tom@shorewall.net +- Updated to 4.4.21-0base * Thu Jun 23 2011 Tom Eastep tom@shorewall.net - Updated to 4.4.21-0RC1 * Sun Jun 19 2011 Tom Eastep tom@shorewall.net diff --git a/Shorewall-init/uninstall.sh b/Shorewall-init/uninstall.sh index d9da02048..4fca0dd6d 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-RC1 +VERSION=4.4.21 usage() # $1 = exit status { diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh index 5ef974e19..1718ab402 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-RC1 +VERSION=4.4.21 usage() # $1 = exit status { diff --git a/Shorewall-lite/shorewall-lite.spec b/Shorewall-lite/shorewall-lite.spec index f1c0ee0a6..c847e3513 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 0RC1 +%define release 0base Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems. Name: %{name} @@ -103,6 +103,8 @@ fi %doc COPYING changelog.txt releasenotes.txt %changelog +* Wed Jun 29 2011 Tom Eastep tom@shorewall.net +- Updated to 4.4.21-0base * Thu Jun 23 2011 Tom Eastep tom@shorewall.net - Updated to 4.4.21-0RC1 * Sun Jun 19 2011 Tom Eastep tom@shorewall.net diff --git a/Shorewall-lite/uninstall.sh b/Shorewall-lite/uninstall.sh index dd41a1776..958a8c970 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-RC1 +VERSION=4.4.21 usage() # $1 = exit status { diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm index 22dabf7a4..d8b6cd099 100644 --- a/Shorewall/Perl/Shorewall/Config.pm +++ b/Shorewall/Perl/Shorewall/Config.pm @@ -428,7 +428,7 @@ sub initialize( $ ) { EXPORT => 0, STATEMATCH => '-m state --state', UNTRACKED => 0, - VERSION => "4.4.21-RC1", + VERSION => "4.4.21", CAPVERSION => 40421 , ); # diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index 571845b49..911245af7 100644 --- a/Shorewall/changelog.txt +++ b/Shorewall/changelog.txt @@ -1,3 +1,7 @@ +Changes in Shorewall 4.4.21 Final + +None. + Changes in Shorewall 4.4.21 RC 1 1) Fix empty parameter lists in _DEFAULT settings. diff --git a/Shorewall/install.sh b/Shorewall/install.sh index bd14ae215..38e92e07d 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-RC1 +VERSION=4.4.21 usage() # $1 = exit status { diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index 140893c33..a0bcb7de0 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 R C I + S H O R E W A L L 4 . 4 . 2 1 ---------------------------------------------------------------------------- I. PROBLEMS CORRECTED IN THIS RELEASE @@ -16,7 +16,7 @@ VI. PROBLEMS CORRECTED AND NEW FEATURES IN PRIOR RELEASES 1) All problems corrections included in Shorewall 4.4.20.1 - 4.4.20.3 (see below). -2) The following error message has been corrected +2) The following error message FOREWARD_CLEAR_MARK=Yes requires MARK Target in your kernel and iptables @@ -39,7 +39,8 @@ VI. PROBLEMS CORRECTED AND NEW FEATURES IN PRIOR RELEASES 1) AUTOMAKE=Yes now causes all directories on the CONFIG_PATH to be searched for files newer than the script that last - started/restarted the firewall. + started/restarted the firewall. Previously, only /etc/shorewall + (/etc/shorewall6) was searched. 2) FORMAT-2 actions may now specify default parameter values using the DEFAULTS directive. @@ -50,8 +51,8 @@ VI. PROBLEMS CORRECTED AND NEW FEATURES IN PRIOR RELEASES is the default value for the second parameter and so on. To specify an empty default, use '-'. -3) Macros may now specify a default parameter value using the DEFAULT - directive. +3) Parameterized macros may now specify a default parameter value + using the DEFAULT directive. DEFAULT @@ -67,7 +68,7 @@ VI. PROBLEMS CORRECTED AND NEW FEATURES IN PRIOR RELEASES 1) Pass 'audit' if you want all ACCEPTs, DROPs and REJECTs audited. Pass '-' otherwise. - 2) The action to be applied to Auth requests + 2) The action to be applied to Auth requests: FIRST PARAMETER DEFAULT @@ -75,7 +76,7 @@ VI. PROBLEMS CORRECTED AND NEW FEATURES IN PRIOR RELEASES audit A_REJECT 3) The action to be applied to SMB traffic. The default depends on - the first parameter: + the action and its first parameter: ACTION FIRST PARAMETER DEFAULT @@ -118,7 +119,7 @@ VI. PROBLEMS CORRECTED AND NEW FEATURES IN PRIOR RELEASES DROP_DEFAULT=Drop(-,DROP) 5) An 'update' command has been added to /sbin/shorewall and - /sbin/shorewall6. The command updates he shorewall.conf + /sbin/shorewall6. The command updates the shorewall.conf (shorewall6.conf) file then validates the configuration. The updated file will set any options not specified in the old file with their default values, and will move any deprecated options @@ -131,7 +132,7 @@ VI. PROBLEMS CORRECTED AND NEW FEATURES IN PRIOR RELEASES The 'update' command accepts the same options as the 'check' command plus a '-a' option that causes the updated file to be - annotated with documentation. + annotated with manpage documentation. 6) Shorewall6 now supports ipsets. @@ -146,8 +147,8 @@ VI. PROBLEMS CORRECTED AND NEW FEATURES IN PRIOR RELEASES SAVE_IPSETS option in /etc/sysconfig/shorewall-init (/etc/default/shorewall-init on Debian and derivatives). The value of the option is a file name where the contents of the ipsets will - be save to and restored from. Shorewall-init will create any - necessary directories during the first 'save' operation. + be saved to and restored from. Shorewall-init will create any + parent directories during the first 'save' operation. If you configure Shorewall-init to save/restore ipsets, be sure to set SAVE_IPSETS=No in shorewall.conf and shorewall6.conf. diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec index d175beed0..94b460466 100644 --- a/Shorewall/shorewall.spec +++ b/Shorewall/shorewall.spec @@ -1,6 +1,6 @@ %define name shorewall %define version 4.4.21 -%define release 0RC1 +%define release 0base Summary: Shoreline Firewall is an iptables-based firewall for Linux systems. Name: %{name} @@ -111,6 +111,8 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt Contrib/* Samples %changelog +* Wed Jun 29 2011 Tom Eastep tom@shorewall.net +- Updated to 4.4.21-0base * Thu Jun 23 2011 Tom Eastep tom@shorewall.net - Updated to 4.4.21-0RC1 * Sun Jun 19 2011 Tom Eastep tom@shorewall.net diff --git a/Shorewall/uninstall.sh b/Shorewall/uninstall.sh index f8dbcecdd..27d9d5fab 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-RC1 +VERSION=4.4.21 usage() # $1 = exit status { diff --git a/Shorewall6-lite/install.sh b/Shorewall6-lite/install.sh index 4a2c2a3dd..a6fa3a481 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-RC1 +VERSION=4.4.21 usage() # $1 = exit status { diff --git a/Shorewall6-lite/shorewall6-lite.spec b/Shorewall6-lite/shorewall6-lite.spec index e1ce5e707..b269faa70 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 0RC1 +%define release 0base Summary: Shoreline Firewall 6 Lite is an ip6tables-based firewall for Linux systems. Name: %{name} @@ -94,6 +94,8 @@ fi %doc COPYING changelog.txt releasenotes.txt %changelog +* Wed Jun 29 2011 Tom Eastep tom@shorewall.net +- Updated to 4.4.21-0base * Thu Jun 23 2011 Tom Eastep tom@shorewall.net - Updated to 4.4.21-0RC1 * Sun Jun 19 2011 Tom Eastep tom@shorewall.net diff --git a/Shorewall6-lite/uninstall.sh b/Shorewall6-lite/uninstall.sh index dcdb0f75f..12258ab63 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-RC1 +VERSION=4.4.21 usage() # $1 = exit status { diff --git a/Shorewall6/install.sh b/Shorewall6/install.sh index 027ceb7a3..871e116b4 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-RC1 +VERSION=4.4.21 usage() # $1 = exit status { diff --git a/Shorewall6/shorewall6.spec b/Shorewall6/shorewall6.spec index 0dc77c4b8..40746a127 100644 --- a/Shorewall6/shorewall6.spec +++ b/Shorewall6/shorewall6.spec @@ -1,6 +1,6 @@ %define name shorewall6 %define version 4.4.21 -%define release 0RC1 +%define release 0base Summary: Shoreline Firewall 6 is an ip6tables-based firewall for Linux systems. Name: %{name} @@ -101,6 +101,8 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn ipv6 Samples6 %changelog +* Wed Jun 29 2011 Tom Eastep tom@shorewall.net +- Updated to 4.4.21-0base * Thu Jun 23 2011 Tom Eastep tom@shorewall.net - Updated to 4.4.21-0RC1 * Sun Jun 19 2011 Tom Eastep tom@shorewall.net diff --git a/Shorewall6/uninstall.sh b/Shorewall6/uninstall.sh index 0c0503784..a7d1eece8 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-RC1 +VERSION=4.4.21 usage() # $1 = exit status {