- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-91.6.0esr-11.5-1] Adding issue template for bugs.
by richard＠torproject.org 09 Feb '22

09 Feb '22

commit 05250a938d07629448bda5f1178234dbf82b17d9 Author: Gaba <gaba(a)torproject.org> Date: Mon Jun 28 11:44:16 2021 -0700 Adding issue template for bugs. --- .gitlab/issue_templates/UXBug.md | 29 +++++++++++++++++++++++++++++ .gitlab/issue_templates/bug.md | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/.gitlab/issue_templates/UXBug.md b/.gitlab/issue_templates/UXBug.md new file mode 100644 index 000000000000..8e7cb2a5e163 --- /dev/null +++ b/.gitlab/issue_templates/UXBug.md @@ -0,0 +1,29 @@ + + +### Summary +**Summarize the bug encountered concisely.** + + +### Steps to reproduce: +**How one can reproduce the issue - this is very important.** + +1. Step 1 +2. Step 2 +3. ... + +### What is the current bug behavior? +**What actually happens.** + + +### What is the expected behavior? +**What you want to see instead** + + + +## Relevant logs and/or screenshots +**Do you have screenshots? Attach them to this ticket please.** + +/label ~tor-ux ~needs-investigation ~bug +/assign @nah diff --git a/.gitlab/issue_templates/bug.md b/.gitlab/issue_templates/bug.md new file mode 100644 index 000000000000..6ce85a4864be --- /dev/null +++ b/.gitlab/issue_templates/bug.md @@ -0,0 +1,32 @@ + + +### Summary +**Summarize the bug encountered concisely.** + + +### Steps to reproduce: +**How one can reproduce the issue - this is very important.** + +1. Step 1 +2. Step 2 +3. ... + +### What is the current bug behavior? +**What actually happens.** + + +### What is the expected behavior? +**What you want to see instead** + + + +### Environment +**Which operating system are you using? For example: Debian GNU/Linux 10.1, Windows 10, Ubuntu Xenial, FreeBSD 12.2, etc.** +**Which installation method did you use? Distribution package (apt, pkg, homebrew), from source tarball, from Git, etc.** + +### Relevant logs and/or screenshots + + +/label ~bug

1 0

[tor-browser/tor-browser-91.6.0esr-11.5-1] Revert "Bug 1724777, optimize suppressed MicroTask handling, r=mccr8 a=RyanVM"
by richard＠torproject.org 09 Feb '22

09 Feb '22

