diff --git a/Shorewall-init/install.sh b/Shorewall-init/install.sh index a32643be1..286eb07d7 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.13.1 +VERSION=4.4.11.2 usage() # $1 = exit status { diff --git a/Shorewall-init/shorewall-init.spec b/Shorewall-init/shorewall-init.spec index 221330e29..a738553d6 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.13 -%define release 1 +%define version 4.4.11 +%define release 2 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.11-2 * Wed Sep 22 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.13-1 * Mon Sep 20 2010 Tom Eastep tom@shorewall.net diff --git a/Shorewall-init/uninstall.sh b/Shorewall-init/uninstall.sh index 2d3c7815a..0c92ed370 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.13.1 +VERSION=4.4.11.2 usage() # $1 = exit status { diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh index 68d88a542..7dfb678f9 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.13.1 +VERSION=4.4.11.2 usage() # $1 = exit status { diff --git a/Shorewall-lite/shorewall-lite.spec b/Shorewall-lite/shorewall-lite.spec index 85833777f..fef1846de 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.13 -%define release 1 +%define version 4.4.11 +%define release 2 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.11-2 * Wed Sep 22 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.13-1 * Mon Sep 20 2010 Tom Eastep tom@shorewall.net diff --git a/Shorewall-lite/uninstall.sh b/Shorewall-lite/uninstall.sh index 763e8cf37..55b6c33cc 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.13.1 +VERSION=4.4.11.2 usage() # $1 = exit status { diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm index 338053591..162929924 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.13.1", + VERSION => "4.4.11.2", CAPVERSION => 40413 , ); diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index 7948a4d3c..bb62c25a8 100644 --- a/Shorewall/changelog.txt +++ b/Shorewall/changelog.txt @@ -1,3 +1,9 @@ +Changes in Shorewall 4.4.13.2 + +1) Fix Debian -lite init scripts. + +2) Clamp VERBOSITY to valid range. + Changes in Shorewall 4.4.13.1 1) Make log messages uniform. diff --git a/Shorewall/install.sh b/Shorewall/install.sh index 976e9b1da..499db24b0 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.13.1 +VERSION=4.4.11.2 usage() # $1 = exit status { diff --git a/Shorewall/known_problems.txt b/Shorewall/known_problems.txt index 3a475762a..3f27d738f 100644 --- a/Shorewall/known_problems.txt +++ b/Shorewall/known_problems.txt @@ -23,3 +23,15 @@ #ZONE TYPE OPTIONS IN_OPTIONS net ipv4 - blacklist + +4) The Debian init scripts for Shorewall-lite and Shorewall6-lite + contain a syntax error. + + Fixed in 4.4.13.2. + +5) If the -v or -q option is passed to /sbin/shorewall-lite or + /sbin/shorewall6-lite on a command that involves the compiled + script, then the command will fail if the effective verbosity is + > 2 or < -1. + + Fixed in 4.4.13.2. diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index 072fd9712..8fd24b71b 100644 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -1,5 +1,5 @@ ---------------------------------------------------------------------------- - S H O R E W A L L 4 . 4 . 1 3 . 1 + S H O R E W A L L 4 . 4 . 1 3 . 2 ---------------------------------------------------------------------------- I. PROBLEMS CORRECTED IN THIS RELEASE @@ -13,6 +13,16 @@ VI. PROBLEMS CORRECTED AND NEW FEATURES IN PRIOR RELEASES 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 ---------------------------------------------------------------------------- +4.4.13.2 + +1) The Debian init scripts for Shorewall-lite and Shorewall6-lite + contained a syntax error. + +2) If the -v or -q option was passed to /sbin/shorewall-lite or + /sbin/shorewall6-lite on a command that involved the compiled + script, then the command would fail if the effective verbosity was + > 2 or < -1. + 4.4.13.1 1) Previously, messages to the STARTUP_LOG had inconsistent date formats. diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec index 8b6950fde..7382cf44a 100644 --- a/Shorewall/shorewall.spec +++ b/Shorewall/shorewall.spec @@ -1,6 +1,6 @@ %define name shorewall -%define version 4.4.13 -%define release 1 +%define version 4.4.11 +%define release 2 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.11-2 * Wed Sep 22 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.13-1 * Mon Sep 20 2010 Tom Eastep tom@shorewall.net diff --git a/Shorewall/uninstall.sh b/Shorewall/uninstall.sh index fab3f3199..37ea6ad39 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.13.1 +VERSION=4.4.11.2 usage() # $1 = exit status { diff --git a/Shorewall6-lite/install.sh b/Shorewall6-lite/install.sh index 2e4207fc7..9fed99344 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.13.1 +VERSION=4.4.11.2 usage() # $1 = exit status { diff --git a/Shorewall6-lite/shorewall6-lite.spec b/Shorewall6-lite/shorewall6-lite.spec index c30cffc89..e4764fb7e 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.13 -%define release 1 +%define version 4.4.11 +%define release 2 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.11-2 * Wed Sep 22 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.13-1 * Mon Sep 20 2010 Tom Eastep tom@shorewall.net diff --git a/Shorewall6-lite/uninstall.sh b/Shorewall6-lite/uninstall.sh index 9a88e3762..095c4fb5e 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.13.1 +VERSION=4.4.11.2 usage() # $1 = exit status { diff --git a/Shorewall6/install.sh b/Shorewall6/install.sh index 36557befd..e2941f333 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.13.1 +VERSION=4.4.11.2 usage() # $1 = exit status { diff --git a/Shorewall6/shorewall6.spec b/Shorewall6/shorewall6.spec index 7ed59b015..0dbc01bde 100644 --- a/Shorewall6/shorewall6.spec +++ b/Shorewall6/shorewall6.spec @@ -1,6 +1,6 @@ %define name shorewall6 -%define version 4.4.13 -%define release 1 +%define version 4.4.11 +%define release 2 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.11-2 * Wed Sep 22 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.13-1 * Mon Sep 20 2010 Tom Eastep tom@shorewall.net diff --git a/Shorewall6/uninstall.sh b/Shorewall6/uninstall.sh index b9a4f6815..915ef57aa 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.13.1 +VERSION=4.4.11.2 usage() # $1 = exit status {