From dc5eb1f3a196c4d33d2fb8f04d32ff2051f567b6 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Wed, 14 Oct 2015 19:58:37 +0200
Subject: [PATCH] dbus: Initialize secret service before claiming name

---
 ...-secret-service-before-claiming-name.patch | 56 +++++++++++++++++++
 gnome-keyring.spec                            |  7 ++-
 2 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 0001-dbus-Initialize-secret-service-before-claiming-name.patch

diff --git a/0001-dbus-Initialize-secret-service-before-claiming-name.patch b/0001-dbus-Initialize-secret-service-before-claiming-name.patch
new file mode 100644
index 0000000..00fda2d
--- /dev/null
+++ b/0001-dbus-Initialize-secret-service-before-claiming-name.patch
@@ -0,0 +1,56 @@
+From 3cf744f67939dc23c2cc8715cda999a7ec13f1b6 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Tue, 6 Oct 2015 21:12:49 +0200
+Subject: [PATCH] dbus: Initialize secret service before claiming name
+
+Otherwise incoming calls can race with our initialization. Activating
+calls are even guaranteed to arrive before we have set up the service.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=756006
+---
+ daemon/dbus/gkd-dbus-secrets.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/daemon/dbus/gkd-dbus-secrets.c b/daemon/dbus/gkd-dbus-secrets.c
+index 2712a33..207524b 100644
+--- a/daemon/dbus/gkd-dbus-secrets.c
++++ b/daemon/dbus/gkd-dbus-secrets.c
+@@ -74,6 +74,7 @@ gkd_dbus_secrets_startup (void)
+ 	guint res;
+ 
+ 	g_return_val_if_fail (dbus_conn, FALSE);
++	g_return_val_if_fail (!secrets_service, FALSE);
+ 
+ #ifdef WITH_DEBUG
+ 	service = g_getenv ("GNOME_KEYRING_TEST_SERVICE");
+@@ -86,6 +87,9 @@ gkd_dbus_secrets_startup (void)
+ 	/* Figure out which slot to use */
+ 	slot = calculate_secrets_slot ();
+ 	g_return_val_if_fail (slot, FALSE);
++	secrets_service = g_object_new (GKD_SECRET_TYPE_SERVICE,
++					"connection", dbus_conn, "pkcs11-slot", slot, NULL);
++	g_object_unref (slot);
+ 
+ 	/* Try and grab our name */
+ 	request_variant = g_dbus_connection_call_sync (dbus_conn,
+@@ -120,16 +124,12 @@ gkd_dbus_secrets_startup (void)
+ 			g_message ("another secret service is running");
+ 			break;
+ 		default:
++			g_clear_object (&secrets_service);
+ 			g_return_val_if_reached (FALSE);
+ 			break;
+ 		};
+ 	}
+ 
+-	g_return_val_if_fail (!secrets_service, FALSE);
+-	secrets_service = g_object_new (GKD_SECRET_TYPE_SERVICE,
+-					"connection", dbus_conn, "pkcs11-slot", slot, NULL);
+-
+-	g_object_unref (slot);
+ 	return TRUE;
+ }
+ 
+-- 
+2.5.0
+
diff --git a/gnome-keyring.spec b/gnome-keyring.spec
index c992ac0..4dee69f 100644
--- a/gnome-keyring.spec
+++ b/gnome-keyring.spec
@@ -6,11 +6,12 @@
 Summary: Framework for managing passwords and other secrets
 Name: gnome-keyring
 Version: 3.18.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 #VCS: git:git://git.gnome.org/gnome-keyring
 Source:  https://download.gnome.org/sources/%{name}/3.15/%{name}-%{version}.tar.xz
+Patch0:  0001-dbus-Initialize-secret-service-before-claiming-name.patch
 URL:     https://wiki.gnome.org/Projects/GnomeKeyring
 
 BuildRequires: pkgconfig(dbus-1) >= %{dbus_version}
@@ -51,6 +52,7 @@ automatically unlock the "login" keyring when the user logs in.
 
 %prep
 %setup -q -n gnome-keyring-%{version}
+%patch0 -p1
 
 %build
 %configure \
@@ -107,6 +109,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
 
 
 %changelog
+* Wed Oct 14 2015 Kalev Lember <klember@redhat.com> - 3.18.0-2
+- dbus: Initialize secret service before claiming name
+
 * Mon Sep 28 2015 Kalev Lember <klember@redhat.com> - 3.18.0-1
 - Update to 3.18.0