- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 31467: Switch to clang for cctools project
by boklm＠torproject.org 27 Aug '19

27 Aug '19

commit d14719716fe9b4940686fd5a6b449fd7680176df Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 20 08:55:37 2019 +0000 Bug 31467: Switch to clang for cctools project --- projects/cctools/build | 4 ++-- projects/cctools/config | 4 ++-- projects/llvm/build | 37 ------------------------------------- projects/llvm/config | 35 ----------------------------------- 4 files changed, 4 insertions(+), 76 deletions(-) diff --git a/projects/cctools/build b/projects/cctools/build index cad9e3a..a724399 100644 --- a/projects/cctools/build +++ b/projects/cctools/build @@ -2,8 +2,8 @@ [% c("var/set_default_env") -%] distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/dist -tar -C /var/tmp/dist -xf [% c('input_files_by_name/llvm') %] -export PATH="/var/tmp/dist/llvm/bin:$PATH" +tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang') %] +export PATH="/var/tmp/dist/clang/bin:$PATH" mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %]/cctools diff --git a/projects/cctools/config b/projects/cctools/config index cb84ec4..8e7ff65 100644 --- a/projects/cctools/config +++ b/projects/cctools/config @@ -12,5 +12,5 @@ var: input_files: - project: container-image - - name: llvm - project: llvm + - name: clang + project: clang diff --git a/projects/llvm/build b/projects/llvm/build deleted file mode 100644 index 0958a4c..0000000 --- a/projects/llvm/build +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -distdir=/var/tmp/dist/[% project %] -mkdir -p /var/tmp/dist -tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] -export PATH="/var/tmp/dist/cmake/bin:$PATH" -[% IF c("var/linux") %] - # We need a link to our GCC, otherwise the system cc gets used which points to - # /usr/bin/gcc. - [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'), - hardened_gcc => 0 }) %] - ln -s gcc /var/tmp/dist/gcc/bin/cc -[% END -%] -mkdir -p /var/tmp/build -cd /var/tmp/build -tar -xf $rootdir/[% c('input_files_by_name/llvm') %] -tar -xf $rootdir/[% c('input_files_by_name/cfe') %] -tar -xf $rootdir/[% c('input_files_by_name/libcxx') %] -tar -xf $rootdir/[% c('input_files_by_name/libcxxabi') %] -mv cfe-* clang -mv libcxx-* libcxx -mv libcxxabi-* libcxxabi -mv clang llvm-*/tools -mv libcxx llvm-*/projects -mv libcxxabi llvm-*/projects -cd llvm-* -export LLVM_HOME=$(pwd) -mkdir build -cd build -cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir -DCMAKE_BUILD_TYPE:STRING=Release $LLVM_HOME -make -j[% c("buildconf/num_procs") %] -make install -cd /var/tmp/dist -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/llvm/config b/projects/llvm/config deleted file mode 100644 index 76fb2c0..0000000 --- a/projects/llvm/config +++ /dev/null @@ -1,35 +0,0 @@ -# vim: filetype=yaml sw=2 -version: 3.9.1 -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' - -var: - container: - use_container: 1 - -input_files: - - project: container-image - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' - enable: '[% c("var/linux") %]' - - project: cmake - name: cmake - - URL: 'https://releases.llvm.org/[% c("version") %]/llvm-[% c("version") %].src.tar.xz' - name: llvm - sig_ext: sig - file_gpg_id: 1 - gpg_keyring: llvm.gpg - - URL: 'https://releases.llvm.org/[% c("version") %]/cfe-[% c("version") %].src.tar.xz' - name: cfe - sig_ext: sig - file_gpg_id: 1 - gpg_keyring: llvm.gpg - - URL: 'https://releases.llvm.org/[% c("version") %]/libcxx-[% c("version") %].src.tar.xz' - name: libcxx - sig_ext: sig - file_gpg_id: 1 - gpg_keyring: llvm.gpg - - URL: 'https://releases.llvm.org/[% c("version") %]/libcxxabi-[% c("version") %].src.tar.xz' - name: libcxxabi - sig_ext: sig - file_gpg_id: 1 - gpg_keyring: llvm.gpg

1 0

[torbutton/master] Bug 10760: bring back review changes that got lost by mistake
by gk＠torproject.org 27 Aug '19

27 Aug '19

