Hello community, here is the log from the commit of package ConsoleKit for openSUSE:Factory checked in at Fri Mar 12 17:14:56 CET 2010. -------- --- ConsoleKit/ConsoleKit-doc.changes 2009-12-18 12:47:21.000000000 +0100 +++ /mounts/work_src_done/STABLE/ConsoleKit/ConsoleKit-doc.changes 2010-03-12 17:14:41.274282000 +0100 @@ -1,0 +2,6 @@ +Thu Mar 11 14:05:31 UTC 2010 - coolo@novell.com + +- take some changes out of git to fix autologin in kdm (mainly + fc2870a65f6b3ed3b71bcac69c5faf3a9c759c64) + +------------------------------------------------------------------- ConsoleKit.changes: same change calling whatdependson for head-i586 New: ---- 0008-Don-t-daemonize-when-activated.patch 0009-Don-t-take-bus-name-until-ready.patch 0010-Don-t-segfault-if-the-seats-file-is-invalid.patch 0012-format-not-a-string-literal-and-no-format-arguments.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ConsoleKit-doc.spec ++++++ --- /var/tmp/diff_new_pack.7kvSgM/_old 2010-03-12 17:14:49.000000000 +0100 +++ /var/tmp/diff_new_pack.7kvSgM/_new 2010-03-12 17:14:49.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ConsoleKit-doc (Version 0.4.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -37,12 +37,16 @@ %endif Summary: System daemon for tracking users, sessions and seats Version: 0.4.1 -Release: 2 +Release: 3 License: GPLv2+ Group: System/Daemons AutoReqProv: on Source: %{pkg_name}-%{version}.tar.bz2 Source2: baselibs.conf +Patch0: 0008-Don-t-daemonize-when-activated.patch +Patch1: 0009-Don-t-take-bus-name-until-ready.patch +Patch2: 0010-Don-t-segfault-if-the-seats-file-is-invalid.patch +Patch3: 0012-format-not-a-string-literal-and-no-format-arguments.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %build_doc == 0 PreReq: pwdutils login @@ -82,6 +86,10 @@ %prep %setup -q -n ConsoleKit-%{version} +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build autoreconf -fi ConsoleKit.spec: same change ++++++ 0008-Don-t-daemonize-when-activated.patch ++++++
From fc2870a65f6b3ed3b71bcac69c5faf3a9c759c64 Mon Sep 17 00:00:00 2001 From: Matthias Clasen
Date: Mon, 21 Dec 2009 11:13:23 -0500 Subject: [PATCH 08/12] Don't daemonize when activated
It confuses some versions of D-Bus and isn't needed (or wanted it). http://bugs.freedesktop.org/show_bug.cgi?id=25642 --- data/org.freedesktop.ConsoleKit.service.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/data/org.freedesktop.ConsoleKit.service.in b/data/org.freedesktop.ConsoleKit.service.in index ec2128c..d716a36 100644 --- a/data/org.freedesktop.ConsoleKit.service.in +++ b/data/org.freedesktop.ConsoleKit.service.in @@ -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 -- 1.6.6.1 ++++++ 0009-Don-t-take-bus-name-until-ready.patch ++++++
From 2418840248f07025ad0edc96ed17e03ce5e47f3e Mon Sep 17 00:00:00 2001 From: Ray Strode
Date: Mon, 21 Dec 2009 11:14:54 -0500 Subject: [PATCH 09/12] Don't take bus name until ready
Previously, we would take a bus name right away, but not register the manager object until later. This causes a race when being activated by a method call on the manager object, where ConsoleKit gets started but the method call fails. https://bugs.freedesktop.org/show_bug.cgi?id=25744 --- src/main.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main.c b/src/main.c index 809c6d6..b8f698f 100644 --- a/src/main.c +++ b/src/main.c @@ -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, -- 1.6.6.1 ++++++ 0010-Don-t-segfault-if-the-seats-file-is-invalid.patch ++++++
From f01e054a419d7aaf10c1da321bfbff554ffc3c54 Mon Sep 17 00:00:00 2001 From: Michael Biebl
Date: Thu, 28 Jan 2010 18:11:54 -0500 Subject: [PATCH 10/12] Don't segfault if the seats file is invalid.
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=561106 --- src/ck-manager.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/ck-manager.c b/src/ck-manager.c index d436a06..1dfc789 100644 --- a/src/ck-manager.c +++ b/src/ck-manager.c @@ -2447,6 +2447,10 @@ add_seat_for_file (CkManager *manager, seat = ck_seat_new_from_file (sid, filename); + if (seat == NULL) { + return; + } + connect_seat_signals (manager, seat); if (!ck_seat_register (seat)) { /* returns false if connection to bus fails */ -- 1.6.6.1 ++++++ 0012-format-not-a-string-literal-and-no-format-arguments.patch ++++++
From e7f3952632f077ff647e303bd08950085c293297 Mon Sep 17 00:00:00 2001 From: Frederic Crozat
Date: Fri, 29 Jan 2010 06:43:29 -0500 Subject: [PATCH 12/12] format not a string literal and no format arguments
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=24152 --- src/ck-log-event.c | 16 ++++++++-------- src/main.c | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/ck-log-event.c b/src/ck-log-event.c index 66f439c..5cc88ce 100644 --- a/src/ck-log-event.c +++ b/src/ck-log-event.c @@ -721,7 +721,7 @@ parse_log_for_seat_added (const GString *str, error = NULL; re = g_regex_new ("seat-id='(?P<seatid>[a-zA-Z0-9/]+)' seat-kind=(?P<sessionid>[0-9]*)", 0, 0, &error); if (re == NULL) { - g_warning (error->message); + g_warning ("%s", error->message); goto out; } @@ -781,7 +781,7 @@ parse_log_for_seat_removed (const GString *str, error = NULL; re = g_regex_new ("seat-id='(?P<seatid>[a-zA-Z0-9/]+)' seat-kind=(?P<sessionid>[0-9]*)", 0, 0, &error); if (re == NULL) { - g_warning (error->message); + g_warning ("%s", error->message); goto out; } @@ -887,7 +887,7 @@ parse_log_for_system_start (const GString *str, error = NULL; re = g_regex_new ("(kernel-release='(?P<release>[^']+)')?[ ]?(boot-arguments='(?P<arguments>.*)')?", 0, 0, &error); if (re == NULL) { - g_warning (error->message); + g_warning ("%s", error->message); goto out; } @@ -941,7 +941,7 @@ parse_log_for_seat_session_added (const GString *str, error = NULL; re = g_regex_new ("seat-id='(?P<seatid>[a-zA-Z0-9/]+)' session-id='(?P<sessionid>[a-zA-Z0-9/]+)' session-type='(?P<sessiontype>[a-zA-Z0-9 ]*)' session-x11-display='(?P<sessionx11display>[0-9a-zA-Z.:]*)' session-x11-display-device='(?P<sessionx11displaydevice>[^']*)' session-display-device='(?P<sessiondisplaydevice>[^']*)' session-remote-host-name='(?P<sessionremovehostname>[^']*)' session-is-local=(?P<sessionislocal>[a-zA-Z]*) session-unix-user=(?P<sessionunixuser>[0-9]*) session-creation-time='(?P<sessioncreationtime>[^']*)'", 0, 0, &error); if (re == NULL) { - g_warning (error->message); + g_warning ("%s", error->message); goto out; } @@ -1016,7 +1016,7 @@ parse_log_for_seat_session_removed (const GString *str, error = NULL; re = g_regex_new ("seat-id='(?P<seatid>[a-zA-Z0-9/]+)' session-id='(?P<sessionid>[a-zA-Z0-9/]+)' session-type='(?P<sessiontype>[a-zA-Z0-9 ]*)' session-x11-display='(?P<sessionx11display>[0-9a-zA-Z.:]*)' session-x11-display-device='(?P<sessionx11displaydevice>[^']*)' session-display-device='(?P<sessiondisplaydevice>[^']*)' session-remote-host-name='(?P<sessionremovehostname>[^']*)' session-is-local=(?P<sessionislocal>[a-zA-Z]*) session-unix-user=(?P<sessionunixuser>[0-9]*) session-creation-time='(?P<sessioncreationtime>[^']*)'", 0, 0, &error); if (re == NULL) { - g_warning (error->message); + g_warning ("%s", error->message); goto out; } @@ -1090,7 +1090,7 @@ parse_log_for_seat_active_session_changed (const GString *str, error = NULL; re = g_regex_new ("seat-id='(?P<seatid>[a-zA-Z0-9/]+)' session-id='(?P<sessionid>[a-zA-Z0-9/]*)'", 0, 0, &error); if (re == NULL) { - g_warning (error->message); + g_warning ("%s", error->message); goto out; } @@ -1142,7 +1142,7 @@ parse_log_for_seat_device_added (const GString *str, error = NULL; re = g_regex_new ("seat-id='(?P<seatid>[a-zA-Z0-9/]+)' device-id='(?P<deviceid>[^']+)' device-type='(?P<devicetype>[^']+)'", 0, 0, &error); if (re == NULL) { - g_warning (error->message); + g_warning ("%s", error->message); goto out; } @@ -1195,7 +1195,7 @@ parse_log_for_seat_device_removed (const GString *str, error = NULL; re = g_regex_new ("seat-id='(?P<seatid>[a-zA-Z0-9/]+)' device-id='(?P<deviceid>[^']+)' device-type='(?P<devicetype>[^']+)'", 0, 0, &error); if (re == NULL) { - g_warning (error->message); + g_warning ("%s", error->message); goto out; } diff --git a/src/main.c b/src/main.c index b8f698f..f685026 100644 --- a/src/main.c +++ b/src/main.c @@ -283,7 +283,7 @@ main (int argc, res = g_option_context_parse (context, &argc, &argv, &error); g_option_context_free (context); if (! res) { - g_warning (error->message); + g_warning ("%s", error->message); g_error_free (error); goto out; } -- 1.6.6.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org