From dbda67aef0ecc2240fde852ffb292d65dae18588 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 16 Jul 2024 15:43:55 +0200 Subject: [PATCH] Related: RHEL-45844 (Update to 3.51.0) --- 0001-remove-google-files-backend.patch | 25 ++++++------ 0002-coverity-scan-fixes.patch | 53 -------------------------- gnome-online-accounts.spec | 19 ++++++--- sources | 2 +- 4 files changed, 28 insertions(+), 71 deletions(-) delete mode 100644 0002-coverity-scan-fixes.patch diff --git a/0001-remove-google-files-backend.patch b/0001-remove-google-files-backend.patch index 86f59d5..b535897 100644 --- a/0001-remove-google-files-backend.patch +++ b/0001-remove-google-files-backend.patch @@ -1,6 +1,6 @@ -diff -up gnome-online-accounts-3.50.1/src/goabackend/goagoogleprovider.c.no-files gnome-online-accounts-3.50.1/src/goabackend/goagoogleprovider.c ---- gnome-online-accounts-3.50.1/src/goabackend/goagoogleprovider.c.no-files 2024-04-24 09:16:22.842043803 +0200 -+++ gnome-online-accounts-3.50.1/src/goabackend/goagoogleprovider.c 2024-04-24 09:16:47.334355800 +0200 +diff -up gnome-online-accounts-3.51.0/src/goabackend/goagoogleprovider.c.1 gnome-online-accounts-3.51.0/src/goabackend/goagoogleprovider.c +--- gnome-online-accounts-3.51.0/src/goabackend/goagoogleprovider.c.1 2024-06-29 03:16:48.000000000 +0200 ++++ gnome-online-accounts-3.51.0/src/goabackend/goagoogleprovider.c 2024-07-16 15:19:45.450083253 +0200 @@ -69,8 +69,7 @@ get_provider_features (GoaProvider *prov return GOA_PROVIDER_FEATURE_BRANDED | GOA_PROVIDER_FEATURE_MAIL | @@ -21,9 +21,9 @@ diff -up gnome-online-accounts-3.50.1/src/goabackend/goagoogleprovider.c.no-file /* Google Documents List Data API */ "https://docs.googleusercontent.com/ " "https://spreadsheets.google.com/feeds/ " -@@ -274,12 +270,10 @@ build_object (GoaProvider *provi - GoaAccount *account = NULL; - GoaMail *mail = NULL; +@@ -276,12 +272,10 @@ build_object (GoaProvider *provi + GKeyFile *goa_conf; + const gchar *provider_type; gchar *uri_caldav; - gchar *uri_drive; gboolean ret = FALSE; @@ -34,18 +34,21 @@ diff -up gnome-online-accounts-3.50.1/src/goabackend/goagoogleprovider.c.no-file const gchar *email_address; /* Chain up */ -@@ -339,18 +333,11 @@ build_object (GoaProvider *provi +@@ -346,13 +340,6 @@ build_object (GoaProvider *provi contacts_enabled, FALSE); - /* Files */ -- files_enabled = g_key_file_get_boolean (key_file, group, "FilesEnabled", NULL); +- files_enabled = goa_util_provider_feature_is_enabled (goa_conf, provider_type, GOA_PROVIDER_FEATURE_FILES) && +- g_key_file_get_boolean (key_file, group, "FilesEnabled", NULL); - uri_drive = g_strconcat ("google-drive://", email_address, "/", NULL); - goa_object_skeleton_attach_files (object, uri_drive, files_enabled, FALSE); - g_free (uri_drive); - + g_clear_pointer (&goa_conf, g_key_file_free); + if (just_added) - { +@@ -360,7 +347,6 @@ build_object (GoaProvider *provi goa_account_set_mail_disabled (account, !mail_enabled); goa_account_set_calendar_disabled (account, !calendar_enabled); goa_account_set_contacts_disabled (account, !contacts_enabled); @@ -53,7 +56,7 @@ diff -up gnome-online-accounts-3.50.1/src/goabackend/goagoogleprovider.c.no-file g_signal_connect (account, "notify::mail-disabled", -@@ -364,10 +351,6 @@ build_object (GoaProvider *provi +@@ -374,10 +360,6 @@ build_object (GoaProvider *provi "notify::contacts-disabled", G_CALLBACK (goa_util_account_notify_property_cb), (gpointer) "ContactsEnabled"); @@ -64,7 +67,7 @@ diff -up gnome-online-accounts-3.50.1/src/goabackend/goagoogleprovider.c.no-file } ret = TRUE; -@@ -387,7 +370,6 @@ add_account_key_values (GoaOAuth2Provide +@@ -397,7 +379,6 @@ add_account_key_values (GoaOAuth2Provide g_variant_builder_add (builder, "{ss}", "MailEnabled", "true"); g_variant_builder_add (builder, "{ss}", "CalendarEnabled", "true"); g_variant_builder_add (builder, "{ss}", "ContactsEnabled", "true"); diff --git a/0002-coverity-scan-fixes.patch b/0002-coverity-scan-fixes.patch deleted file mode 100644 index e15d55a..0000000 --- a/0002-coverity-scan-fixes.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -up gnome-online-accounts-3.50.2/src/goabackend/goafedoraprovider.c.2 gnome-online-accounts-3.50.2/src/goabackend/goafedoraprovider.c ---- gnome-online-accounts-3.50.2/src/goabackend/goafedoraprovider.c.2 2024-05-25 18:27:06.000000000 +0200 -+++ gnome-online-accounts-3.50.2/src/goabackend/goafedoraprovider.c 2024-06-26 14:48:43.970418551 +0200 -@@ -321,18 +321,24 @@ add_account_action_cb (GoaProviderDialog - return; - - /* Reset the temporary account watch */ -- g_free (data->identity); -+ g_clear_pointer (&data->identity, g_free); - g_clear_object (&data->object); - if (data->client_source != NULL) - { - g_source_destroy (data->client_source); - g_source_unref (data->client_source); -+ data->client_source = NULL; - } - - username = gtk_editable_get_text (GTK_EDITABLE (data->username)); - password = gtk_editable_get_text (GTK_EDITABLE (data->password)); - provider_type = goa_provider_get_provider_type (provider); -- parse_principal (username, &data->identity); -+ if (!parse_principal (username, &data->identity)) -+ { -+ error = g_error_new (G_IO_ERROR, G_IO_ERROR_FAILED, _("Faild to get principal from user name “%s”"), username); -+ goa_provider_task_return_error (task, g_steal_pointer (&error)); -+ return; -+ } - - /* If this is duplicate account we're finished */ - if (!goa_utils_check_duplicate (data->client, -diff -up gnome-online-accounts-3.50.2/src/goabackend/goautils.c.2 gnome-online-accounts-3.50.2/src/goabackend/goautils.c ---- gnome-online-accounts-3.50.2/src/goabackend/goautils.c.2 2024-05-25 18:27:06.000000000 +0200 -+++ gnome-online-accounts-3.50.2/src/goabackend/goautils.c 2024-06-26 14:48:43.970418551 +0200 -@@ -670,6 +670,7 @@ goa_utils_set_error_soup (GError **err, - case SOUP_STATUS_INTERNAL_SERVER_ERROR: - case SOUP_STATUS_NOT_IMPLEMENTED: - error_msg = g_strdup (_("Not supported")); -+ break; - - case SOUP_STATUS_NOT_FOUND: - error_msg = g_strdup (_("Not found")); -diff -up gnome-online-accounts-3.50.2/src/goabackend/goawebdavprovider.c.2 gnome-online-accounts-3.50.2/src/goabackend/goawebdavprovider.c ---- gnome-online-accounts-3.50.2/src/goabackend/goawebdavprovider.c.2 2024-06-26 14:50:38.747965297 +0200 -+++ gnome-online-accounts-3.50.2/src/goabackend/goawebdavprovider.c 2024-06-26 14:50:56.283201602 +0200 -@@ -1005,7 +1005,7 @@ refresh_account_action_cb (GoaProviderDi - username = gtk_editable_get_text (GTK_EDITABLE (data->username)); - password = gtk_editable_get_text (GTK_EDITABLE (data->password)); - -- g_free (data->presentation_identity); -+ g_clear_pointer (&data->presentation_identity, g_free); - uri = dav_normalize_uri (uri_text, NULL, &server); - if (strchr (username, '@') != NULL) - g_set_str (&data->presentation_identity, username); diff --git a/gnome-online-accounts.spec b/gnome-online-accounts.spec index c5d7e06..c7f4d3d 100644 --- a/gnome-online-accounts.spec +++ b/gnome-online-accounts.spec @@ -4,16 +4,16 @@ %global libsoup_version 3.0 Name: gnome-online-accounts -Version: 3.50.2 -Release: 3%{?dist} +Version: 3.51.0 +Release: 1%{?dist} Summary: Single sign-on framework for GNOME -License: LGPL-2.0-or-later +# Sources are LGPL-2.0-or-later, icons are CC-BY-SA-4.0. +License: LGPL-2.0-or-later AND CC-BY-SA-4.0 URL: https://wiki.gnome.org/Projects/GnomeOnlineAccounts -Source0: https://download.gnome.org/sources/gnome-online-accounts/3.50/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/gnome-online-accounts/3.51/%{name}-%{version}.tar.xz Patch: 0001-remove-google-files-backend.patch -Patch: 0002-coverity-scan-fixes.patch BuildRequires: pkgconfig(gcr-4) BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version} @@ -22,12 +22,14 @@ BuildRequires: pkgconfig(gobject-2.0) >= %{glib2_version} BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(libadwaita-1) +BuildRequires: docbook-style-xsl BuildRequires: gettext >= %{gettext_version} -BuildRequires: gtk-doc BuildRequires: krb5-devel BuildRequires: meson BuildRequires: vala BuildRequires: /usr/bin/desktop-file-validate +BuildRequires: /usr/bin/gi-docgen +BuildRequires: /usr/bin/xsltproc %if !0%{?flatpak} BuildRequires: pkgconfig(gtk4) >= %{gtk4_version} BuildRequires: pkgconfig(json-glib-1.0) @@ -94,6 +96,7 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.gnome.OnlineAcco %{_libdir}/libgoa-backend-1.0.so.2 %{_libdir}/libgoa-backend-1.0.so.2.0.0 %dir %{_libdir}/goa-1.0 +%{_mandir}/man8/goa-daemon.8* %{_prefix}/libexec/goa-daemon %{_prefix}/libexec/goa-identity-service %{_prefix}/libexec/goa-oauth2-handler @@ -105,6 +108,7 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.gnome.OnlineAcco %{_datadir}/icons/hicolor/*/apps/goa-*.svg %files devel +%{_pkgdocdir}/Goa-1.0/ %{_includedir}/goa-1.0/ %{_libdir}/libgoa-1.0.so %dir %{_datadir}/gir-1.0 @@ -118,6 +122,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.gnome.OnlineAcco %{_datadir}/vala/ %changelog +* Tue Jul 16 2024 Milan Crha - 3.51.0-1 +- Related: RHEL-45844 (Update to 3.51.0) + * Wed Jun 26 2024 Milan Crha - 3.50.2-3 - Resolves: RHEL-45186 (Fix issues found by Coverity Scan) diff --git a/sources b/sources index 5cde0b1..1266b50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-online-accounts-3.50.2.tar.xz) = d120e4933039c7b442fffd6846252877e161e7449f3b4e5e5d9cb227d2d0d2994f80cf1946e58f4776ab4f25a495e48999fc3c989091264c2affb4f5115b9d92 +SHA512 (gnome-online-accounts-3.51.0.tar.xz) = 36849c734c2fef152c67d6b0ec00cdcd126d1ddac055ce44d6daebafeaf665afd9b4f5b09dcd19a05612fdcfdbdb20d9f54a502b5a857e399f110d9fd5701ad2