- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 29349: Remove network.http.spdy.* overrides from meek helper user.js.
by gk＠torproject.org 06 Feb '19

06 Feb '19

commit 9117e69a41563c21621d7337357d9da7c8958573 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Feb 5 22:13:56 2019 +0000 Bug 29349: Remove network.http.spdy.* overrides from meek helper user.js. First added in https://bugs.torproject.org/15512 for Firefox 38 ESR, these are no longer needed. Tor Browser no longer sets these to false: https://bugs.torproject.org/14952#comment:49 https://github.com/arthuredelstein/tor-browser/commit/14952+1 network.http.spdy.enabled.http2draft no longer even exists: https://bugzilla.mozilla.org/show_bug.cgi?id=1132357 network.http.spdy.enabled.v3-1 no longer even exists: https://bugzilla.mozilla.org/show_bug.cgi?id=1248197 --- .../tor-browser/Bundle-Data/PTConfigs/meek-http-helper-user.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/meek-http-helper-user.js b/projects/tor-browser/Bundle-Data/PTConfigs/meek-http-helper-user.js index 820335d..c62b066 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/meek-http-helper-user.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/meek-http-helper-user.js @@ -9,14 +9,6 @@ user_pref("browser.dom.window.dump.enabled", true); // https://trac.torproject.org/projects/tor/ticket/13442#comment:1 user_pref("security.ssl.disable_session_identifiers", false); -// Enable SPDY and HTTP/2 as they are in Firefox 38, for a matching ALPN -// extension. -// https://trac.torproject.org/projects/tor/ticket/15512 -user_pref("network.http.spdy.enabled", true); -user_pref("network.http.spdy.enabled.http2", true); -user_pref("network.http.spdy.enabled.http2draft", true); -user_pref("network.http.spdy.enabled.v3-1", true); - // Disable safe mode. In case of a crash, we don't want to prompt for a // safe-mode browser that has extensions disabled. // https://support.mozilla.org/en-US/questions/951221#answer-410562

1 0

[tor-browser-build/master] Bug 29325: Use Yawning's utls fork
by gk＠torproject.org 05 Feb '19

05 Feb '19

commit 50193b4aff592e79b5a45fccb2a1547cef8e2691 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Feb 5 19:54:13 2019 +0100 Bug 29325: Use Yawning's utls fork The nightly version of obfs4 now requires Yawning's utls fork, so we change projects/goutls to use Yawning's fork. While doing that we rename keyring/obfs4.gpg to keyring/yawning.gpg, to use the same keyring in obfs4 and goutls. And we refresh it to get the new subkeys. --- keyring/{obfs4.gpg => yawning.gpg} | Bin 41312 -> 58959 bytes projects/gocompress/config | 17 +++++++++++++++++ projects/goutls/config | 13 +++++++++---- projects/obfs4/config | 2 +- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/keyring/obfs4.gpg b/keyring/yawning.gpg similarity index 65% rename from keyring/obfs4.gpg rename to keyring/yawning.gpg index f26a4cd..e3384c5 100644 Binary files a/keyring/obfs4.gpg and b/keyring/yawning.gpg differ diff --git a/projects/gocompress/config b/projects/gocompress/config new file mode 100644 index 0000000..c675362 --- /dev/null +++ b/projects/gocompress/config @@ -0,0 +1,17 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/dsnet/compress +git_hash: cc9eb1d7ad760af14e8f918698f745e80377af4f +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/dsnet/compress + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/goutls/config b/projects/goutls/config index bdd5273..b21dea9 100644 --- a/projects/goutls/config +++ b/projects/goutls/config @@ -1,7 +1,9 @@ # vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' -git_url: https://github.com/refraction-networking/utls -git_hash: a89e7e6da482a5a0db02578fc606ace9ccfbea62 +git_url: https://gitlab.com/yawning/utls.git +version: 0.0.9-2 +git_hash: 'v[% c("version") %]' +tag_gpg_id: 1 +gpg_keyring: yawning.gpg filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -9,9 +11,10 @@ build: '[% c("projects/go/var/build_go_lib") %]' var: container: use_container: 1 - go_lib: github.com/refraction-networking/utls + go_lib: gitlab.com/yawning/utls.git go_lib_deps: - goxcrypto + - gocompress input_files: - project: container-image @@ -19,3 +22,5 @@ input_files: project: go - name: goxcrypto project: goxcrypto + - name: gocompress + project: gocompress diff --git a/projects/obfs4/config b/projects/obfs4/config index 2c94f10..32d3435 100644 --- a/projects/obfs4/config +++ b/projects/obfs4/config @@ -3,7 +3,7 @@ version: 0.0.7 git_url: https://git.torproject.org/pluggable-transports/obfs4.git git_hash: 'obfs4proxy-[% c("version") %]' tag_gpg_id: 1 -gpg_keyring: obfs4.gpg +gpg_keyring: yawning.gpg filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var:

