shorewall_code/tools/build/buildshorewall

#!/bin/sh
#
# Shorewall Release Processing -- (C) 2003,2004,2005 -- Tom Eastep (teastep@shorewall.net)
#                              -- (C) 2005,2006 -- Cristian Rodriguez (webmaster@shorewall.net)
# Version : $Id$
#
#     This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
#
#	This program is free software; you can redistribute it and/or modify
#	it under the terms of Version 2 of the GNU General Public License
#	as published by the Free Software Foundation.
#
#	This program is distributed in the hope that it will be useful,
#	but WITHOUT ANY WARRANTY; without even the implied warranty of
#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#	GNU General Public License for more details.
#
#	You should have received a copy of the GNU General Public License
#	along with this program; if not, write to the Free Software
#	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# I install this script in /usr/local/bin/makeshorewall.
#
# Usage:
#
#   makeshorewall [ -trhxclpsS ] <version> [ <previous version> ]
#
#      -t      Build tarball
#      -r      Build RPM
#      -c      Build Common
#      -l      Build Lite
#      -L      Build 6 Lite
#      -6      Build 6
#      -p      Build Perl
#      -s      Build Shell
#      -h      Build HTML documentation
#      -x      Build XML documentation
#      -S      Sign with GPG
#
# If no options are given, all options are assumed.
#
# If <previous version> is given, patch files reflecting the differences
# between that version and the current version ( <version> ) are generated
# generated. The directory ./shorewall-<previous version> must exist and
# contain the version against which the patch is generated.
################################################################################
#                          C O N F I G U R A T I O N
################################################################################
#
# XSL Stylesheet to use for XML->HTML conversion
#
STYLESHEET=/usr/share/xml/docbook/stylesheet/nwalsh/current/xhtml/docbook.xsl
#
# Directory where the build log will be placed. The log has the name
# shorewall_build_<version>.log
#
LOGDIR=$PWD
#
# Your RPM build directory
#
RPMDIR=~/rpm/
#
# Directory where you want the release to be built -- must be fully-qualified
#
DIR=$PWD
#
# location and options for GnuPG
#
GPG="/usr/bin/gpg -ab --batch --comment 'To verify this, you can download our public key at https://lists.shorewall.net/shorewall.gpg.key'"
#
# SVN Repository
#
SVN=https://shorewall.svn.sourceforge.net/svnroot/shorewall
################################################################################
#                               V A R I A B L E S
################################################################################
VERSION=
BASEVERSION=
OLDVERSION=
SHOREWALLDIR=
SHOREWALLLITEDIR=
SHELLDIR=
SOURCEDIR=
SVNBRANCH=
LITESVNBRANCH=
SHELLBRANCH=
XMLPROJ=
RPMNAME=
LITERPMNAME=
TARBALL=
LITETARBALL=
LOGFILE=
HTMLDIR=
BUILDTARBALL=
BUILDRPM=
BUILDXML=
BUILDHTML=
SAMPLESTAG=
SIGN=
MANPAGETAG=
MANPAGE6TAG=
LITEMANPAGETAG=
LITE6MANPAGETAG=
PERLDIR=
SHELLDIR=
PERLBRANCH=
PERLRPMNAME=
PERLTARBALL=
SHELLBRANCH=
SHELLRPMNAME=
SHELLTARBALL=
BUILDCOMMON=
BUILDPERL=
BUILDSHELL=
BUILDLITE=
PATCHRELEASE=
PATCHNUM=

SVN6BRANCH=
SAMPLES6TAG=
LITE6SVNBRANCH=
SHOREWALL6DIR=
LITE6DIR=
BUILD6=
BUILD6LITE=
RPM6NAME=
LITE6RPMNAME=
TARBALL6=
LITE6TARBALL=
################################################################################
#                               F U N C T I O N S
################################################################################
progress_message()
{
    echo         >>    $LOGFILE
    echo "$@" | tee -a $LOGFILE
    echo         >>    $LOGFILE
}

report()
{
    echo "$@" | tee -a $LOGFILE
}

do_or_die()
{
    eval $@ || { progress_message "Step \"$*\" FAILED" ; exit 2; }
}

fatal_error() {
    progress_message "$*"
    exit 2
}

list_search() # $1 = element to search for , $2-$n = list
{
    local e
    e=$1

    while [ $# -gt 1 ]; do
	shift
	[ "x$e" = "x$1" ] && return 0
    done

    return 1
}

#
# It's easy to mis-type the GPG passphrase; this function allows us additional chances to get it right
#
do_rpmbuild() {
    while ! rpmbuild $@ >> $LOGFILE 2>&1; do
	echo    "rpmbuild $@ failed" >&2
	echo -n "Retry? Y/n " >&2
	read response
	case $response in
	    Y*|y*)
		;;
	    *)
		[ -n "$response" ] && return 1
		;;
	esac
    done

    return 0
}

usage()
{
    echo "usage: $(basename $0) [ -trhxlcpsS] <version> [ <old-version> ]"
    exit 2
}
################################################################################
#                E X E C U T I O N   S T A R T S   H E R E
################################################################################

set -e
set -u


done=

[ $# -eq 0 ] && usage

case $1 in
    -*)
	;;
    *)
	BUILDTARBALL=Yes
	BUILDRPM=Yes
	BUILDHTML=Yes
	BUILDXML=Yes
	BUILDRPM=Yes
	BUILDCOMMON=Yes
	BUILDPERL=Yes
	BUILDSHELL=Yes
	BUILDLITE=Yes

	case $1 in
	    4.0.*)
		;;
	    *)
		BUILD6=Yes
		BUILD6LITE=Yes
		;;
	esac

	done=Yes
	SIGN=Yes
	;;
esac

while [ -z "$done" ]; do
    [ $# -eq 0 ] && break

    option=$1
    case $option in
	-*)
	    shift
	    option=${option#-}

	    [ -z "$option" ] && done=Yes && break

	    while [ -n "$option" ]; do
		case $option in
		    t*)
			BUILDTARBALL=Yes
			option=${option#t}
			;;
		    r*)
			BUILDTARBALL=Yes
			BUILDRPM=Yes
			option=${option#r}
			;;
		    h*)
			BUILDHTML=Yes
			option=${option#h}
			;;
		    x*)
			BUILDXML=Yes
			option=${option#x}
			;;
		    c*)
			BUILDCOMMON=Yes
			option=${option#c}
			;;
		    6*)
			BUILD6=Yes
			option=${option#6}
			;;
		    p*)
			BUILDPERL=Yes
			option=${option#p}
			;;
		    s*)
			BUILDSHELL=Yes
			option=${option#s}
			;;
		    l*)
			BUILDLITE=Yes
			option=${option#l}
			;;
		    L*)
			BUILD6LITE=Yes
			option=${option#L}
			;;
		    S*)
			SIGN=Yes
			option=${option#S}
			;;
	    	    *)
			usage
			;;
		esac
	    done
	    ;;
	*)
	    done=Yes
	    ;;
    esac
