promotions validated
git-svn-id: https://svn.apache.org/repos/asf/spamassassin/tags/sa-update_3.4.2_20180326195033@1827792 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/build/mkupdates/listpromotable b/build/mkupdates/listpromotable
index e1769cb..b75f772 100755
--- a/build/mkupdates/listpromotable
+++ b/build/mkupdates/listpromotable
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#! /usr/bin/env perl
use strict;
use warnings;
diff --git a/build/mkupdates/mkupdate-with-scores b/build/mkupdates/mkupdate-with-scores
index 369796d..1e98dbe 100755
--- a/build/mkupdates/mkupdate-with-scores
+++ b/build/mkupdates/mkupdate-with-scores
@@ -7,7 +7,7 @@
#
# - retrieves the latest gernerated scores for new active.list rules
# - checks out the trunk revision of code that those scores were generated for
-# - generates an update tarball and associated sha1 and asc files
+# - generates an update tarball and associated sha1, sha256, and asc files
# - checks out each of the 3.3 stable release tagged versions, builds and
# installs that version (in a tmp dir) and then installs the above generated
# update using sa-update --install to make sure it works with each version
@@ -157,7 +157,8 @@
cd ../..
- shasum $TMPDIR/${REVISION}.tar.gz > $TMPDIR/${REVISION}.tar.gz.sha1
+ shasum -a 1 $TMPDIR/${REVISION}.tar.gz > $TMPDIR/${REVISION}.tar.gz.sha1
+ shasum -a 256 $TMPDIR/${REVISION}.tar.gz > $TMPDIR/${REVISION}.tar.gz.sha256
gpg --batch --homedir $KEYDIR -bas $TMPDIR/${REVISION}.tar.gz || exit $?
tar -ztvf $TMPDIR/${REVISION}.tar.gz
@@ -168,7 +169,8 @@
(
copy_update_paranoid "$UPDATEDIR/$REVERT_REVISION.tar.gz" "$TMPDIR/$REVISION.tar.gz" &&
copy_update_paranoid "$UPDATEDIR/$REVERT_REVISION.tar.gz.asc" "$TMPDIR/$REVISION.tar.gz.asc" &&
- copy_update_paranoid "$UPDATEDIR/$REVERT_REVISION.tar.gz.sha1" "$TMPDIR/$REVISION.tar.gz.sha1"
+ copy_update_paranoid "$UPDATEDIR/$REVERT_REVISION.tar.gz.sha1" "$TMPDIR/$REVISION.tar.gz.sha1" &&
+ copy_update_paranoid "$UPDATEDIR/$REVERT_REVISION.tar.gz.sha256" "$TMPDIR/$REVISION.tar.gz.sha256"
) || EXIT=6
# copying the update files went wrong exit
@@ -234,7 +236,7 @@
# that we have generated scores for
make_rule_update_from_trunk
else
- if [ ! -f $UPDATEDIR/$REVERT_REVISION.tar.gz -a ! -f $UPDATEDIR/$REVERT_REVISION.tar.gz.asc -a ! -f $UPDATEDIR/$REVERT_REVISION.tar.gz.sha1 ]; then
+ if [ ! -f $UPDATEDIR/$REVERT_REVISION.tar.gz -a ! -f $UPDATEDIR/$REVERT_REVISION.tar.gz.asc -a ! -f $UPDATEDIR/$REVERT_REVISION.tar.gz.sha1 -a ! -f $UPDATEDIR/$REVERT_REVISION.tar.gz.sha256 ]; then
echo "Could not find update files for update revision $REVERT_REVISION, aborting."
exit 8
fi
diff --git a/build/mkupdates/revert-stable-update b/build/mkupdates/revert-stable-update
index b455d67..26ddf98 100755
--- a/build/mkupdates/revert-stable-update
+++ b/build/mkupdates/revert-stable-update
@@ -50,7 +50,7 @@
echo "Usage: ./revert-stable-update 1234567"
fi
-if [ ! -f $UPDATEDIR/$1.tar.gz -a ! -f $UPDATEDIR/$1.tar.gz.asc -a ! -f $UPDATEDIR/$1.tar.gz.sha1 ]; then
+if [ ! -f $UPDATEDIR/$1.tar.gz -a ! -f $UPDATEDIR/$1.tar.gz.asc -a ! -f $UPDATEDIR/$1.tar.gz.sha1 -a ! -f $UPDATEDIR/$1.tar.gz.sha256 ]; then
echo "Could not find update files for update revision $1"
fi
diff --git a/build/mkupdates/run_nightly b/build/mkupdates/run_nightly
index b573c38..abb842b 100755
--- a/build/mkupdates/run_nightly
+++ b/build/mkupdates/run_nightly
@@ -1,6 +1,6 @@
#!/bin/bash
-PERL=/usr/bin/perl
+PERL=`which perl`
LOGDIR="/var/www/automc.spamassassin.org/mkupdates"
REPDIR="/var/www/ruleqa.spamassassin.org/reports"
@@ -69,7 +69,7 @@
# "tflags nopublish" leakage (bug 6297)
make test \
TEST_FILES="t/basic_lint.t t/basic_lint_without_sandbox.t t/basic_meta.t" \
- || exit $?
+ TEST_VERBOSE=1 || exit $?
# remove the rules files for rules we won't be shipping
rm rules/70_sandbox.cf rules/70_inactive.cf
@@ -94,7 +94,7 @@
tar cvf - *.cf || exit $?
) | gzip -9 > $tmpdir/update.tgz || exit $?
-
+
# ensure non-empty
[ -s $tmpdir/update.tgz ] || exit 3
@@ -122,7 +122,8 @@
gpg --batch --homedir $HOME/key \
-bas $tmpdir/update.tgz || exit $?
- $PERL build/sha1sum.pl $tmpdir/update.tgz > $tmpdir/update.tgz.sha1 || exit $?
+ shasum -a 1 $tmpdir/update.tgz > $tmpdir/update.tgz.sha1 || exit $?
+ shasum -a 256 $tmpdir/update.tgz > $tmpdir/update.tgz.sha256 || exit $?
# get SVN revision number.
@@ -169,6 +170,7 @@
mv $tmpdir/update.tgz $UPDDIR/${svnrev}.tar.gz || exit $?
mv $tmpdir/update.tgz.sha1 $UPDDIR/${svnrev}.tar.gz.sha1 || exit $?
+ mv $tmpdir/update.tgz.sha256 $UPDDIR/${svnrev}.tar.gz.sha256 || exit $?
mv $tmpdir/update.tgz.asc $UPDDIR/${svnrev}.tar.gz.asc || exit $?
# Give the mirrors time to pull the new files above
diff --git a/build/mkupdates/update-rules b/build/mkupdates/update-rules
index 5ce4a49..652d3d1 100755
--- a/build/mkupdates/update-rules
+++ b/build/mkupdates/update-rules
@@ -54,7 +54,8 @@
rm -f $V.tar.gz*
mv /tmp/$V.tar.gz .
/local/gnupg-1.4.2/bin/gpg --batch --homedir /home/updatesd/key -bas $V.tar.gz
-/local/perl586/bin/perl /home/updatesd/svn/spamassassin/build/sha1sum.pl $V.tar.gz > $V.tar.gz.sha1
+shasum -a 1 $V.tar.gz > $V.tar.gz.sha1
+shasum -a 256 $V.tar.gz > $V.tar.gz.sha256
chmod 0444 $V.tar.*
if [ $VERS = 3.1 ]; then
diff --git a/build/mkupdates/update-rules-3.3 b/build/mkupdates/update-rules-3.3
index 4f33d03..b6e572b 100755
--- a/build/mkupdates/update-rules-3.3
+++ b/build/mkupdates/update-rules-3.3
@@ -113,7 +113,8 @@
gpg --batch --homedir /home/updatesd/key \
-bas $tmpdir/update.tgz || exit $?
-$PERL build/sha1sum.pl $tmpdir/update.tgz > $tmpdir/update.tgz.sha1 || exit $?
+shasum -a 1 $tmpdir/update.tgz > $tmpdir/update.tgz.sha1 || exit $?
+shasum -a 256 $tmpdir/update.tgz > $tmpdir/update.tgz.sha256 || exit $?
@@ -160,6 +161,7 @@
mv $tmpdir/update.tgz $stagedir/$svnrev.tar.gz || exit $?
mv $tmpdir/update.tgz.sha1 $stagedir/$svnrev.tar.gz.sha1 || exit $?
+mv $tmpdir/update.tgz.sha256 $stagedir/$svnrev.tar.gz.sha256 || exit $?
mv $tmpdir/update.tgz.asc $stagedir/$svnrev.tar.gz.asc || exit $?
chmod 644 $stagedir/$svnrev.*