1 0

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

05 Feb '19

commit d176b2c555c1f0298ab8764bcb6c4fda8dc255ff Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jan 16 15:06:07 2019 -0500 Bug 28885: notify users that update is downloading Add a "Downloading Tor Browser update" item which appears in the hamburger (app) menu while the update service is downloading a MAR file. Before this change, the browser did not indicate to the user that an update was in progress, which is especially confusing in Tor Browser because downloads often take some time. If the user clicks on the new menu item, the about dialog is opened to allow the user to see download progress. As part of this fix, the update service was changed to always show update-related messages in the hamburger menu, even if the update was started in the foreground via the about dialog or via the "Check for Tor Browser Update" toolbar menu item. This change is consistent with the Tor Browser goal of making sure users are informed about the update process. --- 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.0esr-8.5-1] Bug 29180: MAR download stalls when about dialog is opened
by gk＠torproject.org 05 Feb '19

05 Feb '19

commit ffda294141584fdf69257e2a04fbcc7d4705ca3f Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jan 31 10:01:14 2019 -0500 Bug 29180: MAR download stalls when about dialog is opened Avoid stopping and restarting the download when the about dialog or update dialog is opened. This avoids a race between canceling the MAR download and trying to start a new download. --- 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/tor-browser-60.5.0esr-8.5-1] fixup! Bug 23247: Communicating security expectations for .onion
by gk＠torproject.org 04 Feb '19

04 Feb '19

commit 71eb1c774844d5662184914f4defd76110fe0ef7 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Feb 4 09:09:10 2019 +0000 fixup! Bug 23247: Communicating security expectations for .onion This commit fixes #29327. --- browser/base/content/pageinfo/security.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/browser/base/content/pageinfo/security.js b/browser/base/content/pageinfo/security.js index 5a827488ccad..ef12ddb0099f 100644 --- a/browser/base/content/pageinfo/security.js +++ b/browser/base/content/pageinfo/security.js @@ -52,7 +52,10 @@ var security = { (ui.state & Ci.nsIWebProgressListener.STATE_IS_INSECURE); var isEV = (ui.state & Ci.nsIWebProgressListener.STATE_IDENTITY_EV_TOPLEVEL); - var isOnion = hostName.endsWith(".onion"); + var isOnion = false; + if (hostName && hostName.endsWith(".onion")) { + isOnion = true; + } ui.QueryInterface(nsISSLStatusProvider); var status = ui.SSLStatus;

1 0

[tor-browser-build/master] Bug 29235: Build our own version of python3.6
by gk＠torproject.org 01 Feb '19

01 Feb '19

