diff --git a/STABLE2/changelog.txt b/STABLE2/changelog.txt index 0ada9982f..1d775569d 100644 --- a/STABLE2/changelog.txt +++ b/STABLE2/changelog.txt @@ -68,3 +68,5 @@ Changes since 1.4.10 33) Correct a comment in the rules file. Update for 2.0.0 final release. 34) Eliminate Warning about Policy as rule when using actions. + +35) Implement Sean Mathews's fix for Proxy ARP/IPSEC. diff --git a/STABLE2/fallback.sh b/STABLE2/fallback.sh index 0426ef11b..6aa8f8bb4 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.0 +VERSION=2.0.0b usage() # $1 = exit status { diff --git a/STABLE2/firewall b/STABLE2/firewall index 0fb91993b..1329d095e 100755 --- a/STABLE2/firewall +++ b/STABLE2/firewall @@ -1368,7 +1368,7 @@ setup_proxy_arp() { [ -n "$persistent" ] && haveroute=yes fi - run_arp -Ds $address $external pub + run_arp -i $external -Ds $address $external pub echo 1 > /proc/sys/net/ipv4/conf/$interface/proxy_arp echo 0 > /proc/sys/net/ipv4/conf/$external/proxy_arp diff --git a/STABLE2/install.sh b/STABLE2/install.sh index 5dd432d76..0e83f5b98 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.0 +VERSION=2.0.0b usage() # $1 = exit status { diff --git a/STABLE2/releasenotes.txt b/STABLE2/releasenotes.txt index f809cc15d..5390db2a7 100644 --- a/STABLE2/releasenotes.txt +++ b/STABLE2/releasenotes.txt @@ -1,4 +1,4 @@ -Shorewall 2.0.0a +Shorewall 2.0.0b ---------------------------------------------------------------------- Problems Corrected since 1.4.10 @@ -30,6 +30,9 @@ Problems Corrected since 2.0.0 1) Using actions in the manner recommended in the documentation results in a Warning that the rule is a policy. +2) Thanks to Sean Mathews, a long-time problem with Proxy ARP and IPSEC + has been corrected. + ----------------------------------------------------------------------- Issues when migrating from Shorewall 1.4.x to Shorewall 2.0.0: diff --git a/STABLE2/shorewall.spec b/STABLE2/shorewall.spec index 639f7c9e1..6ff60c28d 100644 --- a/STABLE2/shorewall.spec +++ b/STABLE2/shorewall.spec @@ -1,5 +1,5 @@ %define name shorewall -%define version 2.0.0 +%define version 2.0.0b %define release 1 %define prefix /usr @@ -137,6 +137,10 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel %changelog +* Sat Mar 20 2004 Tom Eastep +- Update for 2.0.0b +* Wed Mar 17 2004 Tom Eastep +- Update for 2.0.0a * Sat Mar 13 2004 Tom Eastep - Update for 2.0.0 Final * Sat Mar 06 2004 Tom Eastep diff --git a/STABLE2/uninstall.sh b/STABLE2/uninstall.sh index 3ed960efa..cd5251bbc 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.0 +VERSION=2.0.0b usage() # $1 = exit status {