diff --git a/Lrp2/usr/share/shorewall/firewall b/Lrp2/usr/share/shorewall/firewall index b16aa7dd6..9d186d78d 100755 --- a/Lrp2/usr/share/shorewall/firewall +++ b/Lrp2/usr/share/shorewall/firewall @@ -5952,6 +5952,7 @@ do_initialize() { # accurately detected when kernel module autoloading is not # enabled. # + [ -n "$MODULE_SUFFIX" ] || MODULE_SUFFIX="o gz ko o.gz ko.gz" load_kernel_modules determine_capabilities @@ -6067,8 +6068,6 @@ do_initialize() { BRIDGING=$(added_param_value_no BRIDGING $BRIDGING) DYNAMIC_ZONES=$(added_param_value_no DYNAMIC_ZONES $DYNAMIC_ZONES) - [ -n "$MODULE_SUFFIX" ] || MODULE_SUFFIX="o gz ko o.gz ko.gz" - # # Strip the files that we use often # diff --git a/Lrp2/usr/share/shorewall/version b/Lrp2/usr/share/shorewall/version index 4ddc9837b..5e388152b 100644 --- a/Lrp2/usr/share/shorewall/version +++ b/Lrp2/usr/share/shorewall/version @@ -1 +1 @@ -2.0.2e +2.0.2f diff --git a/STABLE2/changelog.txt b/STABLE2/changelog.txt index 014cb2993..3b3d2762c 100644 --- a/STABLE2/changelog.txt +++ b/STABLE2/changelog.txt @@ -74,4 +74,6 @@ Changes since 2.0.1 36) Fix 'newnotsyn' in the hosts file. -37) Fix double LOG rules in actions. \ No newline at end of file +37) Fix double LOG rules in actions. + +38) Another kernel module disaster fixed. \ No newline at end of file diff --git a/STABLE2/fallback.sh b/STABLE2/fallback.sh index 51e774a61..abd004fdd 100755 --- a/STABLE2/fallback.sh +++ b/STABLE2/fallback.sh @@ -28,7 +28,7 @@ # shown below. Simply run this script to revert to your prior version of # Shoreline Firewall. -VERSION=2.0.2e +VERSION=2.0.2f usage() # $1 = exit status { diff --git a/STABLE2/firewall b/STABLE2/firewall index b16aa7dd6..9d186d78d 100755 --- a/STABLE2/firewall +++ b/STABLE2/firewall @@ -5952,6 +5952,7 @@ do_initialize() { # accurately detected when kernel module autoloading is not # enabled. # + [ -n "$MODULE_SUFFIX" ] || MODULE_SUFFIX="o gz ko o.gz ko.gz" load_kernel_modules determine_capabilities @@ -6067,8 +6068,6 @@ do_initialize() { BRIDGING=$(added_param_value_no BRIDGING $BRIDGING) DYNAMIC_ZONES=$(added_param_value_no DYNAMIC_ZONES $DYNAMIC_ZONES) - [ -n "$MODULE_SUFFIX" ] || MODULE_SUFFIX="o gz ko o.gz ko.gz" - # # Strip the files that we use often # diff --git a/STABLE2/install.sh b/STABLE2/install.sh index da757d8bc..8b995d1ec 100755 --- a/STABLE2/install.sh +++ b/STABLE2/install.sh @@ -22,7 +22,7 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA # -VERSION=2.0.2e +VERSION=2.0.2f usage() # $1 = exit status { diff --git a/STABLE2/releasenotes.txt b/STABLE2/releasenotes.txt index e079a53b5..25a3e9b46 100644 --- a/STABLE2/releasenotes.txt +++ b/STABLE2/releasenotes.txt @@ -41,7 +41,9 @@ Problems Corrected since 2.0.2 7) The 'newnotsyn' option in /etc/shorewall/hosts has no effect. 8) When used within an action, the LOG target produces two logging - rules. + rules. + +9) Kernel Modules loading is still screwed up. ----------------------------------------------------------------------- Issues when migrating from Shorewall 2.0.1 to Shorewall 2.0.2: diff --git a/STABLE2/shorewall.spec b/STABLE2/shorewall.spec index f8f3dacea..2f699f103 100644 --- a/STABLE2/shorewall.spec +++ b/STABLE2/shorewall.spec @@ -1,5 +1,5 @@ %define name shorewall -%define version 2.0.2e +%define version 2.0.2f %define release 1 %define prefix /usr @@ -141,6 +141,8 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel %changelog +* Thu Jun 03 2004 Tom Eastep tom@shorewall.net +- Updated for 2.0.2f-1 * Sat May 29 2004 Tom Eastep tom@shorewall.net - Updated for 2.0.2e-1 * Thu May 27 2004 Tom Eastep tom@shorewall.net diff --git a/STABLE2/uninstall.sh b/STABLE2/uninstall.sh index 43a8bc424..ffdb2c3c1 100755 --- a/STABLE2/uninstall.sh +++ b/STABLE2/uninstall.sh @@ -26,7 +26,7 @@ # You may only use this script to uninstall the version # shown below. Simply run this script to remove Seattle Firewall -VERSION=2.0.2e +VERSION=2.0.2f usage() # $1 = exit status {