holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Allow building without GPG signature

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4323 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
paulgear 2006-08-09 01:07:17 +00:00
parent 48d06133a6
commit 91f70f3e3f
1 changed files with 57 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tools/build/makeshorewall
View File

@ -29,6 +29,7 @@
# -r Build RPM
# -h Build HTML documentation
# -x Build XML documentation
# -s Don't sign with GPG
#
# If no options are given, all options are assumed.
#
@ -83,6 +84,7 @@ BUILDXML=
BUILDHTML=
SAMPLESTAG=
HASLITE=
SIGN=
################################################################################
# F U N C T I O N S
################################################################################
@ -145,6 +147,7 @@ case $1 in
BUILDHTML=Yes
BUILDXML=Yes
BUILDRPM=Yes
SIGN=Yes
done=Yes
;;
esac
@ -178,6 +181,10 @@ while [ -z "$done" ]; do
BUILDXML=Yes
option=${option#x}
;;
s*)
SIGN=""
option=${option#s}
;;
*)
usage
;;
@ -316,16 +323,19 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
progress_message "Creating $DIR/$TARBALL..."
do_or_die "tar -zcvf $TARBALL $SHOREWALLDIR >> $LOGFILE 2>&1"
do_or_die "tar -jcvf shorewall-${VERSION%-*}.tar.bz2 $SHOREWALLDIR >> $LOGFILE 2>&1"
if [ -n "$SIGN" ]; then
for shoresuffix in tgz tar.bz2; do
shoreball=shorewall-${VERSION%-*}.${shoresuffix}
report "GPG signing $DIR/$shoreball"
rm -f ${shoreball}.asc
do_or_die "$GPG $shoreball"
done
fi
if [ -n "$HASLITE" ]; then
progress_message "Creating $DIR/$LITETARBALL..."
do_or_die "tar -zcvf $LITETARBALL $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
do_or_die "tar -jcvf shorewall-lite-${VERSION%-*}.tar.bz2 $SHOREWALLLITEDIR >> $LOGFILE 2>&1"
if [ -n "$SIGN" ]; then
for shoresuffix in tgz tar.bz2; do
shoreball=shorewall-lite-${VERSION%-*}.${shoresuffix}
report "GPG signing $DIR/$shoreball"
@ -334,17 +344,19 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
done
fi
fi
fi
if [ -n "$BUILDRPM" ]; then
progress_message "Building $RPMNAME..."
do_or_die "rpmbuild -tb --sign $TARBALL >> $LOGFILE 2>&1"
test -n "$SIGN" && SIGN="--sign"
do_or_die "rpmbuild -tb $SIGN $TARBALL >> $LOGFILE 2>&1"
do_or_die cp -a $RPMDIR/RPMS/noarch/$RPMNAME .
if [ -n "$HASLITE" ]; then
progress_message "Building $LITERPMNAME..."
do_or_die "rpmbuild -tb --sign $LITETARBALL >> $LOGFILE 2>&1"
do_or_die "rpmbuild -tb $SIGN $LITETARBALL >> $LOGFILE 2>&1"
do_or_die cp -a $RPMDIR/RPMS/noarch/$LITERPMNAME .
fi
fi
@ -369,6 +381,7 @@ if [ -n "${BUILDXML}${BUILDHTML}" ]; then
progress_message "Creating $DIR/shorewall-docs-xml-$VERSION tarballs"
do_or_die "tar -zcvf shorewall-docs-xml-$VERSION.tgz shorewall-docs-xml-$VERSION >> $LOGFILE 2>&1"
do_or_die "tar -jcvf shorewall-docs-xml-$VERSION.tar.bz2 shorewall-docs-xml-$VERSION >> $LOGFILE 2>&1"
if [ -n "$SIGN" ]; then
for shoresuffix in tgz tar.bz2; do
xmlball=shorewall-docs-xml-$VERSION.${shoresuffix}
report "GPG signing $DIR/$xmlball tarball"
@ -376,6 +389,7 @@ if [ -n "${BUILDXML}${BUILDHTML}" ]; then
do_or_die "$GPG $xmlball"
done
fi
fi
if [ -n "$BUILDHTML" ]; then
progress_message "Building $HTMLDIR ..."
@ -453,6 +467,7 @@ if [ -n "${BUILDXML}${BUILDHTML}" ]; then
do_or_die "tar -zcvf shorewall-docs-html-$VERSION.tgz shorewall-docs-html-$VERSION >> $LOGFILE 2>&1"
do_or_die "tar -jcvf shorewall-docs-html-$VERSION.tar.bz2 shorewall-docs-html-$VERSION >> $LOGFILE 2>&1"
if [ -n "$SIGN" ]; then
for shoresuffix in tgz tar.bz2; do
htmlball=shorewall-docs-html-$VERSION.${shoresuffix}
report "GPG signing $DIR/$htmlball tarball"
@ -460,6 +475,7 @@ if [ -n "${BUILDXML}${BUILDHTML}" ]; then
do_or_die "$GPG $htmlball"
done
fi
fi
fi
[ -n "$BUILDTARBALL" ] && case $VERSION in
@ -479,12 +495,14 @@ fi
do_or_die "tar -zcvf shorewall-${VERSION}.tgz shorewall-$VERSION >> $LOGFILE 2>&1"
do_or_die "tar -jcvf shorewall-$VERSION.tar.bz2 shorewall-$VERSION >> $LOGFILE 2>&1"
if [ -n "$SIGN" ]; then
for shoresuffix in tgz tar.bz2; do
betaball=shorewall-$VERSION.${shoresuffix}
report "GPG signing $DIR/$betaball tarball"
rm -f ${betaball}.asc
do_or_die "$GPG $betaball"
done
fi
if [ -n "$HASLITE" ]; then
@ -500,6 +518,7 @@ fi
do_or_die "tar -zcvf shorewall-lite-${VERSION}.tgz shorewall-lite-$VERSION >> $LOGFILE 2>&1"
do_or_die "tar -jcvf shorewall-lite-$VERSION.tar.bz2 shorewall-lite-$VERSION >> $LOGFILE 2>&1"
if [ -n "$SIGN" ]; then
for shoresuffix in tgz tar.bz2; do
betaball=shorewall-lite-$VERSION.${shoresuffix}
report "GPG signing $DIR/$betaball tarball"
@ -507,6 +526,7 @@ fi
do_or_die "$GPG $betaball"
done
fi
fi
;;
esac