commit 66a0ab022c3c539a3756771cf72e793fa2e861e7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jan 30 20:54:51 2019 +0100 Bug 29235: Build our own version of python3.6 The build of HTTPS-Everywhere requires python3.6, however the python3.6 package which we were using has now been removed from Debian Unstable. We now build python 3.6 ourselves. As the different platforms use a different suite by default, we add the common-stretch target to rbm.conf, which we use to avoid building a different python for each platform. --- keyring/python.gpg | Bin 0 -> 4302 bytes projects/debootstrap-image/config | 7 ------- projects/https-everywhere/build | 1 + projects/https-everywhere/config | 9 ++++++--- projects/python/build | 14 ++++++++++++++ projects/python/config | 25 +++++++++++++++++++++++++ rbm.conf | 17 +++++++++++++++++ 7 files changed, 63 insertions(+), 10 deletions(-) diff --git a/keyring/python.gpg b/keyring/python.gpg new file mode 100644 index 0000000..66711fd Binary files /dev/null and b/keyring/python.gpg differ diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index c916e9f..7e8b280 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -100,13 +100,6 @@ targets: suite: jessie arch: i386 - buster-amd64: - var: - minimal_apt_version: '1.8.0~alpha3.1' - container: - suite: buster - arch: amd64 - stretch-amd64: var: minimal_apt_version: 1.4.9 diff --git a/projects/https-everywhere/build b/projects/https-everywhere/build index 10dd4bf..88431e0 100644 --- a/projects/https-everywhere/build +++ b/projects/https-everywhere/build @@ -1,5 +1,6 @@ #!/bin/bash [% c("var/set_default_env") -%] +[% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %] tar xf [% project %]-[% c('version') %].tar.gz cd [% project %]-[% c('version') %] ./make.sh diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 59eb463..1be120b 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -10,18 +10,17 @@ var: # HTTPS Everywhere is expected to be the same on all platforms. To avoid # building the same thing 4 times, using 4 different container images # (each one with a different suite or architecture), we set the container - # to buster/amd64 for all platforms. This allows us to create only one + # to stretch/amd64 for all platforms. This allows us to create only one # container image, and also build the extension only one time as the # filename does not contain the platform, and var/build_id should be # the same since there is now nothing platform specific in the build # inputs. This allows us to save a little time and disk space. container: use_container: 1 - suite: buster + suite: stretch arch: amd64 deps: - git - - python3.6 - libxslt1.1 - libxml2-utils - sqlite3 @@ -31,3 +30,7 @@ var: input_files: - project: container-image + - project: python + name: python + target: + - common-stretch diff --git a/projects/python/build b/projects/python/build new file mode 100644 index 0000000..1fff7ce --- /dev/null +++ b/projects/python/build @@ -0,0 +1,14 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir=/var/tmp/dist/[% project %] +mkdir -p $distdir +tar xf [% c('input_files_by_name/python') %] +cd Python-[% c('version') %] +./configure --prefix=$distdir +make -j[% c("buildconf/num_procs") %] +make prefix=$distdir install +cd /var/tmp/dist +[% c('tar', { + tar_src => 'python', + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/python/config b/projects/python/config new file mode 100644 index 0000000..10c79cc --- /dev/null +++ b/projects/python/config @@ -0,0 +1,25 @@ +# vim: filetype=yaml sw=2 +version: 3.6.8 +filename: 'python-[% c("lsb_release/id") %]-[% c("lsb_release/release") %]-[% c("var/build_id") %].tar.gz' +var: + container: + use_container: 1 + deps: + - xz-utils + - build-essential + - python-all + - zlib1g-dev + - libssl-dev + + setup: | + mkdir -p /var/tmp/dist + tar -C /var/tmp/dist -xf $rootdir/[% c("python_tarfile") %] + export PATH=/var/tmp/dist/python/bin:"$PATH" + +input_files: + - project: container-image + - name: python + URL: 'https://www.python.org/ftp/python/[% c("version") %]/Python-[% c("version") %].tar.xz' + gpg_keyring: python.gpg + sig_ext: asc + file_gpg_id: 1 diff --git a/rbm.conf b/rbm.conf index 810eae8..381eab6 100644 --- a/rbm.conf +++ b/rbm.conf @@ -140,6 +140,23 @@ targets: # Don't create mar files to save time build_mar: 0 + # The common-stretch target is used to build components that are common to all + # platforms, using Debian stretch. + common-stretch: + var: + common: 1 + container: + suite: stretch + arch: amd64 + deps: + - build-essential + - python + - bison + - automake + - libtool + - zip + - unzip + torbrowser-android-armv7: - android-armv7 android-armv7:

1 0

[torbutton/master] Bug 29239: Don't ship the Torbutton .xpi on mobile
by gk＠torproject.org 31 Jan '19

31 Jan '19

commit 70035640b586301baa4eebff868460c1e939b8e3 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 31 12:42:50 2019 +0000 Bug 29239: Don't ship the Torbutton .xpi on mobile We include Torbutton directly into the browser on Android. The features .xpi we bundle is not used. Patch idea by sysrqb(a)torproject.org. --- moz.build | 3 --- 1 file changed, 3 deletions(-) diff --git a/moz.build b/moz.build index 5e067c98..28f592f8 100644 --- a/moz.build +++ b/moz.build @@ -7,6 +7,3 @@ JAR_MANIFESTS += ['src/jar.mn'] JS_PREFERENCE_FILES += [ 'src/defaults/preferences/preferences.js', ] -FINAL_TARGET_FILES.features['torbutton(a)torproject.org'] += [ - 'src/install.rdf' -]

1 0

