From 69085a126308531e487f1c5f40f4a0e56cab83db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Sun, 6 Apr 2025 04:26:32 +0000 Subject: [PATCH] firefox: prepare 136 release and strength privacy --- ...ntly_enable_new_search_engine_config.patch | 100 ---------- .../008_aboutRights_removal_fix.patch | 172 +++--------------- ...ubunfox_suggest_webext-ublock-origin.patch | 24 +++ helpers/DATA/firefox/process-json-files.py | 2 +- ...llback_ddg_firefox_partnership_codes.patch | 24 --- helpers/DATA/firefox/settings.js | 23 ++- .../{newtab => topsites}/directory.png | Bin .../DATA/firefox/{newtab => topsites}/fsf.ico | Bin .../DATA/firefox/{newtab => topsites}/fsf.png | Bin .../firefox/{newtab => topsites}/fsfe.ico | Bin .../firefox/{newtab => topsites}/fsfe.png | Bin .../DATA/firefox/{newtab => topsites}/gnu.ico | Bin .../DATA/firefox/{newtab => topsites}/gnu.png | Bin .../firefox/{newtab => topsites}/hnode.ico | Bin .../firefox/{newtab => topsites}/hnode.png | Bin .../{newtab => topsites}/libreplanet.ico | Bin .../{newtab => topsites}/libreplanet.png | Bin .../trisquel-packages.ico | Bin .../trisquel-packages.png | Bin .../firefox/{newtab => topsites}/trisquel.ico | Bin .../firefox/{newtab => topsites}/trisquel.png | Bin .../firefox/{newtab => topsites}/wikinews.ico | Bin .../firefox/{newtab => topsites}/wikinews.png | Bin .../{newtab => topsites}/wikipedia-org@2x.png | Bin .../{newtab => topsites}/wikipedia.ico | Bin .../{newtab => topsites}/wikipedia.png | Bin helpers/make-firefox | 31 +++- 27 files changed, 94 insertions(+), 282 deletions(-) delete mode 100644 helpers/DATA/firefox/firefox_permanently_enable_new_search_engine_config.patch create mode 100644 helpers/DATA/firefox/patch_changes/009_remove_ubunfox_suggest_webext-ublock-origin.patch delete mode 100644 helpers/DATA/firefox/rollback_ddg_firefox_partnership_codes.patch rename helpers/DATA/firefox/{newtab => topsites}/directory.png (100%) rename helpers/DATA/firefox/{newtab => topsites}/fsf.ico (100%) rename helpers/DATA/firefox/{newtab => topsites}/fsf.png (100%) rename helpers/DATA/firefox/{newtab => topsites}/fsfe.ico (100%) rename helpers/DATA/firefox/{newtab => topsites}/fsfe.png (100%) rename helpers/DATA/firefox/{newtab => topsites}/gnu.ico (100%) rename helpers/DATA/firefox/{newtab => topsites}/gnu.png (100%) rename helpers/DATA/firefox/{newtab => topsites}/hnode.ico (100%) rename helpers/DATA/firefox/{newtab => topsites}/hnode.png (100%) rename helpers/DATA/firefox/{newtab => topsites}/libreplanet.ico (100%) rename helpers/DATA/firefox/{newtab => topsites}/libreplanet.png (100%) rename helpers/DATA/firefox/{newtab => topsites}/trisquel-packages.ico (100%) rename helpers/DATA/firefox/{newtab => topsites}/trisquel-packages.png (100%) rename helpers/DATA/firefox/{newtab => topsites}/trisquel.ico (100%) rename helpers/DATA/firefox/{newtab => topsites}/trisquel.png (100%) rename helpers/DATA/firefox/{newtab => topsites}/wikinews.ico (100%) rename helpers/DATA/firefox/{newtab => topsites}/wikinews.png (100%) rename helpers/DATA/firefox/{newtab => topsites}/wikipedia-org@2x.png (100%) rename helpers/DATA/firefox/{newtab => topsites}/wikipedia.ico (100%) rename helpers/DATA/firefox/{newtab => topsites}/wikipedia.png (100%) diff --git a/helpers/DATA/firefox/firefox_permanently_enable_new_search_engine_config.patch b/helpers/DATA/firefox/firefox_permanently_enable_new_search_engine_config.patch deleted file mode 100644 index 385611c..0000000 --- a/helpers/DATA/firefox/firefox_permanently_enable_new_search_engine_config.patch +++ /dev/null @@ -1,100 +0,0 @@ - -# HG changeset patch -# User Mark Banner -# Date 1717528181 0 -# Node ID bad743156b3050747ba33df8bc46518e90a1f673 -# Parent a414b7e839e5940d7d90cc8134665b1595549605 -Bug 1900638 - Permanently enable the new search config. r=search-reviewers,daleharvey - -Differential Revision: https://phabricator.services.mozilla.com/D212575 - -diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js ---- a/modules/libpref/init/all.js -+++ b/modules/libpref/init/all.js -@@ -3580,26 +3580,16 @@ pref("urlclassifier.blockedTable", "mozt - pref("browser.search.log", false); - pref("browser.search.update", true); - pref("browser.search.suggest.enabled", true); - pref("browser.search.suggest.enabled.private", false); - pref("browser.search.separatePrivateDefault", true); - pref("browser.search.separatePrivateDefault.ui.enabled", false); - pref("browser.search.removeEngineInfobar.enabled", true); - --// Enables a new search configuration style with no functional changes for the --// user. This is solely intended as a rollout button - it will go away once the --// new configuration has been rolled out. --// Whether search-config-v2 is enabled. --#ifdef NIGHTLY_BUILD --pref("browser.search.newSearchConfig.enabled", true); --#else --pref("browser.search.newSearchConfig.enabled", false); --#endif -- - // GMPInstallManager prefs - - // User-settable override to media.gmp-manager.url for testing purposes. - //pref("media.gmp-manager.url.override", ""); - - // When |media.gmp-manager.allowLocalSources| is true, we will allow falling - // back to using the plugin configurations distributed with Firefox to update - // or install plugins. This fallback is only used when we fail to get an -diff --git a/toolkit/components/search/SearchUtils.sys.mjs b/toolkit/components/search/SearchUtils.sys.mjs ---- a/toolkit/components/search/SearchUtils.sys.mjs -+++ b/toolkit/components/search/SearchUtils.sys.mjs -@@ -106,16 +106,20 @@ class LoadListener { - } - - // nsIProgressEventSink - onProgress() {} - onStatus() {} - } - - export var SearchUtils = { -+ // Permanently enable the new search configuration until we remove the old -+ // code as part of bug 1870686. -+ newSearchConfigEnabled: true, -+ - BROWSER_SEARCH_PREF, - - /** - * This is the Remote Settings key that we use to get the ignore lists for - * engines. - */ - SETTINGS_IGNORELIST_KEY: "hijack-blocklists", - -@@ -426,20 +430,13 @@ export var SearchUtils = { - - XPCOMUtils.defineLazyPreferenceGetter( - SearchUtils, - "loggingEnabled", - BROWSER_SEARCH_PREF + "log", - false - ); - --ChromeUtils.defineLazyGetter(SearchUtils, "newSearchConfigEnabled", () => { -- return Services.prefs.getBoolPref( -- "browser.search.newSearchConfig.enabled", -- false -- ); --}); -- - // Can't use defineLazyPreferenceGetter because we want the value - // from the default branch - ChromeUtils.defineLazyGetter(SearchUtils, "distroID", () => { - return Services.prefs.getDefaultBranch("distribution.").getCharPref("id", ""); - }); -diff --git a/toolkit/components/search/tests/xpcshell/xpcshell.toml b/toolkit/components/search/tests/xpcshell/xpcshell.toml -index 72020a45..6b5f63d2 100644 ---- a/toolkit/components/search/tests/xpcshell/xpcshell.toml -+++ b/toolkit/components/search/tests/xpcshell/xpcshell.toml -@@ -119,8 +119,10 @@ support-files = [ - ["test_engine_old_selector_application.js"] - - ["test_engine_old_selector_application_distribution.js"] -+skip-if = ["true"] # Will be permanently removed as part of bug 1870686 - - ["test_engine_old_selector_application_name.js"] -+skip-if = ["true"] # Will be permanently removed as part of bug 1870686 - - ["test_engine_old_selector_order.js"] - diff --git a/helpers/DATA/firefox/patch_changes/008_aboutRights_removal_fix.patch b/helpers/DATA/firefox/patch_changes/008_aboutRights_removal_fix.patch index f9aa981..57ffc6f 100644 --- a/helpers/DATA/firefox/patch_changes/008_aboutRights_removal_fix.patch +++ b/helpers/DATA/firefox/patch_changes/008_aboutRights_removal_fix.patch @@ -1,146 +1,26 @@ -diff --git a/toolkit/content/aboutRights.xhtml b/toolkit/content/aboutRights.xhtml -index 324b97f4..2416a16e 100644 ---- a/toolkit/content/aboutRights.xhtml -+++ b/toolkit/content/aboutRights.xhtml -@@ -61,14 +61,6 @@ - data-l10n-name="mozilla-privacy-policy-link" - > - --
  • -- --
    • --
  • - - -
    -diff --git a/toolkit/content/aboutRights-unbranded.xhtml b/toolkit/content/aboutRights-unbranded.xhtml_ -index 240b1195..50469282 100644 ---- a/toolkit/content/aboutRights-unbranded.xhtml -+++ b/toolkit/content/aboutRights-unbranded.xhtml -@@ -39,14 +39,6 @@ - --
  • --
  • -- --
    • - - -
    -diff --git a/toolkit/locales/en-US/toolkit/about/aboutRights.ftl b/toolkit/locales/en-US/toolkit/about/aboutRights.ftl -index 517e4232..93dea417 100644 ---- a/toolkit/locales/en-US/toolkit/about/aboutRights.ftl -+++ b/toolkit/locales/en-US/toolkit/about/aboutRights.ftl -@@ -30,103 +30,3 @@ rights-intro-point-4 = - { -vendor-short-name } through { -brand-short-name } is described in the - { -brand-short-name } - Privacy Policy. --rights-intro-point-4-unbranded = -- Any applicable privacy policies for this product should be listed here. --rights-intro-point-5 = -- Some { -brand-short-name } features make use of web-based information -- services, however, we cannot guarantee they are 100% accurate or -- error-free. More details, including information on how to disable the -- features that use these services, can be found in the -- service terms. --rights-intro-point-5-unbranded = -- If this product incorporates web services, any applicable service terms for -- the service(s) should be linked to the -- Website Services -- section. --rights-intro-point-6 = -- In order to play back certain types of video content, { -brand-short-name } -- downloads certain content decryption modules from third parties. --rights-webservices-header = { -brand-full-name } Web-Based Information Services --rights-webservices = -- { -brand-full-name } uses web-based information services (“Services”) to -- provide some of the features provided for your use with this binary version -- of { -brand-short-name } under the terms described below. If you do not -- want to use one or more of the Services or the terms below are -- unacceptable, you may disable the feature or Service(s). Instructions on -- how to disable a particular feature or Service may be found -- here. Other features -- and Services can be disabled in the application preferences. --rights-safebrowsing = -- SafeBrowsing: Disabling the Safe Browsing feature is not -- recommended as it may result in you going to unsafe sites. If you wish to -- disable the feature completely, follow these steps: --rights-safebrowsing-term-1 = Open the application preferences --rights-safebrowsing-term-2 = Select the Security selection --rights-safebrowsing-term-3 = -- Uncheck the option to “{ enableSafeBrowsing-label }” --enableSafeBrowsing-label = Block dangerous and deceptive content --rights-safebrowsing-term-4 = Safe Browsing is now disabled --rights-locationawarebrowsing = -- Location Aware Browsing: is always opt-in. No location -- information is ever sent without your permission. If you wish to disable -- the feature completely, follow these steps: --rights-locationawarebrowsing-term-1 = -- In the URL bar, type about:config --rights-locationawarebrowsing-term-2 = Type geo.enabled --rights-locationawarebrowsing-term-3 = -- Double click on the geo.enabled preference --rights-locationawarebrowsing-term-4 = Location-Aware Browsing is now disabled --rights-webservices-unbranded = -- An overview of the website services the product incorporates, along with -- instructions on how to disable them, if applicable, should be included -- here. --rights-webservices-term-unbranded = -- Any applicable service terms for this product should be listed here. --rights-webservices-term-1 = -- { -vendor-short-name } and its contributors, licensors and partners work to -- provide the most accurate and up-to-date Services. However, we cannot -- guarantee that this information is comprehensive and error-free. For -- example, the Safe Browsing Service may not identify some risky sites and -- may identify some safe sites in error and the Location Aware Service all -- locations returned by our service providers are estimates only and neither -- we nor our service providers guarantee the accuracy of the locations -- provided. --rights-webservices-term-2 = -- { -vendor-short-name } may discontinue or change the Services at its -- discretion. --rights-webservices-term-3 = -- You are welcome to use these Services with the accompanying version of -- { -brand-short-name }, and { -vendor-short-name } grants you its rights to -- do so. { -vendor-short-name } and its licensors reserve all other rights in -- the Services. These terms are not intended to limit any rights granted -- under open source licenses applicable to { -brand-short-name } and to -- corresponding source code versions of { -brand-short-name }. --rights-webservices-term-4 = -- The Services are provided “as-is.” { -vendor-short-name }, its -- contributors, licensors, and distributors, disclaim all warranties, whether -- express or implied, including without limitation, warranties that the -- Services are merchantable and fit for your particular purposes. You bear -- the entire risk as to selecting the Services for your purposes and as to -- the quality and performance of the Services. Some jurisdictions do not -- allow the exclusion or limitation of implied warranties, so this disclaimer -- may not apply to you. --rights-webservices-term-5 = -- Except as required by law, { -vendor-short-name }, its -- contributors, licensors, and distributors will not be liable for any -- indirect, special, incidental, consequential, punitive, or exemplary -- damages arising out of or in any way relating to the use of -- { -brand-short-name } and the Services. The collective liability under -- these terms will not exceed $500 (five hundred dollars). Some jurisdictions -- do not allow the exclusion or limitation of certain damages, so this -- exclusion and limitation may not apply to you. --rights-webservices-term-6 = -- { -vendor-short-name } may update these terms as necessary from time to -- time. These terms may not be modified or canceled without -- { -vendor-short-name }’s written agreement. --rights-webservices-term-7 = -- These terms are governed by the laws of the state of California, U.S.A., -- excluding its conflict of law provisions. If any portion of these terms is -- held to be invalid or unenforceable, the remaining portions will remain in -- full force and effect. In the event of a conflict between a translated -- version of these terms and the English language version, the English -- language version shall control. +diff --git a/browser/base/content/aboutDialog.xhtml b/browser/base/content/aboutDialog.xhtml +index 53e4616a..ba6a3dfb 100644 +--- a/browser/base/content/aboutDialog.xhtml ++++ b/browser/base/content/aboutDialog.xhtml +@@ -137,7 +137,7 @@ + + + + +diff --git a/browser/components/about/AboutRedirector.cpp b/browser/components/about/AboutRedirector.cpp +index d1fe0148..ce5d1f42 100644 +--- a/browser/components/about/AboutRedirector.cpp ++++ b/browser/components/about/AboutRedirector.cpp +@@ -90,7 +90,7 @@ static const RedirEntry kRedirMap[] = { + {"profiling", + "chrome://devtools/content/performance-new/aboutprofiling/index.xhtml", + nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI}, +- {"rights", "https://www.mozilla.org/about/legal/terms/firefox/", ++ {"rights", "https://trisquel.info/es/legal", + nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | + nsIAboutModule::URI_MUST_LOAD_IN_CHILD}, + {"robots", "chrome://browser/content/aboutRobots.xhtml", diff --git a/helpers/DATA/firefox/patch_changes/009_remove_ubunfox_suggest_webext-ublock-origin.patch b/helpers/DATA/firefox/patch_changes/009_remove_ubunfox_suggest_webext-ublock-origin.patch new file mode 100644 index 0000000..d5226c7 --- /dev/null +++ b/helpers/DATA/firefox/patch_changes/009_remove_ubunfox_suggest_webext-ublock-origin.patch @@ -0,0 +1,24 @@ +diff --git a/debian/control.in b/debian/control.in +index dd3c8daa..911d9667 100644 +--- a/debian/control.in ++++ b/debian/control.in +@@ -52,8 +52,7 @@ Architecture: any + Depends: lsb-release, + ${misc:Depends}, + ${shlibs:Depends} +-Recommends: xul-ext-ubufox, +- ${support:Recommends}, ++Recommends: ${support:Recommends}, + libcanberra0, + libdbusmenu-glib4, + libdbusmenu-gtk3-4 +@@ -61,7 +60,8 @@ Provides: www-browser, + iceweasel, firefox, + gnome-www-browser, + ${app:Provides} +-Suggests: fonts-lyx, ++Suggests: webext-ublock-origin, ++ fonts-lyx, + ${support:Suggests} + Breaks: ${transitional:Breaks} + Replaces: ${transitional:Replaces} diff --git a/helpers/DATA/firefox/process-json-files.py b/helpers/DATA/firefox/process-json-files.py index 992cb45..f9d12b5 100644 --- a/helpers/DATA/firefox/process-json-files.py +++ b/helpers/DATA/firefox/process-json-files.py @@ -294,7 +294,7 @@ class UrlClassifierSkipUrls(EmptyRemoteSettings): class TippyTopSites(JsonProcessor): JSON_PATHS = ( arguments.MAIN_PATH / - 'browser/components/newtab/data/content/tippytop/top_sites.json', + 'browser/components/topsites/content/tippytop/top_sites.json', arguments.BRANDING_PATH / 'tippytop/top_sites.json') diff --git a/helpers/DATA/firefox/rollback_ddg_firefox_partnership_codes.patch b/helpers/DATA/firefox/rollback_ddg_firefox_partnership_codes.patch deleted file mode 100644 index f266643..0000000 --- a/helpers/DATA/firefox/rollback_ddg_firefox_partnership_codes.patch +++ /dev/null @@ -1,24 +0,0 @@ -More info related to the change: https://hg.mozilla.org/mozilla-central/rev/5079bb7577182734823d6e4a3c468115d45a9dd9 - ---- a/browser/components/search/extensions/ddg/manifest.json 2023-04-06 23:48:16.983734806 -0600 -+++ b/browser/components/search/extensions/ddg/manifest.json 2023-04-06 23:54:27.848103496 -0600 -@@ -21,7 +21,7 @@ - "name": "DuckDuckGo", - "search_url": "https://duckduckgo.com/", - "search_form": "https://duckduckgo.com/", -- "search_url_get_params": "t=ffab&q={searchTerms}", -+ "search_url_get_params": "q={searchTerms}", - "suggest_url": "https://ac.duckduckgo.com/ac/", - "suggest_url_get_params": "q={searchTerms}&type=list" - } ---- a/browser/components/search/extensions/ddg-html/manifest.json 2023-04-06 23:48:16.987734810 -0600 -+++ b/browser/components/search/extensions/ddg-html/manifest.json 2023-04-06 23:55:19.080158907 -0600 -@@ -21,7 +21,7 @@ - "name": "DuckDuckGo (HTML)", - "search_url": "https://html.duckduckgo.com/html/", - "search_form": "https://html.duckduckgo.com/html/", -- "search_url_get_params": "t=ffab&q={searchTerms}", -+ "search_url_get_params": "q={searchTerms}", - "suggest_url": "https://ac.duckduckgo.com/ac/", - "suggest_url_get_params": "q={searchTerms}&type=list" - } diff --git a/helpers/DATA/firefox/settings.js b/helpers/DATA/firefox/settings.js index 2464ef9..1cd77a4 100644 --- a/helpers/DATA/firefox/settings.js +++ b/helpers/DATA/firefox/settings.js @@ -1,4 +1,4 @@ - +: // Release notes and vendor URLs pref("app.releaseNotesURL", "https://trisquel.info/en/wiki/abrowser-help"); pref("app.vendorURL", "https://trisquel.info/en/wiki/abrowser-help"); @@ -117,6 +117,7 @@ pref("network.http.sendRefererHeader", 2); pref("dom.event.clipboardevents.enabled",false); pref("network.prefetch-next", false); pref("network.dns.disablePrefetch", true); +pref("network.dns.disablePrefetchFromHTTPS", true); pref("network.http.sendSecureXSiteReferrer", false); pref("toolkit.telemetry.enabled", false); // Do not tell what plugins do we have enabled: https://mail.mozilla.org/pipermail/firefox-dev/2013-November/001186.html @@ -126,6 +127,7 @@ pref("plugin.state.flash", 1); pref("browser.newtabpage.directory.source", ""); pref("browser.newtabpage.directory.ping", ""); pref("browser.newtabpage.introShown", true); +pref("browser.newtabpage.activity-stream.unifiedAds.endpoint",""); // Disable home snippets pref("browser.aboutHomeSnippets.updateUrl", ""); // Always ask before restoring the browsing session @@ -152,6 +154,7 @@ pref("toolkit.telemetry.firstShutdownPing.enabled", false); pref("toolkit.telemetry.bhrPing.enabled", false); pref("browser.ping-centre.telemetry", false); pref("dom.security.unexpected_system_load_telemetry_enabled", false); +pref("network.connectivity-service.enabled", false); // Canvas fingerprint protection // Disabled, as it breaks things and does little improvements to fingerprinting @@ -250,9 +253,12 @@ pref("browser.onboarding.enabled", false); pref("browser.newtabpage.activity-stream.default.sites", "https://trisquel.info/,https://packages.trisquel.org,https://www.gnu.org/,https://www.fsf.org/,https://directory.fsf.org,https://libreplanet.org/,https://fsfe.org,https://www.wikipedia.org/wiki/,https://www.h-node.org/"); pref("browser.newtabpage.activity-stream.showTopSites",true); pref("browser.newtabpage.activity-stream.feeds.section.topstories",false); +pref("browser.newtabpage.activity-stream.feeds.discoverystreamfeed", false); +pref("browser.newtabpage.activity-stream.discoverystream.enabled", false); +pref("browser.newtabpage.activity-stream.discoverystream.endpoints, ""); pref("browser.newtabpage.activity-stream.feeds.snippets",false); pref("browser.newtabpage.activity-stream.disableSnippets", true); -user_pref("browser.newtabpage.activity-stream.tippyTop.service.endpoint", ""); +pref("browser.newtabpage.activity-stream.tippyTop.service.endpoint", ""); // Enable xrender //pref("gfx.xrender.enabled",true); @@ -260,7 +266,6 @@ user_pref("browser.newtabpage.activity-stream.tippyTop.service.endpoint", ""); // Disable push notifications pref("dom.webnotifications.enabled",false); pref("dom.webnotifications.serviceworker.enabled",false); -pref("dom.push.enabled",false); // Disable services server pref("services.settings.server", ""); @@ -272,7 +277,7 @@ pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons", false); pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features", false); pref("extensions.htmlaboutaddons.discover.enabled", false); pref("extensions.htmlaboutaddons.recommendations.enabled", false); -//pref("browser.newtabpage.activity-stream.asrouterExperimentEnabled", false); +pref("extensions.getAddons.cache.enabled", false); pref("extensions.getAddons.get.url", ""); pref("extensions.getAddons.link.url", "https://gnuzilla.gnu.org/mozzarella/"); pref("extensions.getAddons.langpacks.url", ""); @@ -306,3 +311,13 @@ pref("browser.ml.chat.hideLabsShortcuts", true); // Disable tab hover preview pref("browser.tabs.hoverPreview.enabled", false); + +// Disable DAP telemetry servers & experiments +pref("toolkit.telemetry.dap.leader.url", ""); +pref("toolkit.telemetry.dap.helper.url", ""); +pref("messaging-system.rsexperimentloader.enabled", false); + +// Disable DoH as third party service, users can restore it at will. +pref("network.trr.mode", 5); +pref("doh-rollout.enabled", false); +pref("doh-rollout.provider-steering.enabled", false); diff --git a/helpers/DATA/firefox/newtab/directory.png b/helpers/DATA/firefox/topsites/directory.png similarity index 100% rename from helpers/DATA/firefox/newtab/directory.png rename to helpers/DATA/firefox/topsites/directory.png diff --git a/helpers/DATA/firefox/newtab/fsf.ico b/helpers/DATA/firefox/topsites/fsf.ico similarity index 100% rename from helpers/DATA/firefox/newtab/fsf.ico rename to helpers/DATA/firefox/topsites/fsf.ico diff --git a/helpers/DATA/firefox/newtab/fsf.png b/helpers/DATA/firefox/topsites/fsf.png similarity index 100% rename from helpers/DATA/firefox/newtab/fsf.png rename to helpers/DATA/firefox/topsites/fsf.png diff --git a/helpers/DATA/firefox/newtab/fsfe.ico b/helpers/DATA/firefox/topsites/fsfe.ico similarity index 100% rename from helpers/DATA/firefox/newtab/fsfe.ico rename to helpers/DATA/firefox/topsites/fsfe.ico diff --git a/helpers/DATA/firefox/newtab/fsfe.png b/helpers/DATA/firefox/topsites/fsfe.png similarity index 100% rename from helpers/DATA/firefox/newtab/fsfe.png rename to helpers/DATA/firefox/topsites/fsfe.png diff --git a/helpers/DATA/firefox/newtab/gnu.ico b/helpers/DATA/firefox/topsites/gnu.ico similarity index 100% rename from helpers/DATA/firefox/newtab/gnu.ico rename to helpers/DATA/firefox/topsites/gnu.ico diff --git a/helpers/DATA/firefox/newtab/gnu.png b/helpers/DATA/firefox/topsites/gnu.png similarity index 100% rename from helpers/DATA/firefox/newtab/gnu.png rename to helpers/DATA/firefox/topsites/gnu.png diff --git a/helpers/DATA/firefox/newtab/hnode.ico b/helpers/DATA/firefox/topsites/hnode.ico similarity index 100% rename from helpers/DATA/firefox/newtab/hnode.ico rename to helpers/DATA/firefox/topsites/hnode.ico diff --git a/helpers/DATA/firefox/newtab/hnode.png b/helpers/DATA/firefox/topsites/hnode.png similarity index 100% rename from helpers/DATA/firefox/newtab/hnode.png rename to helpers/DATA/firefox/topsites/hnode.png diff --git a/helpers/DATA/firefox/newtab/libreplanet.ico b/helpers/DATA/firefox/topsites/libreplanet.ico similarity index 100% rename from helpers/DATA/firefox/newtab/libreplanet.ico rename to helpers/DATA/firefox/topsites/libreplanet.ico diff --git a/helpers/DATA/firefox/newtab/libreplanet.png b/helpers/DATA/firefox/topsites/libreplanet.png similarity index 100% rename from helpers/DATA/firefox/newtab/libreplanet.png rename to helpers/DATA/firefox/topsites/libreplanet.png diff --git a/helpers/DATA/firefox/newtab/trisquel-packages.ico b/helpers/DATA/firefox/topsites/trisquel-packages.ico similarity index 100% rename from helpers/DATA/firefox/newtab/trisquel-packages.ico rename to helpers/DATA/firefox/topsites/trisquel-packages.ico diff --git a/helpers/DATA/firefox/newtab/trisquel-packages.png b/helpers/DATA/firefox/topsites/trisquel-packages.png similarity index 100% rename from helpers/DATA/firefox/newtab/trisquel-packages.png rename to helpers/DATA/firefox/topsites/trisquel-packages.png diff --git a/helpers/DATA/firefox/newtab/trisquel.ico b/helpers/DATA/firefox/topsites/trisquel.ico similarity index 100% rename from helpers/DATA/firefox/newtab/trisquel.ico rename to helpers/DATA/firefox/topsites/trisquel.ico diff --git a/helpers/DATA/firefox/newtab/trisquel.png b/helpers/DATA/firefox/topsites/trisquel.png similarity index 100% rename from helpers/DATA/firefox/newtab/trisquel.png rename to helpers/DATA/firefox/topsites/trisquel.png diff --git a/helpers/DATA/firefox/newtab/wikinews.ico b/helpers/DATA/firefox/topsites/wikinews.ico similarity index 100% rename from helpers/DATA/firefox/newtab/wikinews.ico rename to helpers/DATA/firefox/topsites/wikinews.ico diff --git a/helpers/DATA/firefox/newtab/wikinews.png b/helpers/DATA/firefox/topsites/wikinews.png similarity index 100% rename from helpers/DATA/firefox/newtab/wikinews.png rename to helpers/DATA/firefox/topsites/wikinews.png diff --git a/helpers/DATA/firefox/newtab/wikipedia-org@2x.png b/helpers/DATA/firefox/topsites/wikipedia-org@2x.png similarity index 100% rename from helpers/DATA/firefox/newtab/wikipedia-org@2x.png rename to helpers/DATA/firefox/topsites/wikipedia-org@2x.png diff --git a/helpers/DATA/firefox/newtab/wikipedia.ico b/helpers/DATA/firefox/topsites/wikipedia.ico similarity index 100% rename from helpers/DATA/firefox/newtab/wikipedia.ico rename to helpers/DATA/firefox/topsites/wikipedia.ico diff --git a/helpers/DATA/firefox/newtab/wikipedia.png b/helpers/DATA/firefox/topsites/wikipedia.png similarity index 100% rename from helpers/DATA/firefox/newtab/wikipedia.png rename to helpers/DATA/firefox/topsites/wikipedia.png diff --git a/helpers/make-firefox b/helpers/make-firefox index bf135b1..10db9dd 100644 --- a/helpers/make-firefox +++ b/helpers/make-firefox @@ -19,7 +19,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=120 +VERSION=120.8 EXTERNAL='deb-src http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu $UPSTREAM main' REPOKEY=9BDB3D89CE49EC21 @@ -67,6 +67,12 @@ grep -rl browser.vpn_promo.enabled | xargs -r sed -i '/browser.vpn_promo.enabled sed '/network.connectivity-service.IPv/s/http.*success.txt?ipv[46]//' -i modules/libpref/init/all.js sed 's/accounts-static.cdn.mozilla.net.*sync.services.mozilla.com//' -i modules/libpref/init/all.js +# Disable remote connections instead of disable push completely. 'dom.push' values can't +# be changed on vendor-firefox.js settings only at libpref compilation or by user prefs. +#sed '/dom.push.enabled/,/mirror/s|true|false|' -i modules/libpref/init/StaticPrefList.yaml +sed '/dom.push.connection.enabled/s|true|false|' -i modules/libpref/init/all.js +#sed '/dom.push.serverURL/s|wss.*"|"|' -i modules/libpref/init/all.js + # Disable 106 firefox-view and other firefox-branded popups /bin/sed -i '/browser.urlbar.quicksuggest.shouldShowOnboardingDialog/s|true|false|' $BAP_FirefoxJs sed -i '/services.sync.prefs.sync.browser.firefox-view.feature-tour/s|true|false|' $BAP_FirefoxJs @@ -83,8 +89,8 @@ sed -i '/browser.theme.colorway-closet/s|true|false|' $BAP_FirefoxJs # keep contentRelevancy disabled (first appearence is false thus using /bin/sed) /bin/sed -i '/"toolkit.contentRelevancy.ingestEnabled"/s|,.*)|, false)|' $BAP_FirefoxJs -# Replace ubufox recommendation -sed 's/xul-ext-ubufox/webext-ublock-origin/' -i debian/control.in +# Remove ubufox recommendation and lower ublock to suggestion +# see more at: $DATA/009_remove_ubunfox_suggest_webext-ublock-origin.patch #Remove exceptions on warnings when installing addons. sed -i '/addons.mozilla.org/d' browser/app/permissions @@ -110,6 +116,7 @@ grep -rl toolkit.telemetry.shutdownPingSender.enabled | xargs -r sed -i '/toolk grep -rl toolkit.telemetry.newProfilePing.enabled | xargs -r sed -i '/toolkit.telemetry.newProfilePing.enabled/s|true|false|' grep -rl toolkit.telemetry.firstShutdownPing.enabled | xargs -r sed -i '/toolkit.telemetry.firstShutdownPing.enabled/s|true|false|' grep -rl toolkit.telemetry.bhrPing.enabled | xargs -r sed -i '/toolkit.telemetry.bhrPing.enabled/s|true|false|' +sed -i '/datareporting.usage.uploadEnabled/s|true|false|' modules/libpref/init/all.js # fixed by https://bugzilla.mozilla.org/show_bug.cgi?id=1868988 #grep -rl security.certerrors.recordEventTelemetry | xargs -r sed -i '/security.certerrors.recordEventTelemetry/s|true|false|' grep -rl services.sync.telemetry.maxPayloadCount modules/ | xargs -r sed -i '/services.sync.telemetry.maxPayloadCount/s|500|-1|' @@ -164,6 +171,7 @@ sed '/gmp-clearkey/d' -i ./debian/firefox.install.in # Locale packages should provide firefox-locale-$LANG sed "s/Provides.*/Provides: abrowser-locale-@LANGCODE@/" -i debian/control.langpacks sed 's/Firefox/Abrowser/' -i debian/control.langpacks +sed '/This language is unavailable/s|Firefox|Abrowser|' -i debian/control.langpacks.unavail # Provide firefox sed "s/iceweasel,/iceweasel, firefox,/" -i debian/control.in @@ -173,12 +181,21 @@ sed -i /ubuntu-bookmarks/d debian/patches/series rm debian/patches/ubuntu-bookmarks* # Custom newtab images at DATA/firefox/search-custom/ - -cp $DATA/newtab/*.ico browser/components/newtab/data/content/tippytop/favicons/ -cp $DATA/newtab/*.png browser/components/newtab/data/content/tippytop/images/ +echo "## dropping unused brands images and favicons." +for i in $(ls browser/components/topsites/content/tippytop/favicons/|grep -v wikipedia) +do + echo " - removing $i" + rm browser/components/topsites/content/tippytop/favicons/$i +done +for i in $(ls browser/components/topsites/content/tippytop/images/|grep -v wikipedia) +do + echo " - removing $i" + rm browser/components/topsites/content/tippytop/images/$i +done +cp $DATA/topsites/*.ico browser/components/topsites/content/tippytop/favicons/ +cp $DATA/topsites/*.png browser/components/topsites/content/tippytop/images/ #Trisquel custom search engines -#cp -a $DATA/searchplugins/* browser/components/search/extensions/ /bin/sed "/\"data\": \[/ r $DATA/searchplugins/trisquel-v2.json" -i ./services/settings/dumps/main/search-config-v2.json /bin/sed "/\"data\": \[/ r $DATA/searchplugins/trisquel-packages-v2.json" -i ./services/settings/dumps/main/search-config-v2.json # Setup trisquel's searchengine icons