commit 11c41cf294050dbe364f287e35f06da8b437214b Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Aug 27 11:26:44 2019 +0200 Bug 10760: bring back review changes that got lost by mistake --- chrome/content/aboutTor/aboutTor-content.js | 10 +++------- chrome/content/tor-circuit-display.js | 2 +- chrome/content/torbutton.js | 31 +++++++---------------------- chrome/content/torbutton_util.js | 1 - components/cookie-jar-selector.js | 25 ++++++----------------- components/domain-isolator.js | 9 ++------- components/dragDropFilter.js | 4 ++-- components/external-app-blocker.js | 9 ++++----- components/startup-observer.js | 30 +++++----------------------- components/torCheckService.js | 4 ++-- components/torbutton-logger.js | 7 ++----- modules/noscript-control.js | 4 ++-- modules/tor-control-port.js | 2 +- modules/utils.js | 2 +- 14 files changed, 38 insertions(+), 102 deletions(-) diff --git a/chrome/content/aboutTor/aboutTor-content.js b/chrome/content/aboutTor/aboutTor-content.js index d4399624..01b4c2c7 100644 --- a/chrome/content/aboutTor/aboutTor-content.js +++ b/chrome/content/aboutTor/aboutTor-content.js @@ -14,11 +14,9 @@ * AboutTor:ChromeData privileged data chrome -> content */ -var {classes: Cc, interfaces: Ci, utils: Cu} = Components; +const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); - -Cu.import("resource://gre/modules/Services.jsm"); -let { bindPrefAndInit, show_torbrowser_manual } = Cu.import("resource://torbutton/modules/utils.js", {}); +let { bindPrefAndInit, show_torbrowser_manual } = ChromeUtils.import("resource://torbutton/modules/utils.js", {}); var AboutTorListener = { @@ -139,9 +137,7 @@ var AboutTorListener = { // Display the Tor Browser product name and version. try { const kBrandBundle = "chrome://branding/locale/brand.properties"; - let brandBundle = Cc["@mozilla.org/intl/stringbundle;1"] - .getService(Ci.nsIStringBundleService) - .createBundle(kBrandBundle); + let brandBundle = Services.strings.createBundle(kBrandBundle); let productName = brandBundle.GetStringFromName("brandFullName"); let tbbVersion = Services.prefs.getCharPref("torbrowser.version"); let elem = content.document.getElementById("torbrowser-version"); diff --git a/chrome/content/tor-circuit-display.js b/chrome/content/tor-circuit-display.js index 05dc14de..d21b0770 100644 --- a/chrome/content/tor-circuit-display.js +++ b/chrome/content/tor-circuit-display.js @@ -357,7 +357,7 @@ let setupGuardNote = function () { ["div", {}, noteBefore, ["span", {class: "circuit-guard-name"}, name], noteAfter, " ", - ["span", {onclick: `gBrowser.selectedTab = gBrowser.addTab('https://support.torproject.org/${localeCode}/tbb/tbb-2/', {triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal()});`, + ["span", {onclick: `gBrowser.selectedTab = gBrowser.addWebTab('https://support.torproject.org/${localeCode}/tbb/tbb-2/');`, class: "circuit-link"}, learnMoreString]]); }; diff --git a/chrome/content/torbutton.js b/chrome/content/torbutton.js index 605f6d29..0ad9d620 100644 --- a/chrome/content/torbutton.js +++ b/chrome/content/torbutton.js @@ -200,9 +200,7 @@ var torbutton_tor_check_observer = { } if (!foundTab) { - gBrowser.selectedTab = gBrowser.addTab("about:tor", { - triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(), - }); + gBrowser.selectedTab = gBrowser.addTrustedTab("about:tor"); } } } @@ -883,7 +881,6 @@ function torbutton_new_identity() { // conditions leading to failures (see bug 11783 for an example). // TODO: Remove the Torbutton menu entry again once we have done our // security control redesign. - // document.getElementById("torbutton-new-identity").disabled = true; document.getElementById("menu_newIdentity").disabled = true; document.getElementById("appMenuNewIdentity").disabled = true; @@ -909,7 +906,6 @@ function torbutton_new_identity() { } else { // TODO: Remove the Torbutton menu entry again once we have done our // security control redesign. - // document.getElementById("torbutton-new-identity").disabled = false; document.getElementById("menu_newIdentity").disabled = false; document.getElementById("appMenuNewIdentity").disabled = false; } @@ -923,7 +919,6 @@ function torbutton_new_identity() { // security control redesign. torbutton_log(5, "Unexpected error on new identity: " + e); window.alert("Torbutton: Unexpected error on new identity: " + e); - // document.getElementById("torbutton-new-identity").disabled = false; document.getElementById("menu_newIdentity").disabled = false; document.getElementById("appMenuNewIdentity").disabled = false; } @@ -1575,7 +1570,7 @@ function torbutton_close_tabs_on_new_identity() { let tabCount = browser.browsers.length; torbutton_log(3, "Tab count for window: " + tabCount); - let tabsToRemove = new Array(); + let tabsToRemove = []; for (let i = 0; i < tabCount; i++) { let tab = browser.getTabForBrowser(browser.browsers[i]); if (!tab) { @@ -1586,9 +1581,7 @@ function torbutton_close_tabs_on_new_identity() { } if (win == window) { - browser.addTab("about:blank", { - triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(), - }); + browser.addWebTab("about:blank"); } else { // It is a bad idea to alter the window list while iterating // over it, so add this window to an array and close it later. @@ -1641,7 +1634,6 @@ function torbutton_check_protections() if (!m_tb_control_pass || (!m_tb_control_ipc_file && !m_tb_control_port)) { // TODO: Remove the Torbutton menu entry again once we have done our // security control redesign. - document.getElementById("torbutton-new-identity").disabled = true; document.getElementById("menu_newIdentity").disabled = true; document.getElementById("appMenuNewIdentity").disabled = true; } @@ -1651,12 +1643,6 @@ function torbutton_check_protections() } } -// Bug 1506 P2: I think cookie protections is a neat feature. -function torbutton_open_cookie_dialog() { - showDialog(window, 'chrome://torbutton/content/torcookiedialog.xul', - 'Cookie Protections', 'centerscreen,chrome,dialog,modal,resizable'); -} - // -------------- HISTORY & COOKIES --------------------- // Bug 1506 P4: Used by New Identity if cookie protections are @@ -1680,9 +1666,7 @@ function torbutton_disable_browser_js(browser) { if (!browser.contentWindow) torbutton_log(3, "No content window to disable JS events."); else - eventSuppressor = browser.contentWindow. - QueryInterface(Ci.nsIInterfaceRequestor). - getInterface(Ci.nsIDOMWindowUtils); + eventSuppressor = browser.contentWindow.windowUtils; } catch(e) { torbutton_log(4, "Failed to disable JS events: "+e) } @@ -1805,8 +1789,8 @@ function torbutton_do_startup() { if(m_tb_prefs.getBoolPref("extensions.torbutton.startup")) { // Bug 1506: Still want to do this - // torbutton_toggle_plugins( - // m_tb_prefs.getBoolPref("plugin.disable")); + torbutton_toggle_plugins( + m_tb_prefs.getBoolPref("plugin.disable")); // Bug 1506: Should probably be moved to an XPCOM component torbutton_do_main_window_startup(); @@ -1894,10 +1878,9 @@ function showSecurityPreferencesPanel(chromeWindow) { if (settingsTab === null) { // Open up the settings panel in a new tab. - tabBrowser.addTab(SECURITY_PREFERENCES_URI, { + tabBrowser.addTrustedTab(SECURITY_PREFERENCES_URI, { "selected": true, "parentId": tabBrowser.selectedTab.id, - triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(), }); } else { // Activate an existing settings panel tab. diff --git a/chrome/content/torbutton_util.js b/chrome/content/torbutton_util.js index c7116a09..e6446cde 100644 --- a/chrome/content/torbutton_util.js +++ b/chrome/content/torbutton_util.js @@ -3,7 +3,6 @@ // code directly. I don't see any of them as essential for 1506, // really. -// let { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm", {}); var m_tb_torlog = Cc["@torproject.org/torbutton-logger;1"] .getService(Ci.nsISupports).wrappedJSObject; diff --git a/components/cookie-jar-selector.js b/components/cookie-jar-selector.js index b3eeda53..79a66e8a 100644 --- a/components/cookie-jar-selector.js +++ b/components/cookie-jar-selector.js @@ -21,9 +21,9 @@ const kMODULE_CID = Components.ID("e6204253-b690-4159-bfe8-d4eedab6b3be"); ChromeUtils.import("resource://torbutton/modules/default-prefs.js", {}) .ensureDefaultPrefs(); -const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm"); +const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); +const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); -// XXX: Must match the definition in torcookie.js :/ function Cookie(number,name,value,isDomain,host,rawHost,HttpOnly,path,isSecure,isSession, expires,isProtected) { this.number = number; @@ -88,9 +88,7 @@ function CookieJarSelector() { if (typeof(cookiesAsJS) == "undefined" || !cookiesAsJS) return; - var cookieManager = - Cc["@mozilla.org/cookiemanager;1"] - .getService(Ci.nsICookieManager2); + var cookieManager = Services.cookies; for (var i = 0; i < cookiesAsJS.length; i++) { var cookie = cookiesAsJS[i]; @@ -299,9 +297,7 @@ function CookieJarSelector() { this.clearCookies(); return; } - var cookiemanager = - Cc["@mozilla.org/cookiemanager;1"] - .getService(Ci.nsICookieManager2); + var cookiemanager = Services.cookies; var enumerator = cookiemanager.enumerator; var count = 0; @@ -329,7 +325,7 @@ function CookieJarSelector() { } // Emit cookie-changed event. This instructs other components to clear their identifiers // (Specifically DOM storage and safe browsing, but possibly others) - var obsSvc = Cc["@mozilla.org/observer-service;1"].getService(nsIObserverService); + var obsSvc = Services.obs; obsSvc.notifyObservers(this, "cookie-changed", "cleared"); } catch (e) { this.logger.log(5, "Error deleting unprotected cookies: " + e); @@ -367,10 +363,6 @@ function CookieJarSelector() { this.logger.log(2, "Cookies reloaded"); }; - // Check firefox version to know filename - // var appInfo = Services.appinfo; - // var versionChecker = Services.vc; - // This JSObject is exported directly to chrome this.wrappedJSObject = this; @@ -399,13 +391,9 @@ function CookieJarSelector() { } -const nsISupports = Ci.nsISupports; const nsIClassInfo = Ci.nsIClassInfo; const nsIObserver = Ci.nsIObserver; const nsITimer = Ci.nsITimer; -const nsIComponentRegistrar = Ci.nsIComponentRegistrar; -const nsIObserverService = Ci.nsIObserverService; -const nsICategoryManager = Ci.nsICategoryManager; // Start1506: You may or may not care about this: CookieJarSelector.prototype = @@ -446,7 +434,7 @@ CookieJarSelector.prototype = } break; case "profile-after-change": - var obsSvc = Cc["@mozilla.org/observer-service;1"].getService(nsIObserverService); + var obsSvc = Services.obs; obsSvc.addObserver(this, "cookie-changed"); // after profil loading, initialize a timer to call timerCallback // at a specified interval @@ -464,7 +452,6 @@ CookieJarSelector.prototype = * XPCOMUtils.generateNSGetFactory was introduced in Mozilla 2 (Firefox 4). * XPCOMUtils.generateNSGetModule is for Mozilla 1.9.2 (Firefox 3.6). */ -const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); if (XPCOMUtils.generateNSGetFactory) var NSGetFactory = XPCOMUtils.generateNSGetFactory([CookieJarSelector]); else diff --git a/components/domain-isolator.js b/components/domain-isolator.js index 891a19cc..f6a6d598 100644 --- a/components/domain-isolator.js +++ b/components/domain-isolator.js @@ -8,7 +8,8 @@ // ### Abbreviations -const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm"); +const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); +const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); // Make the logger available. let logger = Cc["@torproject.org/torbutton-logger;1"] @@ -17,9 +18,6 @@ let logger = Cc["@torproject.org/torbutton-logger;1"] let { ensureDefaultPrefs } = ChromeUtils.import("resource://torbutton/modules/default-prefs.js", {}); ensureDefaultPrefs(); -// Import Services object -ChromeUtils.import("resource://gre/modules/Services.jsm"); - // Import crypto object (FF 37+). Cu.importGlobalProperties(["crypto"]); @@ -163,9 +161,6 @@ const kMODULE_NAME = "TorBrowser Domain Isolator"; const kMODULE_CONTRACTID = "@torproject.org/domain-isolator;1"; const kMODULE_CID = Components.ID("e33fd6d4-270f-475f-a96f-ff3140279f68"); -// Import XPCOMUtils object. -const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); - // DomainIsolator object. function DomainIsolator() { this.wrappedJSObject = this; diff --git a/components/dragDropFilter.js b/components/dragDropFilter.js index 66dbe3a4..9d6f74c8 100644 --- a/components/dragDropFilter.js +++ b/components/dragDropFilter.js @@ -8,8 +8,8 @@ ChromeUtils.import("resource://torbutton/modules/default-prefs.js", {}).ensureDefaultPrefs(); -const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); -const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm"); +const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); +const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); // Module specific constants const kMODULE_NAME = "Torbutton Drag and Drop Handler"; diff --git a/components/external-app-blocker.js b/components/external-app-blocker.js index 1cc2000f..afd5c002 100644 --- a/components/external-app-blocker.js +++ b/components/external-app-blocker.js @@ -12,9 +12,9 @@ * handle an URL (e.g., when the user clicks on a mailto: URL). *************************************************************************/ -const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); -const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm"); -const {PromptUtils} = ChromeUtils.import("resource://gre/modules/SharedPromptUtils.jsm"); +const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); +const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); +const { PromptUtils } = ChromeUtils.import("resource://gre/modules/SharedPromptUtils.jsm"); // Module specific constants const kMODULE_NAME = "Torbutton External App Handler"; @@ -33,8 +33,7 @@ ExternalAppBlocker.prototype = { _helperAppLauncher: undefined, - QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver, - Ci.nsIHelperAppWarningDialog]), + QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver, Ci.nsIHelperAppWarningDialog]), // make this an nsIClassInfo object flags: Ci.nsIClassInfo.DOM_OBJECT, diff --git a/components/startup-observer.js b/components/startup-observer.js index eea9e8db..742b1a0f 100644 --- a/components/startup-observer.js +++ b/components/startup-observer.js @@ -12,18 +12,14 @@ * *************************************************************************/ -const Cc = Components.classes; -const Ci = Components.interfaces; -const Cr = Components.results; -const Cu = Components.utils; +const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); +const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); -Cu.import("resource://gre/modules/Services.jsm"); -Cu.import("resource://gre/modules/XPCOMUtils.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "FileUtils", "resource://gre/modules/FileUtils.jsm"); -Cu.import("resource://torbutton/modules/default-prefs.js", {}).ensureDefaultPrefs(); -let NoScriptControl = Cu.import("resource://torbutton/modules/noscript-control.js", {}); +ChromeUtils.import("resource://torbutton/modules/default-prefs.js", {}).ensureDefaultPrefs(); +let NoScriptControl = ChromeUtils.import("resource://torbutton/modules/noscript-control.js", {}); // Module specific constants const kMODULE_NAME = "Startup"; @@ -158,15 +154,7 @@ StartupObserver.prototype = { Services.prefs.savePrefFile(null); }, - QueryInterface: function(iid) { - if (iid.equals(Ci.nsISupports)) { - return this; - } - if(iid.equals(Ci.nsIClassInfo)) { - return this; - } - return this; - }, + QueryInterface: ChromeUtils.generateQI([Ci.nsIClassInfo]), // method of nsIClassInfo classDescription: "Torbutton Startup Observer", @@ -175,14 +163,6 @@ StartupObserver.prototype = { // Hack to get us registered early to observe recovery _xpcom_categories: [{category:"profile-after-change"}], - - getInterfaces: function(count) { - var interfaceList = [nsIClassInfo]; - count.value = interfaceList.length; - return interfaceList; - }, - getHelperForLanguage: function(count) { return null; } - }; var NSGetFactory = XPCOMUtils.generateNSGetFactory([StartupObserver]); diff --git a/components/torCheckService.js b/components/torCheckService.js index d4815ee2..409cc2c5 100644 --- a/components/torCheckService.js +++ b/components/torCheckService.js @@ -7,7 +7,8 @@ * Tor check service *************************************************************************/ -const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm"); +const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); +const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); // Module specific constants const kMODULE_NAME = "Torbutton Tor Check Service"; @@ -130,5 +131,4 @@ TBTorCheckService.prototype = }, }; -const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); var NSGetFactory = XPCOMUtils.generateNSGetFactory([TBTorCheckService]); diff --git a/components/torbutton-logger.js b/components/torbutton-logger.js index 22c664fa..52fdfc23 100644 --- a/components/torbutton-logger.js +++ b/components/torbutton-logger.js @@ -15,7 +15,8 @@ const kMODULE_CID = Components.ID("f36d72c9-9718-4134-b550-e109638331d7"); ChromeUtils.import("resource://torbutton/modules/default-prefs.js", {}).ensureDefaultPrefs(); -const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm"); +const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); +const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); function TorbuttonLogger() { // Register observer @@ -44,10 +45,7 @@ function TorbuttonLogger() { * Everything below is boring boilerplate and can probably be ignored. */ -const nsISupports = Ci.nsISupports; const nsIClassInfo = Ci.nsIClassInfo; -const nsIComponentRegistrar = Ci.nsIComponentRegistrar; -const nsIObserverService = Ci.nsIObserverService; const logString = { 1:"VERB", 2:"DBUG", 3: "INFO", 4:"NOTE", 5:"WARN" }; @@ -162,7 +160,6 @@ TorbuttonLogger.prototype = * XPCOMUtils.generateNSGetFactory was introduced in Mozilla 2 (Firefox 4). * XPCOMUtils.generateNSGetModule is for Mozilla 1.9.2 (Firefox 3.6). */ -const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); if (XPCOMUtils.generateNSGetFactory) var NSGetFactory = XPCOMUtils.generateNSGetFactory([TorbuttonLogger]); else diff --git a/modules/noscript-control.js b/modules/noscript-control.js index 0daf15e1..0383b9b5 100644 --- a/modules/noscript-control.js +++ b/modules/noscript-control.js @@ -100,7 +100,7 @@ var initialize = () => { try { // LegacyExtensionContext is not there anymore. Using raw - // Services.mm.broadcastAsyncMessage mecanism to communicate with + // Services.cpmm.sendAsyncMessage mechanism to communicate with // NoScript. // The component that handles WebExtensions' sendMessage. @@ -113,7 +113,7 @@ var initialize = () => { // TODO: Is there a better way? let sendNoScriptSettings = settings => - Services.mm.broadcastAsyncMessage("MessageChannel:Messages", [{ + Services.cpmm.sendAsyncMessage("MessageChannel:Messages", [{ messageName: "Extension:Message", sender: { id: noscriptID, extensionId: noscriptID }, recipient: { extensionId: noscriptID }, diff --git a/modules/tor-control-port.js b/modules/tor-control-port.js index f1d9ed14..afb3d606 100644 --- a/modules/tor-control-port.js +++ b/modules/tor-control-port.js @@ -22,7 +22,7 @@ let { Constructor: CC } = Components; // ### Import Mozilla Services -const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm"); +const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); // __log__. // Logging function diff --git a/modules/utils.js b/modules/utils.js index 7b81819d..ea41fce9 100644 --- a/modules/utils.js +++ b/modules/utils.js @@ -2,7 +2,7 @@ // Various helpful utility functions. // ### Import Mozilla Services -const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm"); +const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); // ### About firstPartyDomain literal const k_tb_about_uri_first_party_domain = "about.ef2a7dd5-93bc-417f-a698-142c3116864f.mozilla";

1 0

[torbutton/maint-2.1] Bug 31520: Remove monthly giving banner from Tor Browser
by gk＠torproject.org 27 Aug '19

27 Aug '19

commit 0928f38e17224cf67d3059d1656f41a89f142450 Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Aug 27 12:10:10 2019 +0200 Bug 31520: Remove monthly giving banner from Tor Browser This reverts commit 99210412d9f7b33ed40f9407e179c6cbeaa61957. --- src/chrome/content/aboutTor/aboutTor-content.js | 19 ------ src/chrome/content/aboutTor/aboutTor.xhtml | 13 ---- src/chrome/content/torbutton.js | 17 ----- src/chrome/locale/en-US/aboutTor.dtd | 3 - src/chrome/skin/aboutTor.css | 83 ------------------------ src/chrome/skin/icon_monthly_donors.png | Bin 3093 -> 0 bytes src/defaults/preferences/preferences.js | 1 - 7 files changed, 136 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor-content.js b/src/chrome/content/aboutTor/aboutTor-content.js index d4399624..2b65dbcf 100644 --- a/src/chrome/content/aboutTor/aboutTor-content.js +++ b/src/chrome/content/aboutTor/aboutTor-content.js @@ -24,7 +24,6 @@ let { bindPrefAndInit, show_torbrowser_manual } = Cu.import("resource://torbutto var AboutTorListener = { kAboutTorLoadedMessage: "AboutTor:Loaded", kAboutTorChromeDataMessage: "AboutTor:ChromeData", - kAboutTorHideDonationBanner: "AboutTor:HideDonationBanner", get isAboutTor() { return content.document.documentURI.toLowerCase() == "about:tor"; @@ -59,22 +58,6 @@ var AboutTorListener = { } }, - setupBannerClosing: function () { - let that = this; - let closer = content.document.getElementById("donation-banner-closer"); - closer.addEventListener("click", function () { - sendAsyncMessage(that.kAboutTorHideDonationBanner); - }); - - bindPrefAndInit("extensions.torbutton.donation_banner_countdown3", - countdown => { - if (content.document && content.document.body) { - content.document.body.setAttribute( - "show-donation-banner", countdown > 0); - } - }); - }, - onPageLoad: function() { // Arrange to update localized text and links. bindPrefAndInit("intl.locale.requested", aNewVal => { @@ -83,8 +66,6 @@ var AboutTorListener = { } }); - this.setupBannerClosing(); - // Add message and event listeners. addMessageListener(this.kAboutTorChromeDataMessage, this); addEventListener("pagehide", this, false); diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 106bd936..4736f653 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -34,19 +34,6 @@ window.addEventListener("pageshow", function() { </script> </head> <body dir="&locale.dir;"> - <div id="donation-banner"> - <div></div> - <div id="donation-banner-message"> - <div id="donation-banner-icon"></div> - <div>&aboutTor.donationBanner3.line1; - <a href="https://donate.torproject.org/monthly-giving"> - &aboutTor.donationBanner3.line2; - </a> - </div> - </div> - <div id="donation-banner-closer">×</div> - </div> - <div class="torcontent-container"> <div id="torbrowser-info"> <div id="torbrowser-version"/> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index d9813e62..971d3023 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -22,7 +22,6 @@ const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion" const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; const k_tb_last_update_check_pref = "extensions.torbutton.lastUpdateCheck"; const k_tb_tor_check_failed_topic = "Torbutton:TorCheckFailed"; -const k_tb_donation_banner_countdown = "extensions.torbutton.donation_banner_countdown3"; var m_tb_prefs = Services.prefs; @@ -218,14 +217,6 @@ function torbutton_init_toolbutton() } } -// Show the donation banner a finite number of times. -function torbutton_donation_banner_countdown() { - let count = m_tb_prefs.getIntPref(k_tb_donation_banner_countdown, 0); - if (count > 0) { - m_tb_prefs.setIntPref(k_tb_donation_banner_countdown, count - 1); - } -} - function torbutton_is_mobile() { return Services.appinfo.OS === "Android"; } @@ -338,10 +329,6 @@ function torbutton_init() { // Add about:tor IPC message listener. window.messageManager.addMessageListener("AboutTor:Loaded", torbutton_abouttor_message_handler); - window.messageManager.addMessageListener("AboutTor:HideDonationBanner", - torbutton_abouttor_message_handler); - - torbutton_donation_banner_countdown(); setupPreferencesForMobile(); @@ -457,10 +444,6 @@ var torbutton_abouttor_message_handler = { aMessage.target.messageManager.sendAsyncMessage("AboutTor:ChromeData", this.getChromeData(true)); break; - case "AboutTor:HideDonationBanner": - torbutton_log(5, "message AboutTor:HideDonationBanner received"); - m_tb_prefs.setIntPref(k_tb_donation_banner_countdown, 0); - break; } }, diff --git a/src/chrome/locale/en-US/aboutTor.dtd b/src/chrome/locale/en-US/aboutTor.dtd index 5757fae4..c4273ad2 100644 --- a/src/chrome/locale/en-US/aboutTor.dtd +++ b/src/chrome/locale/en-US/aboutTor.dtd @@ -30,6 +30,3 @@ <!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> <!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> <!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> - -<!ENTITY aboutTor.donationBanner3.line1 "Automatic monthly donations keep Tor strong."> -<!ENTITY aboutTor.donationBanner3.line2 "Become a Defender of Privacy today."> diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 09f6208d..baa92b42 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -137,12 +137,6 @@ body:not([showmanual]) .showForManual { margin-top: 10vh; } -/* Reducing this on mobile to avoid vertical overflow - * on small screens when showing donation banner */ -body[mobile] #bottom { - margin-top: 3vh; -} - #bottom p { font-size: 10px; text-align: start; @@ -310,83 +304,6 @@ body[mobile] #bottom { border-radius: 50px 50px 0 0; } -/* Donation Banner - * While this banner is present, we need to - * offset the elements normally at the top of - * the window. - */ - -#donation-banner { - display: flex; - align-items: stretch; - background-color: white; - color: var(--abouttor-bg-toron-color); - font-size: 16px; - height: 70px; - justify-content: center; - left: 0px; - right: 0px; - top: 0px; - position: absolute; - transform: translateY(-70px); - transition: transform 200ms; - z-index: 1; - padding-right:38px; -} - -body[mobile] #donation-banner { - font-size: 14px; -} - -body[show-donation-banner="true"] #donation-banner { - transform: translateY(0px); - transition: transform 0ms; -} - -#donation-banner-message { - align-items: center; - display: flex; - justify-content: center; -} - -#donation-banner-message a { - color: var(--abouttor-bg-toron-color); -} - -#donation-banner-icon { - background: url('chrome://torbutton/skin/icon_monthly_donors.png') no-repeat center center; - background-size: contain; - background-position: bottom; - height: 56px; - margin: 14px 16px 0px 16px; - width: 65px; -} - -#donation-banner-closer { - display: flex; - align-items: center; - font-size: 20px; - height: 22px; - justify-content: center; - margin: 4px; - padding: 4px; - position: absolute; - offset-inline-end: 0px; - top: 0px; - width: 22px; - -moz-user-select: none; -} - -#donation-banner-closer:hover { - background-color: gray; - cursor: pointer; -} - -body[show-donation-banner="true"] #onboarding-overlay-button-container, -body[show-donation-banner="true"] .torcontent-container { - margin-top: 72px; -} - /* * Mobile specific css */ diff --git a/src/chrome/skin/icon_monthly_donors.png b/src/chrome/skin/icon_monthly_donors.png deleted file mode 100644 index 9505f471..00000000 Binary files a/src/chrome/skin/icon_monthly_donors.png and /dev/null differ diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 3a2cdcd3..e5d66d55 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -6,7 +6,6 @@ pref("extensions.torbutton.logmethod",1); // 0=stdout, 1=errorconsole, 2=debuglo pref("extensions.torbutton.display_circuit", true); pref("extensions.torbutton(a)torproject.org.description", "chrome://torbutton/locale/torbutton.properties"); pref("extensions.torbutton.updateNeeded", false); -pref("extensions.torbutton.donation_banner_countdown3", 4); // Tor check and proxy prefs pref("extensions.torbutton.test_enabled",true);

1 0

[torbutton/maint-2.1] fixup! Bug 31140 - Do not enable IonMonkey at low security level on AARCH64
by gk＠torproject.org 27 Aug '19

27 Aug '19

commit 5533b49ca22cacebb2900e427413bed4444b1f87 Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Aug 27 12:42:31 2019 +0200 fixup! Bug 31140 - Do not enable IonMonkey at low security level on AARCH64 --- src/modules/security-prefs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/security-prefs.js b/src/modules/security-prefs.js index 94480123..fb465a05 100644 --- a/src/modules/security-prefs.js +++ b/src/modules/security-prefs.js @@ -51,7 +51,7 @@ var write_setting_to_prefs = function (settingIndex) { if (XPCOMABI.split("-")[0] == "aarch64" && prefName == "javascript.options.ion") { setBoolPref(prefName, false); - continue; + return; } setBoolPref( prefName, kSecuritySettings[prefName][settingIndex]);

1 0

[tor-browser/tor-browser-60.8.0esr-8.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 27 Aug '19

27 Aug '19

commit 393eb8915c202736cd22f489724af9fa14dacb2d Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 19 07:38:56 2019 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. Fixes bug 31141. --- browser/app/profile/000-tor-browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index c810c18a84a1..5f961f40deeb 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -366,7 +366,7 @@ pref("font.name.sans-serif.ar", "Arial"); #endif #ifdef XP_WIN -pref("font.system.whitelist", "Arial, Batang, 바탕, Cambria Math, Courier New, Euphemia, Gautami, Georgia, Gulim, 굴림, GulimChe, 굴림체, Iskoola Pota, Kalinga, Kartika, Latha, Lucida Console, MS Gothic, ＭＳゴシック, MS Mincho, ＭＳ明朝, MS PGothic, ＭＳＰゴシック, MS PMincho, ＭＳＰ明朝, MV Boli, Malgun Gothic, Mangal, Meiryo, Meiryo UI, Microsoft Himalaya, Microsoft JhengHei, Microsoft JengHei UI, Microsoft YaHei, 微软雅黑, Microsoft YaHei UI, MingLiU, 細明體, Noto Sans Buginese, Noto Sans Khmer, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Yi, Nyala, PMingLiU, 新細明體, Plantagenet Cherokee, Raavi, Segoe UI, Shruti, SimSun, 宋体, Sylfaen, Tahoma, Times New Roman, Tunga, Verdana, Vrinda, Yu Gothic UI"); +pref("font.system.whitelist", "Arial, Batang, 바탕, Cambria Math, Courier New, Euphemia, Gautami, Georgia, Gulim, 굴림, GulimChe, 굴림체, Iskoola Pota, Kalinga, Kartika, Latha, Lucida Console, MS Gothic, ＭＳゴシック, MS Mincho, ＭＳ明朝, MS PGothic, ＭＳＰゴシック, MS PMincho, ＭＳＰ明朝, MV Boli, Malgun Gothic, Mangal, Meiryo, Meiryo UI, Microsoft Himalaya, Microsoft JhengHei, Microsoft JhengHei UI, Microsoft YaHei, 微软雅黑, Microsoft YaHei UI, MingLiU, 細明體, Noto Sans Buginese, Noto Sans Khmer, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Yi, Nyala, PMingLiU, 新細明體, Plantagenet Cherokee, Raavi, Segoe UI, Shruti, SimSun, 宋体, Sylfaen, Tahoma, Times New Roman, Tunga, Verdana, Vrinda, Yu Gothic UI"); #endif #ifdef XP_LINUX

1 0

[tor-browser-build/maint-8.5] Bump NoScript version to 11.0.3
by gk＠torproject.org 27 Aug '19

27 Aug '19

commit dd665cd95f680d7a8232220abad3cd1c623fbd66 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 27 08:20:00 2019 +0000 Bump NoScript version to 11.0.3 This bump fixes our #26847 and #31287 --- projects/tor-browser/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 667d579..28b2522 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -91,9 +91,9 @@ input_files: enable: '[% c("var/snowflake") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 2f9e10d2512263fbf56cb225c1622576037f01305e09e0e7757e23d13eb3f97d + sha256sum: 2d15f8011640b49525e5005a54486c507c11863f8d73b0742f379b16c2a4b204 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop'

1 0

[tor-browser-build/master] Bump NoScript version to 11.0.3
by gk＠torproject.org 27 Aug '19

27 Aug '19

commit 9c03e532c542eb9f01399d39fb39d9fede00e705 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 27 08:20:00 2019 +0000 Bump NoScript version to 11.0.3 This bump fixes our #26847 and #31287 --- projects/tor-browser/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index cf8fcb3..04e9368 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -76,9 +76,9 @@ input_files: enable: '[% c("var/snowflake") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 2f9e10d2512263fbf56cb225c1622576037f01305e09e0e7757e23d13eb3f97d + sha256sum: 2d15f8011640b49525e5005a54486c507c11863f8d73b0742f379b16c2a4b204 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop'

1 0

[tor-browser-build/maint-8.5] Revert "5af627e10e6ab2da4dd24e8321cd2c933481d4ba"
by gk＠torproject.org 27 Aug '19

27 Aug '19

commit 9e0ba5ce2aaf03fe436d223d591fe08f7db44865 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 27 07:42:37 2019 +0000 Revert "5af627e10e6ab2da4dd24e8321cd2c933481d4ba" This reverts commit 0dfb0a6602c5608721ddf14f8f30c6a4d57537d8. --- projects/tor-android-service/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index 1581cc2..881b143 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_hash: e7ca52e09c9bad0635ad1f2e77a23534f071b53c +git_hash: f81e8f61fd83367aead34ae0ce3b397d2ed6a494 git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1

1 0

[tor-browser-build/maint-8.5] Pick up fix for #31357
by gk＠torproject.org 27 Aug '19

27 Aug '19

commit 0430509e52869e86585df054cce3b3523afe7b9c Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 27 07:43:07 2019 +0000 Pick up fix for #31357 --- projects/tor-android-service/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index 881b143..1581cc2 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_hash: f81e8f61fd83367aead34ae0ce3b397d2ed6a494 +git_hash: e7ca52e09c9bad0635ad1f2e77a23534f071b53c git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1

1 0

[tor-browser-build/maint-8.5] 5af627e10e6ab2da4dd24e8321cd2c933481d4ba
by gk＠torproject.org 27 Aug '19

27 Aug '19

commit 0dfb0a6602c5608721ddf14f8f30c6a4d57537d8 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 27 07:40:14 2019 +0000 5af627e10e6ab2da4dd24e8321cd2c933481d4ba --- projects/tor-android-service/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index 881b143..1581cc2 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_hash: f81e8f61fd83367aead34ae0ce3b397d2ed6a494 +git_hash: e7ca52e09c9bad0635ad1f2e77a23534f071b53c git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1

1 0