From a18c57386892f0381cca39cc861f8eacb2956876 Mon Sep 17 00:00:00 2001 From: teastep Date: Tue, 16 Sep 2003 19:44:49 +0000 Subject: [PATCH] Beta 2 plus fix proxy ARP routes git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@738 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall/changelog.txt | 5 +++++ Shorewall/fallback.sh | 2 +- Shorewall/firewall | 4 ++-- Shorewall/install.sh | 2 +- Shorewall/releasenotes.txt | 7 +++++++ Shorewall/shorewall.spec | 4 +++- Shorewall/uninstall.sh | 2 +- 7 files changed, 20 insertions(+), 6 deletions(-) diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index d4cba1d0c..50428a121 100755 --- a/Shorewall/changelog.txt +++ b/Shorewall/changelog.txt @@ -70,3 +70,8 @@ Changes since 1.4.6 load-balancing. 31) Fix IPV6 address confusion. + +32) Add "o.gz" to the list of module extensions. + +33) Replace existing route to PROXY ARP host rather than adding another + one. diff --git a/Shorewall/fallback.sh b/Shorewall/fallback.sh index fbe3c7399..2d04db42b 100755 --- a/Shorewall/fallback.sh +++ b/Shorewall/fallback.sh @@ -28,7 +28,7 @@ # shown below. Simply run this script to revert to your prior version of # Shoreline Firewall. -VERSION=1.4.7-Beta1 +VERSION=1.4.7-Beta2 usage() # $1 = exit status { diff --git a/Shorewall/firewall b/Shorewall/firewall index 1f37367f9..6c70f775a 100755 --- a/Shorewall/firewall +++ b/Shorewall/firewall @@ -1349,7 +1349,7 @@ setup_proxy_arp() { ;; esac - [ -z "$haveroute" ] && run_ip route add $address dev $interface + [ -z "$haveroute" ] && run_ip route replace $address dev $interface run_arp -Ds $address $external pub @@ -3069,7 +3069,7 @@ loadmodule() # $1 = module name, $2 - * arguments if [ -z "`lsmod | grep $modulename`" ]; then shift - for suffix in o gz ko ; do + for suffix in o gz ko o.gz ; do modulefile=$MODULESDIR/${modulename}.${suffix} if [ -f $modulefile ]; then diff --git a/Shorewall/install.sh b/Shorewall/install.sh index d6413bd40..f8f405a13 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -54,7 +54,7 @@ # /etc/rc.d/rc.local file is modified to start the firewall. # -VERSION=1.4.7-Beta1 +VERSION=1.4.7-Beta2 usage() # $1 = exit status { diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index 32b6c42da..87a8169f7 100755 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -44,6 +44,13 @@ Problems Corrected since version 1.4.6: about the interface (such as when "detect" appears in the BROADCAST column of the /etc/shorewall/interfaces file). +10) Shorewall will now load module files that are formed from the + module name by appending ".o.gz". + +11) When Shorewall adds a route to a proxy ARP host and such a route + already exists, two routes resulted. This has been corrected so + that the existing route is replaced if it already exists. + Migration Issues: 1) IP Traffic Accounting is changed from Snapshot 20030813. diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec index 911bf9fa5..2dd88fa1c 100644 --- a/Shorewall/shorewall.spec +++ b/Shorewall/shorewall.spec @@ -1,6 +1,6 @@ %define name shorewall %define version 1.4.7 -%define release 0Beta1 +%define release 0Beta2 %define prefix /usr Summary: Shoreline Firewall is an iptables-based firewall for Linux systems. @@ -109,6 +109,8 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel %changelog +* Mon Sep 15 2003 Tom Eastep +- Changed version to 1.4.7-0Beta2 * Mon Aug 25 2003 Tom Eastep - Changed version to 1.4.7-0Beta1 * Sat Aug 23 2003 Tom Eastep diff --git a/Shorewall/uninstall.sh b/Shorewall/uninstall.sh index 6a4b5c21f..32434b82e 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 Seattle Firewall -VERSION=1.4.7-Beta1 +VERSION=1.4.7-Beta2 usage() # $1 = exit status {