[Pkg-utopia-commits] r2518 - in /packages/unstable/consolekit/debian: changelog patches/04-defer_daemonizing.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Fri Dec  5 00:25:33 2008
New Revision: 2518

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=2518
Log:
* debian/patches/04-defer_daemonizing.patch
  - Daemonize after registering the dbus name to avoid a race condition
    where dbus-daemon thinks that console-kit-daemon has failed to start
    properly and returns an error to the caller. (Closes: #507815)

Added:
    packages/unstable/consolekit/debian/patches/04-defer_daemonizing.patch
Modified:
    packages/unstable/consolekit/debian/changelog
    packages/unstable/consolekit/debian/patches/series

Modified: packages/unstable/consolekit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/consolekit/debian/changelog?rev=2518&op=diff
==============================================================================
--- packages/unstable/consolekit/debian/changelog (original)
+++ packages/unstable/consolekit/debian/changelog Fri Dec  5 00:25:33 2008
@@ -1,3 +1,12 @@
+consolekit (0.2.10-3) UNRELEASED; urgency=low
+
+  * debian/patches/04-defer_daemonizing.patch
+    - Daemonize after registering the dbus name to avoid a race condition
+      where dbus-daemon thinks that console-kit-daemon has failed to start
+      properly and returns an error to the caller. (Closes: #507815)
+
+ -- Michael Biebl <biebl at debian.org>  Fri, 05 Dec 2008 00:54:34 +0100
+
 consolekit (0.2.10-2) unstable; urgency=high
 
   * debian/patches/03-cleanup_console_tags.patch

Added: packages/unstable/consolekit/debian/patches/04-defer_daemonizing.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/consolekit/debian/patches/04-defer_daemonizing.patch?rev=2518&op=file
==============================================================================
--- packages/unstable/consolekit/debian/patches/04-defer_daemonizing.patch (added)
+++ packages/unstable/consolekit/debian/patches/04-defer_daemonizing.patch Fri Dec  5 00:25:33 2008
@@ -1,0 +1,29 @@
+Daemonize after registering the dbus name to avoid a race condition
+where dbus-daemon thinks that console-kit-daemon has failed to start
+properly and returns an error to the caller. (Closes: #507815)
+Index: ConsoleKit-0.2.10/src/main.c
+===================================================================
+--- ConsoleKit-0.2.10.orig/src/main.c	2008-12-05 00:59:53.000000000 +0100
++++ ConsoleKit-0.2.10/src/main.c	2008-12-05 00:59:56.000000000 +0100
+@@ -325,10 +325,6 @@
+                 goto out;
+         }
+ 
+-        if (! no_daemon && daemon (0, 0)) {
+-                g_error ("Could not daemonize: %s", g_strerror (errno));
+-        }
+-
+         setup_debug_log (debug);
+ 
+         connection = get_system_bus ();
+@@ -347,6 +343,10 @@
+                 goto out;
+         }
+ 
++        if (! no_daemon && daemon (0, 0)) {
++                g_error ("Could not daemonize: %s", g_strerror (errno));
++        }
++
+         g_debug ("initializing console-kit-daemon %s", VERSION);
+ 
+ 	delete_console_tags ();

Modified: packages/unstable/consolekit/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/consolekit/debian/patches/series?rev=2518&op=diff
==============================================================================
--- packages/unstable/consolekit/debian/patches/series (original)
+++ packages/unstable/consolekit/debian/patches/series Fri Dec  5 00:25:33 2008
@@ -1,3 +1,4 @@
 01-dbus_policy.patch
 02-exit_with_dbus.patch
 03-cleanup_console_tags.patch
+04-defer_daemonizing.patch