[tor-browser-build/master] Bug 29181: Add a version number in debootstrap-image filename
by gk＠torproject.org 30 Jan '19

30 Jan '19

commit 592acedeb13ec0d08087b4cd2fb414b04431fb13 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jan 25 17:37:43 2019 +0100 Bug 29181: Add a version number in debootstrap-image filename Updating this version number will cause the old images created by debootstrap-image to be discarded when a new image is built by container-image. However existing images from container-image will not be discarded as container-image's filename doesn't depend on debootstrap-image's filename. --- projects/debootstrap-image/config | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index a1d26cb..c916e9f 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -1,5 +1,6 @@ # vim: filetype=yaml sw=2 -filename: 'container-image_[% c("var/container/suite") %]-[% c("var/container/arch") %].tar.gz' +filename: 'container-image_[% c("var/container/suite") %]-[% c("var/container/arch") %]-[% c("version") %].tar.gz' +version: 1 pkg_type: build var:

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_29181_v2'
by gk＠torproject.org 30 Jan '19

30 Jan '19

commit 929c3f8d6fe4d6182d4dfce2472581ccc45824f0 Merge: 9bac5b8 592aced Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 30 19:51:34 2019 +0000 Merge remote-tracking branch 'boklm/bug_29181_v2' projects/debootstrap-image/config | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[tor-browser-build/master] Bug 29167: Upgrade go to 1.11.5.
by gk＠torproject.org 30 Jan '19

30 Jan '19

commit 9bac5b8ddc129cc0349f1c6350f819f8ba29af94 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jan 24 21:00:34 2019 +0000 Bug 29167: Upgrade go to 1.11.5. --- projects/go/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/go/config b/projects/go/config index 1841705..be9f84d 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.11.1 +version: 1.11.5 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -84,7 +84,7 @@ input_files: enable: '[% c("var/windows") || c("var/osx") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 558f8c169ae215e25b81421596e8de7572bd3ba824b79add22fba6e284db1117 + sha256sum: bc1ef02bb1668835db1390a2e478dcbccb5dd16911691af9d75184bbe5aa943e - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959

1 0

[tor-browser-build/master] Bug 29193: Update goxnet commit in nightly
by gk＠torproject.org 29 Jan '19

29 Jan '19

commit 23f8101525288ccdd6ccef2035a698c4e9f1b232 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jan 29 15:26:50 2019 +0100 Bug 29193: Update goxnet commit in nightly --- projects/goxnet/config | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/projects/goxnet/config b/projects/goxnet/config index f33cb32..6aa5a0e 100644 --- a/projects/goxnet/config +++ b/projects/goxnet/config @@ -13,6 +13,12 @@ var: go_lib_install: - golang.org/x/net/proxy +targets: + nightly: + # Nightly version of obfs4 requires a more recent version of goxnet + # See bug 29193 + git_hash: ed066c81e75eba56dd9bd2139ade88125b855585 + input_files: - project: container-image - name: go

1 0

[tor-browser-build/master] Bug 29178: Don't build master of goxcrypto, goxnet, uniuri and go-webrtc
by gk＠torproject.org 28 Jan '19

28 Jan '19

commit 5bad67e4f31d984702c530cbd423d83d009e699a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jan 28 12:11:24 2019 +0100 Bug 29178: Don't build master of goxcrypto, goxnet, uniuri and go-webrtc --- projects/go-webrtc/config | 2 -- projects/goxcrypto/config | 4 ---- projects/goxnet/config | 4 ---- projects/uniuri/config | 4 ---- 4 files changed, 14 deletions(-) diff --git a/projects/go-webrtc/config b/projects/go-webrtc/config index 8b171f9..8136122 100644 --- a/projects/go-webrtc/config +++ b/projects/go-webrtc/config @@ -35,8 +35,6 @@ var: [% END -%] targets: - master: - git_hash: master linux: var: arch_deps: diff --git a/projects/goxcrypto/config b/projects/goxcrypto/config index fe73f93..698f94b 100644 --- a/projects/goxcrypto/config +++ b/projects/goxcrypto/config @@ -19,10 +19,6 @@ var: go_lib_deps: - goxsys -targets: - nightly: - git_hash: master - input_files: - project: container-image - name: go diff --git a/projects/goxnet/config b/projects/goxnet/config index ec368a2..f33cb32 100644 --- a/projects/goxnet/config +++ b/projects/goxnet/config @@ -13,10 +13,6 @@ var: go_lib_install: - golang.org/x/net/proxy -targets: - nightly: - git_hash: master - input_files: - project: container-image - name: go diff --git a/projects/uniuri/config b/projects/uniuri/config index e4c7294..5eea6e2 100644 --- a/projects/uniuri/config +++ b/projects/uniuri/config @@ -11,10 +11,6 @@ var: use_container: 1 go_lib: github.com/dchest/uniuri -targets: - nightly: - git_hash: master - input_files: - project: container-image - name: go

