diff --git a/assets/patches.txt b/assets/patches.txt index 082018e..34af6b1 100644 --- a/assets/patches.txt +++ b/assets/patches.txt @@ -11,7 +11,7 @@ patches/remove_addons.patch patches/sed-patches/allow-searchengines-non-esr.patch patches/sed-patches/disable-pocket.patch patches/sed-patches/remove-internal-plugin-certs.patch -patches/sed-patches/stop-undesired-requests2.patch +patches/sed-patches/stop-undesired-requests.patch patches/ui-patches/handlers.patch patches/ui-patches/hide-default-browser.patch patches/ui-patches/lw-logo-devtools.patch diff --git a/patches/sed-patches/stop-undesired-requests.patch b/patches/sed-patches/stop-undesired-requests.patch index 1dd3ce4..63974d8 100644 --- a/patches/sed-patches/stop-undesired-requests.patch +++ b/patches/sed-patches/stop-undesired-requests.patch @@ -1,44 +1,44 @@ diff --git a/browser/components/newtab/data/content/activity-stream.bundle.js b/browser/components/newtab/data/content/activity-stream.bundle.js -index 92f0652aec..696a99f7ef 100644 +index d5a3f10..b5efa81 100644 --- a/browser/components/newtab/data/content/activity-stream.bundle.js +++ b/browser/components/newtab/data/content/activity-stream.bundle.js -@@ -1841,7 +1841,7 @@ class ASRouterAdminInner extends react__WEBPACK_IMPORTED_MODULE_3___default.a.Pu - label = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("span", null, "remote settings (", /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("a", { +@@ -1577,7 +1577,7 @@ class ASRouterAdminInner extends (external_React_default()).PureComponent { + label = /*#__PURE__*/external_React_default().createElement("span", null, "remote settings (", /*#__PURE__*/external_React_default().createElement("a", { className: "providerUrl", target: "_blank", - href: "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/nimbus-desktop-experiments/records", -+ href: "https://f.s.s.%.c.qjz9zk/v1/buckets/main/collections/nimbus-desktop-experiments/records", ++ href: "https://%.invalid", rel: "noopener noreferrer" }, "nimbus-desktop-experiments"), ")"); } diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js -index c7cde8917c..b398a22064 100644 +index 261e46f..22f8214 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js -@@ -2243,7 +2243,7 @@ pref("security.cert_pinning.hpkp.enabled", false); +@@ -2181,7 +2181,7 @@ pref("security.insecure_field_warning.ignore_local_ip_address", true); + // Remote settings preferences - // Note: if you change this, make sure to also review security.onecrl.maximum_staleness_in_seconds pref("services.settings.poll_interval", 86400); // 24H -pref("services.settings.server", "https://firefox.settings.services.mozilla.com/v1"); -+pref("services.settings.server", "https://f.s.s.%.c.qjz9zk/v1"); ++pref("services.settings.server", "https://%.invalid"); pref("services.settings.default_bucket", "main"); // The percentage of clients who will report uptake telemetry as diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm -index 66df850904..1538a2ff0d 100644 +index 2ce9e87..cd132a3 100644 --- a/services/settings/Utils.jsm +++ b/services/settings/Utils.jsm -@@ -64,6 +64,6 @@ - !Cu.isInAutomation && - !isXpcshell && - isNotThunderbird -- ? "https://firefox.settings.services.mozilla.com/v1" -+ ? "https://f.s.s.%.c.qjz9zk/v1" - : gServerURL; +@@ -89,7 +89,7 @@ var Utils = { + get SERVER_URL() { + return allowServerURLOverride + ? gServerURL +- : "https://firefox.settings.services.mozilla.com/v1"; ++ : "https://%.invalid"; }, - + + CHANGES_PATH: "/buckets/monitor/collections/changes/changeset", diff --git a/toolkit/components/search/SearchUtils.jsm b/toolkit/components/search/SearchUtils.jsm -index 8a3c6acb84..7408b3fd2f 100644 +index 983d567..5fb6ae7 100644 --- a/toolkit/components/search/SearchUtils.jsm +++ b/toolkit/components/search/SearchUtils.jsm @@ -159,9 +159,9 @@ var SearchUtils = { @@ -46,10 +46,10 @@ index 8a3c6acb84..7408b3fd2f 100644 ENGINES_URLS: { "prod-main": - "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/search-config/records", -+ "https://f.s.s.%.c.qjz9zk/v1/buckets/main/collections/search-config/records", ++ "https://%.invalid", "prod-preview": - "https://firefox.settings.services.mozilla.com/v1/buckets/main-preview/collections/search-config/records", -+ "https://f.s.s.%.c.qjz9zk/v1/buckets/main-preview/collections/search-config/records", ++ "https://%.invalid", "stage-main": "https://settings.stage.mozaws.net/v1/buckets/main/collections/search-config/records", "stage-preview": diff --git a/patches/sed-patches/stop-undesired-requests2.patch b/patches/sed-patches/stop-undesired-requests2.patch deleted file mode 100644 index 9e67029..0000000 --- a/patches/sed-patches/stop-undesired-requests2.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/browser/components/newtab/data/content/activity-stream.bundle.js b/browser/components/newtab/data/content/activity-stream.bundle.js -index d5a3f10..b5efa81 100644 ---- a/browser/components/newtab/data/content/activity-stream.bundle.js -+++ b/browser/components/newtab/data/content/activity-stream.bundle.js -@@ -1577,7 +1577,7 @@ class ASRouterAdminInner extends (external_React_default()).PureComponent { - label = /*#__PURE__*/external_React_default().createElement("span", null, "remote settings (", /*#__PURE__*/external_React_default().createElement("a", { - className: "providerUrl", - target: "_blank", -- href: "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/nimbus-desktop-experiments/records", -+ href: "https://f.s.s.%.c.invalid/v1/buckets/main/collections/nimbus-desktop-experiments/records", - rel: "noopener noreferrer" - }, "nimbus-desktop-experiments"), ")"); - } -@@ -14758,5 +14758,4 @@ function renderCache(initialState) { - }), document.getElementById("root")); - } - NewtabRenderUtils = __webpack_exports__; --/******/ })() --; -\ No newline at end of file -+/******/ }); -diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js -index 261e46f..22f8214 100644 ---- a/modules/libpref/init/all.js -+++ b/modules/libpref/init/all.js -@@ -2181,7 +2181,7 @@ pref("security.insecure_field_warning.ignore_local_ip_address", true); - - // Remote settings preferences - pref("services.settings.poll_interval", 86400); // 24H --pref("services.settings.server", "https://firefox.settings.services.mozilla.com/v1"); -+pref("services.settings.server", "https://https://f.s.s.%.c.invalid/v1"); - pref("services.settings.default_bucket", "main"); - - // The percentage of clients who will report uptake telemetry as -diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm -index 2ce9e87..cd132a3 100644 ---- a/services/settings/Utils.jsm -+++ b/services/settings/Utils.jsm -@@ -89,7 +89,7 @@ var Utils = { - get SERVER_URL() { - return allowServerURLOverride - ? gServerURL -- : "https://firefox.settings.services.mozilla.com/v1"; -+ : "https://f.s.s.%.c.invalid/v1"; - }, - - CHANGES_PATH: "/buckets/monitor/collections/changes/changeset", -diff --git a/toolkit/components/search/SearchUtils.jsm b/toolkit/components/search/SearchUtils.jsm -index 983d567..5fb6ae7 100644 ---- a/toolkit/components/search/SearchUtils.jsm -+++ b/toolkit/components/search/SearchUtils.jsm -@@ -159,9 +159,9 @@ var SearchUtils = { - - ENGINES_URLS: { - "prod-main": -- "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/search-config/records", -+ "https://f.s.s.%.c.invalid/v1/buckets/main/collections/search-config/records", - "prod-preview": -- "https://firefox.settings.services.mozilla.com/v1/buckets/main-preview/collections/search-config/records", -+ "https://f.s.s.%.c.invalid/v1/buckets/main-preview/collections/search-config/records", - "stage-main": - "https://settings.stage.mozaws.net/v1/buckets/main/collections/search-config/records", - "stage-preview":