45 lines
2.2 KiB
Diff
45 lines
2.2 KiB
Diff
From b6cda4bc2283a02a5b5209c0f4282a8365f6f33e Mon Sep 17 00:00:00 2001
|
|
From: Matt Jolly <Matt.Jolly@footclan.ninja>
|
|
Date: Tue, 21 May 2024 10:04:24 +1000
|
|
Subject: [PATCH] www-client/chromium: work around dead oauth2 credentials -
|
|
126 update
|
|
|
|
126 changed the function proto; patch rebased.
|
|
|
|
Google doesn't let us bake in OAuth2 credentials, and for some time,
|
|
Google sign-in has been broken. Arch dealt with this in March, and so
|
|
did we to some degree, but in the last few months, our sign-in
|
|
credentials have been broken. It appears that we actually did remove API
|
|
credentials in March around Chrome 89, but they got added back, perhaps
|
|
when rotating newer versions to replace older versions. Work around this
|
|
by following Arch's lead: we remove the predefined credentials, as
|
|
before, but also we patch Chromium so that people can use their own
|
|
easily, using Arch's patch for that.
|
|
|
|
For more info, see:
|
|
|
|
https://archlinux.org/news/chromium-losing-sync-support-in-early-march/
|
|
https://bodhi.fedoraproject.org/updates/FEDORA-2021-48866282e5
|
|
https://hackaday.com/2021/01/26/whats-the-deal-with-chromium-on-linux-google-at-odds-with-package-maintainers/
|
|
|
|
Bug: https://bugs.gentoo.org/791871
|
|
Signed-off-by: Matt Jolly <kangie@gentoo.org>
|
|
--- a/google_apis/google_api_keys-inc.cc
|
|
+++ b/google_apis/google_api_keys-inc.cc
|
|
@@ -193,11 +193,11 @@ class APIKeyCache {
|
|
std::string default_client_id = CalculateKeyValue(
|
|
GOOGLE_DEFAULT_CLIENT_ID,
|
|
STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), std::string(),
|
|
- nullptr, std::string(), environment.get(), command_line, gaia_config);
|
|
+ ::switches::kOAuth2ClientID, std::string(), environment.get(), command_line, gaia_config);
|
|
std::string default_client_secret = CalculateKeyValue(
|
|
GOOGLE_DEFAULT_CLIENT_SECRET,
|
|
STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), std::string(),
|
|
- nullptr, std::string(), environment.get(), command_line, gaia_config);
|
|
+ ::switches::kOAuth2ClientSecret, std::string(), environment.get(), command_line, gaia_config);
|
|
|
|
// We currently only allow overriding the baked-in values for the
|
|
// default OAuth2 client ID and secret using a command-line
|
|
--
|
|
2.45.1
|
|
|