tbb-commits June 2021

tbb-commits@lists.torproject.org

3 participants
220 discussions

[tor-browser-spec/master] fixup! Upgrade quickstart from Idea to Proposal
by sysrqb＠torproject.org 21 Jun '21

21 Jun '21

commit 2b790522de5b25dda59b225a06754c749e8e4551 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Jun 21 17:56:25 2021 +0000 fixup! Upgrade quickstart from Idea to Proposal --- proposals/106-quickstart.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/106-quickstart.txt b/proposals/106-quickstart.txt index 2fb5294..12da042 100644 --- a/proposals/106-quickstart.txt +++ b/proposals/106-quickstart.txt @@ -1,4 +1,4 @@ -Filename: xxx-quickstart.txt +Filename: 106-quickstart.txt Title: Tor Browser Quickstart Author: antonela Created: 09-Sep-2020

1 0

[tor-browser-spec/master] Upgrade quickstart from Idea to Proposal
by sysrqb＠torproject.org 21 Jun '21

21 Jun '21

commit 060b12824d03226e67472d29d7474001646de9db Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Jun 21 17:54:14 2021 +0000 Upgrade quickstart from Idea to Proposal --- proposals/{ideas/xxx-quickstart.txt => 106-quickstart.txt} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/ideas/xxx-quickstart.txt b/proposals/106-quickstart.txt similarity index 99% rename from proposals/ideas/xxx-quickstart.txt rename to proposals/106-quickstart.txt index 395b8c4..2fb5294 100644 --- a/proposals/ideas/xxx-quickstart.txt +++ b/proposals/106-quickstart.txt @@ -2,7 +2,7 @@ Filename: xxx-quickstart.txt Title: Tor Browser Quickstart Author: antonela Created: 09-Sep-2020 -Status: Draft +Status: Open Target: Tor Browser 10.5 1. Introduction

1 0

[tor-browser/tor-browser-78.11.0esr-10.5-1] Merge remote-tracking branch 'richardgl/27476_fixup' into tor-browser-78.11.0esr-10.5-1
by sysrqb＠torproject.org 18 Jun '21

18 Jun '21

commit ca636f7fea97c6e05f226eee0c3b535d94fd261b Merge: 0ec919bf414f d27a43d5986f Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Jun 17 15:51:11 2021 +0000 Merge remote-tracking branch 'richardgl/27476_fixup' into tor-browser-78.11.0esr-10.5-1 browser/base/content/aboutNetError.js | 7 +- browser/components/torconnect/TorConnectParent.jsm | 11 +++ .../torconnect/content/aboutTorConnect.css | 73 ++++++++++------ .../torconnect/content/aboutTorConnect.js | 96 +++++++++++----------- .../torconnect/content/aboutTorConnect.xhtml | 13 +-- .../torconnect/content/torconnect-urlbar.css | 12 ++- .../components/torpreferences/content/torPane.js | 3 +- browser/components/urlbar/UrlbarInput.jsm | 31 +++++++ toolkit/modules/RemotePageAccessManager.jsm | 3 + toolkit/xre/nsAppRunner.cpp | 7 +- 10 files changed, 178 insertions(+), 78 deletions(-)

1 0

[tor-browser/tor-browser-78.11.0esr-10.5-1] fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by sysrqb＠torproject.org 18 Jun '21

18 Jun '21

