From 2c47f56ec7913c6009f62f08835e14e47e89db52 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 11 Mar 2025 07:18:12 +0000 Subject: [PATCH] import CS gnome-online-accounts-3.40.0-8.el9 --- SOURCES/0005-Mute-no-provider-warning.patch | 40 +++++++++++++++++++++ SPECS/gnome-online-accounts.spec | 6 +++- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 SOURCES/0005-Mute-no-provider-warning.patch diff --git a/SOURCES/0005-Mute-no-provider-warning.patch b/SOURCES/0005-Mute-no-provider-warning.patch new file mode 100644 index 0000000..dbf44da --- /dev/null +++ b/SOURCES/0005-Mute-no-provider-warning.patch @@ -0,0 +1,40 @@ +diff --git a/src/daemon/goadaemon.c b/src/daemon/goadaemon.c +index 0eb372e..db770b4 100644 +--- a/src/daemon/goadaemon.c ++++ b/src/daemon/goadaemon.c +@@ -535,14 +535,14 @@ add_config_file (GoaDaemon *self, + if (provider_type != NULL) + provider = goa_provider_get_for_provider_type (provider_type); + ++ needs_update = g_key_file_remove_group (key_file, groups[n], NULL) || needs_update; ++ + if (provider == NULL) + { +- g_warning ("Unsupported account type %s for ID %s (no provider)", provider_type, id); ++ g_debug ("Unsupported account type %s for ID %s (no provider)", provider_type, id); + goto cleanup_and_continue; + } + +- needs_update = g_key_file_remove_group (key_file, groups[n], NULL); +- + error = NULL; + if (!goa_utils_delete_credentials_for_id_sync (provider, id, NULL, &error)) + { +@@ -562,7 +562,7 @@ add_config_file (GoaDaemon *self, + } + else + { +- needs_update = g_key_file_remove_key (key_file, groups[n], "SessionId", NULL); ++ needs_update = g_key_file_remove_key (key_file, groups[n], "SessionId", NULL) || needs_update; + } + + g_hash_table_insert (group_name_to_key_file_data, +@@ -647,7 +647,7 @@ update_account_object (GoaDaemon *self, + provider = goa_provider_get_for_provider_type (type); + if (provider == NULL) + { +- g_warning ("Unsupported account type %s for identity %s (no provider)", type, identity); ++ g_debug ("Unsupported account type %s for identity %s (no provider)", type, identity); + goto out; + } + diff --git a/SPECS/gnome-online-accounts.spec b/SPECS/gnome-online-accounts.spec index 6bbb9b2..807a7fa 100644 --- a/SPECS/gnome-online-accounts.spec +++ b/SPECS/gnome-online-accounts.spec @@ -5,7 +5,7 @@ Name: gnome-online-accounts Version: 3.40.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Single sign-on framework for GNOME License: LGPLv2+ @@ -22,6 +22,7 @@ Patch: 0001-google-Remove-Photos-support.patch Patch: kerberos-fixes.patch Patch: 0003-Drop-dependency-on-WebKitGTK-139.patch Patch: 0004-Restrict-Services.patch +Patch: 0005-Mute-no-provider-warning.patch Obsoletes: gnome-online-accounts-oauth2 < 3.40.0-5 @@ -136,6 +137,9 @@ find $RPM_BUILD_ROOT -name '*.la' -delete %{_datadir}/vala/ %changelog +* Wed Jan 08 2025 Milan Crha - 3.40.0-8 +- Resolves: RHEL-34647 (goa-daemon: Mute "Unsupported account type ... (no provider)" error) + * Wed Jun 12 2024 Milan Crha - 3.40.0-7 - Resolves: RHEL-40831 (Use /etc/goa.conf to disable features for providers and whole providers)