From b3e75b0e7aa98dfb3fe84366f4ed0d95e4b3d525 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malte=20J=C3=BCrgens?= Date: Tue, 23 Jan 2024 20:24:20 +0100 Subject: [PATCH] Fix stop-undesired-requests.patch --- .../sed-patches/stop-undesired-requests.patch | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/patches/sed-patches/stop-undesired-requests.patch b/patches/sed-patches/stop-undesired-requests.patch index 9373516..c8867cc 100644 --- a/patches/sed-patches/stop-undesired-requests.patch +++ b/patches/sed-patches/stop-undesired-requests.patch @@ -1,9 +1,7 @@ -diff --git a/browser/components/newtab/data/content/activity-stream.bundle.js b/browser/components/newtab/data/content/activity-stream.bundle.js -index cb7c26e..b1a56e9 100644 ---- a/browser/components/newtab/data/content/activity-stream.bundle.js -+++ b/browser/components/newtab/data/content/activity-stream.bundle.js -@@ -1576,7 +1576,7 @@ class ASRouterAdminInner extends (external_React_default()).PureComponent { - label = /*#__PURE__*/external_React_default().createElement("span", null, "remote settings (", /*#__PURE__*/external_React_default().createElement("a", { +--- a/browser/components/asrouter/content/asrouter-admin.bundle.js ++++ b/browser/components/asrouter/content/asrouter-admin.bundle.js +@@ -1641,7 +1641,7 @@ class ASRouterAdminInner extends (react__WEBPACK_IMPORTED_MODULE_1___default().P + label = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement("span", null, "remote settings (", /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement("a", { className: "providerUrl", target: "_blank", - href: "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/nimbus-desktop-experiments/records", @@ -11,8 +9,6 @@ index cb7c26e..b1a56e9 100644 rel: "noopener noreferrer" }, "nimbus-desktop-experiments"), ")"); } -diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm -index 23d6bf1..4affc89 100644 --- a/services/settings/Utils.sys.mjs +++ b/services/settings/Utils.sys.mjs @@ -51,6 +51,9 @@ ChromeUtils.defineLazyGetter(lazy, "isRunningTests", () => { @@ -25,11 +21,9 @@ index 23d6bf1..4affc89 100644 if (!AppConstants.RELEASE_OR_BETA) { // Always allow to override the server URL on Nightly/DevEdition. return true; -diff --git a/toolkit/components/search/SearchUtils.sys.mjs b/toolkit/components/search/SearchUtils.sys.mjs -index a3100fa..c7bf03b 100644 --- a/toolkit/components/search/SearchUtils.sys.mjs +++ b/toolkit/components/search/SearchUtils.sys.mjs -@@ -157,9 +157,9 @@ var SearchUtils = { +@@ -193,9 +193,9 @@ export var SearchUtils = { ENGINES_URLS: { "prod-main": @@ -39,5 +33,5 @@ index a3100fa..c7bf03b 100644 - "https://firefox.settings.services.mozilla.com/v1/buckets/main-preview/collections/search-config/records", + "https://%.invalid", "stage-main": - "https://settings.stage.mozaws.net/v1/buckets/main/collections/search-config/records", + "https://firefox.settings.services.allizom.org/v1/buckets/main/collections/search-config/records", "stage-preview":