- tbb-commits - lists.torproject.org

[tor-browser-build/maint-8.0] Merge remote-tracking branch 'boklm/bug_26570' into maint-8.0
by gk＠torproject.org 06 Sep '18

06 Sep '18

commit f71743e229b4a696fabccb4632df919bed2b1ee3 Merge: 80410af 018a2e9 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 6 10:33:44 2018 +0000 Merge remote-tracking branch 'boklm/bug_26570' into maint-8.0 projects/release/update_responses_config.yml | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor-browser-build/maint-8.0] Bug 26570: Redirect pre-8.0 stable users to a separate update directory
by gk＠torproject.org 06 Sep '18

06 Sep '18

commit 018a2e972bb8963ee3250e7b4926fda46b3c8577 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 29 17:33:35 2018 +0200 Bug 26570: Redirect pre-8.0 stable users to a separate update directory --- projects/release/update_responses_config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index 90fbc3a..a66ba41 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -56,3 +56,6 @@ htaccess_rewrite_rules: # bug 26569: Redirect pre-8.0a9 alpha users to a separate update directory RewriteRule ^[^/]+/8\.0a[12345678]/.* https://aus1.torproject.org/torbrowser/update_pre8.0a9/alpha/$0 [last] RewriteRule ^[^/]+/[4567]\..*/.* https://aus1.torproject.org/torbrowser/update_pre8.0a9/alpha/$0 [last] + release: | + # bug 26570: Redirect pre-8.0 stable users to a separate update directory + RewriteRule ^[^/]+/[4567]\..*/.* https://aus1.torproject.org/torbrowser/update_pre8.0/release/$0 [last]

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_26570'
by gk＠torproject.org 06 Sep '18

06 Sep '18

commit 01d1537144fc2ecd5a9c1f346b0d889234666051 Merge: 6c19357 018a2e9 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 6 10:31:20 2018 +0000 Merge remote-tracking branch 'boklm/bug_26570' projects/release/update_responses_config.yml | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor-browser-build/master] Bug 26570: Redirect pre-8.0 stable users to a separate update directory
by gk＠torproject.org 06 Sep '18

06 Sep '18

commit 018a2e972bb8963ee3250e7b4926fda46b3c8577 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 29 17:33:35 2018 +0200 Bug 26570: Redirect pre-8.0 stable users to a separate update directory --- projects/release/update_responses_config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index 90fbc3a..a66ba41 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -56,3 +56,6 @@ htaccess_rewrite_rules: # bug 26569: Redirect pre-8.0a9 alpha users to a separate update directory RewriteRule ^[^/]+/8\.0a[12345678]/.* https://aus1.torproject.org/torbrowser/update_pre8.0a9/alpha/$0 [last] RewriteRule ^[^/]+/[4567]\..*/.* https://aus1.torproject.org/torbrowser/update_pre8.0a9/alpha/$0 [last] + release: | + # bug 26570: Redirect pre-8.0 stable users to a separate update directory + RewriteRule ^[^/]+/[4567]\..*/.* https://aus1.torproject.org/torbrowser/update_pre8.0/release/$0 [last]

1 0

[tor-browser-build/master] Bug 27182: set mar_compression to xz for 8.0.1 release
by gk＠torproject.org 06 Sep '18

06 Sep '18

commit 6c1935752caf9c72595d9e20cbf0da2300783ab6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Sep 3 11:47:03 2018 +0200 Bug 27182: set mar_compression to xz for 8.0.1 release --- projects/release/update_responses_config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index d1ed52f..8cac04c 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -48,6 +48,7 @@ versions: win64: minSupportedOSVersion: 6.1 [% IF c("var/release") -%] + mar_compression: xz mar_compression: bzip2 [% ELSE -%] mar_compression: xz

1 0

[tor-browser-build/maint-8.0] Bug 27182: set mar_compression to xz for 8.0.1 release
by gk＠torproject.org 06 Sep '18

06 Sep '18

commit e16754013b11c941efe92f19ff2b041fffca8906 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Sep 3 11:47:03 2018 +0200 Bug 27182: set mar_compression to xz for 8.0.1 release --- projects/release/update_responses_config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index d1ed52f..8cac04c 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -48,6 +48,7 @@ versions: win64: minSupportedOSVersion: 6.1 [% IF c("var/release") -%] + mar_compression: xz mar_compression: bzip2 [% ELSE -%] mar_compression: xz

