- tbb-commits - lists.torproject.org

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_25849_v3'
by boklm＠torproject.org 21 Feb '19

21 Feb '19

commit d500c61974ff1cdbccd31a64181aa10cb1e9482f Merge: caa9e6d 3de8afa Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Feb 21 16:16:35 2019 +0100 Merge remote-tracking branch 'gk/bug_25849_v3' 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(-)

1 0

[tor-browser-build/master] Bug 23384: Add user pospeselr on build-sunet-a.torproject.net
by boklm＠torproject.org 12 Feb '19

12 Feb '19

commit caa9e6d5711ef098cfd7ba77fe88ad44e14cdd72 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Feb 12 20:56:32 2019 +0100 Bug 23384: Add user pospeselr on build-sunet-a.torproject.net --- tools/ansible/roles/tbb-team/defaults/main.yml | 1 + tools/ansible/roles/tbb-team/files/pospeselr.pub | 1 + 2 files changed, 2 insertions(+) diff --git a/tools/ansible/roles/tbb-team/defaults/main.yml b/tools/ansible/roles/tbb-team/defaults/main.yml index fa8ffa3..a1c091d 100644 --- a/tools/ansible/roles/tbb-team/defaults/main.yml +++ b/tools/ansible/roles/tbb-team/defaults/main.yml @@ -5,4 +5,5 @@ tbb_team_members: - gk - mcs - mikeperry + - pospeselr - sukhbir diff --git a/tools/ansible/roles/tbb-team/files/pospeselr.pub b/tools/ansible/roles/tbb-team/files/pospeselr.pub new file mode 100644 index 0000000..17274a4 --- /dev/null +++ b/tools/ansible/roles/tbb-team/files/pospeselr.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDN8+GoMp+QiVpBXK8raB2u+3+BdqCL1CCTRzVu6jr+nqvwF2zFgH6qW6WTz85PEM1Lm66wY3SNwsNoCr3Kt53MQa1g6V9sGudi7kYUoV3u7LxLVMwNKK9K6YZZjDFCWBmhcvw/ntFccShgkv8zSCtcbHp1bLivImFi8MCTHJ/Uul/moi0vd3OPXYWGhPQDnLW7+q3o6DenffvjkdP/88QIJe63b/TesLLiC+Czeuu6sTNftCgBVmMwHyYrFPeIrQsiz2tYNgG9Iyd06ElozouGywFvT/s6zKnQUw7J5Mcv4MLXIj/6n75r/g/lVNT3cwho5RlBkGCC+xUH7+Us2QliuILp1EgaVsqB989j4EyTrYoUxfBhtXlmUXbaydO0cYG2tVwk7QRx6PTPO1xcR/UXo3VPio9/BHCZ1d2CPV0xCaXoCMp09fTSLCBM4o0NoxrFJAfbM1cWY3R+tmXPmF4venISGnYqYXLk4rx/HfWiUxSl0tDPB1f/VL786kthRgLhI02a55/31oSf53S2uzsZH0OvvwJyrYcF3jDmSHziMVn40A0HdjKtixfTuX4ZRynv3aZVlGpSuttm76+/nx3oiYSh7YqHXFfI4ZiGYoCkSXtfyC1QYVoMa6NS2B8I4cO9QXkOPxHvWwfBAtcpACZ7d5OQF5xjAY1mWiM7MmUUjw== richard(a)torproject.org

1 0

[tor-browser-build/master] There is no build2 of 60.5.1esr
by gk＠torproject.org 12 Feb '19

12 Feb '19

commit e66a25545ada2335a2e496b61f147547939b9ef7 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Feb 12 09:39:21 2019 +0000 There is no build2 of 60.5.1esr --- projects/firefox-langpacks/config | 2 +- rbm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 17a707a..34d6fad 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build2 + ff_build: build1 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' targets: diff --git a/rbm.conf b/rbm.conf index 12d5130..03c105e 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.5a8' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 8.5a7 project_name: tor-browser

1 0

[tor-browser-build/master] Release preparations for 8.5a8
by gk＠torproject.org 12 Feb '19

12 Feb '19

