Change version to 2.5.7

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@2796 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2005-10-04 20:17:30 +00:00
parent 79fead0fae
commit eb43db253f
4 changed files with 14 additions and 12 deletions

View File

@ -28,7 +28,7 @@
# shown below. Simply run this script to revert to your prior version of
# Shoreline Firewall.
VERSION=2.5.6
VERSION=2.5.7
usage() # $1 = exit status
{
@ -48,8 +48,8 @@ restore_directory() # $1 = directory to restore
exit 1
fi
fi
}
}
restore_file() # $1 = file to restore, $2 = (Optional) Directory to restore from
{
if [ -n "$2" ]; then
@ -65,8 +65,8 @@ restore_file() # $1 = file to restore, $2 = (Optional) Directory to restore from
echo "ERROR: Could not restore $1"
exit 1
fi
fi
fi
if [ -f ${1}-${VERSION}.bkout -o -L ${1}-${VERSION}.bkout ]; then
if (mv -f ${1}-${VERSION}.bkout $1); then
echo

View File

@ -22,7 +22,7 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
#
VERSION=2.5.6
VERSION=2.5.7
usage() # $1 = exit status
{
@ -59,10 +59,10 @@ backup_directory() # $1 = directory to backup
fi
fi
}
backup_file() # $1 = file to backup, $2 = (optional) Directory in which to create the backup
{
if [ -z "$PREFIX" ]; then
if [ -z "$PREFIX" ]; then
if [ -f $1 -a ! -f ${1}-${VERSION}.bkout ]; then
if [ -n "$2" ]; then
if [ -d $2 ]; then
@ -175,7 +175,7 @@ elif [ -d /etc/apt -a -e /usr/bin/dpkg ]; then
elif [ -f /etc/slackware-version ] ; then
DEST="/etc/rc.d"
INIT="rc.firewall"
elif [ -f /etc/arch-release ] ; then
elif [ -f /etc/arch-release ] ; then
DEST="/etc/rc.d"
INIT="shorewall"
ARCHLINUX=yes
@ -238,7 +238,7 @@ fi
if [ -n "$ARCHLINUX" ] ; then
sed -e 's!LOGFILE=/var/log/messages!LOGFILE=/var/log/messages.log!' -i ${PREFIX}/etc/shorewall/shorewall.conf
fi
fi
#
# Install the zones file
#

View File

@ -1,5 +1,5 @@
%define name shorewall
%define version 2.5.6
%define version 2.5.7
%define release 1
%define prefix /usr
@ -158,6 +158,8 @@ fi
%doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn
%changelog
* Tue Oct 04 2005 Tom Eastep tom@shorewall.net
- Updated to 2.5.7-1
* Sat Sep 17 2005 Tom Eastep tom@shorewall.net
- Updated to 2.5.6-1
* Tue Aug 30 2005 Tom Eastep tom@shorewall.net

View File

@ -26,7 +26,7 @@
# You may only use this script to uninstall the version
# shown below. Simply run this script to remove Shorewall Firewall
VERSION=2.5.6
VERSION=2.5.7
usage() # $1 = exit status
{