r25308 - in /desktop/unstable/gnome-keyring/debian: changelog patches/06_init_timeout.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Oct  5 20:36:06 2010
New Revision: 25308

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25308
Log:
06_init_timeout.patch: new patch. Exit the daemon when started 
through the PAM module if it is not initialized in 10 seconds. This 
avoids leaking gnome-keyring-daemon processes everywhere.

Added:
    desktop/unstable/gnome-keyring/debian/patches/06_init_timeout.patch
Modified:
    desktop/unstable/gnome-keyring/debian/changelog
    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=25308&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/changelog [utf-8] Tue Oct  5 20:36:06 2010
@@ -1,3 +1,11 @@
+gnome-keyring (2.30.3-3) UNRELEASED; urgency=low
+
+  * 06_init_timeout.patch: new patch. Exit the daemon when started 
+    through the PAM module if it is not initialized in 10 seconds. This 
+    avoids leaking gnome-keyring-daemon processes everywhere.
+
+ -- Josselin Mouette <joss at debian.org>  Tue, 05 Oct 2010 22:30:24 +0200
+
 gnome-keyring (2.30.3-2) unstable; urgency=high
 
   * 10_debugging_output.patch: new patch. Stop spewing sensitive 

Added: desktop/unstable/gnome-keyring/debian/patches/06_init_timeout.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/patches/06_init_timeout.patch?rev=25308&op=file
==============================================================================
--- desktop/unstable/gnome-keyring/debian/patches/06_init_timeout.patch (added)
+++ desktop/unstable/gnome-keyring/debian/patches/06_init_timeout.patch [utf-8] Tue Oct  5 20:36:06 2010
@@ -1,0 +1,38 @@
+GNOME #631465
+
+Index: gnome-keyring-2.30.3/daemon/gkd-main.c
+===================================================================
+--- gnome-keyring-2.30.3.orig/daemon/gkd-main.c	2010-10-05 21:59:31.531925308 +0200
++++ gnome-keyring-2.30.3/daemon/gkd-main.c	2010-10-05 22:29:52.171927885 +0200
+@@ -82,6 +82,8 @@
+ #define DEFAULT_COMPONENTS  "pkcs11,secrets"
+ #endif
+ 
++#define LOGIN_TIMEOUT 10
++
+ static gchar* run_components = DEFAULT_COMPONENTS;
+ static gboolean pkcs11_started = FALSE;
+ static gboolean secrets_started = FALSE;
+@@ -690,6 +692,14 @@ gkd_main_complete_initialization (const
+ 	gkr_daemon_initialize_steps (components);
+ }
+ 
++static gboolean
++on_login_timeout (gpointer data)
++{
++	if (!initialization_completed)
++		cleanup_and_exit (0);
++	return FALSE;
++}
++
+ int
+ main (int argc, char *argv[])
+ {
+@@ -772,6 +782,7 @@ main (int argc, char *argv[])
+ 	if (run_for_login) {
+ 		login_password = read_login_password (STDIN);
+ 		atexit (clear_login_password);
++		g_timeout_add_seconds (LOGIN_TIMEOUT, (GSourceFunc) on_login_timeout, NULL);
+ 
+ 	/* Not a login daemon. Startup stuff now.*/
+ 	} else {

Modified: desktop/unstable/gnome-keyring/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/patches/series?rev=25308&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/patches/series [utf-8] Tue Oct  5 20:36:06 2010
@@ -3,5 +3,6 @@
 03_kfreebsd.patch
 04_link-libtasns1.patch
 05_hurd_maxpathlen.patch
+06_init_timeout.patch
 10_debugging_output.patch
 99_ltmain_as-needed.patch