commit 9901ee290ce9171d5487690c1dfa26935027dcc3 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Dec 7 16:19:15 2021 +0000 Revert "Bug 1724777, optimize suppressed MicroTask handling, r=mccr8 a=RyanVM" This reverts commit 1eb1364357ac5bc2a4531337fb5416af39c3793f. This fixes tor-browser#40721, tor-browser#40698, and tor-browser#40706. However, it is a temporary workaround, that we should revert once https://bugzilla.mozilla.org/show_bug.cgi?id=1744719 is fixed. --- dom/base/Document.cpp | 12 ------ dom/base/Document.h | 8 +++- dom/base/test/mochitest.ini | 2 - dom/base/test/test_suppressed_microtasks.html | 62 --------------------------- dom/workers/RuntimeService.cpp | 4 +- dom/workers/WorkerPrivate.cpp | 2 +- dom/worklet/WorkletThread.cpp | 2 +- xpcom/base/CycleCollectedJSContext.cpp | 51 ++++++---------------- xpcom/base/CycleCollectedJSContext.h | 29 +++---------- 9 files changed, 28 insertions(+), 144 deletions(-) diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp index a58e76cb5258..0ef4b3236477 100644 --- a/dom/base/Document.cpp +++ b/dom/base/Document.cpp @@ -15633,18 +15633,6 @@ nsAutoSyncOperation::~nsAutoSyncOperation() { } } -void Document::SetIsInSyncOperation(bool aSync) { - if (CycleCollectedJSContext* ccjs = CycleCollectedJSContext::Get()) { - ccjs->UpdateMicroTaskSuppressionGeneration(); - } - - if (aSync) { - ++mInSyncOperationCount; - } else { - --mInSyncOperationCount; - } -} - gfxUserFontSet* Document::GetUserFontSet() { if (!mFontFaceSet) { return nullptr; diff --git a/dom/base/Document.h b/dom/base/Document.h index 7165496397f3..69e59d09b924 100644 --- a/dom/base/Document.h +++ b/dom/base/Document.h @@ -3214,7 +3214,13 @@ class Document : public nsINode, bool IsInSyncOperation() { return mInSyncOperationCount != 0; } - void SetIsInSyncOperation(bool aSync); + void SetIsInSyncOperation(bool aSync) { + if (aSync) { + ++mInSyncOperationCount; + } else { + --mInSyncOperationCount; + } + } bool CreatingStaticClone() const { return mCreatingStaticClone; } diff --git a/dom/base/test/mochitest.ini b/dom/base/test/mochitest.ini index 06b5691422c5..e287a0d10ae8 100644 --- a/dom/base/test/mochitest.ini +++ b/dom/base/test/mochitest.ini @@ -769,8 +769,6 @@ skip-if = debug == false [test_shared_compartment2.html] [test_structuredclone_backref.html] [test_style_cssText.html] -[test_suppressed_microtasks.html] -skip-if = debug || asan || verify || toolkit == 'android' # The test needs to run reasonably fast. [test_text_wholeText.html] [test_textnode_normalize_in_selection.html] [test_textnode_split_in_selection.html] diff --git a/dom/base/test/test_suppressed_microtasks.html b/dom/base/test/test_suppressed_microtasks.html deleted file mode 100644 index f5d333638698..000000000000 --- a/dom/base/test/test_suppressed_microtasks.html +++ /dev/null @@ -1,62 +0,0 @@ -<!DOCTYPE HTML> -<html> -<head> - <meta charset="utf-8"> - <title>Test microtask suppression</title> - <script src="/tests/SimpleTest/SimpleTest.js"></script> - <link rel="stylesheet" href="/tests/SimpleTest/test.css"/> - <script> - SimpleTest.waitForExplicitFinish(); - - var previousTask = -1; - function test() { - let win = window.open("about:blank"); - win.onload = function() { - win.onmessage = function() { - win.start = win.performance.now(); - win.didRunMicrotask = false; - win.onmessage = function() { - ok(win.didRunMicrotask, "Should have run a microtask."); - let period = win.performance.now() - win.start; - win.opener.ok( - period < 200, - "Running a task should be fast. Took " + period + "ms."); - win.onmessage = null; - } - win.queueMicrotask(function() { win.didRunMicrotask = true; }); - win.postMessage("measurementMessage", "*"); - } - win.postMessage("initialMessage", "*"); - - const last = 500000; - for (let i = 0; i < last + 1; ++i) { - window.queueMicrotask(function() { - // Check that once microtasks are unsuppressed, they are handled in - // the correct order. - if (previousTask != i - 1) { - // Explicitly optimize out cases which pass. - ok(false, "Microtasks should be handled in order."); - } - previousTask = i; - if (i == last) { - win.close(); - SimpleTest.finish(); - } - }); - } - - // Synchronous XMLHttpRequest suppresses microtasks. - var xhr = new XMLHttpRequest(); - xhr.open("GET", "slow.sjs", false); - xhr.send(); - is(previousTask, -1, "Shouldn't have run microtasks during a sync XHR."); - } - } - </script> -</head> -<body onload="test()"> -<p id="display"></p> -<div id="content" style="display: none"></div> -<pre id="test"></pre> -</body> -</html> diff --git a/dom/workers/RuntimeService.cpp b/dom/workers/RuntimeService.cpp index c3e3f56834d7..3fda0a78fd23 100644 --- a/dom/workers/RuntimeService.cpp +++ b/dom/workers/RuntimeService.cpp @@ -931,7 +931,7 @@ class WorkerJSContext final : public mozilla::CycleCollectedJSContext { MOZ_ASSERT(!NS_IsMainThread()); MOZ_ASSERT(runnable); - std::deque<RefPtr<MicroTaskRunnable>>* microTaskQueue = nullptr; + std::queue<RefPtr<MicroTaskRunnable>>* microTaskQueue = nullptr; JSContext* cx = Context(); NS_ASSERTION(cx, "This should never be null!"); @@ -953,7 +953,7 @@ class WorkerJSContext final : public mozilla::CycleCollectedJSContext { } JS::JobQueueMayNotBeEmpty(cx); - microTaskQueue->push_back(std::move(runnable)); + microTaskQueue->push(std::move(runnable)); } bool IsSystemCaller() const override { diff --git a/dom/workers/WorkerPrivate.cpp b/dom/workers/WorkerPrivate.cpp index 506ef24185c4..6907a3ae816c 100644 --- a/dom/workers/WorkerPrivate.cpp +++ b/dom/workers/WorkerPrivate.cpp @@ -4313,7 +4313,7 @@ void WorkerPrivate::EnterDebuggerEventLoop() { { MutexAutoLock lock(mMutex); - std::deque<RefPtr<MicroTaskRunnable>>& debuggerMtQueue = + std::queue<RefPtr<MicroTaskRunnable>>& debuggerMtQueue = ccjscx->GetDebuggerMicroTaskQueue(); while (mControlQueue.IsEmpty() && !(debuggerRunnablesPending = !mDebuggerQueue.IsEmpty()) && diff --git a/dom/worklet/WorkletThread.cpp b/dom/worklet/WorkletThread.cpp index fae1a1c550d1..c672dfb21b8b 100644 --- a/dom/worklet/WorkletThread.cpp +++ b/dom/worklet/WorkletThread.cpp @@ -159,7 +159,7 @@ class WorkletJSContext final : public CycleCollectedJSContext { #endif JS::JobQueueMayNotBeEmpty(cx); - GetMicroTaskQueue().push_back(std::move(runnable)); + GetMicroTaskQueue().push(std::move(runnable)); } bool IsSystemCaller() const override { diff --git a/xpcom/base/CycleCollectedJSContext.cpp b/xpcom/base/CycleCollectedJSContext.cpp index 0a35a5cf5524..347f15c82322 100644 --- a/xpcom/base/CycleCollectedJSContext.cpp +++ b/xpcom/base/CycleCollectedJSContext.cpp @@ -61,7 +61,6 @@ CycleCollectedJSContext::CycleCollectedJSContext() mDoingStableStates(false), mTargetedMicroTaskRecursionDepth(0), mMicroTaskLevel(0), - mSuppressionGeneration(0), mDebuggerRecursionDepth(0), mMicroTaskRecursionDepth(0), mFinalizationRegistryCleanup(this) { @@ -292,7 +291,7 @@ class CycleCollectedJSContext::SavedMicroTaskQueue private: CycleCollectedJSContext* ccjs; - std::deque<RefPtr<MicroTaskRunnable>> mQueue; + std::queue<RefPtr<MicroTaskRunnable>> mQueue; }; js::UniquePtr<JS::JobQueue::SavedJobQueue> @@ -380,13 +379,13 @@ void CycleCollectedJSContext::SetPendingException(Exception* aException) { mPendingException = aException; } -std::deque<RefPtr<MicroTaskRunnable>>& +std::queue<RefPtr<MicroTaskRunnable>>& CycleCollectedJSContext::GetMicroTaskQueue() { MOZ_ASSERT(mJSContext); return mPendingMicroTaskRunnables; } -std::deque<RefPtr<MicroTaskRunnable>>& +std::queue<RefPtr<MicroTaskRunnable>>& CycleCollectedJSContext::GetDebuggerMicroTaskQueue() { MOZ_ASSERT(mJSContext); return mDebuggerMicroTaskQueue; @@ -563,7 +562,7 @@ void CycleCollectedJSContext::DispatchToMicroTask( JS::JobQueueMayNotBeEmpty(Context()); LogMicroTaskRunnable::LogDispatch(runnable.get()); - mPendingMicroTaskRunnables.push_back(std::move(runnable)); + mPendingMicroTaskRunnables.push(std::move(runnable)); } class AsyncMutationHandler final : public mozilla::Runnable { @@ -582,25 +581,6 @@ class AsyncMutationHandler final : public mozilla::Runnable { } }; -SuppressedMicroTasks::SuppressedMicroTasks(CycleCollectedJSContext* aContext) - : mContext(aContext), - mSuppressionGeneration(aContext->mSuppressionGeneration) {} - -bool SuppressedMicroTasks::Suppressed() { - if (mSuppressionGeneration == mContext->mSuppressionGeneration) { - return true; - } - - for (std::deque<RefPtr<MicroTaskRunnable>>::reverse_iterator it = - mSuppressedMicroTaskRunnables.rbegin(); - it != mSuppressedMicroTaskRunnables.rend(); ++it) { - mContext->GetMicroTaskQueue().push_front(*it); - } - mContext->mSuppressedMicroTasks = nullptr; - - return false; -} - bool CycleCollectedJSContext::PerformMicroTaskCheckPoint(bool aForce) { if (mPendingMicroTaskRunnables.empty() && mDebuggerMicroTaskQueue.empty()) { AfterProcessMicrotasks(); @@ -636,14 +616,15 @@ bool CycleCollectedJSContext::PerformMicroTaskCheckPoint(bool aForce) { bool didProcess = false; AutoSlowOperation aso; + std::queue<RefPtr<MicroTaskRunnable>> suppressed; for (;;) { RefPtr<MicroTaskRunnable> runnable; if (!mDebuggerMicroTaskQueue.empty()) { runnable = std::move(mDebuggerMicroTaskQueue.front()); - mDebuggerMicroTaskQueue.pop_front(); + mDebuggerMicroTaskQueue.pop(); } else if (!mPendingMicroTaskRunnables.empty()) { runnable = std::move(mPendingMicroTaskRunnables.front()); - mPendingMicroTaskRunnables.pop_front(); + mPendingMicroTaskRunnables.pop(); } else { break; } @@ -654,16 +635,10 @@ bool CycleCollectedJSContext::PerformMicroTaskCheckPoint(bool aForce) { // all suppressed tasks in mDebuggerMicroTaskQueue unexpectedly. MOZ_ASSERT(NS_IsMainThread()); JS::JobQueueMayNotBeEmpty(Context()); - if (runnable != mSuppressedMicroTasks) { - if (!mSuppressedMicroTasks) { - mSuppressedMicroTasks = new SuppressedMicroTasks(this); - } - mSuppressedMicroTasks->mSuppressedMicroTaskRunnables.push_back( - runnable); - } + suppressed.push(runnable); } else { if (mPendingMicroTaskRunnables.empty() && - mDebuggerMicroTaskQueue.empty() && !mSuppressedMicroTasks) { + mDebuggerMicroTaskQueue.empty() && suppressed.empty()) { JS::JobQueueIsEmpty(Context()); } didProcess = true; @@ -678,9 +653,7 @@ bool CycleCollectedJSContext::PerformMicroTaskCheckPoint(bool aForce) { // Note, it is possible that we end up keeping these suppressed tasks around // for some time, but no longer than spinning the event loop nestedly // (sync XHR, alert, etc.) - if (mSuppressedMicroTasks) { - mPendingMicroTaskRunnables.push_back(mSuppressedMicroTasks); - } + mPendingMicroTaskRunnables.swap(suppressed); AfterProcessMicrotasks(); @@ -695,7 +668,7 @@ void CycleCollectedJSContext::PerformDebuggerMicroTaskCheckpoint() { for (;;) { // For a debugger microtask checkpoint, we always use the debugger microtask // queue. - std::deque<RefPtr<MicroTaskRunnable>>* microtaskQueue = + std::queue<RefPtr<MicroTaskRunnable>>* microtaskQueue = &GetDebuggerMicroTaskQueue(); if (microtaskQueue->empty()) { @@ -708,7 +681,7 @@ void CycleCollectedJSContext::PerformDebuggerMicroTaskCheckpoint() { LogMicroTaskRunnable::Run log(runnable.get()); // This function can re-enter, so we remove the element before calling. - microtaskQueue->pop_front(); + microtaskQueue->pop(); if (mPendingMicroTaskRunnables.empty() && mDebuggerMicroTaskQueue.empty()) { JS::JobQueueIsEmpty(Context()); diff --git a/xpcom/base/CycleCollectedJSContext.h b/xpcom/base/CycleCollectedJSContext.h index 116bff1c90c8..769b000418ab 100644 --- a/xpcom/base/CycleCollectedJSContext.h +++ b/xpcom/base/CycleCollectedJSContext.h @@ -7,7 +7,7 @@ #ifndef mozilla_CycleCollectedJSContext_h #define mozilla_CycleCollectedJSContext_h -#include <deque> +#include <queue> #include "mozilla/Attributes.h" #include "mozilla/MemoryReporting.h" @@ -81,20 +81,6 @@ class MicroTaskRunnable { virtual ~MicroTaskRunnable() = default; }; -// Store the suppressed mictotasks in another microtask so that operations -// for the microtask queue as a whole keep working. -class SuppressedMicroTasks : public MicroTaskRunnable { - public: - explicit SuppressedMicroTasks(CycleCollectedJSContext* aContext); - - MOZ_CAN_RUN_SCRIPT_BOUNDARY void Run(AutoSlowOperation& aAso) final {} - virtual bool Suppressed(); - - CycleCollectedJSContext* mContext; - uint64_t mSuppressionGeneration; - std::deque<RefPtr<MicroTaskRunnable>> mSuppressedMicroTaskRunnables; -}; - // Support for JS FinalizationRegistry objects, which allow a JS callback to be // registered that is called when objects die. // @@ -131,7 +117,6 @@ class FinalizationRegistryCleanup { class CycleCollectedJSContext : dom::PerThreadAtomCache, private JS::JobQueue { friend class CycleCollectedJSRuntime; - friend class SuppressedMicroTasks; protected: CycleCollectedJSContext(); @@ -181,8 +166,8 @@ class CycleCollectedJSContext : dom::PerThreadAtomCache, private JS::JobQueue { already_AddRefed<dom::Exception> GetPendingException() const; void SetPendingException(dom::Exception* aException); - std::deque<RefPtr<MicroTaskRunnable>>& GetMicroTaskQueue(); - std::deque<RefPtr<MicroTaskRunnable>>& GetDebuggerMicroTaskQueue(); + std::queue<RefPtr<MicroTaskRunnable>>& GetMicroTaskQueue(); + std::queue<RefPtr<MicroTaskRunnable>>& GetDebuggerMicroTaskQueue(); JSContext* Context() const { MOZ_ASSERT(mJSContext); @@ -198,8 +183,6 @@ class CycleCollectedJSContext : dom::PerThreadAtomCache, private JS::JobQueue { mTargetedMicroTaskRecursionDepth = aDepth; } - void UpdateMicroTaskSuppressionGeneration() { ++mSuppressionGeneration; } - protected: JSContext* MaybeContext() const { return mJSContext; } @@ -333,10 +316,8 @@ class CycleCollectedJSContext : dom::PerThreadAtomCache, private JS::JobQueue { uint32_t mMicroTaskLevel; - std::deque<RefPtr<MicroTaskRunnable>> mPendingMicroTaskRunnables; - std::deque<RefPtr<MicroTaskRunnable>> mDebuggerMicroTaskQueue; - RefPtr<SuppressedMicroTasks> mSuppressedMicroTasks; - uint64_t mSuppressionGeneration; + std::queue<RefPtr<MicroTaskRunnable>> mPendingMicroTaskRunnables; + std::queue<RefPtr<MicroTaskRunnable>> mDebuggerMicroTaskQueue; // How many times the debugger has interrupted execution, possibly creating // microtask checkpoints in places that they would not normally occur.

