diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm index 0590ba21c..dd2612bd2 100644 --- a/Shorewall/Perl/Shorewall/Config.pm +++ b/Shorewall/Perl/Shorewall/Config.pm @@ -3075,7 +3075,7 @@ sub get_configuration( $ ) { # # get_capabilities requires that the true settings of these options be established # - default 'MODULE_PREFIX', 'o gz ko o.gz ko.gz'; + default 'MODULE_PREFIX', 'ko ko.gz o o.gz gz'; default_yes_no 'LOAD_HELPERS_ONLY' , ''; get_capabilities( $export ); diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index 8c8f33039..1821b253d 100644 --- a/Shorewall/changelog.txt +++ b/Shorewall/changelog.txt @@ -1,3 +1,19 @@ +Changes in Shorewall 4.4.18 Beta 4 + +1) Fix trivalue handling AGAIN. + +2) Change default value of MODULE_PREFIX. + +Changes in Shorewall 4.4.18 Beta 3 + +1) Change default chain in FORWARD section of the accounting file. + +2) Restrict USER/GROUP to OUTPUT section. + +3) Restore prohibition of MAC addresses in unsectioned config. + +4) Fix several optimizer problems. + Changes in Shorewall 4.4.18 Beta 2 1) Fix the 'local' Provider option in IPv6 diff --git a/Shorewall/lib.common b/Shorewall/lib.common index 698685e42..9f62c4b7b 100644 --- a/Shorewall/lib.common +++ b/Shorewall/lib.common @@ -258,7 +258,7 @@ reload_kernel_modules() { moduleloader=insmod fi - [ -n "${MODULE_SUFFIX:=o gz ko o.gz ko.gz}" ] + [ -n "${MODULE_SUFFIX:=ko ko.gz o o.gz gz}" ] [ -z "$MODULESDIR" ] && \ uname=$(uname -r) && \ diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index e0396ec0d..5c2b30cb0 100644 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -14,10 +14,13 @@ 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.18 Beta 3 +4.4.18 Beta 4 1) Edting of the MARK column has been tighened to catch errors at - compile time. + compile time. + +2) The MODULE_SUFFIX default has been changed to "ko ko.gz o o.gz gz" + to get the most common suffixes at the front of the list. 4.4.18 Beta 2 diff --git a/Shorewall6/lib.common b/Shorewall6/lib.common index 00b3ddfe4..0b4022ce1 100644 --- a/Shorewall6/lib.common +++ b/Shorewall6/lib.common @@ -279,7 +279,7 @@ reload_kernel_modules() { moduleloader=insmod fi - [ -n "${MODULE_SUFFIX:=o gz ko o.gz ko.gz}" ] + [ -n "${MODULE_SUFFIX:=ko ko.gz o o.gz gz}" ] [ -z "$MODULESDIR" ] && MODULESDIR=/lib/modules/$(uname -r)/kernel/net/ipv6/netfilter:/lib/modules/$(uname -r)/kernel/net/netfilter:/lib/modules/$(uname -r)/kernel/net/sched MODULES=$(lsmod | cut -d ' ' -f1) diff --git a/manpages/shorewall.conf.xml b/manpages/shorewall.conf.xml index 10416a313..01fd2913c 100644 --- a/manpages/shorewall.conf.xml +++ b/manpages/shorewall.conf.xml @@ -1163,8 +1163,8 @@ net all DROP infothen the chain name is 'net2all' The value of this option determines the possible file - extensions of kernel modules. The default value is "o gz ko - o.gz". + extensions of kernel modules. The default value is "ko ko.gz o o.gz + gz". diff --git a/manpages6/shorewall6.conf.xml b/manpages6/shorewall6.conf.xml index 7ba9024a0..a8937f84a 100644 --- a/manpages6/shorewall6.conf.xml +++ b/manpages6/shorewall6.conf.xml @@ -1003,8 +1003,8 @@ net all DROP infothen the chain name is 'net2all' The value of this option determines the possible file - extensions of kernel modules. The default value is "o gz ko - o.gz". + extensions of kernel modules. The default value is "ko ko.gz o o.gz + gz".