March 2019 - tbb-commits - lists.torproject.org

[tor-browser/tor-browser-60.5.1esr-8.5-1] Revert "Bug 26962 - implement new features onboarding (part 2)."
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit 681eefdd4234007f4984dd88abc2dfe10cbc2740 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Mar 6 16:04:42 2019 -0500 Revert "Bug 26962 - implement new features onboarding (part 2)." This reverts commit 73018a0de3eab8cf12f0b9554a7595b35ceaeb53. --- .../base/content/abouttbupdate/aboutTBUpdate.css | 25 ---------------------- .../base/content/abouttbupdate/aboutTBUpdate.js | 9 +------- .../base/content/abouttbupdate/aboutTBUpdate.xhtml | 5 ----- browser/base/content/tab-content.js | 10 --------- .../locales/en-US/chrome/browser/aboutTBUpdate.dtd | 4 ---- 5 files changed, 1 insertion(+), 52 deletions(-) diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.css b/browser/base/content/abouttbupdate/aboutTBUpdate.css index dc42f8ff5f9e..90252d77a739 100644 --- a/browser/base/content/abouttbupdate/aboutTBUpdate.css +++ b/browser/base/content/abouttbupdate/aboutTBUpdate.css @@ -53,31 +53,6 @@ a { margin-bottom: 20px; } -#new-features { - margin-bottom: 15px; - padding: 10px; - text-align: center; - /* swap text and background colors in this section */ - color: var(--abouttor-bg-toron-color); - background-color: var(--abouttor-text-color); -} - -#new-features-description { - margin: 15px auto; - max-width: 500px; - font-size: 85%; -} - -#new-features button { - padding: 8px 20px; - border: none; - border-radius: 3px; - font-size: 90%; - color: var(--abouttor-text-color); - background-color: var(--abouttor-bg-toron-color); - cursor: pointer; -} - #changelog-container { margin: 0px 20px 20px 20px; } diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.js b/browser/base/content/abouttbupdate/aboutTBUpdate.js index fa8bd3241a28..8243647c5708 100644 --- a/browser/base/content/abouttbupdate/aboutTBUpdate.js +++ b/browser/base/content/abouttbupdate/aboutTBUpdate.js @@ -1,4 +1,4 @@ -// Copyright (c) 2018, The Tor Project, Inc. +// Copyright (c) 2015, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -8,10 +8,3 @@ function init() let event = new CustomEvent("AboutTBUpdateLoad", { bubbles: true }); document.dispatchEvent(event); } - -function showNewFeaturesOnboarding() -{ - let event = new CustomEvent("AboutTBUpdateNewFeaturesOnboarding", - { bubbles: true }); - document.dispatchEvent(event); -} diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml b/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml index a046f2658a5a..fe8ed69b537f 100644 --- a/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml +++ b/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml @@ -28,11 +28,6 @@ </div> </div> <br clear="all"/> -<div id="new-features"> - <div>&aboutTBUpdate.circuitDisplayHeading;</div> - <div id="new-features-description">&aboutTBUpdate.circuitDisplayDescription;</div> - <button onclick="showNewFeaturesOnboarding()">&aboutTBUpdate.learnMore;</button> -</div> <div id="changelog-container"> <div id="changelog-heading">&aboutTBUpdate.changeLogHeading;</div> <div id="changelog"></div> diff --git a/browser/base/content/tab-content.js b/browser/base/content/tab-content.js index c0987dbc05c7..e0cf6747aaa4 100644 --- a/browser/base/content/tab-content.js +++ b/browser/base/content/tab-content.js @@ -359,8 +359,6 @@ AboutReaderListener.init(); let AboutTBUpdateListener = { init: function(chromeGlobal) { chromeGlobal.addEventListener('AboutTBUpdateLoad', this, false, true); - chromeGlobal.addEventListener("AboutTBUpdateNewFeaturesOnboarding", - this, false, true); }, get isAboutTBUpdate() { @@ -375,9 +373,6 @@ let AboutTBUpdateListener = { case "AboutTBUpdateLoad": this.onPageLoad(); break; - case "AboutTBUpdateNewFeaturesOnboarding": - this.onNewFeaturesOnboarding(); - break; case "pagehide": this.onPageHide(aEvent); break; @@ -411,11 +406,6 @@ let AboutTBUpdateListener = { removeEventListener("pagehide", this, true); }, - onNewFeaturesOnboarding: function() { - // Tell the onboarding extension to open the circuit display onboarding. - sendAsyncMessage("Onboarding:OnContentMessage", - {action: "tor-open-circuit-display-page"}); - }, }; AboutTBUpdateListener.init(this); #endif diff --git a/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd b/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd index f7b3f2ed8fcd..37567bd7e38c 100644 --- a/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd +++ b/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd @@ -4,7 +4,3 @@ <!ENTITY aboutTBUpdate.linkLabel "visit our website"> <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "Changelog:"> - -<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display"> -<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display."> -<!ENTITY aboutTBUpdate.learnMore "Learn More">

