[tbb-commits] [tor-browser-build/master] Bug 26362: Use old MAR format for update file creation

[boklm at torproject.org]

commit befc4910feb0eee2016e10000ed31e3fea7ef6b1
Author: Georg Koppen <gk at torproject.org>
Date:   Tue Jun 19 09:29:37 2018 +0000

    Bug 26362: Use old MAR format for update file creation
    
    Mozilla switched from Bzip2 to LZMA as compression algorithm for MAR
    files during th Firefox 56. That means esr52-based Tor Browsers don't
    understand LZMA yet. Thus, we still use Bzip2 for the first esr60-based
    MAR files and switch afterwards to LZMA.
---
 Makefile                   | 8 ++++----
 projects/tor-browser/build | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 4c21a83..80e9983 100644
--- a/Makefile
+++ b/Makefile
@@ -113,13 +113,13 @@ signtag-alpha: submodule-update
 incrementals-release: submodule-update
 	$(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals
 	tools/update-responses/download_missing_versions release
-	tools/update-responses/gen_incrementals release
+	MAR_OLD_FORMAT=1 tools/update-responses/gen_incrementals release
 	$(rbm) build release --step hash_incrementals --target release
 
 incrementals-alpha: submodule-update
 	$(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals
 	tools/update-responses/download_missing_versions alpha
-	tools/update-responses/gen_incrementals alpha
+	MAR_OLD_FORMAT=1 tools/update-responses/gen_incrementals alpha
 	$(rbm) build release --step hash_incrementals --target alpha
 
 update_responses-release: submodule-update
@@ -134,13 +134,13 @@ dmg2mar-release: submodule-update
 	$(rbm) build release --step update_responses_config --target release --target signed
 	$(rbm) build release --step dmg2mar --target release --target signed
 	tools/update-responses/download_missing_versions release
-	CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals release
+	CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 MAR_OLD_FORMAT=1 tools/update-responses/gen_incrementals release
 
 dmg2mar-alpha: submodule-update
 	$(rbm) build release --step update_responses_config --target alpha --target signed
 	$(rbm) build release --step dmg2mar --target alpha --target signed
 	tools/update-responses/download_missing_versions alpha
-	CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals alpha
+	CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 MAR_OLD_FORMAT=1 tools/update-responses/gen_incrementals alpha
 
 submodule-update:
 	git submodule update --init
diff --git a/projects/tor-browser/build b/projects/tor-browser/build
index 19aa657..52678ed 100644
--- a/projects/tor-browser/build
+++ b/projects/tor-browser/build
@@ -268,6 +268,9 @@ popd
 cd $distdir
 
 [% IF c("var/build_mar") -%]
+  # Let's use the bzip2 format for now so that users can update to the first
+  # esr60-based Tor Browser.
+  export MAR_OLD_FORMAT=1
   # Create full MAR file and compressed package.
   MAR_FILE=tor-browser-[% c("var/mar_osname") %]-[% c("var/torbrowser_version") %]_${PKG_LOCALE}.mar
   MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE "$TBDIR"