commit fc5024a19cc315036eac989f0d1f34e84ec0c285 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Feb 12 08:56:09 2019 +0000 Release preparations for 8.5a8 Changelog update and versions bump --- projects/firefox/config | 2 +- projects/https-everywhere/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 13 +++++++++++++ rbm.conf | 6 +++--- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 59ec1ee..68f2326 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.5.0 + firefox_platform_version: 60.5.1 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 1be120b..a9409cd 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2019.1.7 +version: 2019.1.31 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 410173d..83d0f4b 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,16 @@ +Tor Browser 8.5a8 -- February 13 2019 + * All platforms + * Update Firefox to 60.5.1esr + * Update HTTPS Everywhere to 2019.1.31 + * Bug 29378: Remove 83.212.101.3 from default bridges + * Bug 29349: Remove network.http.spdy.* overrides from meek helper user.js + * Build System + * All Platforms + * Bug 29235: Build our own version of python3.6 for HTTPS Everywhere + * Bug 29167: Upgrade go to 1.11.5 + * Linux + * Bug 29183: Use linux-x86_64 langpacks on linux-x86_64 + Tor Browser 8.5a7 -- January 29 2019 * All Platforms * Update Firefox to 60.5.0esr diff --git a/rbm.conf b/rbm.conf index 381eab6..12d5130 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.5a7' - torbrowser_build: 'build4' + torbrowser_version: '8.5a8' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 8.5a6 + - 8.5a7 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

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

12 Feb '19

commit fcc53d9fa4969850b4cd77951974ee6db73e827b Author: Georg Koppen <gk(a)torproject.org> Date: Tue Feb 12 08:49:33 2019 +0000 Revert "Bug 29180: MAR download stalls when about dialog is opened" This reverts commit 9ca60802516a3f693f6ae22e9df6994aab67c5f9. We don't want to ship a new Torbutton but it contains language strings we need. --- browser/base/content/aboutDialog-appUpdater.js | 17 +++++----------- toolkit/mozapps/update/content/updates.js | 27 ++++++++++++-------------- 2 files changed, 17 insertions(+), 27 deletions(-) diff --git a/browser/base/content/aboutDialog-appUpdater.js b/browser/base/content/aboutDialog-appUpdater.js index b732db6bee6b..e81098a1e898 100644 --- a/browser/base/content/aboutDialog-appUpdater.js +++ b/browser/base/content/aboutDialog-appUpdater.js @@ -318,18 +318,11 @@ appUpdater.prototype = this.update.QueryInterface(Ci.nsIWritablePropertyBag); this.update.setProperty("foregroundDownload", "true"); - // 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.aus.pauseDownload(); + 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 195265ff81f9..5b6ae7cc6ba1 100644 --- a/toolkit/mozapps/update/content/updates.js +++ b/toolkit/mozapps/update/content/updates.js @@ -751,22 +751,19 @@ var gDownloadingPage = { gUpdates.update.QueryInterface(Ci.nsIWritablePropertyBag); gUpdates.update.setProperty("foregroundDownload", "true"); - // 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; - } + // 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; } - // Add this UI as a listener for active downloads aus.addDownloadListener(this);

1 0

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

12 Feb '19

