extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-19 17:28:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Experiment with RPM versions

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7906 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-12-12 19:08:11 +00:00
parent 76bbd985cd
commit 0dd64cab77
15 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall-common/fallback.sh
View File

@ -28,7 +28,7 @@
# shown below. Simply run this script to revert to your prior version of # shown below. Simply run this script to revert to your prior version of
# Shoreline Firewall. # Shoreline Firewall.
VERSION=4.1.3 VERSION=4.2.0-RC1
usage() # $1 = exit status usage() # $1 = exit status
{ {

2
Shorewall-common/install.sh
View File

@ -22,7 +22,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # 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 usage() # $1 = exit status
{ {

6
Shorewall-common/shorewall-common.spec
View File

@ -1,6 +1,6 @@
%define name shorewall-common %define name shorewall-common
%define version 4.1.3 %define version 4.2.0
%define release 1 %define release RC1
Summary: Shoreline Firewall is an iptables-based firewall for Linux systems. Summary: Shoreline Firewall is an iptables-based firewall for Linux systems.
Name: %{name} Name: %{name}
@ -243,6 +243,8 @@ fi
%doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn Samples %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn Samples
%changelog %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 * Fri Dec 07 2007 Tom Eastep tom@shorewall.net
- Updated to 4.1.3-1 - Updated to 4.1.3-1
* Tue Nov 27 2007 Tom Eastep tom@shorewall.net * Tue Nov 27 2007 Tom Eastep tom@shorewall.net

2
Shorewall-common/uninstall.sh
View File

@ -26,7 +26,7 @@
# You may only use this script to uninstall the version # You may only use this script to uninstall the version
# shown below. Simply run this script to remove Shorewall Firewall # shown below. Simply run this script to remove Shorewall Firewall
VERSION=4.1.3 VERSION=4.2.0-RC1
usage() # $1 = exit status usage() # $1 = exit status
{ {

2
Shorewall-lite/fallback.sh
View File

@ -28,7 +28,7 @@
# shown below. Simply run this script to revert to your prior version of # shown below. Simply run this script to revert to your prior version of
# Shoreline Firewall. # Shoreline Firewall.
VERSION=4.1.3 VERSION=4.2.0-RC1
usage() # $1 = exit status usage() # $1 = exit status
{ {

2
Shorewall-lite/install.sh
View File

@ -22,7 +22,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # 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 usage() # $1 = exit status
{ {

6
Shorewall-lite/shorewall-lite.spec
View File

@ -1,6 +1,6 @@
%define name shorewall-lite %define name shorewall-lite
%define version 4.1.3 %define version 4.2.0
%define release 1 %define release RC1
Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems. Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems.
Name: %{name} Name: %{name}
@ -98,6 +98,8 @@ fi
%doc COPYING changelog.txt releasenotes.txt %doc COPYING changelog.txt releasenotes.txt
%changelog %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 * Fri Dec 07 2007 Tom Eastep tom@shorewall.net
- Updated to 4.1.3-1 - Updated to 4.1.3-1
* Tue Nov 27 2007 Tom Eastep tom@shorewall.net * Tue Nov 27 2007 Tom Eastep tom@shorewall.net

2
Shorewall-lite/uninstall.sh
View File

@ -26,7 +26,7 @@
# You may only use this script to uninstall the version # You may only use this script to uninstall the version
# shown below. Simply run this script to remove Shorewall Firewall # shown below. Simply run this script to remove Shorewall Firewall
VERSION=4.1.3 VERSION=4.2.0-RC1
usage() # $1 = exit status usage() # $1 = exit status
{ {

2
Shorewall-perl/Shorewall/Config.pm
View File

@ -253,7 +253,7 @@ sub initialize() {
ORIGINAL_POLICY_MATCH => '', ORIGINAL_POLICY_MATCH => '',
LOGPARMS => '', LOGPARMS => '',
TC_SCRIPT => '', TC_SCRIPT => '',
VERSION => "4.1.3", VERSION => "4.2.0-RC1",
CAPVERSION => 40100 , CAPVERSION => 40100 ,
); );
# #

2
Shorewall-perl/install.sh
View File

@ -22,7 +22,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # 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 usage() # $1 = exit status
{ {

6
Shorewall-perl/shorewall-perl.spec
View File

@ -1,6 +1,6 @@
%define name shorewall-perl %define name shorewall-perl
%define version 4.1.3 %define version 4.2.0
%define release 1 %define release RC1
Summary: Shoreline Firewall Perl-based compiler. Summary: Shoreline Firewall Perl-based compiler.
Name: %{name} Name: %{name}
@ -64,6 +64,8 @@ rm -rf $RPM_BUILD_ROOT
%doc COPYING releasenotes.txt %doc COPYING releasenotes.txt
%changelog %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 * Fri Dec 07 2007 Tom Eastep tom@shorewall.net
- Updated to 4.1.3-1 - Updated to 4.1.3-1
* Tue Nov 27 2007 Tom Eastep tom@shorewall.net * Tue Nov 27 2007 Tom Eastep tom@shorewall.net

2
Shorewall-shell/install.sh
View File

@ -22,7 +22,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # 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 usage() # $1 = exit status
{ {

6
Shorewall-shell/shorewall-shell.spec
View File

@ -1,6 +1,6 @@
%define name shorewall-shell %define name shorewall-shell
%define version 4.1.3 %define version 4.2.0
%define release 1 %define release RC1
Summary: Shoreline Firewall is an iptables-based firewall for Linux systems. Summary: Shoreline Firewall is an iptables-based firewall for Linux systems.
Name: %{name} Name: %{name}
@ -81,6 +81,8 @@ fi
%doc COPYING INSTALL %doc COPYING INSTALL
%changelog %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 * Fri Dec 07 2007 Tom Eastep tom@shorewall.net
- Updated to 4.1.3-1 - Updated to 4.1.3-1
* Tue Nov 27 2007 Tom Eastep tom@shorewall.net * Tue Nov 27 2007 Tom Eastep tom@shorewall.net

10
tools/build/buildshorewall
View File

@ -304,7 +304,7 @@ case $VERSION in
MANPAGETAG=="tags/${BASEVERSION}/manpages" MANPAGETAG=="tags/${BASEVERSION}/manpages"
LITEMANPAGETAG="tags/${BASEVERSION}/manpages-lite" LITEMANPAGETAG="tags/${BASEVERSION}/manpages-lite"
;; ;;
4.1.*) 4.[12].*)
SVNBRANCH="trunk/Shorewall-common" SVNBRANCH="trunk/Shorewall-common"
LITESVNBRANCH="trunk/Shorewall-lite" LITESVNBRANCH="trunk/Shorewall-lite"
PERLBRANCH="trunk/Shorewall-perl" PERLBRANCH="trunk/Shorewall-perl"
@ -395,12 +395,12 @@ case $VERSION in
SHOREWALLLITEDIR=shorewall-lite-$VERSION SHOREWALLLITEDIR=shorewall-lite-$VERSION
TARBALL=shorewall-common-$VERSION.tgz TARBALL=shorewall-common-$VERSION.tgz
LITETARBALL=shorewall-lite-$VERSION.tgz LITETARBALL=shorewall-lite-$VERSION.tgz
RPMNAME=shorewall-common-${VERSION}-1.noarch.rpm RPMNAME=shorewall-common-${VERSION}-0base.noarch.rpm
LITERPMNAME=shorewall-lite-${VERSION}-1.noarch.rpm LITERPMNAME=shorewall-lite-${VERSION}-0base.noarch.rpm
PERLRPMNAME=shorewall-perl-${VERSION}-1.noarch.rpm PERLRPMNAME=shorewall-perl-${VERSION}-0base.noarch.rpm
PERLDIR=shorewall-perl-$VERSION PERLDIR=shorewall-perl-$VERSION
PERLTARBALL=shorewall-perl-$VERSION.tgz PERLTARBALL=shorewall-perl-$VERSION.tgz
SHELLRPMNAME=shorewall-shell-${VERSION}-1.noarch.rpm SHELLRPMNAME=shorewall-shell-${VERSION}-0base.noarch.rpm
SHELLDIR=shorewall-shell-$VERSION SHELLDIR=shorewall-shell-$VERSION
SHELLTARBALL=shorewall-shell-$VERSION.tgz SHELLTARBALL=shorewall-shell-$VERSION.tgz
;; ;;

12
tools/build/setversion
View File

@ -27,17 +27,21 @@
[ $# -eq 1 ] || { echo "usage: setversion <version>" >&2; exit 1; } [ $# -eq 1 ] || { echo "usage: setversion <version>" >&2; exit 1; }
VERSION=$1 VERSION=$1
SUFFIX=
case $VERSION in case $VERSION in
*.*.*.*) *.*.*.*)
RELEASE=${VERSION##*.}
RPMVERSION=${VERSION%.*} RPMVERSION=${VERSION%.*}
RELEASE=${VERSION##*.}
SUFFIX="-$RELEASE" SUFFIX="-$RELEASE"
;; ;;
*-*)
RPMVERSION=${VERSION%-*}
RELEASE=${VERSION##*-}
;;
*) *)
RPMVERSION=${VERSION} RPMVERSION=${VERSION}
RELEASE=1 RELEASE=0base
SUFFIX=
;; ;;
esac esac
@ -60,5 +64,3 @@ done
file=Shorewall-perl${SUFFIX}/Shorewall/Config.pm file=Shorewall-perl${SUFFIX}/Shorewall/Config.pm
[ -f $file ] && eval perl -p -i -e "'s/^(\s+)VERSION => .*/\$1VERSION => \"${VERSION}\",/'" $file [ -f $file ] && eval perl -p -i -e "'s/^(\s+)VERSION => .*/\$1VERSION => \"${VERSION}\",/'" $file