Pier Angelo Vendrame pushed to branch tor-browser-140.1.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 7a29de1f by Pier Angelo Vendrame at 2025-08-11T16:31:01+02:00 fixup! TB 42891: Set the bundled search engine for Tor Browser. TB 43111: Remove legacy search addons. Remove legacy files that are not needed anymore. - - - - - 3b214e31 by Pier Angelo Vendrame at 2025-08-11T16:35:47+02:00 fixup! TB 41435: Add a Tor Browser migration function TB 43111: Remove legacy search addons. The upstream migration code does not allow removing the manifests. If we want to remove them, we need to add our migration. - - - - - 8 changed files: - browser/components/BrowserGlue.sys.mjs - − browser/components/search/extensions/ddg-onion/favicon.ico - − browser/components/search/extensions/ddg-onion/manifest.json - browser/components/search/extensions/ddg/manifest.json - − browser/components/search/extensions/startpage-onion/favicon.png - − browser/components/search/extensions/startpage-onion/manifest.json - − browser/components/search/extensions/startpage/favicon.png - − browser/components/search/extensions/startpage/manifest.json Changes: ===================================== browser/components/BrowserGlue.sys.mjs ===================================== @@ -1922,7 +1922,7 @@ BrowserGlue.prototype = { // Use this method for any TBB migration that can be run just before showing // the UI. // Anything that critically needs to be migrated earlier should not use this. - _migrateUITBB() { + async _migrateUITBB() { // Version 1: Tor Browser 12.0. We use it to remove langpacks, after the // migration to packaged locales. // Version 2: Tor Browser 13.0/13.0a1: tor-browser#41845. Also, removed some @@ -1936,9 +1936,11 @@ BrowserGlue.prototype = { // Version 6: Tor Browser 14.5a3: Clear preference for TorSettings that is // no longer used (tor-browser#41921). // Drop unused TorConnect setting (tor-browser#43462). - // Version 6: Tor Browser 14.5a6: Clear home page update url preference + // Version 7: Tor Browser 14.5a6: Clear home page update url preference // (tor-browser#43567). - const TBB_MIGRATION_VERSION = 7; + // Version 8: Tor Browser 15.0a2: Remove legacy search addons + // (tor-browser#43111). + const TBB_MIGRATION_VERSION = 8; const MIGRATION_PREF = "torbrowser.migration.version"; // If we decide to force updating users to pass through any version @@ -1961,9 +1963,11 @@ BrowserGlue.prototype = { } }; if (currentVersion < 1) { - removeLangpacks().catch(err => { + try { + await removeLangpacks(); + } catch (err) { console.error("Could not remove langpacks", err); - }); + } } if (currentVersion < 2) { const prefToClear = [ @@ -1999,13 +2003,13 @@ BrowserGlue.prototype = { } }; if (currentVersion < 3) { - dropAddons([ + await dropAddons([ "blockchair@search.mozilla.org", "blockchair-onion@search.mozilla.org", ]); } if (currentVersion < 4) { - dropAddons([ + await dropAddons([ "twitter@search.mozilla.org", "yahoo@search.mozilla.org", "youtube@search.mozilla.org", @@ -2019,15 +2023,23 @@ BrowserGlue.prototype = { Services.prefs.clearUserPref(pref); } } - if (currentVersion < 6) { Services.prefs.clearUserPref("torbrowser.settings.enabled"); Services.prefs.clearUserPref("torbrowser.bootstrap.allow_internet_test"); } - if (currentVersion < 7) { Services.prefs.clearUserPref("torbrowser.post_update.url"); } + if (currentVersion < 8) { + await dropAddons([ + "ddg@search.mozilla.org", + "ddg-onion@search.mozilla.org", + "google@search.mozilla.org", + "startpage@search.mozilla.org", + "startpage-onion@search.mozilla.org", + "wikipedia@search.mozilla.org", + ]); + } Services.prefs.setIntPref(MIGRATION_PREF, TBB_MIGRATION_VERSION); }, ===================================== browser/components/search/extensions/ddg-onion/favicon.ico deleted ===================================== Binary files a/browser/components/search/extensions/ddg-onion/favicon.ico and /dev/null differ ===================================== browser/components/search/extensions/ddg-onion/manifest.json deleted ===================================== @@ -1,26 +0,0 @@ -{ - "name": "DuckDuckGo (.onion)", - "description": "Duck Duck Go Onion", - "manifest_version": 2, - "version": "1.0", - "applications": { - "gecko": { - "id": "ddg-onion@search.mozilla.org" - } - }, - "hidden": true, - "icons": { - "16": "favicon.ico" - }, - "web_accessible_resources": ["favicon.ico"], - "chrome_settings_overrides": { - "search_provider": { - "name": "DuckDuckGo (.onion)", - "search_url": "https://duckduckgogg42xjoc72x3sjasowoarfbgcmvfimaftt6twagswzczad.onion", - "search_form": "https://duckduckgogg42xjoc72x3sjasowoarfbgcmvfimaftt6twagswzczad.onion/?q={searchTerms}", - "search_url_get_params": "q={searchTerms}", - "suggest_url": "https://duckduckgogg42xjoc72x3sjasowoarfbgcmvfimaftt6twagswzczad.onion/ac/", - "suggest_url_get_params": "q={searchTerms}&type=list" - } - } -} ===================================== browser/components/search/extensions/ddg/manifest.json ===================================== @@ -14,7 +14,7 @@ "keyword": ["@duckduckgo", "@ddg"], "name": "DuckDuckGo", "search_url": "https://duckduckgo.com/", - "search_url_get_params": "q={searchTerms}", + "search_url_get_params": "t=ffab&q={searchTerms}", "suggest_url": "https://ac.duckduckgo.com/ac/", "suggest_url_get_params": "q={searchTerms}&type=list" } ===================================== browser/components/search/extensions/startpage-onion/favicon.png deleted ===================================== Binary files a/browser/components/search/extensions/startpage-onion/favicon.png and /dev/null differ ===================================== browser/components/search/extensions/startpage-onion/manifest.json deleted ===================================== @@ -1,24 +0,0 @@ -{ - "name": "Startpage (.onion)", - "description": "Startpage Onion", - "manifest_version": 2, - "version": "1.0", - "applications": { - "gecko": { - "id": "startpage-onion@search.mozilla.org" - } - }, - "hidden": true, - "icons": { - "16": "favicon.png" - }, - "web_accessible_resources": ["favicon.png"], - "chrome_settings_overrides": { - "search_provider": { - "name": "Startpage (.onion)", - "search_url": "http://startpagel6srwcjlue4zgq3zevrujfaow726kjytqbbjyrswwmjzcqd.onion/sp/sea...", - "search_form": "http://startpagel6srwcjlue4zgq3zevrujfaow726kjytqbbjyrswwmjzcqd.onion/sp/sea...", - "search_url_post_params": "q={searchTerms}" - } - } -} ===================================== browser/components/search/extensions/startpage/favicon.png deleted ===================================== Binary files a/browser/components/search/extensions/startpage/favicon.png and /dev/null differ ===================================== browser/components/search/extensions/startpage/manifest.json deleted ===================================== @@ -1,24 +0,0 @@ -{ - "name": "Startpage", - "description": "Startpage", - "manifest_version": 2, - "version": "1.0", - "applications": { - "gecko": { - "id": "startpage@search.mozilla.org" - } - }, - "hidden": true, - "icons": { - "16": "favicon.png" - }, - "web_accessible_resources": ["favicon.png"], - "chrome_settings_overrides": { - "search_provider": { - "name": "Startpage", - "search_url": "https://www.startpage.com/sp/search", - "search_form": "https://www.startpage.com/sp/search/", - "search_url_post_params": "q={searchTerms}" - } - } -} View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/5258513... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/5258513... You're receiving this email because of your account on gitlab.torproject.org.