commit 58a439dd4e6fc1734d60d7175caa1cb2f88fbbac Author: Georg Koppen <gk(a)torproject.org> Date: Tue Feb 12 08:50:23 2019 +0000 Revert "Bug 28885: notify users that update is downloading" This reverts commit 5f2b1d1a6be48be796f30dbef8ab3a3e42ae428f. We don't want to ship a new Torbutton right now but it contains needed language strings. --- 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 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 9f1e727ce724..11027f4c9a3a 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -20,7 +20,6 @@ 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 ee4f8351d02b..5891556a6e5f 100644 --- a/browser/components/customizableui/content/panelUI.inc.xul +++ b/browser/components/customizableui/content/panelUI.inc.xul @@ -172,7 +172,6 @@ <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 a4018bb2e6c2..5233be130be2 100644 --- a/browser/components/customizableui/content/panelUI.js +++ b/browser/components/customizableui/content/panelUI.js @@ -46,7 +46,6 @@ const PanelUI = { init() { this._initElements(); - this._initUpdaterStrings(); this.menuButton.addEventListener("mousedown", this); this.menuButton.addEventListener("keypress", this); @@ -54,7 +53,6 @@ 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) => { @@ -122,28 +120,6 @@ 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) @@ -176,7 +152,6 @@ 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); @@ -277,9 +252,6 @@ 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 e68817fd3c7c..0ec10a3337d4 100644 --- a/browser/components/nsBrowserGlue.js +++ b/browser/components/nsBrowserGlue.js @@ -187,7 +187,6 @@ 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 4cb2032a09d1..75946aa5f082 100644 --- a/browser/themes/shared/customizableui/panelUI.inc.css +++ b/browser/themes/shared/customizableui/panelUI.inc.css @@ -62,7 +62,6 @@ } #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 230ddf951858..d3a634d5ff51 100644 --- a/browser/themes/shared/toolbarbutton-icons.inc.css +++ b/browser/themes/shared/toolbarbutton-icons.inc.css @@ -259,7 +259,6 @@ 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 8437f4b884d4..a2b228d321ac 100644 --- a/toolkit/mozapps/update/UpdateListener.jsm +++ b/toolkit/mozapps/update/UpdateListener.jsm @@ -127,15 +127,6 @@ 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": @@ -213,17 +204,6 @@ var UpdateListener = { } }, - handleUpdateDownloading(status) { - switch (status) { - case "downloading": - this.showUpdateDownloadingNotification(); - break; - case "idle": - this.reset(); - break; - } - }, - observe(subject, topic, status) { if (!this.enabled) { return; @@ -235,9 +215,6 @@ 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 159112805425..b2a4e82cf241 100644 --- a/toolkit/mozapps/update/nsUpdateService.js +++ b/toolkit/mozapps/update/nsUpdateService.js @@ -38,7 +38,6 @@ 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"; @@ -3326,8 +3325,6 @@ Downloader.prototype = { if (this._request && this._request instanceof Ci.nsIRequest) { this._request.cancel(cancelError); } - - this._notifyDownloadStatusObservers(); }, /** @@ -3501,13 +3498,6 @@ 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. */ @@ -3562,9 +3552,6 @@ Downloader.prototype = { var um = Cc["@mozilla.org/updates/update-manager;1"]. getService(Ci.nsIUpdateManager); um.saveUpdates(); - - this._notifyDownloadStatusObservers(); - return STATE_DOWNLOADING; }, @@ -3741,16 +3728,9 @@ 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. @@ -3855,7 +3835,6 @@ Downloader.prototype = { } this._request = null; - this._notifyDownloadStatusObservers(); if (state == STATE_DOWNLOAD_FAILED) { var allFailed = true; @@ -3928,16 +3907,9 @@ 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-build/maint-8.0] Release preparations for 8.0.6
by gk＠torproject.org 11 Feb '19

11 Feb '19

commit 36edb804ea966828f8cebd9c9dedb947b6bbf5d1 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Feb 11 22:24:02 2019 +0000 Release preparations for 8.0.6 --- projects/firefox/config | 2 +- projects/https-everywhere/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 9 +++++++++ rbm.conf | 6 +++--- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 238bc5c..c6d2a6a 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.0 + firefox_platform_version: 60.5.1 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 8.0 torbrowser_update_channel: alpha diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 1be120b..a9409cd 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2019.1.7 +version: 2019.1.31 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 cc51f85..e1dbaa3 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,12 @@ +Tor Browser 8.0.6 -- February 12 2019 + * All platforms + * Update Firefox to 60.5.1esr + * Update HTTPS Everywhere to 2019.1.31 + * Bug 29378: Remove 83.212.101.3 from default bridges + * Build System + * All Platforms + * Bug 29235: Build our own version of python3.6 for HTTPS Everywhere + Tor Browser 8.0.5 -- January 29 2019 * All platforms * Update Firefox to 60.5.0esr diff --git a/rbm.conf b/rbm.conf index 7abdf6a..2983684 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.0.5' - torbrowser_build: 'build2' + torbrowser_version: '8.0.6' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 8.0.4 + - 8.0.5 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/maint-8.0] Bug 29158: Install updated apt packages (CVE-2019-3462)
by gk＠torproject.org 11 Feb '19

11 Feb '19