1 0

[tor-browser/tor-browser-91.6.0esr-11.5-1] Bug 16439: Remove screencasting code
by richard＠torproject.org 09 Feb '22

09 Feb '22

commit 28d36e0ac9eec25601b11c8816b02f49cf9f7498 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jun 24 11:01:11 2015 -0400 Bug 16439: Remove screencasting code We avoid including the screencasting code on mobile (it got ripped out for desktop in bug 1393582) by simply excluding the related JS modules from Tor Browser. --- toolkit/modules/moz.build | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build index 8ac56c81e646..3fb050b5d18b 100644 --- a/toolkit/modules/moz.build +++ b/toolkit/modules/moz.build @@ -255,10 +255,11 @@ if "Android" != CONFIG["OS_TARGET"]: ] else: DEFINES["ANDROID"] = True - EXTRA_JS_MODULES += [ - "secondscreen/RokuApp.jsm", - "secondscreen/SimpleServiceDiscovery.jsm", - ] + if not CONFIG["TOR_BROWSER_VERSION"]: + EXTRA_JS_MODULES += [ + "secondscreen/RokuApp.jsm", + "secondscreen/SimpleServiceDiscovery.jsm", + ] if CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows":

1 0

[tor-browser/tor-browser-91.6.0esr-11.5-1] Bug 24796 - Comment out excess permissions from GeckoView
by richard＠torproject.org 09 Feb '22

09 Feb '22

commit ea96fafdaeb8d4c7e417681b330e0330c9af7681 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Wed Apr 11 17:52:59 2018 +0000 Bug 24796 - Comment out excess permissions from GeckoView The GeckoView AndroidManifest.xml is not preprocessed unlike Fennec's manifest, so we can't use the ifdef preprocessor guards around the permissions we do not want. Commenting the permissions is the next-best-thing. --- .../android/geckoview/src/main/AndroidManifest.xml | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/mobile/android/geckoview/src/main/AndroidManifest.xml b/mobile/android/geckoview/src/main/AndroidManifest.xml index a76b6a4754b6..7a2f30708fc3 100644 --- a/mobile/android/geckoview/src/main/AndroidManifest.xml +++ b/mobile/android/geckoview/src/main/AndroidManifest.xml @@ -6,20 +6,32 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.mozilla.geckoview"> + +  + <uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.WAKE_LOCK"/> <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" /> + +  + <uses-feature android:name="android.hardware.touchscreen" android:required="false"/> + +  +  +  <uses-feature

1 0

[tor-browser/tor-browser-91.6.0esr-11.5-1] Bug 25741 - TBA: Disable GeckoNetworkManager
by richard＠torproject.org 09 Feb '22

09 Feb '22

