rpms/gnome-keyring/devel init-dbus-later.patch, NONE, 1.1 gnome-keyring.spec, 1.102, 1.103

[Ray Strode]

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-keyring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13094

Modified Files:
	gnome-keyring.spec 
Added Files:
	init-dbus-later.patch 
Log Message:
- Init dbus later (fixes ssh-agent,
  patch from Yanko Kaneti, bug 476300)


init-dbus-later.patch:

--- NEW FILE init-dbus-later.patch ---
Author: Yanko Kanetii <yaneti at declera.com>
Date:   Tue Dec 16 02:31:16 2008 +0200

    On daemon initialisation move the dbus setup after the plugins setup
    so that all supported environment variables are exported to the session.

diff --git a/daemon/gkr-daemon.c b/daemon/gkr-daemon.c
index c1966a4..9e26511 100644
--- a/daemon/gkr-daemon.c
+++ b/daemon/gkr-daemon.c
@@ -634,8 +634,6 @@ gkr_daemon_complete_initialization(void)
 		return TRUE;
 	}
 	
-	gkr_daemon_dbus_setup ();
-	
 	/* Initialize object storage */
 	if (!gkr_pk_object_storage_initialize ())
 		return FALSE;
@@ -660,6 +658,8 @@ gkr_daemon_complete_initialization(void)
 			return FALSE;
 	}
 	
+	gkr_daemon_dbus_setup ();
+	
 	initialization_completed = TRUE;
 	return TRUE;
 }


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- gnome-keyring.spec	12 Dec 2008 05:50:46 -0000	1.102
+++ gnome-keyring.spec	20 Dec 2008 19:24:14 -0000	1.103
@@ -8,7 +8,7 @@
 Summary: Framework for managing passwords and other secrets
 Name: gnome-keyring
 Version: 2.25.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gnome-keyring/2.24/gnome-keyring-%{version}.tar.bz2
@@ -30,6 +30,9 @@
 Requires(preun): GConf2
 Requires(post): GConf2
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=476300
+Patch0: init-dbus-later.patch
+
 %description
 The gnome-keyring session daemon manages passwords and other types of 
 secrets for the user, storing them encrypted with a main password. 
@@ -64,6 +67,7 @@
 
 %prep
 %setup -q -n gnome-keyring-%{version}
+%patch0 -p1 -b .init-dbus-later
 
 %build
 %configure --disable-gtk-doc --with-pam-dir=/%{_lib}/security --disable-acl-prompts
@@ -131,6 +135,10 @@
 
 
 %changelog
+* Sat Dec 20 2008 Ray Strode <rstrode at redhat.com> - 2.25.2-3
+- Init dbus later (fixes ssh-agent,
+  patch from Yanko Kaneti, bug 476300)
+
 * Fri Dec 12 2008 Matthias Clasen <mclasen at redhat.com> - 2.25.2-2
 - Update to 2.25.2