done

echo "Arguments are $*"

case $# in
    1)
	;;
    2)
	OLDVERSION=$2
	;;
    *)
	usage
	;;
esac

VERSION=$1
BASEVERSION=$1

LOGFILE=$LOGDIR/shorewall_build_${VERSION}.log
touch $LOGFILE
progress_message "Build of Shorewall $VERSION on $(date)"

case $VERSION in
     4.3.*)
	SVNBRANCH="trunk/Shorewall-common"
	SVN6BRANCH="trunk/Shorewall6"
	LITESVNBRANCH="trunk/Shorewall-lite"
	LITE6SVNBRANCH="trunk/Shorewall6-lite"
	PERLBRANCH="trunk/Shorewall-perl"
	SHELLBRANCH="trunk/Shorewall-shell"
	DOCTAG="trunk/docs"
	XMLPROJ="docs-4.3"
	SAMPLESTAG="trunk/Samples"
	SAMPLES6TAG="trunk/Samples6"
	MANPAGETAG=trunk/manpages
	MANPAGE6TAG=trunk/manpages6
	LITEMANPAGETAG=trunk/manpages-lite
	LITE6MANPAGETAG=trunk/manpages6-lite
	;;
     4.2.*-*)
	SVNBRANCH="trunk/Shorewall-common"
	SVN6BRANCH="trunk/Shorewall6"
	LITESVNBRANCH="trunk/Shorewall-lite"
	LITE6SVNBRANCH="trunk/Shorewall6-lite"
	PERLBRANCH="trunk/Shorewall-perl"
	SHELLBRANCH="trunk/Shorewall-shell"
	DOCTAG="trunk/docs"
	XMLPROJ="docs-4.2"
	SAMPLESTAG="trunk/Samples"
	SAMPLES6TAG="trunk/Samples6"
	MANPAGETAG=trunk/manpages
	MANPAGE6TAG=trunk/manpages6
	LITEMANPAGETAG=trunk/manpages-lite
	LITE6MANPAGETAG=trunk/manpages6-lite
	;;
     4.2.*.*)
	PATCHRELEASE=Yes
	PATCHNUM=${VERSION##*.}
	BASEVERSION=${VERSION%.*}
	SVNBRANCH="tags/${BASEVERSION}/Shorewall-common-${PATCHNUM}"
	LITESVNBRANCH="/tags/${BASEVERSION}/Shorewall-lite-${PATCHNUM}"
	PERLBRANCH="tags/${BASEVERSION}/Shorewall-perl-${PATCHNUM}"
	SHELLBRANCH="tags/${BASEVERSION}/Shorewall-shell-${PATCHNUM}"
	DOCTAG="trunk/docs"
	XMLPROJ="docs-4.2"
	SAMPLESTAG="tags/${BASEVERSION}/Samples"
	MANPAGETAG="tags/${BASEVERSION}/manpages"
	LITEMANPAGETAG="tags/${BASEVERSION}/manpages-lite"
	;;
     4.2.*)
	SVNBRANCH="branches/4.2/Shorewall-common"
	LITESVNBRANCH="branches/4.2/Shorewall-lite"
	PERLBRANCH="branches/4.2/Shorewall-perl"
	SHELLBRANCH="branches/4.2/Shorewall-shell"
	DOCTAG="trunk/docs"
	XMLPROJ="docs-4.2"
	SAMPLESTAG="trunk/Samples"
	MANPAGETAG=trunk/manpages
	LITEMANPAGETAG=trunk/manpages-lite
	;;
     4.0.*.*)
	PATCHRELEASE=Yes
	PATCHNUM=${VERSION##*.}
	BASEVERSION=${VERSION%.*}
	SVNBRANCH="tags/${BASEVERSION}/Shorewall-common-${PATCHNUM}"
	LITESVNBRANCH="/tags/${BASEVERSION}/Shorewall-lite-${PATCHNUM}"
	PERLBRANCH="tags/${BASEVERSION}/Shorewall-perl-${PATCHNUM}"
	SHELLBRANCH="tags/${BASEVERSION}/Shorewall-shell-${PATCHNUM}"
	DOCTAG="trunk/docs"
	XMLPROJ="docs-4.0"
	SAMPLESTAG="tags/${BASEVERSION}/Samples"
	MANPAGETAG="tags/${BASEVERSION}/manpages"
	LITEMANPAGETAG="tags/${BASEVERSION}/manpages-lite"
	;;
     4.0.*)
	SVNBRANCH="branches/4.0/Shorewall-common"
	LITESVNBRANCH="branches/4.0/Shorewall-lite"
	PERLBRANCH="branches/4.0/Shorewall-perl"
	SHELLBRANCH="branches/4.0/Shorewall-shell"
	DOCTAG="trunk/docs"
	XMLPROJ="docs-4.0"
	SAMPLESTAG="branches/4.0/Samples"
	MANPAGETAG=branches/4.0/manpages
	LITEMANPAGETAG=branches/4.0/manpages-lite
	;;
   *)
	echo "Unsupported Version: $VERSION"
	exit 2
	;;
esac

[ -d $DIR ] || { echo "Directory $DIR does not exist or is unaccessible" ; exit 2 ; }

progress_message "Distribution directory is $DIR"

cd $DIR

[ -n "$BUILDCOMMON" ] && SHOREWALLDIR=shorewall-common-${VERSION} || SHOREWALLDIR=shorewall-common
SHOREWALL6DIR=shorewall6-${VERSION}
SHOREWALLLITEDIR=shorewall-lite-${VERSION}
LITE6DIR=shorewall6-lite-${VERSION}
TARBALL=shorewall-common-${VERSION}.tgz
TARBALL6=shorewall6-${VERSION}.tgz
LITETARBALL=shorewall-lite-${VERSION}.tgz
LITE6TARBALL=shorewall6-lite-${VERSION}.tgz
SHELLTARBALL=shorewall-shell-${VERSION}.tgz
SHELLDIR=shorewall-shell-${VERSION}
PERLTARBALL=shorewall-perl-${VERSION}.tgz
PERLDIR=shorewall-perl-${VERSION}