commit f9c9cb2b54b27d557caee71aec19405da9508b0b Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Apr 26 22:22:51 2018 +0000 Bug 25741 - TBA: Disable GeckoNetworkManager The browser should not need information related to the network interface or network state, tor should take care of that. --- .../src/main/java/org/mozilla/geckoview/GeckoRuntime.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java index f084b522ad53..b94d8e803b6b 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java @@ -122,7 +122,9 @@ public final class GeckoRuntime implements Parcelable { mPaused = false; // Monitor network status and send change notifications to Gecko // while active. - GeckoNetworkManager.getInstance().start(GeckoAppShell.getApplicationContext()); + if (BuildConfig.TOR_BROWSER_VERSION == "") { + GeckoNetworkManager.getInstance().start(GeckoAppShell.getApplicationContext()); + } } @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE) @@ -130,7 +132,9 @@ public final class GeckoRuntime implements Parcelable { Log.d(LOGTAG, "Lifecycle: onPause"); mPaused = true; // Stop monitoring network status while inactive. - GeckoNetworkManager.getInstance().stop(); + if (BuildConfig.TOR_BROWSER_VERSION == "") { + GeckoNetworkManager.getInstance().stop(); + } GeckoThread.onPause(); } }

1 0

[tor-browser/tor-browser-91.6.0esr-11.5-1] Bug 16285: Exclude ClearKey system for now
by richard＠torproject.org 09 Feb '22

09 Feb '22

commit 6480268ab422afe5a05fac21a608d8d940331b39 Author: Georg Koppen <gk(a)torproject.org> Date: Mon May 22 12:44:40 2017 +0000 Bug 16285: Exclude ClearKey system for now In the past the ClearKey system had not been compiled when specifying --disable-eme. But that changed and it is even bundled nowadays (see: Mozilla's bug 1300654). We don't want to ship it right now as the use case for it is not really visible while the code had security vulnerabilities in the past. --- browser/installer/package-manifest.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 40de7394e6ee..c64d488c750c 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -449,8 +449,8 @@ bin/libfreebl_64int_3.so #endif ; media -@RESPATH@/gmp-clearkey/0.1/@DLL_PREFIX@clearkey@DLL_SUFFIX@ -@RESPATH@/gmp-clearkey/0.1/manifest.json +;@RESPATH@/gmp-clearkey/0.1/@DLL_PREFIX@clearkey@DLL_SUFFIX@ +;@RESPATH@/gmp-clearkey/0.1/manifest.json #ifdef MOZ_DMD ; DMD

1 0

[tor-browser/tor-browser-91.6.0esr-11.5-1] Bug 28125 - Prevent non-Necko network connections
by richard＠torproject.org 09 Feb '22

09 Feb '22

commit e46b6e6e2e79ffe73eff394a5213008befcf6994 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Oct 25 19:17:09 2018 +0000 Bug 28125 - Prevent non-Necko network connections --- .../gecko/media/GeckoMediaDrmBridgeV21.java | 49 +--------------------- .../exoplayer2/upstream/DefaultHttpDataSource.java | 47 ++------------------- 2 files changed, 4 insertions(+), 92 deletions(-) diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrmBridgeV21.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrmBridgeV21.java index 6e75e6fb4dd5..7faa9bc2821d 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrmBridgeV21.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrmBridgeV21.java @@ -490,54 +490,7 @@ public class GeckoMediaDrmBridgeV21 implements GeckoMediaDrm { @Override protected Void doInBackground(final Void... params) { - HttpURLConnection urlConnection = null; - BufferedReader in = null; - try { - final URI finalURI = new URI(mURL + "&signedRequest=" + URLEncoder.encode(new String(mDrmRequest), "UTF-8")); - urlConnection = (HttpURLConnection) ProxySelector.openConnectionWithProxy(finalURI); - urlConnection.setRequestMethod("POST"); - if (DEBUG) Log.d(LOGTAG, "Provisioning, posting url =" + finalURI.toString()); - - // Add data - urlConnection.setRequestProperty("Accept", "*/*"); - urlConnection.setRequestProperty("User-Agent", getCDMUserAgent()); - urlConnection.setRequestProperty("Content-Type", "application/json"); - - // Execute HTTP Post Request - urlConnection.connect(); - - final int responseCode = urlConnection.getResponseCode(); - if (responseCode == HttpURLConnection.HTTP_OK) { - in = new BufferedReader(new InputStreamReader(urlConnection.getInputStream(), UTF_8)); - String inputLine; - final StringBuffer response = new StringBuffer(); - - while ((inputLine = in.readLine()) != null) { - response.append(inputLine); - } - in.close(); - mResponseBody = String.valueOf(response).getBytes(UTF_8); - if (DEBUG) Log.d(LOGTAG, "Provisioning, response received."); - if (mResponseBody != null) Log.d(LOGTAG, "response length=" + mResponseBody.length); - } else { - Log.d(LOGTAG, "Provisioning, server returned HTTP error code :" + responseCode); - } - } catch (final IOException e) { - Log.e(LOGTAG, "Got exception during posting provisioning request ...", e); - } catch (final URISyntaxException e) { - Log.e(LOGTAG, "Got exception during creating uri ...", e); - } finally { - if (urlConnection != null) { - urlConnection.disconnect(); - } - try { - if (in != null) { - in.close(); - } - } catch (final IOException e) { - Log.e(LOGTAG, "Exception during closing in ...", e); - } - } + Log.i(LOGTAG, "This is Tor Browser. Skipping."); return null; } diff --git a/mobile/android/geckoview/src/thirdparty/java/org/mozilla/thirdparty/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java b/mobile/android/geckoview/src/thirdparty/java/org/mozilla/thirdparty/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java index 6e5095b0a4c9..a585e283ed4e 100644 --- a/mobile/android/geckoview/src/thirdparty/java/org/mozilla/thirdparty/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java +++ b/mobile/android/geckoview/src/thirdparty/java/org/mozilla/thirdparty/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java @@ -46,6 +46,7 @@ import java.util.regex.Pattern; import java.util.zip.GZIPInputStream; import org.mozilla.gecko.util.ProxySelector; + /** * An {@link HttpDataSource} that uses Android's {@link HttpURLConnection}. * @@ -516,50 +517,8 @@ public class DefaultHttpDataSource extends BaseDataSource implements HttpDataSou boolean followRedirects, Map<String, String> requestParameters) throws IOException, URISyntaxException { - /** - * Tor Project modified the way the connection object was created. For the sake of - * simplicity, instead of duplicating the whole file we changed the connection object - * to use the ProxySelector. - */ - HttpURLConnection connection = (HttpURLConnection) ProxySelector.openConnectionWithProxy(url.toURI()); - - connection.setConnectTimeout(connectTimeoutMillis); - connection.setReadTimeout(readTimeoutMillis); - - Map<String, String> requestHeaders = new HashMap<>(); - if (defaultRequestProperties != null) { - requestHeaders.putAll(defaultRequestProperties.getSnapshot()); - } - requestHeaders.putAll(requestProperties.getSnapshot()); - requestHeaders.putAll(requestParameters); - - for (Map.Entry<String, String> property : requestHeaders.entrySet()) { - connection.setRequestProperty(property.getKey(), property.getValue()); - } - - if (!(position == 0 && length == C.LENGTH_UNSET)) { - String rangeRequest = "bytes=" + position + "-"; - if (length != C.LENGTH_UNSET) { - rangeRequest += (position + length - 1); - } - connection.setRequestProperty("Range", rangeRequest); - } - connection.setRequestProperty("User-Agent", userAgent); - connection.setRequestProperty("Accept-Encoding", allowGzip ? "gzip" : "identity"); - connection.setInstanceFollowRedirects(followRedirects); - connection.setDoOutput(httpBody != null); - connection.setRequestMethod(DataSpec.getStringForHttpMethod(httpMethod)); - - if (httpBody != null) { - connection.setFixedLengthStreamingMode(httpBody.length); - connection.connect(); - OutputStream os = connection.getOutputStream(); - os.write(httpBody); - os.close(); - } else { - connection.connect(); - } - return connection; + Log.i(TAG, "This is Tor Browser. Skipping."); + throw new IOException(); } /** Creates an {@link HttpURLConnection} that is connected with the {@code url}. */

1 0

[tor-browser/tor-browser-91.6.0esr-11.5-1] Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots
by richard＠torproject.org 09 Feb '22

09 Feb '22

commit 8665b764781e1136677c1783330d3170455a6beb Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Oct 9 12:55:35 2020 +0200 Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots --- browser/components/BrowserGlue.jsm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm index d23d72a1afc8..0b6a4506b80d 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -1352,6 +1352,20 @@ BrowserGlue.prototype = { // handle any UI migration this._migrateUI(); + // Clear possibly auto enabled enterprise_roots prefs (see bug 40166) + if ( + !Services.prefs.getBoolPref( + "security.certerrors.mitm.auto_enable_enterprise_roots" + ) && + Services.prefs.getBoolPref( + "security.enterprise_roots.auto-enabled", + false + ) + ) { + Services.prefs.clearUserPref("security.enterprise_roots.enabled"); + Services.prefs.clearUserPref("security.enterprise_roots.auto-enabled"); + } + if (!Services.prefs.prefHasUserValue(PREF_PDFJS_ISDEFAULT_CACHE_STATE)) { PdfJs.checkIsDefault(this._isNewProfile); }

1 0

[tor-browser-spec/master] Update xxx-quickstart.txt. Include https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/34345 as an issue to handle.
by boklm＠torproject.org 04 Feb '22

04 Feb '22

commit 3acaee2c13aa8b08ad895dcc9a311eb4b9e48fc0 Author: Antonela <antonela(a)torproject.org> Date: Mon Nov 30 11:54:19 2020 +0000 Update xxx-quickstart.txt. Include https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/34345 as an issue to handle. --- proposals/ideas/xxx-quickstart.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/proposals/ideas/xxx-quickstart.txt b/proposals/ideas/xxx-quickstart.txt index 395b8c4..a508ede 100644 --- a/proposals/ideas/xxx-quickstart.txt +++ b/proposals/ideas/xxx-quickstart.txt @@ -60,6 +60,7 @@ Target: Tor Browser 10.5 - Inform users in Tor Launcher of which settings are best for them based on their country https://bugs.torproject.org/24527 - Make it easier to add a bridge in network settings https://bugs.torproject.org/14638 - Use OONI to inform Tor Launcher user workflow https://bugs.torproject.org/23838 + - "Don't Bootstrap" Startup Mode https://bugs.torproject.org/34345 4.1 Requirements

1 0

[tor-browser-spec/master] Merge remote-tracking branch 'gitlab-tpo/merge-requests/16'
by boklm＠torproject.org 04 Feb '22

04 Feb '22

commit a96eddc23d37e5b0a2fdbf8aaae1e838d218c4ac Merge: 144aff7 3acaee2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Feb 4 12:53:50 2022 +0100 Merge remote-tracking branch 'gitlab-tpo/merge-requests/16' proposals/106-quickstart.txt | 1 + 1 file changed, 1 insertion(+)

1 0

[Git][tpo/applications/fenix] Pushed new branch tor-browser-96.3.0-11.5-1
by aguestuser (＠aguestuser) 03 Feb '22

03 Feb '22

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

1 0

[tor-browser-build/maint-11.0] Bug 40416: updated obfsproxy to 0.0.12
by richard＠torproject.org 03 Feb '22

03 Feb '22

commit 51f8de401745575ccc0e7357168a0b8aa62bbbda Author: Pier Angelo Vendrame <pierov(a)torproject.org> Date: Mon Jan 24 09:29:46 2022 +0100 Bug 40416: updated obfsproxy to 0.0.12 --- projects/edwards25519-extra/config | 31 +++++++++++++++++++++++++++++++ projects/edwards25519/config | 17 +++++++++++++++++ projects/gobsaes/config | 8 ++++++-- projects/goutls/config | 3 +-- projects/goutls/sessionid.patch | 25 ------------------------- projects/obfs4/build | 3 ++- projects/obfs4/config | 14 ++++++++------ 7 files changed, 65 insertions(+), 36 deletions(-) diff --git a/projects/edwards25519-extra/config b/projects/edwards25519-extra/config new file mode 100644 index 0000000..2aa7390 --- /dev/null +++ b/projects/edwards25519-extra/config @@ -0,0 +1,31 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://gitlab.com/yawning/edwards25519-extra.git +git_hash: 2f91fcc9fbdb888f3c795849b6777940135559b7 +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: gitlab.com/yawning/edwards25519-extra.git + go_lib_deps: + - goxcrypto + - edwards25519 + go_lib_install: + - gitlab.com/yawning/edwards25519-extra.git/elligator2 + - gitlab.com/yawning/edwards25519-extra.git/h2c + - gitlab.com/yawning/edwards25519-extra.git/vrf + +input_files: + - project: container-image + - name: go + project: go + - name: goxcrypto + project: goxcrypto + - name: edwards25519 + project: edwards25519 + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + enable: '[% c("var/android") %]' diff --git a/projects/edwards25519/config b/projects/edwards25519/config new file mode 100644 index 0000000..0f3377d --- /dev/null +++ b/projects/edwards25519/config @@ -0,0 +1,17 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/FiloSottile/edwards25519.git +git_hash: 390f27c3be2014e4912ce88c6a1fff52ec60428b +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: filippo.io/edwards25519 + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/gobsaes/config b/projects/gobsaes/config index 3674488..cd8af1a 100644 --- a/projects/gobsaes/config +++ b/projects/gobsaes/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 git_url: https://gitlab.com/yawning/bsaes.git version: '[% c("abbrev") %]' -git_hash: 26d1add596b6d800bdeeb3bc3b2c7b316c056b6d +git_hash: 0a714cd429ec754482b4001e918db30cd2094405 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -9,7 +9,9 @@ build: '[% c("projects/go/var/build_go_lib") %]' var: container: use_container: 1 - go_lib: git.schwanenlied.me/yawning/bsaes.git + go_lib: gitlab.com/yawning/bsaes.git + go_lib_deps: + - goxsys targets: android: @@ -21,6 +23,8 @@ input_files: - project: container-image - name: go project: go + - name: goxsys + project: goxsys - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' enable: '[% c("var/android") %]' diff --git a/projects/goutls/config b/projects/goutls/config index 7a46517..8052176 100644 --- a/projects/goutls/config +++ b/projects/goutls/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 git_url: https://gitlab.com/yawning/utls.git -version: 0.0.10-1 +version: 0.0.12-1 git_hash: 'v[% c("version") %]' tag_gpg_id: 1 gpg_keyring: yawning.gpg @@ -33,7 +33,6 @@ input_files: project: gocompress - name: gobsaes project: gobsaes - - filename: sessionid.patch - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' enable: '[% c("var/android") %]' diff --git a/projects/goutls/sessionid.patch b/projects/goutls/sessionid.patch deleted file mode 100644 index fd3636d..0000000 --- a/projects/goutls/sessionid.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4da67951864128358459681399dd208c49d5d001 Mon Sep 17 00:00:00 2001 -From: Rod Hynes <rod-hynes(a)users.noreply.github.com> -Date: Mon, 12 Aug 2019 17:06:06 -0400 -Subject: [PATCH] Fix all-zeroes SessionID (#31) - ---- - u_conn.go | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/u_conn.go b/u_conn.go -index 9079460..2706373 100644 ---- a/u_conn.go -+++ b/u_conn.go -@@ -121,7 +121,7 @@ func (uconn *UConn) SetSessionState(session *ClientSessionState) error { - } - } - var sessionID [32]byte -- _, err := io.ReadFull(uconn.config.rand(), uconn.HandshakeState.Hello.SessionId) -+ _, err := io.ReadFull(uconn.config.rand(), sessionID[:]) - if err != nil { - return err - } --- -2.22.0 - diff --git a/projects/obfs4/build b/projects/obfs4/build index b57b0c5..3aa2167 100644 --- a/projects/obfs4/build +++ b/projects/obfs4/build @@ -13,7 +13,8 @@ mkdir -p $PTDIR [% END -%] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goptlib') %] -tar -C /var/tmp/dist -xf [% c('input_files_by_name/ed25519') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/edwards25519') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/edwards25519-extra') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/siphash') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxcrypto') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxnet') %] diff --git a/projects/obfs4/config b/projects/obfs4/config index eec61bb..a05d2d4 100644 --- a/projects/obfs4/config +++ b/projects/obfs4/config @@ -1,8 +1,8 @@ # vim: filetype=yaml sw=2 -version: 0.0.11 -git_url: https://git.torproject.org/pluggable-transports/obfs4.git -git_hash: 40245c4a1cf221395c59d1f4bf274127045352f9 -tag_gpg_id: 0 +version: 0.0.12 +git_url: https://gitlab.com/yawning/obfs4.git +git_hash: 'obfs4proxy-[% c("version") %]' +tag_gpg_id: 1 gpg_keyring: yawning.gpg filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' @@ -22,8 +22,10 @@ input_files: project: go - name: goptlib project: goptlib - - name: ed25519 - project: ed25519 + - name: edwards25519 + project: edwards25519 + - name: edwards25519-extra + project: edwards25519-extra - name: siphash project: siphash - name: goxcrypto

1 0

[tor-browser-build/maint-11.0] Release preparations for 11.0.6
by richard＠torproject.org 03 Feb '22

03 Feb '22

commit 13f877d8d53e134fe5774afa31265af73823311c Author: Richard Pospesel <richard(a)torproject.org> Date: Thu Feb 3 14:50:57 2022 +0100 Release preparations for 11.0.6 Version bumps and changelog update --- projects/firefox/config | 2 +- projects/go/config | 4 ++-- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 13 +++++++++++++ projects/tor-launcher/config | 2 +- rbm.conf | 4 ++-- 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 5604d82..97c64c4 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 91.5.0 + firefox_platform_version: 91.6.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 11.0 branding_directory: 'browser/branding/alpha' diff --git a/projects/go/config b/projects/go/config index 342ba3d..2287424 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.16.12 +version: 1.16.13 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -118,7 +118,7 @@ input_files: enable: '[% ! c("var/linux") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 2afd839dcb76d2bb082c502c01a0a5cdbfc09fd630757835363c4fde8e2fbfe8 + sha256sum: b0926654eaeb01ef43816638f42d7b1681f2d3f41b9559f07735522b7afad41a - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 07e6205..d7ede19 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 11.0.6 - February 8 2022 + * Windows + OS X + Linux + * Update Firefox to 91.6.0esr + * Update NoScript to 11.2.16 + * Bug 40795: Revert Deutsche Welle v2 redirect [tor-browser] + * Bug 40679: Missing features on first-time launch in esr91 [tor-browser] + * Added extensions.torlauncher.launch_delay debug pref to simulate slow tor daemon launch [tor-launcher] + * Build System + * Windows + OS X + Linux + Android + * Update Go to 1.16.13 + * Bug 40413: Removed lsb_release from Python build script [tor-browser-build] + * Bug 40416: Pick up obfsproxy 0.0.12 [tor-browser-build] + Tor Browser 11.0.5 - February 3 2022 * Android * Update Fenix to 94.1.1 diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 3fa9cfc..5e9a426 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.32 +version: 0.2.33 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index ff0b58f..a91c705 100644 --- a/rbm.conf +++ b/rbm.conf @@ -58,10 +58,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '11.0.5' + torbrowser_version: '11.0.6' torbrowser_build: 'build1' torbrowser_incremental_from: - - 11.0.3 + - 11.0.4 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] Bug 32355: rbm.conf: Add linux-arm target
by boklm＠torproject.org 03 Feb '22

03 Feb '22

commit 56c81359d60d0f6cece32f344786eb38c59a8f4c Author: JeremyRand <jeremyrand(a)airmail.cc> Date: Sun May 3 11:29:51 2020 +0000 Bug 32355: rbm.conf: Add linux-arm target --- rbm.conf | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/rbm.conf b/rbm.conf index e09ee13..680ba3f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -342,11 +342,17 @@ targets: torbrowser-linux-i686: - linux-i686 - linux + torbrowser-linux-arm: + - linux-arm + - linux-cross + - linux linux-x86_64: arch: x86_64 var: linux-x86_64: 1 osname: linux-x86_64 + linux-cross: 0 + arch_debian: amd64 # We only support RLBox on the nightly channel and x86_64 for now rlbox: 0 linux-i686: @@ -354,7 +360,22 @@ targets: var: linux-i686: 1 osname: linux-i686 + linux-cross: 0 configure_opt: '--host=i686-linux-gnu CFLAGS=-m32 CXXFLAGS=-m32 LDFLAGS=-m32 [% c("var/configure_opt_project") %]' + arch_debian: i386 + linux-arm: + arch: arm + var: + linux-arm: 1 + osname: linux-arm + crosstarget: arm-linux-gnueabihf + arch_debian: armhf + linux-cross: + var: + linux-cross: 1 + container: + arch: amd64 + configure_opt: '--host=[% c("var/crosstarget") %] [% c("var/configure_opt_project") %]' linux: var: linux: 1

1 0

[tor-browser-build/master] Revert "Bug 40354: Remove buster from mmdebstrap-image"
by boklm＠torproject.org 03 Feb '22

03 Feb '22

commit 46dd0768c277af6a4d9f63b242d14e3222a73f14 Author: Jeremy Rand <jeremyrand(a)airmail.cc> Date: Fri Dec 31 14:50:31 2021 +0000 Revert "Bug 40354: Remove buster from mmdebstrap-image" This reverts commit 381e1ac3a8c23f95af5e37478850283a0ec18167. Buster is used by the linux-cross target. --- projects/mmdebstrap-image/config | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/projects/mmdebstrap-image/config b/projects/mmdebstrap-image/config index 6a34a5f..f326728 100644 --- a/projects/mmdebstrap-image/config +++ b/projects/mmdebstrap-image/config @@ -43,6 +43,13 @@ targets: suite: jessie arch: amd64 + buster-amd64: + var: + minimal_apt_version: 1.8.2 + container: + suite: buster + arch: amd64 + bullseye-amd64: var: minimal_apt_version: 2.2.4

1 0

[tor-browser-build/master] Bug 32355: container-image: Add linux-cross target
by boklm＠torproject.org 03 Feb '22

03 Feb '22

commit 5d1b728ae1ecf4515f37836297ce39e4739e5ecb Author: Jeremy Rand <jeremyrand(a)airmail.cc> Date: Tue Sep 14 11:29:50 2021 +0000 Bug 32355: container-image: Add linux-cross target --- projects/container-image/config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/container-image/config b/projects/container-image/config index 721da60..2d89444 100644 --- a/projects/container-image/config +++ b/projects/container-image/config @@ -33,6 +33,9 @@ pre: | apt-get update -y -q [% IF pc(c('origin_project'), 'var/pre_pkginst', { step => c('origin_step') }) -%] [% pc(c('origin_project'), 'var/pre_pkginst', { step => c('origin_step') }) %] + [% IF c("var/linux-cross") -%] + dpkg --add-architecture [% c("var/arch_debian") %] + [% END -%] # Update the package cache again because `pre_pkginst` may change the # package manager configuration. apt-get update -y -q

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gitlab-tpo/merge-requests/400'
by boklm＠torproject.org 03 Feb '22

03 Feb '22

commit 6abc82f35a7f1ba6c5cc0d4294a013837e99f28a Merge: 0b01289 5d1b728 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Feb 3 19:34:12 2022 +0100 Merge remote-tracking branch 'gitlab-tpo/merge-requests/400' projects/container-image/config | 3 +++ projects/mmdebstrap-image/config | 7 +++++++ rbm.conf | 21 +++++++++++++++++++++ 3 files changed, 31 insertions(+)

1 0

[tor-browser-build/maint-11.0] Bug 40395: Update node to 12.22.1
by sysrqb＠torproject.org 03 Feb '22

03 Feb '22

commit 70a822ab6eb006b8327867badab397d80d5d11f5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Dec 10 14:37:42 2021 +0100 Bug 40395: Update node to 12.22.1 --- projects/node/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/node/config b/projects/node/config index 041e5d9..300e59c 100644 --- a/projects/node/config +++ b/projects/node/config @@ -2,8 +2,8 @@ version: '[% c("var/node_version") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: - node_version: 10.23.1 - node_hash: 88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa + node_version: 12.22.1 + node_hash: dd650df7773a6ed3e390320ba51ef33cba6499f0e9397709ea3d1debdcbcb989 container: use_container: 1

1 0

[tor-browser-build/maint-11.0] Bug 40402: Use /bin/bash in list_toolchain_updates
by sysrqb＠torproject.org 03 Feb '22

03 Feb '22

commit 291994127cecdbd69231788f89b3cf0db5788ea7 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 15 09:48:38 2021 +0000 Bug 40402: Use /bin/bash in list_toolchain_updates See: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_re… for the issue we hit. --- projects/common/list_toolchain_updates | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/common/list_toolchain_updates b/projects/common/list_toolchain_updates index 4cfd829..ebbfe6e 100644 --- a/projects/common/list_toolchain_updates +++ b/projects/common/list_toolchain_updates @@ -1,4 +1,4 @@ -#!/usr/bin/bash +#!/bin/bash set -e

1 0

[tor-browser-build/maint-11.0] Bug 40367: Switch to bullseye for android builds
by sysrqb＠torproject.org 03 Feb '22

03 Feb '22

commit a893611f34242e8e421562054fbdeb1b5446334c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Sep 24 16:04:27 2021 +0200 Bug 40367: Switch to bullseye for android builds --- projects/android-toolchain/config | 2 +- projects/ninja/build | 2 +- projects/node/config | 4 ++++ projects/nss/build | 5 ++++- projects/nss/config | 1 + projects/nss/use-python3.patch | 12 ++++++++++++ rbm.conf | 6 +++--- 7 files changed, 26 insertions(+), 6 deletions(-) diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index 5196528..0689bd2 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -9,7 +9,7 @@ var: use_container: 1 deps: - unzip - - python + - python3 setup: | mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] diff --git a/projects/ninja/build b/projects/ninja/build index 527f1b6..57aac77 100644 --- a/projects/ninja/build +++ b/projects/ninja/build @@ -10,7 +10,7 @@ mkdir /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] -[% IF c("var/windows") || c("var/osx") -%] +[% IF !c("var/linux") -%] # Starting with Debian Bullseye, /usr/bin/python does not exist, so # we need to use python3 explicitly sed -i 's/env python$/env python3/' configure.py diff --git a/projects/node/config b/projects/node/config index 300e59c..0dfa76c 100644 --- a/projects/node/config +++ b/projects/node/config @@ -16,6 +16,10 @@ targets: var: arch_deps: - python2 + android: + var: + arch_deps: + - python2 input_files: - project: container-image diff --git a/projects/nss/build b/projects/nss/build index 786eec4..f7e962e 100644 --- a/projects/nss/build +++ b/projects/nss/build @@ -44,6 +44,8 @@ patch -p2 < $rootdir/config.patch # side. patch -p2 < $rootdir/bug_13028.patch +patch -p1 < $rootdir/use-python3.patch + # Building NSPR mkdir $builddir/nspr_build cd $builddir/nspr_build @@ -72,7 +74,8 @@ gyp -f ninja-android "$builddir/nss/nss.gyp" \ -Dsign_libs=0 \ -Denable_sslkeylogfile=0 \ -Ddisable_tests=1 \ - -Ddisable_libpkix=1 + -Ddisable_libpkix=1 \ + -Dpython=python3 gendir="$builddir/nss/out/Release" ninja -C "$gendir" diff --git a/projects/nss/config b/projects/nss/config index 0224dca..0da66d1 100644 --- a/projects/nss/config +++ b/projects/nss/config @@ -23,3 +23,4 @@ input_files: - filename: configure.patch - filename: config.patch - filename: bug_13028.patch + - filename: use-python3.patch diff --git a/projects/nss/use-python3.patch b/projects/nss/use-python3.patch new file mode 100644 index 0000000..4046dea --- /dev/null +++ b/projects/nss/use-python3.patch @@ -0,0 +1,12 @@ +diff -ru nss-3.65/nss/lib/ckfw/builtins/builtins.gyp nss-3.65.n/nss/lib/ckfw/builtins/builtins.gyp +--- nss-3.65/nss/lib/ckfw/builtins/builtins.gyp 2021-09-29 12:48:34.982000000 +0200 ++++ nss-3.65.n/nss/lib/ckfw/builtins/builtins.gyp 2021-09-29 12:48:43.152000000 +0200 +@@ -30,7 +30,7 @@ + { + 'msvs_cygwin_shell': 0, + 'action': [ +- 'python', ++ 'python3', + 'certdata.py', + 'certdata.txt', + '<@(_outputs)', diff --git a/rbm.conf b/rbm.conf index 5fead9d..34d503f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,12 +24,13 @@ steps: output_dir: "out/[% project %]/cargo_vendor" var: container: - suite: buster + suite: bullseye arch: amd64 pre_pkginst: '' deps: - cargo - patch + - bzip2 cargo_vendor: | #!/bin/bash [% c("var/set_default_env") %] @@ -307,14 +308,13 @@ targets: # This is needed to get the offline build part for Glean right. glean_parser: 1.29.0 container: - suite: buster + suite: bullseye arch: amd64 disable_network: # Disable network in the script for merging GeckoView .aar files merge_aars: 1 deps: - build-essential - - python - python3 - python3-distutils - automake

1 0

[tor-browser-build/maint-11.0] Bug 40391: Fix clang config
by sysrqb＠torproject.org 03 Feb '22

03 Feb '22

commit 163f9a33bc02d2a70fdd134c390094ff5317c01c Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 8 09:13:30 2021 +0000 Bug 40391: Fix clang config --- projects/clang/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/clang/config b/projects/clang/config index 11ea039..aeefc7a 100644 --- a/projects/clang/config +++ b/projects/clang/config @@ -14,7 +14,7 @@ input_files: enable: '[% c("var/linux") %]' - name: binutils project: binutils - enable: '[% c("var/linux") %] || [% c("var/android") %]' + enable: '[% c("var/linux") || c("var/android") %]' - project: cmake name: cmake - project: llvm-project

1 0

[tor-browser-build/maint-11.0] Bug 40395: Update how we check node version in list_toolchain_updates_checks
by sysrqb＠torproject.org 03 Feb '22

03 Feb '22

commit a720689f260ca25c417faa09a9c285acf86671f7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Dec 10 12:42:01 2021 +0100 Bug 40395: Update how we check node version in list_toolchain_updates_checks --- projects/firefox/list_toolchain_updates_checks | 28 ++++++++++++++++++++---- projects/geckoview/list_toolchain_updates_checks | 28 ++++++++++++++++++++---- 2 files changed, 48 insertions(+), 8 deletions(-) diff --git a/projects/firefox/list_toolchain_updates_checks b/projects/firefox/list_toolchain_updates_checks index a308468..26ee3a0 100644 --- a/projects/firefox/list_toolchain_updates_checks +++ b/projects/firefox/list_toolchain_updates_checks @@ -89,12 +89,32 @@ check_update_needed clang "$needed" "$current" # node read -d '' p << 'EOF' || true -if (m/^\\s*NODE_MIN_VERSION\\s*=\\s*StrictVersion\$"([^"]+)"\$/) { - print $1; - exit; +sub l { + ref $_[0] eq 'ARRAY' ? $_[0] : [ $_[0] ]; } + +my $d = YAML::XS::LoadFile('taskcluster/ci/toolchain/node.yml'); +my $node_toolchain; +T: foreach my $t (keys %$d) { + foreach my $alias (@{l($d->{$t}{run}{'toolchain-alias'})}) { + if ($alias eq 'linux64-node') { + foreach my $fetch (@{$d->{$t}{fetches}{fetch}}) { + if ($fetch =~ m/^nodejs-.*/) { + $node_toolchain = $fetch; + last T; + } + } + } + } +} + +exit 1 unless $node_toolchain; + +my $fetch = YAML::XS::LoadFile('taskcluster/ci/fetch/toolchains.yml'); +my ($version) = $fetch->{$node_toolchain}{fetch}{url} =~ m|^https://nodejs.org/dist/v([^/]+)/|; +print "$version\\n"; EOF -needed=$(cat python/mozbuild/mozbuild/nodeutil.py | perl -ne "$p") +needed=$(perl -MYAML::XS -e "$p") current='[% pc("node", "version") %]' check_update_needed node "$needed" "$current" diff --git a/projects/geckoview/list_toolchain_updates_checks b/projects/geckoview/list_toolchain_updates_checks index f31fa51..fef9756 100644 --- a/projects/geckoview/list_toolchain_updates_checks +++ b/projects/geckoview/list_toolchain_updates_checks @@ -180,12 +180,32 @@ check_update_needed clang "$needed" "$current" # node read -d '' p << 'EOF' || true -if (m/^\\s*NODE_MIN_VERSION\\s*=\\s*StrictVersion\$"([^"]+)"\$/) { - print $1; - exit; +sub l { + ref $_[0] eq 'ARRAY' ? $_[0] : [ $_[0] ]; } + +my $d = YAML::XS::LoadFile('taskcluster/ci/toolchain/node.yml'); +my $node_toolchain; +T: foreach my $t (keys %$d) { + foreach my $alias (@{l($d->{$t}{run}{'toolchain-alias'})}) { + if ($alias eq 'linux64-node') { + foreach my $fetch (@{$d->{$t}{fetches}{fetch}}) { + if ($fetch =~ m/^nodejs-.*/) { + $node_toolchain = $fetch; + last T; + } + } + } + } +} + +exit 1 unless $node_toolchain; + +my $fetch = YAML::XS::LoadFile('taskcluster/ci/fetch/toolchains.yml'); +my ($version) = $fetch->{$node_toolchain}{fetch}{url} =~ m|^https://nodejs.org/dist/v([^/]+)/|; +print "$version\\n"; EOF -needed=$(cat python/mozbuild/mozbuild/nodeutil.py | perl -ne "$p") +needed=$(perl -MYAML::XS -e "$p") current='[% pc("node", "version") %]' check_update_needed node "$needed" "$current"

1 0

[tor-browser-build/maint-11.0] Bug 40373: install ndk to $SDK_HOME/ndk
by sysrqb＠torproject.org 03 Feb '22

03 Feb '22

commit 97826538688645a4d12e556838131dfefa256666 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Oct 15 12:58:28 2021 +0200 Bug 40373: install ndk to $SDK_HOME/ndk New Android Gradle Plugin versions ignore the ANDROID_NDK_HOME environment variable, and expect to find the NDK in directory $SDK_HOME/ndk. --- projects/android-toolchain/build | 2 +- projects/android-toolchain/config | 2 +- projects/geckoview/mozconfig-android-aarch64 | 2 +- projects/geckoview/mozconfig-android-armv7 | 2 +- projects/geckoview/mozconfig-android-x86 | 2 +- projects/geckoview/mozconfig-android-x86_64 | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build index a164fc1..6cd9626 100644 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -2,7 +2,7 @@ [% c("var/set_default_env") -%] export PROJECT_PATH=/var/tmp/dist/[% project %] export SDK_HOME=$PROJECT_PATH/android-sdk-linux -export NDK_HOME=$PROJECT_PATH/android-ndk +export NDK_HOME=$SDK_HOME/ndk android_release_dir_9=android-9 android_release_dir_10=android-10 android_release_dir_11=android-11 diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index 08e14f6..76bb98e 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -17,7 +17,7 @@ var: # By default we use the old NDK which is the one GeckoView is using. # However, we can overwrite that per project if needed (e.g. # application-services is currently on a newer NDK). - export ANDROID_NDK_HOME=/var/tmp/dist/[% project %]/android-ndk/android-ndk-r[% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %] + export ANDROID_NDK_HOME=$ANDROID_SDK_HOME/ndk/android-ndk-r[% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %] export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME export ANDROID_NDK_API_VERSION=[% c("var/android_ndk_version") %][% c('var/android_ndk_revision') %] export NDK_HOST_TAG=linux-x86_64 diff --git a/projects/geckoview/mozconfig-android-aarch64 b/projects/geckoview/mozconfig-android-aarch64 index 4762a10..e2f9553 100644 --- a/projects/geckoview/mozconfig-android-aarch64 +++ b/projects/geckoview/mozconfig-android-aarch64 @@ -12,7 +12,7 @@ ac_add_options --enable-official-branding ac_add_options --enable-application=mobile/android ac_add_options --target=aarch64-linux-android -ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r21d +ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-sdk-linux/ndk/android-ndk-r21d ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle diff --git a/projects/geckoview/mozconfig-android-armv7 b/projects/geckoview/mozconfig-android-armv7 index 5fdcffc..5feea4e 100644 --- a/projects/geckoview/mozconfig-android-armv7 +++ b/projects/geckoview/mozconfig-android-armv7 @@ -12,7 +12,7 @@ ac_add_options --enable-official-branding ac_add_options --enable-application=mobile/android ac_add_options --target=arm-linux-androideabi -ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r21d +ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-sdk-linux/ndk/android-ndk-r21d ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle diff --git a/projects/geckoview/mozconfig-android-x86 b/projects/geckoview/mozconfig-android-x86 index 294484c..44243e8 100644 --- a/projects/geckoview/mozconfig-android-x86 +++ b/projects/geckoview/mozconfig-android-x86 @@ -12,7 +12,7 @@ ac_add_options --enable-official-branding ac_add_options --enable-application=mobile/android ac_add_options --target=i686-linux-android -ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r21d +ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-sdk-linux/ndk/android-ndk-r21d ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle diff --git a/projects/geckoview/mozconfig-android-x86_64 b/projects/geckoview/mozconfig-android-x86_64 index 391b0a5..12a3b93 100644 --- a/projects/geckoview/mozconfig-android-x86_64 +++ b/projects/geckoview/mozconfig-android-x86_64 @@ -12,7 +12,7 @@ ac_add_options --enable-official-branding ac_add_options --enable-application=mobile/android ac_add_options --target=x86_64-linux-android -ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r21d +ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-sdk-linux/ndk/android-ndk-r21d ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle

1 0

[tor-browser-build/maint-11.0] Bug 40373: Update components for mozilla93: gradle part
by sysrqb＠torproject.org 03 Feb '22

03 Feb '22

commit c2062d739b347022a2ab3bb78fb787b07322357d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Oct 11 18:14:13 2021 +0200 Bug 40373: Update components for mozilla93: gradle part --- projects/gradle/config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/gradle/config b/projects/gradle/config index 8e732f5..de9b8ff 100644 --- a/projects/gradle/config +++ b/projects/gradle/config @@ -13,6 +13,9 @@ var: 6.5: 23e7d37e9bb4f8dabb8a3ea7fdee9dd0428b9b1a71d298aefd65b11dccea220f 6.5.1: 50a7d30529fa939721fe9268a0205142f3f2302bcac5fb45b27a3902e58db54a 6.6.1: 7873ed5287f47ca03549ab8dcb6dc877ac7f0e3d7b1eb12685161d10080910ac + 6.7.1: 3239b5ed86c3838a37d983ac100573f64c1f3fd8e1eb6c89fa5f9529b5ec091d + 6.9.1: 8c12154228a502b784f451179846e518733cf856efc7d45b2e6691012977b2fe + 7.0.2: 0e46229820205440b48a5501122002842b82886e76af35f0f3a069243dca4b3c input_files: - project: container-image

1 0

[tor-browser-build/maint-11.0] Bug 40372: Make the list of android components updates for switch to mozilla93-based Fenix
by sysrqb＠torproject.org 03 Feb '22

03 Feb '22

commit c78b311dc7ddb8e552b428bbf534078c9f9de4d9 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Oct 11 17:46:09 2021 +0200 Bug 40372: Make the list of android components updates for switch to mozilla93-based Fenix --- projects/android-components/config | 2 +- projects/android-components/list_toolchain_updates_checks | 2 +- projects/application-services/config | 2 +- projects/fenix/config | 2 +- projects/fenix/list_toolchain_updates_checks | 2 +- projects/geckoview/config | 3 +-- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/projects/android-components/config b/projects/android-components/config index 0047529..b789049 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -58,7 +58,7 @@ input_files: steps: list_toolchain_updates: git_url: https://github.com/mozilla-mobile/android-components.git - git_hash: releases/91.0 + git_hash: releases/93.0 #tag_gpg_id: 0 var: container: diff --git a/projects/android-components/list_toolchain_updates_checks b/projects/android-components/list_toolchain_updates_checks index a46afb4..c11b9b6 100644 --- a/projects/android-components/list_toolchain_updates_checks +++ b/projects/android-components/list_toolchain_updates_checks @@ -63,7 +63,7 @@ check_update_needed glean_parser "$needed" "$current" # gradle read -d '' p << 'EOF' || true -if (m|distributionUrl=https\\\\://services.gradle.org/distributions/gradle-(.*)…) { +if (m|distributionUrl=https\\\\://services.gradle.org/distributions/gradle-(.*)…) { print $1; exit; } diff --git a/projects/application-services/config b/projects/application-services/config index c41a812..71dcb4f 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -90,7 +90,7 @@ input_files: steps: list_toolchain_updates: - git_hash: 'v79.0.0' + git_hash: 'v82.1.0' input_files: [] var: container: diff --git a/projects/fenix/config b/projects/fenix/config index c38ff99..f2490b0 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -59,7 +59,7 @@ input_files: steps: list_toolchain_updates: git_url: https://github.com/mozilla-mobile/fenix.git - git_hash: releases_v91.0.0 + git_hash: releases_v93.0.0 #tag_gpg_id: 0 input_files: [] var: diff --git a/projects/fenix/list_toolchain_updates_checks b/projects/fenix/list_toolchain_updates_checks index 1a75e28..221e7c3 100644 --- a/projects/fenix/list_toolchain_updates_checks +++ b/projects/fenix/list_toolchain_updates_checks @@ -50,7 +50,7 @@ check_update_needed minSdkVersion "$needed" "$current" # gradle read -d '' p << 'EOF' || true -if (m|distributionUrl=https\\\\://services.gradle.org/distributions/gradle-(.*)…) { +if (m|distributionUrl=https\\\\://services.gradle.org/distributions/gradle-(.*)…) { print $1; exit; } diff --git a/projects/geckoview/config b/projects/geckoview/config index 08d906f..62a499b 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -133,8 +133,7 @@ steps: list_toolchain_updates: git_url: https://github.com/mozilla/gecko-dev.git - # beta - git_hash: beta + git_hash: release tag_gpg_id: 0 input_files: [] var:

1 0