From 09f8011a49a016c5c9248ffa1531edb391237ebc Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sun, 14 Feb 2010 07:28:52 -0800 Subject: [PATCH] Create 4.4.7.2 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/changelog.txt | 6 +++++- Shorewall/install.sh | 2 +- Shorewall/releasenotes.txt | 8 ++++++++ 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 +- 18 files changed, 37 insertions(+), 17 deletions(-) diff --git a/Shorewall-lite/fallback.sh b/Shorewall-lite/fallback.sh index d23a48d2c..e67618772 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.7.1 +VERSION=4.4.7.2 usage() # $1 = exit status { diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh index a0295e024..eb40df869 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.7.1 +VERSION=4.4.7.2 usage() # $1 = exit status { diff --git a/Shorewall-lite/shorewall-lite.spec b/Shorewall-lite/shorewall-lite.spec index c4c66842d..9c93ec03d 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.7 -%define release 1 +%define release 2 Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems. Name: %{name} @@ -100,6 +100,8 @@ fi %doc COPYING changelog.txt releasenotes.txt %changelog +* Sun Feb 14 2010 Tom Eastep tom@shorewall.net +- Updated to 4.4.7-2 * Sat Feb 13 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.7-1 * Thu Feb 11 2010 Tom Eastep tom@shorewall.net diff --git a/Shorewall-lite/uninstall.sh b/Shorewall-lite/uninstall.sh index b3e70aa8c..4d3a0754f 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.7.1 +VERSION=4.4.7.2 usage() # $1 = exit status { diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm index 20e9b4baf..cbcfc147e 100644 --- a/Shorewall/Perl/Shorewall/Config.pm +++ b/Shorewall/Perl/Shorewall/Config.pm @@ -337,7 +337,7 @@ sub initialize( $ ) { TC_SCRIPT => '', EXPORT => 0, UNTRACKED => 0, - VERSION => "4.4.7.1", + VERSION => "4.4.7.2", CAPVERSION => 40407 , ); diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index 09d291b8b..0576f3a9a 100644 --- a/Shorewall/changelog.txt +++ b/Shorewall/changelog.txt @@ -1,4 +1,8 @@ -Changes in Shorewall 4.4.7-1 +Changes in Shorewall 4.4.7.2 + +1) Fix detection of "Old hashlimit match". + +Changes in Shorewall 4.4.7.1 1) Don't apply rate limiting twice in NAT rules. diff --git a/Shorewall/install.sh b/Shorewall/install.sh index 42451a6a5..f7e660418 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.7.1 +VERSION=4.4.7.2 usage() # $1 = exit status { diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index 5932f6e91..d1e98a85b 100644 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -187,6 +187,14 @@ Shorewall 4.4.7 Patch Release 1. P R O B L E M S C O R R E C T E D I N 4 . 4 . 7 . 1 ---------------------------------------------------------------------------- +1) Detection of the 'Old hashlimit match' capability was broken in + /sbin/shorewall, /sbin/shorewall-lite and in the IPv4 version of + shorecap. + +---------------------------------------------------------------------------- + P R O B L E M S C O R R E C T E D I N 4 . 4 . 7 . 1 +---------------------------------------------------------------------------- + 1) All versions of Shorewall-perl mishandle per-IP rate limiting in REDIRECT and DNAT rules. The effective rate and burst are 1/2 of the values given in the rule. diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec index 13e876c6a..710f953d2 100644 --- a/Shorewall/shorewall.spec +++ b/Shorewall/shorewall.spec @@ -1,6 +1,6 @@ %define name shorewall %define version 4.4.7 -%define release 1 +%define release 2 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems. Name: %{name} @@ -107,6 +107,8 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt Contrib/* Samples %changelog +* Sun Feb 14 2010 Tom Eastep tom@shorewall.net +- Updated to 4.4.7-2 * Sat Feb 13 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.7-1 * Thu Feb 11 2010 Tom Eastep tom@shorewall.net diff --git a/Shorewall/uninstall.sh b/Shorewall/uninstall.sh index 31ac359be..09a2a38a6 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.7.1 +VERSION=4.4.7.2 usage() # $1 = exit status { diff --git a/Shorewall6-lite/fallback.sh b/Shorewall6-lite/fallback.sh index d23a48d2c..e67618772 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.7.1 +VERSION=4.4.7.2 usage() # $1 = exit status { diff --git a/Shorewall6-lite/install.sh b/Shorewall6-lite/install.sh index 78d650697..7da5f3193 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.7.1 +VERSION=4.4.7.2 usage() # $1 = exit status { diff --git a/Shorewall6-lite/shorewall6-lite.spec b/Shorewall6-lite/shorewall6-lite.spec index aa027f6ca..1b95dad8b 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.7 -%define release 1 +%define release 2 Summary: Shoreline Firewall 6 Lite is an ip6tables-based firewall for Linux systems. Name: %{name} @@ -91,6 +91,8 @@ fi %doc COPYING changelog.txt releasenotes.txt %changelog +* Sun Feb 14 2010 Tom Eastep tom@shorewall.net +- Updated to 4.4.7-2 * Sat Feb 13 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.7-1 * Thu Feb 11 2010 Tom Eastep tom@shorewall.net diff --git a/Shorewall6-lite/uninstall.sh b/Shorewall6-lite/uninstall.sh index f33e4c669..191b68cd9 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.7.1 +VERSION=4.4.7.2 usage() # $1 = exit status { diff --git a/Shorewall6/fallback.sh b/Shorewall6/fallback.sh index 7b40e34b2..5c3ab0b1c 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.7.1 +VERSION=4.4.7.2 usage() # $1 = exit status { diff --git a/Shorewall6/install.sh b/Shorewall6/install.sh index e95bcb665..fbf8387c2 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.7.1 +VERSION=4.4.7.2 usage() # $1 = exit status { diff --git a/Shorewall6/shorewall6.spec b/Shorewall6/shorewall6.spec index 1d8df234b..e96b52d76 100644 --- a/Shorewall6/shorewall6.spec +++ b/Shorewall6/shorewall6.spec @@ -1,6 +1,6 @@ %define name shorewall6 %define version 4.4.7 -%define release 1 +%define release 2 Summary: Shoreline Firewall 6 is an ip6tables-based firewall for Linux systems. Name: %{name} @@ -96,6 +96,8 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn ipv6 Samples6 %changelog +* Sun Feb 14 2010 Tom Eastep tom@shorewall.net +- Updated to 4.4.7-2 * Sat Feb 13 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.7-1 * Thu Feb 11 2010 Tom Eastep tom@shorewall.net diff --git a/Shorewall6/uninstall.sh b/Shorewall6/uninstall.sh index 02a9fb750..3ac47795e 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.7.1 +VERSION=4.4.7.2 usage() # $1 = exit status {