From 3d9421058f2d3bd15723be08fff22968ff4e1416 Mon Sep 17 00:00:00 2001 From: jj Date: Fri, 28 Feb 2025 14:21:12 +0000 Subject: [PATCH] patches: unbreak google web store, break default update url --- devutils/update_lists.py | 3 ++- domain_substitution.list | 2 +- ...k-prefixes-to-possibly-evil-connections.patch | 16 ---------------- .../break-chrome-webstore-update-url.patch | 11 +++++++++++ patches/helium/proxy-extension-downloads.patch | 8 +++++--- patches/series | 1 + 6 files changed, 20 insertions(+), 21 deletions(-) create mode 100644 patches/helium/break-chrome-webstore-update-url.patch diff --git a/devutils/update_lists.py b/devutils/update_lists.py index 1011a3b7..fec62835 100755 --- a/devutils/update_lists.py +++ b/devutils/update_lists.py @@ -111,9 +111,10 @@ DOMAIN_EXCLUDE_PREFIXES = [ # Exclusions for files covered with other patches/unnecessary 'components/search_engines/prepopulated_engines.json', 'third_party/blink/renderer/core/dom/document.cc', + # Google Web Store extension stuff 'tools/search_engine_choice/generate_search_engine_icons.py', - 'chrome/common/extensions/api/_api_features.json', 'extensions/common/api/_api_features.json', + 'extensions/common/extension_urls.cc', ] # pylint: enable=line-too-long diff --git a/domain_substitution.list b/domain_substitution.list index 047792b4..c9ffe8d1 100644 --- a/domain_substitution.list +++ b/domain_substitution.list @@ -2180,6 +2180,7 @@ chrome/common/chrome_switches.cc chrome/common/conflicts/module_watcher_win.cc chrome/common/extensions/PRESUBMIT.py chrome/common/extensions/api/PRESUBMIT.py +chrome/common/extensions/api/_api_features.json chrome/common/extensions/api/common_extension_api_unittest.cc chrome/common/extensions/api/content_settings.json chrome/common/extensions/api/cookies.json @@ -4157,7 +4158,6 @@ extensions/common/extension_builder_unittest.cc extensions/common/extension_features.h extensions/common/extension_l10n_util_unittest.cc extensions/common/extension_set_unittest.cc -extensions/common/extension_urls.cc extensions/common/extension_urls.h extensions/common/extension_urls_unittest.cc extensions/common/file_util_unittest.cc diff --git a/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch b/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch index 399834ee..d3d992c5 100644 --- a/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch +++ b/patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch @@ -403,22 +403,6 @@ by default. #if BUILDFLAG(IS_WIN) GURL url(base::WideToUTF16(args[0])); ---- a/extensions/common/extension_urls.cc -+++ b/extensions/common/extension_urls.cc -@@ -38,10 +38,10 @@ const GURL* g_item_snippet_url_for_test_ - - } // namespace - --const char kChromeWebstoreBaseURL[] = "https://chrome.google.com/webstore"; --const char kNewChromeWebstoreBaseURL[] = "https://chromewebstore.google.com/"; -+const char kChromeWebstoreBaseURL[] = "trk:09:https://chrome.google.com/webstore"; -+const char kNewChromeWebstoreBaseURL[] = "trk:08:https://chromewebstore.google.com/"; - const char kChromeWebstoreUpdateURL[] = -- "https://clients2.google.com/service/update2/crx"; -+ "trk:05:https://clients2.google.com/service/update2/crx"; - - const char kAppMenuUtmSource[] = "ext_app_menu"; - const char kExtensionsMenuUtmSource[] = "ext_extensions_menu"; --- a/google_apis/gaia/gaia_constants.cc +++ b/google_apis/gaia/gaia_constants.cc @@ -14,169 +14,169 @@ const char kChromeSource[] = "ChromiumBr diff --git a/patches/helium/break-chrome-webstore-update-url.patch b/patches/helium/break-chrome-webstore-update-url.patch new file mode 100644 index 00000000..456f640a --- /dev/null +++ b/patches/helium/break-chrome-webstore-update-url.patch @@ -0,0 +1,11 @@ +--- a/extensions/common/extension_urls.cc ++++ b/extensions/common/extension_urls.cc +@@ -41,7 +41,7 @@ const GURL* g_item_snippet_url_for_test_ + const char kChromeWebstoreBaseURL[] = "https://chrome.google.com/webstore"; + const char kNewChromeWebstoreBaseURL[] = "https://chromewebstore.google.com/"; + const char kChromeWebstoreUpdateURL[] = +- "https://clients2.google.com/service/update2/crx"; ++ "https://clients2.9oo91e.qjz9zk/service/update2/crx"; + const char kHeliumProxyWebstoreUpdateURL[] = + "https://services.helium.computer/ext/webstore"; + diff --git a/patches/helium/proxy-extension-downloads.patch b/patches/helium/proxy-extension-downloads.patch index b3c4bde7..c8a6c1b6 100644 --- a/patches/helium/proxy-extension-downloads.patch +++ b/patches/helium/proxy-extension-downloads.patch @@ -1,9 +1,11 @@ --- a/extensions/common/extension_urls.cc +++ b/extensions/common/extension_urls.cc -@@ -42,6 +42,8 @@ const char kChromeWebstoreBaseURL[] = "t - const char kNewChromeWebstoreBaseURL[] = "trk:08:https://chromewebstore.google.com/"; +@@ -41,7 +41,9 @@ const GURL* g_item_snippet_url_for_test_ + const char kChromeWebstoreBaseURL[] = "https://chrome.google.com/webstore"; + const char kNewChromeWebstoreBaseURL[] = "https://chromewebstore.google.com/"; const char kChromeWebstoreUpdateURL[] = - "trk:05:https://clients2.google.com/service/update2/crx"; +- "https://clients2.google.com/service/update2/crx"; ++ "invalid://clients2.google.com/service/update2/crx"; +const char kHeliumProxyWebstoreUpdateURL[] = + "https://services.helium.computer/ext/webstore"; diff --git a/patches/series b/patches/series index cf60cede..39703d61 100644 --- a/patches/series +++ b/patches/series @@ -119,6 +119,7 @@ helium/clean-new-tab-page.patch helium/proxy-extension-downloads.patch helium/download-icons-from-source.patch helium/regenerate-search_engine_choice_scaled_resources.patch +helium/break-chrome-webstore-update-url.patch helium-ui/remove-toolbar-corners.patch helium-ui/location-bar-style.patch