- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-87.0b4-10.5-1] Bug 21431: Clean-up system extensions shipped in Firefox
by sysrqb＠torproject.org 11 Mar '21

11 Mar '21

commit ef889fb46ceaeea02a04ffab8047c4964fc89b1c Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue May 23 17:05:29 2017 -0400 Bug 21431: Clean-up system extensions shipped in Firefox Only ship the pdfjs extension. --- browser/components/BrowserGlue.jsm | 6 ++++++ browser/extensions/moz.build | 2 +- browser/installer/package-manifest.in | 1 - browser/locales/Makefile.in | 8 -------- browser/locales/jar.mn | 7 ------- 5 files changed, 7 insertions(+), 17 deletions(-) diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm index 8e72257f27a1..46854a782e5c 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -2149,6 +2149,9 @@ BrowserGlue.prototype = { const ID = "screenshots(a)mozilla.org"; const _checkScreenshotsPref = async () => { let addon = await AddonManager.getAddonByID(ID); + if (!addon) { + return; + } let disabled = Services.prefs.getBoolPref(PREF, false); if (disabled) { await addon.disable({ allowSystemAddons: true }); @@ -2165,6 +2168,9 @@ BrowserGlue.prototype = { const ID = "webcompat-reporter(a)mozilla.org"; Services.prefs.addObserver(PREF, async () => { let addon = await AddonManager.getAddonByID(ID); + if (!addon) { + return; + } let enabled = Services.prefs.getBoolPref(PREF, false); if (enabled && !addon.isActive) { await addon.enable({ allowSystemAddons: true }); diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build index df98fa94f629..8b16ddc4a84a 100644 --- a/browser/extensions/moz.build +++ b/browser/extensions/moz.build @@ -4,7 +4,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DIRS += ["doh-rollout", "formautofill", "screenshots", "webcompat", "report-site-issue"] +DIRS += [] if not CONFIG["TOR_BROWSER_DISABLE_TOR_LAUNCHER"]: DIRS += ["tor-launcher"] diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index b752f985c4c2..27424c5d7fcd 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -275,7 +275,6 @@ @RESPATH@/browser/chrome/icons/default/default64.png @RESPATH@/browser/chrome/icons/default/default128.png #endif -@RESPATH@/browser/features/* ; [DevTools Startup Files] @RESPATH@/browser/chrome/devtools-startup@JAREXT@ diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in index 496379c4306f..0946188813da 100644 --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in @@ -58,10 +58,6 @@ l10n-%: @$(MAKE) -C ../../toolkit/locales l10n-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)' @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* -ifneq (,$(wildcard ../extensions/formautofill/locales)) - @$(MAKE) -C ../extensions/formautofill/locales AB_CD=$* XPI_NAME=locale-$* -endif - @$(MAKE) -C ../extensions/report-site-issue/locales AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -C ../../devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)' @$(MAKE) -C ../../devtools/startup/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)' @$(MAKE) l10n AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR) @@ -75,14 +71,10 @@ chrome-%: @$(MAKE) -C ../../toolkit/locales chrome-$* @$(MAKE) -C ../../services/sync/locales chrome AB_CD=$* @$(MAKE) -C ../../extensions/spellcheck/locales chrome AB_CD=$* -ifneq (,$(wildcard ../extensions/formautofill/locales)) - @$(MAKE) -C ../extensions/formautofill/locales chrome AB_CD=$* -endif @$(MAKE) -C ../../devtools/client/locales chrome AB_CD=$* @$(MAKE) -C ../../devtools/startup/locales chrome AB_CD=$* @$(MAKE) chrome AB_CD=$* @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales chrome AB_CD=$* - @$(MAKE) -C ../extensions/report-site-issue/locales chrome AB_CD=$* package-win32-installer: $(SUBMAKEFILES) $(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen ZIP_IN='$(ZIP_OUT)' installer diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn index 2aecae56bdca..934205ce6e15 100644 --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn @@ -53,10 +53,3 @@ locale/browser/newInstall.dtd (%chrome/browser/newInstall.dtd) locale/browser/brandings.dtd (%chrome/browser/brandings.dtd) locale/browser/fxmonitor.properties (%chrome/browser/fxmonitor.properties) - -#ifdef XPI_NAME -# Bug 1240628, restructure how l10n repacks work with feature addons -# This is hacky, but ensures the chrome.manifest chain is complete -[.] chrome.jar: -% manifest features/chrome.manifest -#endif

1 0

[tor-browser/tor-browser-87.0b4-10.5-1] Bug 19121: reinstate the update.xml hash check
by sysrqb＠torproject.org 11 Mar '21

11 Mar '21

commit f3c340a62dc8c892bb7f9d7dc9c4359929fafd76 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Apr 23 15:22:57 2018 -0400 Bug 19121: reinstate the update.xml hash check Revert most changes from Mozilla Bug 1373267 "Remove hashFunction and hashValue attributes from nsIUpdatePatch and code related to these attributes." Changes to the tests were not reverted; the tests have been changed significantly and we do not run automated updater tests for Tor Browser at this time. Also partial revert of commit f1241db6986e4b54473a1ed870f7584c75d51122. Revert the nsUpdateService.js changes from Mozilla Bug 862173 "don't verify mar file hash when using mar signing to verify the mar file (lessens main thread I/O)." Changes to the tests were not reverted; the tests have been changed significantly and we do not run automated updater tests for Tor Browser at this time. We kept the addition to the AppConstants API in case other JS code references it in the future. --- toolkit/modules/AppConstants.jsm | 7 ++++ toolkit/mozapps/update/UpdateService.jsm | 63 ++++++++++++++++++++++++++++- toolkit/mozapps/update/UpdateTelemetry.jsm | 1 + toolkit/mozapps/update/nsIUpdateService.idl | 11 +++++ 4 files changed, 81 insertions(+), 1 deletion(-) diff --git a/toolkit/modules/AppConstants.jsm b/toolkit/modules/AppConstants.jsm index dc71230b77fb..79fbb9303cf6 100644 --- a/toolkit/modules/AppConstants.jsm +++ b/toolkit/modules/AppConstants.jsm @@ -212,6 +212,13 @@ this.AppConstants = Object.freeze({ false, #endif + MOZ_VERIFY_MAR_SIGNATURE: +#ifdef MOZ_VERIFY_MAR_SIGNATURE + true, +#else + false, +#endif + MOZ_MAINTENANCE_SERVICE: #ifdef MOZ_MAINTENANCE_SERVICE true, diff --git a/toolkit/mozapps/update/UpdateService.jsm b/toolkit/mozapps/update/UpdateService.jsm index e615f7d6fdc0..6298ef2e3fe0 100644 --- a/toolkit/mozapps/update/UpdateService.jsm +++ b/toolkit/mozapps/update/UpdateService.jsm @@ -907,6 +907,20 @@ function LOG(string) { } } +/** + * Convert a string containing binary values to hex. + */ +function binaryToHex(input) { + var result = ""; + for (var i = 0; i < input.length; ++i) { + var hex = input.charCodeAt(i).toString(16); + if (hex.length == 1) + hex = "0" + hex; + result += hex; + } + return result; +} + /** * Gets the specified directory at the specified hierarchy under the * update root directory and creates it if it doesn't exist. @@ -1907,6 +1921,8 @@ function UpdatePatch(patch) { } break; case "finalURL": + case "hashFunction": + case "hashValue": case "state": case "type": case "URL": @@ -1926,6 +1942,8 @@ UpdatePatch.prototype = { // over writing nsIUpdatePatch attributes. _attrNames: [ "errorCode", + "hashFunction", + "hashValue", "finalURL", "selected", "size", @@ -1939,6 +1957,8 @@ UpdatePatch.prototype = { */ serialize: function UpdatePatch_serialize(updates) { var patch = updates.createElementNS(URI_UPDATE_NS, "patch"); + patch.setAttribute("hashFunction", this.hashFunction); + patch.setAttribute("hashValue", this.hashValue); patch.setAttribute("size", this.size); patch.setAttribute("type", this.type); patch.setAttribute("URL", this.URL); @@ -4962,7 +4982,42 @@ Downloader.prototype = { } LOG("Downloader:_verifyDownload downloaded size == expected size."); - return true; + let fileStream = Cc["@mozilla.org/network/file-input-stream;1"]. + createInstance(Ci.nsIFileInputStream); + fileStream.init(destination, FileUtils.MODE_RDONLY, FileUtils.PERMS_FILE, 0); + + let digest; + try { + let hash = Cc["@mozilla.org/security/hash;1"]. + createInstance(Ci.nsICryptoHash); + var hashFunction = Ci.nsICryptoHash[this._patch.hashFunction.toUpperCase()]; + if (hashFunction == undefined) { + throw Cr.NS_ERROR_UNEXPECTED; + } + hash.init(hashFunction); + hash.updateFromStream(fileStream, -1); + // NOTE: For now, we assume that the format of _patch.hashValue is hex + // encoded binary (such as what is typically output by programs like + // sha1sum). In the future, this may change to base64 depending on how + // we choose to compute these hashes. + digest = binaryToHex(hash.finish(false)); + } catch (e) { + LOG("Downloader:_verifyDownload - failed to compute hash of the " + + "downloaded update archive"); + digest = ""; + } + + fileStream.close(); + + if (digest == this._patch.hashValue.toLowerCase()) { + LOG("Downloader:_verifyDownload hashes match."); + return true; + } + + LOG("Downloader:_verifyDownload hashes do not match. "); + AUSTLMY.pingDownloadCode(this.isCompleteUpdate, + AUSTLMY.DWNLD_ERR_VERIFY_NO_HASH_MATCH); + return false; }, /** @@ -5548,6 +5603,9 @@ Downloader.prototype = { " is higher than patch size: " + this._patch.size ); + // It's important that we use a different code than + // NS_ERROR_CORRUPTED_CONTENT so that tests can verify the difference + // between a hash error and a wrong download error. AUSTLMY.pingDownloadCode( this.isCompleteUpdate, AUSTLMY.DWNLD_ERR_PATCH_SIZE_LARGER @@ -5566,6 +5624,9 @@ Downloader.prototype = { " is not equal to expected patch size: " + this._patch.size ); + // It's important that we use a different code than + // NS_ERROR_CORRUPTED_CONTENT so that tests can verify the difference + // between a hash error and a wrong download error. AUSTLMY.pingDownloadCode( this.isCompleteUpdate, AUSTLMY.DWNLD_ERR_PATCH_SIZE_NOT_EQUAL diff --git a/toolkit/mozapps/update/UpdateTelemetry.jsm b/toolkit/mozapps/update/UpdateTelemetry.jsm index dae76e09acd0..df5b8917970e 100644 --- a/toolkit/mozapps/update/UpdateTelemetry.jsm +++ b/toolkit/mozapps/update/UpdateTelemetry.jsm @@ -192,6 +192,7 @@ var AUSTLMY = { DWNLD_ERR_VERIFY_NO_REQUEST: 13, DWNLD_ERR_VERIFY_PATCH_SIZE_NOT_EQUAL: 14, DWNLD_ERR_WRITE_FAILURE: 15, + DWNLD_ERR_VERIFY_NO_HASH_MATCH: 16, // Temporary failure code to see if there are failures without an update phase DWNLD_UNKNOWN_PHASE_ERR_WRITE_FAILURE: 40, diff --git a/toolkit/mozapps/update/nsIUpdateService.idl b/toolkit/mozapps/update/nsIUpdateService.idl index 29d6e6528a90..2bf490336981 100644 --- a/toolkit/mozapps/update/nsIUpdateService.idl +++ b/toolkit/mozapps/update/nsIUpdateService.idl @@ -39,6 +39,17 @@ interface nsIUpdatePatch : nsISupports */ attribute AString finalURL; + /** + * The hash function to use when determining this file's integrity + */ + attribute AString hashFunction; + + /** + * The value of the hash function named above that should be computed if + * this file is not corrupt. + */ + attribute AString hashValue; + /** * The size of this file, in bytes. */

1 0

[tor-browser/tor-browser-87.0b4-10.5-1] Bug 16940: After update, load local change notes.
by sysrqb＠torproject.org 11 Mar '21

11 Mar '21

commit de6af9c8de8311b1b434ef3678eca1bfebddd30c Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Nov 25 11:36:20 2015 -0500 Bug 16940: After update, load local change notes. Add an about:tbupdate page that displays the first section from TorBrowser/Docs/ChangeLog.txt and includes a link to the remote post-update page (typically our blog entry for the release). Always load about:tbupdate in a content process, but implement the code that reads the file system (changelog) in the chrome process for compatibility with future sandboxing efforts. Also fix bug 29440. Now about:tbupdate is styled as a fairly simple changelog page that is designed to be displayed via a link that is on about:tor. --- browser/actors/AboutTBUpdateChild.jsm | 12 +++ browser/actors/AboutTBUpdateParent.jsm | 120 +++++++++++++++++++++ browser/actors/moz.build | 6 ++ .../base/content/abouttbupdate/aboutTBUpdate.css | 74 +++++++++++++ .../base/content/abouttbupdate/aboutTBUpdate.js | 27 +++++ .../base/content/abouttbupdate/aboutTBUpdate.xhtml | 39 +++++++ browser/base/content/browser-siteIdentity.js | 2 +- browser/base/content/browser.js | 4 + browser/base/jar.mn | 5 + browser/components/BrowserContentHandler.jsm | 55 +++++++--- browser/components/BrowserGlue.jsm | 15 +++ browser/components/about/AboutRedirector.cpp | 6 ++ browser/components/about/components.conf | 3 + browser/components/moz.build | 5 +- .../locales/en-US/chrome/browser/aboutTBUpdate.dtd | 8 ++ browser/locales/jar.mn | 3 + toolkit/modules/RemotePageAccessManager.jsm | 5 + 17 files changed, 373 insertions(+), 16 deletions(-) diff --git a/browser/actors/AboutTBUpdateChild.jsm b/browser/actors/AboutTBUpdateChild.jsm new file mode 100644 index 000000000000..4670da19b3db --- /dev/null +++ b/browser/actors/AboutTBUpdateChild.jsm @@ -0,0 +1,12 @@ +// Copyright (c) 2020, The Tor Project, Inc. +// See LICENSE for licensing information. +// +// vim: set sw=2 sts=2 ts=8 et syntax=javascript: + +var EXPORTED_SYMBOLS = ["AboutTBUpdateChild"]; + +const { RemotePageChild } = ChromeUtils.import( + "resource://gre/actors/RemotePageChild.jsm" +); + +class AboutTBUpdateChild extends RemotePageChild {} diff --git a/browser/actors/AboutTBUpdateParent.jsm b/browser/actors/AboutTBUpdateParent.jsm new file mode 100644 index 000000000000..56a10394565a --- /dev/null +++ b/browser/actors/AboutTBUpdateParent.jsm @@ -0,0 +1,120 @@ +// Copyright (c) 2020, The Tor Project, Inc. +// See LICENSE for licensing information. +// +// vim: set sw=2 sts=2 ts=8 et syntax=javascript: + +"use strict"; + +this.EXPORTED_SYMBOLS = ["AboutTBUpdateParent"]; + +const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); +const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); +const { AppConstants } = ChromeUtils.import( + "resource://gre/modules/AppConstants.jsm" +); + +const kRequestUpdateMessageName = "FetchUpdateData"; + +/** + * This code provides services to the about:tbupdate page. Whenever + * about:tbupdate needs to do something chrome-privileged, it sends a + * message that's handled here. It is modeled after Mozilla's about:home + * implementation. + */ +class AboutTBUpdateParent extends JSWindowActorParent { + receiveMessage(aMessage) { + if (aMessage.name == kRequestUpdateMessageName) { + return this.releaseNoteInfo; + } + return undefined; + } + + get moreInfoURL() { + try { + return Services.prefs.getCharPref("torbrowser.post_update.url"); + } catch (e) {} + + // Use the default URL as a fallback. + return Services.urlFormatter.formatURLPref("startup.homepage_override_url"); + } + + // Read the text from the beginning of the changelog file that is located + // at TorBrowser/Docs/ChangeLog.txt and return an object that contains + // the following properties: + // version e.g., Tor Browser 8.5 + // releaseDate e.g., March 31 2019 + // releaseNotes details of changes (lines 2 - end of ChangeLog.txt) + // We attempt to parse the first line of ChangeLog.txt to extract the + // version and releaseDate. If parsing fails, we return the entire first + // line in version and omit releaseDate. + // + // On Mac OS, when building with --enable-tor-browser-data-outside-app-dir + // to support Gatekeeper signing, the ChangeLog.txt file is located in + // TorBrowser.app/Contents/Resources/TorBrowser/Docs/. + get releaseNoteInfo() { + let info = { moreInfoURL: this.moreInfoURL }; + + try { + let f; + if (AppConstants.TOR_BROWSER_DATA_OUTSIDE_APP_DIR) { + // "XREExeF".parent is the directory that contains firefox, i.e., + // Browser/ or, on Mac OS, TorBrowser.app/Contents/MacOS/. + f = Services.dirsvc.get("XREExeF", Ci.nsIFile).parent; + if (AppConstants.platform === "macosx") { + f = f.parent; + f.append("Resources"); + } + f.append("TorBrowser"); + } else { + // "DefProfRt" is .../TorBrowser/Data/Browser + f = Services.dirsvc.get("DefProfRt", Ci.nsIFile); + f = f.parent.parent; // Remove "Data/Browser" + } + + f.append("Docs"); + f.append("ChangeLog.txt"); + + let fs = Cc["@mozilla.org/network/file-input-stream;1"].createInstance( + Ci.nsIFileInputStream + ); + fs.init(f, -1, 0, 0); + let s = NetUtil.readInputStreamToString(fs, fs.available()); + fs.close(); + + // Truncate at the first empty line. + s = s.replace(/[\r\n][\r\n][\s\S]*$/m, ""); + + // Split into first line (version plus releaseDate) and + // remainder (releaseNotes). + // This first match() uses multiline mode with two capture groups: + // first line: (.*$) + // remaining lines: ([\s\S]+) + // [\s\S] matches all characters including end of line. This trick + // is needed because when using JavaScript regex in multiline mode, + // . does not match an end of line character. + let matchArray = s.match(/(.*$)\s*([\s\S]+)/m); + if (matchArray && matchArray.length == 3) { + info.releaseNotes = matchArray[2]; + let line1 = matchArray[1]; + // Extract the version and releaseDate. The first line looks like: + // Tor Browser 8.5 -- May 1 2019 + // The regex uses two capture groups: + // text that does not include a hyphen: (^[^-]*) + // remaining text: (.*$) + // In between we match optional whitespace, one or more hyphens, and + // optional whitespace by using: \s*-+\s* + matchArray = line1.match(/(^[^-]*)\s*-+\s*(.*$)/); + if (matchArray && matchArray.length == 3) { + info.version = matchArray[1]; + info.releaseDate = matchArray[2]; + } else { + info.version = line1; // Match failed: return entire line in version. + } + } else { + info.releaseNotes = s; // Only one line: use as releaseNotes. + } + } catch (e) {} + + return info; + } +} diff --git a/browser/actors/moz.build b/browser/actors/moz.build index 5118f85caf54..f731ee9b851b 100644 --- a/browser/actors/moz.build +++ b/browser/actors/moz.build @@ -89,3 +89,9 @@ FINAL_TARGET_FILES.actors += [ "WebRTCChild.jsm", "WebRTCParent.jsm", ] + +if CONFIG["TOR_BROWSER_UPDATE"]: + FINAL_TARGET_FILES.actors += [ + "AboutTBUpdateChild.jsm", + "AboutTBUpdateParent.jsm", + ] diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.css b/browser/base/content/abouttbupdate/aboutTBUpdate.css new file mode 100644 index 000000000000..7c1a34b77f17 --- /dev/null +++ b/browser/base/content/abouttbupdate/aboutTBUpdate.css @@ -0,0 +1,74 @@ +/* + * Copyright (c) 2019, The Tor Project, Inc. + * See LICENSE for licensing information. + * + * vim: set sw=2 sts=2 ts=8 et syntax=css: + */ + +:root { + --abouttor-text-color: white; + --abouttor-bg-toron-color: #420C5D; +} + +body { + font-family: Helvetica, Arial, sans-serif; + color: var(--abouttor-text-color); + background-color: var(--abouttor-bg-toron-color); + background-attachment: fixed; + background-size: 100% 100%; +} + +a { + color: var(--abouttor-text-color); +} + +.two-column-grid { + display: inline-grid; + grid-template-columns: auto auto; + grid-column-gap: 50px; + margin: 10px 0px 0px 50px; +} + +.two-column-grid div { + margin-top: 40px; + align-self: baseline; /* Align baseline of text across the row. */ +} + +.label-column { + font-size: 14px; + font-weight: 400; +} + +/* + * Use a reduced top margin to bring the row that contains the + * "visit our website" link closer to the row that precedes it. This + * looks better because the "visit our website" row does not have a + * label in the left column. + */ +div.more-info-row { + margin-top: 5px; + font-size: 14px; +} + +#version-content { + font-size: 50px; + font-weight: 300; +} + +body:not([havereleasedate]) .release-date-cell { + display: none; +} + +#releasedate-content { + font-size: 17px; +} + +#releasenotes-label { + align-self: start; /* Anchor "Release Notes" label at the top. */ +} + +#releasenotes-content { + font-family: monospace; + font-size: 15px; + white-space: pre; +} diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.js b/browser/base/content/abouttbupdate/aboutTBUpdate.js new file mode 100644 index 000000000000..ec070e2cb131 --- /dev/null +++ b/browser/base/content/abouttbupdate/aboutTBUpdate.js @@ -0,0 +1,27 @@ +// Copyright (c) 2020, The Tor Project, Inc. +// See LICENSE for licensing information. +// +// vim: set sw=2 sts=2 ts=8 et syntax=javascript: + +/* eslint-env mozilla/frame-script */ + +// aData may contain the following string properties: +// version +// releaseDate +// moreInfoURL +// releaseNotes +function onUpdate(aData) { + document.getElementById("version-content").textContent = aData.version; + if (aData.releaseDate) { + document.body.setAttribute("havereleasedate", "true"); + document.getElementById("releasedate-content").textContent = + aData.releaseDate; + } + if (aData.moreInfoURL) { + document.getElementById("infolink").setAttribute("href", aData.moreInfoURL); + } + document.getElementById("releasenotes-content").textContent = + aData.releaseNotes; +} + +RPMSendQuery("FetchUpdateData").then(onUpdate); diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml b/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml new file mode 100644 index 000000000000..8489cfef5083 --- /dev/null +++ b/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE html [ + <!ENTITY % htmlDTD + PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "DTD/xhtml1-strict.dtd"> + %htmlDTD; + <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd"> + %globalDTD; + <!ENTITY % tbUpdateDTD SYSTEM "chrome://browser/locale/aboutTBUpdate.dtd"> + %tbUpdateDTD; +]> + +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> + <meta http-equiv="Content-Security-Policy" content="default-src chrome:; object-src 'none'" /> + <title>&aboutTBUpdate.changelogTitle;</title> + <link rel="stylesheet" type="text/css" + href="chrome://browser/content/abouttbupdate/aboutTBUpdate.css"/> + <script src="chrome://browser/content/abouttbupdate/aboutTBUpdate.js" + type="text/javascript"/> +</head> +<body dir="&locale.dir;"> +<div class="two-column-grid"> + <div class="label-column">&aboutTBUpdate.version;</div> + <div id="version-content"/> + + <div class="label-column release-date-cell">&aboutTBUpdate.releaseDate;</div> + <div id="releasedate-content" class="release-date-cell"/> + + <div class="more-info-row"/> + <div class="more-info-row">&aboutTBUpdate.linkPrefix;<a id="infolink">&aboutTBUpdate.linkLabel;</a>&aboutTBUpdate.linkSuffix;</div> + + <div id="releasenotes-label" + class="label-column">&aboutTBUpdate.releaseNotes;</div> + <div id="releasenotes-content"></div> +</div> +</body> +</html> diff --git a/browser/base/content/browser-siteIdentity.js b/browser/base/content/browser-siteIdentity.js index 01d47f0907e6..384466fc52b3 100644 --- a/browser/base/content/browser-siteIdentity.js +++ b/browser/base/content/browser-siteIdentity.js @@ -57,7 +57,7 @@ var gIdentityHandler = { * RegExp used to decide if an about url should be shown as being part of * the browser UI. */ - _secureInternalPages: /^(?:accounts|addons|cache|certificate|config|crashes|downloads|license|logins|preferences|protections|rights|sessionrestore|support|welcomeback|ion)(?:[?#]|$)/i, + _secureInternalPages: (AppConstants.TOR_BROWSER_UPDATE ? /^(?:accounts|addons|cache|certificate|config|crashes|downloads|license|logins|preferences|protections|rights|sessionrestore|support|welcomeback|ion|tor|tbupdate)(?:[?#]|$)/i : /^(?:accounts|addons|cache|certificate|config|crashes|downloads|license|logins|preferences|protections|rights|sessionrestore|support|welcomeback|ion|tor)(?:[?#]|$)/i), /** * Whether the established HTTPS connection is considered "broken". diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 7e030dc329ee..eee078ae5a7b 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -677,6 +677,10 @@ var gInitialPages = [ "about:newinstall", ]; +if (AppConstants.TOR_BROWSER_UPDATE) { + gInitialPages.push("about:tbupdate"); +} + function isInitialPage(url) { if (!(url instanceof Ci.nsIURI)) { try { diff --git a/browser/base/jar.mn b/browser/base/jar.mn index 8d482e8b6417..61dd651c23ea 100644 --- a/browser/base/jar.mn +++ b/browser/base/jar.mn @@ -31,6 +31,11 @@ browser.jar: content/browser/aboutTabCrashed.css (content/aboutTabCrashed.css) content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js) content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) +#ifdef TOR_BROWSER_UPDATE + content/browser/abouttbupdate/aboutTBUpdate.xhtml (content/abouttbupdate/aboutTBUpdate.xhtml) + content/browser/abouttbupdate/aboutTBUpdate.js (content/abouttbupdate/aboutTBUpdate.js) + content/browser/abouttbupdate/aboutTBUpdate.css (content/abouttbupdate/aboutTBUpdate.css) +#endif * content/browser/browser.css (content/browser.css) content/browser/browser.js (content/browser.js) * content/browser/browser.xhtml (content/browser.xhtml) diff --git a/browser/components/BrowserContentHandler.jsm b/browser/components/BrowserContentHandler.jsm index 0a37ca088ca0..ab63c16087f0 100644 --- a/browser/components/BrowserContentHandler.jsm +++ b/browser/components/BrowserContentHandler.jsm @@ -652,6 +652,23 @@ nsBrowserContentHandler.prototype = { } } + // Retrieve the home page early so we can compare it against about:tor + // to decide whether or not we need an override page (second tab) after + // an update was applied. + var startPage = ""; + try { + var choice = prefb.getIntPref("browser.startup.page"); + if (choice == 1 || choice == 3) { + startPage = HomePage.get(); + } + } catch (e) { + Cu.reportError(e); + } + + if (startPage == "about:blank") { + startPage = ""; + } + var override; var overridePage = ""; var additionalPage = ""; @@ -703,6 +720,16 @@ nsBrowserContentHandler.prototype = { // into account because that requires waiting for the session file // to be read. If a crash occurs after updating, before restarting, // we may open the startPage in addition to restoring the session. + // + // Tor Browser: Instead of opening the post-update "override page" + // directly, we ensure that about:tor will be opened in a special + // mode that notifies the user that their browser was updated. + // The about:tor page will provide a link to the override page + // where the user can learn more about the update, as well as a + // link to the Tor Browser changelog page (about:tbupdate). The + // override page URL comes from the openURL attribute within the + // updates.xml file or, if no showURL action is present, from the + // startup.homepage_override_url pref. willRestoreSession = SessionStartup.isAutomaticRestoreEnabled(); overridePage = Services.urlFormatter.formatURLPref( @@ -722,6 +749,20 @@ nsBrowserContentHandler.prototype = { overridePage = overridePage.replace("%OLD_VERSION%", old_mstone); overridePage = overridePage.replace("%OLD_TOR_BROWSER_VERSION%", old_tbversion); +#ifdef TOR_BROWSER_UPDATE + if (overridePage) + { + prefb.setCharPref("torbrowser.post_update.url", overridePage); + prefb.setBoolPref("torbrowser.post_update.shouldNotify", true); + // If the user's homepage is about:tor, we will inform them + // about the update on that page; otherwise, we arrange to + // open about:tor in a secondary tab. + if (startPage === "about:tor") + overridePage = ""; + else + overridePage = "about:tor"; + } +#endif break; case OVERRIDE_NEW_BUILD_ID: if (UpdateManager.readyUpdate) { @@ -794,20 +835,6 @@ nsBrowserContentHandler.prototype = { } } - var startPage = ""; - try { - var choice = prefb.getIntPref("browser.startup.page"); - if (choice == 1 || choice == 3) { - startPage = HomePage.get(); - } - } catch (e) { - Cu.reportError(e); - } - - if (startPage == "about:blank") { - startPage = ""; - } - let skipStartPage = (override == OVERRIDE_NEW_PROFILE || override == OVERRIDE_ALTERNATE_PROFILE) && diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm index 204ff9da5720..8e72257f27a1 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -749,6 +749,21 @@ let JSWINDOWACTORS = { }, }; +if (AppConstants.TOR_BROWSER_UPDATE) { + JSWINDOWACTORS["AboutTBUpdate"] = { + parent: { + moduleURI: "resource:///actors/AboutTBUpdateParent.jsm", + }, + child: { + moduleURI: "resource:///actors/AboutTBUpdateChild.jsm", + events: { + DOMWindowCreated: { capture: true }, + }, + }, + matches: ["about:tbupdate"], + }; +} + (function earlyBlankFirstPaint() { let startTime = Cu.now(); if ( diff --git a/browser/components/about/AboutRedirector.cpp b/browser/components/about/AboutRedirector.cpp index e3ff9023ca9f..85bd42d67263 100644 --- a/browser/components/about/AboutRedirector.cpp +++ b/browser/components/about/AboutRedirector.cpp @@ -128,6 +128,12 @@ static const RedirEntry kRedirMap[] = { nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS}, {"ion", "chrome://browser/content/ion.html", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT}, +#ifdef TOR_BROWSER_UPDATE + {"tbupdate", "chrome://browser/content/abouttbupdate/aboutTBUpdate.xhtml", + nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | + nsIAboutModule::URI_MUST_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT | + nsIAboutModule::HIDE_FROM_ABOUTABOUT}, +#endif }; static nsAutoCString GetAboutModuleName(nsIURI* aURI) { diff --git a/browser/components/about/components.conf b/browser/components/about/components.conf index 274eee9c384e..b6d013df3fbc 100644 --- a/browser/components/about/components.conf +++ b/browser/components/about/components.conf @@ -32,6 +32,9 @@ pages = [ 'welcomeback', ] +if defined('TOR_BROWSER_UPDATE'): + pages.append('tbupdate') + Classes = [ { 'cid': '{7e4bb6ad-2fc4-4dc6-89ef-23e8e5ccf980}', diff --git a/browser/components/moz.build b/browser/components/moz.build index d16b27b1eaa3..1e977cfe5499 100644 --- a/browser/components/moz.build +++ b/browser/components/moz.build @@ -87,11 +87,14 @@ EXTRA_COMPONENTS += [ ] EXTRA_JS_MODULES += [ - "BrowserContentHandler.jsm", "BrowserGlue.jsm", "distribution.js", ] +EXTRA_PP_JS_MODULES += [ + "BrowserContentHandler.jsm", +] + BROWSER_CHROME_MANIFESTS += [ "safebrowsing/content/test/browser.ini", "tests/browser/browser.ini", diff --git a/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd b/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd new file mode 100644 index 000000000000..2d1e59b40eaf --- /dev/null +++ b/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd @@ -0,0 +1,8 @@ +<!ENTITY aboutTBUpdate.changelogTitle "Tor Browser Changelog"> +<!ENTITY aboutTBUpdate.updated "Tor Browser has been updated."> +<!ENTITY aboutTBUpdate.linkPrefix "For the most up-to-date information about this release, "> +<!ENTITY aboutTBUpdate.linkLabel "visit our website"> +<!ENTITY aboutTBUpdate.linkSuffix "."> +<!ENTITY aboutTBUpdate.version "Version"> +<!ENTITY aboutTBUpdate.releaseDate "Release Date"> +<!ENTITY aboutTBUpdate.releaseNotes "Release Notes"> diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn index 6000f3b48c01..2aecae56bdca 100644 --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn @@ -20,6 +20,9 @@ locale/browser/accounts.properties (%chrome/browser/accounts.properties) locale/browser/app-extension-fields.properties (%chrome/browser/app-extension-fields.properties) +#ifdef TOR_BROWSER_UPDATE + locale/browser/aboutTBUpdate.dtd (%chrome/browser/aboutTBUpdate.dtd) +#endif locale/browser/browser.dtd (%chrome/browser/browser.dtd) locale/browser/browser.properties (%chrome/browser/browser.properties) locale/browser/customizableui/customizableWidgets.properties (%chrome/browser/customizableui/customizableWidgets.properties) diff --git a/toolkit/modules/RemotePageAccessManager.jsm b/toolkit/modules/RemotePageAccessManager.jsm index e8086792e4d1..f93232aded4a 100644 --- a/toolkit/modules/RemotePageAccessManager.jsm +++ b/toolkit/modules/RemotePageAccessManager.jsm @@ -202,6 +202,11 @@ let RemotePageAccessManager = { RPMAddMessageListener: ["*"], RPMRemoveMessageListener: ["*"], }, + "about:tbupdate": { + RPMSendQuery: [ + "FetchUpdateData", + ], + }, }, /**

1 0

[tor-browser-spec/master] Update gecko-dev commit hash for FF86, too.
by sysrqb＠torproject.org 08 Mar '21

08 Mar '21

commit f98962badc0e278c9b4b4afb1809d19dcf0bd075 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Mar 8 15:41:47 2021 +0000 Update gecko-dev commit hash for FF86, too. --- audits/FF86_NETWORK_AUDIT | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audits/FF86_NETWORK_AUDIT b/audits/FF86_NETWORK_AUDIT index 0e86e89..663c65b 100644 --- a/audits/FF86_NETWORK_AUDIT +++ b/audits/FF86_NETWORK_AUDIT @@ -1,4 +1,4 @@ -`git diff 5a2e34d5821fa203454eb9a8b12d7749a7c50d00 cb5d7889e9b8fb61fe5fe6c87f6b58e261be0ddb` +`git diff 5a2e34d5821fa203454eb9a8b12d7749a7c50d00 fe9560804bef331ff346f3fd3b05e74122fdd30b` and then go over all the changes containing the below mentioned potentially dangerous calls and features. Grep the diff for the following strings and examine surrounding usage.

1 0

[tor-browser-spec/master] Update FF86 audit
by sysrqb＠torproject.org 08 Mar '21

08 Mar '21

commit 54c7064a7de462d15a9397264c46cee5cf490d18 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Mar 8 15:36:43 2021 +0000 Update FF86 audit --- audits/FF86_NETWORK_AUDIT | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/audits/FF86_NETWORK_AUDIT b/audits/FF86_NETWORK_AUDIT index 74d76b0..0e86e89 100644 --- a/audits/FF86_NETWORK_AUDIT +++ b/audits/FF86_NETWORK_AUDIT @@ -116,7 +116,7 @@ End: 4cc798c8cd8a1e38ce88e0bb22a05692be63b164 # v67.2.0 ============ Android Components Portion ============= Start: 21ce9abdda0bc4001a72835fbbe7d71026ac0e66 # v70.0.16 -End: 4f36d0f93dab50e946a0dede0732c901c9942851 # v72.0.5 +End: 095c0ef007ada4dab8561bef69e43bf6db1d3298 # v72.0.15 # FF86 (using `java_audit.sh`) # Issue 8598: @@ -128,7 +128,7 @@ End: 4f36d0f93dab50e946a0dede0732c901c9942851 # v72.0.5 ============ Fenix Portion ============= Start: 24995d51a12d8e0bb10166f9f286c68d23b84a6a # v85.1.0 -End: 159c13ba04cdd8e4cd888b637d65e11e95241696 # v86.0.0-beta.2 +End: db196d0e49eb0f69ab620856491deb8c4c7ccf57 # v86.1.0 # FF86: Nothing new (using `java_audit.sh`)

1 0

[tor-browser-build/master] Bug 40247: Remove projects/firefox/mozconfig-android-* files
by gk＠torproject.org 05 Mar '21

05 Mar '21

commit 1859ae466eb8e0d6b522be042c6d159c1f585b06 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Mar 5 14:23:45 2021 +0100 Bug 40247: Remove projects/firefox/mozconfig-android-* files projects/firefox is no longer used in Android builds (projects/geckoview is now used instead), so those mozconfig-android-* files are not needed anymore. --- projects/firefox/mozconfig-android-aarch64 | 50 ----------------------------- projects/firefox/mozconfig-android-armv7 | 50 ----------------------------- projects/firefox/mozconfig-android-x86 | 50 ----------------------------- projects/firefox/mozconfig-android-x86_64 | 51 ------------------------------ 4 files changed, 201 deletions(-) diff --git a/projects/firefox/mozconfig-android-aarch64 b/projects/firefox/mozconfig-android-aarch64 deleted file mode 100644 index fd86f23..0000000 --- a/projects/firefox/mozconfig-android-aarch64 +++ /dev/null @@ -1,50 +0,0 @@ -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-aarch64-linux-android -mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -export MOZILLA_OFFICIAL=1 -CC="clang" -CXX="clang++" - -ac_add_options --with-android-min-sdk=21 - -ac_add_options --enable-optimize -ac_add_options --enable-official-branding - -ac_add_options --enable-application=mobile/android -ac_add_options --target=aarch64-linux-android -ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk -ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux -ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-4.10.2/bin/gradle - -ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser -ac_add_options --with-l10n-base=/var/tmp/dist/locales - -# We do not use Tor Launcher on Android: -ac_add_options --disable-tor-launcher - -if [ -z "${TB_BUILD_WITH_UPDATER}" ]; then -# Because Google Play will likely be the primary distribution medium, -# we disable updating and rely on Google Play by default. The -# Developer Policy explicitly prohibits in-app updating: -# An app distributed via Google Play may not modify, replace, or -# update itself using any method other than Google Plays update -# mechanism. -# https://play.google.com/about/privacy-security-deception/malicious-behavior/ - - ac_add_options --disable-tor-browser-update - ac_add_options --disable-signmar - ac_add_options --disable-verify-mar -fi - -ac_add_options --enable-strip -ac_add_options --disable-tests -ac_add_options --disable-debug -ac_add_options --disable-rust-debug -ac_add_options --disable-crashreporter -ac_add_options --disable-webrtc -ac_add_options --disable-parental-controls - -ac_add_options --without-google-play-services -ac_add_options --enable-proxy-bypass-protection - -# Disable telemetry -ac_add_options MOZ_TELEMETRY_REPORTING= \ No newline at end of file diff --git a/projects/firefox/mozconfig-android-armv7 b/projects/firefox/mozconfig-android-armv7 deleted file mode 100644 index 9ee3bfe..0000000 --- a/projects/firefox/mozconfig-android-armv7 +++ /dev/null @@ -1,50 +0,0 @@ -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-arm-linux-androideabi -mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -export MOZILLA_OFFICIAL=1 -CC="clang" -CXX="clang++" - -ac_add_options --with-android-min-sdk=16 - -ac_add_options --enable-optimize -ac_add_options --enable-official-branding - -ac_add_options --enable-application=mobile/android -ac_add_options --target=arm-linux-androideabi -ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk -ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux -ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-4.10.2/bin/gradle - -ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser -ac_add_options --with-l10n-base=/var/tmp/dist/locales - -# We do not use Tor Launcher on Android: -ac_add_options --disable-tor-launcher - -if [ -z "${TB_BUILD_WITH_UPDATER}" ]; then -# Because Google Play will likely be the primary distribution medium, -# we disable updating and rely on Google Play by default. The -# Developer Policy explicitly prohibits in-app updating: -# An app distributed via Google Play may not modify, replace, or -# update itself using any method other than Google Plays update -# mechanism. -# https://play.google.com/about/privacy-security-deception/malicious-behavior/ - - ac_add_options --disable-tor-browser-update - ac_add_options --disable-signmar - ac_add_options --disable-verify-mar -fi - -ac_add_options --enable-strip -ac_add_options --disable-tests -ac_add_options --disable-debug -ac_add_options --disable-rust-debug -ac_add_options --disable-crashreporter -ac_add_options --disable-webrtc -ac_add_options --disable-parental-controls - -ac_add_options --without-google-play-services -ac_add_options --enable-proxy-bypass-protection - -# Disable telemetry -ac_add_options MOZ_TELEMETRY_REPORTING= \ No newline at end of file diff --git a/projects/firefox/mozconfig-android-x86 b/projects/firefox/mozconfig-android-x86 deleted file mode 100644 index f7e1ffa..0000000 --- a/projects/firefox/mozconfig-android-x86 +++ /dev/null @@ -1,50 +0,0 @@ -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-i386-linux-android -mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -export MOZILLA_OFFICIAL=1 -CC="clang" -CXX="clang++" - -ac_add_options --with-android-min-sdk=16 - -ac_add_options --enable-optimize -ac_add_options --enable-official-branding - -ac_add_options --enable-application=mobile/android -ac_add_options --target=i686-linux-android -ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk -ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux -ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-4.10.2/bin/gradle - -ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser -ac_add_options --with-l10n-base=/var/tmp/dist/locales - -# We do not use Tor Launcher on Android: -ac_add_options --disable-tor-launcher - -if [ -z "${TB_BUILD_WITH_UPDATER}" ]; then -# Because Google Play will likely be the primary distribution medium, -# we disable updating and rely on Google Play by default. The -# Developer Policy explicitly prohibits in-app updating: -# An app distributed via Google Play may not modify, replace, or -# update itself using any method other than Google Plays update -# mechanism. -# https://play.google.com/about/privacy-security-deception/malicious-behavior/ - - ac_add_options --disable-tor-browser-update - ac_add_options --disable-signmar - ac_add_options --disable-verify-mar -fi - -ac_add_options --enable-strip -ac_add_options --disable-tests -ac_add_options --disable-debug -ac_add_options --disable-rust-debug -ac_add_options --disable-crashreporter -ac_add_options --disable-webrtc -ac_add_options --disable-parental-controls - -ac_add_options --without-google-play-services -ac_add_options --enable-proxy-bypass-protection - -# Disable telemetry -ac_add_options MOZ_TELEMETRY_REPORTING= \ No newline at end of file diff --git a/projects/firefox/mozconfig-android-x86_64 b/projects/firefox/mozconfig-android-x86_64 deleted file mode 100644 index 3c78993..0000000 --- a/projects/firefox/mozconfig-android-x86_64 +++ /dev/null @@ -1,51 +0,0 @@ -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-x86_64-linux-android -mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -export MOZILLA_OFFICIAL=1 -CC="clang" -CXX="clang++" - -ac_add_options --with-android-min-sdk=21 - -ac_add_options --enable-optimize -ac_add_options --enable-official-branding - -ac_add_options --enable-application=mobile/android -ac_add_options --target=x86_64-linux-android -ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk -ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux -ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-4.10.2/bin/gradle - -ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser -ac_add_options --with-l10n-base=/var/tmp/dist/locales - -# We do not use Tor Launcher on Android: -ac_add_options --disable-tor-launcher - -if [ -z "${TB_BUILD_WITH_UPDATER}" ]; then -# Because Google Play will likely be the primary distribution medium, -# we disable updating and rely on Google Play by default. The -# Developer Policy explicitly prohibits in-app updating: -# An app distributed via Google Play may not modify, replace, or -# update itself using any method other than Google Plays update -# mechanism. -# https://play.google.com/about/privacy-security-deception/malicious-behavior/ - - ac_add_options --disable-tor-browser-update - ac_add_options --disable-signmar - ac_add_options --disable-verify-mar -fi - -ac_add_options --enable-strip -ac_add_options --disable-tests -ac_add_options --disable-debug -ac_add_options --disable-rust-debug -ac_add_options --disable-crashreporter -ac_add_options --disable-webrtc -ac_add_options --disable-parental-controls - -ac_add_options --without-google-play-services - -ac_add_options --enable-proxy-bypass-protection - -# Disable telemetry -ac_add_options MOZ_TELEMETRY_REPORTING= \ No newline at end of file

1 0

[tor-browser-build/master] Update rbm for rbm#40015
by boklm＠torproject.org 03 Mar '21

03 Mar '21

commit 8a80284d05e987942a9ec4c73aafded162368166 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Mar 3 18:12:27 2021 +0100 Update rbm for rbm#40015 --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index cfb4018..8f5e0cd 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit cfb4018d34400e43837e77754519b3c2761b7ae6 +Subproject commit 8f5e0cd0f4a4467777c6a80cf0a92cec60d4c6c4

1 0

[rbm/master] Bug 40015: Fix copying of /etc/resolv.conf when it is a symlink
by boklm＠torproject.org 03 Mar '21

03 Mar '21

commit 8f5e0cd0f4a4467777c6a80cf0a92cec60d4c6c4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 2 16:12:58 2021 +0100 Bug 40015: Fix copying of /etc/resolv.conf when it is a symlink --- container | 2 ++ 1 file changed, 2 insertions(+) diff --git a/container b/container index 3f07f24..74e74bb 100755 --- a/container +++ b/container @@ -92,6 +92,8 @@ sub run_chroot { my ($rootfsdir, $cmd) = @_; create_devfiles($rootfsdir); do_mounts($rootfsdir); + # On some systems resolv.conf is a symlink (see #40015) + local $File::Copy::Recursive::CopyLink = 0; fcopy('/etc/resolv.conf', "$rootfsdir/etc/resolv.conf"); local %ENV = (); system('hostname', 'rbm');

1 0

[tor-browser-build/maint-10.0-desktop] Tag the component in the ChangeLog
by sysrqb＠torproject.org 03 Mar '21

03 Mar '21

commit ecc4657a4b03875338f42ba9de2ca198843383d4 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Mar 3 16:27:40 2021 +0000 Tag the component in the ChangeLog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index d35865a..426c0c3 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,6 +1,6 @@ Tor Browser 10.0.13 -- March 3 2021 * Linux - * Bug 40328: Fix instability after upgrading to glibc 2.33 + * Bug 40328: Fix instability after upgrading to glibc 2.33 [tor-browser] Tor Browser 10.0.12 -- February 23 2021 * Windows + OS X + Linux

1 0

[tor-browser-build/maint-10.0-desktop] Release preparation for 10.0.13
by sysrqb＠torproject.org 02 Mar '21

02 Mar '21

commit b33b276e2dc98df1aacdd6d432628eb785b6e080 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Mar 2 15:38:13 2021 +0000 Release preparation for 10.0.13 Versions bump and Changelog update --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++++ rbm.conf | 7 +++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index a7e705b..035ccca 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index b763127..d35865a 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,7 @@ +Tor Browser 10.0.13 -- March 3 2021 + * Linux + * Bug 40328: Fix instability after upgrading to glibc 2.33 + Tor Browser 10.0.12 -- February 23 2021 * Windows + OS X + Linux * Update Firefox to 78.8.0esr diff --git a/rbm.conf b/rbm.conf index 7fb27df..ba4baa0 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,11 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '10.0.12' - torbrowser_build: 'build3' + torbrowser_version: '10.0.13' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 10.0.10 - - 10.0.11 + - 10.0.12 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0