From 0dd64cab77e10036a4450873893ffa907b16a0ae Mon Sep 17 00:00:00 2001 From: teastep Date: Wed, 12 Dec 2007 19:08:11 +0000 Subject: [PATCH] Experiment with RPM versions git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7906 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall-common/fallback.sh | 2 +- Shorewall-common/install.sh | 2 +- Shorewall-common/shorewall-common.spec | 6 ++++-- Shorewall-common/uninstall.sh | 2 +- Shorewall-lite/fallback.sh | 2 +- Shorewall-lite/install.sh | 2 +- Shorewall-lite/shorewall-lite.spec | 6 ++++-- Shorewall-lite/uninstall.sh | 2 +- Shorewall-perl/Shorewall/Config.pm | 2 +- Shorewall-perl/install.sh | 2 +- Shorewall-perl/shorewall-perl.spec | 6 ++++-- Shorewall-shell/install.sh | 2 +- Shorewall-shell/shorewall-shell.spec | 6 ++++-- tools/build/buildshorewall | 10 +++++----- tools/build/setversion | 12 +++++++----- 15 files changed, 37 insertions(+), 27 deletions(-) diff --git a/Shorewall-common/fallback.sh b/Shorewall-common/fallback.sh index dc342cc8a..fba57610a 100755 --- 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=4.1.3 +VERSION=4.2.0-RC1 usage() # $1 = exit status { diff --git a/Shorewall-common/install.sh b/Shorewall-common/install.sh index 092149c35..cd247ef29 100755 --- 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=4.1.3 +VERSION=4.2.0-RC1 usage() # $1 = exit status { diff --git a/Shorewall-common/shorewall-common.spec b/Shorewall-common/shorewall-common.spec index b17e6d3a4..e027f6126 100644 --- a/Shorewall-common/shorewall-common.spec +++ b/Shorewall-common/shorewall-common.spec @@ -1,6 +1,6 @@ %define name shorewall-common -%define version 4.1.3 -%define release 1 +%define version 4.2.0 +%define release RC1 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems. Name: %{name} @@ -243,6 +243,8 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn Samples %changelog +* Wed Dec 12 2007 Tom Eastep tom@shorewall.net +- Updated to 4.2.0-RC1 * Fri Dec 07 2007 Tom Eastep tom@shorewall.net - Updated to 4.1.3-1 * Tue Nov 27 2007 Tom Eastep tom@shorewall.net diff --git a/Shorewall-common/uninstall.sh b/Shorewall-common/uninstall.sh index 07a388dab..c0b066f4d 100755 --- 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=4.1.3 +VERSION=4.2.0-RC1 usage() # $1 = exit status { diff --git a/Shorewall-lite/fallback.sh b/Shorewall-lite/fallback.sh index 4c41876f1..8e048142f 100755 --- 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=4.1.3 +VERSION=4.2.0-RC1 usage() # $1 = exit status { diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh index 109713524..f34396529 100755 --- 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=4.1.3 +VERSION=4.2.0-RC1 usage() # $1 = exit status { diff --git a/Shorewall-lite/shorewall-lite.spec b/Shorewall-lite/shorewall-lite.spec index cfd23fd2a..2c4e17416 100644 --- a/Shorewall-lite/shorewall-lite.spec +++ b/Shorewall-lite/shorewall-lite.spec @@ -1,6 +1,6 @@ %define name shorewall-lite -%define version 4.1.3 -%define release 1 +%define version 4.2.0 +%define release RC1 Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems. Name: %{name} @@ -98,6 +98,8 @@ fi %doc COPYING changelog.txt releasenotes.txt %changelog +* Wed Dec 12 2007 Tom Eastep tom@shorewall.net +- Updated to 4.2.0-RC1 * Fri Dec 07 2007 Tom Eastep tom@shorewall.net - Updated to 4.1.3-1 * Tue Nov 27 2007 Tom Eastep tom@shorewall.net diff --git a/Shorewall-lite/uninstall.sh b/Shorewall-lite/uninstall.sh index 127842014..646b51115 100755 --- 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=4.1.3 +VERSION=4.2.0-RC1 usage() # $1 = exit status { diff --git a/Shorewall-perl/Shorewall/Config.pm b/Shorewall-perl/Shorewall/Config.pm index ca13edb87..5f31c3e31 100644 --- a/Shorewall-perl/Shorewall/Config.pm +++ b/Shorewall-perl/Shorewall/Config.pm @@ -253,7 +253,7 @@ sub initialize() { ORIGINAL_POLICY_MATCH => '', LOGPARMS => '', TC_SCRIPT => '', - VERSION => "4.1.3", + VERSION => "4.2.0-RC1", CAPVERSION => 40100 , ); # diff --git a/Shorewall-perl/install.sh b/Shorewall-perl/install.sh index 2ebf3cea8..3d6ee66bf 100755 --- 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=4.1.3 +VERSION=4.2.0-RC1 usage() # $1 = exit status { diff --git a/Shorewall-perl/shorewall-perl.spec b/Shorewall-perl/shorewall-perl.spec index fc9de2a71..d8e2f7452 100644 --- a/Shorewall-perl/shorewall-perl.spec +++ b/Shorewall-perl/shorewall-perl.spec @@ -1,6 +1,6 @@ %define name shorewall-perl -%define version 4.1.3 -%define release 1 +%define version 4.2.0 +%define release RC1 Summary: Shoreline Firewall Perl-based compiler. Name: %{name} @@ -64,6 +64,8 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING releasenotes.txt %changelog +* Wed Dec 12 2007 Tom Eastep tom@shorewall.net +- Updated to 4.2.0-RC1 * Fri Dec 07 2007 Tom Eastep tom@shorewall.net - Updated to 4.1.3-1 * Tue Nov 27 2007 Tom Eastep tom@shorewall.net diff --git a/Shorewall-shell/install.sh b/Shorewall-shell/install.sh index 9fd0e9a2f..3a8a97f07 100755 --- 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=4.1.3 +VERSION=4.2.0-RC1 usage() # $1 = exit status { diff --git a/Shorewall-shell/shorewall-shell.spec b/Shorewall-shell/shorewall-shell.spec index da2f95810..32665c8f7 100644 --- a/Shorewall-shell/shorewall-shell.spec +++ b/Shorewall-shell/shorewall-shell.spec @@ -1,6 +1,6 @@ %define name shorewall-shell -%define version 4.1.3 -%define release 1 +%define version 4.2.0 +%define release RC1 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems. Name: %{name} @@ -81,6 +81,8 @@ fi %doc COPYING INSTALL %changelog +* Wed Dec 12 2007 Tom Eastep tom@shorewall.net +- Updated to 4.2.0-RC1 * Fri Dec 07 2007 Tom Eastep tom@shorewall.net - Updated to 4.1.3-1 * Tue Nov 27 2007 Tom Eastep tom@shorewall.net diff --git a/tools/build/buildshorewall b/tools/build/buildshorewall index 01ab63830..72e55645f 100755 --- a/tools/build/buildshorewall +++ b/tools/build/buildshorewall @@ -304,7 +304,7 @@ case $VERSION in MANPAGETAG=="tags/${BASEVERSION}/manpages" LITEMANPAGETAG="tags/${BASEVERSION}/manpages-lite" ;; - 4.1.*) + 4.[12].*) SVNBRANCH="trunk/Shorewall-common" LITESVNBRANCH="trunk/Shorewall-lite" PERLBRANCH="trunk/Shorewall-perl" @@ -395,12 +395,12 @@ case $VERSION in SHOREWALLLITEDIR=shorewall-lite-$VERSION TARBALL=shorewall-common-$VERSION.tgz LITETARBALL=shorewall-lite-$VERSION.tgz - RPMNAME=shorewall-common-${VERSION}-1.noarch.rpm - LITERPMNAME=shorewall-lite-${VERSION}-1.noarch.rpm - PERLRPMNAME=shorewall-perl-${VERSION}-1.noarch.rpm + RPMNAME=shorewall-common-${VERSION}-0base.noarch.rpm + LITERPMNAME=shorewall-lite-${VERSION}-0base.noarch.rpm + PERLRPMNAME=shorewall-perl-${VERSION}-0base.noarch.rpm PERLDIR=shorewall-perl-$VERSION PERLTARBALL=shorewall-perl-$VERSION.tgz - SHELLRPMNAME=shorewall-shell-${VERSION}-1.noarch.rpm + SHELLRPMNAME=shorewall-shell-${VERSION}-0base.noarch.rpm SHELLDIR=shorewall-shell-$VERSION SHELLTARBALL=shorewall-shell-$VERSION.tgz ;; diff --git a/tools/build/setversion b/tools/build/setversion index f4903b66e..95e6f0c1e 100755 --- a/tools/build/setversion +++ b/tools/build/setversion @@ -27,17 +27,21 @@ [ $# -eq 1 ] || { echo "usage: setversion " >&2; exit 1; } VERSION=$1 +SUFFIX= case $VERSION in *.*.*.*) - RELEASE=${VERSION##*.} RPMVERSION=${VERSION%.*} + RELEASE=${VERSION##*.} SUFFIX="-$RELEASE" ;; + *-*) + RPMVERSION=${VERSION%-*} + RELEASE=${VERSION##*-} + ;; *) RPMVERSION=${VERSION} - RELEASE=1 - SUFFIX= + RELEASE=0base ;; esac @@ -60,5 +64,3 @@ done file=Shorewall-perl${SUFFIX}/Shorewall/Config.pm [ -f $file ] && eval perl -p -i -e "'s/^(\s+)VERSION => .*/\$1VERSION => \"${VERSION}\",/'" $file - -