Tom, The first patch(releasenotes.txt.patch) will correct a typo.
build50-5.patch: In addition to what has already been done to build50, patch 1 will allow the build of tag ending in -[bB]ase for the LOGDIR variable. So if 'LOGDIR=$BASEDIR/$2' and 'DIR=$BASEDIR/$2'(or '$1' if all options are to be assumed) is used, shorewall will be built in a subdirectory which will have as name the VERSION passed to build50. As part of that changed, I've reordered and grouped the checks for tag ending in -[bB]ase and also removed a line that wasn't necessary anymore. -Matt -------------- Enclosure number 1 ---------------- >From c69191fe42b676f9f3a95fa213fce4bf90ac0fc9 Mon Sep 17 00:00:00 2001 From: Matt Darfeuille <[email protected]> Date: Mon, 22 Aug 2016 17:59:44 +0200 Subject: [PATCH] Correct a typo in the release notes Signed-off-by: Matt Darfeuille <[email protected]> --- releasenotes.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releasenotes.txt b/releasenotes.txt index 00852f4..d48d0af 100644 --- a/releasenotes.txt +++ b/releasenotes.txt @@ -22,7 +22,7 @@ V. PROBLEMS CORRECTED AND NEW FEATURES IN PRIOR RELEASES The default is now restored to POSTROUTING, its earlier value. -3) When 'trace' was specified, prevously the output of ip[6]tables +3) When 'trace' was specified, previously the output of ip[6]tables rules containing a comment were displayed incorrectly. The "-m comment --comment" specification was missing and the comment was not enclosed in double quotes. This has been corrected. -- 2.6.2 -------------- Enclosure number 2 ---------------- >From 34b554b6e97509d3430d1dfd7db8c381da93b905 Mon Sep 17 00:00:00 2001 From: Matt Darfeuille <[email protected]> Date: Mon, 22 Aug 2016 16:52:05 +0200 Subject: [PATCH 1/5] Support tag ending in -[bB]ase for LOGDIR variable Signed-off-by: Matt Darfeuille <[email protected]> --- build/build50 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build/build50 b/build/build50 index 141cc25..aef02a1 100755 --- a/build/build50 +++ b/build/build50 @@ -490,6 +490,12 @@ esac VERSION=$1 BASEVERSION=$1 +case $LOGDIR in + *[bB]ase*) + LOGDIR=${LOGDIR%-*} + ;; +esac + LOGFILE=$LOGDIR/shorewall_build_${VERSION}.log echo "Arguments are $*" > $LOGFILE progress_message "Build of Shorewall $VERSION on $(date)" -- 2.6.2 >From c1409144ebc0853912a46e5fe4ac58fbb976bce4 Mon Sep 17 00:00:00 2001 From: Matt Darfeuille <[email protected]> Date: Wed, 24 Aug 2016 13:51:45 +0200 Subject: [PATCH 2/5] Test tag ending in -[bB]ase before setting LOGFILE Signed-off-by: Matt Darfeuille <[email protected]> --- build/build50 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/build50 b/build/build50 index aef02a1..d92f2ca 100755 --- a/build/build50 +++ b/build/build50 @@ -496,10 +496,6 @@ case $LOGDIR in ;; esac -LOGFILE=$LOGDIR/shorewall_build_${VERSION}.log -echo "Arguments are $*" > $LOGFILE -progress_message "Build of Shorewall $VERSION on $(date)" - case $VERSION in *[bB]ase*) TAGVERSION=$VERSION @@ -513,6 +509,10 @@ case $VERSION in ;; esac +LOGFILE=$LOGDIR/shorewall_build_${VERSION}.log +echo "Arguments are $*" > $LOGFILE +progress_message "Build of Shorewall $VERSION on $(date)" + case $VERSION in 5.[0].*.*) XMLPROJ="docs-5.0" -- 2.6.2 >From 00172dfb3fcddec9e9250f8835d6c341da9981f4 Mon Sep 17 00:00:00 2001 From: Matt Darfeuille <[email protected]> Date: Wed, 24 Aug 2016 14:46:43 +0200 Subject: [PATCH 3/5] Group together checks for tag ending in -[bB]ase Signed-off-by: Matt Darfeuille <[email protected]> --- build/build50 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build/build50 b/build/build50 index d92f2ca..38036c0 100755 --- a/build/build50 +++ b/build/build50 @@ -490,17 +490,17 @@ esac VERSION=$1 BASEVERSION=$1 -case $LOGDIR in - *[bB]ase*) - LOGDIR=${LOGDIR%-*} - ;; -esac - case $VERSION in *[bB]ase*) TAGVERSION=$VERSION VERSION=${VERSION%-*} + case $LOGDIR in + *[bB]ase*) + LOGDIR=${LOGDIR%-*} + ;; + esac + case $DIR in *[bB]ase*) DIR=${DIR%-*} -- 2.6.2 >From 1da3be0d8da7bb5d77cc3dd3b27ec460a66c27bc Mon Sep 17 00:00:00 2001 From: Matt Darfeuille <[email protected]> Date: Wed, 24 Aug 2016 16:27:28 +0200 Subject: [PATCH 4/5] Test if LOGDIR directory exist Signed-off-by: Matt Darfeuille <[email protected]> --- build/build50 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/build50 b/build/build50 index 38036c0..2db3db4 100755 --- a/build/build50 +++ b/build/build50 @@ -509,6 +509,8 @@ case $VERSION in ;; esac +[ -d $LOGDIR ] || { echo "Directory $LOGDIR does not exist or is unaccessible" ; exit 2 ; } + LOGFILE=$LOGDIR/shorewall_build_${VERSION}.log echo "Arguments are $*" > $LOGFILE progress_message "Build of Shorewall $VERSION on $(date)" -- 2.6.2 >From be3ec5525bbb4723ba0bd6499136496509e54b5b Mon Sep 17 00:00:00 2001 From: Matt Darfeuille <[email protected]> Date: Wed, 24 Aug 2016 16:45:08 +0200 Subject: [PATCH 5/5] Remove unnecessary check for the TAGVERSION var Signed-off-by: Matt Darfeuille <[email protected]> --- build/build50 | 2 -- 1 file changed, 2 deletions(-) diff --git a/build/build50 b/build/build50 index 2db3db4..b10b69f 100755 --- a/build/build50 +++ b/build/build50 @@ -1196,6 +1196,4 @@ if [ -n "$OLDVERSION" ]; then fi fi -[ -n "$TAGVERSION" ] && VERSION=$TAGVERSION - progress_message "Shorewall $VERSION Build complete - $(date)" -- 2.6.2 ------------------------------------------------------------------------------ _______________________________________________ Shorewall-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/shorewall-devel
