From 1f855b035ca7592f76779d3ad2846bba8bffc6af Mon Sep 17 00:00:00 2001 From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb> Date: Wed, 30 Jun 2004 19:55:27 +0000 Subject: [PATCH] Shorewall 2.0.3b git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1426 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Lrp2/usr/share/shorewall/functions | 14 +++++++------- Lrp2/usr/share/shorewall/version | 2 +- STABLE2/fallback.sh | 2 +- STABLE2/install.sh | 2 +- STABLE2/shorewall.spec | 4 +++- STABLE2/uninstall.sh | 2 +- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Lrp2/usr/share/shorewall/functions b/Lrp2/usr/share/shorewall/functions index e8aa7d942..e3bbb5023 100644 --- a/Lrp2/usr/share/shorewall/functions +++ b/Lrp2/usr/share/shorewall/functions @@ -374,7 +374,7 @@ mktempfile() { mktemp -p $1 shorewall.XXXXXX ;; None) - mkdir $1/shorewall-$$ && echo $1/shorewall-$$ + > $1/shorewall-$$ && echo $1/shorewall-$$ ;; *) echo " ERROR:Internal error in mktempfile" @@ -407,20 +407,20 @@ mktempdir() { [ -z "$MKTEMP" ] && find_mktemp case "$MKTEMP" in - BSD) - mktemp -d /tmp/shorewall.XXXXXX - ;; STD) mktemp -td shorewall.XXXXXX ;; - None) - mkdir /tmp/shorewall-$$ && echo /tmp/shorewall-$$ + None|BSD) + # + # Not all versions of the BSD mktemp support the -d option under Linux + # + mkdir /tmp/shorewall-$$ && chmod 700 /tmp/shorewall-$$ && echo /tmp/shorewall-$$ ;; *) echo " ERROR:Internal error in mktempdir" ;; esac -} +} # # Read a file and handle "INCLUDE" directives diff --git a/Lrp2/usr/share/shorewall/version b/Lrp2/usr/share/shorewall/version index 8dfc449c3..9aaba3dac 100644 --- a/Lrp2/usr/share/shorewall/version +++ b/Lrp2/usr/share/shorewall/version @@ -1 +1 @@ -2.0.3a +2.0.3b diff --git a/STABLE2/fallback.sh b/STABLE2/fallback.sh index a82ccb0a1..3f461ecb5 100755 --- a/STABLE2/fallback.sh +++ b/STABLE2/fallback.sh @@ -28,7 +28,7 @@ # shown below. Simply run this script to revert to your prior version of # Shoreline Firewall. -VERSION=2.0.3a +VERSION=2.0.3b usage() # $1 = exit status { diff --git a/STABLE2/install.sh b/STABLE2/install.sh index 1ec541c22..bd2042373 100755 --- a/STABLE2/install.sh +++ b/STABLE2/install.sh @@ -22,7 +22,7 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA # -VERSION=2.0.3a +VERSION=2.0.3b usage() # $1 = exit status { diff --git a/STABLE2/shorewall.spec b/STABLE2/shorewall.spec index 8103beb25..8e961019c 100644 --- a/STABLE2/shorewall.spec +++ b/STABLE2/shorewall.spec @@ -1,5 +1,5 @@ %define name shorewall -%define version 2.0.3a +%define version 2.0.3b %define release 1 %define prefix /usr @@ -141,6 +141,8 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel %changelog +* Wed Jun 30 2004 Tom Eastep tom@shorewall.net +- Updated to 2.0.2b-1 * Mon Jun 28 2004 Tom Eastep tom@shorewall.net - Updated to 2.0.2a-1 * Wed Jun 23 2004 Tom Eastep tom@shorewall.net diff --git a/STABLE2/uninstall.sh b/STABLE2/uninstall.sh index 6f5683198..5fc67ad03 100755 --- a/STABLE2/uninstall.sh +++ b/STABLE2/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=2.0.3a +VERSION=2.0.3b usage() # $1 = exit status {