public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/gnome-keyring] f45: Update to 51.0
@ 2026-09-16 10:46
0 siblings, 0 replies; only message in thread
From: @ 2026-09-16 10:46 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/gnome-keyring
Branch : f45
Commit : 637a13cf014a0c453addf97313bb5d28978000b7
Author : Lukáš Tyrychtr <ltyrycht@redhat.com>
Date : 2026-09-16T12:46:13+02:00
Stats : +2/-209 in 4 file(s)
URL : https://src.fedoraproject.org/rpms/gnome-keyring/c/637a13cf014a0c453addf97313bb5d28978000b7?branch=f45
Log:
Update to 51.0
Also, drop the two patches, as they're already part of the 51.0 release.
---
diff --git a/78.patch b/78.patch
deleted file mode 100644
index 05ef465..0000000
--- a/78.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-From 651417478158ae00b9cdf1dc05d038117615fe69 Mon Sep 17 00:00:00 2001
-From: zsien <i@zsien.cn>
-Date: Tue, 3 Dec 2024 19:56:05 +0800
-Subject: [PATCH] Ensure the login collection is registered after unlocking
-
-Fixes #151
----
- daemon/control/gkd-control-server.c | 8 ++++++--
- daemon/dbus/gkd-dbus-secrets.c | 6 ++++++
- daemon/dbus/gkd-dbus.h | 2 ++
- daemon/dbus/gkd-secret-objects.c | 7 +++++++
- daemon/dbus/gkd-secret-objects.h | 3 +++
- daemon/dbus/gkd-secret-service.c | 13 +++++++++++++
- daemon/dbus/gkd-secret-service.h | 2 ++
- daemon/gkd-main.c | 6 ++++++
- daemon/gkd-main.h | 2 ++
- 9 files changed, 47 insertions(+), 2 deletions(-)
-
-diff --git a/daemon/control/gkd-control-server.c b/daemon/control/gkd-control-server.c
-index 5ef307d6..dcf6471e 100644
---- a/daemon/control/gkd-control-server.c
-+++ b/daemon/control/gkd-control-server.c
-@@ -25,6 +25,7 @@
-
- #include "daemon/gkd-main.h"
- #include "daemon/gkd-util.h"
-+#include "daemon/dbus/gkd-dbus.h"
-
- #include "egg/egg-buffer.h"
- #include "egg/egg-cleanup.h"
-@@ -85,10 +86,13 @@ control_unlock_login (EggBuffer *buffer)
- if (!egg_buffer_get_string (buffer, offset, &offset, &master, egg_secure_realloc))
- return GKD_CONTROL_RESULT_FAILED;
-
-- if (gkd_login_unlock (master))
-+ if (gkd_login_unlock (master)) {
- res = GKD_CONTROL_RESULT_OK;
-- else
-+ if (gkd_main_secrets_started ())
-+ gkd_dbus_ensure_login_collection_is_registered ();
-+ } else {
- res = GKD_CONTROL_RESULT_DENIED;
-+ }
-
- egg_secure_strfree (master);
- return res;
-diff --git a/daemon/dbus/gkd-dbus-secrets.c b/daemon/dbus/gkd-dbus-secrets.c
-index 207524b2..7227dd83 100644
---- a/daemon/dbus/gkd-dbus-secrets.c
-+++ b/daemon/dbus/gkd-dbus-secrets.c
-@@ -156,3 +156,9 @@ gkd_dbus_secrets_cleanup (GDBusConnection *conn)
- secrets_service = NULL;
- }
- }
-+
-+void
-+gkd_dbus_ensure_login_collection_is_registered (void)
-+{
-+ gkd_secret_service_ensure_login_collection_is_registered (secrets_service);
-+}
-diff --git a/daemon/dbus/gkd-dbus.h b/daemon/dbus/gkd-dbus.h
-index 8a9ca450..9cd2a55b 100644
---- a/daemon/dbus/gkd-dbus.h
-+++ b/daemon/dbus/gkd-dbus.h
-@@ -38,4 +38,6 @@ gchar* gkd_dbus_singleton_control (void);
- gboolean gkd_dbus_invocation_matches_caller (GDBusMethodInvocation *invocation,
- const char *caller);
-
-+void gkd_dbus_ensure_login_collection_is_registered (void);
-+
- #endif /* GKD_DBUS_H */
-diff --git a/daemon/dbus/gkd-secret-objects.c b/daemon/dbus/gkd-secret-objects.c
-index af896017..5dda0f3f 100644
---- a/daemon/dbus/gkd-secret-objects.c
-+++ b/daemon/dbus/gkd-secret-objects.c
-@@ -1660,3 +1660,10 @@ gkd_secret_objects_unregister_collection (GkdSecretObjects *self,
- return;
- }
- }
-+
-+gboolean
-+gkd_secret_objects_check_collection_is_registered (GkdSecretObjects *self,
-+ const gchar *collection_path)
-+{
-+ return g_hash_table_lookup (self->collections_to_skeletons, collection_path) != NULL;
-+}
-diff --git a/daemon/dbus/gkd-secret-objects.h b/daemon/dbus/gkd-secret-objects.h
-index e9b61d4e..90516743 100644
---- a/daemon/dbus/gkd-secret-objects.h
-+++ b/daemon/dbus/gkd-secret-objects.h
-@@ -102,4 +102,7 @@ void gkd_secret_objects_register_collection (GkdSecretObjec
- void gkd_secret_objects_unregister_collection (GkdSecretObjects *self,
- const gchar *collection_path);
-
-+gboolean gkd_secret_objects_check_collection_is_registered (GkdSecretObjects *self,
-+ const gchar *collection_path);
-+
- #endif /* __GKD_SECRET_OBJECTS_H__ */
-diff --git a/daemon/dbus/gkd-secret-service.c b/daemon/dbus/gkd-secret-service.c
-index 7a445815..b36cbac9 100644
---- a/daemon/dbus/gkd-secret-service.c
-+++ b/daemon/dbus/gkd-secret-service.c
-@@ -1447,3 +1447,16 @@ gkd_secret_service_emit_collection_changed (GkdSecretService *self,
-
- gkd_exported_service_emit_collection_changed (self->skeleton, collection_path);
- }
-+
-+void
-+gkd_secret_service_ensure_login_collection_is_registered (GkdSecretService *self)
-+{
-+ g_return_if_fail (GKD_SECRET_IS_SERVICE (self));
-+
-+ gchar *collection_path = gkd_secret_util_build_path (SECRET_COLLECTION_PREFIX, "login", strlen("login"));
-+ if (gkd_secret_objects_check_collection_is_registered (self->objects, collection_path)) {
-+ return;
-+ }
-+
-+ gkd_secret_objects_register_collection (self->objects, collection_path);
-+}
-diff --git a/daemon/dbus/gkd-secret-service.h b/daemon/dbus/gkd-secret-service.h
-index f95ac960..960da546 100644
---- a/daemon/dbus/gkd-secret-service.h
-+++ b/daemon/dbus/gkd-secret-service.h
-@@ -84,4 +84,6 @@ void gkd_secret_service_emit_collection_changed (GkdSecretSer
-
- gchar ** gkd_secret_service_get_collections (GkdSecretService *self);
-
-+void gkd_secret_service_ensure_login_collection_is_registered (GkdSecretService *self);
-+
- #endif /* ___SECRET_SERVICE_H__ */
-diff --git a/daemon/gkd-main.c b/daemon/gkd-main.c
-index 6fab91fa..f6268bad 100644
---- a/daemon/gkd-main.c
-+++ b/daemon/gkd-main.c
-@@ -821,6 +821,12 @@ gkd_main_complete_initialization (const gchar *components)
- gkr_daemon_initialize_steps (components);
- }
-
-+gboolean
-+gkd_main_secrets_started (void)
-+{
-+ return secrets_started;
-+}
-+
- static gboolean
- on_login_timeout (gpointer data)
- {
-diff --git a/daemon/gkd-main.h b/daemon/gkd-main.h
-index b847be6b..5e9ba153 100644
---- a/daemon/gkd-main.h
-+++ b/daemon/gkd-main.h
-@@ -27,4 +27,6 @@ void gkd_main_quit (void);
-
- void gkd_main_complete_initialization (const gchar *components);
-
-+gboolean gkd_main_secrets_started (void);
-+
- #endif /* GKD_MAIN_H_ */
---
-GitLab
-
diff --git a/gnome-keyring.spec b/gnome-keyring.spec
index 842edd7..40355e5 100644
--- a/gnome-keyring.spec
+++ b/gnome-keyring.spec
@@ -5,7 +5,7 @@
%bcond_without ssh_agent
Name: gnome-keyring
-Version: 50.0
+Version: 51.0
Release: %autorelease
Summary: Framework for managing passwords and other secrets
@@ -17,14 +17,6 @@ Source0: https://download.gnome.org/sources/%{name}/%{gnome_major_version
%gnome_check_version
-# https://gitlab.gnome.org/GNOME/gnome-keyring/-/merge_requests/78
-# https://gitlab.gnome.org/GNOME/gnome-keyring/-/issues/165
-# https://bugzilla.redhat.com/show_bug.cgi?id=2349314
-# Ensure the login collection is registered after unlocking
-Patch: 78.patch
-
-Patch: prompt-crash.patch
-
BuildRequires: pkgconfig(gcr-3) >= %{gcr_version}
BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
BuildRequires: pkgconfig(libcap-ng)
diff --git a/prompt-crash.patch b/prompt-crash.patch
deleted file mode 100644
index 9b9c0c0..0000000
--- a/prompt-crash.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From ff18dbaa05358bc615795c868c147c621aa6d8ac Mon Sep 17 00:00:00 2001
-From: Michael Catanzaro <mcatanzaro@gnome.org>
-Date: Mon, 24 Aug 2026 10:41:46 -0500
-Subject: [PATCH] secret-unlock: fix crash when prompt is dismissed
-
-Each time we process a new prompt from the queue, we assert to ensure
-that we are not already processing a current prompt. Good idea, but the
-state tracking is messed up.
----
- daemon/dbus/gkd-secret-unlock.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/daemon/dbus/gkd-secret-unlock.c b/daemon/dbus/gkd-secret-unlock.c
-index a1a551f6..8681a117 100644
---- a/daemon/dbus/gkd-secret-unlock.c
-+++ b/daemon/dbus/gkd-secret-unlock.c
-@@ -155,6 +155,9 @@ mark_as_complete (GkdSecretUnlock *self, gboolean dismissed)
- return FALSE;
- self->completed = TRUE;
-
-+ g_free (self->current);
-+ self->current = NULL;
-+
- g_variant_builder_init (&builder, G_VARIANT_TYPE ("ao"));
- for (i = 0; i < self->results->len; ++i) {
- value = g_array_index (self->results, gchar*, i);
-@@ -208,8 +211,6 @@ on_unlock_complete (GObject *object, GAsyncResult *res, gpointer user_data)
-
- /* The user cancelled the protected auth prompt */
- } else if (g_error_matches (error, GCK_ERROR, CKR_PIN_INCORRECT)) {
-- g_free (self->current);
-- self->current = NULL;
- mark_as_complete (self, TRUE);
-
- /* The operation was cancelled via Dismiss call */
---
-2.55.0
-
diff --git a/sources b/sources
index 0c21bed..1524188 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gnome-keyring-50.0.tar.xz) = 20786486655c2188d8d0eae129d1c14a61d995d55a2339b166aa914287cf5ddd29b67d6a2fbc9d4b3d73705459cd3d17c696369500e4a0f0d12087aac78a8c15
+SHA512 (gnome-keyring-51.0.tar.xz) = 9d16e9210d5a3aec5b4bde334c7b524f2aed6148d1b8aa70c9df26a4330f95d81734e240792edfedb39d2bd789a5441f0c55a9f0593c3b50177aa72ec62df09f
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-09-16 10:46 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-16 10:46 [rpms/gnome-keyring] f45: Update to 51.0
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox