diff options
| -rw-r--r-- | allow-searchengines-non-esr.patch | 13 | ||||
| -rw-r--r-- | disable-pocket.patch | 38 | ||||
| -rw-r--r-- | librewolf.spec | 11 | ||||
| -rw-r--r-- | remove-internal-plugin-certs.patch | 18 | ||||
| -rw-r--r-- | stop-undesired-requests.patch | 55 | ||||
| -rw-r--r-- | urlbarprovider-interventions.patch | 13 |
6 files changed, 147 insertions, 1 deletions
diff --git a/allow-searchengines-non-esr.patch b/allow-searchengines-non-esr.patch new file mode 100644 index 0000000..6418416 --- /dev/null +++ b/allow-searchengines-non-esr.patch @@ -0,0 +1,13 @@ +diff --git a/browser/components/enterprisepolicies/schemas/policies-schema.json b/browser/components/enterprisepolicies/schemas/policies-schema.json +index d436cf1ca1..ecd6e53b9e 100644 +--- a/browser/components/enterprisepolicies/schemas/policies-schema.json ++++ b/browser/components/enterprisepolicies/schemas/policies-schema.json +@@ -1074,7 +1074,7 @@ + }, + + "SearchEngines": { +- "enterprise_only": true, ++ "enterprise_only": false, + + "type": "object", + "properties": { diff --git a/disable-pocket.patch b/disable-pocket.patch new file mode 100644 index 0000000..9f5a890 --- /dev/null +++ b/disable-pocket.patch @@ -0,0 +1,38 @@ +diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm +index 81de0fb201..163b4843e4 100644 +--- a/browser/components/BrowserGlue.jsm ++++ b/browser/components/BrowserGlue.jsm +@@ -1375,8 +1375,6 @@ BrowserGlue.prototype = { + Normandy.init(); + } + +- SaveToPocket.init(); +- + AboutHomeStartupCache.init(); + + Services.obs.notifyObservers(null, "browser-ui-startup-complete"); +diff --git a/browser/components/moz.build b/browser/components/moz.build +index d16b27b1ea..a119166fa5 100644 +--- a/browser/components/moz.build ++++ b/browser/components/moz.build +@@ -42,7 +42,6 @@ DIRS += [ + "originattributes", + "ion", + "places", +- "pocket", + "preferences", + "privatebrowsing", + "prompts", +diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js +index 16168e5..857a968 100644 +--- a/browser/base/content/browser.js ++++ b/browser/base/content/browser.js +@@ -5246,8 +5246,6 @@ var XULBrowserWindow = { + + SafeBrowsingNotificationBox.onLocationChange(aLocationURI); + +- SaveToPocket.onLocationChange(window); +- + UrlbarProviderSearchTips.onLocationChange( + window, + aLocationURI, diff --git a/librewolf.spec b/librewolf.spec index 563cd8f..21c1166 100644 --- a/librewolf.spec +++ b/librewolf.spec @@ -410,6 +410,10 @@ Patch905: megabar.patch Patch906: reduce-rust-debuginfo.patch Patch907: mozilla-vpn-ad.patch Patch908: context-menu.patch +Patch909: urlbarprovider-interventions.patch +Patch1000: remove-internal-plugin-certs.patch +Patch1001: allow-searchengines-non-esr.patch +Patch1002: stop-undesired-requests.patch %description Mozilla Firefox is an open-source web browser, designed for standards compliance, performance and portability. @@ -517,6 +521,10 @@ This package contains results of tests executed during build. #%%patch906 -p1 %patch907 -p1 %patch908 -p1 +%patch909 -p1 +#%%patch1000 -p1 +%patch1001 -p1 +%patch1002 -p1 sed -i '/"pocket"/d' browser/components/moz.build sed -i "/SaveToPocket\.init/d" browser/components/BrowserGlue.jsm sed -i -r -e '/organizationalUnit.{0,5}=.{0,5}Mozilla/{N;N;N;d}' toolkit/mozapps/extensions/internal/XPIInstall.jsm @@ -750,6 +758,7 @@ echo "ac_add_options --with-branding=browser/branding/librewolf" >> .mozconfig echo "ac_add_options --with-branding=browser/branding/librewolf" >> .mozconfig echo "ac_add_options --with-distribution-id=io.gitlab.librewolf-community" >> .mozconfig echo "ac_add_options --with-unsigned-addon-scopes=app,system" >> .mozconfig +echo "ac_add_options --allow-addon-sideload" >> .mozconfig echo "ac_add_options --enable-alsa" >> .mozconfig echo "ac_add_options --enable-jack" >> .mozconfig echo "ac_add_options --disable-updater" >> .mozconfig @@ -1120,7 +1129,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Sat Oct 02 2021 B. Stack <bgstack15@gmail.com> - 92.0.1-2 +* Tue Oct 05 2021 B. Stack <bgstack15@gmail.com> - 92.0.1-2 - Fork to librewolf release. * Mon Sep 27 2021 Martin Stransky <stransky@redhat.com> - 92.0.1-1 diff --git a/remove-internal-plugin-certs.patch b/remove-internal-plugin-certs.patch new file mode 100644 index 0000000..72183e2 --- /dev/null +++ b/remove-internal-plugin-certs.patch @@ -0,0 +1,18 @@ +diff --git a/toolkit/mozapps/extensions/internal/XPIInstall.jsm b/toolkit/mozapps/extensions/internal/XPIInstall.jsm +index 698cd67..5b899d9 100644 +--- a/toolkit/mozapps/extensions/internal/XPIInstall.jsm ++++ b/toolkit/mozapps/extensions/internal/XPIInstall.jsm +@@ -832,11 +832,11 @@ function getSignedStatus(aRv, aCert, aAddonID) { + } + + if (aCert.organizationalUnit == "Mozilla Components") { +- return AddonManager.SIGNEDSTATE_SYSTEM; ++ return AddonManager.SIGNEDSTATE_SIGNED; + } + + if (aCert.organizationalUnit == "Mozilla Extensions") { +- return AddonManager.SIGNEDSTATE_PRIVILEGED; ++ return AddonManager.SIGNEDSTATE_SIGNED; + } + + return /preliminary/i.test(aCert.organizationalUnit) diff --git a/stop-undesired-requests.patch b/stop-undesired-requests.patch new file mode 100644 index 0000000..57bb966 --- /dev/null +++ b/stop-undesired-requests.patch @@ -0,0 +1,55 @@ +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 +--- 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", { + className: "providerUrl", + target: "_blank", +- href: "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/nimbus-desktop-experiments/records", ++ href: "https://f.s.s.m.c.qjz9zk/v1/buckets/main/collections/nimbus-desktop-experiments/records", + rel: "noopener noreferrer" + }, "nimbus-desktop-experiments"), ")"); + } +diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js +index c7cde8917c..b398a22064 100644 +--- a/modules/libpref/init/all.js ++++ b/modules/libpref/init/all.js +@@ -2243,7 +2243,7 @@ pref("security.cert_pinning.hpkp.enabled", false); + // 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.m.c.qjz9zk/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 66df850904..1538a2ff0d 100644 +--- a/services/settings/Utils.jsm ++++ b/services/settings/Utils.jsm +@@ -64,7 +64,7 @@ + !Cu.isInAutomation && + !isXpcshell && + isNotThunderbird +- ? "https://firefox.settings.services.mozilla.com/v1" ++ ? "https://f.s.s.m.c.qjz9zk/v1" + : gServerURL; + }, + +diff --git a/toolkit/components/search/SearchUtils.jsm b/toolkit/components/search/SearchUtils.jsm +index 8a3c6acb84..7408b3fd2f 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.m.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://f.s.s.m.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": diff --git a/urlbarprovider-interventions.patch b/urlbarprovider-interventions.patch new file mode 100644 index 0000000..22448f1 --- /dev/null +++ b/urlbarprovider-interventions.patch @@ -0,0 +1,13 @@ +diff --git a/browser/components/urlbar/UrlbarProviderInterventions.jsm b/browser/components/urlbar/UrlbarProviderInterventions.jsm +index e22886ce92..d46d8191f2 100644 +--- a/browser/components/urlbar/UrlbarProviderInterventions.jsm ++++ b/browser/components/urlbar/UrlbarProviderInterventions.jsm +@@ -451,7 +451,7 @@ class ProviderInterventions extends UrlbarProvider { + ]), + }); + for (let [id, phrases] of Object.entries(DOCUMENTS)) { +- queryScorer.addDocument({ id, phrases }); ++// queryScorer.addDocument({ id, phrases }); + } + return queryScorer; + }); |