commit d27a43d5986ff72c28d1380a4622eab594395085 Author: Richard Pospesel <richard(a)torproject.org> Date: Fri Jun 11 15:46:34 2021 +0200 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser --- browser/base/content/aboutNetError.js | 7 +- browser/components/torconnect/TorConnectParent.jsm | 11 +++ .../torconnect/content/aboutTorConnect.css | 73 ++++++++++------ .../torconnect/content/aboutTorConnect.js | 96 +++++++++++----------- .../torconnect/content/aboutTorConnect.xhtml | 13 +-- .../torconnect/content/torconnect-urlbar.css | 12 ++- .../components/torpreferences/content/torPane.js | 3 +- browser/components/urlbar/UrlbarInput.jsm | 31 +++++++ toolkit/modules/RemotePageAccessManager.jsm | 3 + toolkit/xre/nsAppRunner.cpp | 7 +- 10 files changed, 178 insertions(+), 78 deletions(-) diff --git a/browser/base/content/aboutNetError.js b/browser/base/content/aboutNetError.js index 238b4930461c..b85ba74217cb 100644 --- a/browser/base/content/aboutNetError.js +++ b/browser/base/content/aboutNetError.js @@ -196,8 +196,13 @@ async function setErrorPageStrings(err) { async function initPage() { var err = getErrorCode(); + + // proxyConnectFailure because no-tor running daemon would return this error + // netOffline because we do not want to show the offline page (where users can disable offline-mode) + // when we are 'offline' (offline mode is disabled after successful bootstrapping in + // TorConnectParent) if ( - err === "proxyConnectFailure" && + (err === "proxyConnectFailure" || err === "netOffline") && (await RPMSendQuery("ShouldShowTorConnect")) ) { document.location.replace("about:torconnect"); diff --git a/browser/components/torconnect/TorConnectParent.jsm b/browser/components/torconnect/TorConnectParent.jsm index f775507a744f..cd574ada4da1 100644 --- a/browser/components/torconnect/TorConnectParent.jsm +++ b/browser/components/torconnect/TorConnectParent.jsm @@ -45,6 +45,17 @@ class TorConnectParent extends JSWindowActorParent { obj.handled = true; } self.sendAsyncMessage(aTopic, obj); + + // we need to tell the IOService that we are not online + // setting offline to false will make the io service send out + // 'network:offline-status-changed' message to observers + // the app updater (among other things) listens for this message + // and will attempt to check for updates when receiving this message + // to recover from a previously failed attempt + if (aTopic === kTorBootstrapStatusTopic && + obj.PROGRESS === 100) { + Services.io.offline = false; + } }, }; diff --git a/browser/components/torconnect/content/aboutTorConnect.css b/browser/components/torconnect/content/aboutTorConnect.css index 2081d4f6c4b8..eff767205266 100644 --- a/browser/components/torconnect/content/aboutTorConnect.css +++ b/browser/components/torconnect/content/aboutTorConnect.css @@ -43,42 +43,69 @@ position: relative; } -#copyLogTooltip { - visibility: hidden; - display: inline-block; - width: 100%; +/* mirrors p element spacing */ +#copyLogContainer { + margin: 1em 0; + height: 1.2em; + min-height: 1.2em; +} - position: absolute; - z-index: 1; - left: 0px; - bottom: calc(100% + 6px); +#copyLogLink { + position: relative; + display: inline-block; + color: var(--in-content-link-color); } -#copyLogTooltip::after { - content: ""; - position: absolute; - top: 100%; - left: 50%; - margin-left: -4px; - border-width: 4px; - border-style: solid; - border-color: #30E60B transparent transparent transparent; +/* hidden apparently only works if no display is set; who knew? */ +#copyLogLink[hidden="true"] { + display: none; } +#copyLogLink:hover { + cursor:pointer; +} + +/* This div: + - is centered over its parent + - centers its child + - has z-index above parent + - ignores mouse events from parent +*/ +#copyLogTooltip { + pointer-events: none; + visibility: hidden; + display: flex; + justify-content: center; + white-space: nowrap; + width: 0; + position: absolute; + + z-index: 1; + left: 50%; + bottom: calc(100% + 0.25em); +} +/* tooltip content (any content could go here) */ #copyLogTooltipText { - display: inline-block; background-color: #30E60B; color: #003706; border-radius: 2px; - text-align: center; + padding: 4px; line-height: 13px; - font: 11px Regular; + font: 11px sans-serif; font-weight: 400; +} - margin-left: auto; - margin-right: auto; - padding: 4px; +/* our speech bubble tail */ +#copyLogTooltipText::after { + content: ""; + position: absolute; + top: 100%; + left: 50%; + margin-left: -4px; + border-width: 4px; + border-style: solid; + border-color: #30E60B transparent transparent transparent; } body { diff --git a/browser/components/torconnect/content/aboutTorConnect.js b/browser/components/torconnect/content/aboutTorConnect.js index 5089bbc9363b..a88a887c7878 100644 --- a/browser/components/torconnect/content/aboutTorConnect.js +++ b/browser/components/torconnect/content/aboutTorConnect.js @@ -15,6 +15,10 @@ const TorLauncherPrefs = { prompt_at_startup: "extensions.torlauncher.prompt_at_startup", } +const BrowserPrefs = { + homepage: "browser.startup.homepage", +} + class AboutTorConnect { log(...args) { console.log(...args); @@ -40,6 +44,15 @@ class AboutTorConnect { get elemProgressMeter() { return this.getElem("progressBackground"); } + get elemCopyLogLink() { + return this.getElem("copyLogLink"); + } + get elemCopyLogTooltip() { + return this.getElem("copyLogTooltip"); + } + get elemCopyLogTooltipText() { + return this.getElem("copyLogTooltipText"); + } get elemQuickstartCheckbox() { return this.getElem("quickstartCheckbox"); } @@ -49,15 +62,6 @@ class AboutTorConnect { get elemConnectButton() { return this.getElem("connectButton"); } - get elemCopyLogButton() { - return this.getElem("copyLogButton"); - } - get elemCopyLogTooltip() { - return this.getElem("copyLogTooltip"); - } - get elemCopyLogTooltipText() { - return this.getElem("copyLogTooltipText"); - } get elemAdvancedButton() { return this.getElem("advancedButton"); } @@ -97,7 +101,7 @@ class AboutTorConnect { this.torStrings.settings.quickstartDescription; this.showElem(this.elemConnectButton); this.showElem(this.elemAdvancedButton); - this.hideElem(this.elemCopyLogButton); + this.hideElem(this.elemCopyLogLink); this.hideElem(this.elemCancelButton); this.hideElem(this.elemProgressContent); this.hideElem(this.elemProgressMeter); @@ -108,7 +112,7 @@ class AboutTorConnect { this.setTitle(this.torStrings.torConnect.torConnecting); this.hideElem(this.elemConnectButton); this.hideElem(this.elemAdvancedButton); - this.hideElem(this.elemCopyLogButton); + this.hideElem(this.elemCopyLogLink); this.showElem(this.elemCancelButton); this.showElem(this.elemProgressContent); this.showElem(this.elemProgressMeter); @@ -124,13 +128,14 @@ class AboutTorConnect { this.showElem(this.elemProgressContent); this.hideElem(this.elemProgressMeter); this.elemTitle.classList.add("error"); - - this.elem } goToBrowserHome() { this.hideElem(this.elemCancelButton); - RPMSendAsyncMessage("GoToBrowserHome"); + + // redirect this about:torconnect to browser homepage + const homepage = RPMGetStringPref(BrowserPrefs.homepage); + window.location.replace(homepage); } set state(state) { @@ -163,10 +168,7 @@ class AboutTorConnect { } } - let haveErrorOrWarning = - (await RPMSendQuery("TorBootstrapErrorOccurred")) || - (await RPMSendQuery("TorLogHasWarnOrErr")); - this.showCopyLogButton(haveErrorOrWarning); + this.showCopyLog(); this.showElem(this.elemConnectButton); } @@ -179,6 +181,11 @@ class AboutTorConnect { } async connect() { + // reset the text to original quickstart description + // in case we are trying again after an error (clears out error text) + this.elemProgressDesc.textContent = + this.torStrings.settings.quickstartDescription; + this.state = AboutTorConnect.STATE_BOOTSTRAPPING; const error = await RPMSendQuery("TorConnect"); if (error) { @@ -189,12 +196,8 @@ class AboutTorConnect { } } - restoreCopyLogVisibility() { - this.elemCopyLogButton.setAttribute("hidden", true); - } - - showCopyLogButton() { - this.elemCopyLogButton.removeAttribute("hidden"); + showCopyLog() { + this.elemCopyLogLink.removeAttribute("hidden"); } async updateBootstrapProgress(status) { @@ -241,28 +244,10 @@ class AboutTorConnect { RPMSendAsyncMessage("OpenTorAdvancedPreferences"); }); - this.elemQuickstartLabel.textContent = this.torStrings.settings.quickstartCheckbox; - this.elemQuickstartCheckbox.addEventListener("change", () => { - const quickstart = this.elemQuickstartCheckbox.checked; - RPMSetBoolPref(TorLauncherPrefs.quickstart, quickstart); - }); - this.elemQuickstartCheckbox.checked = await RPMGetBoolPref(TorLauncherPrefs.quickstart); - - this.elemConnectButton.textContent = - this.torStrings.torConnect.torConnectButton; - this.elemConnectButton.addEventListener("click", () => { - this.connect(); - }); - - this.elemCancelButton.textContent = this.torStrings.torConnect.cancel; - this.elemCancelButton.addEventListener("click", () => { - this.stopTorBootstrap(); - }); - // sets the text content while keping the child elements intact - this.elemCopyLogButton.childNodes[0].nodeValue = + this.elemCopyLogLink.childNodes[0].nodeValue = this.torStrings.torConnect.copyLog; - this.elemCopyLogButton.addEventListener("click", async () => { + this.elemCopyLogLink.addEventListener("click", async (event) => { const copiedMessage = await RPMSendQuery("TorCopyLog"); aboutTorConnect.elemCopyLogTooltipText.textContent = copiedMessage; aboutTorConnect.elemCopyLogTooltip.style.visibility = "visible"; @@ -279,16 +264,35 @@ class AboutTorConnect { aboutTorConnect.copyLogTimeoutId = 0; }, TOOLTIP_TIMEOUT); }); + + + this.elemQuickstartLabel.textContent = this.torStrings.settings.quickstartCheckbox; + this.elemQuickstartCheckbox.addEventListener("change", () => { + const quickstart = this.elemQuickstartCheckbox.checked; + RPMSetBoolPref(TorLauncherPrefs.quickstart, quickstart); + }); + this.elemQuickstartCheckbox.checked = await RPMGetBoolPref(TorLauncherPrefs.quickstart); + + this.elemConnectButton.textContent = + this.torStrings.torConnect.torConnectButton; + this.elemConnectButton.addEventListener("click", () => { + this.connect(); + }); + + this.elemCancelButton.textContent = this.torStrings.torConnect.cancel; + this.elemCancelButton.addEventListener("click", () => { + this.stopTorBootstrap(); + }); } initObservers() { RPMAddMessageListener(kTorBootstrapErrorTopic, ({ data }) => { - this.showCopyLogButton(true); + this.showCopyLog(); this.stopTorBootstrap(); this.showErrorMessage(data); }); RPMAddMessageListener(kTorLogHasWarnOrErrTopic, () => { - this.showCopyLogButton(true); + this.showCopyLog(); }); RPMAddMessageListener(kTorProcessDidNotStartTopic, ({ data }) => { this.showErrorMessage(data); diff --git a/browser/components/torconnect/content/aboutTorConnect.xhtml b/browser/components/torconnect/content/aboutTorConnect.xhtml index d12c896c8959..0a0721afb7db 100644 --- a/browser/components/torconnect/content/aboutTorConnect.xhtml +++ b/browser/components/torconnect/content/aboutTorConnect.xhtml @@ -28,6 +28,14 @@ </div> </div> + <div id="copyLogContainer"> + <span id="copyLogLink" hidden="true"> + <div id="copyLogTooltip"> + <span id="copyLogTooltipText"/> + </div> + </span> + </div> + <div id="quickstartContainer"> <input id="quickstartCheckbox" type="checkbox" /> <label id="quickstartCheckboxLabel" for="quickstartCheckbox"/> @@ -35,11 +43,6 @@ <div id="connectButtonContainer" class="button-container"> <button id="advancedButton" hidden="true"></button> - <button id="copyLogButton" hidden="true"> - <div id="copyLogTooltip"> - <div id="copyLogTooltipText"></div> - </div> - </button> <button id="cancelButton" hidden="true"></button> <button id="connectButton" class="primary try-again" hidden="true"></button> </div> diff --git a/browser/components/torconnect/content/torconnect-urlbar.css b/browser/components/torconnect/content/torconnect-urlbar.css index 7331f3cd48df..db2f1069b22b 100644 --- a/browser/components/torconnect/content/torconnect-urlbar.css +++ b/browser/components/torconnect/content/torconnect-urlbar.css @@ -3,6 +3,7 @@ */ hbox.urlbar-page-action#torconnect-box { display: -moz-inline-box!important; + margin: 0 6px; height: 28px; } /* disable the button-like default css */ @@ -13,13 +14,14 @@ hbox.urlbar-page-action#torconnect-box:active { label#torconnect-label { line-height: 28px; - margin: 0 0.1em; + margin: 0; opacity: 0.6; } /* set appropriate sizes for the non-standard ui densities */ :root[uidensity=compact] { hbox.urlbar-page-action#torconnect-box { + margin: 0 4px; height: 24px; } label#torconnect-label { @@ -28,6 +30,7 @@ label#torconnect-label { } :root[uidensity=touch] { hbox.urlbar-page-action#torconnect-box { + margin: 0 7px; height: 30px; } label#torconnect-label { @@ -53,3 +56,10 @@ hbox#urlbar-input-container[torconnect="offline"] + vbox.urlbarView, hbox#urlbar-input-container[torconnect="connecting"] + vbox.urlbarView { display: none!important; } + +/* hide search icon when we are not connected to tor */ +hbox#urlbar-input-container[torconnect="offline"] > #identity-box[pageproxystate="invalid"] > #identity-icon, +hbox#urlbar-input-container[torconnect="connecting"] > #identity-box[pageproxystate="invalid"] > #identity-icon +{ + display: none!important; +} diff --git a/browser/components/torpreferences/content/torPane.js b/browser/components/torpreferences/content/torPane.js index 63db876a7ccd..d63b31c4c6f6 100644 --- a/browser/components/torpreferences/content/torPane.js +++ b/browser/components/torpreferences/content/torPane.js @@ -189,7 +189,8 @@ const gTorPane = (function() { this._messageBoxButton.addEventListener("click", () => { TorProtocolService.connect(); let win = Services.wm.getMostRecentWindow("navigator:browser"); - win.switchToTabHavingURI("about:torconnect"); + // switch to existing about:torconnect tab or create a new one + win.switchToTabHavingURI("about:torconnect", true); }); let populateMessagebox = () => { diff --git a/browser/components/urlbar/UrlbarInput.jsm b/browser/components/urlbar/UrlbarInput.jsm index 13b1279105f2..f727c386701c 100644 --- a/browser/components/urlbar/UrlbarInput.jsm +++ b/browser/components/urlbar/UrlbarInput.jsm @@ -10,6 +10,33 @@ const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); +const { TorProtocolService } = ChromeUtils.import( + "resource:///modules/TorProtocolService.jsm" +); + +// in certain scenarios we want user input uris to open in a new tab if they do so from the +// about:torconnect tab +function maybeUpdateOpenLocationForTorConnect(openUILinkWhere, currentURI, destinationURI) { + try { + // only open in new tab if: + if (// user is navigating away from about:torconnect + currentURI === "about:torconnect" && + // we are trying to open in same tab + openUILinkWhere === "current" && + // only if user still has not bootstrapped + TorProtocolService.shouldShowTorConnect() && + // and user is not just navigating to about:torconnect + destinationURI !== "about:torconnect") { + return "tab"; + } + } catch (e) { + // swallow exception and fall through returning original so we don't accidentally break + // anything if an exception is thrown + } + + return openUILinkWhere; +}; + XPCOMUtils.defineLazyModuleGetters(this, { AppConstants: "resource://gre/modules/AppConstants.jsm", BrowserUtils: "resource://gre/modules/BrowserUtils.jsm", @@ -1832,6 +1859,10 @@ class UrlbarInput { // area when the current tab is re-selected. browser.focus(); + openUILinkWhere = maybeUpdateOpenLocationForTorConnect( + openUILinkWhere, + this.window.gBrowser.currentURI.asciiSpec, + url); if (openUILinkWhere != "current") { this.handleRevert(); } diff --git a/toolkit/modules/RemotePageAccessManager.jsm b/toolkit/modules/RemotePageAccessManager.jsm index ee21aa7a750f..0c001e707096 100644 --- a/toolkit/modules/RemotePageAccessManager.jsm +++ b/toolkit/modules/RemotePageAccessManager.jsm @@ -205,6 +205,9 @@ let RemotePageAccessManager = { RPMSetBoolPref: [ "extensions.torlauncher.quickstart", ], + RPMGetStringPref: [ + "browser.startup.homepage", + ], }, }, diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 195b3637ca78..6c8105939fcb 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -2984,7 +2984,7 @@ bool fire_glxtest_process(); class XREMain { public: XREMain() - : mStartOffline(false), + : mStartOffline(true), mShuttingDown(false) #ifdef MOZ_HAS_REMOTE , @@ -3588,6 +3588,11 @@ int XREMain::XRE_mainInit(bool* aExitFlag) { CheckArg("new-instance"); #endif + // revert to start online behaviour when using the legacy tor launcher + if (EnvHasValue("TOR_USE_LEGACY_LAUNCHER")) { + mStartOffline = false; + } + ar = CheckArg("offline"); if (ar || EnvHasValue("XRE_START_OFFLINE")) { mStartOffline = true;

1 0

[Git][tpo/applications/android-components] Pushed new branch android-components-75.0.22-10.0-1
by Matthew Finkel (＠sysrqb) 17 Jun '21

17 Jun '21

Matthew Finkel pushed new branch android-components-75.0.22-10.0-1 at The Tor Project / Applications / android-components -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/tree/an… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/fenix] Pushed new tag tor-browser-89.1.1-10.0-1-build1
by Matthew Finkel (＠sysrqb) 17 Jun '21

17 Jun '21

Matthew Finkel pushed new tag tor-browser-89.1.1-10.0-1-build1 at The Tor Project / Applications / fenix -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/tree/tor-browser-89.… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/fenix] Pushed new branch tor-browser-89.1.1-10.0-1
by Matthew Finkel (＠sysrqb) 17 Jun '21