commit 528f683266709865780e75b14755715f44f04d5a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jan 23 14:01:38 2019 +0100 Bug 29158: Install updated apt packages (CVE-2019-3462) --- projects/debootstrap-image/config | 78 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 77 insertions(+), 1 deletion(-) diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index 10e2afe..fa9587a 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -13,34 +13,95 @@ var: pre: | #!/bin/sh set -e + # Bug 29158: install fixed packages for apt vulnerability (CVE-2019-3462) + dpkg -i ./apt_1.2.29ubuntu0.1_amd64.deb ./libapt-pkg5.0_1.2.29ubuntu0.1_amd64.deb apt-get update -y apt-get install -y debian-archive-keyring ubuntu-keyring debootstrap debootstrap --arch=[% c("var/container/arch") %] [% c("var/container/debootstrap_opt") %] [% c("var/container/suite") %] base-image [% c("var/container/debootstrap_mirror") %] + [% IF c("var/apt_package_filename") || c("var/apt_utils_package_filename") || c("var/libapt_inst_package_filename") || c("var/libapt_pkg_package_filename") -%] + mkdir ./base-image/apt-update + mv [% c("var/apt_package_filename") %] [% c("var/apt_utils_package_filename") %] \ + [% c("var/libapt_inst_package_filename") %] [% c("var/libapt_pkg_package_filename") %] \ + ./base-image/apt-update + mount proc ./base-image/proc -t proc + mount sysfs ./base-image/sys -t sysfs + chroot ./base-image dpkg -i -R /apt-update + umount ./base-image/proc + umount ./base-image/sys + [% END -%] + [% IF c("var/minimal_apt_version") -%] + apt_version=$(dpkg --admindir=$(pwd)/base-image/var/lib/dpkg -s apt | grep '^Version: ' | cut -d ' ' -f 2) + echo "apt version: $apt_version" + dpkg --compare-versions "$apt_version" ge '[% c("var/minimal_apt_version") %]' + [% END -%] tar -C ./base-image -czf [% dest_dir %]/[% c("filename") %] . targets: wheezy-amd64: var: + minimal_apt_version: '0.9.7.9+deb7u8' + # https://deb.freexian.com/extended-lts/updates/ela-76-1-apt/ + apt_packages_baseurl: http://deb.freexian.com/extended-lts/pool/main/a/apt + apt_package_filename: apt_0.9.7.9+deb7u8_amd64.deb + apt_package_sha256sum: 83dcdb3f9c11df28b30b85bbb9dec341effbf36ee881a04dece3390082080761 + apt_utils_package_filename: apt-utils_0.9.7.9+deb7u8_amd64.deb + apt_utils_package_sha256sum: 91a4d0ec92a32f13e3acb37f71546d48c51a0df25f3b9eb6a96b73dfc93a11ed + libapt_inst_package_filename: libapt-inst1.5_0.9.7.9+deb7u8_amd64.deb + libapt_inst_package_sha256sum: 181c9c21e1b33496b251fc76ba8ed04acbb8e23006909d27795bbc287eddd027 + libapt_pkg_package_filename: libapt-pkg4.12_0.9.7.9+deb7u8_amd64.deb + libapt_pkg_package_sha256sum: b360dfb5a65ac2f7b81a2551d8a520ba2265785537d6d669869a159888b81999 + container: suite: wheezy arch: amd64 + wheezy-i386: var: + # Missing apt packages for i386: + # http://deb.freexian.com/extended-lts/pool/main/a/apt/ container: suite: wheezy arch: i386 + jessie-amd64: var: + minimal_apt_version: 1.0.9.8.5 + # https://lists.debian.org/debian-lts-announce/2019/01/msg00014.html + apt_packages_baseurl: http://security.debian.org/debian-security/pool/updates/main/a/apt + apt_package_filename: apt_1.0.9.8.5_amd64.deb + apt_package_sha256sum: 4078748632abc19836d045f80f9d6933326065ca1d47367909a0cf7f29e7dfe8 + apt_utils_package_filename: apt-utils_1.0.9.8.5_amd64.deb + apt_utils_package_sha256sum: 87c55d9ccadcabd59674873c221357c774020c116afd978fb9df6d2d0303abf2 + libapt_inst_package_filename: libapt-inst1.5_1.0.9.8.5_amd64.deb + libapt_inst_package_sha256sum: f9615532b1577b3d1455fa51839ce91765f2860eb3a6810fb5e0de0c87253030 + libapt_pkg_package_filename: libapt-pkg4.12_1.0.9.8.5_amd64.deb + libapt_pkg_package_sha256sum: 295d9c69854a4cfbcb46001b09b853f5a098a04c986fc5ae01a0124c1c27e6bd + container: suite: jessie arch: amd64 + jessie-i386: var: + minimal_apt_version: 1.0.9.8.5 + # https://lists.debian.org/debian-lts-announce/2019/01/msg00014.html + apt_packages_baseurl: http://security.debian.org/debian-security/pool/updates/main/a/apt + apt_package_filename: apt_1.0.9.8.5_i386.deb + apt_package_sha256sum: 13c230e9c544b1e67a8da413046bf1728526372170533b1a23e70cc99c40a228 + apt_utils_package_filename: apt-utils_1.0.9.8.5_i386.deb + apt_utils_package_sha256sum: 1a74b12c8bb6b3968a721f3aa96739073e4fe2ced9302792c533e21535bc9cf4 + libapt_inst_package_filename: libapt-inst1.5_1.0.9.8.5_i386.deb + libapt_inst_package_sha256sum: 5791661dd4ade72b61086fefdc209bd1f76ac7b7c812d6d4ba951b1a6232f0b9 + libapt_pkg_package_filename: libapt-pkg4.12_1.0.9.8.5_i386.deb + libapt_pkg_package_sha256sum: 201b6cf4625ed175e6a024ac1f7ca6c526ca79d859753c125b02cd69e26c349d + container: suite: jessie arch: i386 + buster-amd64: var: + minimal_apt_version: '1.8.0~alpha3.1' container: suite: buster arch: amd64 @@ -49,4 +110,19 @@ input_files: - URL: 'http://cdimage.ubuntu.com/ubuntu-base/releases/[% c("var/ubuntu_version") %]/release/ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' filename: 'container-image_ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' sha256sum: 353b01ac60c43574c4977b1a9b7fe09a43298cb572de1a2090a8f09c5133b4d2 - + - URL: http://security.ubuntu.com/ubuntu/pool/main/a/apt/apt_1.2.29ubuntu0.1_amd64… + sha256sum: e3f930803b564c5ecc17281acf491940d87634a1a067072fb8c92c712ee45930 + - URL: http://security.ubuntu.com/ubuntu/pool/main/a/apt/libapt-pkg5.0_1.2.29ubunt… + sha256sum: 93b465b4b320a4fa0c36a85da3851ba8cda61935f29954ca55c011ab498c4cf9 + - URL: '[% c("var/apt_packages_baseurl") %]/[% c("var/apt_package_filename") %]' + sha256sum: '[% c("var/apt_package_sha256sum") %]' + enable: '[% c("var/apt_package_filename") %]' + - URL: '[% c("var/apt_packages_baseurl") %]/[% c("var/apt_utils_package_filename") %]' + sha256sum: '[% c("var/apt_utils_package_sha256sum") %]' + enable: '[% c("var/apt_utils_package_filename") %]' + - URL: '[% c("var/apt_packages_baseurl") %]/[% c("var/libapt_inst_package_filename") %]' + sha256sum: '[% c("var/libapt_inst_package_sha256sum") %]' + enable: '[% c("var/libapt_inst_package_filename") %]' + - URL: '[% c("var/apt_packages_baseurl") %]/[% c("var/libapt_pkg_package_filename") %]' + sha256sum: '[% c("var/libapt_pkg_package_sha256sum") %]' + enable: '[% c("var/libapt_pkg_package_filename") %]'