1 0

[tor-browser-build/master] Tagging build4 to fix Windows reproducibility issues
by gk＠torproject.org 28 Jan '19

28 Jan '19

commit c027caa95d205ec3761215e8b671c999866435b1 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 28 09:33:24 2019 +0000 Tagging build4 to fix Windows reproducibility issues --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 - rbm.conf | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index c0e2a38..5a9feb7 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -24,7 +24,6 @@ Tor Browser 8.5a7 -- January 29 2019 * Bug 22654: Firefox icon is shown for Tor Browser on Windows 10 start menu * Bug 27503: Compile with accessibility support * Bug 28874: Bump mingw-w64 commit to fix WebGL crash - * Bug 28546: Rebrand Tor Browser's Window's Installer * Bug 12885: Windows Jump Lists fail for Tor Browser * Bug 28618: Set MOZILLA_OFFICIAL for Windows build * OS X diff --git a/rbm.conf b/rbm.conf index 74d922b..810eae8 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.5a7' - torbrowser_build: 'build3' + torbrowser_build: 'build4' torbrowser_incremental_from: - 8.5a6 project_name: tor-browser

1 0

[tor-browser-build/master] Revert "Bug 28546: Rebrand Tor Browser's Window's Installer"
by gk＠torproject.org 28 Jan '19

28 Jan '19

commit b25cd533f1ae26c2ee65bc5bef57a33d98f83363 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 28 09:32:00 2019 +0000 Revert "Bug 28546: Rebrand Tor Browser's Window's Installer" This reverts commit 031ecd732636c627ea3b6343869d96ccbf3d2df0. We need to back this out for now because it is causing reproducibility issues, see #29185. --- projects/tbb-windows-installer/config | 2 +- projects/tor-browser/build | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/tbb-windows-installer/config b/projects/tbb-windows-installer/config index 0ec7b0a..a990229 100644 --- a/projects/tbb-windows-installer/config +++ b/projects/tbb-windows-installer/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.6 +version: 0.5 git_url: https://github.com/moba/tbb-windows-installer.git git_hash: 'v[% c("version") %]' tag_gpg_id: 1 diff --git a/projects/tor-browser/build b/projects/tor-browser/build index bc663c2..4661f7a 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -303,7 +303,7 @@ cd $distdir [% ELSIF c("var/windows") %] find "$PKG_DIR" -exec [% c("var/touch") %] {} \; pushd "$PKG_DIR" - makensis -DCHANNEL=[% c("var/channel") %] torbrowser.nsi + makensis torbrowser.nsi # Working around NSIS braindamage mv torbrowser-install.exe torbrowser-install-tmp.exe python $rootdir/pe_checksum_fix.py @@ -392,7 +392,7 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ [% ELSIF c("var/windows") %] find "[% tbdir %]" -exec [% c("var/touch") %] {} \; pushd "[% tbdir %]" - makensis -DCHANNEL=[% c("var/channel") %] torbrowser.nsi + makensis torbrowser.nsi # Working around NSIS braindamage mv torbrowser-install.exe torbrowser-install-tmp.exe python $rootdir/pe_checksum_fix.py

1 0

[tor-browser-build/master] Fix 8.5a7 release year
by gk＠torproject.org 27 Jan '19

27 Jan '19

commit 2ffa418535f8a9baf7ba4894610e91633d876670 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jan 27 15:53:56 2019 +0000 Fix 8.5a7 release year 2018 is gone. Get over it. --- 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 46ba50f..c0e2a38 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 8.5a7 -- January 29 2018 +Tor Browser 8.5a7 -- January 29 2019 * All Platforms * Update Firefox to 60.5.0esr * Update Torbutton to 2.1.4

1 0

[tor-browser-build/master] Picking up fix for Android build bustage
by gk＠torproject.org 26 Jan '19

26 Jan '19

