- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 29633: Don't ship pdnsd anymore
by boklm＠torproject.org 04 Mar '19

04 Mar '19

commit e39c1dbe69a48274c5e806efc0ef2d407085b255 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 1 19:16:56 2019 +0000 Bug 29633: Don't ship pdnsd anymore We don't use Orbot's VPN mode and therefore don't need pdnsd bundled. Thanks, Nathan, for noticing. --- projects/orbot/build | 6 ------ 1 file changed, 6 deletions(-) diff --git a/projects/orbot/build b/projects/orbot/build index 4e222a9..840df3e 100644 --- a/projects/orbot/build +++ b/projects/orbot/build @@ -20,12 +20,6 @@ for p in $rootdir/*.patch do patch -p1 < $p done -# Build OrbotService Native Libraries -pushd /var/tmp/build/[% project %]-[% c('version') %]/orbotservice/src/main -/var/tmp/dist/android-toolchain/android-ndk/ndk-build -mv libs/armeabi-v7a/pdnsd libs/armeabi-v7a/pdnsd.so -popd - # Build Android Libraries and Apps $GRADLE_HOME/gradle-4.1/bin/gradle --offline assembleRelease -x lint

1 0

[tor-browser/tor-browser-60.5.1esr-8.5-1] Bug 29120: Enable media cache in memory
by gk＠torproject.org 04 Mar '19

04 Mar '19

commit b7c1e2820087e60d019b57d25042a27dc83adc4a Author: Georg Koppen <gk(a)torproject.org> Date: Mon Mar 4 08:38:22 2019 +0000 Bug 29120: Enable media cache in memory Back then in bug 10237 we set `media.cache_size` to `0` in the attempt to block disk caching if we are in Private Browsing Mode. However, it turns out that is not enough to prevent writing to disk in that case and, moreover, is the reason for poor video performance in some cases. The patch in this commit addresses both issues by enabling the media cache again and making sure it stays memory-only in Private Browsing Mode. Big thanks to a cypherpunk for analyzing the bug and providing the patch. --- browser/app/profile/000-tor-browser.js | 3 ++- dom/media/MediaCache.cpp | 45 +++++++++++++++++++++++++++------- 2 files changed, 38 insertions(+), 10 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 9f1e727ce724..a0b370c73279 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -60,7 +60,8 @@ pref("signon.rememberSignons", false); pref("browser.formfill.enable", false); pref("signon.autofillForms", false); pref("browser.sessionstore.privacy_level", 2); -pref("media.cache_size", 0); +// Increase the maximum memory-backed cache size (#29120) +pref("media.memory_cache_max_size", 16384); // Misc privacy: Remote pref("browser.send_pings", false); diff --git a/dom/media/MediaCache.cpp b/dom/media/MediaCache.cpp index 38197de3e4a6..056527e7926c 100644 --- a/dom/media/MediaCache.cpp +++ b/dom/media/MediaCache.cpp @@ -154,7 +154,9 @@ class MediaCache { // If the length is known and considered small enough, a discrete MediaCache // with memory backing will be given. Otherwise the one MediaCache with // file backing will be provided. - static RefPtr<MediaCache> GetMediaCache(int64_t aContentLength); + // If aIsPrivateBrowsing is true, only initialization of a memory backed + // MediaCache will be attempted, returning nullptr if that fails. + static RefPtr<MediaCache> GetMediaCache(int64_t aContentLength, bool aIsPrivateBrowsing); nsIEventTarget* OwnerThread() const { return sThread; } @@ -706,7 +708,7 @@ void MediaCache::CloseStreamsForPrivateBrowsing() { } /* static */ RefPtr<MediaCache> MediaCache::GetMediaCache( - int64_t aContentLength) { + int64_t aContentLength, bool aIsPrivateBrowsing) { NS_ASSERTION(NS_IsMainThread(), "Only call on main thread"); if (!sThreadInit) { @@ -734,10 +736,30 @@ void MediaCache::CloseStreamsForPrivateBrowsing() { return nullptr; } - if (aContentLength > 0 && - aContentLength <= int64_t(MediaPrefs::MediaMemoryCacheMaxSize()) * 1024) { - // Small-enough resource, use a new memory-backed MediaCache. - RefPtr<MediaBlockCacheBase> bc = new MemoryBlockCache(aContentLength); + if (aIsPrivateBrowsing || + (aContentLength > 0 && + aContentLength <= int64_t(MediaPrefs::MediaMemoryCacheMaxSize()) * 1024)) { + // We're either in private browsing mode or we have a + // small-enough resource, use a new memory-backed MediaCache. + + int64_t cacheSize = 0; + if (!aIsPrivateBrowsing) { + cacheSize = aContentLength; + } else { + // We're in private browsing mode, we'll have to figure out a + // cache size since we can't fallback to a file backed MediaCache. + if (aContentLength < 0) { + // Unknown content length, we'll give the maximum allowed + // cache size just to be sure. + cacheSize = int64_t(MediaPrefs::MediaMemoryCacheMaxSize()) * 1024; + } else { + // If the content length is less than the maximum allowed cache size, + // use that, otherwise we cap it. + cacheSize = std::min(aContentLength, int64_t(MediaPrefs::MediaMemoryCacheMaxSize()) * 1024); + } + } + + RefPtr<MediaBlockCacheBase> bc = new MemoryBlockCache(cacheSize); nsresult rv = bc->Init(); if (NS_SUCCEEDED(rv)) { RefPtr<MediaCache> mc = new MediaCache(bc); @@ -745,8 +767,13 @@ void MediaCache::CloseStreamsForPrivateBrowsing() { mc.get()); return mc; } - // MemoryBlockCache initialization failed, clean up and try for a - // file-backed MediaCache below. + + // MemoryBlockCache initialization failed. + // If we're in private browsing mode, we will bail here. + // Otherwise, clean up and try for a file-backed MediaCache below. + if (aIsPrivateBrowsing) { + return nullptr; + } } if (gMediaCache) { @@ -2600,7 +2627,7 @@ nsresult MediaCacheStream::Init(int64_t aContentLength) { mStreamLength = aContentLength; } - mMediaCache = MediaCache::GetMediaCache(aContentLength); + mMediaCache = MediaCache::GetMediaCache(aContentLength, mIsPrivateBrowsing); if (!mMediaCache) { return NS_ERROR_FAILURE; }

1 0

[tor-browser-build/master] Bug 29632: Use HTTPS for downloading Gradle
by boklm＠torproject.org 03 Mar '19

03 Mar '19

commit 1e09514cd1bfdeba863a84929edfc21ede3f8b9d Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 1 19:08:03 2019 +0000 Bug 29632: Use HTTPS for downloading Gradle There should be no excuse anymore to use plan HTTP (even though, we check the SHA-256 sum). Use HTTPS where possible. --- projects/android-toolchain/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index c14f90e..8a4c413 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -33,6 +33,6 @@ input_files: - URL: '[% c("var/google_repo") %]/android-ndk-r15c-linux-x86_64.zip' name: android_ndk_compiler sha256sum: f01788946733bf6294a36727b99366a18369904eb068a599dde8cca2c1d2ba3c - - URL: http://services.gradle.org/distributions/gradle-4.1-bin.zip + - URL: https://services.gradle.org/distributions/gradle-4.1-bin.zip name: gradle_bin sha256sum: d55dfa9cfb5a3da86a1c9e75bb0b9507f9a8c8c100793ccec7beb6e259f9ed43

1 0

[tor-browser-build/master] Add missing parenthesis
by gk＠torproject.org 01 Mar '19

01 Mar '19

commit 95f303b383fabb0904545a2c5b8150476270e2d0 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Mar 1 07:05:02 2019 +0000 Add missing parenthesis --- projects/firefox/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/build b/projects/firefox/build index aa0a34f..f3d3c27 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -113,7 +113,7 @@ mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig tar -C /var/tmp/dist/locales -xf $rootdir/[% c('input_files_by_name/firefox-locale-bundle') %] [% END %] -eval $(perl $rootdir/get-moz-build-date [% c("var/copyright_year") %] [% c("var/torbrowser_version") %] +eval $(perl $rootdir/get-moz-build-date [% c("var/copyright_year") %] [% c("var/torbrowser_version") %]) if [ -z $MOZ_BUILD_DATE ] then echo "MOZ_BUILD_DATE is not set"

1 0

[tor-browser-build/master] Bug 28685: Set Build ID based on Tor Browser version
by gk＠torproject.org 28 Feb '19

28 Feb '19

commit d11f03f7c10c2cf5a942a353d0961249ceee9644 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Feb 20 20:15:19 2019 +0100 Bug 28685: Set Build ID based on Tor Browser version --- projects/firefox/build | 2 +- projects/firefox/get-moz-build-date | 26 +++++++++++++++++--------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 1544c11..aa0a34f 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -113,7 +113,7 @@ mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig tar -C /var/tmp/dist/locales -xf $rootdir/[% c('input_files_by_name/firefox-locale-bundle') %] [% END %] -eval $(perl $rootdir/get-moz-build-date [% c("var/copyright_year") %] $(cat browser/config/version.txt)) +eval $(perl $rootdir/get-moz-build-date [% c("var/copyright_year") %] [% c("var/torbrowser_version") %] if [ -z $MOZ_BUILD_DATE ] then echo "MOZ_BUILD_DATE is not set" diff --git a/projects/firefox/get-moz-build-date b/projects/firefox/get-moz-build-date index fb7298a..4e55c92 100755 --- a/projects/firefox/get-moz-build-date +++ b/projects/firefox/get-moz-build-date @@ -1,16 +1,24 @@ #!/usr/bin/perl -w -# Generate a MOZ_BUILD_DATE based on firefox version number +# Generate a MOZ_BUILD_DATE based on Tor Browser version number use strict; die "wrong number of arguments" unless @ARGV == 2; my ($year, $version) = @ARGV; -$version =~ s/\D+$//; -my @v = split(/[\.ab]/, $version); -push @v, '0' if @v < 4; -push @v, '0' if @v < 4; -my $day_of_month = int(($v[0] - 45) / 5); -my $date = 101010101 + $year * 10000000000 + $day_of_month * 1000000 - + $v[1] * 10000 + $v[2] * 100 + $v[3]; -$date += 100000000 unless $version =~ m/[ab]/; +my $date; +if ($version eq 'tbb-nightly') { + my (undef, undef, undef, $day, $mon, $y) = localtime; + $date = sprintf("%d%02d%02d010101", $y + 1900, $mon + 1, $day); +} else { + my @v = split(/[\.ab]/, $version); + push @v, '0' if @v < 4; + push @v, '0' if @v < 4; + # When MOZ_BUILD_DATE was based on the firefox version, with + # Tor Browser 8.0.6 and firefox 60.5.1 it was 20190204060201 + # We can remove 5 from the month, while keeping it increasing. + my $month = $v[0] - 5; + $date = 1010101 + $year * 10000000000 + $month * 100000000 + + $v[1] * 1000000 + $v[2] * 10000 + $v[3]; + $date += 1000000 unless $version =~ m/[ab]/; +} print "export MOZ_BUILD_DATE=$date\n";

1 0

[tor-browser-build/master] Bug 29579: Fix typo in projects/tor/build
by gk＠torproject.org 25 Feb '19

25 Feb '19

commit 0403da4390f8891a5a082eb6c761cd8710f913ca Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Feb 25 15:45:13 2019 +0100 Bug 29579: Fix typo in projects/tor/build --- projects/tor/build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor/build b/projects/tor/build index f063693..d6018d9 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -11,7 +11,7 @@ mkdir -p /var/tmp/build [% END %] [% IF c("var/osx") %] - [% IF ("var/nightly") %] + [% IF c("var/nightly") %] # We are compiling Tor with Rust enabled for nightlies. export TOR_RUST_TARGET=x86_64-apple-darwin [% END %] @@ -33,7 +33,7 @@ libeventdir=/var/tmp/dist/libevent openssldir=/var/tmp/dist/openssl [% IF c("var/windows") %] - [% IF ("var/nightly") %] + [% IF c("var/nightly") %] # We are compiling Tor with Rust enabled for nightlies. export TOR_RUST_TARGET=[% c("arch") %]-pc-windows-gnu [% END %]

1 0

[tor-browser/tor-browser-60.5.1esr-8.5-1] Revert "Revert "Bug 28885: notify users that update is downloading""
by gk＠torproject.org 25 Feb '19

25 Feb '19

commit 4f79cf20b45acc657639f620d03f24b38f8e7bf1 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Feb 25 07:45:02 2019 +0000 Revert "Revert "Bug 28885: notify users that update is downloading"" This reverts commit 58a439dd4e6fc1734d60d7175caa1cb2f88fbbac. --- browser/app/profile/000-tor-browser.js | 1 + .../customizableui/content/panelUI.inc.xul | 1 + .../components/customizableui/content/panelUI.js | 28 ++++++++++++++++++++++ browser/components/nsBrowserGlue.js | 1 + .../themes/shared/customizableui/panelUI.inc.css | 1 + browser/themes/shared/toolbarbutton-icons.inc.css | 1 + toolkit/mozapps/update/UpdateListener.jsm | 23 ++++++++++++++++++ toolkit/mozapps/update/nsUpdateService.js | 28 ++++++++++++++++++++++ 8 files changed, 84 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 11027f4c9a3a..9f1e727ce724 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -20,6 +20,7 @@ pref("startup.homepage_override_url", "https://blog.torproject.org/category/tags // Try to nag a bit more about updates: Pop up a restart dialog an hour after the initial dialog pref("app.update.promptWaitTime", 3600); pref("app.update.badge", true); +pref("app.update.notifyDuringDownload", true); pref("extensions.hotfix.id", ""); // Bug 16837: Disable hotfix updates as they may cause compat issues #ifdef XP_WIN diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul index 5891556a6e5f..ee4f8351d02b 100644 --- a/browser/components/customizableui/content/panelUI.inc.xul +++ b/browser/components/customizableui/content/panelUI.inc.xul @@ -172,6 +172,7 @@ <vbox id="appMenu-addon-banners"/> <toolbarbutton class="panel-banner-item" label-update-available="&updateAvailable.panelUI.label;" + label-update-downloading="Downloading update" label-update-manual="&updateManual.panelUI.label;" label-update-restart="&updateRestart.panelUI.label2;" oncommand="PanelUI._onBannerItemSelected(event)" diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js index 5233be130be2..a4018bb2e6c2 100644 --- a/browser/components/customizableui/content/panelUI.js +++ b/browser/components/customizableui/content/panelUI.js @@ -46,6 +46,7 @@ const PanelUI = { init() { this._initElements(); + this._initUpdaterStrings(); this.menuButton.addEventListener("mousedown", this); this.menuButton.addEventListener("keypress", this); @@ -53,6 +54,7 @@ const PanelUI = { Services.obs.addObserver(this, "fullscreen-nav-toolbox"); Services.obs.addObserver(this, "appMenu-notifications"); + Services.obs.addObserver(this, "show-update-progress"); XPCOMUtils.defineLazyPreferenceGetter(this, "autoHideToolbarInFullScreen", "browser.fullscreen.autohide", false, (pref, previousValue, newValue) => { @@ -120,6 +122,28 @@ const PanelUI = { } }, + _initUpdaterStrings() { + // If Torbutton is installed and enabled, replace the "Downloading update" + // string with one from torbutton.properties (to facilitate localization). + try { + let brands = Services.strings.createBundle( + "chrome://branding/locale/brand.properties"); + let stringArgs = [brands.GetStringFromName("brandShortName")]; + let torbuttonBundle = Services.strings.createBundle( + "chrome://torbutton/locale/torbutton.properties"); + let label = torbuttonBundle.formatStringFromName( + "updateDownloadingPanelUILabel", stringArgs, 1); + let attrName = "label-update-downloading"; + let elements = document.getElementsByClassName("panel-banner-item"); + for (let i = 0; i < elements.length; ++i) { + let elem = elements.item(i); + if (elem.hasAttribute(attrName)) { + elem.setAttribute(attrName, label); + } + } + } catch (e) {} + }, + _eventListenersAdded: false, _ensureEventListenersAdded() { if (this._eventListenersAdded) @@ -152,6 +176,7 @@ const PanelUI = { Services.obs.removeObserver(this, "fullscreen-nav-toolbox"); Services.obs.removeObserver(this, "appMenu-notifications"); + Services.obs.removeObserver(this, "show-update-progress"); window.removeEventListener("MozDOMFullscreen:Entered", this); window.removeEventListener("MozDOMFullscreen:Exited", this); @@ -252,6 +277,9 @@ const PanelUI = { this._notifications = AppMenuNotifications.notifications; this._updateNotifications(true); break; + case "show-update-progress": + openAboutDialog(); + break; } }, diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js index 0ec10a3337d4..e68817fd3c7c 100644 --- a/browser/components/nsBrowserGlue.js +++ b/browser/components/nsBrowserGlue.js @@ -187,6 +187,7 @@ const global = this; const listeners = { observers: { + "update-downloading": ["UpdateListener"], "update-staged": ["UpdateListener"], "update-downloaded": ["UpdateListener"], "update-available": ["UpdateListener"], diff --git a/browser/themes/shared/customizableui/panelUI.inc.css b/browser/themes/shared/customizableui/panelUI.inc.css index 75946aa5f082..4cb2032a09d1 100644 --- a/browser/themes/shared/customizableui/panelUI.inc.css +++ b/browser/themes/shared/customizableui/panelUI.inc.css @@ -62,6 +62,7 @@ } #PanelUI-menu-button[badge-status="update-available"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, +#PanelUI-menu-button[badge-status="update-downloading"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, #PanelUI-menu-button[badge-status="update-manual"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, #PanelUI-menu-button[badge-status="update-restart"] > .toolbarbutton-badge-stack > .toolbarbutton-badge { background: #74BF43 url(chrome://browser/skin/update-badge.svg) no-repeat center; diff --git a/browser/themes/shared/toolbarbutton-icons.inc.css b/browser/themes/shared/toolbarbutton-icons.inc.css index d3a634d5ff51..230ddf951858 100644 --- a/browser/themes/shared/toolbarbutton-icons.inc.css +++ b/browser/themes/shared/toolbarbutton-icons.inc.css @@ -259,6 +259,7 @@ toolbar[brighttext] { } #PanelUI-menu-button[badge-status="update-available"], +#PanelUI-menu-button[badge-status="update-downloading"], #PanelUI-menu-button[badge-status="update-manual"], #PanelUI-menu-button[badge-status="update-restart"] { list-style-image: url("chrome://browser/skin/menu-badged.svg"); diff --git a/toolkit/mozapps/update/UpdateListener.jsm b/toolkit/mozapps/update/UpdateListener.jsm index a2b228d321ac..8437f4b884d4 100644 --- a/toolkit/mozapps/update/UpdateListener.jsm +++ b/toolkit/mozapps/update/UpdateListener.jsm @@ -127,6 +127,15 @@ var UpdateListener = { doc => this.replaceReleaseNotes(doc, update, "updateManualWhatsNew")); }, + showUpdateDownloadingNotification() { + this.showUpdateNotification("downloading", true, true, () => { + // The user clicked on the "Downloading update" app menu item. + // Code in browser/components/customizableui/content/panelUI.js + // receives the following notification and opens the about dialog. + Services.obs.notifyObservers(null, "show-update-progress", null); + }); + }, + handleUpdateError(update, status) { switch (status) { case "download-attempt-failed": @@ -204,6 +213,17 @@ var UpdateListener = { } }, + handleUpdateDownloading(status) { + switch (status) { + case "downloading": + this.showUpdateDownloadingNotification(); + break; + case "idle": + this.reset(); + break; + } + }, + observe(subject, topic, status) { if (!this.enabled) { return; @@ -215,6 +235,9 @@ var UpdateListener = { case "update-available": this.handleUpdateAvailable(update, status); break; + case "update-downloading": + this.handleUpdateDownloading(status); + break; case "update-staged": case "update-downloaded": this.handleUpdateStagedOrDownloaded(update, status); diff --git a/toolkit/mozapps/update/nsUpdateService.js b/toolkit/mozapps/update/nsUpdateService.js index b2a4e82cf241..159112805425 100644 --- a/toolkit/mozapps/update/nsUpdateService.js +++ b/toolkit/mozapps/update/nsUpdateService.js @@ -38,6 +38,7 @@ const PREF_APP_UPDATE_ENABLED = "app.update.enabled"; const PREF_APP_UPDATE_IDLETIME = "app.update.idletime"; const PREF_APP_UPDATE_LOG = "app.update.log"; const PREF_APP_UPDATE_NOTIFIEDUNSUPPORTED = "app.update.notifiedUnsupported"; +const PREF_APP_UPDATE_NOTIFYDURINGDOWNLOAD = "app.update.notifyDuringDownload"; const PREF_APP_UPDATE_POSTUPDATE = "app.update.postupdate"; const PREF_APP_UPDATE_PROMPTWAITTIME = "app.update.promptWaitTime"; const PREF_APP_UPDATE_SERVICE_ENABLED = "app.update.service.enabled"; @@ -3325,6 +3326,8 @@ Downloader.prototype = { if (this._request && this._request instanceof Ci.nsIRequest) { this._request.cancel(cancelError); } + + this._notifyDownloadStatusObservers(); }, /** @@ -3498,6 +3501,13 @@ Downloader.prototype = { return selectedPatch; }, + _notifyDownloadStatusObservers: function Downloader_notifyDownloadStatusObservers() { + if (Services.prefs.getBoolPref(PREF_APP_UPDATE_NOTIFYDURINGDOWNLOAD, false)) { + let status = this.updateService.isDownloading ? "downloading" : "idle"; + Services.obs.notifyObservers(this._update, "update-downloading", status); + } + }, + /** * Whether or not we are currently downloading something. */ @@ -3552,6 +3562,9 @@ Downloader.prototype = { var um = Cc["@mozilla.org/updates/update-manager;1"]. getService(Ci.nsIUpdateManager); um.saveUpdates(); + + this._notifyDownloadStatusObservers(); + return STATE_DOWNLOADING; }, @@ -3728,9 +3741,16 @@ Downloader.prototype = { } else { state = STATE_PENDING; } +#if defined(TOR_BROWSER_UPDATE) + // In Tor Browser, show update-related messages in the hamburger menu + // even if the update was started in the foreground, e.g., from the + // about box. + shouldShowPrompt = !getCanStageUpdates(); +#else if (this.background) { shouldShowPrompt = !getCanStageUpdates(); } +#endif AUSTLMY.pingDownloadCode(this.isCompleteUpdate, AUSTLMY.DWNLD_SUCCESS); // Tell the updater.exe we're ready to apply. @@ -3835,6 +3855,7 @@ Downloader.prototype = { } this._request = null; + this._notifyDownloadStatusObservers(); if (state == STATE_DOWNLOAD_FAILED) { var allFailed = true; @@ -3907,9 +3928,16 @@ Downloader.prototype = { // processor service. LOG("Downloader:onStopRequest - failed to stage update. Exception: " + e); +#if defined(TOR_BROWSER_UPDATE) + // In Tor Browser, show update-related messages in the hamburger menu + // even if the update was started in the foreground, e.g., from the + // about box. + shouldShowPrompt = true; +#else if (this.background) { shouldShowPrompt = true; } +#endif } } }

1 0

[tor-browser/tor-browser-60.5.1esr-8.5-1] Revert "Revert "Bug 29180: MAR download stalls when about dialog is opened""
by gk＠torproject.org 25 Feb '19

25 Feb '19

commit 5a0ac465ad739e62dc0c2e9887a15f146e9415a8 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Feb 25 07:45:23 2019 +0000 Revert "Revert "Bug 29180: MAR download stalls when about dialog is opened"" This reverts commit fcc53d9fa4969850b4cd77951974ee6db73e827b. --- browser/base/content/aboutDialog-appUpdater.js | 17 +++++++++++----- toolkit/mozapps/update/content/updates.js | 27 ++++++++++++++------------ 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/browser/base/content/aboutDialog-appUpdater.js b/browser/base/content/aboutDialog-appUpdater.js index e81098a1e898..b732db6bee6b 100644 --- a/browser/base/content/aboutDialog-appUpdater.js +++ b/browser/base/content/aboutDialog-appUpdater.js @@ -318,11 +318,18 @@ appUpdater.prototype = this.update.QueryInterface(Ci.nsIWritablePropertyBag); this.update.setProperty("foregroundDownload", "true"); - this.aus.pauseDownload(); - let state = this.aus.downloadUpdate(this.update, false); - if (state == "failed") { - this.selectPanel("downloadFailed"); - return; + // If one is not already in progress, start a download. Previously, + // we would pause and restart an existing download in case there was + // a need to transition from a background download to a foreground one, + // but that caused Tor bug 29180. There is no difference between a + // foreground and background download unless the update manifest + // includes a backgroundInterval attribute. + if (!this.isDownloading) { + let state = this.aus.downloadUpdate(this.update, false); + if (state == "failed") { + this.selectPanel("downloadFailed"); + return; + } } this.setupDownloadingUI(); diff --git a/toolkit/mozapps/update/content/updates.js b/toolkit/mozapps/update/content/updates.js index 5b6ae7cc6ba1..195265ff81f9 100644 --- a/toolkit/mozapps/update/content/updates.js +++ b/toolkit/mozapps/update/content/updates.js @@ -751,19 +751,22 @@ var gDownloadingPage = { gUpdates.update.QueryInterface(Ci.nsIWritablePropertyBag); gUpdates.update.setProperty("foregroundDownload", "true"); - // Pause any active background download and restart it as a foreground - // download. - aus.pauseDownload(); - var state = aus.downloadUpdate(gUpdates.update, false); - if (state == "failed") { - // We've tried as hard as we could to download a valid update - - // we fell back from a partial patch to a complete patch and even - // then we couldn't validate. Show a validation error with instructions - // on how to manually update. - this.cleanUp(); - gUpdates.wiz.goTo("errors"); - return; + // If it is not already in progress, start the download. See + // Tor bug 29180 as well as the longer comment in the startDownload() + // function within browser/base/content/aboutDialog-appUpdater.js. + if (!aus.isDownloading) { + var state = aus.downloadUpdate(gUpdates.update, false); + if (state == "failed") { + // We've tried as hard as we could to download a valid update - + // we fell back from a partial patch to a complete patch and even + // then we couldn't validate. Show a validation error with + // instructions on how to manually update. + this.cleanUp(); + gUpdates.wiz.goTo("errors"); + return; + } } + // Add this UI as a listener for active downloads aus.addDownloadListener(this);

1 0

[tor-browser-build/master] Bug 29556: Fix nightly builds emails
by boklm＠torproject.org 22 Feb '19

22 Feb '19

commit abcc56a2ebf32a4ceeea2554b5dea3ab1f6d2fd0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Feb 22 12:01:25 2019 +0100 Bug 29556: Fix nightly builds emails By default dma will send emails by connecting to the configured mail server on port 25. According to https://riseup.net/en/email/clients we should be connecting to mail.riseup.net on port 587. --- tools/ansible/group_vars/boklm-tbb-nightly/dma.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/ansible/group_vars/boklm-tbb-nightly/dma.yml b/tools/ansible/group_vars/boklm-tbb-nightly/dma.yml index b210a3a..0148da5 100644 --- a/tools/ansible/group_vars/boklm-tbb-nightly/dma.yml +++ b/tools/ansible/group_vars/boklm-tbb-nightly/dma.yml @@ -1,6 +1,7 @@ --- dma_conf: | SMARTHOST mail.riseup.net + PORT 587 AUTHPATH /etc/dma/auth.conf SECURETRANSFER STARTTLS

1 0

[tor-browser-build/master] Bug 25849: Enable Rust in Tor for Windows nightlies
by boklm＠torproject.org 21 Feb '19

21 Feb '19

commit 3de8afa44fa4a7078f917263147f6e19107e3141 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Feb 10 20:30:19 2019 +0000 Bug 25849: Enable Rust in Tor for Windows nightlies --- projects/rust/build | 6 +- projects/rust/config | 4 +- projects/rust/unwind_128.patch | 161 +++++++++++++++++++++++++++++++++++++++++ projects/tor/build | 10 ++- projects/tor/config | 3 +- 5 files changed, 178 insertions(+), 6 deletions(-) diff --git a/projects/rust/build b/projects/rust/build index 12f012a..3c1d130 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -59,7 +59,11 @@ cd /var/tmp/build/rustc-[% c('version') %]-src # See: https://github.com/rust-lang/rust/issues/12859 for discussion about # that and https://github.com/rust-lang/rust/pull/49633 for a newer attempt to # fix this problem. We apply the patch from neersighted. - patch -p1 < $rootdir/unwind.patch + [% IF !c("input_file_var/unwind_128") %] + patch -p1 < $rootdir/unwind.patch + [% ELSE %] + patch -p1 < $rootdir/unwind_128.patch + [% END %] [% END %] [% IF c("var/android") %] diff --git a/projects/rust/config b/projects/rust/config index 99d1177..48912ab 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -89,7 +89,9 @@ input_files: file_gpg_id: 1 gpg_keyring: rust.gpg - filename: unwind.patch - enable: '[% c("var/windows-i686") %]' + enable: '[% c("var/windows-i686") && !c("input_file_var/unwind_128") %]' + - filename: unwind_128.patch + enable: '[% c("input_file_var/unwind_128") %]' - filename: 0001-Make-sure-dl_iterate_phdr-is-undefined-on-Android.patch enable: '[% c("var/android") %]' - filename: replace_pagesize_in_mmap.patch diff --git a/projects/rust/unwind_128.patch b/projects/rust/unwind_128.patch new file mode 100644 index 0000000..93528c9 --- /dev/null +++ b/projects/rust/unwind_128.patch @@ -0,0 +1,161 @@ +From 0a186eafebf26ca01879827a4cc95cc274791334 Mon Sep 17 00:00:00 2001 +From: Bjorn Neergaard <bjorn(a)neersighted.com> +Date: Sat, 9 Feb 2019 19:39:23 +0000 +Subject: [PATCH] Fix cross-compiling i686-pc-windows-gnu from Linux + +This is still very rough and serves as a proof-of-concept for fixing +Linux -> 32-bit MinGW cross compilation workflow. Currently, clang and +GCC's MinGW targets both only support DW2 (DWARF) or SJLJ (Set Jump Long +Jump) unwinding on 32-bit Windows. + +The default for GCC (and the way it is shipped on every major distro) is +to use SJLJ on Windows, as DWARF cannot traverse non-DWARF frames. This +would work fine, except for the fact that libgcc (our C runtime on the +MinGW platform) exports symbols under a different name when configured +to use SJLJ-style unwinding, and uses a preprocessor macro internally to +alias them. + +Because of this, we have to detect this scenario and link to the correct +symbols ourselves. Linking has been tested with a full bootstrap on both +x86_64-unknown-linux-gnu and i686-pc-windows-gnu, as well as +cross-compilation of some of my own projects. + +Obviously, the detection is a bit unrefined. Right now we +unconditionally use SJLJ when compiling Linux -> MinGW. I'd like to add +feature detection using compiler build flags or autotools-style +compilation and object analysis. Input on the best way to proceed here +is welcome. + +Also, currently there is copy-pasted/duplicated code in libunwind. +Ideally, this could be reduced, but this would likely require a +rethinking of how iOS is special-cased above, to avoid further +duplication. Input on how to best structure this file is requested. + +diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs +index 11d9154ba6..bd8ff844f7 100644 +--- a/src/bootstrap/compile.rs ++++ b/src/bootstrap/compile.rs +@@ -154,6 +154,11 @@ pub fn std_cargo(builder: &Builder, + } else { + let mut features = builder.std_features(); + ++ // FIXME: Temporary detection of SJLJ MinGW compilers. ++ if builder.config.build.contains("linux") && target == "i686-pc-windows-gnu" { ++ features.push_str(" sjlj_eh"); ++ } ++ + // When doing a local rebuild we tell cargo that we're stage1 rather than + // stage0. This works fine if the local rust and being-built rust have the + // same view of what the default allocator is, but fails otherwise. Since +diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml +index 5a2dce5930..e1c876f503 100644 +--- a/src/libstd/Cargo.toml ++++ b/src/libstd/Cargo.toml +@@ -50,3 +50,4 @@ force_alloc_system = [] + panic-unwind = ["panic_unwind"] + profiler = ["profiler_builtins"] + wasm_syscall = [] ++sjlj_eh = ["unwind/sjlj_eh"] +diff --git a/src/libunwind/Cargo.toml b/src/libunwind/Cargo.toml +index 4760461df6..27c7303604 100644 +--- a/src/libunwind/Cargo.toml ++++ b/src/libunwind/Cargo.toml +@@ -15,3 +15,6 @@ doc = false + core = { path = "../libcore" } + libc = { path = "../rustc/libc_shim" } + compiler_builtins = { path = "../rustc/compiler_builtins_shim" } ++ ++[features] ++sjlj_eh = [] +diff --git a/src/libunwind/libunwind.rs b/src/libunwind/libunwind.rs +index 73a259bd44..ff3404864f 100644 +--- a/src/libunwind/libunwind.rs ++++ b/src/libunwind/libunwind.rs +@@ -10,11 +10,6 @@ + + #![allow(bad_style)] + +-macro_rules! cfg_if { +- ( $( if #[cfg( $meta:meta )] { $($it1:item)* } else { $($it2:item)* } )* ) => +- ( $( $( #[cfg($meta)] $it1)* $( #[cfg(not($meta))] $it2)* )* ) +-} +- + use libc::{c_int, c_void, uintptr_t}; + + #[repr(C)] +@@ -83,8 +78,8 @@ pub enum _Unwind_Context {} + pub type _Unwind_Exception_Cleanup_Fn = extern "C" fn(unwind_code: _Unwind_Reason_Code, + exception: *mut _Unwind_Exception); + extern "C" { +- #[unwind(allowed)] +- pub fn _Unwind_Resume(exception: *mut _Unwind_Exception) -> !; ++ #[cfg_attr(stage0, unwind)] ++ #[cfg_attr(not(stage0), unwind(allowed))] + pub fn _Unwind_DeleteException(exception: *mut _Unwind_Exception); + pub fn _Unwind_GetLanguageSpecificData(ctx: *mut _Unwind_Context) -> *mut c_void; + pub fn _Unwind_GetRegionStart(ctx: *mut _Unwind_Context) -> _Unwind_Ptr; +@@ -216,26 +211,52 @@ if #[cfg(all(any(target_os = "ios", target_os = "netbsd", not(target_arch = "arm + pc + } + } ++} // cfg_if! + +-if #[cfg(not(all(target_os = "ios", target_arch = "arm")))] { +- // Not 32-bit iOS ++cfg_if! { ++if #[cfg(all(target_os = "ios", target_arch = "arm"))] { ++ // 32-bit iOS uses SjLj and does not provide _Unwind_Backtrace() + extern "C" { +- #[unwind(allowed)] +- pub fn _Unwind_RaiseException(exception: *mut _Unwind_Exception) -> _Unwind_Reason_Code; ++ #[cfg_attr(stage0, unwind)] ++ #[cfg_attr(not(stage0), unwind(allowed))] ++ pub fn _Unwind_Resume(exception: *mut _Unwind_Exception) -> !; ++ pub fn _Unwind_SjLj_RaiseException(e: *mut _Unwind_Exception) -> _Unwind_Reason_Code; ++ } ++ ++ #[inline] ++ pub unsafe fn _Unwind_RaiseException(exc: *mut _Unwind_Exception) -> _Unwind_Reason_Code { ++ _Unwind_SjLj_RaiseException(exc) ++ } ++ ++} else if #[cfg(feature = "sjlj_eh")] { ++ extern "C" { ++ #[cfg_attr(stage0, unwind)] ++ #[cfg_attr(not(stage0), unwind(allowed))] ++ pub fn _Unwind_SjLj_Resume(e: *mut _Unwind_Exception) -> !; ++ pub fn _Unwind_SjLj_RaiseException(e: *mut _Unwind_Exception) -> _Unwind_Reason_Code; + pub fn _Unwind_Backtrace(trace: _Unwind_Trace_Fn, + trace_argument: *mut c_void) + -> _Unwind_Reason_Code; + } +-} else { +- // 32-bit iOS uses SjLj and does not provide _Unwind_Backtrace() +- extern "C" { +- #[unwind(allowed)] +- pub fn _Unwind_SjLj_RaiseException(e: *mut _Unwind_Exception) -> _Unwind_Reason_Code; ++ ++ #[inline] ++ pub unsafe fn _Unwind_Resume(exc: *mut _Unwind_Exception) -> ! { ++ _Unwind_SjLj_Resume(exc) + } + + #[inline] + pub unsafe fn _Unwind_RaiseException(exc: *mut _Unwind_Exception) -> _Unwind_Reason_Code { + _Unwind_SjLj_RaiseException(exc) + } ++} else { ++ extern "C" { ++ #[cfg_attr(stage0, unwind)] ++ #[cfg_attr(not(stage0), unwind(allowed))] ++ pub fn _Unwind_Resume(exception: *mut _Unwind_Exception) -> !; ++ pub fn _Unwind_RaiseException(exception: *mut _Unwind_Exception) -> _Unwind_Reason_Code; ++ pub fn _Unwind_Backtrace(trace: _Unwind_Trace_Fn, ++ trace_argument: *mut c_void) ++ -> _Unwind_Reason_Code; ++ } + } + } // cfg_if! +-- +2.20.1 + diff --git a/projects/tor/build b/projects/tor/build index e9bd326..f063693 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -24,7 +24,7 @@ mkdir -p /var/tmp/build tar -C /var/tmp/dist -xf [% c('input_files_by_name/openssl') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/libevent') %] -[% IF (c("var/linux") || c("var/osx")) && c("var/nightly") %] +[% IF !c("var/android") && c("var/nightly") %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %] export PATH=/var/tmp/dist/rust/bin:$PATH [% END %] @@ -33,6 +33,10 @@ libeventdir=/var/tmp/dist/libevent openssldir=/var/tmp/dist/openssl [% IF c("var/windows") %] + [% IF ("var/nightly") %] + # We are compiling Tor with Rust enabled for nightlies. + export TOR_RUST_TARGET=[% c("arch") %]-pc-windows-gnu + [% END %] tar -C /var/tmp/build -xf [% c('input_files_by_name/zlib') %] zlibdir=/var/tmp/build/zlib mingwlibs=/var/tmp/dist/mingw-w64/[% c("arch") %]-w64-mingw32/bin/ @@ -74,11 +78,11 @@ cd /var/tmp/build/[% project %]-[% c('version') %] echo '"[% c("abbrev", { abbrev_length => 16 }) %]"' > micro-revision.i ./autogen.sh find -type f -print0 | xargs -0 [% c("var/touch") %] -[% IF (c("var/linux") || c("var/osx")) && c("var/nightly") %]TOR_RUST_DEPENDENCIES=`pwd`/src/ext/rust/crates[% END %] ./configure --disable-asciidoc --with-libevent-dir="$libeventdir" --with-openssl-dir="$openssldir" \ +[% IF !c("var/android") && c("var/nightly") %]TOR_RUST_DEPENDENCIES=`pwd`/src/ext/rust/crates[% END %] ./configure --disable-asciidoc --with-libevent-dir="$libeventdir" --with-openssl-dir="$openssldir" \ [% IF c("var/asan") %]--enable-fragile-hardening[% END %] \ [% IF c("var/windows") %]--with-zlib-dir="$zlibdir"[% END %] \ [% IF c("var/osx") %]--enable-static-openssl[% END %] \ - [% IF (c("var/linux") || c("var/osx")) && c("var/nightly") %]--enable-rust[% END %] \ + [% IF !c("var/android") && c("var/nightly") %]--enable-rust[% END %] \ --prefix="$distdir" [% c("var/configure_opt") %] [% IF c("var/osx") || c("var/windows") -%] export LD_PRELOAD=[% c("var/faketime_path") %] diff --git a/projects/tor/config b/projects/tor/config index e6e923b..af90885 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -65,4 +65,5 @@ input_files: input_file_var: rust_version: 1.28.0 prev_version: 1.27.2 - enable: '[% (c("var/linux") || c("var/osx")) && c("var/nightly") %]' + unwind_128: '[% c("var/windows-i686") %]' + enable: '[% !c("var/android") && c("var/nightly") %]'

1 0