1 0

[tor-browser/tor-browser-60.5.1esr-8.5-1] squash! Bug 16940: After update, load local change notes.
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit 0c7bd3b2fa73e8be38f5aac46cbc68d025071f05 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Mar 7 15:48:00 2019 -0500 squash! Bug 16940: After update, load local change notes. 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. --- .../base/content/abouttbupdate/aboutTBUpdate.css | 71 ++++++++++++---------- .../base/content/abouttbupdate/aboutTBUpdate.xhtml | 26 ++++---- browser/base/content/tab-content.js | 13 +++- browser/components/nsBrowserContentHandler.js | 49 +++++++++------ .../locales/en-US/chrome/browser/aboutTBUpdate.dtd | 6 +- browser/modules/AboutTBUpdate.jsm | 67 ++++++++++++++------ 6 files changed, 147 insertions(+), 85 deletions(-) diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.css b/browser/base/content/abouttbupdate/aboutTBUpdate.css index 90252d77a739..7c1a34b77f17 100644 --- a/browser/base/content/abouttbupdate/aboutTBUpdate.css +++ b/browser/base/content/abouttbupdate/aboutTBUpdate.css @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, The Tor Project, Inc. + * Copyright (c) 2019, The Tor Project, Inc. * See LICENSE for licensing information. * * vim: set sw=2 sts=2 ts=8 et syntax=css: @@ -12,56 +12,63 @@ body { font-family: Helvetica, Arial, sans-serif; - font-size: 110%; color: var(--abouttor-text-color); background-color: var(--abouttor-bg-toron-color); background-attachment: fixed; background-size: 100% 100%; } -#torbrowser-version { - /* These CSS rules match the about:tor page */ - position: fixed; - top: 6px; - right: 6px; - height: 30px; - width: 200px; - font-size: 15px; - white-space: pre-wrap; - text-align: right; -} - a { color: var(--abouttor-text-color); } -#logo { - background-image: url("chrome://branding/content/icon128.png"); - height: 128px; - width: 128px; - margin: 20px; - float: left; +.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; } -#msg { - margin-top: 50px; - float: left; +#version-content { + font-size: 50px; + font-weight: 300; } -#msg-updated { - font-size: 120%; - margin-bottom: 20px; +body:not([havereleasedate]) .release-date-cell { + display: none; } -#changelog-container { - margin: 0px 20px 20px 20px; +#releasedate-content { + font-size: 17px; } -#changelog-heading { - margin-bottom: 4px; +#releasenotes-label { + align-self: start; /* Anchor "Release Notes" label at the top. */ } -#changelog { - margin-left: 20px; +#releasenotes-content { + font-family: monospace; + font-size: 15px; white-space: pre; } diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml b/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml index fe8ed69b537f..f703fe1e13a1 100644 --- a/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml +++ b/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml @@ -13,24 +13,26 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <title>&aboutTBUpdate.title;</title> + <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;" onload="init()"> -<div id="torbrowser-version"/> -<div id="logo"/> -<div id="msg"> -<div id="msg-updated">&aboutTBUpdate.updated;</div> -<div>&aboutTBUpdate.linkPrefix;<a id="infolink">&aboutTBUpdate.linkLabel;</a>&aboutTBUpdate.linkSuffix; -</div> -</div> -<br clear="all"/> -<div id="changelog-container"> -<div id="changelog-heading">&aboutTBUpdate.changeLogHeading;</div> -<div id="changelog"></div> +<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/tab-content.js b/browser/base/content/tab-content.js index e0cf6747aaa4..6450baa6d060 100644 --- a/browser/base/content/tab-content.js +++ b/browser/base/content/tab-content.js @@ -384,12 +384,21 @@ let AboutTBUpdateListener = { this.onUpdate(aMessage.data); }, + // aData may contain the following string properties: + // version + // releaseDate + // moreInfoURL + // releaseNotes onUpdate: function(aData) { let doc = content.document; - doc.getElementById("torbrowser-version").textContent = aData.productInfo; + doc.getElementById("version-content").textContent = aData.version; + if (aData.releaseDate) { + doc.body.setAttribute("havereleasedate", "true"); + doc.getElementById("releasedate-content").textContent = aData.releaseDate; + } if (aData.moreInfoURL) doc.getElementById("infolink").setAttribute("href", aData.moreInfoURL); - doc.getElementById("changelog").textContent = aData.changeLog; + doc.getElementById("releasenotes-content").textContent = aData.releaseNotes; }, onPageLoad: function() { diff --git a/browser/components/nsBrowserContentHandler.js b/browser/components/nsBrowserContentHandler.js index a640bfc57663..4c698a9ebd90 100644 --- a/browser/components/nsBrowserContentHandler.js +++ b/browser/components/nsBrowserContentHandler.js @@ -541,6 +541,21 @@ 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 = this.startPage; + } catch (e) { + Cu.reportError(e); + } + + if (startPage == "about:blank") + startPage = ""; + var override; var overridePage = ""; var additionalPage = ""; @@ -580,11 +595,14 @@ nsBrowserContentHandler.prototype = { // we may open the startPage in addition to restoring the session. // // Tor Browser: Instead of opening the post-update "override page" - // directly, an about:tbupdate page is opened that includes a link - // to the override page as well as text from the first part of the - // local ChangeLog.txt file. 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. + // 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. var ss = Cc["@mozilla.org/browser/sessionstartup;1"] .getService(Ci.nsISessionStartup); willRestoreSession = ss.isAutomaticRestoreEnabled(); @@ -606,7 +624,14 @@ nsBrowserContentHandler.prototype = { if (overridePage) { prefb.setCharPref("torbrowser.post_update.url", overridePage); - overridePage = "about:tbupdate" + 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; @@ -636,18 +661,6 @@ nsBrowserContentHandler.prototype = { } } - var startPage = ""; - try { - var choice = prefb.getIntPref("browser.startup.page"); - if (choice == 1 || choice == 3) - startPage = this.startPage; - } catch (e) { - Cu.reportError(e); - } - - if (startPage == "about:blank") - startPage = ""; - let skipStartPage = override == OVERRIDE_NEW_PROFILE && prefb.getBoolPref("browser.startup.firstrunSkipsHomepage"); // Only show the startPage if we're not restoring an update session and are diff --git a/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd b/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd index 37567bd7e38c..2d1e59b40eaf 100644 --- a/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd +++ b/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd @@ -1,6 +1,8 @@ -<!ENTITY aboutTBUpdate.title "Tor Browser Update"> +<!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.changeLogHeading "Changelog:"> +<!ENTITY aboutTBUpdate.version "Version"> +<!ENTITY aboutTBUpdate.releaseDate "Release Date"> +<!ENTITY aboutTBUpdate.releaseNotes "Release Notes"> diff --git a/browser/modules/AboutTBUpdate.jsm b/browser/modules/AboutTBUpdate.jsm index 49d9d9b0e18d..4d18d2980a6c 100644 --- a/browser/modules/AboutTBUpdate.jsm +++ b/browser/modules/AboutTBUpdate.jsm @@ -40,10 +40,8 @@ var AboutTBUpdate = { }, sendAboutTBUpdateData: function(aTarget) { - let data = { productInfo: this.productInfo, - moreInfoURL: this.moreInfoURL, - changeLog: this.changeLog }; - + let data = this.releaseNoteInfo; + data.moreInfoURL = this.moreInfoURL; if (aTarget && aTarget.messageManager) { aTarget.messageManager.sendAsyncMessage(kSendUpdateMessageName, data); } else { @@ -53,15 +51,6 @@ var AboutTBUpdate = { } }, - get productInfo() { - const kBrandBundle = "chrome://branding/locale/brand.properties"; - let brandBundle = Cc["@mozilla.org/intl/stringbundle;1"] - .getService(Ci.nsIStringBundleService) - .createBundle(kBrandBundle); - return brandBundle.GetStringFromName("brandFullName") - + "\n" + TOR_BROWSER_VERSION; - }, - get moreInfoURL() { try { return Services.prefs.getCharPref("torbrowser.post_update.url"); @@ -71,12 +60,22 @@ var AboutTBUpdate = { return Services.urlFormatter.formatURLPref("startup.homepage_override_url"); }, - // Read and return the text from the beginning of the changelog file that is - // located at TorBrowser/Docs/ChangeLog.txt. + // 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 file is located in + // to support Gatekeeper signing, the ChangeLog.txt file is located in // TorBrowser.app/Contents/Resources/TorBrowser/Docs/. - get changeLog() { + get releaseNoteInfo() { + let info = {}; + try { #ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR // "XREExeF".parent is the directory that contains firefox, i.e., @@ -103,9 +102,39 @@ var AboutTBUpdate = { fs.close(); // Truncate at the first empty line. - return s.replace(/[\r\n][\r\n][\s\S]*$/m, ""); + 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 ""; + return info; }, };

