From 26cb2b1eeb774040fc16e10feebdf2214a48f1da Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sun, 26 Jul 2009 12:26:49 -0700 Subject: [PATCH] Allow Shorewall6 to recognize TC, IP and IPSET --- Shorewall/Perl/Shorewall/Config.pm | 3 +++ Shorewall/changelog.txt | 4 ++++ Shorewall/releasenotes.txt | 30 +++++++----------------------- web/shorewall_index.htm | 8 ++++---- 4 files changed, 18 insertions(+), 27 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm index c1bce1020..0cee835bf 100644 --- a/Shorewall/Perl/Shorewall/Config.pm +++ b/Shorewall/Perl/Shorewall/Config.pm @@ -488,6 +488,9 @@ sub initialize( $ ) { # Location of Files # IP6TABLES => undef, + IP => undef, + TC => undef, + IPSET => undef, # #PATH is inherited # diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index e36658e19..b9fa678b6 100644 --- a/Shorewall/changelog.txt +++ b/Shorewall/changelog.txt @@ -1,3 +1,7 @@ +Changes in Shorewall 4.4.0-RC2 + +1) Fix capabilities file with Shorewall6. + Changes in Shorewall 4.4.0-RC1 1) Delete duplicate Git macro. diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index c2a846ab8..38d6b833a 100644 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -1,4 +1,4 @@ -Shorewall 4.4.0 RC1 +Shorewall 4.4.0 RC2 ---------------------------------------------------------------------------- R E L E A S E 4 . 4 H I G H L I G H T S @@ -110,25 +110,13 @@ Shorewall 4.4.0 RC1 released. ---------------------------------------------------------------------------- - P R O B L E M S C O R R E C T E D I N 4 . 4 . 0 RC1 + P R O B L E M S C O R R E C T E D I N 4 . 4 . 0 RC2 ---------------------------------------------------------------------------- -1) The duplicate macro GIT has been deleted. +1) In RC1, Shorewall6 reported that the capabilities file did not + contain the latest additions. -2) Previously, Shorewall might alter the routing when there were no - providers, even if the "-n" option was given. - -3) Previously, NONAT rules on a sub-zone were not exempted from - DNAT/REDIRECT rules of a parent zone. - -4) Previously if the 'status' command was run by someone other than - root, the response always show that the firewall was stopped and - the state was 'Unknown'. Now an error message is generated to - indicate that the command may only be run by root. - -5) Previously, if 'rpm -U' was used to upgrade from a version of - Shorewall earlier than 4.3.5, then Shorewall would not start - automatically at boot time. +2) Shorewall6 did not recognize the TC, IP and IPSET options. ---------------------------------------------------------------------------- K N O W N P R O B L E M S R E M A I N I N G @@ -137,14 +125,10 @@ Shorewall 4.4.0 RC1 None. ---------------------------------------------------------------------------- - N E W F E A T U R E S I N 4 . 4 . 0 RC1 + N E W F E A T U R E S I N 4 . 4 . 0 RC2 ---------------------------------------------------------------------------- -1) A new keyword 'any' may be used in the SOURCE and DEST columns of - the rules file. In the absense of nested zones, 'any' works the - same as 'all'. When there are nested zones, 'any' only selects the - top-level zones. 'any' is intended to be used with - IMPLICIT_CONTINUE=Yes in shorewall.conf. +None. ---------------------------------------------------------------------------- N E W F E A T U R E S IN 4 . 4 diff --git a/web/shorewall_index.htm b/web/shorewall_index.htm index dcabe9f50..b5a605ba4 100644 --- a/web/shorewall_index.htm +++ b/web/shorewall_index.htm @@ -47,7 +47,7 @@ -
2009-07-12
+
2009-07-26

Attention Shorewall-shell users

Current Shorewall Releases

@@ -93,14 +93,14 @@ Release
4.4.0 -Beta 4
+RC 1
Release + href="http://www1.shorewall.net/pub/shorewall/development/4.4/shorewall-4.4.0-RC1/releasenotes.txt">Release Notes
Known + href="http://www1.shorewall.net/pub/shorewall/development/4.4/shorewall-4.4.0-RC1/known_problems.txt">Known Problems