1 0

[tor-browser-build/maint-8.0] Bug 29181: Add a version number in debootstrap-image filename
by gk＠torproject.org 11 Feb '19

11 Feb '19

commit 1224c208e61b18dfd078f98e88bc1666800cf5bb 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 fa9587a..3c2df77 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/maint-8.0] Bug 29235: Build our own version of python3.6
by gk＠torproject.org 11 Feb '19

11 Feb '19

commit d036a293dcd041d3ed4d02453b85aa03cfed23fa 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 | 6 +++--- projects/https-everywhere/build | 1 + projects/https-everywhere/config | 9 ++++++--- projects/python/build | 14 ++++++++++++++ projects/python/config | 25 +++++++++++++++++++++++++ rbm.conf | 17 +++++++++++++++++ 7 files changed, 66 insertions(+), 6 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 3c2df77..912d4e6 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -100,11 +100,11 @@ targets: suite: jessie arch: i386 - buster-amd64: + stretch-amd64: var: - minimal_apt_version: '1.8.0~alpha3.1' + minimal_apt_version: 1.4.9 container: - suite: buster + suite: stretch arch: amd64 input_files: 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 5e1ec0e..7abdf6a 100644 --- a/rbm.conf +++ b/rbm.conf @@ -137,6 +137,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-linux-x86_64: - linux-x86_64 - linux

1 0