diff --git a/Shorewall/fallback.sh b/Shorewall/fallback.sh index 4d827f543..7fa1c2f95 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.3.13 +VERSION=1.3.14Beta1 usage() # $1 = exit status { diff --git a/Shorewall/firewall b/Shorewall/firewall index 344a2454f..f5f285ad1 100755 --- a/Shorewall/firewall +++ b/Shorewall/firewall @@ -2899,7 +2899,7 @@ rules_chain() # $1 = source zone, $2 = destination zone } # -# Get the subnets routed out of a given interface +# echo the list of subnets routed out of a given interface # get_routed_subnets() # $1 = interface name { @@ -2908,7 +2908,7 @@ get_routed_subnets() # $1 = interface name ip route show dev $1 2> /dev/null | while read address rest; do - [ -z "`echo "$address" | grep '/'`" ] && address="${address}/32" + [ "$address" = "${address%/*}" ] && address="${address}/32" echo $address done } @@ -2979,7 +2979,7 @@ setup_masq() ;; *) subnets=`get_routed_subnets $subnet` - [ -z "$subnets" ] && startup_error "Unable to determine the address(es) for interface $subnet" + [ -z "$subnets" ] && startup_error "Unable to determine the routes through interface $subnet" subnet="$subnets" ;; esac diff --git a/Shorewall/install.sh b/Shorewall/install.sh index 53315b252..4a645f38d 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.3.13 +VERSION=1.3.14Beta1 usage() # $1 = exit status { diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index ad19fc43a..260066776 100755 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -38,12 +38,11 @@ New features include: #INTERFACE SUBNET ADDRESS eth0 eth2 206.124.146.176 #LAST LINE -- ADD YOUR ENTRIES ABOVE THIS LINE -- DO NOT REMOVE + [root@gateway test]# ip route show dev eth2 192.168.1.0/24 scope link 192.168.10.0/24 proto kernel scope link src 192.168.10.254 - [root@gateway test]# ADDRESS - eth0 eth2 206.124.146.176 - #LAST LINE -- ADD YOUR ENTRIES ABOVE THIS LINE -- DO NOT REMOVE + [root@gateway test]# ip route show dev eth2 192.168.1.0/24 scope link 192.168.10.0/24 proto kernel scope link src 192.168.10.254 @@ -70,6 +69,7 @@ New features include: eth0 eth2 206.124.146.176 eth0 192.168.10.0/24 206.124.146.176 #LAST LINE -- ADD YOUR ENTRIES ABOVE THIS LINE -- DO NOT REMOVE + [root@gateway test]# ip route show dev eth2 192.168.1.0/24 scope link 192.168.10.0/24 proto kernel scope link src 192.168.10.254 @@ -84,6 +84,7 @@ New features include: #INTERFACE SUBNET ADDRESS eth0 eth2 206.124.146.176 #LAST LINE -- ADD YOUR ENTRIES ABOVE THIS LINE -- DO NOT REMOVE + [root@gateway test]# ip route show dev eth2 192.168.1.0/24 scope link 192.168.10.0/24 proto kernel scope link src 192.168.10.254 diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec index e77c3cbf2..ae7838fff 100644 --- a/Shorewall/shorewall.spec +++ b/Shorewall/shorewall.spec @@ -1,6 +1,6 @@ %define name shorewall -%define version 1.3.13 -%define release 1 +%define version 1.3.14 +%define release 0Beta1 %define prefix /usr Summary: Shoreline Firewall is an iptables-based firewall for Linux systems. @@ -105,6 +105,8 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel %changelog +* Sat Jan 25 2003 Tom Eastep +- Changes version to 1.3.14-0Beta1 * Mon Jan 13 2003 Tom Eastep - Changes version to 1.3.13 * Fri Dec 27 2002 Tom Eastep diff --git a/Shorewall/uninstall.sh b/Shorewall/uninstall.sh index c4d83c1fa..36e3d31d3 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.3.13 +VERSION=1.3.14Beta1 usage() # $1 = exit status {