17 Jun '21

Matthew Finkel pushed new branch tor-browser-89.1.1-10.0-1 at The Tor Project / Applications / fenix -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/tree/tor-browser-89.… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser-build/maint-10.0-android] Bug 40290: Update components for mozilla89-based Fenix (GeckoView part)
by sysrqb＠torproject.org 17 Jun '21

17 Jun '21

commit aaec7d9524d695581cc4bf06478056a42ee8bd6d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 28 11:11:51 2021 +0200 Bug 40290: Update components for mozilla89-based Fenix (GeckoView part) --- projects/cbindgen/config | 10 ++++++---- projects/geckoview/config | 6 +++--- projects/rust/config | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/projects/cbindgen/config b/projects/cbindgen/config index 43c2fb8..125d0e4 100644 --- a/projects/cbindgen/config +++ b/projects/cbindgen/config @@ -8,15 +8,17 @@ var: cbindgen_version: 0.14.1 cbindgen_hash: 0761b9bbe48d01ded1bbec45bbeea5544b3b1002 cbindgen_vendor_hash: 1c500bc1b8de4eb400f90a528c4b5c6b2c7357e401a95c5354469a18fd365dbc + cbindgen_vendor_people_tpo_user: gk container: use_container: 1 targets: android: var: - cbindgen_version: 0.16.0 - cbindgen_hash: a00b4215a907601680f6e9acaf93df1cbafa8ded - cbindgen_vendor_hash: f470dcf6a60374f07786491fb2971e8b96f9b7ff18956eb24c4e2577e55440d6 + cbindgen_version: 0.19.0 + cbindgen_hash: d9e490ce8b836194595bd30611253a7028059da2 + cbindgen_vendor_hash: 7d99c195b180e28ca7499d8744d020b864f952a5ba699716707aec9a06b4ee8b + cbindgen_vendor_people_tpo_user: boklm input_files: - project: container-image @@ -25,7 +27,7 @@ input_files: # `cargo vendor vendor` in the `cbindgen` directory has vendored the sources. # Use `make cargo_vendor-cbindgen` or `make cargo_vendor-cbindgen-android` # (for the Android version) to re-generate the vendor tarball - - URL: https://people.torproject.org/~gk/mirrors/sources/cbindgen-vendor-[% c('version') %].tar.bz2 + - URL: https://people.torproject.org/~[% c('var/cbindgen_vendor_people_tpo_user') %]/mirrors/sources/cbindgen-vendor-[% c('version') %].tar.bz2 sha256sum: '[% c("var/cbindgen_vendor_hash") %]' steps: diff --git a/projects/geckoview/config b/projects/geckoview/config index 2d04f08..dfadda3 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - geckoview_version: 88.0.1 + geckoview_version: 89.0 torbrowser_branch: 10.0 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: @@ -138,9 +138,9 @@ steps: - torbrowser-android-x86_64 list_toolchain_updates: - git_url: https://github.com/mozilla/gecko-dev.git + #git_url: https://github.com/mozilla/gecko-dev.git # 89.0b10 - git_hash: 702dfbec3d62823d0dfca870995540383ab39183 + #git_hash: 702dfbec3d62823d0dfca870995540383ab39183 tag_gpg_id: 0 input_files: [] var: diff --git a/projects/rust/config b/projects/rust/config index 0095a8a..4060488 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -11,8 +11,8 @@ var: targets: android: var: - current_version: 1.50.0 - previous_version: 1.49.0 + current_version: 1.51.0 + previous_version: 1.50.0 arch_deps: - libssl-dev - pkg-config

