[tor-commits] [tor-browser-bundle/hardened-builds] Bug 17511: fix sha256sums file in continuous builds

[gk at torproject.org]

commit 7643c10134ff66c427974e36130bfdc1faa044fd
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Mon Nov 2 20:01:02 2015 +0100

    Bug 17511: fix sha256sums file in continuous builds
---
 tools/continuous-builds/build-tbb.sh    |    4 ++--
 tools/continuous-builds/park-nightly.sh |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh
index f1be4ef..6c8d248 100755
--- a/tools/continuous-builds/build-tbb.sh
+++ b/tools/continuous-builds/build-tbb.sh
@@ -61,8 +61,8 @@ if [ $status = done ]; then
   echo "$0: renaming $DESTDIR -> $NEWDESTDIR" | tee -a $logfile
   mv $DESTDIR $NEWDESTDIR
   cd $NEWDESTDIR || exit 3
-  sha256sum *.tar.xz *.zip *.dmg *.exe > sha256sums.txt
-  gpg -a --clearsign $PGPKEYID sha256sums.txt || exit 2
+  sha256sum *.tar.xz *.zip *.dmg *.exe > sha256sums-unsigned-build.txt
+  gpg $PGPKEYID -abs sha256sums-unsigned-build.txt || exit 2
   cd ..
   D=$(basename $NEWDESTDIR)
   tar cf - $D/sha256sums* $D/*.tar.xz $D/*.zip $D/*.exe $D/*.dmg | ssh -i $PUBLISH_SSH_KEY $PUBLISH_HOST | tee -a $logfile
diff --git a/tools/continuous-builds/park-nightly.sh b/tools/continuous-builds/park-nightly.sh
index dbc01e4..0f418b2 100755
--- a/tools/continuous-builds/park-nightly.sh
+++ b/tools/continuous-builds/park-nightly.sh
@@ -16,10 +16,10 @@ DSTDIR=tbb-nightly-$(date +%F)
 
 do_check() {
     [ -z "$1" ] || cd $1 || exit 5
-    [ -z "$V" ] || echo "Verifying sha256sums.txt"
-    gpg -q --verify sha256sums.txt.asc > /dev/null || exit 3
-    [ -z "$V" ] || echo "Checking sha256sums.txt"
-    sha256sum --strict --quiet -c sha256sums.txt || exit 4
+    [ -z "$V" ] || echo "Verifying sha256sums-unsigned-build.txt"
+    gpg -q --verify sha256sums-unsigned-build.txt.asc sha256sums-unsigned-build.txt > /dev/null || exit 3
+    [ -z "$V" ] || echo "Checking sha256sums-unsigned-build.txt"
+    sha256sum --strict --quiet -c sha256sums-unsigned-build.txt || exit 4
 }
 
 if [ -d $DIR/$DSTDIR ] && [ -e $DIR/$DSTDIR/tbb-nightly.stamp ]; then