Shorewall 1-4.10a

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1130 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb

Lrp/usr/share/shorewall/firewall

@@ -1459,7 +1459,7 @@ setup_mac_lists() {
     #
     for interface in $maclist_interfaces; do
 	case $interface in
-	    eth*|wlan*|br[0-9])
+	    eth*|wlan*|br[0-9]|ath[0-9])
 		;;
 	    *)
 		fatal_error "MAC verification is only supported on ethernet and 802.11b devices: $interface"
@@ -3917,8 +3917,8 @@ setup_masq()
 		;;
 	esac
 
+	temp=
 	if [ -n "$addresses" ]; then
-	    temp=
 	    for address in `separate_list $addresses`; do
 		temp="$temp --to-source $address"
 	    done
@@ -3938,7 +3938,7 @@ setup_masq()
 		    echo "   To $destination from $s through ${interface}"
 		fi
 	    done
-	elif [ -n "$address" ]; then
+	elif [ -n "$addresses" ]; then
 	    for destnet in $(separate_list $destnets); do
 		addnatrule $chain -d $destnet -j SNAT $temp
 	    done

Lrp/usr/share/shorewall/version

@@ -1 +1 @@
-1.4.10
+1.4.10a

Lrp/var/lib/lrpkg/shorwall.version

@@ -1 +1 @@
-1.4.10
+1.4.10a

STABLE/changelog.txt

@@ -21,3 +21,7 @@ Changes since 1.4.9
 9) Don't add broadcasts to /0 groups.
 
 10) Fix "-" in PROTO column of an action file.
+
+11) Fix the enhancement in 1) above to avoid startup errors.
+
+12) Allow maclist with Atheros cards

STABLE/fallback.sh

@@ -28,7 +28,7 @@
 #       shown below. Simply run this script to revert to your prior version of
 #       Shoreline Firewall.
 
-VERSION=1.4.10
+VERSION=1.4.10a
 
 usage() # $1 = exit status
 {

STABLE/firewall

@@ -1459,7 +1459,7 @@ setup_mac_lists() {
     #
     for interface in $maclist_interfaces; do
 	case $interface in
-	    eth*|wlan*|br[0-9])
+	    eth*|wlan*|br[0-9]|ath[0-9])
 		;;
 	    *)
 		fatal_error "MAC verification is only supported on ethernet and 802.11b devices: $interface"
@@ -3917,8 +3917,8 @@ setup_masq()
 		;;
 	esac
 
+	temp=
 	if [ -n "$addresses" ]; then
-	    temp=
 	    for address in `separate_list $addresses`; do
 		temp="$temp --to-source $address"
 	    done
@@ -3938,7 +3938,7 @@ setup_masq()
 		    echo "   To $destination from $s through ${interface}"
 		fi
 	    done
-	elif [ -n "$address" ]; then
+	elif [ -n "$addresses" ]; then
 	    for destnet in $(separate_list $destnets); do
 		addnatrule $chain -d $destnet -j SNAT $temp
 	    done

STABLE/install.sh

@@ -54,7 +54,7 @@
 #        /etc/rc.d/rc.local file is modified to start the firewall.
 #
 
-VERSION=1.4.10
+VERSION=1.4.10a
 
 usage() # $1 = exit status
 {

STABLE/releasenotes.txt

@@ -19,6 +19,12 @@ Problems Corrected since version 1.4.9:
 5. Specifying "-" or "all" in the PROTO column of an action no longer
    causes a startup error. 
 
+6. Fixed a problem in which the firewall would encounter an error
+   during startup while processing the /etc/shorewall/masq file.
+
+7. Atheros WiFi cards were previously excluded from use with the
+   "maclist" interface option.
+
 Migration Issues:
 
 None.

STABLE/shorewall.spec

@@ -1,5 +1,5 @@
 %define name shorewall
-%define version 1.4.10
+%define version 1.4.10a
 %define release 1
 %define prefix /usr
 
@@ -109,6 +109,8 @@ fi
 %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel
 
 %changelog
+* Sun Feb 08 2004 Tom Eastep <tom@shorewall.net>
+- Changed version to 1.4.10a-1
 * Fri Jan 30 2004 Tom Eastep <tom@shorewall.net>
 - Changed version to 1.4.10-1
 * Tue Jan 27 2004 Tom Eastep <tom@shorewall.net>

STABLE/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.10
+VERSION=1.4.10a
 
 usage() # $1 = exit status
 {