[arch-commits] Commit in consolekit/trunk (3 files)

[Jan de Groot]

    Date: Sunday, December 20, 2009 @ 05:44:49
  Author: jgc
Revision: 61616

upgpkg: consolekit 0.4.1-2
    Fix initialization order when activated through dbus. Fixes issues with anything that uses consolekit after updating hal to 0.5.14

Added:
  consolekit/trunk/nodaemon.patch
  consolekit/trunk/reorder-initialization.patch
Modified:
  consolekit/trunk/PKGBUILD

------------------------------+
 PKGBUILD                     |   14 ++++++++++----
 nodaemon.patch               |    9 +++++++++
 reorder-initialization.patch |   40 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-12-20 09:39:32 UTC (rev 61615)
+++ PKGBUILD	2009-12-20 10:44:49 UTC (rev 61616)
@@ -4,21 +4,27 @@
 
 pkgname=consolekit
 pkgver=0.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A framework for defining and tracking users, login sessions, and seats"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/ConsoleKit"
 license=('GPL')
-depends=('polkit>=0.94' 'zlib' 'libx11>=1.2.2')
+depends=('polkit>=0.95' 'zlib' 'libx11>=1.2.2')
 makedepends=('pkgconfig' 'xmlto' 'docbook-xsl')
 options=(!libtool)
 source=(http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-${pkgver}.tar.bz2
-        pam-foreground-compat.ck)
+        pam-foreground-compat.ck
+        nodaemon.patch
+        reorder-initialization.patch)
 md5sums=('48eda4483cc97841d5f88e8e003eb6d7'
-         'a8a4de71d9b0549b8143e5f6c2a36fc7')
+         'a8a4de71d9b0549b8143e5f6c2a36fc7'
+         'a5bfd56bc89411ff5bb18276a68cb212'
+         '99fa8cb1bf232050cc0c076378e216c5')
 
 build() {
   cd "${srcdir}/ConsoleKit-${pkgver}"
+  patch -Np1 -i "${srcdir}/nodaemon.patch" || return 1
+  patch -Np1 -i "${srcdir}/reorder-initialization.patch" || return 1
   ./configure --prefix=/usr \
       --sysconfdir=/etc \
       --localstatedir=/var \

Added: nodaemon.patch
===================================================================
--- nodaemon.patch	                        (rev 0)
+++ nodaemon.patch	2009-12-20 10:44:49 UTC (rev 61616)
@@ -0,0 +1,9 @@
+diff -up ConsoleKit-0.4.1/data/org.freedesktop.ConsoleKit.service.in.nodaemon ConsoleKit-0.4.1/data/org.freedesktop.ConsoleKit.service.in
+--- ConsoleKit-0.4.1/data/org.freedesktop.ConsoleKit.service.in.nodaemon	2009-12-15 10:56:39.839818556 -0500
++++ ConsoleKit-0.4.1/data/org.freedesktop.ConsoleKit.service.in	2009-12-15 10:56:50.177792048 -0500
+@@ -1,4 +1,4 @@
+ [D-BUS Service]
+ Name=org.freedesktop.ConsoleKit
+-Exec=@sbindir@/console-kit-daemon
++Exec=@sbindir@/console-kit-daemon --no-daemon
+ User=root

Added: reorder-initialization.patch
===================================================================
--- reorder-initialization.patch	                        (rev 0)
+++ reorder-initialization.patch	2009-12-20 10:44:49 UTC (rev 61616)
@@ -0,0 +1,40 @@
+diff -up ConsoleKit-0.4.1/src/main.c.reorder-initialization ConsoleKit-0.4.1/src/main.c
+--- ConsoleKit-0.4.1/src/main.c.reorder-initialization	2009-12-18 14:51:38.821212946 -0500
++++ ConsoleKit-0.4.1/src/main.c	2009-12-18 14:52:19.246211176 -0500
+@@ -294,11 +294,19 @@ main (int    argc,
+ 
+         setup_debug_log (debug);
+ 
++        g_debug ("initializing console-kit-daemon %s", VERSION);
++
+         connection = get_system_bus ();
+         if (connection == NULL) {
+                 goto out;
+         }
+ 
++        manager = ck_manager_new ();
++
++        if (manager == NULL) {
++                goto out;
++        }
++
+         bus_proxy = get_bus_proxy (connection);
+         if (bus_proxy == NULL) {
+                 g_warning ("Could not construct bus_proxy object; bailing out");
+@@ -310,16 +318,8 @@ main (int    argc,
+                 goto out;
+         }
+ 
+-        g_debug ("initializing console-kit-daemon %s", VERSION);
+-
+         create_pid_file ();
+ 
+-        manager = ck_manager_new ();
+-
+-        if (manager == NULL) {
+-                goto out;
+-        }
+-
+         loop = g_main_loop_new (NULL, FALSE);
+ 
+         g_signal_connect (bus_proxy,