case $VERSION in
    *Beta*|*RC*|*Pre*)
	#
	# Beta or Release Candidate
	#
	BASEVERSION=${VERSION%-*}
	RPMNAME=shorewall-common-${BASEVERSION}-0${VERSION#*-}.noarch.rpm
	RPM6NAME=shorewall6-${BASEVERSION}-0${VERSION#*-}.noarch.rpm
	LITERPMNAME=shorewall-lite-${BASEVERSION}-0${VERSION#*-}.noarch.rpm
	LITE6RPMNAME=shorewall6-lite-${BASEVERSION}-0${VERSION#*-}.noarch.rpm
	PERLRPMNAME=shorewall-perl-${BASEVERSION}-0${VERSION#*-}.noarch.rpm
	SHELLRPMNAME=shorewall-shell-${BASEVERSION}-0${VERSION#*-}.noarch.rpm
	;;
    *.*.*.*)
        #
        # Patch Release
        #
        RPMNAME=shorewall-common-${BASEVERSION}-${PATCHNUM}.noarch.rpm
        RPM6NAME=shorewall6-${BASEVERSION}-${PATCHNUM}.noarch.rpm
        LITERPMNAME=shorewall-lite-${BASEVERSION}-${PATCHNUM}.noarch.rpm
        LITE6RPMNAME=shorewall6-lite-${BASEVERSION}-${PATCHNUM}.noarch.rpm
        PERLRPMNAME=shorewall-perl-${BASEVERSION}-${PATCHNUM}.noarch.rpm
        SHELLRPMNAME=shorewall-shell-${BASEVERSION}-${PATCHNUM}.noarch.rpm
        ;;
     *)
	#
	# Normal Release
	#
	RPMNAME=shorewall-common-${VERSION}-0base.noarch.rpm
	RPM6NAME=shorewall6-${VERSION}-0base.noarch.rpm
	LITERPMNAME=shorewall-lite-${VERSION}-0base.noarch.rpm
	LITE6RPMNAME=shorewall6-lite-${VERSION}-0base.noarch.rpm
	PERLRPMNAME=shorewall-perl-${VERSION}-0base.noarch.rpm
	SHELLRPMNAME=shorewall-shell-${VERSION}-0base.noarch.rpm
	;;
esac

HTMLDIR=shorewall-docs-html-$VERSION

if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
    report "Shorewall directory is $DIR/$SHOREWALLDIR"
    report "Shorewall6 directory is $DIR/$SHOREWALL6DIR"
    report "Shorewall Lite directory is $DIR/$SHOREWALLLITEDIR"
    report "Shorewall6 Lite directory is $DIR/$LITE6DIR"
    report "Shorewall Shell directory is $DIR/$SHELLDIR"
    report "Shorewall Perl directory is $DIR/$PERLDIR"
    report "SVN tag is $SVNBRANCH"
    report "Samples tag is $SAMPLESTAG"
    report "Samples6 tag is $SAMPLES6TAG"
    report "SVN6 tag is $SVN6BRANCH"
    report "Lite SVN tag is $LITESVNBRANCH"
    report "Lite6 SVN tag is $LITE6SVNBRANCH"
    report "Shell SVN tag is $SHELLBRANCH"
    report "Perl SVN tag is $PERLBRANCH"
    if [ -n "$BUILDTARBALL" ]; then
	report "TARBALL is $TARBALL"
	report "TARBALL6 is $TARBALL6"
	report "LITETARBALL is $LITETARBALL"
	report "LITE6TARBALL is $LITE6TARBALL"
	report "SHELLTARBALL is $SHELLTARBALL"
	report "PERLTARBALL is $PERLTARBALL"
    fi

    if [ -n "$BUILDRPM" ]; then
	report "RPM is $RPMNAME"
	[ -n "$RPM6NAME" ] && report "RPM6 is $RPM6NAME"
	report "LITERPM is $LITERPMNAME"
	[ -n "LITE6RPMNAME" ] && report "LITE6RPM is $LITE6RPMNAME"
	report "SHELLRPM is $SHELLRPMNAME"
	report "PERLRPM is $PERLRPMNAME"
    fi
fi

[ -n "$BUILDHTML" ] && report "HTML Directory is $HTMLDIR"

[ -n "$RPM6NAME" ]     || BUILD6=
[ -n "$LITE6RPMNAME" ] || BUILD6LITE=

if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then

    rm -rf $SHOREWALLDIR

    [ -n "$BUILD6" ]      && rm -rf $SHOREWALL6DIR
    [ -n "$BUILDLITE" ]   && rm -rf $SHOREWALLLITEDIR
    [ -n "$BUILD6LITE" ]  && rm -rf $LITE6DIR
    [ -n "$BUILDPERL" ]   && rm -rf $PERLDIR
    [ -n "$BUILDSHELL" ]  && rm -rf $SHELLDIR

    progress_message "Exporting $SVNBRANCH from SVN..."     && do_or_die "svn export --non-interactive --force ${SVN}/$SVNBRANCH  $SHOREWALLDIR >> $LOGFILE 2>&1"

    [ -n "$BUILD6" ]      && progress_message "Exporting $SVN6BRANCH from SVN..."     && do_or_die "svn export --non-interactive --force ${SVN}/$SVN6BRANCH $SHOREWALL6DIR >> $LOGFILE 2>&1"
 
    [ -n "$BUILDLITE" ]   && progress_message "Exporting $LITESVNBRANCH from SVN..."  && do_or_die "svn export --non-interactive --force ${SVN}/$LITESVNBRANCH  $SHOREWALLLITEDIR >> $LOGFILE 2>&1"

    [ -n "$BUILD6LITE" ]  && progress_message "Exporting $LITE6SVNBRANCH from SVN..."  && do_or_die "svn export --non-interactive --force ${SVN}/$LITE6SVNBRANCH  $LITE6DIR >> $LOGFILE 2>&1"
    	
    [ -n "$BUILDPERL" ]   && progress_message "Exporting $PERLBRANCH from SVN..."     && do_or_die "svn export --non-interactive --force ${SVN}/$PERLBRANCH  $PERLDIR >> $LOGFILE 2>&1"

    [ -n "$BUILDSHELL" ]  && progress_message "Exporting $SHELLBRANCH from SVN..."    && do_or_die "svn export --non-interactive --force ${SVN}/$SHELLBRANCH  $SHELLDIR >> $LOGFILE 2>&1"

    
    if [ -n "$BUILDLITE" ]; then
	do_or_die "cp $SHOREWALLDIR/modules $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
	do_or_die "cp $SHOREWALLDIR/lib.base $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
	if [ -f $SHOREWALLDIR/lib.cli ]; then
	    do_or_die "cp $SHOREWALLDIR/lib.cli $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
	fi
	if [ -f $SHOREWALLDIR/wait4ifup ]; then
	    do_or_die "cp $SHOREWALLDIR/wait4ifup $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
	fi
    fi

    if [ -n "$BUILD6LITE" ]; then
	do_or_die "cp $SHOREWALL6DIR/modules   $LITE6DIR >> $LOGFILE 2>&1"
	do_or_die "cp $SHOREWALL6DIR/lib.base  $LITE6DIR >> $LOGFILE 2>&1"
	do_or_die "cp $SHOREWALL6DIR/lib.cli   $LITE6DIR >> $LOGFILE 2>&1"
	do_or_die "cp $SHOREWALL6DIR/wait4ifup $LITE6DIR >> $LOGFILE 2>&1"
    fi

    [ -n "$BUILD6" ]      && do_or_die "cp $SHOREWALLDIR/changelog.txt  $SHOREWALLDIR/releasenotes.txt $SHOREWALL6DIR >> $LOGFILE 2>&1"
    [ -n "$BUILDLITE" ]   && do_or_die "cp $SHOREWALLDIR/changelog.txt  $SHOREWALLDIR/releasenotes.txt $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
    [ -n "$BUILD6LITE" ]  && do_or_die "cp $SHOREWALLDIR/changelog.txt  $SHOREWALLDIR/releasenotes.txt $LITE6DIR >> $LOGFILE 2>&1"
    [ -n "$BUILDPERL" ]   && do_or_die "cp $SHOREWALLDIR/changelog.txt  $SHOREWALLDIR/releasenotes.txt $PERLDIR >> $LOGFILE 2>&1"
    [ -n "$BUILDSHELL" ]  && do_or_die "cp $SHOREWALLDIR/changelog.txt  $SHOREWALLDIR/releasenotes.txt $SHELLDIR >> $LOGFILE 2>&1"

    if [ -n "$BUILDCOMMON" ]; then
	fgrep VERSION=$VERSION $SHOREWALLDIR/install.sh > /dev/null 2>&1     || fatal_error "install.sh has wrong version"
	fgrep VERSION=$VERSION $SHOREWALLDIR/uninstall.sh > /dev/null 2>&1   || fatal_error "uninstall.sh has wrong version"
	fgrep VERSION=$VERSION $SHOREWALLDIR/fallback.sh > /dev/null 2>&1    || fatal_error "fallback.sh has wrong version"
    fi

    if [ -n "$BUILD6" ]; then
	fgrep VERSION=$VERSION $SHOREWALL6DIR/install.sh > /dev/null 2>&1     || fatal_error "6 install.sh has wrong version"
	fgrep VERSION=$VERSION $SHOREWALL6DIR/uninstall.sh > /dev/null 2>&1   || fatal_error "6 uninstall.sh has wrong version"
	fgrep VERSION=$VERSION $SHOREWALL6DIR/fallback.sh > /dev/null 2>&1    || fatal_error "6 fallback.sh has wrong version"
    fi

    if [ -n "$BUILDLITE" ]; then
	fgrep VERSION=$VERSION $SHOREWALLLITEDIR/install.sh > /dev/null 2>&1     || fatal_error "Lite install.sh has wrong version"
	fgrep VERSION=$VERSION $SHOREWALLLITEDIR/uninstall.sh > /dev/null 2>&1   || fatal_error "Lite uninstall.sh has wrong version"
	fgrep VERSION=$VERSION $SHOREWALLLITEDIR/fallback.sh > /dev/null 2>&1    || fatal_error "Lite fallback.sh has wrong version"
    fi

    if [ -n "$BUILD6LITE" ]; then
	fgrep VERSION=$VERSION $LITE6DIR/install.sh > /dev/null 2>&1     || fatal_error "Lite 6 install.sh has wrong version"
	fgrep VERSION=$VERSION $LITE6DIR/uninstall.sh > /dev/null 2>&1   || fatal_error "Lite 6 uninstall.sh has wrong version"
	fgrep VERSION=$VERSION $LITE6DIR/fallback.sh > /dev/null 2>&1    || fatal_error "Lite 6 fallback.sh has wrong version"
    fi

    if [ -n "$BUILDSHELL" ]; then
	fgrep VERSION=$VERSION $SHELLDIR/install.sh > /dev/null 2>&1 || fatal_error "Shell install.sh has wrong version"
    fi

    if [ -n "$BUILDPERL" ]; then    
	fgrep VERSION=$VERSION $PERLDIR/install.sh > /dev/null 2>&1   || fatal_error "Perl install.sh has wrong version"
	[ $(eval perl -e "'use lib \"$PERLDIR\"; use Shorewall::Config qw(:internal); print \"\$globals{VERSION}\n\"'") = $VERSION ] || \
	    fatal_error "Perl Config.pm has wrong version"
    fi

    if [ -n "$BUILDCOMMON" ]; then
	cd $SHOREWALLDIR
	do_or_die "svn export --non-interactive --force ${SVN}/$SAMPLESTAG Samples >> $LOGFILE 2>&1"
	progress_message "Exporting $MANPAGETAG from SVN..."
	do_or_die "svn export --non-interactive --force ${SVN}/$MANPAGETAG manpages >> $LOGFILE 2>&1"
	cd manpages
	for f in *.xml; do
	    if [ $f != shorewall-template.xml ]; then
		progress_message "Generating Man Page from $f..."
		do_or_die "xmlto --skip-validation man $f >> $LOGFILE 2>&1"
		case $f in
		    *.conf.*|shorewall.xml)
			;;
		    *)
			g=${f#shorewall-}
			h=$(ls ${g%.xml}.[58])
			mv $h shorewall-$h
			;;
		esac
	    fi
	done
	rm *.xml
	cd $DIR
    fi

    if [ -n "$BUILD6" ]; then
	cd $SHOREWALL6DIR
	do_or_die "svn export --non-interactive --force ${SVN}/$SAMPLES6TAG Samples6 >> $LOGFILE 2>&1"
	progress_message "Exporting $MANPAGE6TAG from SVN..."
	do_or_die "svn export --non-interactive --force ${SVN}/$MANPAGE6TAG manpages >> $LOGFILE 2>&1"
	cd manpages
	for f in *.xml; do
	    if [ $f != shorewall6-template.xml ]; then
		progress_message "Generating Man Page from $f..."
		do_or_die "xmlto --skip-validation man $f >> $LOGFILE 2>&1"
		case $f in
		    *.conf.*|shorewall6.xml)
			;;
		    *)
			g=${f#shorewall6-}
			h=$(ls ${g%.xml}.[58])
			mv $h shorewall6-$h
			;;
		esac
	    fi
	done
	rm *.xml
	cd $DIR
    fi

    if [ -n "$BUILDLITE" ]; then
	cd $SHOREWALLLITEDIR
	progress_message "Exporting $LITEMANPAGETAG from SVN..."
	do_or_die "svn export --non-interactive --force ${SVN}/$LITEMANPAGETAG manpages >> $LOGFILE 2>&1"
	cd manpages
	for f in *.xml; do
	    if [ $f != shorewall-template.xml ]; then
		progress_message "Generating Man Page from $f..."
		do_or_die "xmlto --skip-validation man $f >> $LOGFILE 2>&1"
		case $f in
		    *.conf.*|shorewall-lite.xml)
			;;
		    *)
			g=${f#shorewall-lite-}
			h=$(ls ${g%.xml}.[58])
			mv $h shorewall-lite-$h
			;;
		esac
	    fi
	done
	rm *.xml
	cd $DIR 
    fi	

    if [ -n "$BUILD6LITE" ]; then
	cd $LITE6DIR
	progress_message "Exporting $LITE6MANPAGETAG from SVN..."
	do_or_die "svn export --non-interactive --force ${SVN}/$LITE6MANPAGETAG manpages >> $LOGFILE 2>&1"
	cd manpages
	for f in *.xml; do
	    if [ $f != shorewall6-template.xml ]; then
		progress_message "Generating Man Page from $f..."
		do_or_die "xmlto --skip-validation man $f >> $LOGFILE 2>&1"
		case $f in
		    *.conf.*|shorewall6-lite.xml)
			;;
		    *)
			g=${f#shorewall6-lite-}
			h=$(ls ${g%.xml}.[58])
			mv $h shorewall6-lite-$h
			;;
		esac
	    fi
	done
	rm *.xml
	cd $DIR 
    fi	

    [ -n "$BUILDCOMMON" ] && do_or_die "rm -rf $SHOREWALLDIR/debian"
    [ -n "$BUILD6" ]      && do_or_die "rm -rf $SHOREWALL6DIR/debian"
    [ -n "$BUILDLITE" ]   && do_or_die "rm -rf $SHOREWALLLITEDIR/debian"
    [ -n "$BUILD6LITE" ]  && do_or_die "rm -rf $LITE6DIR/debian"
    [ -n "$BUILDPERL" ]   && do_or_die "rm -rf $PERLDIR/debian"
    [ -n "$BUILDSHELL" ]  && do_or_die "rm -rf $SHELLDIR/debian"

    if [ -n "$BUILDTARBALL" ]; then
	if [ -n "$BUILDCOMMON" ]; then	
	    progress_message "Creating $DIR/$TARBALL..."
	    rm -f $SHOREWALLDIR/*.diff
	    do_or_die "tar -zcvf $TARBALL $SHOREWALLDIR >> $LOGFILE 2>&1"
	    do_or_die "tar -jcvf shorewall-common-${VERSION}.tar.bz2 $SHOREWALLDIR >> $LOGFILE 2>&1"
	    if [ -n "$SIGN" ]; then
		for shoresuffix in tgz tar.bz2; do
		    shoreball=shorewall-common-${VERSION}.${shoresuffix}
		    report "GPG signing $DIR/$shoreball"
		    rm -f ${shoreball}.asc
		    do_or_die "$GPG $shoreball"
		done
	    fi
	fi

	if [ -n "$BUILD6" ]; then	
	    progress_message "Creating $DIR/$TARBALL6..."
	    rm -f $SHOREWALL6DIR/*.diff
	    do_or_die "tar -zcvf $TARBALL6 $SHOREWALL6DIR >> $LOGFILE 2>&1"
	    do_or_die "tar -jcvf shorewall6-${VERSION}.tar.bz2 $SHOREWALL6DIR >> $LOGFILE 2>&1"
	    if [ -n "$SIGN" ]; then
		for shoresuffix in tgz tar.bz2; do
		    shoreball=shorewall6-${VERSION}.${shoresuffix}
		    report "GPG signing $DIR/$shoreball"
		    rm -f ${shoreball}.asc
		    do_or_die "$GPG $shoreball"
		done
	    fi
	fi

	if [ -n "$BUILDLITE" ]; then	
	    progress_message "Creating $DIR/$LITETARBALL..."
	    rm -f $SHOREWALLLITEDIR/*.diff
	    do_or_die "tar -zcvf $LITETARBALL $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
	    do_or_die "tar -jcvf shorewall-lite-${VERSION}.tar.bz2 $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
	    if [ -n "$SIGN" ]; then
		for shoresuffix in tgz tar.bz2; do
		    shoreball=shorewall-lite-${VERSION}.${shoresuffix}
		    report "GPG signing $DIR/$shoreball"
		    rm -f ${shoreball}.asc
		    do_or_die "$GPG $shoreball"
		done
	    fi
	fi
    	
	if [ -n "$BUILD6LITE" ]; then	
	    progress_message "Creating $DIR/$LITE6TARBALL..."
	    rm -f $LITE6DIR/*.diff
	    do_or_die "tar -zcvf $LITE6TARBALL $LITE6DIR >> $LOGFILE 2>&1"
	    do_or_die "tar -jcvf shorewall6-lite-${VERSION}.tar.bz2 $LITE6DIR >> $LOGFILE 2>&1"
	    if [ -n "$SIGN" ]; then
		for shoresuffix in tgz tar.bz2; do
		    shoreball=shorewall6-lite-${VERSION}.${shoresuffix}
		    report "GPG signing $DIR/$shoreball"
		    rm -f ${shoreball}.asc
		    do_or_die "$GPG $shoreball"
		done
	    fi
	fi
    	
	if [ -n "$BUILDPERL" ]; then	
	    progress_message "Creating $DIR/$PERLTARBALL..."
	    rm -f $PERLDIR/*.diff
	    do_or_die "tar -zcvf $PERLTARBALL $PERLDIR >> $LOGFILE 2>&1"
	    do_or_die "tar -jcvf shorewall-perl-${VERSION}.tar.bz2 $PERLDIR >> $LOGFILE 2>&1"
	    
	    if [ -n "$SIGN" ]; then
		for shoresuffix in tgz tar.bz2; do
		    shoreball=shorewall-perl-${VERSION}.${shoresuffix}
		    report "GPG signing $DIR/$shoreball"
		    rm -f ${shoreball}.asc
		    do_or_die "$GPG $shoreball"
		done
	    fi
	fi

	if [ -n "$BUILDSHELL" ]; then	
	    progress_message "Creating $DIR/$SHELLTARBALL..."
	    rm -f $SHELLDIR/*.diff
	    do_or_die "tar -zcvf $SHELLTARBALL $SHELLDIR >> $LOGFILE 2>&1"
	    do_or_die "tar -jcvf shorewall-shell-${VERSION}.tar.bz2 $SHELLDIR >> $LOGFILE 2>&1"
	
	    if [ -n "$SIGN" ]; then
		for shoresuffix in tgz tar.bz2; do
		    shoreball=shorewall-shell-${VERSION}.${shoresuffix}
		    report "GPG signing $DIR/$shoreball"
		    rm -f ${shoreball}.asc
		    do_or_die "$GPG $shoreball"
		done
	    fi
	fi
    fi

    if [ -n "$BUILDRPM" ]; then
	test -n "$SIGN" && SIGN="--sign"
	
	if [ -n "$BUILDCOMMON" ]; then	
	    progress_message "Building $RPMNAME..."

	    cd /tmp
	    rm -rf shorewall-common-${BASEVERSION}
	    do_or_die "cp -a $DIR/$SHOREWALLDIR shorewall-common-${BASEVERSION}"
	    do_or_die "tar -zcf $RPMDIR/SOURCES/shorewall-common-${BASEVERSION}.tgz shorewall-common-${BASEVERSION}"
	    cd $DIR
	    do_or_die "cp $SHOREWALLDIR/shorewall-common.spec $RPMDIR/SPECS/"
	    do_or_die "do_rpmbuild -ba $SIGN $RPMDIR/SPECS/shorewall-common.spec"
	    do_or_die cp -a $RPMDIR/RPMS/noarch/$RPMNAME .
	fi

	if [ -n "$BUILD6" ]; then	
	    progress_message "Building $RPM6NAME..."

	    cd /tmp
	    rm -rf shorewall6-${BASEVERSION}
	    do_or_die "cp -a $DIR/$SHOREWALL6DIR shorewall6-${BASEVERSION}"
	    do_or_die "tar -zcf $RPMDIR/SOURCES/shorewall6-${BASEVERSION}.tgz shorewall6-${BASEVERSION}"
	    cd $DIR
	    do_or_die "cp $SHOREWALL6DIR/shorewall6.spec $RPMDIR/SPECS/"
	    do_or_die "do_rpmbuild -ba $SIGN $RPMDIR/SPECS/shorewall6.spec"
	    do_or_die cp -a $RPMDIR/RPMS/noarch/$RPM6NAME .
	fi

	if [ -n "$BUILDLITE" ]; then	
	    progress_message "Building $LITERPMNAME..."

	    cd /tmp
	    rm -rf shorewall-lite-${BASEVERSION}
	    do_or_die "cp -a $DIR/$SHOREWALLLITEDIR shorewall-lite-${BASEVERSION}" 
	    do_or_die "tar -zcf $RPMDIR/SOURCES/shorewall-lite-${BASEVERSION}.tgz shorewall-lite-${BASEVERSION}"
	    cd $DIR
	    do_or_die "cp $SHOREWALLLITEDIR/shorewall-lite.spec $RPMDIR/SPECS/"
	    do_or_die "do_rpmbuild -ba $SIGN $RPMDIR/SPECS/shorewall-lite.spec"
	    do_or_die cp -a $RPMDIR/RPMS/noarch/$LITERPMNAME .
	fi

	if [ -n "$BUILD6LITE" ]; then	
	    progress_message "Building $LITE6RPMNAME..."

	    cd /tmp
	    rm -rf shorewall6-lite-${BASEVERSION}
	    do_or_die "cp -a $DIR/$LITE6DIR shorewall6-lite-${BASEVERSION}" 
	    do_or_die "tar -zcf $RPMDIR/SOURCES/shorewall6-lite-${BASEVERSION}.tgz shorewall6-lite-${BASEVERSION}"
	    cd $DIR
	    do_or_die "cp $LITE6DIR/shorewall6-lite.spec $RPMDIR/SPECS/"
	    do_or_die "do_rpmbuild -ba $SIGN $RPMDIR/SPECS/shorewall6-lite.spec"
	    do_or_die cp -a $RPMDIR/RPMS/noarch/$LITE6RPMNAME .
	fi

	if [ -n "$BUILDPERL" ]; then	
	    progress_message "Building $PERLRPMNAME..."

	    cd /tmp
	    rm -rf shorewall-perl-${BASEVERSION}
	    do_or_die "cp -a $DIR/$PERLDIR shorewall-perl-${BASEVERSION}"
	    do_or_die "tar -zcf $RPMDIR/SOURCES/shorewall-perl-${BASEVERSION}.tgz shorewall-perl-${BASEVERSION}"
	    cd $DIR
	    do_or_die "cp $PERLDIR/shorewall-perl.spec $RPMDIR/SPECS/"
	    do_or_die "do_rpmbuild -ba $SIGN $RPMDIR/SPECS/shorewall-perl.spec"
	    do_or_die cp -a $RPMDIR/RPMS/noarch/$PERLRPMNAME  .
	fi

	if [ -n "$BUILDSHELL" ]; then	
	    progress_message "Building $SHELLRPMNAME..."

	    cd /tmp
	    rm -rf shorewall-shell-${BASEVERSION}
	    do_or_die "cp -a $DIR/$SHELLDIR shorewall-shell-${BASEVERSION}"
	    do_or_die "tar -zcf $RPMDIR/SOURCES/shorewall-shell-${BASEVERSION}.tgz shorewall-shell-${BASEVERSION}"
	    cd $DIR
	    do_or_die "cp $SHELLDIR/shorewall-shell.spec $RPMDIR/SPECS/"
	    do_or_die "do_rpmbuild -ba $SIGN $RPMDIR/SPECS/shorewall-shell.spec"
	    do_or_die cp -a $RPMDIR/RPMS/noarch/$SHELLRPMNAME  .
	fi
    fi
fi

if [ -n "${BUILDXML}${BUILDHTML}" ]; then
    progress_message "Exporting $XMLPROJ from SVN..."

    rm -rf $XMLPROJ
    rm -rf shorewall-docs-xml-$VERSION

    do_or_die "svn export --non-interactive --force ${SVN}/$DOCTAG $XMLPROJ >> $LOGFILE 2>&1"
    do_or_die mv $XMLPROJ shorewall-docs-xml-$VERSION

    rm -f shorewall-docs-xml-$VERSION/images/*.vsd
    rm -f shorewall-docs-xml-$VERSION/images/~*
    rm -f shorewall-docs-xml-$VERSION/images/*.JPG
    rm -f shorewall-docs-xml-$VERSION/images/publish
    rm -f shorewall-docs-xml-$VERSION/images/Thumbs.db

    cd shorewall-docs-xml-$VERSION

    progress_message "Exporting $MANPAGETAG from SVN..."
    do_or_die "svn export --non-interactive --force ${SVN}/$MANPAGETAG manpages >> $LOGFILE 2>&1"
    mv manpages manpages.save

    if [ -n "$MANPAGE6TAG" ]; then
	progress_message "Exporting $MANPAGE6TAG from SVN..."
	do_or_die "svn export --non-interactive --force ${SVN}/$MANPAGE6TAG manpages >> $LOGFILE 2>&1"
	do_or_die mv manpages/* manpages.save/
    fi

    progress_message "Exporting $LITEMANPAGETAG from SVN..."	
    do_or_die "svn export --non-interactive --force ${SVN}/$LITEMANPAGETAG manpages >> $LOGFILE 2>&1"
    do_or_die mv manpages/* manpages.save/

    if [ -n "$LITE6MANPAGETAG" ]; then
	progress_message "Exporting $LITE6MANPAGETAG from SVN..."
	do_or_die "svn export --non-interactive --force ${SVN}/$LITE6MANPAGETAG manpages >> $LOGFILE 2>&1"    
	do_or_die mv manpages/* manpages.save/
    fi

    do_or_die rm -rf manpages

    do_or_die mv manpages.save manpages

    cd $DIR

    if [ -n "$BUILDXML" ]; then
	progress_message "Creating $DIR/shorewall-docs-xml-$VERSION tarballs"
        tar -zcvf shorewall-docs-xml-$VERSION.tgz shorewall-docs-xml-$VERSION >> $LOGFILE 2>&1
        tar -jcvf shorewall-docs-xml-$VERSION.tar.bz2 shorewall-docs-xml-$VERSION >> $LOGFILE 2>&1 || true
	if [ -n "$SIGN" ]; then
	    for shoresuffix in tgz tar.bz2; do
		xmlball=shorewall-docs-xml-$VERSION.${shoresuffix}
		report "GPG signing $DIR/$xmlball tarball"
		rm -f ${xmlball}.asc
		do_or_die "$GPG $xmlball"
	    done
	fi
    fi

    if [ -n "$BUILDHTML" ]; then
	progress_message "Building $HTMLDIR ..."

	rm -rf $HTMLDIR

	do_or_die mkdir $HTMLDIR
	do_or_die mkdir $HTMLDIR/images
	#
	# The original HTML documents were created using MS FrontPage and used
	# the .htm suffix. The remainder use the .html suffix.
	#
	HTMFILES="
	    6to4.htm
	    blacklisting_support.htm
	    configuration_file_basics.htm
	    CorpNetwork.htm
	    dhcp.htm
	    Documentation.htm
	    errata.htm
	    fallback.htm
	    FAQ.htm
	    GnuCopyright.htm
	    Install.htm
	    IPIP.htm
	    IPSEC.htm
	    kernel.htm
	    myfiles.htm
	    NAT.htm
	    ports.htm
	    PPTP.htm
	    ProxyARP.htm
	    quotes.htm
	    samba.htm
	    shorewall_extension_scripts.htm
	    shorewall_features.htm
	    shorewall_mirrors.htm
	    shorewall_prerequisites.htm
	    shorewall_quickstart_guide.htm
	    shorewall_setup_guide_fr.htm
	    shorewall_setup_guide.htm
	    Shorewall_sfindex_frame.htm
	    standalone.htm
	    starting_and_stopping_shorewall.htm
	    support.htm
	    three-interface.htm
	    traffic_shaping.htm
	    troubleshoot.htm
	    two-interface.htm
	    upgrade_issues.htm
	    VPN.htm
	    whitelisting_under_shorewall.htm"

	NOTOC="
            Documentation_Index.xml
            ECN.xml
            fallback.xml
            GettingStarted.xml
            IPP2P.xml
            ping.xml
            ProxyARP.xml
            Shorewall_Doesnt.xml
            shorewall_features.xml
            shorewall_prerequisites.xml
            SimpleBridge.xml"

	for file in shorewall-docs-xml-$VERSION/*.xml; do
	    a=$(basename $file)
	    b=${a%.*}
	    list_search $b.htm $HTMFILES && b=$b.htm || b=$b.html
	    f="shorewall-docs-html-$VERSION/$b"
	    list_search $1 $NOTOC && GENTOC="--stringparam generate.toc ''" || GENTOC=

	    case $file in
		*_ru.xml)
		    LANGUAGE="--stringparam l10n.gentext.default.language ru"
		    ;;
		*_fr.xml)
		    LANGUAGE="--stringparam l10n.gentext.default.language fr"
		    ;;
		*)
		    LANGUAGE=
		    ;;
	    esac

	    report "Converting $DIR/$file from XML to HTML ($DIR/$f) ..."

	    do_or_die xsltproc --output $f --stringparam html.stylesheet html.css --stringparam ulink.target _self $GENTOC -param toc.section.depth 3 $STYLESHEET $file
	done

	for f in shorewall-docs-xml-$VERSION/manpages/*.xml; do
	    if [ $f != shorewall-template.xml ]; then
		progress_message "Generating HTML from $f..."
		do_or_die xsltproc --output ${f%.xml}.html --stringparam html.stylesheet html.css --stringparam ulink.target _self -param toc.section.depth 3 $STYLESHEET $f

	    fi
	done

	progress_message "Copying manpages to $DIR/$HTMLDIR/images ..."

	do_or_die mkdir $HTMLDIR/manpages
	do_or_die cp -a shorewall-docs-xml-$VERSION/manpages/*.html $HTMLDIR/manpages/
	do_or_die rm -f shorewall-docs-xml-$VERSION/manpages/*.html

	progress_message "Copying images to $DIR/$HTMLDIR/images ..."

	do_or_die cp -a shorewall-docs-xml-$VERSION/images/*.png $HTMLDIR/images
	do_or_die cp -a shorewall-docs-xml-$VERSION/images/*.gif $HTMLDIR/images
	do_or_die cp -a shorewall-docs-xml-$VERSION/images/*.jpg $HTMLDIR/images
	do_or_die cp -a shorewall-docs-xml-$VERSION/*.css $HTMLDIR

	do_or_die ln -s Documentation_Index.html shorewall-docs-html-$VERSION/index.html

	progress_message "Creating $DIR/shorewall-docs-html-$VERSION tarballs ..."

	do_or_die "tar -zcvf shorewall-docs-html-$VERSION.tgz shorewall-docs-html-$VERSION >> $LOGFILE 2>&1"
	do_or_die "tar -jcvf shorewall-docs-html-$VERSION.tar.bz2 shorewall-docs-html-$VERSION >> $LOGFILE 2>&1"
	if [ -n "$SIGN" ]; then
	    for shoresuffix in tgz tar.bz2; do
		htmlball=shorewall-docs-html-$VERSION.${shoresuffix}
		report "GPG signing $DIR/$htmlball tarball"
		rm -f ${htmlball}.asc
		do_or_die "$GPG $htmlball"
	    done
	fi
    fi
fi

progress_message "Creating md5sums and sha1sums"

rm -f $VERSION.md5sums $VERSION.sha1sums

#
# The following rather awkward algorithm gets around the problem of builds that don't
# include the RPM
#
case $VERSION in
    *Beta*|*RC*)
	if [ -n "$BUILDCOMMON" ]; then		
	    do_or_die "md5sum shorewall-common-${BASEVERSION}-0${VERSION#*-}.noarch.rpm >> $VERSION.md5sums"
	    do_or_die "sha1sum shorewall-common-${BASEVERSION}-0${VERSION#*-}.noarch.rpm >> $VERSION.sha1sums"
	fi

	if [ -n "$BUILDLITE" ]; then		
	    do_or_die "md5sum shorewall-lite-${BASEVERSION}-0${VERSION#*-}.noarch.rpm >> $VERSION.md5sums"
	    do_or_die "sha1sum shorewall-lite-${BASEVERSION}-0${VERSION#*-}.noarch.rpm >> $VERSION.sha1sums"
	fi

	if [ -n "$BUILDPERL" ]; then		
	    do_or_die "md5sum shorewall-perl-${BASEVERSION}-0${VERSION#*-}.noarch.rpm >> $VERSION.md5sums"
	    do_or_die "sha1sum shorewall-perl-${BASEVERSION}-0${VERSION#*-}.noarch.rpm >> $VERSION.sha1sums"
	fi

	if [ -n "$BUILDSHELL" ]; then		
	    do_or_die "md5sum shorewall-shell-${BASEVERSION}-0${VERSION#*-}.noarch.rpm >> $VERSION.md5sums"
	    do_or_die "sha1sum shorewall-shell-${BASEVERSION}-0${VERSION#*-}.noarch.rpm >> $VERSION.sha1sums"
	fi
	;;
    *.*.*.*)
	[ -f $RPMNAME ]      && do_or_die "md5sum $RPMNAME >> $VERSION.md5sums"
	[ -f $RPM6NAME ]     && do_or_die "md5sum $RPM6NAME >> $VERSION.md5sums"
	[ -f $LITERPMNAME ]  && do_or_die "md5sum $LITERPMNAME >> $VERSION.md5sums"
	[ -f $LITE6RPMNAME ] && do_or_die "md5sum $LITE6RPMNAME >> $VERSION.md5sums"
	[ -f $PERLRPMNAME ]  && do_or_die "md5sum $PERLRPMNAME >> $VERSION.md5sums"
	[ -f $SHELLRPMNAME ] && do_or_die "md5sum $SHELLRPMNAME >> $VERSION.md5sums"
	;;
esac

for file in *; do
    case $file in
	*$VERSION[-.]*tgz|*$VERSION[-.]*rpm|*$VERSION[-.]*bz2)
	    do_or_die "md5sum $file >> $VERSION.md5sums"
	    do_or_die "sha1sum $file >> $VERSION.sha1sums"
	    ;;
    esac
done

if [ -n "$PATCHRELEASE" ]; then
    svn update ~/shorewall/tags/${BASEVERSION}
    if [ -f ~/shorewall/tags/${BASEVERSION}/known_problems.txt ]; then
	cp ~/shorewall/tags/${BASEVERSION}/known_problems.txt .
    else 
	[ -f known_problems.txt ] || echo "There are no known problems in Shorewall version $VERSION" > known_problems.txt
    fi
else
    echo "There are no known problems in Shorewall version $VERSION" > known_problems.txt
fi

if [ -n "$OLDVERSION" ]; then
    
    progress_message "Creating patch-$VERSION ..."

    [ -d shorewall-common-$VERSION ] && diff -Naur -X $(dirname $0)/exclude.txt shorewall-common-$OLDVERSION shorewall-common-$VERSION > patch-common-$VERSION || true
    [ -d shorewall6-$VERSION ]       && diff -Naur -X $(dirname $0)/exclude.txt shorewall6-$OLDVERSION       shorewall6-$VERSION       > patch-6-$VERSION      || true
    [ -d shorewall-lite-$VERSION ]   && diff -Naur -X $(dirname $0)/exclude.txt shorewall-lite-$OLDVERSION shorewall-lite-$VERSION     > patch-lite-$VERSION   || true
    [ -d shorewall6-lite-$VERSION ]  && diff -Naur -X $(dirname $0)/exclude.txt shorewall6-lite-$OLDVERSION shorewall6-lite-$VERSION   > patch-6-lite-$VERSION || true
    [ -d shorewall-perl-$VERSION ]   && diff -Naur -X $(dirname $0)/exclude.txt shorewall-perl-$OLDVERSION shorewall-perl-$VERSION     > patch-perl-$VERSION   || true
    [ -d shorewall-shell-$VERSION ]  && diff -Naur -X $(dirname $0)/exclude.txt shorewall-shell-$OLDVERSION shorewall-shell-$VERSION   > patch-shell-$VERSION  || true
    
fi

progress_message "Shorewall $VERSION Build complete - $(date)"