Update version to 4.3.0

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@8973 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
2025-02-07 21:39:53 +01:00 · 2008-12-10 18:43:37 +00:00 · 2008-12-10 18:43:37 +00:00 · 5e7cfa0f03
commit 5e7cfa0f03
parent d84c525ce1
22 changed files with 60 additions and 29 deletions
--- a/Shorewall-common/fallback.sh
+++ b/Shorewall-common/fallback.sh
@ -28,7 +28,7 @@
 #       shown below. Simply run this script to revert to your prior version of
 #       Shoreline Firewall.

-VERSION=2.3.0
+VERSION=4.3.0

 usage() # $1 = exit status
 {
--- a/Shorewall-common/install.sh
+++ b/Shorewall-common/install.sh
@ -22,7 +22,7 @@
 #       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

-VERSION=2.3.0
+VERSION=4.3.0

 usage() # $1 = exit status
 {
--- a/Shorewall-common/shorewall-common.spec
+++ b/Shorewall-common/shorewall-common.spec
@ -1,5 +1,5 @@
 %define name shorewall-common
-%define version 2.3.0
+%define version 4.3.0
 %define release 0base

 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems.
@ -176,6 +176,8 @@ fi

 %changelog
 * Wed Dec 10 2008 Tom Eastep tom@shorewall.net
+- Updated to 4.3.0-0base
+* Wed Dec 10 2008 Tom Eastep tom@shorewall.net
 - Updated to 2.3.0-0base
 * Fri Dec 05 2008 Tom Eastep tom@shorewall.net
 - Updated to 4.2.3-0base
--- a/Shorewall-common/uninstall.sh
+++ b/Shorewall-common/uninstall.sh
@ -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.3.0
+VERSION=4.3.0

 usage() # $1 = exit status
 {
--- a/Shorewall-lite/fallback.sh
+++ b/Shorewall-lite/fallback.sh
@ -28,7 +28,7 @@
 #       shown below. Simply run this script to revert to your prior version of
 #       Shoreline Firewall.

-VERSION=2.3.0
+VERSION=4.3.0

 usage() # $1 = exit status
 {
--- a/Shorewall-lite/install.sh
+++ b/Shorewall-lite/install.sh
@ -22,7 +22,7 @@
 #       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

-VERSION=2.3.0
+VERSION=4.3.0

 usage() # $1 = exit status
 {
--- a/Shorewall-lite/shorewall-lite.spec
+++ b/Shorewall-lite/shorewall-lite.spec
@ -1,5 +1,5 @@
 %define name shorewall-lite
-%define version 2.3.0
+%define version 4.3.0
 %define release 0base

 Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems.
@ -99,6 +99,8 @@ fi

 %changelog
 * Wed Dec 10 2008 Tom Eastep tom@shorewall.net
+- Updated to 4.3.0-0base
+* Wed Dec 10 2008 Tom Eastep tom@shorewall.net
 - Updated to 2.3.0-0base
 * Wed Oct 08 2008 Tom Eastep tom@shorewall.net
 - Updated to 4.2.1-0base
--- a/Shorewall-lite/uninstall.sh
+++ b/Shorewall-lite/uninstall.sh
@ -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.3.0
+VERSION=4.3.0

 usage() # $1 = exit status
 {
--- a/Shorewall-perl/Shorewall/Config.pm
+++ b/Shorewall-perl/Shorewall/Config.pm
@ -297,7 +297,7 @@ sub initialize( $ ) {
 		    LOGPARMS => '',
 		    TC_SCRIPT => '',
 		    EXPORT => 0,
-		    VERSION => "2.3.0",
+		    VERSION => "4.3.0",
 		    CAPVERSION => 40203 ,
 		  );
    #
--- a/Shorewall-perl/install.sh
+++ b/Shorewall-perl/install.sh
@ -22,7 +22,7 @@
 #       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

-VERSION=2.3.0
+VERSION=4.3.0

 usage() # $1 = exit status
 {
--- a/Shorewall-perl/shorewall-perl.spec
+++ b/Shorewall-perl/shorewall-perl.spec
@ -1,5 +1,5 @@
 %define name shorewall-perl
-%define version 2.3.0
+%define version 4.3.0
 %define release 0base

 Summary: Shoreline Firewall Perl-based compiler.
@ -65,6 +65,8 @@ rm -rf $RPM_BUILD_ROOT

 %changelog
 * Wed Dec 10 2008 Tom Eastep tom@shorewall.net
+- Updated to 4.3.0-0base
+* Wed Dec 10 2008 Tom Eastep tom@shorewall.net
 - Updated to 2.3.0-0base
 * Fri Dec 05 2008 Tom Eastep tom@shorewall.net
 - Updated to 4.2.3-0base
--- a/Shorewall-shell/install.sh
+++ b/Shorewall-shell/install.sh
@ -22,7 +22,7 @@
 #       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

-VERSION=2.3.0
+VERSION=4.3.0

 usage() # $1 = exit status
 {
--- a/Shorewall-shell/shorewall-shell.spec
+++ b/Shorewall-shell/shorewall-shell.spec
@ -1,5 +1,5 @@
 %define name shorewall-shell
-%define version 2.3.0
+%define version 4.3.0
 %define release 0base

 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems.
@ -82,6 +82,8 @@ fi

 %changelog
 * Wed Dec 10 2008 Tom Eastep tom@shorewall.net
+- Updated to 4.3.0-0base
+* Wed Dec 10 2008 Tom Eastep tom@shorewall.net
 - Updated to 2.3.0-0base
 * Wed Oct 08 2008 Tom Eastep tom@shorewall.net
 - Updated to 4.2.1-0base
--- a/Shorewall6-lite/fallback.sh
+++ b/Shorewall6-lite/fallback.sh
@ -28,7 +28,7 @@
 #       shown below. Simply run this script to revert to your prior version of
 #       Shoreline Firewall.

-VERSION=2.3.0
+VERSION=4.3.0

 usage() # $1 = exit status
 {
--- a/Shorewall6-lite/install.sh
+++ b/Shorewall6-lite/install.sh
@ -22,7 +22,7 @@
 #       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

-VERSION=2.3.0
+VERSION=4.3.0

 usage() # $1 = exit status
 {
--- a/Shorewall6-lite/shorewall6-lite.spec
+++ b/Shorewall6-lite/shorewall6-lite.spec
@ -1,5 +1,5 @@
 %define name shorewall6-lite
-%define version 2.3.0
+%define version 4.3.0
 %define release 0base

 Summary: Shoreline Firewall 6 Lite is an ip6tables-based firewall for Linux systems.
@ -92,6 +92,8 @@ fi

 %changelog
 * Wed Dec 10 2008 Tom Eastep tom@shorewall.net
+- Updated to 4.3.0-0base
+* Wed Dec 10 2008 Tom Eastep tom@shorewall.net
 - Updated to 2.3.0-0base
 * Tue Dec 09 2008 Tom Eastep tom@shorewall.net
 - Initial Version
--- a/Shorewall6-lite/uninstall.sh
+++ b/Shorewall6-lite/uninstall.sh
@ -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.3.0
+VERSION=4.3.0

 usage() # $1 = exit status
 {
--- a/Shorewall6/fallback.sh
+++ b/Shorewall6/fallback.sh
@ -28,7 +28,7 @@
 #       shown below. Simply run this script to revert to your prior version of
 #       Shoreline Firewall.

-VERSION=2.3.0
+VERSION=4.3.0

 usage() # $1 = exit status
 {
--- a/Shorewall6/install.sh
+++ b/Shorewall6/install.sh
@ -22,7 +22,7 @@
 #       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #

-VERSION=2.3.0
+VERSION=4.3.0

 usage() # $1 = exit status
 {
--- a/Shorewall6/shorewall6.spec
+++ b/Shorewall6/shorewall6.spec
@ -1,5 +1,5 @@
 %define name shorewall6
-%define version 2.3.0
+%define version 4.3.0
 %define release 0base

 Summary: Shoreline Firewall 6 is an ip6tables-based firewall for Linux systems.
@ -152,6 +152,8 @@ fi

 %changelog
 * Wed Dec 10 2008 Tom Eastep tom@shorewall.net
+- Updated to 4.3.0-0base
+* Wed Dec 10 2008 Tom Eastep tom@shorewall.net
 - Updated to 2.3.0-0base
 * Tue Dec 09 2008 Tom Eastep tom@shorewall6.net
 - Initial Version
--- a/Shorewall6/uninstall.sh
+++ b/Shorewall6/uninstall.sh
@ -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.3.0
+VERSION=4.3.0

 usage() # $1 = exit status
 {
--- a/tools/build/buildshorewall
+++ b/tools/build/buildshorewall
@ -210,9 +210,11 @@ case $1 in
 	BUILDXML=Yes
 	BUILDRPM=Yes
 	BUILDCOMMON=Yes
+	BUILD6=Yes
 	BUILDPERL=Yes
 	BUILDSHELL=Yes
 	BUILDLITE=Yes
+	BUILD6LITE=Yes
 	done=Yes
 	SIGN=Yes
 	;;
@ -312,8 +314,8 @@ case $VERSION in
     4.3.*)
 	SVNBRANCH="trunk/Shorewall-common"
 	SVN6BRANCH="trunk/Shorewall6"
-	LITESVNBRANCH=trunk/Shorewall-lite"
-	LITE6SVNBRANCH=trunk/Shorewall6-lite"
+	LITESVNBRANCH="trunk/Shorewall-lite"
+	LITE6SVNBRANCH="trunk/Shorewall6-lite"
 	PERLBRANCH="trunk/Shorewall-perl"
 	SHELLBRANCH="trunk/Shorewall-shell"
 	DOCTAG="trunk/docs"
@ -435,21 +437,38 @@ 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 "Lite SVN tag is $LITESVNBRANCH"
    report "Shell SVN tag is $SHELLBRANCH"
    report "Perl SVN tag is $PERLBRANCH"
-    [ -n "$BUILDTARBALL" ] && report "TARBALL is $TARBALL" && report "LITETARBALL is $LITETARBALL"&& report "SHELLTARBALL is $SHELLTARBALL"&& report "PERLTARBALL is $PERLTARBALL"
-    [ -n "$BUILDRPM" ]     && report "RPM is $RPMNAME" && report "LITERPM is $LITERPMNAME" && report "SHELLRPM is $SHELLRPMNAME" && report "PERLRPM is $PERLRPMNAME"
+    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" ] || BUILD6LITE6=
+[ -n "$LITE6RPMNAME" ] || BUILD6LITE=

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

@ -465,9 +484,9 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then

    [ -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 $LITE6SVNBRANCH from SVN..." && do_or_die "svn export --non-interactive --force ${SVN}/$LITE6SVNBRANCH  $LITE6DIR >> $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 $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"

@ -494,7 +513,7 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then

    [ -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 "$BUIL6DLITE" ]  && do_or_die "cp $SHOREWALLDIR/changelog.txt  $SHOREWALLDIR/releasenotes.txt $LITE6DIR >> $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"