commit 71b5a3b40429a4286b4aafbb3f9cb5b168aeff99 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jan 26 09:19:08 2019 +0000 Picking up fix for Android build bustage --- projects/firefox/config | 2 +- rbm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 2556313..59ec1ee 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/rbm.conf b/rbm.conf index 2636d31..74d922b 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.5a7' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 8.5a6 project_name: tor-browser

1 0

[tor-browser/tor-browser-60.5.0esr-8.5-1] Bug 29182: Fix Android build bustage
by gk＠torproject.org 26 Jan '19

26 Jan '19

commit 4d0f9fa5fdd5831fbc2e28cb6c7b1056bd4deeab Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jan 26 08:10:39 2019 +0000 Bug 29182: Fix Android build bustage Updating the expat library (bug 1374012) resulted in broken compilation of Android builds as `arc4random_buf` is not defined compiling with our current toolchain. The upstream bug is https://bugzilla.mozilla.org/show_bug.cgi?id=1516642. Patch by a cypherpunk (mac198442). --- parser/expat/lib/xmlparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parser/expat/lib/xmlparse.c b/parser/expat/lib/xmlparse.c index 209f20e094dc..95ff14f8e154 100644 --- a/parser/expat/lib/xmlparse.c +++ b/parser/expat/lib/xmlparse.c @@ -839,7 +839,7 @@ generate_hash_secret_salt(XML_Parser parser) { unsigned long entropy; (void)parser; -#if defined(HAVE_ARC4RANDOM_BUF) || defined(__CloudABI__) +#if !defined(__ANDROID__) && (defined(HAVE_ARC4RANDOM_BUF) || defined(__CloudABI__)) (void)gather_time_entropy; arc4random_buf(&entropy, sizeof(entropy)); return ENTROPY_DEBUG("arc4random_buf", entropy);

1 0

[tor-browser-build/master] Use build2 for locales for mobile as well
by gk＠torproject.org 25 Jan '19

25 Jan '19

commit cac6014790f79e8819191ff9af9a69b10f2b52d0 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 25 16:21:20 2019 +0000 Use build2 for locales for mobile as well --- projects/firefox-locale-bundle/config | 2 +- rbm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/firefox-locale-bundle/config b/projects/firefox-locale-bundle/config index 2f4997f..2ea6db6 100644 --- a/projects/firefox-locale-bundle/config +++ b/projects/firefox-locale-bundle/config @@ -5,4 +5,4 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: use_container: 0 ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 diff --git a/rbm.conf b/rbm.conf index e929728..2636d31 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.5a7' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 8.5a6 project_name: tor-browser

1 0

[tor-browser-build/master] Release preparations for 8.5a7
by gk＠torproject.org 25 Jan '19

25 Jan '19

