Fix adding range of aliases

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

Shorewall/changelog.txt

@@ -63,3 +63,5 @@ Changes since 1.4.6
 
 28) Deimplement Smart Blacklisting and fix problem with multiple
     'drop'/'reject' commands for the same address.
+
+29) Update for 1.4.7 Beta 1.

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.6-20030823
+VERSION=1.4.7-Beta1
 
 usage() # $1 = exit status
 {

Shorewall/functions

@@ -308,6 +308,33 @@ ip_range() {
     done
 }
 
+ip_range_explicit() {
+    local first last
+
+    case $1 in 
+    [0-9]*.*.*.*-*.*.*.*)
+	;;
+    *)
+	echo $1
+	return
+	;;
+    esac
+
+    first=`decodeaddr ${1%-*}`
+    last=`decodeaddr ${1#*-}`
+
+    if [ $first -gt $last ]; then
+	fatal_error "Invalid IP address range: $1"
+    fi
+
+    l=$(( $last + 1 ))
+
+    while [ $first -le $last ]; do
+	echo `encodeaddr $first`
+	first=$(($first + 1))
+    done
+}
+
 #
 # Netmask from CIDR
 #

Shorewall/install.sh

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

Shorewall/shorewall.spec

@@ -1,6 +1,6 @@
 %define name shorewall
-%define version 1.4.6_20030823
+%define version 1.4.7
-%define release 1
+%define release 0Beta1
 %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 Aug 25 2003 Tom Eastep <tom@shorewall.net>
+- Changed version to 1.4.7-0Beta1
 * Sat Aug 23 2003 Tom Eastep <tom@shorewall.net>
 - Added /etc/shorewall/users
 - Changed version to 1.4.6_20030823-1

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.6-20030823
+VERSION=1.4.7-Beta1
 
 usage() # $1 = exit status
 {