diff --git a/STABLE2/changelog.txt b/STABLE2/changelog.txt index 136de49d8..014cb2993 100644 --- a/STABLE2/changelog.txt +++ b/STABLE2/changelog.txt @@ -73,3 +73,5 @@ Changes since 2.0.1 35) Load modules before detecting capabilities. 36) Fix 'newnotsyn' in the hosts file. + +37) Fix double LOG rules in actions. \ No newline at end of file diff --git a/STABLE2/fallback.sh b/STABLE2/fallback.sh index d634103f6..51e774a61 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.2d +VERSION=2.0.2e usage() # $1 = exit status { diff --git a/STABLE2/firewall b/STABLE2/firewall index 6023f3b4d..b16aa7dd6 100755 --- a/STABLE2/firewall +++ b/STABLE2/firewall @@ -2496,8 +2496,9 @@ add_an_action() $(fix_bang $proto $sports $multiport $cli -d $srv $dports) fi - run_iptables2 -A $action $proto $multiport $cli $sports \ - -d $srv $dports $ratelimit $userandgroup -j $target + [ "$logtarget" = LOG ] || \ + run_iptables2 -A $action $proto $multiport $cli $sports \ + -d $srv $dports $ratelimit $userandgroup -j $target done done else @@ -2506,8 +2507,9 @@ add_an_action() $(fix_bang $proto $sports $multiport $cli $dports) fi - run_iptables2 -A $action $proto $multiport $cli $sports \ - $dports $ratelimit $userandgroup -j $target + [ "$logtarget" = LOG ] || \ + run_iptables2 -A $action $proto $multiport $cli $sports \ + $dports $ratelimit $userandgroup -j $target fi fi } diff --git a/STABLE2/install.sh b/STABLE2/install.sh index 5d9c0fb5e..da757d8bc 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.2d +VERSION=2.0.2e usage() # $1 = exit status { diff --git a/STABLE2/releasenotes.txt b/STABLE2/releasenotes.txt index 659776f66..e079a53b5 100644 --- a/STABLE2/releasenotes.txt +++ b/STABLE2/releasenotes.txt @@ -39,6 +39,9 @@ Problems Corrected since 2.0.2 capabilities will be misdetected. 7) The 'newnotsyn' option in /etc/shorewall/hosts has no effect. + +8) When used within an action, the LOG target produces two logging + rules. ----------------------------------------------------------------------- Issues when migrating from Shorewall 2.0.1 to Shorewall 2.0.2: diff --git a/STABLE2/shorewall.spec b/STABLE2/shorewall.spec index d482d1a68..f8f3dacea 100644 --- a/STABLE2/shorewall.spec +++ b/STABLE2/shorewall.spec @@ -1,5 +1,5 @@ %define name shorewall -%define version 2.0.2d +%define version 2.0.2e %define release 1 %define prefix /usr @@ -141,6 +141,8 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel %changelog +* Sat May 29 2004 Tom Eastep tom@shorewall.net +- Updated for 2.0.2e-1 * Thu May 27 2004 Tom Eastep tom@shorewall.net - Updated for 2.0.2d-1 * Fri May 21 2004 Tom Eastep tom@shorewall.net diff --git a/STABLE2/uninstall.sh b/STABLE2/uninstall.sh index 9e1ee55e8..43a8bc424 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.2d +VERSION=2.0.2e usage() # $1 = exit status {