Change Version to 1.3.5

Save counter reset time/date in /var/lib/shorewall/restarted


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

Shorewall/changelog.txt

@@ -6,3 +6,12 @@ Changes since 1.3.4
 2. Added MERGE_HOSTS variable in shorewall.conf to provide saner
    behavior of the /etc/shorewall/hosts file.
 
+3. Fix for spec file from Ajay Ramaswamy
+
+4. Update package description in shorewall.spec
+
+5. Save counter reset time in /var/lib/shorewall/restarted
+
+6. Display the counter reset time in shorewall show and status
+   commands.
+

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.4
+VERSION=1.3.5
 
 usage() # $1 = exit status
 {

Shorewall/firewall

@@ -458,6 +458,9 @@ determine_hosts() {
 	hosts=`echo $hosts` # Remove extra trash
 
 	if [ -n "MERGE_HOSTS" ]; then
+	    ####################################################################
+	    # Zone will be the union of its host and interface definitions
+	    #
 	    do_a_zone
 	    recalculate_interfaces
 	elif [ -n "$hosts" ]; then
@@ -3176,6 +3179,8 @@ define_firewall() # $1 = Command (Start or Restart)
 
     createchain shorewall no
 
+    date > /var/lib/shorewall/restarted
+
     report "Shorewall ${1}ed"
 
     rm -rf $TMP_DIR
@@ -3500,6 +3505,7 @@ case "$command" in
     reset)
 	iptables -L -n -Z -v
 	report "Shorewall Counters Reset"
+	date > /var/lib/shorewall/restarted
 	;;
 
     refresh)

Shorewall/install.sh

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

Shorewall/releasenotes.txt

@@ -2,9 +2,15 @@ This is a minor release of Shorewall.
 
 In this release:
 
-1. Empty source and destination qualifiers are now detected in the
-   rules file.
+1. Empty and invalid source and destination qualifiers are now detected
+   in the rules file. It is a good idea to use the 'shorewall check'
+   command before you issue a 'shorewall restart' command be be sure
+   that you don't have any configuration problems that will prevent a
+   successful restart.
 
 2. Added MERGE_HOSTS variable in shorewall.conf to provide saner
    behavior of the /etc/shorewall/hosts file.
 
+3. The time that the counters were last reset is now displayed in the
+   heading of the 'status' and 'show' commands.
+

Shorewall/shorewall

@@ -432,6 +432,14 @@ usage() # $1 = exit status
     exit $1
 }
 
+#################################################################################
+# Display the time that the counters were last reset                            #
+#################################################################################
+show_reset() {
+    [ -f /var/lib/shorewall/restarted ] && \
+	echo -e "Counters reset `cat /var/lib/shorewall/restarted`\\n"
+}
+
 #################################################################################
 # Execution begins here								#
 #################################################################################
@@ -533,10 +541,12 @@ case "$1" in
 	    ;;
 	nat)
 	    echo -e "Shorewall-$version NAT at $HOSTNAME - `date`\\n"
+	    show_reset
 	    iptables -t nat -L -n -v
 	    ;;
 	tos|mangle)
 	    echo -e "Shorewall-$version TOS at $HOSTNAME - `date`\\n"
+	    show_reset
 	    iptables -t mangle -L -n -v
 	    ;;
 	log)
@@ -551,6 +561,7 @@ case "$1" in
 	    ;;
 	*)
 	    echo -e "Shorewall-$version Chain $2 at $HOSTNAME - `date`\\n"
+	    show_reset
 	    iptables -L $2 -n -v
 	    ;;
 	esac
@@ -569,6 +580,7 @@ case "$1" in
 	get_config
 	clear
 	echo -e "Shorewall-$version Status at $HOSTNAME - `date`\\n"
+	show_reset
 	host=`echo $HOSTNAME | sed 's/\..*$//'`
 	iptables -L -n -v
 	echo

Shorewall/shorewall.spec

@@ -1,5 +1,5 @@
 %define name shorewall
-%define version 1.3.4
+%define version 1.3.5
 %define release 1
 %define prefix /usr
 

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.4
+VERSION=1.3.5
 
 usage() # $1 = exit status
 {