now using stop-undesired-requests2.patch

assets/patches.txt

@@ -9,7 +9,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-requests.patch
+patches/sed-patches/stop-undesired-requests2.patch
 patches/ui-patches/hide-default-browser.patch
 patches/ui-patches/pref-naming.patch
 patches/ui-patches/privacy-preferences.patch

patches/sed-patches/stop-undesired-requests.patch

@@ -7,7 +7,7 @@ index 92f0652aec..696a99f7ef 100644
            className: "providerUrl",
            target: "_blank",
 -          href: "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/nimbus-desktop-experiments/records",
-+          href: "https://%.invalid",
++          href: "https://f.s.s.%.c.qjz9zk/v1/buckets/main/collections/nimbus-desktop-experiments/records",
            rel: "noopener noreferrer"
          }, "nimbus-desktop-experiments"), ")");
        }
@@ -20,7 +20,7 @@ index c7cde8917c..b398a22064 100644
  // 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://%.invalid");
++pref("services.settings.server", "https://f.s.s.%.c.qjz9zk/v1");
  pref("services.settings.default_bucket", "main");
  
  // The percentage of clients who will report uptake telemetry as
@@ -28,15 +28,15 @@ diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm
 index 66df850904..1538a2ff0d 100644
 --- a/services/settings/Utils.jsm
 +++ b/services/settings/Utils.jsm
-@@ -90,7 +90,7 @@
+@@ -64,6 +64,6 @@
-   get SERVER_URL() {
+       !Cu.isInAutomation &&
-     return allowServerURLOverride
+       !isXpcshell &&
-       ? gServerURL
+       isNotThunderbird
--      : "https://firefox.settings.services.mozilla.com/v1";
+-      ? "https://firefox.settings.services.mozilla.com/v1"
-+      : "https://%.invalid";
++      ? "https://f.s.s.%.c.qjz9zk/v1"
+       : gServerURL;
    },
 
-   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
 --- a/toolkit/components/search/SearchUtils.jsm
@@ -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://%.invalid,
++      "https://f.s.s.%.c.qjz9zk/v1/buckets/main/collections/search-config/records",
      "prod-preview":
 -      "https://firefox.settings.services.mozilla.com/v1/buckets/main-preview/collections/search-config/records",
-+      "https://%.invalid",
++      "https://f.s.s.%.c.qjz9zk/v1/buckets/main-preview/collections/search-config/records",
      "stage-main":
        "https://settings.stage.mozaws.net/v1/buckets/main/collections/search-config/records",
      "stage-preview":

patches/sed-patches/stop-undesired-requests2.patch

@@ -0,0 +1,62 @@
+diff --git a/browser/components/newtab/data/content/activity-stream.bundle.js b/browser/components/newtab/data/content/activity-stream.bundle.js
+index 6e7cc5e..8334a49 100644
+--- a/browser/components/newtab/data/content/activity-stream.bundle.js
++++ b/browser/components/newtab/data/content/activity-stream.bundle.js
+@@ -1819,7 +1819,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", {
+           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"), ")");
+       }
+@@ -15671,4 +15671,4 @@ TopSiteForm_TopSiteForm.defaultProps = {
+ };
+ 
+ /***/ })
+-/******/ ]);
+\ No newline at end of file
++/******/ ]);
+diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
+index 651d38c..4b99610 100644
+--- a/modules/libpref/init/all.js
++++ b/modules/libpref/init/all.js
+@@ -2198,7 +2198,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://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 f91e5dc..910261c 100644
+--- a/services/settings/Utils.jsm
++++ b/services/settings/Utils.jsm
+@@ -90,7 +90,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 41d2a23..448c92a 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":