commit bcb6cc1a83246ff1018df5f937dfe36687d513d7 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 25 16:09:14 2019 +0000 Release preparations for 8.5a7 Versions bump and Changelog update --- projects/firefox/config | 2 +- projects/https-everywhere/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 53 ++++++++++++++++++++++ projects/tor/config | 2 +- projects/torbutton/config | 2 +- rbm.conf | 5 +- 6 files changed, 59 insertions(+), 7 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index b001354..2556313 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 60.4.0 + firefox_platform_version: 60.5.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 8.5 torbrowser_update_channel: alpha diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 3b45143..59eb463 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2018.10.31 +version: 2019.1.7 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index bd59467..46ba50f 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,56 @@ +Tor Browser 8.5a7 -- January 29 2018 + * All Platforms + * Update Firefox to 60.5.0esr + * Update Torbutton to 2.1.4 + * Bug 25702: Update Tor Browser icon to follow design guidelines + * Bug 21805: Add click-to-play button for WebGL + * Bug 28836: Links on about:tor are not clickable + * Bug 29035: Clean up our donation campaign and add newsletter sign-up link + * Translations update + * Code clean-up + * Update HTTPS Everywhere to 2019.1.7 + * Update NoScript to 10.2.1 + * Bug 28873: Cascading of permissions is broken + * Bug 28720: Some videos are blocked outright on higher security levels + * Bug 29082: Backport patches for bug 1469916 + * Bug 28711: Backport patches for bug 1474659 + * Bug 27828: "Check for Tor Browser update" doesn't seem to do anything + * Bug 29028: Auto-decline most canvas warning prompts again + * Bug 27597: Fix our debug builds + * Windows + * Update Tor to 0.4.0.1-alpha + * Bug 25702: Activity 1.1 Update Tor Browser icon to follow design guidelines + * Bug 28111: Use Tor Browser icon in identity box + * Bug 22654: Firefox icon is shown for Tor Browser on Windows 10 start menu + * Bug 27503: Compile with accessibility support + * Bug 28874: Bump mingw-w64 commit to fix WebGL crash + * Bug 28546: Rebrand Tor Browser's Window's Installer + * Bug 12885: Windows Jump Lists fail for Tor Browser + * Bug 28618: Set MOZILLA_OFFICIAL for Windows build + * OS X + * Update Tor to 0.4.0.1-alpha + * Bug 25702: Activity 1.1 Update Tor Browser icon to follow design guidelines + * Bug 28111: Use Tor Browser icon in identity box + * Linux + * Update Tor to 0.4.0.1-alpha + * Bug 25702: Activity 1.1 Update Tor Browser icon to follow design guidelines + * Bug 28111: Use Tor Browser icon in identity box + * Bug 27531: Fix crashing print dialog + * Android + * Bug 28705: Fix download crash on newer Android devices + * Bug 28814: Backport 1480079 to allow installing downloaded apps + * Build System + * All Platforms + * Bug 29158: Install updated apt packages (CVE-2019-3462) + * Bug 29097: Don't try to install python3.6-lxml for HTTPS Everywhere + * Windows + * Bug 26148: Update binutils to 2.31.1 + * Bug 29081: Harden libwinpthread + * Linux + * Bug 26148: Update binutils to 2.31.1 + * Android + * Bug 28752: Don't download tor-android-binary resources during build + Tor Browser 8.5a6 -- December 11 2018 * All Platforms * Update Firefox to 60.4.0esr diff --git a/projects/tor/config b/projects/tor/config index fe3bec9..e6e923b 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.3.5.5-alpha +version: 0.4.0.1-alpha git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/projects/torbutton/config b/projects/torbutton/config index 0fff877..5d42fc5 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.1.3 +version: 2.1.4 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 a397752..e929728 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,11 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.5a6' + torbrowser_version: '8.5a7' torbrowser_build: 'build1' torbrowser_incremental_from: - - 8.5a4 - - 8.5a5 + - 8.5a6 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser/tor-browser-60.5.0esr-8.5-1] fixup! Bug 1487263 - set requesting principal for macOS drags, r=mstange
by gk＠torproject.org 25 Jan '19

25 Jan '19

commit b6487d517d9982332f3bfad1f14b6e5ed9f77c53 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 25 10:56:09 2019 +0000 fixup! Bug 1487263 - set requesting principal for macOS drags, r=mstange --- widget/cocoa/nsDragService.mm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/widget/cocoa/nsDragService.mm b/widget/cocoa/nsDragService.mm index 47eacb5792a2..e712616b5b95 100644 --- a/widget/cocoa/nsDragService.mm +++ b/widget/cocoa/nsDragService.mm @@ -327,7 +327,8 @@ nsDragService::InvokeDragSessionImpl(nsIArray* aTransferableArray, } // Assign a principal: - currentTransferable->SetRequestingPrincipal(mSourceNode->NodePrincipal()); + nsCOMPtr<nsINode> node = do_QueryInterface(mSourceNode); + currentTransferable->SetRequestingPrincipal(node->NodePrincipal()); // Transform the transferable to an NSDictionary NSDictionary* pasteboardOutputDict =

1 0

[tor-browser/tor-browser-60.5.0esr-8.5-1] fixup! Bug 1469916, r=ckerschb, jkt
by gk＠torproject.org 25 Jan '19

25 Jan '19

commit 6dde994c6580634bd3cb9809c2eb0e02499e65b7 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 25 15:23:49 2019 +0000 fixup! Bug 1469916, r=ckerschb,jkt --- browser/components/shell/nsMacShellService.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/components/shell/nsMacShellService.cpp b/browser/components/shell/nsMacShellService.cpp index 3484a41530a7..a24814c0087b 100644 --- a/browser/components/shell/nsMacShellService.cpp +++ b/browser/components/shell/nsMacShellService.cpp @@ -156,8 +156,8 @@ nsMacShellService::SetDesktopBackground(nsIDOMElement* aElement, loadContext = do_QueryInterface(docShell); } - return wbp->SaveURI(imageURI, aElement->NodePrincipal(), nullptr, docURI, - aElement->OwnerDoc()->GetReferrerPolicy(), nullptr, + return wbp->SaveURI(imageURI, content->NodePrincipal(), nullptr, docURI, + content->OwnerDoc()->GetReferrerPolicy(), nullptr, nullptr, mBackgroundFile, loadContext); }

