From 56bc28a18234a0da70ff3e3a336d6d5e3084b039 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Fri, 9 Apr 2010 07:32:21 -0700 Subject: [PATCH] Prepare 4.4.9 Beta 3 Signed-off-by: Tom Eastep --- 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/install.sh | 2 +- Shorewall/releasenotes.txt | 15 +++++++++++---- 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 +- 17 files changed, 35 insertions(+), 20 deletions(-) diff --git a/Shorewall-lite/fallback.sh b/Shorewall-lite/fallback.sh index 6461886e3..c42e8aec5 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.4.9-Beta2 +VERSION=4.4.9-Beta3 usage() # $1 = exit status { diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh index 9ba48e9fe..56735df43 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.9-Beta2 +VERSION=4.4.9-Beta3 usage() # $1 = exit status { diff --git a/Shorewall-lite/shorewall-lite.spec b/Shorewall-lite/shorewall-lite.spec index 6d3906159..69c7437f1 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.9 -%define release 0Beta2 +%define release 0Beta3 Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems. Name: %{name} @@ -101,6 +101,8 @@ fi %doc COPYING changelog.txt releasenotes.txt %changelog +* Fri Apr 09 2010 Tom Eastep tom@shorewall.net +- Updated to 4.4.9-0Beta3 * Thu Apr 08 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.9-0Beta2 * Sat Mar 20 2010 Tom Eastep tom@shorewall.net diff --git a/Shorewall-lite/uninstall.sh b/Shorewall-lite/uninstall.sh index 963837081..86eb24417 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.9-Beta2 +VERSION=4.4.9-Beta3 usage() # $1 = exit status { diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm index 8b7cfbd57..ce9caba4f 100644 --- a/Shorewall/Perl/Shorewall/Config.pm +++ b/Shorewall/Perl/Shorewall/Config.pm @@ -340,7 +340,7 @@ sub initialize( $ ) { TC_SCRIPT => '', EXPORT => 0, UNTRACKED => 0, - VERSION => "4.4.9-Beta2", + VERSION => "4.4.9-Beta3", CAPVERSION => 40408 , ); diff --git a/Shorewall/install.sh b/Shorewall/install.sh index 88cff5284..23643f23e 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.9-Beta2 +VERSION=4.4.9-Beta3 usage() # $1 = exit status { diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index d697eb1f8..f54ce8e73 100644 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -1,6 +1,6 @@ ---------------------------------------------------------------------------- S H O R E W A L L 4 . 4 . 9 - B E T A 2 + B E T A 3 ---------------------------------------------------------------------------- I. RELEASE 4.4 HIGHLIGHTS @@ -237,10 +237,17 @@ I I I. P R O B L E M S C O R R E C T E D I N T H I S R E L E A S E /var/lib/shorewall6/.restart: line 65: [: -gt: unary operator expected -4) With optimize 4, if an unnecessary NONAT rule is included in - /etc/shorewall/rules (there is no DNAT or REDIRECT rule with the +4) With optimize 4, if an unnecessary NONAT rule was included in + /etc/shorewall/rules (there was no DNAT or REDIRECT rule with the same source zone), then 'shorewall start' and/or 'shorewall restart' - can fail with invalid iptables-restore input. + could fail with invalid iptables-restore input. + +5) The tarball installers now check for the presence of the CLI + program (/sbin/shorewall, /sbin/shorewall6, etc) to determine if a + fresh install or an upgrade should be performed. Previously, the + installers used the presense of the configuration directory + (/etc/shorewall, /etc/shorewall6, etc.) which led to incomplete + installations where there was an existing configuration directory. ---------------------------------------------------------------------------- I V. K N O W N P R O B L E M S R E M A I N I N G diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec index 195d6f7f4..1a97bcd05 100644 --- a/Shorewall/shorewall.spec +++ b/Shorewall/shorewall.spec @@ -1,6 +1,6 @@ %define name shorewall %define version 4.4.9 -%define release 0Beta2 +%define release 0Beta3 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 Apr 09 2010 Tom Eastep tom@shorewall.net +- Updated to 4.4.9-0Beta3 * Thu Apr 08 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.9-0Beta2 * Sat Mar 20 2010 Tom Eastep tom@shorewall.net diff --git a/Shorewall/uninstall.sh b/Shorewall/uninstall.sh index 206c3207e..2f47b7b88 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.9-Beta2 +VERSION=4.4.9-Beta3 usage() # $1 = exit status { diff --git a/Shorewall6-lite/fallback.sh b/Shorewall6-lite/fallback.sh index 6461886e3..c42e8aec5 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.4.9-Beta2 +VERSION=4.4.9-Beta3 usage() # $1 = exit status { diff --git a/Shorewall6-lite/install.sh b/Shorewall6-lite/install.sh index 8191d5558..5ffad4ec3 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.9-Beta2 +VERSION=4.4.9-Beta3 usage() # $1 = exit status { diff --git a/Shorewall6-lite/shorewall6-lite.spec b/Shorewall6-lite/shorewall6-lite.spec index 207c8129c..da0cf64df 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.9 -%define release 0Beta2 +%define release 0Beta3 Summary: Shoreline Firewall 6 Lite is an ip6tables-based firewall for Linux systems. Name: %{name} @@ -92,6 +92,8 @@ fi %doc COPYING changelog.txt releasenotes.txt %changelog +* Fri Apr 09 2010 Tom Eastep tom@shorewall.net +- Updated to 4.4.9-0Beta3 * Thu Apr 08 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.9-0Beta2 * Sat Mar 20 2010 Tom Eastep tom@shorewall.net diff --git a/Shorewall6-lite/uninstall.sh b/Shorewall6-lite/uninstall.sh index 052cefb95..3ae5130c8 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.9-Beta2 +VERSION=4.4.9-Beta3 usage() # $1 = exit status { diff --git a/Shorewall6/fallback.sh b/Shorewall6/fallback.sh index 5b60bbcad..17ffaa50b 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.4.9-Beta2 +VERSION=4.4.9-Beta3 usage() # $1 = exit status { diff --git a/Shorewall6/install.sh b/Shorewall6/install.sh index 13a828463..07ed6f51f 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.9-Beta2 +VERSION=4.4.9-Beta3 usage() # $1 = exit status { diff --git a/Shorewall6/shorewall6.spec b/Shorewall6/shorewall6.spec index db9f7f4a5..36bf051db 100644 --- a/Shorewall6/shorewall6.spec +++ b/Shorewall6/shorewall6.spec @@ -1,6 +1,6 @@ %define name shorewall6 %define version 4.4.9 -%define release 0Beta2 +%define release 0Beta3 Summary: Shoreline Firewall 6 is an ip6tables-based firewall for Linux systems. Name: %{name} @@ -97,6 +97,8 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn ipv6 Samples6 %changelog +* Fri Apr 09 2010 Tom Eastep tom@shorewall.net +- Updated to 4.4.9-0Beta3 * Thu Apr 08 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.9-0Beta2 * Sat Mar 20 2010 Tom Eastep tom@shorewall.net diff --git a/Shorewall6/uninstall.sh b/Shorewall6/uninstall.sh index cb66189c4..fc0dd0db2 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.9-Beta2 +VERSION=4.4.9-Beta3 usage() # $1 = exit status {