[tor-commits] [tor-browser-bundle/master] Bug 18904: Mac OS meek-http-helper profile not updated

[gk at torproject.org]

commit 495885feb51d7f1faf6d4c0dc3dd8f47e9f1caa7
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Thu May 12 13:59:23 2016 -0400

    Bug 18904: Mac OS meek-http-helper profile not updated
    
    When DATA_OUTSIDE_APP_DIR=1, add a meek-template-sha256sum.txt file to
    the meek-http-helper browser profile template. The meek-client-torbrowser
    program uses this file to automatically detect changes to the profile,
    e.g., after Tor Browser is updated.
---
 gitian/descriptors/mac/gitian-bundle.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml
index ff17520..1d200b5 100644
--- a/gitian/descriptors/mac/gitian-bundle.yml
+++ b/gitian/descriptors/mac/gitian-bundle.yml
@@ -181,6 +181,12 @@ script: |
     cat ~/build/torrc-defaults-appendix-mac >> $TORCONFIGPATH/torrc-defaults
     cat ~/build/bridge_prefs.js >> $EXTOVERRIDESPATH
     cat ~/build/meek-http-helper-user.js >> $MEEKPROFILEPATH/user.js
+    if [ "z$DATA_OUTSIDE_APP_DIR" = "z1" ]; then
+      # Create the meek-template-sha256sum.txt file by generating a list
+      # of hashes (one for each file within the meek-http-helper profile) and
+      # and then generating one final hash from the contents of the list.
+      sha256sum `find $MEEKPROFILEPATH -type f | sort` | sha256sum | sed -e 's/ *-$//' > $MEEKPROFILEPATH/meek-template-sha256sum.txt
+    fi
   fi
   # If not building a multi-lingual package, suppress the language prompt.
   if [ "z$MULTI_LINGUAL" != "z1" ]; then