From 65e5c730a7c6843926e5293498ba9e2461abdcf7 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sat, 31 Jul 2010 09:09:01 -0700 Subject: [PATCH] Fix typo in shorewall6-lite that causes locking issue --- 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 | 5 +++++ Shorewall/install.sh | 2 +- Shorewall/releasenotes.txt | 9 ++++++++- Shorewall/shorewall.spec | 4 +++- Shorewall/uninstall.sh | 2 +- Shorewall6-lite/install.sh | 2 +- Shorewall6-lite/shorewall6-lite | 2 +- Shorewall6-lite/shorewall6-lite.spec | 4 +++- Shorewall6-lite/uninstall.sh | 2 +- Shorewall6/install.sh | 2 +- Shorewall6/shorewall6.spec | 4 +++- Shorewall6/uninstall.sh | 2 +- 19 files changed, 40 insertions(+), 18 deletions(-) diff --git a/Shorewall-init/install.sh b/Shorewall-init/install.sh index 512709f7e..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.11.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 e85e993d1..29158d149 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.11 -%define release 1 +%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 +* Sat Jul 31 2010 Tom Eastep tom@shorewall.net +- Updated to 4.4.11-2 * Wed Jul 14 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.11-1 * Fri Jul 09 2010 Tom Eastep tom@shorewall.net diff --git a/Shorewall-init/uninstall.sh b/Shorewall-init/uninstall.sh index 9a2d22441..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.11.1 +VERSION=4.4.11.2 usage() # $1 = exit status { diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh index bad8a9841..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.11.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 e0de12287..25b75aa08 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.11 -%define release 1 +%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 +* Sat Jul 31 2010 Tom Eastep tom@shorewall.net +- Updated to 4.4.11-2 * Wed Jul 14 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.11-1 * Fri Jul 09 2010 Tom Eastep tom@shorewall.net diff --git a/Shorewall-lite/uninstall.sh b/Shorewall-lite/uninstall.sh index 0c6f207a1..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.11.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 6e9f12767..0b54b4bf9 100644 --- a/Shorewall/Perl/Shorewall/Config.pm +++ b/Shorewall/Perl/Shorewall/Config.pm @@ -343,7 +343,7 @@ sub initialize( $ ) { EXPORT => 0, STATEMATCH => '-m state --state', UNTRACKED => 0, - VERSION => "4.4.11.1", + VERSION => "4.4.11.2", CAPVERSION => 40411 , ); diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index 655d9aca3..4e916b56f 100644 --- a/Shorewall/changelog.txt +++ b/Shorewall/changelog.txt @@ -1,3 +1,8 @@ +Changes in Shorewall 4.4.11.2 + +1) Correct typo that caused hang after executing a stop, reset or + clear command in Shorewall6 lite. + Changes in Shorewall 4.4.11.1 1) Fix IPv6 shorecap program. diff --git a/Shorewall/install.sh b/Shorewall/install.sh index a66580564..849a9c339 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.11.1 +VERSION=4.4.11.2 usage() # $1 = exit status { diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index 948b1831d..6d728ebb5 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 1 . 1 + S H O R E W A L L 4 . 4 . 1 1 . 2 ---------------------------------------------------------------------------- I. RELEASE 4.4 HIGHLIGHTS @@ -218,6 +218,13 @@ VI. PROBLEMS CORRECTED AND NEW FEATURES IN PRIOR RELEASES 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 ---------------------------------------------------------------------------- +4.4.11.2 + +1) A typo in /sbin/shorewall6-lite version 4.4.11.1 caused the + stop, reset and clear commands to hang for one minute after the + command had been executed and to cause the next shorewall6-lite + command to similarly hang for one minute. + 4.4.11.1 1) Previously, the Shoreall6-lite version of shorecap was using diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec index d23bbb40a..224731d91 100644 --- a/Shorewall/shorewall.spec +++ b/Shorewall/shorewall.spec @@ -1,6 +1,6 @@ %define name shorewall %define version 4.4.11 -%define release 1 +%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 +* Sat Jul 31 2010 Tom Eastep tom@shorewall.net +- Updated to 4.4.11-2 * Wed Jul 14 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.11-1 * Fri Jul 09 2010 Tom Eastep tom@shorewall.net diff --git a/Shorewall/uninstall.sh b/Shorewall/uninstall.sh index e28bb8bd6..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.11.1 +VERSION=4.4.11.2 usage() # $1 = exit status { diff --git a/Shorewall6-lite/install.sh b/Shorewall6-lite/install.sh index 89b2791fd..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.11.1 +VERSION=4.4.11.2 usage() # $1 = exit status { diff --git a/Shorewall6-lite/shorewall6-lite b/Shorewall6-lite/shorewall6-lite index d53ff86c6..ba7ca2da9 100755 --- a/Shorewall6-lite/shorewall6-lite +++ b/Shorewall6-lite/shorewall6-lite @@ -617,7 +617,7 @@ case "$COMMAND" in verify_firewall_script [ -n "$nolock" ] || mutex_on run_it $g_firewall $debugging $COMMAND - [ -n "$nolock" ] || mutex_on + [ -n "$nolock" ] || mutex_off ;; restart) shift diff --git a/Shorewall6-lite/shorewall6-lite.spec b/Shorewall6-lite/shorewall6-lite.spec index 9e4ca63e7..7fff0057e 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.11 -%define release 1 +%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 +* Sat Jul 31 2010 Tom Eastep tom@shorewall.net +- Updated to 4.4.11-2 * Wed Jul 14 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.11-1 * Fri Jul 09 2010 Tom Eastep tom@shorewall.net diff --git a/Shorewall6-lite/uninstall.sh b/Shorewall6-lite/uninstall.sh index eff9f9726..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.11.1 +VERSION=4.4.11.2 usage() # $1 = exit status { diff --git a/Shorewall6/install.sh b/Shorewall6/install.sh index 06cafa07e..cbd4b7747 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.11.1 +VERSION=4.4.11.2 usage() # $1 = exit status { diff --git a/Shorewall6/shorewall6.spec b/Shorewall6/shorewall6.spec index 59ff168f3..d73f8a871 100644 --- a/Shorewall6/shorewall6.spec +++ b/Shorewall6/shorewall6.spec @@ -1,6 +1,6 @@ %define name shorewall6 %define version 4.4.11 -%define release 1 +%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 +* Sat Jul 31 2010 Tom Eastep tom@shorewall.net +- Updated to 4.4.11-2 * Wed Jul 14 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.11-1 * Fri Jul 09 2010 Tom Eastep tom@shorewall.net diff --git a/Shorewall6/uninstall.sh b/Shorewall6/uninstall.sh index 47a8b0590..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.11.1 +VERSION=4.4.11.2 usage() # $1 = exit status {