- tbb-commits - lists.torproject.org

[tor-browser-bundle/maint-6.5] Picking up missing SSE2-related update patch
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit 8b029dbb4394446afa0b157e18fe0014966c3dfd Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 13 15:18:21 2017 +0000 Picking up missing SSE2-related update patch --- gitian/versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions b/gitian/versions index 82f7e6e..7bde308 100755 --- a/gitian/versions +++ b/gitian/versions @@ -14,7 +14,7 @@ FIREFOX_VERSION=45.9.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build3 TOR_TAG=tor-0.2.9.10 TORLAUNCHER_TAG=0.2.10.3 TORBUTTON_TAG=1.9.6.14

1 0

[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 15cf08adee2d81031b12769e75edb02eab85042b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 13 16:54:08 2017 +0200 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. Bug 19316: change update URL from update_2 to update_3 Change the update URL so that 6.5.1 users who don't have SSE available are not updated to 7.0 directly when it is avaible. --- browser/app/profile/firefox.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index ce16a75..c40c936 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -147,7 +147,7 @@ pref("app.update.badge", false); pref("app.update.staging.enabled", true); // Update service URL: -pref("app.update.url", "https://aus1.torproject.org/torbrowser/update_2/%CHANNEL%/%BUILD_TARGET%/%V…"); +pref("app.update.url", "https://aus1.torproject.org/torbrowser/update_3/%CHANNEL%/%BUILD_TARGET%/%V…"); // app.update.url.manual is in branding section // app.update.url.details is in branding section

1 0

[tor-browser-bundle/maint-6.5] Pick up a new tor-browser tag
by gk＠torproject.org 13 Apr '17

13 Apr '17

commit 652990244e81125aed75612a822eec86bb4c301c Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 13 14:55:10 2017 +0000 Pick up a new tor-browser tag We want to be able to deal with the SSE2 requirement for ESR52 without shipping a Tor Browser 6.5.3 just for that. --- Bundle-Data/Docs/ChangeLog.txt | 1 + gitian/versions | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 1808047..8e186ce 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -4,6 +4,7 @@ Tor Browser 6.5.2 -- April 19 2017 * 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 19316: Make sure our Windows updates can deal with the SSE2 requirement * Bug 21917: Add new obfs4 bridges * Bug 21918: Move meek-amazon to d2cly7j4zqgua7.cloudfront.net backend * Windows diff --git a/gitian/versions b/gitian/versions index 1557a98..82f7e6e 100755 --- a/gitian/versions +++ b/gitian/versions @@ -14,7 +14,7 @@ FIREFOX_VERSION=45.9.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build2 TOR_TAG=tor-0.2.9.10 TORLAUNCHER_TAG=0.2.10.3 TORBUTTON_TAG=1.9.6.14

1 0

[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

[tor-browser-bundle/maint-6.5] Release preparations for 6.5.1
by gk＠torproject.org 12 Apr '17

12 Apr '17

commit 6e7d7a00118e4416f341ce0ff160a427f1319534 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 12 20:13:35 2017 +0000 Release preparations for 6.5.1 Version updates, changelog update, and config.yml changes --- Bundle-Data/Docs/ChangeLog.txt | 11 +++++++++++ gitian/versions | 12 ++++++------ tools/update-responses/config.yml | 10 +++++----- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 5438022..c8d6fcc 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,14 @@ +Tor Browser 6.5.2 -- April 19 2017 + * All Platforms + * 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 21917: Add new obfs4 bridges + * Bug 21918: Move meek-amazon to d2cly7j4zqgua7.cloudfront.net backend + * Windows + * Bug 21795: Fix Tor Browser crashing on github.com + Tor Browser 6.5.1 -- March 7 2017 * All Platforms * Update Firefox to 45.8.0esr diff --git a/gitian/versions b/gitian/versions index df49b55..1557a98 100755 --- a/gitian/versions +++ b/gitian/versions @@ -10,15 +10,15 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=1 -FIREFOX_VERSION=45.8.0esr +FIREFOX_VERSION=45.9.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-2-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build1 TOR_TAG=tor-0.2.9.10 TORLAUNCHER_TAG=0.2.10.3 TORBUTTON_TAG=1.9.6.14 -HTTPSE_TAG=5.2.11 +HTTPSE_TAG=5.2.14 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -47,7 +47,7 @@ GITIAN_TAG=tor-browser-builder-4-1 OPENSSL_VER=1.0.2k GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build3 BINUTILS_VER=2.24 GCC_VER=5.1.0 CLANG_VER=r247539 @@ -68,7 +68,7 @@ NSIS_VER=2.51 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.9.5.3-fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-5.0.2-fx+sm.xpi TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -102,7 +102,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=ce9779a3a5a2574b958f8e4d079a99d43a8f84193bef52c587c704ed81c2fbbd +NOSCRIPT_HASH=31ba7743699deefb606bcc49197d26d926f6b4e3d3526cd2f8a339f857a04fb1 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 2db2570..c43932f 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -20,13 +20,13 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 6.5a6 - release: 6.5.1 + release: 6.5.2 versions: - 6.5.1: - platformVersion: 45.8.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-651-released + 6.5.2: + platformVersion: 45.9.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-652-released incremental_from: - - 6.5 + - 6.5.1 migrate_archs: osx32: osx64 migrate_langs:

1 0

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

12 Apr '17

commit 5d2f77c0c56a62199fab2034ba14686867808b82 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/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index 3ccab99..09f3f8e 100644 --- a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/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/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index 3ccab99..09f3f8e 100644 --- a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/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/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index 3ccab99..09f3f8e 100644 --- a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/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/tor-browser-45.8.0esr-6.5-2] Bug 21795: Fix github.com crashes on Windows
by gk＠torproject.org 12 Apr '17

12 Apr '17

commit fd67e2869611a961893a868fa0891cf4ded173eb Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 12 11:15:40 2017 +0000 Bug 21795: Fix github.com crashes on Windows This is https://bugzilla.mozilla.org/show_bug.cgi?id=1351278 --- js/src/jit/IonBuilder.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/js/src/jit/IonBuilder.cpp b/js/src/jit/IonBuilder.cpp index 9e70e24..34520b3 100644 --- a/js/src/jit/IonBuilder.cpp +++ b/js/src/jit/IonBuilder.cpp @@ -6366,7 +6366,12 @@ IonBuilder::jsop_funapply(uint32_t argc) if (argument->type() != MIRType_MagicOptimizedArguments) { // Optimize fun.apply(self, array) if the length is sane and there are no holes. TemporaryTypeSet* objTypes = argument->resultTypeSet(); - if (native && native->isNative() && native->native() == fun_apply && +#ifdef XP_WIN + bool opt = false; +#else + bool opt = true; +#endif + if (opt && native && native->isNative() && native->native() == fun_apply && objTypes && objTypes->getKnownClass(constraints()) == &ArrayObject::class_ && !objTypes->hasObjectFlags(constraints(), OBJECT_FLAG_LENGTH_OVERFLOW) &&

1 0

[tor-launcher/master] Bug 21920: Don't show locale selection dialog
by gk＠torproject.org 12 Apr '17

12 Apr '17

commit afb9893b7626ce819d7b2b571a847d44277971f6 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 12 10:23:38 2017 +0000 Bug 21920: Don't show locale selection dialog The locale selection dialog was one of the features we included in the hardened series. It is not needed on the alpha or stable channel. We therefore disable it, keeping the code as we might be able to resue it for #17400 later on. --- src/modules/tl-util.jsm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index 2f8d14e..0d33267 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -290,7 +290,10 @@ let TorLauncherUtil = // Public get shouldPromptForLocale() { - const kPrefPromptForLocale = "extensions.torlauncher.prompt_for_locale"; + // We are not supporting locale selection on the alpha/stable channel + // right now. Thus, no prompt for the user. + return false; + /* const kPrefPromptForLocale = "extensions.torlauncher.prompt_for_locale"; try { const kEnvSkipLocalePrompt = "TOR_SKIP_LOCALE_PROMPT"; @@ -301,7 +304,7 @@ let TorLauncherUtil = // Public return ("1" != env.get(kEnvSkipLocalePrompt)); } catch(e) {} - return this.getBoolPref(kPrefPromptForLocale, true); + return this.getBoolPref(kPrefPromptForLocale, true); */ }, get shouldShowNetworkSettings()

1 0

[tor-browser-build/master] Update tor-browser.git commit
by boklm＠torproject.org 12 Apr '17

12 Apr '17

commit 2603af6dee70233dcc30f8717ee48a2b0121ff04 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 12 10:57:28 2017 +0200 Update tor-browser.git commit --- projects/firefox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/config b/projects/firefox/config index 7e685e7..0b8995b 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -2,7 +2,7 @@ version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' ## There is no signed tag yet, so we use a fixed commit -git_hash: 47fa36dc780f4962102205b390e18ce9ef74b1b9 +git_hash: 4c6219dc621d139cd39e8aaca578dd69b9c063d0 #git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' #tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Bug 21907: Fix runtime error on CentOS 6
by gk＠torproject.org 12 Apr '17

12 Apr '17

commit 4c6219dc621d139cd39e8aaca578dd69b9c063d0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 10 16:07:23 2017 +0200 Bug 21907: Fix runtime error on CentOS 6 In Mozilla bug 1324780, support for building with glib 2.28 (the version available in CentOS 6) was added. However we are building on Debian Wheezy which has glib 2.32. We fix that by backing out all glib > 2.28 code paths. --- gfx/harfbuzz/src/hb-glib.cc | 41 ----------------------------------------- gfx/harfbuzz/src/hb-glib.h | 5 ----- 2 files changed, 46 deletions(-) diff --git a/gfx/harfbuzz/src/hb-glib.cc b/gfx/harfbuzz/src/hb-glib.cc index 2b91b5b..0971ca2 100644 --- a/gfx/harfbuzz/src/hb-glib.cc +++ b/gfx/harfbuzz/src/hb-glib.cc @@ -33,7 +33,6 @@ #include "hb-unicode-private.hh" -#if !GLIB_CHECK_VERSION(2,29,14) static const hb_script_t glib_script_to_script[] = { @@ -155,14 +154,10 @@ glib_script_to_script[] = HB_SCRIPT_SORA_SOMPENG, HB_SCRIPT_TAKRI }; -#endif hb_script_t hb_glib_script_to_script (GUnicodeScript script) { -#if GLIB_CHECK_VERSION(2,29,14) - return (hb_script_t) g_unicode_script_to_iso15924 (script); -#else if (likely ((unsigned int) script < ARRAY_LENGTH (glib_script_to_script))) return glib_script_to_script[script]; @@ -170,15 +165,11 @@ hb_glib_script_to_script (GUnicodeScript script) return HB_SCRIPT_INVALID; return HB_SCRIPT_UNKNOWN; -#endif } GUnicodeScript hb_glib_script_from_script (hb_script_t script) { -#if GLIB_CHECK_VERSION(2,29,14) - return g_unicode_script_from_iso15924 (script); -#else unsigned int count = ARRAY_LENGTH (glib_script_to_script); for (unsigned int i = 0; i < count; i++) if (glib_script_to_script[i] == script) @@ -188,7 +179,6 @@ hb_glib_script_from_script (hb_script_t script) return G_UNICODE_SCRIPT_INVALID_CODE; return G_UNICODE_SCRIPT_UNKNOWN; -#endif } @@ -243,10 +233,6 @@ hb_glib_unicode_compose (hb_unicode_funcs_t *ufuncs HB_UNUSED, hb_codepoint_t *ab, void *user_data HB_UNUSED) { -#if GLIB_CHECK_VERSION(2,29,12) - return g_unichar_compose (a, b, ab); -#endif - /* We don't ifdef-out the fallback code such that compiler always * sees it and makes sure it's compilable. */ @@ -280,10 +266,6 @@ hb_glib_unicode_decompose (hb_unicode_funcs_t *ufuncs HB_UNUSED, hb_codepoint_t *b, void *user_data HB_UNUSED) { -#if GLIB_CHECK_VERSION(2,29,12) - return g_unichar_decompose (ab, a, b); -#endif - /* We don't ifdef-out the fallback code such that compiler always * sees it and makes sure it's compilable. */ @@ -339,10 +321,6 @@ hb_glib_unicode_decompose_compatibility (hb_unicode_funcs_t *ufuncs HB_UNUSED, hb_codepoint_t *decomposed, void *user_data HB_UNUSED) { -#if GLIB_CHECK_VERSION(2,29,12) - return g_unichar_fully_decompose (u, true, decomposed, HB_UNICODE_MAX_DECOMPOSITION_LEN); -#endif - /* If the user doesn't have GLib >= 2.29.12 we have to perform * a round trip to UTF-8 and the associated memory management dance. */ gchar utf8[6]; @@ -381,22 +359,3 @@ hb_glib_get_unicode_funcs (void) return const_cast<hb_unicode_funcs_t *> (&_hb_glib_unicode_funcs); } - -#if GLIB_CHECK_VERSION(2,31,10) -/** - * hb_glib_blob_create: - * - * Since: 0.9.38 - **/ -hb_blob_t * -hb_glib_blob_create (GBytes *gbytes) -{ - gsize size = 0; - gconstpointer data = g_bytes_get_data (gbytes, &size); - return hb_blob_create ((const char *) data, - size, - HB_MEMORY_MODE_READONLY, - g_bytes_ref (gbytes), - (hb_destroy_func_t) g_bytes_unref); -} -#endif diff --git a/gfx/harfbuzz/src/hb-glib.h b/gfx/harfbuzz/src/hb-glib.h index 5f04183..4adbd7c 100644 --- a/gfx/harfbuzz/src/hb-glib.h +++ b/gfx/harfbuzz/src/hb-glib.h @@ -46,11 +46,6 @@ hb_glib_script_from_script (hb_script_t script); HB_EXTERN hb_unicode_funcs_t * hb_glib_get_unicode_funcs (void); -#if GLIB_CHECK_VERSION(2,31,10) -HB_EXTERN hb_blob_t * -hb_glib_blob_create (GBytes *gbytes); -#endif - HB_END_DECLS #endif /* HB_GLIB_H */

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Bug 1352305 - Part2: Add a test case for making sure dialog windows will not be enforced to rounded sizes when fingerprinting resistance is enabled. r?ehsan
by gk＠torproject.org 12 Apr '17

12 Apr '17

commit e761b3ca2087275c165fb67b7f876a55286d47dd Author: Tim Huang <tihuang(a)mozilla.com> Date: Fri Mar 31 00:11:41 2017 -0800 Bug 1352305 - Part2: Add a test case for making sure dialog windows will not be enforced to rounded sizes when fingerprinting resistance is enabled. r?ehsan A browser chrome test which ensures the dialog windows will not be enforced to be rounded sizes when fingerprinting resistance is enabled. MozReview-Commit-ID: LQG13FMANav --- .../resistfingerprinting/test/browser/browser.ini | 1 + .../browser/browser_roundedWindow_dialogWindow.js | 30 ++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/browser/components/resistfingerprinting/test/browser/browser.ini b/browser/components/resistfingerprinting/test/browser/browser.ini index 713f3d2..4b81c91 100644 --- a/browser/components/resistfingerprinting/test/browser/browser.ini +++ b/browser/components/resistfingerprinting/test/browser/browser.ini @@ -4,6 +4,7 @@ support-files = file_dummy.html head.js +[browser_roundedWindow_dialogWindow.js] [browser_roundedWindow_newWindow.js] [browser_roundedWindow_open_max.js] [browser_roundedWindow_open_mid.js] diff --git a/browser/components/resistfingerprinting/test/browser/browser_roundedWindow_dialogWindow.js b/browser/components/resistfingerprinting/test/browser/browser_roundedWindow_dialogWindow.js new file mode 100644 index 0000000..839388e --- /dev/null +++ b/browser/components/resistfingerprinting/test/browser/browser_roundedWindow_dialogWindow.js @@ -0,0 +1,30 @@ +/** + * Bug 1352305 - A test case for dialog windows that it should not be rounded + * even after fingerprinting resistance is enabled. + */ + +add_task(async function setup() { + await SpecialPowers.pushPrefEnv({"set": + [["privacy.resistFingerprinting", true]] + }); +}); + +add_task(async function test_dialog_window() { + + let diagWin; + + await new Promise(resolve => { + // Open a dialog window which is not rounded size. + diagWin = window.openDialog("about:blank", null, + "innerWidth=250,innerHeight=350"); + + diagWin.addEventListener("load", function() { + resolve(); + }, {once: true}); + }); + + is(diagWin.innerWidth, 250, "The dialog window doesn't have a rounded size."); + is(diagWin.innerHeight, 350, "The dialog window doesn't have a rounded size."); + + await BrowserTestUtils.closeWindow(diagWin); +});

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Bug 1352305 - Part 1: Making the XULWindow will not be enforecd to be rounded dimensions if it is
by gk＠torproject.org 12 Apr '17

12 Apr '17

commit 9ee872b57e55ae672a30f087cf55bccef18f3646 Author: Tim Huang <tihuang(a)mozilla.com> Date: Mon Apr 10 11:03:22 2017 -0700 Bug 1352305 - Part 1: Making the XULWindow will not be enforecd to be rounded dimensions if it is a window without a primary content when fingerprinting resistance is enabled. r?ehsan This patch making the nsXULWindow::ForceRoundedDimensions() will only be called when this window is a window which has a primary content when fingerprinting resistance is enabled. This will fix the problem that dialog windows are incorrectly resized after fingerprinting resistance is enabled. MozReview-Commit-ID: 6WD6c38CTPv --- xpfe/appshell/nsXULWindow.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/xpfe/appshell/nsXULWindow.cpp b/xpfe/appshell/nsXULWindow.cpp index a24318a..604c41a 100644 --- a/xpfe/appshell/nsXULWindow.cpp +++ b/xpfe/appshell/nsXULWindow.cpp @@ -1129,8 +1129,13 @@ void nsXULWindow::OnChromeLoaded() int32_t specWidth = -1, specHeight = -1; bool gotSize = false; + bool isContent = false; - if (nsContentUtils::ShouldResistFingerprinting()) { + GetHasPrimaryContent(&isContent); + + // If this window has a primary content and fingerprinting resistance is + // enabled, we enforce this window to rounded dimensions. + if (isContent && nsContentUtils::ShouldResistFingerprinting()) { ForceRoundedDimensions(); } else if (!mIgnoreXULSize) { gotSize = LoadSizeFromXUL(specWidth, specHeight);

1 0

[tor-browser/tor-browser-52.0.2esr-7.0-2] Bug 21876: Always use esr policies for e10s.
by gk＠torproject.org 11 Apr '17

11 Apr '17

commit 1240ac3e85536322d6af0075c662eaf60ab078f9 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Apr 11 11:33:02 2017 -0400 Bug 21876: Always use esr policies for e10s. Always use the policies associated with the esr update channel so that the e10s behavior is the same for all Tor Browser builds. --- browser/extensions/e10srollout/bootstrap.js | 5 ++++- toolkit/xre/nsAppRunner.cpp | 9 +++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/browser/extensions/e10srollout/bootstrap.js b/browser/extensions/e10srollout/bootstrap.js index 8847501..e4e0738 100644 --- a/browser/extensions/e10srollout/bootstrap.js +++ b/browser/extensions/e10srollout/bootstrap.js @@ -58,7 +58,10 @@ function defineCohort() { } cohortDefinedOnThisSession = true; - let updateChannel = UpdateUtils.getUpdateChannel(false); + // For Tor Browser, always use the e10s policies associated with the esr + // update channel so that the e10s behavior is the same for all builds. + let updateChannel = "esr"; + if (!(updateChannel in TEST_THRESHOLD)) { setCohort("unsupportedChannel"); return; diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 721f599..190fec1 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -5453,15 +5453,12 @@ MultiprocessBlockPolicy() { #endif /** - * Avoids enabling e10s for Windows XP users on the release channel. + * Avoid enabling e10s for all Windows XP users. */ #if defined(XP_WIN) if (!IsVistaOrLater()) { - nsAdoptingCString channelName = Preferences::GetDefaultCString("app.update.channel"); - if (channelName.EqualsLiteral("release") || channelName.EqualsLiteral("esr")) { - gMultiprocessBlockPolicy = kE10sDisabledForOperatingSystem; - return gMultiprocessBlockPolicy; - } + gMultiprocessBlockPolicy = kE10sDisabledForOperatingSystem; + return gMultiprocessBlockPolicy; } #endif // XP_WIN

1 0

[tor-browser-bundle/master] We are on tor-browser-builder-4 meanwhile
by gk＠torproject.org 11 Apr '17

11 Apr '17

commit beb571f4c3e96be1458c870e6be486e5f1561d39 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 11 14:54:38 2017 +0000 We are on tor-browser-builder-4 meanwhile --- gitian/check-prerequisites.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index d6e79fd..74ddab6 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -92,7 +92,7 @@ then echo echo "Please run:" echo " cd ../../ " - echo " torsocks git clone -b tor-browser-builder-3 https://git.torproject.org/builders/gitian-builder.git" + echo " torsocks git clone -b tor-browser-builder-4 https://git.torproject.org/builders/gitian-builder.git" echo " cd -" exit 1 fi

1 0

[tor-browser-build/master] Add some indentation in various places
by boklm＠torproject.org 11 Apr '17

11 Apr '17

commit 1c9ccca6e097a988283d9474d30118670cbbded8 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 10 21:17:06 2017 +0200 Add some indentation in various places Add some indentation to make things more clear. --- projects/binutils/build | 26 ++++---- projects/firefox-langpacks/build | 14 ++--- projects/firefox/build | 124 +++++++++++++++++++-------------------- projects/fonts/build | 8 +-- projects/tor/build | 90 ++++++++++++++-------------- 5 files changed, 131 insertions(+), 131 deletions(-) diff --git a/projects/binutils/build b/projects/binutils/build index e3064cf..8d4f09f 100644 --- a/projects/binutils/build +++ b/projects/binutils/build @@ -18,25 +18,25 @@ distdir=/var/tmp/dist/binutils tar xf [% project %]-[% c("version") %].tar.bz2 cd [% project %]-[% c("version") %] [% IF c('var/windows') -%] -# XXX: This is needed due to bug 10102. -sed 's/= extern_rt_rel_d;/= extern_rt_rel_d;\n memset (extern_rt_rel_d, 0, PE_IDATA5_SIZE);/' -i ld/pe-dll.c -# Needed for the hardening... -patch -p1 < ../enable-reloc-section-ld.patch -# Zeroing timestamps in PE headers reliably, see bug 12753. -patch -p1 < ../peXXigen.patch + # XXX: This is needed due to bug 10102. + sed 's/= extern_rt_rel_d;/= extern_rt_rel_d;\n memset (extern_rt_rel_d, 0, PE_IDATA5_SIZE);/' -i ld/pe-dll.c + # Needed for the hardening... + patch -p1 < ../enable-reloc-section-ld.patch + # Zeroing timestamps in PE headers reliably, see bug 12753. + patch -p1 < ../peXXigen.patch [% END -%] ./configure --prefix=$distdir [% c('var/configure_opt') %] make -j4 make install [% IF c("var/linux") %] -# Make sure gold is used with the hardening wrapper for full RELRO, see #13031. -cd $distdir/bin -rm ld -cp /usr/bin/hardened-ld ./ -mv ld.gold ld.gold.real -ln -sf hardened-ld ld.gold -ln -sf ld.gold ld + # Make sure gold is used with the hardening wrapper for full RELRO, see #13031. + cd $distdir/bin + rm ld + cp /usr/bin/hardened-ld ./ + mv ld.gold ld.gold.real + ln -sf hardened-ld ld.gold + ln -sf ld.gold ld [% END %] cd /var/tmp/dist diff --git a/projects/firefox-langpacks/build b/projects/firefox-langpacks/build index 9ac07cb..6bc1810 100644 --- a/projects/firefox-langpacks/build +++ b/projects/firefox-langpacks/build @@ -2,15 +2,15 @@ [% c("var/set_default_env") -%] [% FOREACH lang = c('var/locales') %] -[% SET lang = tmpl(lang) %] -[% SET filename = c("var/input_filename") _ '/' _ lang _ '.xpi'; %] -shasum=$(grep '[% c("var/ff_arch") %]/xpi/[% lang %].xpi$' SHA512SUMS-[% c("version") %] | sed 's| [% c("var/ff_arch") %]/xpi/[% lang %].xpi$||') -echo "$shasum [% filename %]" | sha512sum -c + [% SET lang = tmpl(lang) %] + [% SET filename = c("var/input_filename") _ '/' _ lang _ '.xpi'; %] + shasum=$(grep '[% c("var/ff_arch") %]/xpi/[% lang %].xpi$' SHA512SUMS-[% c("version") %] | sed 's| [% c("var/ff_arch") %]/xpi/[% lang %].xpi$||') + echo "$shasum [% filename %]" | sha512sum -c [% END %] mkdir -p [% dest_dir %]/[% c("filename") %] [% FOREACH lang = c('var/locales') %] -[% SET lang = tmpl(lang) %] -[% SET filename = c("var/input_filename") _ '/' _ lang _ '.xpi'; %] -cp -a [% filename %] [% dest_dir %]/[% c("filename") %]/ + [% SET lang = tmpl(lang) %] + [% SET filename = c("var/input_filename") _ '/' _ lang _ '.xpi'; %] + cp -a [% filename %] [% dest_dir %]/[% c("filename") %]/ [% END %] diff --git a/projects/firefox/build b/projects/firefox/build index 4d83b28..b10bab4 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -21,21 +21,21 @@ distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build [% IF c("var/linux") %] -mkdir -p /var/tmp/dist -tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %] -export PATH="/var/tmp/dist/binutils/bin:$PATH" + mkdir -p /var/tmp/dist + tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %] + export PATH="/var/tmp/dist/binutils/bin:$PATH" [% END -%] tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz [% IF c("var/osx") %] -mkdir -p $distdir/TorBrowser.app/Contents/MacOS + mkdir -p $distdir/TorBrowser.app/Contents/MacOS [% ELSE %] -mkdir -p $distdir/Browser + mkdir -p $distdir/Browser [% END %] [% IF c("var/linux") %] -mkdir -p $distdir/Debug/Browser/gmp-clearkey/0.1 + mkdir -p $distdir/Debug/Browser/gmp-clearkey/0.1 [% END %] cd /var/tmp/build/[% project %]-[% c("version") %] @@ -49,29 +49,29 @@ then fi [% IF c("var/windows") %] -# FIXME -# Ideally, using LDFLAGS (and e.g. DLLFLAGS for NSS) would be enough to get -# all Firefox libraries linked against msvcr100. Alas, this does not hold for -# NSPR. Without patching it we get a "missing entry points for _strcmpi in -# msvcr100.dll". Now, this should be fixed in rev>=6179 as the def file there -# contains a proper patch according to the mingw-w64 developers. -# However, even with this patch the _strcmpi issue is still popping up, -# probably due to a bug in our current linking setup. The small patch below -# is therefore just a workaround which should get fixed but is at least -# justified as the signature of _strcmpi and _stricmp is the same, see: -# http://msdn.microsoft.com/en-us/library/k59z8dwe.aspx. -sed 's/strcmpi/stricmp/' -i nsprpub/pr/src/linking/prlink.c -export HOST_LDFLAGS=" " -export LDFLAGS="-specs=/var/tmp/dist/mingw-w64/msvcr100.spec" -# Our flags don't get passed to NSS. We need to do that manually using an -# obscure one. -export DLLFLAGS="-specs=/var/tmp/dist/mingw-w64/msvcr100.spec" + # FIXME + # Ideally, using LDFLAGS (and e.g. DLLFLAGS for NSS) would be enough to get + # all Firefox libraries linked against msvcr100. Alas, this does not hold for + # NSPR. Without patching it we get a "missing entry points for _strcmpi in + # msvcr100.dll". Now, this should be fixed in rev>=6179 as the def file there + # contains a proper patch according to the mingw-w64 developers. + # However, even with this patch the _strcmpi issue is still popping up, + # probably due to a bug in our current linking setup. The small patch below + # is therefore just a workaround which should get fixed but is at least + # justified as the signature of _strcmpi and _stricmp is the same, see: + # http://msdn.microsoft.com/en-us/library/k59z8dwe.aspx. + sed 's/strcmpi/stricmp/' -i nsprpub/pr/src/linking/prlink.c + export HOST_LDFLAGS=" " + export LDFLAGS="-specs=/var/tmp/dist/mingw-w64/msvcr100.spec" + # Our flags don't get passed to NSS. We need to do that manually using an + # obscure one. + export DLLFLAGS="-specs=/var/tmp/dist/mingw-w64/msvcr100.spec" [% END %] [% IF c("var/osname") == "linux-i686" -%] -export LDFLAGS=-m32 -export CFLAGS=-m32 -export CC='gcc -m32' + export LDFLAGS=-m32 + export CFLAGS=-m32 + export CC='gcc -m32' [% END -%] rm -f configure @@ -82,31 +82,31 @@ make -j8 -f client.mk build make -C obj-* package INNER_MAKE_PACKAGE=true [% IF c("var/osx") %] -cp -a obj-macos/dist/firefox/* $distdir -# Remove firefox-bin (we don't use it, see ticket #10126) -rm -f $distdir/TorBrowser.app/Contents/MacOS/firefox-bin - -# Adjust the Info.plist file -INFO_PLIST=$distdir/TorBrowser.app/Contents/Info.plist -mv $INFO_PLIST tmp.plist -python $rootdir/fix-info-plist.py '[% c("var/torbrowser_version") %]' '[% c("var/copyright_year") %]' < tmp.plist > $INFO_PLIST -rm -f tmp.plist + cp -a obj-macos/dist/firefox/* $distdir + # Remove firefox-bin (we don't use it, see ticket #10126) + rm -f $distdir/TorBrowser.app/Contents/MacOS/firefox-bin + + # Adjust the Info.plist file + INFO_PLIST=$distdir/TorBrowser.app/Contents/Info.plist + mv $INFO_PLIST tmp.plist + python $rootdir/fix-info-plist.py '[% c("var/torbrowser_version") %]' '[% c("var/copyright_year") %]' < tmp.plist > $INFO_PLIST + rm -f tmp.plist [% END %] [% IF c("var/linux") %] -cp -a obj-*/dist/firefox/* $distdir/Browser/ -# Remove firefox-bin (we don't use it, see ticket #10126) -rm -f $distdir/Browser/firefox-bin -# TODO: There goes FIPS-140.. We could upload these somewhere unique and -# subsequent builds could test to see if they've been uploaded before... -# But let's find out if it actually matters first.. -rm -f $distdir/Browser/*.chk + cp -a obj-*/dist/firefox/* $distdir/Browser/ + # Remove firefox-bin (we don't use it, see ticket #10126) + rm -f $distdir/Browser/firefox-bin + # TODO: There goes FIPS-140.. We could upload these somewhere unique and + # subsequent builds could test to see if they've been uploaded before... + # But let's find out if it actually matters first.. + rm -f $distdir/Browser/*.chk [% END %] [% IF c("var/windows") %] -cp -a obj-*/dist/firefox/* $distdir/Browser/ -cp -a $rootdir/msvcr100.dll $distdir/Browser -cp -a $gcclibs/libssp-0.dll $distdir/Browser + cp -a obj-*/dist/firefox/* $distdir/Browser/ + cp -a $rootdir/msvcr100.dll $distdir/Browser + cp -a $gcclibs/libssp-0.dll $distdir/Browser [% END %] # Make MAR-based update tools available for use during the bundle phase. @@ -121,26 +121,26 @@ cp -p tools/update-packaging/*.sh $MARTOOLS/ cp -p obj-*/dist/host/bin/mar $MARTOOLS/ 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" -NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" -for LIB in $NSS_LIBS $NSPR_LIBS; do - cp -p obj-*/dist/bin/$LIB $MARTOOLS/ -done + 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" + NSPR_LIBS="libnspr4.so libplc4.so libplds4.so" + for LIB in $NSS_LIBS $NSPR_LIBS; do + cp -p obj-*/dist/bin/$LIB $MARTOOLS/ + done [% END %] cd $distdir [% IF c("var/linux") %] -# Strip and generate debuginfo for the firefox binary that we keep, all *.so -# files, the plugin-container, and the updater (see ticket #10126) -for LIB in Browser/*.so Browser/firefox Browser/plugin-container Browser/gmp-clearkey/0.1/*.so Browser/updater -do - objcopy --only-keep-debug $LIB Debug/$LIB - strip $LIB - objcopy --add-gnu-debuglink=./Debug/$LIB $LIB -done + # Strip and generate debuginfo for the firefox binary that we keep, all *.so + # files, the plugin-container, and the updater (see ticket #10126) + for LIB in Browser/*.so Browser/firefox Browser/plugin-container Browser/gmp-clearkey/0.1/*.so Browser/updater + do + objcopy --only-keep-debug $LIB Debug/$LIB + strip $LIB + objcopy --add-gnu-debuglink=./Debug/$LIB $LIB + done [% END %] # Re-zipping the omni.ja files is not needed to make them reproductible, @@ -156,8 +156,8 @@ done [% END %] [% IF c("var/windows") %] -cp $rootdir/msvcr100.dll Browser/ -cp $gcclibs/libssp-0.dll Browser/ + cp $rootdir/msvcr100.dll Browser/ + cp $gcclibs/libssp-0.dll Browser/ [% END %] mkdir -p [% dest_dir _ '/' _ c('filename') %] diff --git a/projects/fonts/build b/projects/fonts/build index e645c31..9b33da9 100644 --- a/projects/fonts/build +++ b/projects/fonts/build @@ -13,12 +13,12 @@ mkdir -p $distdir END; %] [% IF c("var/linux") || c("var/osx") %] -unzip -o STIXv1.1.1-latex.zip -d STIX -cp "STIX/Fonts/fonts/opentype/public/stix/STIXMath-Regular.otf" $distdir/ + unzip -o STIXv1.1.1-latex.zip -d STIX + cp "STIX/Fonts/fonts/opentype/public/stix/STIXMath-Regular.otf" $distdir/ [% END %] [% IF c("var/linux") %] -cp NotoEmoji-Regular.ttf $distdir/ -cp {NotoSansJP-Regular.otf,NotoSansKR-Regular.otf,NotoSansSC-Regular.otf,NotoSansTC-Regular.otf} $distdir/ + cp NotoEmoji-Regular.ttf $distdir/ + cp {NotoSansJP-Regular.otf,NotoSansKR-Regular.otf,NotoSansSC-Regular.otf,NotoSansTC-Regular.otf} $distdir/ [% END %] cd /var/tmp/dist [% c('tar', { diff --git a/projects/tor/build b/projects/tor/build index c1296fe..85e158f 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -5,17 +5,17 @@ distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build [% IF c("var/linux") || c("var/windows") %] -TORCONFIGDIR="$distdir/Data/Tor" -mkdir -p $TORCONFIGDIR -mkdir -p "$distdir/Tor" + TORCONFIGDIR="$distdir/Data/Tor" + mkdir -p $TORCONFIGDIR + mkdir -p "$distdir/Tor" [% END %] [% IF c("var/osx") %] -TORBINDIR="$distdir/Contents/MacOS/Tor" -TORCONFIGDIR="$distdir/Contents/Resources/TorBrowser/Tor" -mkdir -p $distdir/bin -mkdir -p $TORBINDIR -mkdir -p $TORCONFIGDIR + TORBINDIR="$distdir/Contents/MacOS/Tor" + TORCONFIGDIR="$distdir/Contents/Resources/TorBrowser/Tor" + mkdir -p $distdir/bin + mkdir -p $TORBINDIR + mkdir -p $TORCONFIGDIR [% END %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/openssl') %] @@ -25,32 +25,32 @@ libeventdir=/var/tmp/dist/libevent openssldir=/var/tmp/dist/openssl [% IF c("var/windows") %] -tar -C /var/tmp/build -xf [% c('input_files_by_name/zlib') %] -zlibdir=/var/tmp/build/zlib -cp $zlibdir/lib/*.dll $openssldir/bin/*.dll $libeventdir/bin/*.dll \ - $gcclibs/*.dll $distdir/Tor/ + tar -C /var/tmp/build -xf [% c('input_files_by_name/zlib') %] + zlibdir=/var/tmp/build/zlib + cp $zlibdir/lib/*.dll $openssldir/bin/*.dll $libeventdir/bin/*.dll \ + $gcclibs/*.dll $distdir/Tor/ [% END %] [% IF c("var/linux") %] -mkdir -p "$distdir/Debug/Tor" -cp $openssldir/lib/libssl.so.1.0.0 "$distdir/Tor/" -cp $openssldir/lib/libcrypto.so.1.0.0 "$distdir/Tor/" -cp $libeventdir/lib/libevent-2.0.so.5 "$distdir/Tor/" -# We need to copy the libstdc++.so.6 for Tor Browser on older Linux distros. -# Copying it into /Browser, which feels more natural, and amending -# LD_LIBRARY_PATH breaks updates from a Tor Browser with the old -# LD_LIBRARY_PATH value to the Tor Browser with the newer one. Thus, we copy -# the libstdc++ into the directory with the libs tor depends on, too. See bug -# 13359 for further details. -cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libstdc++.so.6 "$distdir/Tor/" -chmod 700 "$distdir"/Tor/*.so* -# This is needed to make RPATH unavailable. See bug 9150. -export LD_LIBRARY_PATH="$distdir/Tor/" + mkdir -p "$distdir/Debug/Tor" + cp $openssldir/lib/libssl.so.1.0.0 "$distdir/Tor/" + cp $openssldir/lib/libcrypto.so.1.0.0 "$distdir/Tor/" + cp $libeventdir/lib/libevent-2.0.so.5 "$distdir/Tor/" + # We need to copy the libstdc++.so.6 for Tor Browser on older Linux distros. + # Copying it into /Browser, which feels more natural, and amending + # LD_LIBRARY_PATH breaks updates from a Tor Browser with the old + # LD_LIBRARY_PATH value to the Tor Browser with the newer one. Thus, we copy + # the libstdc++ into the directory with the libs tor depends on, too. See bug + # 13359 for further details. + cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libstdc++.so.6 "$distdir/Tor/" + chmod 700 "$distdir"/Tor/*.so* + # This is needed to make RPATH unavailable. See bug 9150. + export LD_LIBRARY_PATH="$distdir/Tor/" [% END %] [% IF c("var/osx") %] -cp $libeventdir/lib/libevent-*.dylib $TORBINDIR/ + cp $libeventdir/lib/libevent-*.dylib $TORBINDIR/ [% END %] cd /var/tmp/build/[% project %]-[% c('version') %] @@ -73,33 +73,33 @@ cp $distdir/share/tor/geoip $TORCONFIGDIR cp $distdir/share/tor/geoip6 $TORCONFIGDIR [% IF c("var/osx") %] -LIBEVENT_FILE=`basename $libeventdir/lib/libevent-*.dylib` -cd $distdir -cp bin/tor $TORBINDIR/ -cd $TORBINDIR/ -x86_64-apple-darwin10-install_name_tool -change $libeventdir/lib/$LIBEVENT_FILE @executable_path/$LIBEVENT_FILE tor + LIBEVENT_FILE=`basename $libeventdir/lib/libevent-*.dylib` + cd $distdir + cp bin/tor $TORBINDIR/ + cd $TORBINDIR/ + x86_64-apple-darwin10-install_name_tool -change $libeventdir/lib/$LIBEVENT_FILE @executable_path/$LIBEVENT_FILE tor [% END %] cd $distdir [% IF c("var/windows") %] -install -s $distdir/bin/tor.exe $distdir/Tor/ + install -s $distdir/bin/tor.exe $distdir/Tor/ [% IF c("var/expert_bundle") %] -install -s $distdir/bin/tor-gencert.exe $distdir/Tor/ + install -s $distdir/bin/tor-gencert.exe $distdir/Tor/ [% END %] [% END %] [% IF c("var/linux") %] -# Strip and generate debuginfo for libs -objcopy --only-keep-debug $distdir/bin/tor $distdir/Debug/Tor/tor -install -s $distdir/bin/tor $distdir/Tor/ -objcopy --add-gnu-debuglink=./Debug/Tor/tor $distdir/Tor/tor -for i in $distdir/Tor/*so* -do - LIB=`basename $i` - objcopy --only-keep-debug $distdir/Tor/$LIB $distdir/Debug/Tor/$LIB - strip $distdir/Tor/$LIB - objcopy --add-gnu-debuglink=./Debug/Tor/$LIB $distdir/Tor/$LIB -done + # Strip and generate debuginfo for libs + objcopy --only-keep-debug $distdir/bin/tor $distdir/Debug/Tor/tor + install -s $distdir/bin/tor $distdir/Tor/ + objcopy --add-gnu-debuglink=./Debug/Tor/tor $distdir/Tor/tor + for i in $distdir/Tor/*so* + do + LIB=`basename $i` + objcopy --only-keep-debug $distdir/Tor/$LIB $distdir/Debug/Tor/$LIB + strip $distdir/Tor/$LIB + objcopy --add-gnu-debuglink=./Debug/Tor/$LIB $distdir/Tor/$LIB + done [% END %] mkdir -p [% dest_dir _ '/' _ c('filename') %]

1 0

[tor-browser-build/master] Bug 21837: Fix reproducibility of accessibility code for Windows
by boklm＠torproject.org 11 Apr '17

11 Apr '17

commit bf7083a47fbe40f8e5ca423fde06bb0f0cd403b0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 10 21:18:50 2017 +0200 Bug 21837: Fix reproducibility of accessibility code for Windows tor-browser-bundle.git commit: f13a2dae1ca038a448483dc6b25f17e40c8f3c9b --- projects/firefox/build | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/firefox/build b/projects/firefox/build index b10bab4..3985aec 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -66,6 +66,9 @@ fi # Our flags don't get passed to NSS. We need to do that manually using an # obscure one. export DLLFLAGS="-specs=/var/tmp/dist/mingw-w64/msvcr100.spec" + + # Make sure widl is not inserting random timestamps, see #21837. + export WIDL_TIME_OVERRIDE="0" [% END %] [% IF c("var/osname") == "linux-i686" -%]

1 0