1 0

[tor-browser-build/maint-8.0] Bug 27179: update mar_compression
by gk＠torproject.org 06 Sep '18

06 Sep '18

commit 8955afc1fb84a191268219b7f4c28050585b791a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Aug 17 11:21:22 2018 +0200 Bug 27179: update mar_compression Set mar_compression to xz for the alpha, and bzip2 for the stable. --- projects/release/update_responses_config.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index 90fbc3a..d1ed52f 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -47,10 +47,11 @@ versions: minSupportedOSVersion: 6.1 win64: minSupportedOSVersion: 6.1 -[% IF ! c("var/release") -%] - mar_compression: xz -[% END -%] +[% IF c("var/release") -%] mar_compression: bzip2 +[% ELSE -%] +mar_compression: xz +[% END -%] htaccess_rewrite_rules: alpha: | # bug 26569: Redirect pre-8.0a9 alpha users to a separate update directory

1 0

[tor-browser-build/maint-8.0] Merge remote-tracking branch 'boklm/bug_27182' into maint-8.0
by gk＠torproject.org 06 Sep '18

06 Sep '18

commit 80410afe4226a0a20feb5f9470e33ae31f1e9f8d Merge: eea6a6a e167540 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 6 10:17:42 2018 +0000 Merge remote-tracking branch 'boklm/bug_27182' into maint-8.0 projects/release/update_responses_config.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)

1 0

[tor-browser-build/master] Bug 26411: Stop using old MAR format in the second esr60-based stable release
by gk＠torproject.org 06 Sep '18

06 Sep '18

commit 12d52de1efe093b75a434a10ff0fb8f48fec2858 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 29 17:43:32 2018 +0200 Bug 26411: Stop using old MAR format in the second esr60-based stable release --- Makefile | 6 +++--- projects/tor-browser/build | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index b667960..4c21a83 100644 --- a/Makefile +++ b/Makefile @@ -113,7 +113,7 @@ 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 - MAR_OLD_FORMAT=1 tools/update-responses/gen_incrementals release + tools/update-responses/gen_incrementals release $(rbm) build release --step hash_incrementals --target release incrementals-alpha: submodule-update @@ -132,9 +132,9 @@ update_responses-alpha: submodule-update dmg2mar-release: submodule-update $(rbm) build release --step update_responses_config --target release --target signed - MAR_OLD_FORMAT=1 $(rbm) build release --step dmg2mar --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 MAR_OLD_FORMAT=1 tools/update-responses/gen_incrementals release + CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals release dmg2mar-alpha: submodule-update $(rbm) build release --step update_responses_config --target alpha --target signed diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 7211841..4c228a9 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -274,11 +274,6 @@ popd cd $distdir [% IF c("var/build_mar") -%] - [% IF c("var/release") -%] - # 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 - [% END -%] # 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"

1 0

[tor-browser-build/maint-8.0] Bug 26411: Stop using old MAR format in the second esr60-based stable release
by gk＠torproject.org 06 Sep '18

06 Sep '18

commit eea6a6af8765bf1781515fb813a6860ece96fee5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 29 17:43:32 2018 +0200 Bug 26411: Stop using old MAR format in the second esr60-based stable release --- Makefile | 6 +++--- projects/tor-browser/build | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index b667960..4c21a83 100644 --- a/Makefile +++ b/Makefile @@ -113,7 +113,7 @@ 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 - MAR_OLD_FORMAT=1 tools/update-responses/gen_incrementals release + tools/update-responses/gen_incrementals release $(rbm) build release --step hash_incrementals --target release incrementals-alpha: submodule-update @@ -132,9 +132,9 @@ update_responses-alpha: submodule-update dmg2mar-release: submodule-update $(rbm) build release --step update_responses_config --target release --target signed - MAR_OLD_FORMAT=1 $(rbm) build release --step dmg2mar --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 MAR_OLD_FORMAT=1 tools/update-responses/gen_incrementals release + CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals release dmg2mar-alpha: submodule-update $(rbm) build release --step update_responses_config --target alpha --target signed diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 5456ad1..219f622 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -266,11 +266,6 @@ popd cd $distdir [% IF c("var/build_mar") -%] - [% IF c("var/release") -%] - # 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 - [% END -%] # 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"

1 0