r46331 - in /desktop/unstable/gnome-keyring/debian: changelog control patches/init_secret_service.patch patches/series

[mitya57 at users.alioth.debian.org]

Author: mitya57
Date: Wed Oct  7 15:40:04 2015
New Revision: 46331

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=46331
Log:
Add proposed upstream patch from Jan Alexander Steffens to fix
the D-Bus service activation race (hopefully closes: #800617).

Added:
    desktop/unstable/gnome-keyring/debian/patches/init_secret_service.patch
Modified:
    desktop/unstable/gnome-keyring/debian/changelog
    desktop/unstable/gnome-keyring/debian/control
    desktop/unstable/gnome-keyring/debian/patches/series

Modified: desktop/unstable/gnome-keyring/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/changelog?rev=46331&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/changelog	[utf-8] Wed Oct  7 15:40:04 2015
@@ -1,3 +1,10 @@
+gnome-keyring (3.18.0-2) unstable; urgency=medium
+
+  * Add proposed upstream patch from Jan Alexander Steffens to fix
+    the D-Bus service activation race (hopefully closes: #800617).
+
+ -- Dmitry Shachnev <mitya57 at debian.org>  Wed, 07 Oct 2015 18:38:06 +0300
+
 gnome-keyring (3.18.0-1) unstable; urgency=medium
 
   * New upstream release.

Modified: desktop/unstable/gnome-keyring/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/control?rev=46331&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/control	[utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/control	[utf-8] Wed Oct  7 15:40:04 2015
@@ -6,7 +6,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Dmitry Shachnev <mitya57 at debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Dmitry Shachnev <mitya57 at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: debhelper (>= 9),
                cdbs,
                ca-certificates,

Added: desktop/unstable/gnome-keyring/debian/patches/init_secret_service.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/patches/init_secret_service.patch?rev=46331&op=file
==============================================================================
--- desktop/unstable/gnome-keyring/debian/patches/init_secret_service.patch	(added)
+++ desktop/unstable/gnome-keyring/debian/patches/init_secret_service.patch	[utf-8] Wed Oct  7 15:40:04 2015
@@ -0,0 +1,43 @@
+Description: dbus: initialize secret service before claiming name
+Author: Jan Alexander Steffens <jan.steffens at gmail.com>
+Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=756006#c6
+Last-Update: 2015-10-07
+
+--- a/daemon/dbus/gkd-dbus-secrets.c
++++ b/daemon/dbus/gkd-dbus-secrets.c
+@@ -74,6 +74,7 @@
+ 	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 @@
+ 	/* 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 @@
+ 			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;
+ }
+ 

Modified: desktop/unstable/gnome-keyring/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/patches/series?rev=46331&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/patches/series	[utf-8] Wed Oct  7 15:40:04 2015
@@ -1,2 +1,3 @@
 03_kfreebsd.patch
 fix_tests_for_new_glib.patch
+init_secret_service.patch