1 0

[tor-browser-build/maint-10.0-android] Bug 40290: Update components for mozilla89-based Fenix (android-components part)
by sysrqb＠torproject.org 17 Jun '21

17 Jun '21

commit 0b8e30597b2ff826010f0c02f01f506fecac058e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu May 13 10:41:37 2021 +0200 Bug 40290: Update components for mozilla89-based Fenix (android-components part) --- projects/android-components/config | 10 +++++----- projects/android-components/gradle-dependencies-list.txt | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/projects/android-components/config b/projects/android-components/config index 6eedb7c..2047bca 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -8,12 +8,12 @@ gpg_keyring: torbutton.gpg variant: '[% IF c("var/release") %]Release[% ELSE %]Beta[% END %]' var: - android_components_version: 74.0.13 + android_components_version: 75.0.22 torbrowser_branch: 10.0 container: use_container: 1 # This should be updated when the list of gradle dependencies is changed. - gradle_dependencies_version: 24 + gradle_dependencies_version: 25 gradle_version: 6.6.1 glean_parser: 2.2.0 git_branch: '[% project %]-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-1' @@ -58,9 +58,9 @@ input_files: steps: list_toolchain_updates: - git_url: https://github.com/mozilla-mobile/android-components.git - git_hash: v75.0.11 - tag_gpg_id: 0 + #git_url: https://github.com/mozilla-mobile/android-components.git + #git_hash: v75.0.22 + #tag_gpg_id: 0 var: container: use_container: 0 diff --git a/projects/android-components/gradle-dependencies-list.txt b/projects/android-components/gradle-dependencies-list.txt index fc57f9c..7cfb131 100644 --- a/projects/android-components/gradle-dependencies-list.txt +++ b/projects/android-components/gradle-dependencies-list.txt @@ -49,7 +49,6 @@ a67c52c9ddfaff2ffb2fd4b97cd94fa382e837ea8a5874d029e0a04fa63e5caf | https://dl.go 78309600ba6fe4473c045976906649b25b3c9a49b14642f8a8a7dcd9e1afe7c8 | https://dl.google.com/dl/android/maven2/androidx/core/core-ktx/1.3.2/core-k… ba6a806bc1a6faf0cbae08397b3f781feca293ff2b5f3aa600b3d2db142e5ab4 | https://dl.google.com/dl/android/maven2/androidx/core/core-ktx/1.3.2/core-k… 384d529ad668ada4808de29b29a6348f0007c2841ad79cae9a5a089bd68810f5 | https://dl.google.com/dl/android/maven2/androidx/core/core/1.0.0/core-1.0.0… -76c7cfbe596fe3c09a6983bf1c89e889299c08ac9a3b52ce5182a088d056647e | https://dl.google.com/dl/android/maven2/androidx/core/core/1.1.0/core-1.1.0… dae46132cdcd46b798425f7cb78fd65890869b6d26101ccdcd43461a4f51754c | https://dl.google.com/dl/android/maven2/androidx/core/core/1.1.0/core-1.1.0… 1c6b6626f15185d8f4bc7caac759412a1ab6e851ecf7526387d9b9fadcabdb63 | https://dl.google.com/dl/android/maven2/androidx/core/core/1.3.0/core-1.3.0… 3ea5d60db139d9fbc5c5f7ac06d779fb75dafe71b0931bc9db863231294bc2d5 | https://dl.google.com/dl/android/maven2/androidx/core/core/1.3.0/core-1.3.0… @@ -159,6 +158,8 @@ c3a321133e616b46cf5ad07191aeebf4affdb73abee455851d39f7b4db7acb36 | https://dl.go 8831c06417fab6a9690c25f6e4b347b2e8c03cf6d47337be9c57e75b7fb23e6a | https://dl.google.com/dl/android/maven2/androidx/recyclerview/recyclerview/… f0d2b5a67d0a91ee1b1c73ef2b636a81f3563925ddd15a1d4e1c41ec28de7a4f | https://dl.google.com/dl/android/maven2/androidx/recyclerview/recyclerview/… fe321062a6e4e168b9c2b39a1137564c8784a2e5849402729768d5d7c4d972ef | https://dl.google.com/dl/android/maven2/androidx/recyclerview/recyclerview/… +f68c432db998efac90b9e7f41c1510f097b82220766524d45d04f9b64c6e4d87 | https://dl.google.com/dl/android/maven2/androidx/recyclerview/recyclerview/… +8b3980162e37ea8bd61207e0ba2e74b7c28b4eecd142bb5021d3e4ac27607eaf | https://dl.google.com/dl/android/maven2/androidx/recyclerview/recyclerview/… 2b130dd4a1d3d91b6701ed33096d389f01c4fc1197a7acd6b91724ddc5acfc06 | https://dl.google.com/dl/android/maven2/androidx/room/room-common/2.2.5/roo… fbb37fcf02b35ba7a909fffb52ce4ccb36874f03c1f927f6338b68ef9f1d6b7a | https://dl.google.com/dl/android/maven2/androidx/room/room-common/2.2.5/roo… b504b252dc8b15a0e8255d4c355363675b0d79aa40b4ccbb5ea58fabb184df81 | https://dl.google.com/dl/android/maven2/androidx/room/room-compiler/2.2.5/r… @@ -344,7 +345,6 @@ efe2431a01a188d3037d02a08e60900ec7406de626e4bd5b4995f28d409c0ebd | https://dl.go 24bd1b4a8f81aea76ae30054df6343b5c0abc27024a5f6fb9c6ee7d4ffb86533 | https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-measur… d7a2ff3a2fdbd0801f832df3de81dab06d9db7e4a57dfa6d768e7c6e5fa22280 | https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-messag… 79b705ecf5140d3a2601b44ef058b4588878432eb6fb2f9d65da0551cb0a8e20 | https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-messag… -e953cbf59b797ceb11ce312e8da19bb8afc013ef548d8946711c116bc2500482 | https://download.jetbrains.com/kotlin/native/builds/releases/1.4.30/linux/k… 6d600e6f04708c1393db6a3fb57ee273068fd8e7f95dcc32c184e3c2bb767599 | https://maven.mozilla.org/maven2/org/mozilla/appservices/autofill/74.0.1/au… ca74e10892b729a0026257b89e953c03e77e44582d1686f65e8796d969ba16fd | https://maven.mozilla.org/maven2/org/mozilla/appservices/autofill/74.0.1/au… 5c40c0df6784f1d6ae1748196945c3c314d626153c81fc626c9dfd9847719bfa | https://maven.mozilla.org/maven2/org/mozilla/appservices/full-megazord-forU… @@ -385,12 +385,12 @@ d1741144ed2ea215a84f5d94d779cafcfaf778cce8cc7224437a2884cb1101bc | https://maven 7b0a3bd6d32c8002f785db8fdbf3b08e3541366e784cac1304cb3f49642b916a | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/71.0.0/… f7bf27270904abd8639b543151b6eaf268b821b8e6235c8decf8031e02ec8648 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/71.0.… 0b80acf7d1dd0d9484b0e82cd1a04ae57270d7f7e6b339ce39424554d48798e3 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/71.0.… -cd7d0e09420351e9e69277083b263c8f0aad75a4bac3153776caf1424efae653 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/88.0.… -e1913ae393cae4186dd8603fbbf11f7b76720a216ce3132319a13d57d575f558 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/88.0.… -d622b92149ed8477aca47dabe0fd53de75191a29ff4d79a0cfc718736bb4aa2a | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/89… -8d6bc0c248af8f3d1f4f45abd4e04bf76044fbce518ca3c384ff83fe9acb38b4 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/89… -72a76c4fa3ae7f124803ec831cf3b9789310bf7db1d79f2f8bf32ae258981292 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/88.0.20210… -5f4bba20be1099c4a1f156099155fe159efcedf796130874315f02a99260bee5 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/88.0.20210… +f505022a34ce4fb702b870ad67a9d8e034e01a1aea254639f28bb4ea4c39277f | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/89.0.… +fc20b0295ed1842656fb728387a5759ce88853964e762121193662fe14d1c656 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/89.0.… +b72463d7806c54aa4e249fbd67994ad4aa4b60bd9682033f38d6f6baa1f78a7f | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/90… +995e64a86fb059b9a03fb9694daf15a0cb45979e7154fc9b3fb518fcc0fae301 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/90… +c35990d69effd8de43596536f1c831a29cd6083e98308942cfb17f6b53afae44 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/89.0.20210… +d6311287b00e2ee57d45ab8d1ba54b781be78e9db36de36b3ba7360cea3314d7 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/89.0.20210… 1eb5321d64bdd07865bd8599b6b981193b54661f25bbb8e3ccdc6f8210c9ae38 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3… f62de54f66aa4086100f26884927dbff06a1cbea7fb17010312d10d71cea3f01 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3… 624e642862770feb72c22cd80cd96f0e5d53340ded862987b3ec9c537c8bed29 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/…

