June 2016 - tbb-commits - lists.torproject.org

[tor-browser/tor-browser-45.2.0esr-6.5-1] Revert "Bug 1229855: Fix miscompilation of uint8_t enum class with gcc4.8.2; r=luke a=lizzard"
by gk＠torproject.org 17 Jun '16

17 Jun '16

commit 2fbfb9d9af2553b35ec9231f3923b3be49ab2549 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 17 13:38:23 2016 +0000 Revert "Bug 1229855: Fix miscompilation of uint8_t enum class with gcc4.8.2; r=luke a=lizzard" This reverts commit fcb31773712f1e2adce790771f7978ba30056645. This fixes bug 19400. We are not affected by a buggy GCC 4.8.2. --- js/src/asmjs/Wasm.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/js/src/asmjs/Wasm.h b/js/src/asmjs/Wasm.h index b0976d0..2777467 100644 --- a/js/src/asmjs/Wasm.h +++ b/js/src/asmjs/Wasm.h @@ -34,9 +34,7 @@ using mozilla::Move; // The ValType enum represents the WebAssembly "value type", which are used to // specify the type of locals and parameters. -// FIXME: uint8_t would make more sense for the underlying storage class, but -// causes miscompilations in GCC (fixed in 4.8.5 and 4.9.3). -enum class ValType +enum class ValType : uint8_t { I32, I64,

1 0

