From f22dff0fcac6cf72c4b4b8e881aa827b809c8f3a Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Tue, 13 Jan 2004 20:54:58 +0000
Subject: [PATCH] Shorewall 1.4.9

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1078 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/fallback.sh    | 9 +++++++--
 Shorewall/install.sh     | 2 +-
 Shorewall/shorewall.spec | 4 +++-
 Shorewall/uninstall.sh   | 6 +++---
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Shorewall/fallback.sh b/Shorewall/fallback.sh
index 6334d5c52..7b41b29b5 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.9-Beta2
+VERSION=1.4.9
 
 usage() # $1 = exit status
 {
@@ -79,6 +79,8 @@ restore_file /sbin/shorewall
 restore_file /etc/shorewall/shorewall.conf
 
 restore_file /etc/shorewall/functions
+restore_file /usr/share/shorewall/functions
+restore_file /usr/share/shorewall/firewall
 restore_file /usr/lib/shorewall/functions
 restore_file /var/lib/shorewall/functions
 restore_file /usr/lib/shorewall/firewall
@@ -144,7 +146,10 @@ restore_file /etc/shorewall/actions
 
 restore_file /etc/shorewall/action.template
 
-if [ -f /usr/lib/shorewall/version-${VERSION}.bkout ]; then
+if [ -f /usr/share/shorewall/version-${VERSION}.bkout ]; then
+    restore_file /usr/share/shorewall/version
+    oldversion="`cat /usr/share/shorewall/version`"
+elif [ -f /usr/lib/shorewall/version-${VERSION}.bkout ]; then
     restore_file /usr/lib/shorewall/version
     oldversion="`cat /usr/lib/shorewall/version`"
 elif [ -f /var/lib/shorewall/version-${VERSION}.bkout ]; then
diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index da33bac53..8506989c7 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.9-Beta2
+VERSION=1.4.9
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec
index 38aa8cc50..bbf1a1854 100644
--- a/Shorewall/shorewall.spec
+++ b/Shorewall/shorewall.spec
@@ -1,6 +1,6 @@
 %define name shorewall
 %define version 1.4.9
-%define release 0Beta2
+%define release 1
 %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
+* Tue Jan 13 2004 Tom Eastep <tom@shorewall.net>
+- Changed version to 1.4.9
 * Mon Dec 29 2003 Tom Eastep <tom@shorewall.net>
 - Remove Documentation from this RPM
 * Sun Dec 28 2003 Tom Eastep <tom@shorewall.net>
diff --git a/Shorewall/uninstall.sh b/Shorewall/uninstall.sh
index a4fe7907e..f21e230cd 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.9-Beta2
+VERSION=1.4.9
 
 usage() # $1 = exit status
 {
@@ -60,8 +60,8 @@ remove_file() # $1 = file to restore
     fi
 }
 
-if [ -f /usr/lib/shorewall/version ]; then
-    INSTALLED_VERSION="`cat /usr/lib/shorewall/version`"
+if [ -f /usr/share/shorewall/version ]; then
+    INSTALLED_VERSION="`cat /usr/share/shorewall/version`"
     if [ "$INSTALLED_VERSION" != "$VERSION" ]; then
 	echo "WARNING: Shorewall Version $INSTALLED_VERSION is installed"
 	echo "         and this is the $VERSION uninstaller."