1 0

[tor-browser-build/maint-8.0] Bug 29081: Harden libwinpthread
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit 2da5df458e3aa88a578210a1dc22a46387e39fba Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 14 08:22:40 2019 +0000 Bug 29081: Harden libwinpthread --- projects/mingw-w64/build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build index 1e25290..b2117c5 100644 --- a/projects/mingw-w64/build +++ b/projects/mingw-w64/build @@ -43,8 +43,8 @@ make install mkdir -p /var/tmp/build/builddir/mingw-w64/mingw-w64-pthread cd /var/tmp/build/builddir/mingw-w64/mingw-w64-pthread /var/tmp/build/[% project %]-[% c("version") %]/mingw-w64-libraries/winpthreads/configure \ - LDFLAGS="-Wl,--no-insert-timestamp" \ - --host=[% c("arch") %]-w64-mingw32 --prefix=$distdir/[% c("arch") %]-w64-mingw32 + LDFLAGS="-Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp" \ + --host=[% c("arch") %]-w64-mingw32 --prefix=$distdir/[% c("arch") %]-w64-mingw32 make -j[% c("buildconf/num_procs") %] make install

1 0

[tor-browser-build/maint-8.0] Prepare -build2 for 8.0.7
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit 8487e3a1e498dcb5604d884d422ab999957877f8 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 13 12:47:08 2019 +0000 Prepare -build2 for 8.0.7 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++++ projects/torbutton/config | 2 +- rbm.conf | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 6a941a1..4d533ce 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -3,6 +3,10 @@ Tor Browser 8.0.7 -- March 19 2019 * Update Firefox to 60.6.0esr * Update Tor to 0.3.5.8 * Bug 29660: XMPP can not connect to SOCKS5 anymore + * Update Torbutton to 2.0.11 + * Bug 29021: Tell NoScript it is running within Tor Browser + * Windows + * Bug 29081: Harden libwinpthread * Linux * Bug 27531: Add separate LD_LIBRARY_PATH for fteproxy diff --git a/projects/torbutton/config b/projects/torbutton/config index c262950..0d66ae0 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.0.10 +version: 2.0.11 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 49166f2..3de1879 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.0.7' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 8.0.6 project_name: tor-browser