1 0

[tor-browser-build/master] Bug 27503: Adapt mozconfig files to enable accessibility on Windows
by boklm＠torproject.org 25 Jan '19

25 Jan '19

commit a0735614173b4d284bb70791d9c15d4d3f018599 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 22 10:58:41 2019 +0000 Bug 27503: Adapt mozconfig files to enable accessibility on Windows When bumping mingw-w64 for the crash fix in #28874 we forgot to adapt our Windows mozconfig files to take into account that we don't need to define CXXFLAGS anymore. The changes landed in commit a91a7e405752bbdbe39101f7aaeb1e1d932199db in the mingw-w64 repo. --- projects/firefox/mozconfig-windows-i686 | 3 --- projects/firefox/mozconfig-windows-x86_64 | 3 --- 2 files changed, 6 deletions(-) diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index a5e15f1..daeaed4 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -1,8 +1,5 @@ CROSS_COMPILE=1 -# https://bugzilla.mozilla.org/show_bug.cgi?id=1411401 -export CXXFLAGS="-DWIDL_EXPLICIT_AGGREGATE_RETURNS" - ac_add_options --enable-application=browser ac_add_options --target=i686-w64-mingw32 ac_add_options --with-toolchain-prefix=i686-w64-mingw32- diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64 index e7f857d..568d88d 100644 --- a/projects/firefox/mozconfig-windows-x86_64 +++ b/projects/firefox/mozconfig-windows-x86_64 @@ -1,8 +1,5 @@ CROSS_COMPILE=1 -# https://bugzilla.mozilla.org/show_bug.cgi?id=1411401 -export CXXFLAGS="-DWIDL_EXPLICIT_AGGREGATE_RETURNS" - ac_add_options --enable-application=browser ac_add_options --target=x86_64-w64-mingw32 ac_add_options --with-toolchain-prefix=x86_64-w64-mingw32-

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_27503_v3'
by boklm＠torproject.org 25 Jan '19

25 Jan '19

commit 97effd6d7380f76dd53e666b034113c84692f51a Merge: 15e8c53 0baa425 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jan 25 16:39:41 2019 +0100 Merge remote-tracking branch 'gk/bug_27503_v3'

1 0

[tor-browser-build/master] Bug 27503: Adapt mozconfig files to enable accessibility on Windows
by boklm＠torproject.org 25 Jan '19

25 Jan '19

commit 0baa4255304030ba1fbe450f6e1213b1550a0200 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 22 11:03:53 2019 +0000 Bug 27503: Adapt mozconfig files to enable accessibility on Windows --- projects/firefox/mozconfig-windows-i686 | 1 - projects/firefox/mozconfig-windows-x86_64 | 1 - 2 files changed, 2 deletions(-) diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index daeaed4..d541edb 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -25,5 +25,4 @@ ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc ac_add_options --disable-tests ac_add_options --disable-stylo # Bugzilla 1390583 -ac_add_options --disable-accessibility # https://sourceforge.net/p/mingw-w64/bugs/648/ ac_add_options --disable-jemalloc # Bugzilla 1466192 diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64 index 568d88d..70f47e2 100644 --- a/projects/firefox/mozconfig-windows-x86_64 +++ b/projects/firefox/mozconfig-windows-x86_64 @@ -25,5 +25,4 @@ ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc ac_add_options --disable-tests ac_add_options --disable-stylo # Bugzilla 1390583 -ac_add_options --disable-accessibility # https://sourceforge.net/p/mingw-w64/bugs/648/ ac_add_options --disable-jemalloc # Bugzilla 1466192

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Update Torbutton to 2.1.4
by gk＠torproject.org 25 Jan '19

25 Jan '19

commit d6b1a532a574f3f5b821fc2a000a4c1ec2d58311 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 25 08:46:13 2019 +0000 Update Torbutton to 2.1.4 --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 61c79b29f463..e2ca58b2dcda 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 61c79b29f463666548754d9a2a6b15c996df48ee +Subproject commit e2ca58b2dcda9e37e94c87bf77f443e103216100

1 0