diff --git a/Shorewall-init/install.sh b/Shorewall-init/install.sh index 61441bc88..012846e9e 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.17-RC1 +VERSION=4.4.17 usage() # $1 = exit status { diff --git a/Shorewall-init/shorewall-init.spec b/Shorewall-init/shorewall-init.spec index 41bee7299..c40c6d3ba 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.17 -%define release 0RC1 +%define release 0base Summary: Shorewall-init adds functionality to Shoreline Firewall (Shorewall). Name: %{name} @@ -119,6 +119,8 @@ fi %doc COPYING changelog.txt releasenotes.txt %changelog +* Fri Feb 04 2011 Tom Eastep tom@shorewall.net +- Updated to 4.4.17-0base * Sun Jan 30 2011 Tom Eastep tom@shorewall.net - Updated to 4.4.17-0RC1 * Fri Jan 28 2011 Tom Eastep tom@shorewall.net diff --git a/Shorewall-init/uninstall.sh b/Shorewall-init/uninstall.sh index 9bec01045..16a3968d5 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.17-RC1 +VERSION=4.4.17 usage() # $1 = exit status { diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh index 9edfb40f0..8ffe4e5dc 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.17-RC1 +VERSION=4.4.17 usage() # $1 = exit status { diff --git a/Shorewall-lite/shorewall-lite.spec b/Shorewall-lite/shorewall-lite.spec index 9ecf75f29..480a03c46 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.17 -%define release 0RC1 +%define release 0base 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 Feb 04 2011 Tom Eastep tom@shorewall.net +- Updated to 4.4.17-0base * Sun Jan 30 2011 Tom Eastep tom@shorewall.net - Updated to 4.4.17-0RC1 * Fri Jan 28 2011 Tom Eastep tom@shorewall.net diff --git a/Shorewall-lite/uninstall.sh b/Shorewall-lite/uninstall.sh index 6b3a58a3c..a76780118 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.17-RC1 +VERSION=4.4.17 usage() # $1 = exit status { diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm index 4a9d79ee7..598dbf70a 100644 --- a/Shorewall/Perl/Shorewall/Config.pm +++ b/Shorewall/Perl/Shorewall/Config.pm @@ -365,7 +365,7 @@ sub initialize( $ ) { EXPORT => 0, STATEMATCH => '-m state --state', UNTRACKED => 0, - VERSION => "4.4.17-RC1", + VERSION => "4.4.17", CAPVERSION => 40417 , ); # diff --git a/Shorewall/install.sh b/Shorewall/install.sh index a35a25413..3499b4938 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.17-RC1 +VERSION=4.4.17 usage() # $1 = exit status { diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index ef4ce7118..fcb285eb2 100644 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -1,6 +1,5 @@ ---------------------------------------------------------------------------- S H O R E W A L L 4 . 4 . 1 7 - R C 1 ---------------------------------------------------------------------------- I. PROBLEMS CORRECTED IN THIS RELEASE @@ -14,8 +13,6 @@ 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 ---------------------------------------------------------------------------- -RC 1 - 1) Previously, Shorewall did not check the length of the names of accounting chains and manual chains. This could result in errors when loading the resulting ruleset. Now, the compiler issues @@ -62,17 +59,7 @@ RC 1 This is now flagged as an error at compile time. -Beta 3 - -1) If the SOURCE column in /etc/shorewall6/rules contained an IPv6 - address enclosed in [...], a spurious error was generated: - - ERROR: Invalid VLSM (0]) : /etc/shorewall6/rules (line 20) - - The error did not occur if <...> was used to enclose the IPv6 - address. - -2) Two defects in compiler module loading have been corrected: +4) Two defects in compiler module loading have been corrected: a) Previously, the kernel/net/ipv6/netfilter/ directory was not searched. @@ -80,32 +67,28 @@ Beta 3 b) A Perl diagnostic was issued when running on a monolithic kernel when the modutils package was installed. -Beta 2 - -1) A line containing only 'INCLUDE' appearing in an extension script +5) A line containing only 'INCLUDE' appearing in an extension script now generates a compile-time diagnostic rather than a run-time diagnostic. -2) Previously, the uninstall.sh scripts used insserv (if installed) on +6) Previously, the uninstall.sh scripts used insserv (if installed) on Debian-based systems. These scripts now use the preferred tool (updaterc.d). -3) Beginning with 4.4.16, compilation would fail if an empty shell +7) Beginning with 4.4.16, compilation would fail if an empty shell variable was referenced in a config file on a system where /bin/sh is the Bourne Again Shell (bash). -4) In earlier versions. if OPTIMIZE=8 then the ruleset displayed by +8) In earlier versions. if OPTIMIZE=8 then the ruleset displayed by 'check -r' was the same as when OPTIMIZE=0 (unoptimized). Similarly, if OPTIMIZE=9 then the ruleset displayed was the same as when OPTIMIZE=1. -5) Startup could previously fail on a system where kernel module +9) Startup could previously fail on a system where kernel module autoloading was not available and where TC_ENABLED=Simple was specified in shorewall.conf. -Beta 1 - -1) Previously, a 'done.' message could be printed at the end of +10) Previously, a 'done.' message could be printed at the end of command processing even when the command had failed. Now, such a message only appears if the command completed successfully. @@ -120,13 +103,6 @@ Beta 1 I I I. N E W F E A T U R E S I N T H I S R E L E A S E ---------------------------------------------------------------------------- -RC 1 - -1) A 'show ipa' command has been added to /sbin/shorewall. It - displays each per-IP accounting table. - -Beta 3 - 1) This release adds support for per-IP accounting using the ACCOUNT target. That target is only available when xtables-addons is installed. This support has been successfully tested with @@ -206,9 +182,10 @@ Beta 3 "shorewall stop; shorewall start" to have a successful restart (counters will be cleared). -Beta 2 +2) A 'show ipa' command has been added to /sbin/shorewall. It + displays each per-IP accounting table. -1) Traditionally, the -lite products have used the modules (or +3) Traditionally, the -lite products have used the modules (or helpers) file on the firewall system unless there is a modules (or helpers) file in the configuration directory on the administrative system. This release introduces the USE_LOCAL_MODULES option in @@ -218,7 +195,7 @@ Beta 2 administrative system will be used to determine the set of modules loaded. -2) Given that shell variables are expanded at compile time, there was +4) Given that shell variables are expanded at compile time, there was previously no way to cause such variables to be expanded at run time. This made it difficult (to impossible) to include dynamic IP addresses in a Shorewall-lite configuration. @@ -257,16 +234,14 @@ Beta 2 that the firewall starts, the resulting Netfilter rule(s) containing the interface address are not added. -Beta 1 - -1) The shell variables set in /etc/shorewall/params +5) The shell variables set in /etc/shorewall/params (/etc/shorewall6/params) are now available in the compiled script at run-time with EXPORTPARAMS=No. The EXPORTPARAMS option is now deprecated and the released /etc/shorewall/shorewall.conf and /etc/shorewall/shorewall6.conf have been modified to specify EXPORTPARAMS=No. -2) The INCLUDE directive may now be used in the following extension +6) The INCLUDE directive may now be used in the following extension scripts: clear diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec index d89f5c3d9..44efba6f7 100644 --- a/Shorewall/shorewall.spec +++ b/Shorewall/shorewall.spec @@ -1,6 +1,6 @@ %define name shorewall %define version 4.4.17 -%define release 0RC1 +%define release 0base Summary: Shoreline Firewall is an iptables-based firewall for Linux systems. Name: %{name} @@ -109,6 +109,8 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt Contrib/* Samples %changelog +* Fri Feb 04 2011 Tom Eastep tom@shorewall.net +- Updated to 4.4.17-0base * Sun Jan 30 2011 Tom Eastep tom@shorewall.net - Updated to 4.4.17-0RC1 * Fri Jan 28 2011 Tom Eastep tom@shorewall.net diff --git a/Shorewall/uninstall.sh b/Shorewall/uninstall.sh index a402329bb..09c3e47df 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.17-RC1 +VERSION=4.4.17 usage() # $1 = exit status { diff --git a/Shorewall6-lite/install.sh b/Shorewall6-lite/install.sh index 8c86d1547..d383bac2c 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.17-RC1 +VERSION=4.4.17 usage() # $1 = exit status { diff --git a/Shorewall6-lite/shorewall6-lite.spec b/Shorewall6-lite/shorewall6-lite.spec index 2d798bd4d..bd961ef79 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.17 -%define release 0RC1 +%define release 0base 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 Feb 04 2011 Tom Eastep tom@shorewall.net +- Updated to 4.4.17-0base * Sun Jan 30 2011 Tom Eastep tom@shorewall.net - Updated to 4.4.17-0RC1 * Fri Jan 28 2011 Tom Eastep tom@shorewall.net diff --git a/Shorewall6-lite/uninstall.sh b/Shorewall6-lite/uninstall.sh index dd34d8dcb..0e0244c24 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.17-RC1 +VERSION=4.4.17 usage() # $1 = exit status { diff --git a/Shorewall6/install.sh b/Shorewall6/install.sh index 19a1b4098..b0b49f008 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.17-RC1 +VERSION=4.4.17 usage() # $1 = exit status { diff --git a/Shorewall6/shorewall6.spec b/Shorewall6/shorewall6.spec index 87c69466b..33d0d0ba7 100644 --- a/Shorewall6/shorewall6.spec +++ b/Shorewall6/shorewall6.spec @@ -1,6 +1,6 @@ %define name shorewall6 %define version 4.4.17 -%define release 0RC1 +%define release 0base 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 Feb 04 2011 Tom Eastep tom@shorewall.net +- Updated to 4.4.17-0base * Sun Jan 30 2011 Tom Eastep tom@shorewall.net - Updated to 4.4.17-0RC1 * Fri Jan 28 2011 Tom Eastep tom@shorewall.net diff --git a/Shorewall6/uninstall.sh b/Shorewall6/uninstall.sh index e553506cc..20ba75687 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.17-RC1 +VERSION=4.4.17 usage() # $1 = exit status { diff --git a/docs/GettingStarted.xml b/docs/GettingStarted.xml index 84692c0b6..0e8ff9a1f 100644 --- a/docs/GettingStarted.xml +++ b/docs/GettingStarted.xml @@ -24,6 +24,8 @@ 2010 + 2011 + Thomas M. Eastep