1 0

[torbutton/maint-2.0] Release preparations for 2.0.11
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit 70d44df529402368ec599955a7eef033ecb9b0e0 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 13 12:42:24 2019 +0000 Release preparations for 2.0.11 Version bump and CHANGELOG update --- src/CHANGELOG | 3 +++ src/install.rdf | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 2b0d2db0..b8d462ac 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,6 @@ +2.0.11 + * Bug 29021: Tell NoScript it is running within Tor Browser + 2.0.10 * Bug 29035: Clean up our donation campaign and add newsletter sign-up link * Bug 27175: Add pref to allow users to persist custom noscript settings diff --git a/src/install.rdf b/src/install.rdf index c39fbfb8..1aa768b4 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>2.0.10</em:version> + <em:version>2.0.11</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/maint-2.0] Bug 29021: Tell NoScript it is running within Tor Browser
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit 9ad542c9a851ee531ff75773c763a17758867bdb Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 13 09:58:54 2019 +0000 Bug 29021: Tell NoScript it is running within Tor Browser --- src/modules/noscript-control.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/noscript-control.js b/src/modules/noscript-control.js index 275f9dba..e164510b 100644 --- a/src/modules/noscript-control.js +++ b/src/modules/noscript-control.js @@ -78,6 +78,7 @@ let noscriptSettings = safetyLevel => ( "enforced": true, "autoAllowTop": false }, + "isTorBrowser": true, "tabId": -1 });

