- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-45.9.0esr-6.5-1] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit db3f92ed23e12a2a9b9eac5be773d475897edfca Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Mar 10 17:32:04 2017 +0100 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. Bug 19316: add support for a minInstructionSet attribute in the update manifests. --- toolkit/mozapps/update/nsUpdateService.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/toolkit/mozapps/update/nsUpdateService.js b/toolkit/mozapps/update/nsUpdateService.js index 4ad5bb8..d098597 100644 --- a/toolkit/mozapps/update/nsUpdateService.js +++ b/toolkit/mozapps/update/nsUpdateService.js @@ -1512,6 +1512,15 @@ function Update(update) { this.unsupported = (Services.vc.compare(osVersion, minOSVersion) < 0); } catch (e) {} } + if (!this.unsupported && update.hasAttribute("minSupportedInstructionSet")) { + let minInstructionSet = update.getAttribute("minSupportedInstructionSet"); + if (['MMX', 'SSE', 'SSE2', 'SSE3', + 'SSE4A', 'SSE4_1', 'SSE4_2'].indexOf(minInstructionSet) >= 0) { + try { + this.unsupported = !Services.sysinfo.getProperty("has" + minInstructionSet); + } catch (e) {} + } + } if (this._patches.length == 0 && !this.unsupported) { throw Cr.NS_ERROR_ILLEGAL_VALUE;

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Backport of tjr's patch for bug 1353765
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit db07e42c13b82aa62a6132be92974aca371546ac Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 13 14:25:03 2017 +0000 Backport of tjr's patch for bug 1353765 It's not clear if it is still needed but we take it to be on the safe side. This closes #21868. --- dom/filesystem/compat/FileSystemDirectoryReader.h | 1 + 1 file changed, 1 insertion(+) diff --git a/dom/filesystem/compat/FileSystemDirectoryReader.h b/dom/filesystem/compat/FileSystemDirectoryReader.h index d568990..391a793 100644 --- a/dom/filesystem/compat/FileSystemDirectoryReader.h +++ b/dom/filesystem/compat/FileSystemDirectoryReader.h @@ -10,6 +10,7 @@ #include "mozilla/Attributes.h" #include "mozilla/ErrorResult.h" #include "mozilla/dom/BindingDeclarations.h" +#include "mozilla/dom/FileSystemDirectoryEntry.h" #include "nsCycleCollectionParticipant.h" #include "nsWrapperCache.h"

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit 3e531451125720e28f3b7fd113af19b5d02aad18 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Mar 10 17:32:04 2017 +0100 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. Bug 19316: add support for a minInstructionSet attribute in the update manifests. --- toolkit/mozapps/update/nsUpdateService.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/toolkit/mozapps/update/nsUpdateService.js b/toolkit/mozapps/update/nsUpdateService.js index 699632d..8abc55a 100644 --- a/toolkit/mozapps/update/nsUpdateService.js +++ b/toolkit/mozapps/update/nsUpdateService.js @@ -1550,6 +1550,15 @@ function Update(update) { this.unsupported = (Services.vc.compare(osVersion, minOSVersion) < 0); } catch (e) {} } + if (!this.unsupported && update.hasAttribute("minSupportedInstructionSet")) { + let minInstructionSet = update.getAttribute("minSupportedInstructionSet"); + if (['MMX', 'SSE', 'SSE2', 'SSE3', + 'SSE4A', 'SSE4_1', 'SSE4_2'].indexOf(minInstructionSet) >= 0) { + try { + this.unsupported = !Services.sysinfo.getProperty("has" + minInstructionSet); + } catch (e) {} + } + } if (this._patches.length == 0 && !this.unsupported) { throw Cr.NS_ERROR_ILLEGAL_VALUE;

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Bug 1335916 - Make sure the update driver only calls SetupMacCommandLine from the main thread. r=rstrong
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit 899435e1997583bd01ab31e363fe3153486dd134 Author: Matt Howell <mhowell(a)mozilla.com> Date: Thu Feb 2 15:29:32 2017 -0800 Bug 1335916 - Make sure the update driver only calls SetupMacCommandLine from the main thread. r=rstrong MozReview-Commit-ID: 9nOgB6z8ooE --HG-- extra : rebase_source : 6a6a18f64297a0bd44e7d6f49b1812e035636e4c --- toolkit/xre/nsUpdateDriver.cpp | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/toolkit/xre/nsUpdateDriver.cpp b/toolkit/xre/nsUpdateDriver.cpp index a9dbeff..7af085a 100644 --- a/toolkit/xre/nsUpdateDriver.cpp +++ b/toolkit/xre/nsUpdateDriver.cpp @@ -32,6 +32,7 @@ #include "nsCommandLineServiceMac.h" #include "MacLaunchHelper.h" #include "updaterfileutils_osx.h" +#include "mozilla/Monitor.h" #endif #if defined(XP_WIN) @@ -91,6 +92,33 @@ static const int kAppUpdaterIOPrioClassDefault = IOPRIO_CLASS_IDLE; static const int kAppUpdaterIOPrioLevelDefault = 0; // Doesn't matter for CLASS IDLE #endif +#ifdef XP_MACOSX +static void +UpdateDriverSetupMacCommandLine(int& argc, char**& argv, bool restart) +{ + if (NS_IsMainThread()) { + CommandLineServiceMac::SetupMacCommandLine(argc, argv, restart); + return; + } + // Bug 1335916: SetupMacCommandLine calls a CoreFoundation function that + // asserts that it was called from the main thread, so if we are not the main + // thread, we have to dispatch that call to there. But we also have to get the + // result from it, so we can't just dispatch and return, we have to wait + // until the dispatched operation actually completes. So we also set up a + // monitor to signal us when that happens, and block until then. + Monitor monitor("nsUpdateDriver SetupMacCommandLine"); + + NS_DispatchToMainThread( + NS_NewRunnableFunction([&argc, &argv, restart, &monitor]() -> void + { + CommandLineServiceMac::SetupMacCommandLine(argc, argv, restart); + MonitorAutoLock(monitor).Notify(); + })); + + MonitorAutoLock(monitor).Wait(); +} +#endif + static nsresult GetCurrentWorkingDir(char *buf, size_t size) { @@ -735,7 +763,7 @@ SwitchToUpdatedApp(nsIFile *greDir, nsIFile *updateDir, } _exit(0); #elif defined(XP_MACOSX) - CommandLineServiceMac::SetupMacCommandLine(argc, argv, true); + UpdateDriverSetupMacCommandLine(argc, argv, true); LaunchChildMac(argc, argv); exit(0); #else @@ -1072,7 +1100,7 @@ ApplyUpdate(nsIFile *greDir, nsIFile *updateDir, nsIFile *statusFile, _exit(0); } #elif defined(XP_MACOSX) - CommandLineServiceMac::SetupMacCommandLine(argc, argv, restart); + UpdateDriverSetupMacCommandLine(argc, argv, restart); #ifdef DEBUG dump_argv("ApplyUpdate after SetupMacCommandLine", argv, argc); #endif

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Bug 1342887 - Detect and log failures to dispatch SetupMacCommandLine to the main thread. r=rstrong
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit 4cec6538e51ac73c6a46ec582ee0b2794c7d81d9 Author: Matt Howell <mhowell(a)mozilla.com> Date: Mon Feb 27 13:57:11 2017 -0800 Bug 1342887 - Detect and log failures to dispatch SetupMacCommandLine to the main thread. r=rstrong MozReview-Commit-ID: LMoxF5yfXq2 --HG-- extra : rebase_source : c206e32bf8abf1aa225901ff5cde390a8a2ecec7 --- toolkit/xre/nsUpdateDriver.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/toolkit/xre/nsUpdateDriver.cpp b/toolkit/xre/nsUpdateDriver.cpp index 7af085a..3abbf7f 100644 --- a/toolkit/xre/nsUpdateDriver.cpp +++ b/toolkit/xre/nsUpdateDriver.cpp @@ -108,14 +108,24 @@ UpdateDriverSetupMacCommandLine(int& argc, char**& argv, bool restart) // monitor to signal us when that happens, and block until then. Monitor monitor("nsUpdateDriver SetupMacCommandLine"); - NS_DispatchToMainThread( + nsresult rv = NS_DispatchToMainThread( NS_NewRunnableFunction([&argc, &argv, restart, &monitor]() -> void { CommandLineServiceMac::SetupMacCommandLine(argc, argv, restart); MonitorAutoLock(monitor).Notify(); })); - MonitorAutoLock(monitor).Wait(); + if (NS_FAILED(rv)) { + LOG(("Update driver error dispatching SetupMacCommandLine to main thread: %d\n", rv)); + return; + } + + // The length of this wait is arbitrary, but should be long enough that having + // it expire means something is seriously wrong. + rv = MonitorAutoLock(monitor).Wait(PR_SecondsToInterval(60)); + if (NS_FAILED(rv)) { + LOG(("Update driver timed out waiting for SetupMacCommandLine: %d\n", rv)); + } } #endif

1 0

[tor-browser-bundle/maint-6.5] Fix typo in changelog
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit 7974cac344e5610f4f1cec42b668251e62579ac2 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 13 10:18:38 2017 +0000 Fix typo in changelog --- Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index c8d6fcc..1808047 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -3,7 +3,7 @@ Tor Browser 6.5.2 -- April 19 2017 * Update Firefox to 45.9.0esr * Update HTTPS-Everywhere to 5.2.14 * Update NoScript to 5.0.2 - * Bug 21555+16450: Don't remove Authorization header on subdomains (e.g. Twitter) + * Bug 21555+16450: Don't remove Authorization header on subdomains (e.g. Twitter) * Bug 21917: Add new obfs4 bridges * Bug 21918: Move meek-amazon to d2cly7j4zqgua7.cloudfront.net backend * Windows

1 0

[torbutton/master] Bug 21865: Update our JIT preferences in the slider
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit cb73494b177f0dcb595920090a81af5621083f8d Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 13 09:24:04 2017 +0000 Bug 21865: Update our JIT preferences in the slider It turns out that the JIT *.content prefs are gone for a while now. This happened in https://bugzilla.mozilla.org/show_bug.cgi?id=939562 and the patch updates the security slider to take this into account. We got the tip to include `javascript.options.native_regexp` as well. `javascript.options.typeinference` is gone with https://bugzilla.mozilla.org/show_bug.cgi?id=972817 and we therefore remove it. And asm.js is disabled globally until we find a good solution for #19417. The tooltip text got updated accordingly. --- src/chrome/locale/en/torbutton.dtd | 2 +- src/modules/security-prefs.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 97a994f..6bc7141 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -41,7 +41,7 @@ <!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript."> <!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects."> <!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> +<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower."> <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> diff --git a/src/modules/security-prefs.js b/src/modules/security-prefs.js index 4a39ca8..3d3630b 100644 --- a/src/modules/security-prefs.js +++ b/src/modules/security-prefs.js @@ -19,12 +19,12 @@ let log = (level, msg) => logger.log(level, msg); // corresponding to the old 2-medium-high setting. const kSecuritySettings = { // Preference name : [0, 1-high 2-m 3-m 4-low] - "javascript.options.ion.content" : [, false, false, false, true ], - "javascript.options.typeinference" : [, false, false, false, true ], + "javascript.options.ion" : [, false, false, false, true ], + "javascript.options.baselinejit" : [, false, false, false, true ], + "javascript.options.native_regexp" : [, false, false, false, true ], "noscript.forbidMedia" : [, true, true, true, false], "media.webaudio.enabled" : [, false, false, false, true ], "mathml.disabled" : [, true, true, true, false], - "javascript.options.baselinejit.content" : [, false, false, false, true ], "gfx.font_rendering.opentype_svg.enabled" : [, false, false, false, true ], "noscript.global" : [, false, false, false, true ], "noscript.globalHttpsWhitelist" : [, false, true, true, false],

1 0

[tor-browser-build/master] Bug 21930: NSS libraries are missing from mar-tools archive
by boklm＠torproject.org 13 Apr '17

13 Apr '17

commit 867176ff839bb0b7067ab2a8e237621a14c98616 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 13 10:30:47 2017 +0200 Bug 21930: NSS libraries are missing from mar-tools archive The Linux sigmar program needs libfreeblpriv3.so and libsoftokn3.so, so include them in the mar-tools archive. tor-browser-bundle.git commit: c2bae45c6a41923712bf176df6fb9bd1f773d887 --- projects/firefox/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/build b/projects/firefox/build index 3985aec..1cf9be1 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -126,7 +126,7 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ [% IF c("var/linux") %] cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ cp -p obj-*/security/nss/cmd/certutil/certutil $MARTOOLS/ - NSS_LIBS="libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libssl3.so" + NSS_LIBS="libfreeblpriv3.so libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so" NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" for LIB in $NSS_LIBS $NSPR_LIBS; do cp -p obj-*/dist/bin/$LIB $MARTOOLS/

1 0

[tor-browser-build/master] Bug 21887: Fix broken error pages on higher security levels
by boklm＠torproject.org 13 Apr '17

13 Apr '17

commit 08a94190b79720466e092c9e98deaadc77ff39ce Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 12 14:05:16 2017 +0000 Bug 21887: Fix broken error pages on higher security levels We need to allow JavaScript on `about:neterror` pages explicitly. Otherwise are those pages on higher security levels. --- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index 3ccab99..09f3f8e 100644 --- a/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/projects/tor-browser/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); +pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); +pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index 3ccab99..09f3f8e 100644 --- a/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); +pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); +pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index 3ccab99..09f3f8e 100644 --- a/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/projects/tor-browser/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); +pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); +pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false);

1 0

[tor-browser-bundle/master] Bug 21930: NSS libraries are missing from mar-tools archive
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit c2bae45c6a41923712bf176df6fb9bd1f773d887 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Apr 12 23:15:28 2017 -0400 Bug 21930: NSS libraries are missing from mar-tools archive The Linux sigmar program needs libfreeblpriv3.so and libsoftokn3.so, so include them in the mar-tools archive. --- gitian/descriptors/linux/gitian-firefox.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index d607f6a..c9ced44 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -119,7 +119,7 @@ script: | cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/ cp -p obj-*/security/nss/cmd/certutil/certutil $MARTOOLS/ - NSS_LIBS="libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libssl3.so" + NSS_LIBS="libfreeblpriv3.so libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so" NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" for LIB in $NSS_LIBS $NSPR_LIBS; do cp -p obj-*/dist/bin/$LIB $MARTOOLS/

1 0