Update tools

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3468 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-02-10 19:52:48 +00:00
parent bb9c22cfe0
commit 460d2df887
2 changed files with 12 additions and 24 deletions

View File

@ -305,9 +305,11 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
do_or_die "cvs -z3 export -r $CVSTAG -d $SHOREWALLDIR Shorewall >> $LOGFILE 2>&1"
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"
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"
[ -f $SHOREWALLDIR/shorecap ] && \
{ fgrep VERSION=$VERSION $SHOREWALLDIR/shorecap > /dev/null 2>&1 || fatal_error "shorecap has wrong version"; }
if [ -n "$SAMPLESTAG" ]; then
cd $SHOREWALLDIR
@ -323,10 +325,6 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
do_or_die "tar -jcvf shorewall-${VERSION%-*}.tar.bz2 $SHOREWALLDIR >> $LOGFILE 2>&1"
for shoresuffix in tgz tar.bz2; do
shoreball=shorewall-${VERSION%-*}.${shoresuffix}
report "Creating $DIR/$shoreball tarball sha1sums.."
do_or_die "sha1sum $shoreball >> $VERSION.sha1sums"
report "Creating $DIR/$shoreball tarball md5sums.."
do_or_die "md5sum $shoreball >> $VERSION.md5sums"
report "GPG signing $DIR/$shoreball"
rm -f ${shoreball}.asc
do_or_die "$GPG $shoreball"
@ -338,10 +336,6 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
do_or_die "rpmbuild -tb --sign $TARBALL >> $LOGFILE 2>&1"
do_or_die cp -a $RPMDIR/RPMS/noarch/$RPMNAME .
progress_message "Creating $RPMNAME sha1sums.."
do_or_die "sha1sum $RPMNAME >> $VERSION.sha1sums"
progress_message "Creating $RPMNAME md5sums.."
do_or_die "md5sum $RPMNAME >> $VERSION.md5sums"
fi
fi
@ -366,10 +360,6 @@ if [ -n "${BUILDXML}${BUILDHTML}" ]; then
do_or_die "tar -jcvf shorewall-docs-xml-$VERSION.tar.bz2 shorewall-docs-xml-$VERSION >> $LOGFILE 2>&1"
for shoresuffix in tgz tar.bz2; do
xmlball=shorewall-docs-xml-$VERSION.${shoresuffix}
report "Creating $DIR/$xmlball tarball sha1sums.."
do_or_die "sha1sum $xmlball >> $VERSION.sha1sums"
report "Creating $DIR/$xmlball tarball md5sums.."
do_or_die "md5sum $xmlball >> $VERSION.md5sums"
report "GPG signing $DIR/$xmlball tarball"
rm -f ${xmlball}.asc
do_or_die "$GPG $xmlball"
@ -454,10 +444,6 @@ if [ -n "${BUILDXML}${BUILDHTML}" ]; then
do_or_die "tar -jcvf shorewall-docs-html-$VERSION.tar.bz2 shorewall-docs-html-$VERSION >> $LOGFILE 2>&1"
for shoresuffix in tgz tar.bz2; do
htmlball=shorewall-docs-html-$VERSION.${shoresuffix}
report "Creating $DIR/$htmlball tarball sha1sums"
do_or_die "sha1sum $htmlball >> $VERSION.sha1sums"
report "Creating $DIR/$htmlball tarball md5sums"
do_or_die "md5sum $htmlball >> $VERSION.md5sums"
report "GPG signing $DIR/$htmlball tarball"
rm -f ${htmlball}.asc
do_or_die "$GPG $htmlball"
@ -484,10 +470,6 @@ fi
for shoresuffix in tgz tar.bz2; do
betaball=shorewall-$VERSION.${shoresuffix}
report "Creating $DIR/shorewall-$VERSION tarball sha1sums"
do_or_die "sha1sum $betaball >> $VERSION.sha1sums"
report "Creating $DIR/shorewall-$VERSION tarball md5sums"
do_or_die "md5sum $betaball >> $VERSION.md5sums"
report "GPG signing $DIR/$betaball tarball"
rm -f ${betaball}.asc
do_or_die "$GPG $betaball"
@ -547,4 +529,10 @@ if [ -n "$OLDVERSION" ]; then
diff -Naur shorewall-$OLDVERSION shorewall-$VERSION > patch-$VERSION
fi
report "Creating md5sums"
do_or_die "md5sum *.tgz *.rpm *.bz2 > $VERSION.md5sums"
report "Creating sha1sums"
do_or_die "sha1sum *.tgz *.rpm *.bz2 > $VERSION.sha1sums"
progress_message "Shorewall $VERSION Build complete - $(date)"

View File

@ -1,6 +1,6 @@
#/bin/sh
DEST="root@mail.shorewall.net:/var/ftp/pub/shorewall/${1%.*}/shorewall-$1"
DEST="root@mail.shorewall.net:/srv/ftp/pub/shorewall/${1%.*}/shorewall-$1"
usage() { echo "$0: <version>"; }