1 0

[tor-browser-build/maint-10.0-android] Bug 40289: Make the list of components updates for switch to mozilla89-based Fenix
by sysrqb＠torproject.org 17 Jun '21

17 Jun '21

commit 2a4f04fc7333c66f35edd338a7fea3b7c1eeae71 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 28 10:45:21 2021 +0200 Bug 40289: Make the list of components updates for switch to mozilla89-based Fenix --- projects/android-components/config | 6 +++--- projects/fenix/config | 6 +++--- projects/geckoview/config | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/projects/android-components/config b/projects/android-components/config index 8c5c4ab..50ff128 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -57,9 +57,9 @@ input_files: steps: list_toolchain_updates: - #git_url: https://github.com/mozilla-mobile/android-components.git - #git_hash: v74.0.6 - #tag_gpg_id: 0 + git_url: https://github.com/mozilla-mobile/android-components.git + git_hash: v75.0.11 + tag_gpg_id: 0 var: container: use_container: 0 diff --git a/projects/fenix/config b/projects/fenix/config index 3835e41..893163a 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -55,9 +55,9 @@ input_files: steps: list_toolchain_updates: - #git_url: https://github.com/mozilla-mobile/fenix.git - #git_hash: v88.0.0-beta.4 - #tag_gpg_id: 0 + git_url: https://github.com/mozilla-mobile/fenix.git + git_hash: v89.0.0-beta.5 + tag_gpg_id: 0 input_files: [] var: container: diff --git a/projects/geckoview/config b/projects/geckoview/config index 844fd82..2d04f08 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -138,10 +138,10 @@ steps: - torbrowser-android-x86_64 list_toolchain_updates: - #git_url: https://github.com/mozilla/gecko-dev.git - # 88.0b8 - #git_hash: 43ab49774f70a5c70b2cd69a2b2a8bc0a3be20bf - #tag_gpg_id: 0 + git_url: https://github.com/mozilla/gecko-dev.git + # 89.0b10 + git_hash: 702dfbec3d62823d0dfca870995540383ab39183 + tag_gpg_id: 0 input_files: [] var: container:

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits June 2021