1 0

[torbutton/master] Bug 29021: Tell NoScript it is running within Tor Browser
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit 3187dd92b4804c20fa08e225e629c3ec94eead03 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 13 09:58:54 2019 +0000 Bug 29021: Tell NoScript it is running within Tor Browser --- src/modules/noscript-control.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/noscript-control.js b/src/modules/noscript-control.js index 895889c8..31ee98c2 100644 --- a/src/modules/noscript-control.js +++ b/src/modules/noscript-control.js @@ -78,6 +78,7 @@ let noscriptSettings = safetyLevel => ( "enforced": true, "autoAllowTop": false }, + "isTorBrowser": true, "tabId": -1 });

1 0

[tor-browser-build/master] Bug 29758: Build firefox debug symbols for linux-i686
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit 4097d931d0fd5a0376ca57437c2cdd76adf62d57 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Mar 13 12:25:19 2019 +0100 Bug 29758: Build firefox debug symbols for linux-i686 This reverts commit 7dc74d1652c560e193d1a4c3331efcfb08ee67b0. --- projects/firefox/build | 4 ++-- projects/firefox/mozconfig-linux-i686 | 3 ++- projects/tor-browser/build | 4 +--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index f3d3c27..9bc025a 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -259,7 +259,7 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ cd $distdir -[% IF c("var/linux-x86_64") %] +[% 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.real Browser/plugin-container Browser/updater @@ -303,7 +303,7 @@ END; tar_args => '-czf ' _ dest_dir _ '/' _ c('filename') _ '/tor-browser.tar.gz', }) %] -[% IF c("var/linux-x86_64") %] +[% IF c("var/linux") %] [% c('tar', { tar_src => [ 'Debug' ], tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename') _ '/tor-browser-debug.tar.xz', diff --git a/projects/firefox/mozconfig-linux-i686 b/projects/firefox/mozconfig-linux-i686 index abc7b0e..ef952aa 100755 --- a/projects/firefox/mozconfig-linux-i686 +++ b/projects/firefox/mozconfig-linux-i686 @@ -27,9 +27,10 @@ ac_add_options --enable-tor-browser-update ac_add_options --enable-signmar ac_add_options --enable-verify-mar +ac_add_options --disable-strip +ac_add_options --disable-install-strip ac_add_options --disable-tests ac_add_options --disable-debug -ac_add_options --disable-debug-symbols ac_add_options --disable-maintenance-service ac_add_options --disable-crashreporter ac_add_options --disable-webrtc diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 4661f7a..fc64ee1 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -316,10 +316,8 @@ rm -rf $distdir/${PKG_DIR} SCRIPT_EOF cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ -[% IF c("var/linux-x86_64") -%] - cp $rootdir/[% c('input_files_by_name/firefox') %]/tor-browser-debug.tar.xz "$OUTDIR"/tor-browser-[% c("var/mar_osname") %]-debug.tar.xz -[% END -%] [% IF c("var/linux") -%] + cp $rootdir/[% c('input_files_by_name/firefox') %]/tor-browser-debug.tar.xz "$OUTDIR"/tor-browser-[% c("var/mar_osname") %]-debug.tar.xz cp $rootdir/[% c('input_files_by_name/tor') %]/tor-debug.tar.xz "$OUTDIR"/tor-[% c("var/mar_osname") %]-debug.tar.xz [% END -%]

1 0

[tor-browser-build/maint-8.0] Release preparations for 8.0.7
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit b68bceab5040b9d48808295add017b83b4788b7d Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 13 08:17:25 2019 +0000 Release preparations for 8.0.7 Versions bump and Changelog update --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 8 ++++++++ rbm.conf | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index c6d2a6a..9476cac 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -7,7 +7,7 @@ git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 60.5.1 + firefox_platform_version: 60.6.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 8.0 torbrowser_update_channel: alpha diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index e1dbaa3..6a941a1 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,11 @@ +Tor Browser 8.0.7 -- March 19 2019 + * All platforms + * Update Firefox to 60.6.0esr + * Update Tor to 0.3.5.8 + * Bug 29660: XMPP can not connect to SOCKS5 anymore + * Linux + * Bug 27531: Add separate LD_LIBRARY_PATH for fteproxy + Tor Browser 8.0.6 -- February 12 2019 * All platforms * Update Firefox to 60.5.1esr diff --git a/rbm.conf b/rbm.conf index 2983684..49166f2 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.0.6' + torbrowser_version: '8.0.7' torbrowser_build: 'build1' torbrowser_incremental_from: - - 8.0.5 + - 8.0.6 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/maint-8.0] Bug 27531: Add separate LD_LIBRARY_PATH for fteproxy
by gk＠torproject.org 13 Mar '19

13 Mar '19

commit 5c5b8b1fa1940bf85f0fbbd10229ec97ae617d07 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jan 14 19:11:20 2019 +0100 Bug 27531: Add separate LD_LIBRARY_PATH for fteproxy --- projects/fteproxy/build | 2 ++ projects/fteproxy/config | 2 ++ projects/fteproxy/fteproxy.wrapper | 10 ++++++++++ projects/libfte/build | 4 ++-- .../Bundle-Data/PTConfigs/linux/torrc-defaults-appendix | 2 +- 5 files changed, 17 insertions(+), 3 deletions(-) diff --git a/projects/fteproxy/build b/projects/fteproxy/build index 310c9a5..6b6a82f 100644 --- a/projects/fteproxy/build +++ b/projects/fteproxy/build @@ -22,6 +22,8 @@ cd /var/tmp/build/[% project %]-[% c('version') %] cp -a fteproxy/defs/*.json $PTDIR/fteproxy/defs rm -Rf $pydir [% ELSE -%] + cp -a $rootdir/fteproxy.wrapper $PTDIR/fteproxy.wrapper + chmod +x $PTDIR/fteproxy.wrapper cp -a bin/fteproxy $PTDIR/fteproxy.bin cp -ra fteproxy $PTDIR/ [% END -%] diff --git a/projects/fteproxy/config b/projects/fteproxy/config index d58095e..06ea149 100644 --- a/projects/fteproxy/config +++ b/projects/fteproxy/config @@ -28,3 +28,5 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' enable: '[% c("var/windows") %]' + - filename: fteproxy.wrapper + enable: '[% c("var/linux") %]' diff --git a/projects/fteproxy/fteproxy.wrapper b/projects/fteproxy/fteproxy.wrapper new file mode 100644 index 0000000..ca10086 --- /dev/null +++ b/projects/fteproxy/fteproxy.wrapper @@ -0,0 +1,10 @@ +#!/bin/sh +basedir=$(dirname "$0") +libdir=$(cd "$basedir"/fteproxy-lib ; pwd) +if test -z "$LD_LIBRARY_PATH" +then + export LD_LIBRARY_PATH="$libdir" +else + export LD_LIBRARY_PATH="$libdir:$LD_LIBRARY_PATH" +fi +exec "$basedir/fteproxy.bin" "$@" diff --git a/projects/libfte/build b/projects/libfte/build index 4f3455f..5d62453 100644 --- a/projects/libfte/build +++ b/projects/libfte/build @@ -28,8 +28,8 @@ tar -C $distdir -xf $rootdir/[% c('input_files_by_name/obfsproxy') %] export PYTHON=python2 make cp -ra fte $PTDIR/ - mkdir -p $distdir/TorBrowser/Tor - cp /var/tmp/dist/gmp/lib/libgmp.so.10 $distdir/TorBrowser/Tor/ + mkdir -p $PTDIR/fteproxy-lib + cp /var/tmp/dist/gmp/lib/libgmp.so.10 $PTDIR/fteproxy-lib [% END -%] cp -a {LICENSE,README.md} $DOCSDIR/ cp -a thirdparty/re2/LICENSE $DOCSDIR/LICENSE.re2 diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix b/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix index 12b8aad..d9988fb 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix +++ b/projects/tor-browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix @@ -1,5 +1,5 @@ ## fteproxy configuration -ClientTransportPlugin fte exec ./TorBrowser/Tor/PluggableTransports/fteproxy.bin --managed +ClientTransportPlugin fte exec ./TorBrowser/Tor/PluggableTransports/fteproxy.wrapper --managed ## obfs4proxy configuration ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec ./TorBrowser/Tor/PluggableTransports/obfs4proxy

1 0