[tor-browser/tor-browser-45.2.0esr-6.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 17 Jun '16

17 Jun '16

commit 979f170107821ca481870c01820d628e55d47913 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 17 08:29:48 2016 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. This works around the most problematic performance regressions brought up in bug 19276. --- browser/app/profile/000-tor-browser.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 7b2e773..e3665b4 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -240,6 +240,10 @@ pref("network.http.pipelining.max-optimistic-requests", 3); pref("security.ssl.disable_session_identifiers", true); pref("network.manage-offline-status", false); +// Disable Xrender as it causes serious performance regressions on some machines +// and is disabled in Firefox >= 47 anyway. +pref("gfx.xrender.enabled",false); + // As a "defense in depth" measure, configure an empty push server URL (the // DOM Push features are disabled by default via other prefs). pref("dom.push.serverURL", "");

1 0

[tor-browser/tor-browser-45.2.0esr-6.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 17 Jun '16

17 Jun '16

commit 7d0974ce3580b26f24f9363404e5d36cc584e254 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 17 08:29:48 2016 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. This works around the most problematic performance regressions brought up in bug 19276. --- browser/app/profile/000-tor-browser.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 7b2e773..e3665b4 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -240,6 +240,10 @@ pref("network.http.pipelining.max-optimistic-requests", 3); pref("security.ssl.disable_session_identifiers", true); pref("network.manage-offline-status", false); +// Disable Xrender as it causes serious performance regressions on some machines +// and is disabled in Firefox >= 47 anyway. +pref("gfx.xrender.enabled",false); + // As a "defense in depth" measure, configure an empty push server URL (the // DOM Push features are disabled by default via other prefs). pref("dom.push.serverURL", "");

1 0

[tor-browser-bundle/master] Bump Tor Browser branch used in nightlies
by gk＠torproject.org 17 Jun '16

17 Jun '16

commit ee898eb0345f572bae8f0dca6a68ad75edeb8ce3 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 17 11:36:37 2016 +0000 Bump Tor Browser branch used in nightlies --- gitian/versions.nightly | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 815a169..331da1c 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -17,11 +17,11 @@ MULTI_LINGUAL=1 VERIFY_TAGS=0 -FIREFOX_VERSION=45.1.0esr +FIREFOX_VERSION=45.2.0esr TORBROWSER_UPDATE_CHANNEL=default -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master

1 0

[tor-browser/tor-browser-45.2.0esr-6.0-1] Bug 19411: Update icon shows up even if partial updates are failing.
by gk＠torproject.org 17 Jun '16

17 Jun '16

commit 15792fd075f46d2150a566bd546ec41b427f3588 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jun 15 14:12:45 2016 -0400 Bug 19411: Update icon shows up even if partial updates are failing. Do not show the "update badge" on the hamburger menu when the update state is "downloading" (which means fallback to a complete update is in progress). --- browser/base/content/browser.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 0adbe61..41d72ae 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -2668,6 +2668,12 @@ var gMenuButtonUpdateBadge = { }, observe: function (subject, topic, status) { + if (status == "downloading") { + // A partial update failed and a complete update is being attempted. + // Ignore (it does not make sense to show the update badge yet). + return; + } + if (status == "failed") { // Background update has failed, let's show the UI responsible for // prompting the user to update manually.

1 0

[tor-browser/tor-browser-45.2.0esr-6.5-1] Bug 19411: Update icon shows up even if partial updates are failing.
by gk＠torproject.org 17 Jun '16

17 Jun '16

commit 8d80221e8cfdc85e1b6c7692542181621b2eb4f1 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jun 15 14:12:45 2016 -0400 Bug 19411: Update icon shows up even if partial updates are failing. Do not show the "update badge" on the hamburger menu when the update state is "downloading" (which means fallback to a complete update is in progress). --- browser/base/content/browser.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 0adbe61..41d72ae 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -2668,6 +2668,12 @@ var gMenuButtonUpdateBadge = { }, observe: function (subject, topic, status) { + if (status == "downloading") { + // A partial update failed and a complete update is being attempted. + // Ignore (it does not make sense to show the update badge yet). + return; + } + if (status == "failed") { // Background update has failed, let's show the UI responsible for // prompting the user to update manually.

1 0

[tor-browser-bundle/hardened-builds-6.5] Bug 19348: Windows %BUILD_TARGET% changed in Tor Browser 6.0
by gk＠torproject.org 17 Jun '16

17 Jun '16

commit 4569eee1f94ad008c9a4b3d3924e6fed0b2e1926 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jun 13 18:15:54 2016 +0200 Bug 19348: Windows %BUILD_TARGET% changed in Tor Browser 6.0 The values in build_targets can now be a list of values rather than a single value and are all included in the generated .htaccess file. They are also all tested in check_update_responses_deployement. Additionally, a trailing '/' in the last RewriteRule in the .htaccess has been added. This missing '/' was the reason why the requests using the new BUILD_TARGET values were returning the en-US complete mar file rather than an error. --- tools/update-responses/config.yml | 5 ++++- tools/update-responses/update_responses | 29 ++++++++++++++++++----------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 5e4d463..179f882 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -5,7 +5,10 @@ download: build_targets: linux32: Linux_x86-gcc3 linux64: Linux_x86_64-gcc3 - win32: WINNT_x86-gcc3 + win32: + - WINNT_x86-gcc3 + - WINNT_x86-gcc3-x86 + - WINNT_x86-gcc3-x64 osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 72a19d7..1a7cb14 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -39,8 +39,10 @@ sub exit_error { exit (exists $_[1] ? $_[1] : 1); } -sub build_target_by_os { - $config->{build_targets}{$_[0]} ? $config->{build_targets}{$_[0]} : $_[0]; +sub build_targets_by_os { + return ($_[0]) unless $config->{build_targets}{$_[0]}; + my $r = $config->{build_targets}{$_[0]}; + return ref $r eq 'ARRAY' ? @$r : ($r); } sub get_nbprocs { @@ -313,16 +315,17 @@ sub write_htaccess { my $files = $config->{versions}{$version}{files}; $htaccess .= "RewriteRule ^[^\/]+/$version/ no-update.xml $flags\n"; foreach my $os (sort keys %$files) { - my $bt = build_target_by_os($os); - foreach my $lang (sort keys %{$files->{$os}}) { - foreach my $from_version (sort keys %{$files->{$os}{$lang}{partial}}) { - $htaccess .= "RewriteRule ^$bt/$from_version/$lang " - . "$from_version-$version-$os-$lang.xml $flags\n"; + foreach my $bt (build_targets_by_os($os)) { + foreach my $lang (sort keys %{$files->{$os}}) { + foreach my $from_version (sort keys %{$files->{$os}{$lang}{partial}}) { + $htaccess .= "RewriteRule ^$bt/$from_version/$lang " + . "$from_version-$version-$os-$lang.xml $flags\n"; + } + $htaccess .= "RewriteRule ^$bt/[^\/]+/$lang " + . "$version-$os-$lang.xml $flags\n"; } - $htaccess .= "RewriteRule ^$bt/[^\/]+/$lang " - . "$version-$os-$lang.xml $flags\n"; + $htaccess .= "RewriteRule ^$bt/ $version-$os-en-US.xml $flags\n"; } - $htaccess .= "RewriteRule ^$bt $version-$os-en-US.xml $flags\n"; } write_htdocs($channel, '.htaccess', $htaccess); } @@ -426,10 +429,14 @@ sub check_has_incremental { return undef; } +sub build_targets_list { + map { ref $_ eq 'ARRAY' ? @$_ : $_ } values %{$config->{build_targets}}; +} + sub check_update_responses_channel { my ($config, $base_url, $channel) = @_; my $channel_version = $config->{channels}{$channel}; - foreach my $build_target (values %{$config->{build_targets}}) { + foreach my $build_target (build_targets_list()) { foreach my $lang (qw(en-US de)) { my $url = "$base_url/$channel/$build_target/1.0/$lang"; my $dom = get_remote_xml($url);

1 0

[tor-browser-bundle/hardened-builds] Bug 19348: Windows %BUILD_TARGET% changed in Tor Browser 6.0
by gk＠torproject.org 17 Jun '16

17 Jun '16

commit 8944fbfc435fbba739fdbae74402409b0b4f58f7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jun 13 18:15:54 2016 +0200 Bug 19348: Windows %BUILD_TARGET% changed in Tor Browser 6.0 The values in build_targets can now be a list of values rather than a single value and are all included in the generated .htaccess file. They are also all tested in check_update_responses_deployement. Additionally, a trailing '/' in the last RewriteRule in the .htaccess has been added. This missing '/' was the reason why the requests using the new BUILD_TARGET values were returning the en-US complete mar file rather than an error. --- tools/update-responses/config.yml | 5 ++++- tools/update-responses/update_responses | 29 ++++++++++++++++++----------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 5e4d463..179f882 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -5,7 +5,10 @@ download: build_targets: linux32: Linux_x86-gcc3 linux64: Linux_x86_64-gcc3 - win32: WINNT_x86-gcc3 + win32: + - WINNT_x86-gcc3 + - WINNT_x86-gcc3-x86 + - WINNT_x86-gcc3-x64 osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 72a19d7..1a7cb14 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -39,8 +39,10 @@ sub exit_error { exit (exists $_[1] ? $_[1] : 1); } -sub build_target_by_os { - $config->{build_targets}{$_[0]} ? $config->{build_targets}{$_[0]} : $_[0]; +sub build_targets_by_os { + return ($_[0]) unless $config->{build_targets}{$_[0]}; + my $r = $config->{build_targets}{$_[0]}; + return ref $r eq 'ARRAY' ? @$r : ($r); } sub get_nbprocs { @@ -313,16 +315,17 @@ sub write_htaccess { my $files = $config->{versions}{$version}{files}; $htaccess .= "RewriteRule ^[^\/]+/$version/ no-update.xml $flags\n"; foreach my $os (sort keys %$files) { - my $bt = build_target_by_os($os); - foreach my $lang (sort keys %{$files->{$os}}) { - foreach my $from_version (sort keys %{$files->{$os}{$lang}{partial}}) { - $htaccess .= "RewriteRule ^$bt/$from_version/$lang " - . "$from_version-$version-$os-$lang.xml $flags\n"; + foreach my $bt (build_targets_by_os($os)) { + foreach my $lang (sort keys %{$files->{$os}}) { + foreach my $from_version (sort keys %{$files->{$os}{$lang}{partial}}) { + $htaccess .= "RewriteRule ^$bt/$from_version/$lang " + . "$from_version-$version-$os-$lang.xml $flags\n"; + } + $htaccess .= "RewriteRule ^$bt/[^\/]+/$lang " + . "$version-$os-$lang.xml $flags\n"; } - $htaccess .= "RewriteRule ^$bt/[^\/]+/$lang " - . "$version-$os-$lang.xml $flags\n"; + $htaccess .= "RewriteRule ^$bt/ $version-$os-en-US.xml $flags\n"; } - $htaccess .= "RewriteRule ^$bt $version-$os-en-US.xml $flags\n"; } write_htdocs($channel, '.htaccess', $htaccess); } @@ -426,10 +429,14 @@ sub check_has_incremental { return undef; } +sub build_targets_list { + map { ref $_ eq 'ARRAY' ? @$_ : $_ } values %{$config->{build_targets}}; +} + sub check_update_responses_channel { my ($config, $base_url, $channel) = @_; my $channel_version = $config->{channels}{$channel}; - foreach my $build_target (values %{$config->{build_targets}}) { + foreach my $build_target (build_targets_list()) { foreach my $lang (qw(en-US de)) { my $url = "$base_url/$channel/$build_target/1.0/$lang"; my $dom = get_remote_xml($url);

1 0

[tor-browser-bundle/maint-6.0] Bug 19348: Windows %BUILD_TARGET% changed in Tor Browser 6.0
by gk＠torproject.org 17 Jun '16

17 Jun '16

commit 417c30014f40ebb40d7b03f0a71609e0122846e7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jun 13 18:15:54 2016 +0200 Bug 19348: Windows %BUILD_TARGET% changed in Tor Browser 6.0 The values in build_targets can now be a list of values rather than a single value and are all included in the generated .htaccess file. They are also all tested in check_update_responses_deployement. Additionally, a trailing '/' in the last RewriteRule in the .htaccess has been added. This missing '/' was the reason why the requests using the new BUILD_TARGET values were returning the en-US complete mar file rather than an error. --- tools/update-responses/config.yml | 5 ++++- tools/update-responses/update_responses | 29 ++++++++++++++++++----------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index fd6411b..e7ea1a7 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -5,7 +5,10 @@ download: build_targets: linux32: Linux_x86-gcc3 linux64: Linux_x86_64-gcc3 - win32: WINNT_x86-gcc3 + win32: + - WINNT_x86-gcc3 + - WINNT_x86-gcc3-x86 + - WINNT_x86-gcc3-x64 osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 72a19d7..1a7cb14 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -39,8 +39,10 @@ sub exit_error { exit (exists $_[1] ? $_[1] : 1); } -sub build_target_by_os { - $config->{build_targets}{$_[0]} ? $config->{build_targets}{$_[0]} : $_[0]; +sub build_targets_by_os { + return ($_[0]) unless $config->{build_targets}{$_[0]}; + my $r = $config->{build_targets}{$_[0]}; + return ref $r eq 'ARRAY' ? @$r : ($r); } sub get_nbprocs { @@ -313,16 +315,17 @@ sub write_htaccess { my $files = $config->{versions}{$version}{files}; $htaccess .= "RewriteRule ^[^\/]+/$version/ no-update.xml $flags\n"; foreach my $os (sort keys %$files) { - my $bt = build_target_by_os($os); - foreach my $lang (sort keys %{$files->{$os}}) { - foreach my $from_version (sort keys %{$files->{$os}{$lang}{partial}}) { - $htaccess .= "RewriteRule ^$bt/$from_version/$lang " - . "$from_version-$version-$os-$lang.xml $flags\n"; + foreach my $bt (build_targets_by_os($os)) { + foreach my $lang (sort keys %{$files->{$os}}) { + foreach my $from_version (sort keys %{$files->{$os}{$lang}{partial}}) { + $htaccess .= "RewriteRule ^$bt/$from_version/$lang " + . "$from_version-$version-$os-$lang.xml $flags\n"; + } + $htaccess .= "RewriteRule ^$bt/[^\/]+/$lang " + . "$version-$os-$lang.xml $flags\n"; } - $htaccess .= "RewriteRule ^$bt/[^\/]+/$lang " - . "$version-$os-$lang.xml $flags\n"; + $htaccess .= "RewriteRule ^$bt/ $version-$os-en-US.xml $flags\n"; } - $htaccess .= "RewriteRule ^$bt $version-$os-en-US.xml $flags\n"; } write_htdocs($channel, '.htaccess', $htaccess); } @@ -426,10 +429,14 @@ sub check_has_incremental { return undef; } +sub build_targets_list { + map { ref $_ eq 'ARRAY' ? @$_ : $_ } values %{$config->{build_targets}}; +} + sub check_update_responses_channel { my ($config, $base_url, $channel) = @_; my $channel_version = $config->{channels}{$channel}; - foreach my $build_target (values %{$config->{build_targets}}) { + foreach my $build_target (build_targets_list()) { foreach my $lang (qw(en-US de)) { my $url = "$base_url/$channel/$build_target/1.0/$lang"; my $dom = get_remote_xml($url);

1 0

[tor-browser-bundle/maint-6.0] Bug 19202: Use cdn.tpo in mar files URLs
by gk＠torproject.org 17 Jun '16

17 Jun '16

commit db7120e326563c39da93d529905922bc8998ef15 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon May 30 17:21:21 2016 +0200 Bug 19202: Use cdn.tpo in mar files URLs --- tools/update-responses/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 615150b..fd6411b 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -15,7 +15,7 @@ versions: 6.0.1: platformVersion: 45.2.0 detailsURL: https://blog.torproject.org/blog/tor-browser-601-released - download_url: https://www.torproject.org/dist/torbrowser/6.0.1 + download_url: https://cdn.torproject.org/aus1/torbrowser/6.0.1 incremental_from: - 5.5.5 - 6.0 @@ -27,7 +27,7 @@ versions: 6.0a5: platformVersion: 45.1.0 detailsURL: https://blog.torproject.org/blog/tor-browser-60a5-released - download_url: https://www.torproject.org/dist/torbrowser/6.0a5 + download_url: https://cdn.torproject.org/aus1/torbrowser/6.0a5 incremental_from: - 6.0a4 migrate_archs:

1 0