[tor-commits] [tor-browser-build/master] Bug 24477: Fix generation of Windows 64 mar files

[gk at torproject.org]

commit 0abccfe4258218612f38ac1c2d762c319781386f
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Fri Dec 1 00:48:20 2017 +0100

    Bug 24477: Fix generation of Windows 64 mar files
---
 projects/tor-browser/build  | 5 +++++
 projects/tor-browser/config | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/projects/tor-browser/build b/projects/tor-browser/build
index 022d6e9..56d6294 100644
--- a/projects/tor-browser/build
+++ b/projects/tor-browser/build
@@ -43,6 +43,11 @@ mkdir -p $TBDIR/$MEEKPROFILEPATH/extensions
 # Extract the MAR tools.
 unzip -d $rootdir $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip
 MARTOOLS=$rootdir/mar-tools
+[% IF c("var/windows-x86_64") -%]
+  # Workaround for bug 24477
+  rm -Rf $MARTOOLS
+  unzip -d $rootdir $rootdir/mar-tools-linux32.zip
+[% END -%]
 
 mv [% c('input_files_by_name/tor-launcher') %] $TBDIR/$EXTSPATH/tor-launcher at torproject.org.xpi
 mv [% c('input_files_by_name/torbutton') %] $TBDIR/$EXTSPATH/torbutton at torproject.org.xpi
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index c00af05..eb0a5d0 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -85,3 +85,9 @@ input_files:
     enable: '[% c("var/windows") %]'
   - filename: pe_checksum_fix.py
     enable: '[% c("var/windows") %]'
+  # Workaround for bug 24477
+  - URL: https://archive.torproject.org/tor-package-archive/torbrowser/7.5a7/mar-tools-linux32.zip
+    sig_ext: asc
+    file_gpg_id: 1
+    gpg_keyring: torbrowser.gpg
+    enable: '[% c("var/windows-x86_64") %]'