diff options
42 files changed, 1488 insertions, 997 deletions
@@ -1 +1 @@ -William Jon McCann <mccann@jhu.edu> +William Jon McCann <william.jon.mccann@gmail.com> @@ -1,19 +1,358 @@ +commit 6bc4a3bf403acb762dfaa0cf4eb8288b73e6aa2d +Author: William Jon McCann <jmccann@redhat.com> +Date: Thu Sep 24 02:15:59 2009 -0400 + + Fix a crasher + + src/ck-seat.c | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +commit d9f4838baff87ad39f1726200e1b0812b7813808 +Author: Matthias Clasen <mclasen@redhat.com> +Date: Thu Sep 24 01:11:16 2009 -0400 + + fix a small memory leak + + src/ck-manager.c | 7 +------ + 1 files changed, 1 insertions(+), 6 deletions(-) + +commit 76fba3d10411fc62a89d636ec2592cdf8015fbb2 +Author: William Jon McCann <jmccann@redhat.com> +Date: Thu Sep 24 01:06:07 2009 -0400 + + update email address + + doc/dbus/ConsoleKit.xml.in | 3 +-- + 1 files changed, 1 insertions(+), 2 deletions(-) + +commit 2f5a8a128ac423d444882bbed5d186bc7e0d3188 +Author: William Jon McCann <jmccann@redhat.com> +Date: Thu Sep 24 00:47:04 2009 -0400 + + post release version bump + + configure.ac | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit bf1adae39b41009a54b91389b0d625fd81fdb39c +Author: William Jon McCann <jmccann@redhat.com> +Date: Thu Sep 24 00:45:46 2009 -0400 + + Update for release + + .gitignore | 3 ++- + NEWS | 18 +++++++++++++++++- + doc/dbus/.gitignore | 1 + + 3 files changed, 20 insertions(+), 2 deletions(-) + +commit ca74581668475c69fba6b5ccc1be453c8cdde8e9 +Author: William Jon McCann <jmccann@redhat.com> +Date: Thu Sep 24 00:27:15 2009 -0400 + + bump version before new release + + AUTHORS | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit ee7f189f604d2a976ab0861e11e902755c2ea6ae +Author: Halton Huo <halton.huo@sun.com> +Date: Mon Sep 14 20:26:36 2009 -0400 + + close file descriptors before exit func + + This bug is copied from + http://defect.opensolaris.org/bz/show_bug.cgi?id=10291. + The patch is attached, Please review it. + + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=22986 + + src/ck-sysdeps-solaris.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit 528ff2ceb4efd5db89e5e677517c6c487deb196a +Author: William Jon McCann <jmccann@redhat.com> +Date: Mon Sep 14 20:14:41 2009 -0400 + + log the kernel release and boot arguments at start time + + Someone needs to add support for non-Linux platforms. + + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=23948 + + src/ck-log-event.c | 42 + +++++++++++++++++++++++++++++++++++++++++- + src/ck-log-event.h | 3 ++- + tools/ck-history.c | 5 ++--- + tools/ck-log-system-start.c | 32 ++++++++++++++++++++++++++++++++ + 4 files changed, 77 insertions(+), 5 deletions(-) + +commit 85cfd65a204477e22b258b01d29ab78503074290 +Author: William Jon McCann <jmccann@redhat.com> +Date: Mon Sep 14 18:18:41 2009 -0400 + + show display in host field if the host isn't set + + This is consistent with how we write the wtmp records in GDM. + https://bugs.freedesktop.org/show_bug.cgi?id=23944 + + tools/ck-history.c | 22 +++++++++++++++------- + 1 files changed, 15 insertions(+), 7 deletions(-) + +commit 725e76c91823ee01729890ac1fe71a97754512e4 +Author: William Jon McCann <jmccann@redhat.com> +Date: Mon Sep 14 17:12:07 2009 -0400 + + print the uptime for the reboot items in the report + + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=23279 + + tools/ck-history.c | 41 +++++++++++++++++++++++++++++++++++++++-- + 1 files changed, 39 insertions(+), 2 deletions(-) + +commit 3afb5dc9c0a8ee8e1259fea6bd4b6d5fdede2d5f +Author: William Jon McCann <jmccann@redhat.com> +Date: Mon Sep 14 16:08:16 2009 -0400 + + fix logic for finding session remove events + + The logic is supposed to find any type of removal event. This can + be one of CK_LOG_EVENT_SEAT_SESSION_REMOVED, + CK_LOG_EVENT_SYSTEM_START, + CK_LOG_EVENT_SYSTEM_STOP, or CK_LOG_EVENT_SYSTEM_RESTART. + + This is used to determine if the removal was normal or + RECORD_STATUS_CRASH, + or RECORD_STATUS_DOWN. And indicated in the report log as something + like: + + "Thu Sep 3 21:28 - down (20:20)" + + tools/ck-history.c | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +commit 81435b3d10d4b124c0a6b4649b4cf74378a26323 +Author: William Jon McCann <jmccann@redhat.com> +Date: Mon Sep 14 15:54:33 2009 -0400 + + fix a few small leaks + + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=23939 + + src/ck-seat.c | 15 ++++++++++----- + 1 files changed, 10 insertions(+), 5 deletions(-) + +commit b4f893eb294883909759fc9fd825eade1a9f308c +Author: Lennart Poettering <lennart@poettering.net> +Date: Tue Aug 11 04:02:33 2009 +0200 + + Add seat.d/ callout directory and guarantee we dump the database + before callout invocation + + This adds a callout directory called seat.d/ that follows the basic + session.d/ semantics but works on seats instead of sessions. + + As replacement for the old session.d/ 'session_active_changed' + semantics seat.d/ knows 'seat_active_session_changed'. Which combines + the two callouts necessary for session_active_changed into one. This + has + various advantages: it's not as racy, allows the suppressing of ACL + permission changes when switching between sessions of the same user, + reduces the amount of disk IO and finally is less ugly. + + This patch also moves all callout invocations into the CkManager. + This + has the advantage that we can guarantee to have fully dumped the CK + database before the callout. + + In summary, the session.d/ directory will now get two types of callout + invocations: + + session_added + session_removed + + In contrast, seat.d/ gets three types: + + seat_added + seat_removed + seat_active_session_changed + + The 'seat_active_session_changed' callout type gets two sets of + environment variables describing the old resp. the new session that is + active. Either set can be left out if no session was active before, or + no session will be active after the switch. This is similar to + the logic + behind D-Bus' NameOwnerChanged. + + This patch duplicates CkSeat's 'session-removed' signal into + 'session-removed-full' (and friends). Reason for that is that + the signal + forwarded via D-Bus needs the session id as string while the callout + code needs the session itself as object. Since at the time of + invocation + the CkSeat is no longer in the seats hashtable it is hence necessary + to + pass the object in as argument to the signal handlers, which + makes this + duplification necessary to not confuse dbus-glib. For a similar reason + 'active-session-changed' is duplicated as well. + + src/Makefile.am | 2 + + src/ck-manager.c | 56 +++++++++++++----- + src/ck-marshal.list | 1 + + src/ck-seat.c | 161 + +++++++++++++++++++++++++++++++++++++++++++++++--- + src/ck-seat.h | 5 ++ + 5 files changed, 200 insertions(+), 25 deletions(-) + +commit 76f0578e7a497e569438316703df254f84b548a0 +Author: Lennart Poettering <lennart@poettering.net> +Date: Tue Aug 11 03:57:27 2009 +0200 + + get rid of session.d's session_active_changed callout + + The 'session_active_changed' callout is an invitaton to racy misuses + since it splits up the session switches into two events. This + patch gets + rid of it. + + At this point there are two known users of the session.d/ callouts: + + - Suse/Ubuntu ship a script for emulating pam_atconsole style + /var/run/console management for supporting D-Bus' at_console + feature + properly. Both Martin Pitt and Kay Sievers however are happy with + having this feature go away. In addition I prepared a patch for + D-Bus which makes the need for these scripts go away + entirely. That + patch is currently awaiting review. + + - udev's udev-acl tool currently uses this. However this doesn't + work + correctly anyway since it relies on that the CK database is + correctly + dumped before the tool is invoked, which CK does not handle + properly + at this time. In fact fixing this problem is the main reason why I + came up with this patch series. Kay is also very interested in + seeing the 'session_active_changed' logic go away. + + A later commit introduces a replacement functionality that is + less racy. + + Please note that this patch does not drop session.d/ in its entirety. + Only the 'session_active_changed' type callout is removed. Scripts + that + only rely on 'session_added'/'session_removed' will continue to work + fine, and will continue to be supported. + + NEWS | 8 +++++++- + src/ck-session.c | 2 -- + 2 files changed, 7 insertions(+), 3 deletions(-) + +commit 8535db29009c48a37fc2559ca0fcc5b366e1e122 +Author: Lennart Poettering <lennart@poettering.net> +Date: Mon Jul 27 18:16:15 2009 +0200 + + database: write the console database to disk before signalling + via dbus + + We simply change the order how the signal handlers for D-Bus and the + database dumping are registered. According to the gobject docs it is + guaranteed that the signal handlers are run in the same order as they + are registered, so this should be safe and have the desired effect. + + src/ck-manager.c | 29 +++++++++++++++++++---------- + src/ck-seat.c | 19 ++----------------- + src/ck-seat.h | 2 ++ + 3 files changed, 23 insertions(+), 27 deletions(-) + +commit 17fe9ecafedffde111fd0ac95d5688bf5a330972 +Author: Lennart Poettering <lennart@poettering.net> +Date: Tue Aug 11 03:58:45 2009 +0200 + + Enforce that the env array has the right size + + Hit an assert if folks add env vars but don't increase the env + var array + size. + + src/ck-session.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +commit 90ddcd8249e81341ec05fdb508b6768684ce178b +Author: Lennart Poettering <lennart@poettering.net> +Date: Tue Aug 11 04:01:09 2009 +0200 + + when printing size_t use %z format string + + src/ck-seat.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 242971667b66fea86d4cfb5a4d0a396e5a7b5e8b +Author: Lennart Poettering <lennart@poettering.net> +Date: Tue Aug 11 03:54:57 2009 +0200 + + make CK database world readable + + The CK database shall be readable by the D-Bus daemon which runs under + its own user id hence make sure it is readable for non-root processes. + + To make sure this leaks no information this drops the session cookie + from the database. + + src/ck-manager.c | 2 +- + src/ck-session-leader.c | 1 - + src/ck-session.c | 4 ---- + 3 files changed, 1 insertions(+), 6 deletions(-) + +commit 6d4959b9a573c55fe56bbaf2394f492384f19c67 +Author: Lennart Poettering <lennart@poettering.net> +Date: Tue Aug 11 03:56:48 2009 +0200 + + get rid of ck_seat_set_active_session() prototype since no such + function exists + + src/ck-seat.h | 3 --- + 1 files changed, 0 insertions(+), 3 deletions(-) + +commit d4c986776d0626fc5e1d6d67232a312f9ec6ad75 +Author: Lennart Poettering <lennart@poettering.net> +Date: Tue Aug 11 03:53:40 2009 +0200 + + Move ck_session_run_programs() from ck-run-programs.h to ck-session.h + + It's a method of CkSession hence it belongs in ck-session.h + + src/ck-run-programs.h | 3 --- + src/ck-session.h | 3 +++ + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit ced836b356bd3235c69754e82fe8510ee377d58c +Author: Ray Strode <rstrode@redhat.com> +Date: Wed Jul 22 16:54:01 2009 -0400 + + post release version bump + + configure.ac | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + commit a727d971f3dffc98bae043b69a95e02d3ab3eb88 Author: Ray Strode <rstrode@redhat.com> -Date: Wed Jul 22 15:13:40 2009 -0400 +Date: Wed Jul 22 15:13:40 2009 -0400 Fix example upstart system start script It was trying to write the log message way too early, before the root filesystem was mounted. - NEWS | 2 +- + NEWS | 2 +- data/ck-log-system-start | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 0f5a014b1e722998e85a3e8482a1cc7654066b8f Author: Ray Strode <rstrode@redhat.com> -Date: Tue Jul 21 11:00:52 2009 -0400 +Date: Tue Jul 21 11:00:52 2009 -0400 Update NEWS for 0.3.1 release @@ -22,7 +361,7 @@ Date: Tue Jul 21 11:00:52 2009 -0400 commit 671d3100d48af77eb03b79c73d20e7a4611339df Author: Ray Strode <rstrode@redhat.com> -Date: Tue Jul 21 10:38:26 2009 -0400 +Date: Tue Jul 21 10:38:26 2009 -0400 Reference entities relative to srcdir not cwd @@ -33,24 +372,24 @@ Date: Tue Jul 21 10:38:26 2009 -0400 This commit makes ConsoleKit.xml load the entities from srcdir, which fixes make distcheck. - doc/dbus/ConsoleKit.xml.in | 12 ++++++------ + doc/dbus/ConsoleKit.xml.in | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) commit bf40cd1b17e0bb55c606301f7d8ed65ae6791e54 Author: Ray Strode <rstrode@redhat.com> -Date: Tue Jul 21 10:07:49 2009 -0400 +Date: Tue Jul 21 10:07:49 2009 -0400 Call "git log" instead of "git-log" in Makefile git-log (with a hyphen) is an obsolete way to call git log. - Makefile.am | 2 +- + Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 23ab6a2ef30fb6fb56f33ac44ecda5887d2b1f94 Author: Martin Pitt <martin.pitt@ubuntu.com> -Date: Mon Jul 20 17:09:36 2009 -0400 +Date: Mon Jul 20 17:09:36 2009 -0400 Add CanStop/Restart to D-Bus security policy @@ -63,22 +402,22 @@ Date: Mon Jul 20 17:09:36 2009 -0400 commit 89b9256ad86ddc2a9fd12d3359bc431df45c6b25 Author: Matthias Clasen <mclasen@redhat.com> -Date: Mon Jul 20 17:08:23 2009 -0400 +Date: Mon Jul 20 17:08:23 2009 -0400 Port to PolicyKit 1.0 apis - configure.ac | 5 +- - data/Makefile.am | 2 +- - data/org.freedesktop.consolekit.policy | 4 +- - src/ck-manager.c | 673 + configure.ac | 5 +- + data/Makefile.am | 2 +- + data/org.freedesktop.consolekit.policy | 4 +- + src/ck-manager.c | 673 +++++++++------------------- - src/ck-manager.h | 5 + - src/org.freedesktop.ConsoleKit.Manager.xml | 10 + + src/ck-manager.h | 5 + + src/org.freedesktop.ConsoleKit.Manager.xml | 10 + 6 files changed, 226 insertions(+), 473 deletions(-) commit 282c47eb102f839cbf3bee646ba2841362284760 Author: Ray Strode <rstrode@redhat.com> -Date: Mon Jul 20 16:37:45 2009 -0400 +Date: Mon Jul 20 16:37:45 2009 -0400 Get VT from X display if no controlling tty @@ -95,7 +434,7 @@ Date: Mon Jul 20 16:37:45 2009 -0400 commit bcc18427eec07139c9d907ac3995f2c157a7c715 Author: Halton Huo <halton.huo@sun.com> -Date: Mon Jul 20 16:29:46 2009 -0400 +Date: Mon Jul 20 16:29:46 2009 -0400 Fix connector build on Solaris @@ -104,12 +443,12 @@ Date: Mon Jul 20 16:29:46 2009 -0400 bug 22361 - pam-ck-connector/pam-ck-connector.c | 7 ------- + pam-ck-connector/pam-ck-connector.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) commit bb5c86f61775039dca779959eb5822cb1d453bbd Author: Vincent Untz <vuntz@gnome.org> -Date: Mon Jul 20 16:22:43 2009 -0400 +Date: Mon Jul 20 16:22:43 2009 -0400 Allow GetSessions to get called @@ -126,7 +465,7 @@ Date: Mon Jul 20 16:22:43 2009 -0400 commit 0f5390165fd68322d077e13d828af8f32fc09327 Author: Matthias Clasen <mclasen@redhat.com> -Date: Thu Jul 16 17:19:30 2009 -0400 +Date: Thu Jul 16 17:19:30 2009 -0400 avoid a (harmless) warning message @@ -137,33 +476,33 @@ Date: Thu Jul 16 17:19:30 2009 -0400 commit cbfd9578d73f93e47b282bdf4e298067c4a9bf79 Author: William Jon McCann <jmccann@redhat.com> -Date: Thu Jul 16 17:15:14 2009 -0400 +Date: Thu Jul 16 17:15:14 2009 -0400 fix a bunch of xml validation errors https://bugs.freedesktop.org/show_bug.cgi?id=20232 - configure.ac | 3 + - doc/dbus/Makefile.am | 5 ++- - doc/dbus/ck-design.xml | 58 +++++++++++----------- - doc/dbus/spec-to-docbook.xsl | 72 + configure.ac | 3 + + doc/dbus/Makefile.am | 5 ++- + doc/dbus/ck-design.xml | 58 +++++++++++----------- + doc/dbus/spec-to-docbook.xsl | 72 ++++++++++++++++------------ - src/org.freedesktop.ConsoleKit.Manager.xml | 2 +- - src/org.freedesktop.ConsoleKit.Seat.xml | 5 +- + src/org.freedesktop.ConsoleKit.Manager.xml | 2 +- + src/org.freedesktop.ConsoleKit.Seat.xml | 5 +- 6 files changed, 82 insertions(+), 63 deletions(-) commit 25145f35ab527a2219604e1710eb65e2178f6978 Author: William Jon McCann <jmccann@redhat.com> -Date: Thu Feb 12 14:59:15 2009 -0500 +Date: Thu Feb 12 14:59:15 2009 -0500 fix parsing log entries with no body - src/ck-log-event.c | 25 +++++++++++++++++-------- + src/ck-log-event.c | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-) commit b550333228b73bb3ed4a55ec74baade1bdded0ff Author: Daniel Macks <dmacks@netspace.org> -Date: Wed Feb 11 21:56:55 2009 -0500 +Date: Wed Feb 11 21:56:55 2009 -0500 clearer diagnostic if platform back-end isn't implemented @@ -174,7 +513,7 @@ Date: Wed Feb 11 21:56:55 2009 -0500 commit 87703597e24ba94c400ac8878a6835d86571da91 Author: William Jon McCann <jmccann@redhat.com> -Date: Wed Feb 11 21:51:41 2009 -0500 +Date: Wed Feb 11 21:51:41 2009 -0500 parse gecos field to get real name @@ -183,7 +522,7 @@ Date: Wed Feb 11 21:51:41 2009 -0500 commit 739b39203166eda0174672541a06ceeb182b6ed3 Author: James Westby <jw+debian@jameswestby.net> -Date: Wed Feb 11 21:39:46 2009 -0500 +Date: Wed Feb 11 21:39:46 2009 -0500 don't leak dbus proxy @@ -192,7 +531,7 @@ Date: Wed Feb 11 21:39:46 2009 -0500 commit fef7d6f777b017878ba225395fe4199af5f1c581 Author: Halton Huo <halton.huo@sun.com> -Date: Wed Feb 11 20:39:18 2009 -0500 +Date: Wed Feb 11 20:39:18 2009 -0500 fix building with Solaris PAM @@ -235,24 +574,24 @@ Date: Wed Feb 11 20:39:18 2009 -0500 https://bugs.freedesktop.org/show_bug.cgi?id=18173 - pam-ck-connector/Makefile.am | 2 ++ - pam-ck-connector/pam-ck-connector.c | 18 +++++++++++++++++- + pam-ck-connector/Makefile.am | 2 ++ + pam-ck-connector/pam-ck-connector.c | 18 +++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletions(-) commit da3a3fe00ad4c4e750e467db58d383ebf4da978f Author: William Jon McCann <jmccann@redhat.com> -Date: Wed Feb 11 20:30:50 2009 -0500 +Date: Wed Feb 11 20:30:50 2009 -0500 fix zero-sized struct/union https://bugs.freedesktop.org/show_bug.cgi?id=18149 - src/ck-log-event.h | 4 ++++ + src/ck-log-event.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit 2ca61880db1da2b15fe83d0fe94b95245ace77b0 Author: James Westby <jw+debian@jameswestby.net> -Date: Wed Feb 11 20:18:24 2009 -0500 +Date: Wed Feb 11 20:18:24 2009 -0500 serialize removals, and avoid using freed data caused by removals @@ -277,7 +616,7 @@ Date: Wed Feb 11 20:18:24 2009 -0500 commit 1ddd056da19a9e99b10601a557ebbcaf101d0de9 Author: Steve Langasek <steve.langasek@canonical.com> -Date: Wed Feb 11 18:36:34 2009 -0500 +Date: Wed Feb 11 18:36:34 2009 -0500 close directory to fix leak @@ -285,7 +624,7 @@ Date: Wed Feb 11 18:36:34 2009 -0500 number of redundant file descriptors, pointing to /etc/ConsoleKit/run-session.d and - /usr/lib/ConsoleKit/run-session.d. It turns out that + /usr/lib/ConsoleKit/run-session.d. It turns out that ck_run_programs() doesn't close the directory handles after iterating, resulting in a fd leak and a small @@ -298,7 +637,7 @@ Date: Wed Feb 11 18:36:34 2009 -0500 commit a00c329d81be8691e13915ed36f5053bd0f820f3 Author: Martin Pitt <martin.pitt@ubuntu.com> -Date: Wed Feb 11 16:30:34 2009 -0500 +Date: Wed Feb 11 16:30:34 2009 -0500 add "nox11" option to the PAM module @@ -310,28 +649,28 @@ Date: Wed Feb 11 16:30:34 2009 -0500 https://bugs.freedesktop.org/show_bug.cgi?id=16746 - pam-ck-connector/pam-ck-connector.c | 7 +++++++ - pam-ck-connector/pam_ck_connector.8 | 4 ++++ + pam-ck-connector/pam-ck-connector.c | 7 +++++++ + pam-ck-connector/pam_ck_connector.8 | 4 ++++ 2 files changed, 11 insertions(+), 0 deletions(-) commit 946c2daf3f654475e767ae98e52cbcd69e2c3320 Author: William Jon McCann <jmccann@redhat.com> -Date: Wed Feb 11 16:06:04 2009 -0500 +Date: Wed Feb 11 16:06:04 2009 -0500 add example upstart events for logging These can be used to add system start/stop/restart logging but hooking into Upstart event mechanism. - data/Makefile.am | 3 +++ - data/ck-log-system-restart | 8 ++++++++ - data/ck-log-system-start | 8 ++++++++ - data/ck-log-system-stop | 8 ++++++++ + data/Makefile.am | 3 +++ + data/ck-log-system-restart | 8 ++++++++ + data/ck-log-system-start | 8 ++++++++ + data/ck-log-system-stop | 8 ++++++++ 4 files changed, 27 insertions(+), 0 deletions(-) commit e0d9cc359b3099307067107b59ec691418e280b8 Author: Colin Walters <walters@verbum.org> -Date: Sun Jan 18 13:06:37 2009 -0500 +Date: Sun Jan 18 13:06:37 2009 -0500 fix up D-Bus permissions @@ -341,7 +680,7 @@ Date: Sun Jan 18 13:06:37 2009 -0500 commit 6ef0f62dc8b41c6904099c2d2836747da38d69df Author: William Jon McCann <jmccann@redhat.com> -Date: Thu Oct 2 14:18:16 2008 -0400 +Date: Thu Oct 2 14:18:16 2008 -0400 check the result of the fchown call @@ -350,7 +689,7 @@ Date: Thu Oct 2 14:18:16 2008 -0400 commit a58a4bff451dcf8a6019aed1b2fb276e9836b0f4 Author: William Jon McCann <jmccann@redhat.com> -Date: Thu Oct 2 14:15:10 2008 -0400 +Date: Thu Oct 2 14:15:10 2008 -0400 don't close the log file fd twice @@ -361,7 +700,7 @@ Date: Thu Oct 2 14:15:10 2008 -0400 commit 35794ece08bc678a537d0c2a680b79f9232dfe36 Author: William Jon McCann <jmccann@redhat.com> -Date: Thu Oct 2 13:56:58 2008 -0400 +Date: Thu Oct 2 13:56:58 2008 -0400 fix typo @@ -372,7 +711,7 @@ Date: Thu Oct 2 13:56:58 2008 -0400 commit f0fb2d1cfd0f0ea3ad922175e895a9e751498a03 Author: William Jon McCann <jmccann@redhat.com> -Date: Wed Aug 20 19:48:08 2008 -0400 +Date: Wed Aug 20 19:48:08 2008 -0400 allow calling method SetIdleHint by default @@ -381,7 +720,7 @@ Date: Wed Aug 20 19:48:08 2008 -0400 commit cb445f89d64d2171c1050dbf8ba1280f2260bc9c Author: William Jon McCann <jmccann@redhat.com> -Date: Wed Jul 30 20:56:43 2008 -0400 +Date: Wed Jul 30 20:56:43 2008 -0400 post release bump again @@ -390,7 +729,7 @@ Date: Wed Jul 30 20:56:43 2008 -0400 commit 9555166f23499642b64b247bd7106287c5b415c2 Author: William Jon McCann <jmccann@redhat.com> -Date: Wed Jul 30 20:56:22 2008 -0400 +Date: Wed Jul 30 20:56:22 2008 -0400 undo @@ -399,7 +738,7 @@ Date: Wed Jul 30 20:56:22 2008 -0400 commit 6e26aa3e9ae08b4c35539100d1605cd7c3f29a25 Author: William Jon McCann <jmccann@redhat.com> -Date: Wed Jul 30 20:55:28 2008 -0400 +Date: Wed Jul 30 20:55:28 2008 -0400 post release version bump @@ -408,69 +747,69 @@ Date: Wed Jul 30 20:55:28 2008 -0400 commit 129efd6638cab89a3bc75a2b5f252e613a30163d Author: William Jon McCann <jmccann@redhat.com> -Date: Wed Jul 30 20:38:21 2008 -0400 +Date: Wed Jul 30 20:38:21 2008 -0400 update for 0.3.0 release - NEWS | 42 ++++++++++++++++++++++++++++++++++++++++++ - configure.ac | 2 +- + NEWS | 42 ++++++++++++++++++++++++++++++++++++++++++ + configure.ac | 2 +- src/ck-session.c | 2 +- 3 files changed, 44 insertions(+), 2 deletions(-) commit 456065f3f8d9ba785b0d2d9dc247fc9fb4fe9ba0 Author: William Jon McCann <jmccann@redhat.com> -Date: Wed Jul 30 18:06:31 2008 -0400 +Date: Wed Jul 30 18:06:31 2008 -0400 don't allow reboot if PolicyKit and RBAC are disabled - configure.ac | 11 ++++++++++- + configure.ac | 11 ++++++++++- src/ck-manager.c | 27 ++++++++++++++------------- 2 files changed, 24 insertions(+), 14 deletions(-) commit 53d7c964bcdd29d6d22c4e78afe1ee5a2937bf95 Author: William Jon McCann <jmccann@redhat.com> -Date: Wed Jul 30 17:45:07 2008 -0400 +Date: Wed Jul 30 17:45:07 2008 -0400 fix path in includes - doc/dbus/ConsoleKit.xml.in | 12 ++++++------ + doc/dbus/ConsoleKit.xml.in | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) commit edad750e967458f55b9e761af966f325213ce9fe Author: William Jon McCann <jmccann@redhat.com> -Date: Wed Jul 30 17:37:24 2008 -0400 +Date: Wed Jul 30 17:37:24 2008 -0400 reorganize the docs a bit - configure.ac | 4 +- - doc/.gitignore | 2 - - doc/ConsoleKit.xml.in | 74 ----- - doc/Makefile.am | 41 +--- - doc/config.xsl | 6 - - doc/dbus-introspect-docs.dtd | 32 --- - doc/dbus/.gitignore | 6 + - doc/dbus/ConsoleKit.xml.in | 74 +++++ - doc/dbus/Makefile.am | 46 +++ - doc/dbus/ck-design.xml | 180 ++++++++++++ - doc/dbus/ck-introduction.xml | 28 ++ - doc/dbus/ck-terms.xml | 67 +++++ - doc/dbus/config.xsl | 6 + + configure.ac | 4 +- + doc/.gitignore | 2 - + doc/ConsoleKit.xml.in | 74 ----- + doc/Makefile.am | 41 +--- + doc/config.xsl | 6 - + doc/dbus-introspect-docs.dtd | 32 --- + doc/dbus/.gitignore | 6 + + doc/dbus/ConsoleKit.xml.in | 74 +++++ + doc/dbus/Makefile.am | 46 +++ + doc/dbus/ck-design.xml | 180 ++++++++++++ + doc/dbus/ck-introduction.xml | 28 ++ + doc/dbus/ck-terms.xml | 67 +++++ + doc/dbus/config.xsl | 6 + doc/dbus/dbus-introspect-docs.dtd | 32 +++ - doc/dbus/docbook.css | 78 ++++++ - doc/dbus/spec-to-docbook.xsl | 543 + doc/dbus/docbook.css | 78 ++++++ + doc/dbus/spec-to-docbook.xsl | 543 +++++++++++++++++++++++++++++++++++++ - doc/docbook.css | 78 ------ - doc/xml/Makefile.am | 20 -- - doc/xml/ck-design.xml | 180 ------------ - doc/xml/ck-introduction.xml | 28 -- - doc/xml/ck-terms.xml | 67 ----- - doc/xml/spec-to-docbook.xsl | 543 + doc/docbook.css | 78 ------ + doc/xml/Makefile.am | 20 -- + doc/xml/ck-design.xml | 180 ------------ + doc/xml/ck-introduction.xml | 28 -- + doc/xml/ck-terms.xml | 67 ----- + doc/xml/spec-to-docbook.xsl | 543 ------------------------------------- 22 files changed, 1063 insertions(+), 1072 deletions(-) commit 77fe8e2e89af7cd21357116e9668b23d958fb2a5 Author: William Jon McCann <jmccann@redhat.com> -Date: Thu Jul 24 00:32:21 2008 -0400 +Date: Thu Jul 24 00:32:21 2008 -0400 pull updated DTD and xsl from DeviceKit-disks @@ -481,17 +820,17 @@ Date: Thu Jul 24 00:32:21 2008 -0400 commit 3133a9ad1a1eb05ad6717d8ee8ede782b833ee67 Author: William Jon McCann <jmccann@redhat.com> -Date: Thu Jul 24 00:18:32 2008 -0400 +Date: Thu Jul 24 00:18:32 2008 -0400 fix distcheck - doc/Makefile.am | 1 + - doc/xml/Makefile.am | 2 +- + doc/Makefile.am | 1 + + doc/xml/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) commit aad5b87b7e2f993aef418822d52d8dca5345fce5 Author: William Jon McCann <jmccann@redhat.com> -Date: Thu Jul 24 00:06:57 2008 -0400 +Date: Thu Jul 24 00:06:57 2008 -0400 still having problems using xinclude @@ -501,29 +840,29 @@ Date: Thu Jul 24 00:06:57 2008 -0400 commit cda2111bd2a12fc246c6e7973ae7fae4ff779bca Author: William Jon McCann <jmccann@redhat.com> -Date: Wed Jul 23 23:42:17 2008 -0400 +Date: Wed Jul 23 23:42:17 2008 -0400 fix the includes - doc/ConsoleKit.xml.in | 23 +++++++---------------- - doc/dbus-introspect-docs.dtd | 32 ++++++++++++++++++++++++++++++++ - doc/xml/Makefile.am | 6 +++--- + doc/ConsoleKit.xml.in | 23 +++++++---------------- + doc/dbus-introspect-docs.dtd | 32 ++++++++++++++++++++++++++++++++ + doc/xml/Makefile.am | 6 +++--- doc/xml/dbus-introspect-docs.dtd | 32 -------------------------------- 4 files changed, 42 insertions(+), 51 deletions(-) commit 460d6c9e42e84d3d66bfcadfbaa77a0e059caae7 Author: William Jon McCann <jmccann@redhat.com> -Date: Wed Jul 23 23:31:48 2008 -0400 +Date: Wed Jul 23 23:31:48 2008 -0400 add missing bits - doc/Makefile.am | 2 ++ - doc/xml/Makefile.am | 23 +++++++++++++++++++++++ + doc/Makefile.am | 2 ++ + doc/xml/Makefile.am | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-) commit e54095996b9066120ebf20011eba199d25422c2f Author: William Jon McCann <jmccann@redhat.com> -Date: Wed Jul 23 23:22:36 2008 -0400 +Date: Wed Jul 23 23:22:36 2008 -0400 use spec files directly as introspection xml and try to generate docs on the fly @@ -533,29 +872,29 @@ Date: Wed Jul 23 23:22:36 2008 -0400 unknown tags. Apparently this is now fixed. Also install the xml to /usr/share/dbus-1/interfaces. - configure.ac | 6 + - doc/Makefile.am | 6 +- - doc/dbus-introspect-docs.dtd | 32 -- - doc/spec/ck-manager.xml | 343 ---------------------- - doc/spec/ck-seat.xml | 163 ----------- - doc/spec/ck-session.xml | 435 + configure.ac | 6 + + doc/Makefile.am | 6 +- + doc/dbus-introspect-docs.dtd | 32 -- + doc/spec/ck-manager.xml | 343 ---------------------- + doc/spec/ck-seat.xml | 163 ----------- + doc/spec/ck-session.xml | 435 --------------------------- - doc/tools/spec-strip-docs | 34 --- - doc/tools/spec-strip-docs.xsl | 36 --- - doc/tools/spec-to-docbook | 34 --- - doc/tools/spec-to-docbook.xsl | 436 + doc/tools/spec-strip-docs | 34 --- + doc/tools/spec-strip-docs.xsl | 36 --- + doc/tools/spec-to-docbook | 34 --- + doc/tools/spec-to-docbook.xsl | 436 ---------------------------- - doc/tools/update-from-spec | 25 -- - doc/xml/dbus-introspect-docs.dtd | 32 ++ - doc/xml/ref-ck-manager.xml | 199 ------------- - doc/xml/ref-ck-seat.xml | 87 ------ - doc/xml/ref-ck-session.xml | 258 ---------------- - doc/xml/spec-to-docbook.xsl | 436 + doc/tools/update-from-spec | 25 -- + doc/xml/dbus-introspect-docs.dtd | 32 ++ + doc/xml/ref-ck-manager.xml | 199 ------------- + doc/xml/ref-ck-seat.xml | 87 ------ + doc/xml/ref-ck-session.xml | 258 ---------------- + doc/xml/spec-to-docbook.xsl | 436 ++++++++++++++++++++++++++++ - src/Makefile.am | 23 +- - src/ck-manager.xml | 70 ----- - src/ck-seat.xml | 39 --- - src/ck-session.xml | 81 ----- + src/Makefile.am | 23 +- + src/ck-manager.xml | 70 ----- + src/ck-seat.xml | 39 --- + src/ck-session.xml | 81 ----- src/org.freedesktop.ConsoleKit.Manager.xml | 343 ++++++++++++++++++++++ src/org.freedesktop.ConsoleKit.Seat.xml | 163 +++++++++++ src/org.freedesktop.ConsoleKit.Session.xml | 435 @@ -564,7 +903,7 @@ Date: Wed Jul 23 23:22:36 2008 -0400 commit 34cefc96f7661ed92927bffa1cf7cbc79a84e5ab Author: William Jon McCann <jmccann@redhat.com> -Date: Tue Jul 22 18:28:06 2008 -0400 +Date: Tue Jul 22 18:28:06 2008 -0400 use object paths for seat added/removed signals per spec @@ -573,17 +912,17 @@ Date: Tue Jul 22 18:28:06 2008 -0400 commit 25546d381557f5da8dd8db54c857442193c5340b Author: William Jon McCann <jmccann@redhat.com> -Date: Tue Jul 22 17:23:59 2008 -0400 +Date: Tue Jul 22 17:23:59 2008 -0400 regenerate the docs and xml from the spec - doc/xml/ref-ck-session.xml | 6 +++++- - src/ck-session.xml | 3 +++ + doc/xml/ref-ck-session.xml | 6 +++++- + src/ck-session.xml | 3 +++ 2 files changed, 8 insertions(+), 1 deletions(-) commit f0dbc3ee0c8fb53f2b9eed000d72fb923a83a474 Author: William Jon McCann <jmccann@redhat.com> -Date: Tue Jul 22 14:30:22 2008 -0400 +Date: Tue Jul 22 14:30:22 2008 -0400 add GetLoginSessionId to exported interface @@ -592,7 +931,7 @@ Date: Tue Jul 22 14:30:22 2008 -0400 commit e1cfb5cb97eee87ce34ba5ce586bf1e90f485874 Author: William Jon McCann <jmccann@redhat.com> -Date: Tue Jul 22 14:29:54 2008 -0400 +Date: Tue Jul 22 14:29:54 2008 -0400 fix use of unix-user as int @@ -601,7 +940,7 @@ Date: Tue Jul 22 14:29:54 2008 -0400 commit f757f22786dfa0bf034c5c1d66d47ecafc871606 Author: William Jon McCann <jmccann@redhat.com> -Date: Mon Jul 21 16:48:21 2008 -0400 +Date: Mon Jul 21 16:48:21 2008 -0400 use fortify source flag when building from git @@ -610,7 +949,7 @@ Date: Mon Jul 21 16:48:21 2008 -0400 commit 34291722aa95394b7470099394b936dfc70022eb Author: William Jon McCann <jmccann@redhat.com> -Date: Mon Jul 21 14:28:09 2008 -0400 +Date: Mon Jul 21 14:28:09 2008 -0400 fix location of scripts again @@ -619,7 +958,7 @@ Date: Mon Jul 21 14:28:09 2008 -0400 commit fa2bad04422d8c34974121cae68069a9e2d2e841 Author: William Jon McCann <jmccann@redhat.com> -Date: Mon Jul 21 13:55:16 2008 -0400 +Date: Mon Jul 21 13:55:16 2008 -0400 dist bzip by default @@ -628,7 +967,7 @@ Date: Mon Jul 21 13:55:16 2008 -0400 commit 8e6002b4bcf441e6a650d0adacf4a1eafe34cd54 Author: William Jon McCann <jmccann@redhat.com> -Date: Mon Jul 21 13:50:55 2008 -0400 +Date: Mon Jul 21 13:50:55 2008 -0400 fix up signal definition @@ -637,20 +976,20 @@ Date: Mon Jul 21 13:50:55 2008 -0400 commit bab014f7f827c0d5306d029d08bf234b7a452282 Author: William Jon McCann <jmccann@redhat.com> -Date: Wed Jun 11 12:00:03 2008 -0400 +Date: Wed Jun 11 12:00:03 2008 -0400 fix UnixUser to be uint Pointed out by Lennart Poettering - doc/spec/ck-session.xml | 4 ++-- - doc/xml/ref-ck-session.xml | 8 ++++---- - src/ck-session.xml | 7 ++----- + doc/spec/ck-session.xml | 4 ++-- + doc/xml/ref-ck-session.xml | 8 ++++---- + src/ck-session.xml | 7 ++----- 3 files changed, 8 insertions(+), 11 deletions(-) commit 25663a88377d76f9e722635bec96627ed0db4e43 Author: William Jon McCann <jmccann@redhat.com> -Date: Wed Jun 11 11:46:59 2008 -0400 +Date: Wed Jun 11 11:46:59 2008 -0400 use object paths instead of strings for signals @@ -661,7 +1000,7 @@ Date: Wed Jun 11 11:46:59 2008 -0400 commit dfcab49480565a7bcf71752c5b39eb367df81a19 Author: William Jon McCann <jmccann@redhat.com> -Date: Mon May 5 15:12:39 2008 -0400 +Date: Mon May 5 15:12:39 2008 -0400 cleanly shutdown event logging thread @@ -671,32 +1010,32 @@ Date: Mon May 5 15:12:39 2008 -0400 commit 844de7d4b6d29d57a5425dcc7d0d3f6d4b005311 Author: William Jon McCann <jmccann@redhat.com> -Date: Mon May 5 14:20:25 2008 -0400 +Date: Mon May 5 14:20:25 2008 -0400 export login session id to the bus - data/ConsoleKit.conf | 2 ++ - src/ck-manager.c | 9 +++++++++ - src/ck-session.c | 2 +- - src/ck-session.h | 6 +++--- - src/ck-session.xml | 3 +++ + data/ConsoleKit.conf | 2 ++ + src/ck-manager.c | 9 +++++++++ + src/ck-session.c | 2 +- + src/ck-session.h | 6 +++--- + src/ck-session.xml | 3 +++ src/test-method-access-policy | 13 +++++++++++++ - tools/list-sessions.c | 9 +++++++-- + tools/list-sessions.c | 9 +++++++-- 7 files changed, 38 insertions(+), 6 deletions(-) commit 8ec523138671a8fe93748a0b75adaaca96e2392e Author: William Jon McCann <jmccann@redhat.com> -Date: Mon May 5 13:34:08 2008 -0400 +Date: Mon May 5 13:34:08 2008 -0400 exit with the bus now that we're activated by the bus - src/main.c | 65 + src/main.c | 65 +++++++---------------------------------------------------- 1 files changed, 8 insertions(+), 57 deletions(-) commit c7116a525f643dead46873a81cf7a03bf5c54d55 Author: David Zeuthen <davidz@redhat.com> -Date: Sun Apr 20 16:01:13 2008 -0400 +Date: Sun Apr 20 16:01:13 2008 -0400 allow retaining authorizations for {stop,restart}-multiple-users @@ -705,69 +1044,69 @@ Date: Sun Apr 20 16:01:13 2008 -0400 commit 5d62baaba55a1777b60284802d83d3e9befe60c9 Author: William Jon McCann <jmccann@redhat.com> -Date: Sat Apr 19 01:28:27 2008 -0400 +Date: Sat Apr 19 01:28:27 2008 -0400 make sure to add all override parameters - src/ck-session-leader.c | 30 + src/ck-session-leader.c | 30 ++++++++++++++++++++++-------- src/test-open-session-with-parameters | 2 +- 2 files changed, 23 insertions(+), 9 deletions(-) commit 5dbbfa91469135f59351cf3bffcf2d51b40f912f Author: William Jon McCann <jmccann@redhat.com> -Date: Sat Apr 19 01:05:42 2008 -0400 +Date: Sat Apr 19 01:05:42 2008 -0400 fix the script to work with recent dbus-python api changes - src/ck-job.c | 1 - + src/ck-job.c | 1 - src/test-open-session-with-parameters | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) commit fbb42449670f21cdeb7f0106fc617e276d7e229c Author: William Jon McCann <jmccann@redhat.com> -Date: Sat Apr 19 00:48:10 2008 -0400 +Date: Sat Apr 19 00:48:10 2008 -0400 always try to detect parameters for session Treat the parameters passed in via OpenSessionWithParameters as overrides. - src/ck-manager.c | 16 ++---- + src/ck-manager.c | 16 ++---- src/ck-session-leader.c | 120 +++++++++++++++++++++++++++++++++++++++++++++- src/ck-session-leader.h | 63 +++++++++++++------------ - src/ck-vt-monitor.c | 1 - + src/ck-vt-monitor.c | 1 - 4 files changed, 155 insertions(+), 45 deletions(-) commit e30bc7486fe4e872a7b91f1566bc2c880deb63b7 Author: William Jon McCann <jmccann@redhat.com> -Date: Fri Apr 18 16:19:35 2008 -0400 +Date: Fri Apr 18 16:19:35 2008 -0400 oops one more place - tools/solaris/Makefile.am | 2 +- + tools/solaris/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 3c8db75b2ffdba1627a7030a4b57ce7ee8e474f2 Author: William Jon McCann <jmccann@redhat.com> -Date: Fri Apr 18 16:11:59 2008 -0400 +Date: Fri Apr 18 16:11:59 2008 -0400 install scripts into $(prefix)/lib instead of $libdir We don't want scripts going into lib64... - src/Makefile.am | 2 +- - src/ck-manager.c | 4 ++-- - src/ck-session.c | 2 +- - tools/freebsd/Makefile.am | 2 +- - tools/linux/Makefile.am | 2 +- - tools/solaris/Makefile.am | 2 +- + src/Makefile.am | 2 +- + src/ck-manager.c | 4 ++-- + src/ck-session.c | 2 +- + tools/freebsd/Makefile.am | 2 +- + tools/linux/Makefile.am | 2 +- + tools/solaris/Makefile.am | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) commit f2bcc2a62015f6762eb426c25b7350ddf828bb0c Author: William Jon McCann <jmccann@redhat.com> -Date: Wed Apr 16 17:32:50 2008 -0400 +Date: Wed Apr 16 17:32:50 2008 -0400 return PolicyKit results when not privileged for action @@ -776,7 +1115,7 @@ Date: Wed Apr 16 17:32:50 2008 -0400 commit 933b89337028006b508e3ed964803753dea027c0 Author: William Jon McCann <jmccann@redhat.com> -Date: Wed Apr 16 17:30:15 2008 -0400 +Date: Wed Apr 16 17:30:15 2008 -0400 fix typo @@ -785,7 +1124,7 @@ Date: Wed Apr 16 17:30:15 2008 -0400 commit e633be1b9a81cfb7993e469066e50af47f563575 Author: William Jon McCann <jmccann@redhat.com> -Date: Thu Apr 3 22:09:26 2008 -0400 +Date: Thu Apr 3 22:09:26 2008 -0400 initial login session id support @@ -795,20 +1134,20 @@ Date: Thu Apr 3 22:09:26 2008 -0400 * add to event log * figure out how to add it to non-generated sessions - src/ck-session-leader.c | 1 + - src/ck-session.c | 48 ++++++++++++++++++++++++++++ - src/ck-session.h | 6 +++ - src/ck-sysdeps-freebsd.c | 9 +++++ - src/ck-sysdeps-linux.c | 66 + src/ck-session-leader.c | 1 + + src/ck-session.c | 48 ++++++++++++++++++++++++++++ + src/ck-session.h | 6 +++ + src/ck-sysdeps-freebsd.c | 9 +++++ + src/ck-sysdeps-linux.c | 66 +++++++++++++++++++++++++++++++++++++++ - src/ck-sysdeps-solaris.c | 9 +++++ - src/ck-sysdeps.h | 2 + + src/ck-sysdeps-solaris.c | 9 +++++ + src/ck-sysdeps.h | 2 + tools/ck-collect-session-info.c | 10 ++++++ 8 files changed, 151 insertions(+), 0 deletions(-) commit 4740245c6f6137175ef51be2207c35185f4d98f1 Author: William Jon McCann <jmccann@redhat.com> -Date: Fri Feb 29 15:25:54 2008 -0500 +Date: Fri Feb 29 15:25:54 2008 -0500 display uid as unix-user to match api @@ -817,7 +1156,7 @@ Date: Fri Feb 29 15:25:54 2008 -0500 commit 970fbb66cb86c2a8b0ecbccbf8107c85b72343ae Author: William Jon McCann <jmccann@redhat.com> -Date: Fri Feb 29 15:25:43 2008 -0500 +Date: Fri Feb 29 15:25:43 2008 -0500 fix packaging of policy file @@ -826,11 +1165,11 @@ Date: Fri Feb 29 15:25:43 2008 -0500 commit 72a2abee7a963bef52561766131e1b52a85409a3 Author: William Jon McCann <jmccann@redhat.com> -Date: Tue Feb 26 14:18:22 2008 -0500 +Date: Tue Feb 26 14:18:22 2008 -0500 rename policy file - data/ConsoleKit.policy | 48 + data/ConsoleKit.policy | 48 -------------------------------- data/org.freedesktop.consolekit.policy | 48 ++++++++++++++++++++++++++++++++ @@ -838,7 +1177,7 @@ Date: Tue Feb 26 14:18:22 2008 -0500 commit 1d7b97d3a393996ffb95d9c23b081b4cf6c54ed0 Author: William Jon McCann <jmccann@redhat.com> -Date: Mon Feb 25 19:43:04 2008 -0500 +Date: Mon Feb 25 19:43:04 2008 -0500 post release version bump @@ -847,7 +1186,7 @@ Date: Mon Feb 25 19:43:04 2008 -0500 commit c57bc09f5c1eaa216c8850ae64cc1735ce5c2bb1 Author: William Jon McCann <jmccann@redhat.com> -Date: Mon Feb 25 19:41:56 2008 -0500 +Date: Mon Feb 25 19:41:56 2008 -0500 update for release @@ -856,26 +1195,26 @@ Date: Mon Feb 25 19:41:56 2008 -0500 commit 9e78825cef3db4e13cffbfd024bda365403aa6ba Author: William Jon McCann <jmccann@redhat.com> -Date: Mon Feb 25 19:19:31 2008 -0500 +Date: Mon Feb 25 19:19:31 2008 -0500 always create the directories we need src/ck-event-logger.c | 22 ++++++++++++++-- src/ck-manager.c | 63 ++++++++++++++++++++++++++++++------------------ - src/main.c | 50 ++++++++++++++++++++++++++++---------- + src/main.c | 50 ++++++++++++++++++++++++++++---------- 3 files changed, 95 insertions(+), 40 deletions(-) commit 414f7cc1e62474da69058884c5b683dc20e3a8f6 Author: Simon Zheng <simon.zheng@sun.com> -Date: Mon Feb 25 17:14:11 2008 -0500 +Date: Mon Feb 25 17:14:11 2008 -0500 properly get display device on Solaris Mapping between device path and (major, minor). "/dev/vt" -- (15,*) "/dev/pts" -- (24,*) - "/dev/console" -- (0,0) + "/dev/console" -- (0,0) "NO_TTY_VALUE" - (-1,-1) Also, solaris VT device is named like this. @@ -889,7 +1228,7 @@ Date: Mon Feb 25 17:14:11 2008 -0500 commit 5315cd9e36f86f9d1ea1419c6521524a68801d4a Author: Brian Cameron <brian.cameron@sun.com> -Date: Mon Feb 25 16:37:03 2008 -0500 +Date: Mon Feb 25 16:37:03 2008 -0500 fix solaris x11-display-device when no vt available @@ -902,7 +1241,7 @@ Date: Mon Feb 25 16:37:03 2008 -0500 commit fc9abc6db6616b6960db070c98bad21f990a040e Author: Brian Cameron <Brian.Cameron@sun.com> -Date: Mon Feb 25 15:17:10 2008 -0500 +Date: Mon Feb 25 15:17:10 2008 -0500 solaris doesn't like printing null @@ -911,14 +1250,14 @@ Date: Mon Feb 25 15:17:10 2008 -0500 commit f993c1d8970e3aae7de7dea6e1ae5c6d325865b2 Author: Brian Cameron <Brian.Cameron@sun.com> -Date: Mon Feb 25 15:11:02 2008 -0500 +Date: Mon Feb 25 15:11:02 2008 -0500 fix display of active vt when vt is disabled This fixes the Active device so it is set to "/dev/console" when not using VT. Without this patch, the syslog reports messages like: - Active device: /dev/vt/3508388860 + Active device: /dev/vt/3508388860 Which is obviously wrong if not using VT at all. @@ -927,7 +1266,7 @@ Date: Mon Feb 25 15:11:02 2008 -0500 commit f39d3756e1d9da62de923ba470d3312b89bea6be Author: Brian Cameron <Brian.Cameron@sun.com> -Date: Mon Feb 25 15:05:44 2008 -0500 +Date: Mon Feb 25 15:05:44 2008 -0500 fix solaris vt handling to work when no vt available @@ -935,12 +1274,12 @@ Date: Mon Feb 25 15:05:44 2008 -0500 Simon Zhang sent you earlier so that it builds on machines without VT. - src/ck-vt-monitor.c | 8 +++++--- + src/ck-vt-monitor.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) commit f551717e1830e86a8ccf5312f79ce8882af9f352 Author: Simon Zheng <Simon.Zheng@sun.com> -Date: Tue Feb 19 11:34:15 2008 -0500 +Date: Tue Feb 19 11:34:15 2008 -0500 improve supporting Solaris VT switching @@ -959,23 +1298,23 @@ Date: Tue Feb 19 11:34:15 2008 -0500 - Change a little command line of getting maximum vt console numbers. src/ck-sysdeps-solaris.c | 2 +- - src/ck-vt-monitor.c | 59 + src/ck-vt-monitor.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 1 deletions(-) commit 94d4dd225c6d161411f33396aec23a33a6661da6 Author: William Jon McCann <jmccann@redhat.com> -Date: Tue Feb 19 11:04:51 2008 -0500 +Date: Tue Feb 19 11:04:51 2008 -0500 don't include paths.h on systems that don't have it - src/ck-event-logger.c | 1 - - tools/ck-launch-session.c | 5 +++++ + src/ck-event-logger.c | 1 - + tools/ck-launch-session.c | 5 +++++ 2 files changed, 5 insertions(+), 1 deletions(-) commit 190aed4effbfb9a982f46250c82994f58f4e5fb5 Author: William Jon McCann <jmccann@redhat.com> -Date: Wed Feb 13 11:37:20 2008 -0500 +Date: Wed Feb 13 11:37:20 2008 -0500 create the log file with S_IROTH and don't touch the log on build @@ -985,7 +1324,7 @@ Date: Wed Feb 13 11:37:20 2008 -0500 commit 6dda865f8fbe87a10a6047eb2db2c4fd1c94af17 Author: William Jon McCann <jmccann@redhat.com> -Date: Tue Feb 12 22:55:58 2008 -0500 +Date: Tue Feb 12 22:55:58 2008 -0500 post release version bump @@ -994,74 +1333,74 @@ Date: Tue Feb 12 22:55:58 2008 -0500 commit 72ce8d82848a6ee9634d9dd1610c5ba0074db4ae Author: William Jon McCann <jmccann@redhat.com> -Date: Tue Feb 12 22:54:24 2008 -0500 +Date: Tue Feb 12 22:54:24 2008 -0500 update for release - NEWS | 3 +++ - tools/Makefile.am | 2 +- + NEWS | 3 +++ + tools/Makefile.am | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) commit 5ab3eee820e97d632aa9401cbd2d25dc828ee1f0 Author: William Jon McCann <jmccann@redhat.com> -Date: Tue Feb 12 22:30:05 2008 -0500 +Date: Tue Feb 12 22:30:05 2008 -0500 ck_seat_get_active_session shouldn't return a null ssid Da bus no likey nulls for object paths. Return false and set error if there is no active session. - src/ck-manager.c | 31 +++++++++++-------------------- - src/ck-seat.c | 26 +++++++++++++++++++++++--- + src/ck-manager.c | 31 +++++++++++-------------------- + src/ck-seat.c | 26 +++++++++++++++++++++++--- src/test-method-access-policy | 2 +- 3 files changed, 35 insertions(+), 24 deletions(-) commit 885708f75f493b85fb67114d112e950b6bfac652 Author: William Jon McCann <jmccann@redhat.com> -Date: Tue Feb 12 15:32:15 2008 -0500 +Date: Tue Feb 12 15:32:15 2008 -0500 guard against writing null string to keyfile Also make criticals fatal when starting with --debug. - src/ck-seat.c | 6 +++++- + src/ck-seat.c | 6 +++++- src/ck-session.c | 47 ++++++++++++++++++++++++++++++++++++++--------- - src/main.c | 5 +++++ + src/main.c | 5 +++++ 3 files changed, 48 insertions(+), 10 deletions(-) commit 40dff5a03c7b085e34a7052efd23651d5be7674f Author: William Jon McCann <jmccann@redhat.com> -Date: Tue Feb 12 15:00:46 2008 -0500 +Date: Tue Feb 12 15:00:46 2008 -0500 reverse the sense of the dbus policy - Deny first and then allow. Add a simple test + Deny first and then allow. Add a simple test script to check method access policy. - NEWS | 7 + - data/ConsoleKit.conf | 94 ++++++-- + NEWS | 7 + + data/ConsoleKit.conf | 94 ++++++-- src/test-method-access-policy | 517 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 598 insertions(+), 20 deletions(-) commit 685f2cbf9d69da556907ba6c935fe6ab1d2eeda3 Author: William Jon McCann <jmccann@redhat.com> -Date: Mon Feb 11 15:31:42 2008 -0500 +Date: Mon Feb 11 15:31:42 2008 -0500 add a ck-launch-session tool This tool opens a session with ConsoleKit and runs a command in it. - Makefile.am | 2 +- - tools/.gitignore | 1 + - tools/Makefile.am | 11 ++++++ + Makefile.am | 2 +- + tools/.gitignore | 1 + + tools/Makefile.am | 11 ++++++ tools/ck-launch-session.c | 87 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 100 insertions(+), 1 deletions(-) commit e2fa0c66a6ef8dafa8b503d0b077deb17f3fc512 Author: William Jon McCann <jmccann@redhat.com> -Date: Mon Feb 11 14:51:21 2008 -0500 +Date: Mon Feb 11 14:51:21 2008 -0500 don't set the session-type to the command name @@ -1070,7 +1409,7 @@ Date: Mon Feb 11 14:51:21 2008 -0500 commit e0f13df14e4f7289c35ebb376eaf7e1ffb2a2317 Author: William Jon McCann <jmccann@redhat.com> -Date: Mon Feb 11 13:09:56 2008 -0500 +Date: Mon Feb 11 13:09:56 2008 -0500 post release version bump @@ -1079,24 +1418,24 @@ Date: Mon Feb 11 13:09:56 2008 -0500 commit bceedd666cd25abf0aa09807bdb17ddf87f503f9 Author: William Jon McCann <jmccann@redhat.com> -Date: Mon Feb 11 13:08:13 2008 -0500 +Date: Mon Feb 11 13:08:13 2008 -0500 update for release - NEWS | 11 +++++++++++ + NEWS | 11 +++++++++++ tools/.gitignore | 2 ++ 2 files changed, 13 insertions(+), 0 deletions(-) commit 3f178c6d15daed161fe3bd7f5d9019a592cc564a Author: William Jon McCann <jmccann@redhat.com> -Date: Mon Feb 11 12:33:16 2008 -0500 +Date: Mon Feb 11 12:33:16 2008 -0500 add tools to log restart and stop events This should probably be used by init instead of logging the event from CK. - tools/Makefile.am | 20 +++++ + tools/Makefile.am | 20 +++++ tools/ck-log-system-restart.c | 174 +++++++++++++++++++++++++++++++++++++++++ tools/ck-log-system-stop.c | 174 @@ -1105,17 +1444,17 @@ Date: Mon Feb 11 12:33:16 2008 -0500 commit 710a4f5404049762ea49644c74aadb59737be37d Author: William Jon McCann <jmccann@redhat.com> -Date: Mon Feb 11 11:11:45 2008 -0500 +Date: Mon Feb 11 11:11:45 2008 -0500 fix typo in dbus policy file - data/ConsoleKit.conf | 2 +- + data/ConsoleKit.conf | 2 +- src/test-open-session-with-parameters | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit e59d5e9a9974a14043c98c292936584cefa930d3 Author: William Jon McCann <jmccann@redhat.com> -Date: Thu Feb 7 19:29:34 2008 -0500 +Date: Thu Feb 7 19:29:34 2008 -0500 touch the history file to create it for people not using packages @@ -1124,7 +1463,7 @@ Date: Thu Feb 7 19:29:34 2008 -0500 commit a7a00ec7f7237bd0150ed98dba5e796236135e28 Author: William Jon McCann <jmccann@redhat.com> -Date: Wed Feb 6 17:04:14 2008 -0500 +Date: Wed Feb 6 17:04:14 2008 -0500 mkdir /var/log/ConsoleKit at install time @@ -1133,27 +1472,27 @@ Date: Wed Feb 6 17:04:14 2008 -0500 commit edd2422e91f80850c1adfcd3d6d6c723b7947ccf Author: William Jon McCann <jmccann@redhat.com> -Date: Tue Feb 5 11:12:33 2008 -0500 +Date: Tue Feb 5 11:12:33 2008 -0500 set a global flag so that D-Bus does not change the SIGPIPE handler in the PAM module - pam-ck-connector/pam-ck-connector.c | 9 +++++++-- + pam-ck-connector/pam-ck-connector.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) commit 076d63698c204427b210a2da76dc1b7e6640bbb9 Author: William Jon McCann <mccann@jhu.edu> -Date: Fri Feb 1 14:20:00 2008 -0500 +Date: Fri Feb 1 14:20:00 2008 -0500 when a parsing error occurs don't return an empty event - src/ck-log-event.c | 21 +++++++++++++-------- - tools/ck-history.c | 12 ++++++------ + src/ck-log-event.c | 21 +++++++++++++-------- + tools/ck-history.c | 12 ++++++------ 2 files changed, 19 insertions(+), 14 deletions(-) commit 185c0f5169dbcb55854491d9ab642c7b5c6418ca Author: William Jon McCann <mccann@jhu.edu> -Date: Wed Jan 30 20:12:47 2008 -0500 +Date: Wed Jan 30 20:12:47 2008 -0500 post release version bump @@ -1162,7 +1501,7 @@ Date: Wed Jan 30 20:12:47 2008 -0500 commit 53e2ffa946b09dc29d40d822a290e30fbe169888 Author: William Jon McCann <mccann@jhu.edu> -Date: Wed Jan 30 20:11:47 2008 -0500 +Date: Wed Jan 30 20:11:47 2008 -0500 update for 0.2.7 release @@ -1171,7 +1510,7 @@ Date: Wed Jan 30 20:11:47 2008 -0500 commit a034e3992b4c9c2d3723b14003483d4b39eab118 Author: William Jon McCann <mccann@jhu.edu> -Date: Tue Jan 29 16:16:35 2008 -0500 +Date: Tue Jan 29 16:16:35 2008 -0500 update gitignore files @@ -1182,70 +1521,70 @@ Date: Tue Jan 29 16:16:35 2008 -0500 commit c08f52a53901cda1082a010cb2d6b013f3ae50a4 Author: William Jon McCann <mccann@jhu.edu> -Date: Tue Jan 29 16:14:04 2008 -0500 +Date: Tue Jan 29 16:14:04 2008 -0500 add a helper to write a system start record to the CK history - src/ck-log-event.c | 2 +- - tools/Makefile.am | 13 +++ - tools/ck-log-system-start.c | 174 + src/ck-log-event.c | 2 +- + tools/Makefile.am | 13 +++ + tools/ck-log-system-start.c | 174 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 188 insertions(+), 1 deletions(-) commit 1a545ba0744532f2936899806523214d3a067769 Author: William Jon McCann <mccann@jhu.edu> -Date: Tue Jan 29 14:06:45 2008 -0500 +Date: Tue Jan 29 14:06:45 2008 -0500 add support for logging start/stop/restart Also enable reporting this information with ck-history. src/ck-log-event.c | 211 ++++++++++++++++++++++++- - src/ck-log-event.h | 19 ++- - src/ck-manager.c | 59 +++++++- + src/ck-log-event.h | 19 ++- + src/ck-manager.c | 59 +++++++- tools/ck-history.c | 444 ++++++++++++++++++++++++++++++++++------------------ 4 files changed, 564 insertions(+), 169 deletions(-) commit d8dcc8755a87a238ba37bc5275f142c92535915e Author: William Jon McCann <mccann@jhu.edu> -Date: Mon Jan 28 22:26:53 2008 -0500 +Date: Mon Jan 28 22:26:53 2008 -0500 fix typo in man page - pam-ck-connector/pam_ck_connector.8 | 2 +- + pam-ck-connector/pam_ck_connector.8 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit f38aba5d2a26b7c9ea0b7a5631281ed7cf678de4 Author: Marc-Andre Lureau <marcandre.lureau@gmail.com> -Date: Mon Jan 28 22:23:35 2008 -0500 +Date: Mon Jan 28 22:23:35 2008 -0500 make autogen work with aclocal 1.10 https://bugs.freedesktop.org/show_bug.cgi?id=14175 - autogen.sh | 179 + autogen.sh | 179 +++++-------------------------------------- - libck-connector/Makefile.am | 2 +- + libck-connector/Makefile.am | 2 +- 2 files changed, 19 insertions(+), 162 deletions(-) commit 48519104df6037f8653ec62497796ba781dc0040 Author: William Jon McCann <mccann@jhu.edu> -Date: Mon Jan 28 19:56:19 2008 -0500 +Date: Mon Jan 28 19:56:19 2008 -0500 allow session type filtering for all report formats - tools/ck-history.c | 31 ++++++++++++++++++++++--------- + tools/ck-history.c | 31 ++++++++++++++++++++++--------- 1 files changed, 22 insertions(+), 9 deletions(-) commit 5895396bc583ae08c5041f5b81f5f9d0a2888e22 Author: Brian Cameron <brian.cameron@sun.com> -Date: Mon Jan 28 17:43:05 2008 -0500 +Date: Mon Jan 28 17:43:05 2008 -0500 make polkit optional and use RBAC on Solaris This patch makes polkit an optional dependency. If present - it builds with it. If not, polkit support is disabled. + it builds with it. If not, polkit support is disabled. This patch also adds a --enable-rbac-shutdown=<key> option. If set, then ConsoleKit will allow shutdown/reboot if the @@ -1258,18 +1597,18 @@ Date: Mon Jan 28 17:43:05 2008 -0500 and tools/solaris/ck-system-stop scripts to call "/sbin/init 6" and "/sbin/init 5", which are the right commands for Solaris. - configure.ac | 30 ++++++++++++++++- - data/Makefile.am | 2 + - src/Makefile.am | 7 ++++ - src/ck-manager.c | 71 + configure.ac | 30 ++++++++++++++++- + data/Makefile.am | 2 + + src/Makefile.am | 7 ++++ + src/ck-manager.c | 71 ++++++++++++++++++++++++++++++++++++++- tools/solaris/ck-system-restart | 11 +----- - tools/solaris/ck-system-stop | 11 +----- + tools/solaris/ck-system-stop | 11 +----- 6 files changed, 110 insertions(+), 22 deletions(-) commit 96d613ee9a4850753e8f93113ab28ed3045f73f3 Author: Brian Cameron <brian.cameron@sun.com> -Date: Mon Jan 28 17:30:47 2008 -0500 +Date: Mon Jan 28 17:30:47 2008 -0500 fixes for solaris @@ -1281,23 +1620,23 @@ Date: Mon Jan 28 17:30:47 2008 -0500 function where we weren't parsing the data right and causing the hash to not get set properly. - src/ck-session.c | 3 ++- + src/ck-session.c | 3 ++- src/ck-sysdeps-solaris.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) commit 9aca4062ec226c8099b5d46467ad72792e9977dc Author: William Jon McCann <mccann@jhu.edu> -Date: Mon Jan 28 17:17:13 2008 -0500 +Date: Mon Jan 28 17:17:13 2008 -0500 add session-type filtering to ck-history - src/ck-seat.c | 2 ++ - tools/ck-history.c | 22 ++++++++++++++-------- + src/ck-seat.c | 2 ++ + tools/ck-history.c | 22 ++++++++++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) commit 6fe785aaddda2537aa4335e88c0606eda36b75ee Author: William Jon McCann <mccann@jhu.edu> -Date: Mon Jan 28 10:59:04 2008 -0500 +Date: Mon Jan 28 10:59:04 2008 -0500 try to activate x11-display-device not only display-device @@ -1306,7 +1645,7 @@ Date: Mon Jan 28 10:59:04 2008 -0500 commit af7dbbc29151ccfe063625159ea531fbbfc85a07 Author: William Jon McCann <mccann@jhu.edu> -Date: Thu Jan 24 09:38:26 2008 -0500 +Date: Thu Jan 24 09:38:26 2008 -0500 post release version bump @@ -1315,7 +1654,7 @@ Date: Thu Jan 24 09:38:26 2008 -0500 commit 2064706053eb73d88655c0e1bc8dd7d1e144034e Author: William Jon McCann <mccann@jhu.edu> -Date: Thu Jan 24 09:37:16 2008 -0500 +Date: Thu Jan 24 09:37:16 2008 -0500 update for 0.2.6 release @@ -1324,7 +1663,7 @@ Date: Thu Jan 24 09:37:16 2008 -0500 commit d3e1069434bfff5e0c6236cbdec20db2a7d68d2c Author: William Jon McCann <mccann@jhu.edu> -Date: Wed Jan 23 23:12:02 2008 -0500 +Date: Wed Jan 23 23:12:02 2008 -0500 be a little smarter about how we compute the number of users @@ -1334,7 +1673,7 @@ Date: Wed Jan 23 23:12:02 2008 -0500 commit 8dd0bb52b3cabf8673ecd3ede820b48ab6f6436f Author: William Jon McCann <mccann@jhu.edu> -Date: Wed Jan 23 21:59:48 2008 -0500 +Date: Wed Jan 23 21:59:48 2008 -0500 fix policy action name @@ -1343,7 +1682,7 @@ Date: Wed Jan 23 21:59:48 2008 -0500 commit 4833651f336ee8f1cb266cf0c61fe527d3d5f713 Author: William Jon McCann <mccann@jhu.edu> -Date: Wed Jan 23 16:26:22 2008 -0500 +Date: Wed Jan 23 16:26:22 2008 -0500 post release version bump @@ -1352,7 +1691,7 @@ Date: Wed Jan 23 16:26:22 2008 -0500 commit 40d21bbea73ae15afb4823d58cada8ab9399235f Author: William Jon McCann <mccann@jhu.edu> -Date: Wed Jan 23 16:25:23 2008 -0500 +Date: Wed Jan 23 16:25:23 2008 -0500 release 0.2.5 @@ -1361,7 +1700,7 @@ Date: Wed Jan 23 16:25:23 2008 -0500 commit 3c618213b2ada61496b49c4d8c5612df4f082d14 Author: William Jon McCann <mccann@jhu.edu> -Date: Wed Jan 23 16:07:15 2008 -0500 +Date: Wed Jan 23 16:07:15 2008 -0500 history should log to /var/log not /var/run @@ -1372,7 +1711,7 @@ Date: Wed Jan 23 16:07:15 2008 -0500 commit b1d56d43f357185594e5730d6bfb7e7db1f633c3 Author: William Jon McCann <mccann@jhu.edu> -Date: Wed Jan 23 15:06:02 2008 -0500 +Date: Wed Jan 23 15:06:02 2008 -0500 post release version bump @@ -1381,17 +1720,17 @@ Date: Wed Jan 23 15:06:02 2008 -0500 commit 8ec349dc86f617c8055c091fd5a9be80889d96f1 Author: William Jon McCann <mccann@jhu.edu> -Date: Wed Jan 23 14:30:48 2008 -0500 +Date: Wed Jan 23 14:30:48 2008 -0500 release 0.2.4 - NEWS | 36 ++++++++++++++++++++++++++++++++++++ + NEWS | 36 ++++++++++++++++++++++++++++++++++++ configure.ac | 2 ++ 2 files changed, 38 insertions(+), 0 deletions(-) commit 8148ef7a28e3f52f7bd91a0f85fd47ce0cb1d11f Author: William Jon McCann <mccann@jhu.edu> -Date: Wed Jan 23 13:16:30 2008 -0500 +Date: Wed Jan 23 13:16:30 2008 -0500 actually register the error type with dbus @@ -1400,20 +1739,20 @@ Date: Wed Jan 23 13:16:30 2008 -0500 commit 6ad7516f69f08c9c5e30332f95b50c0dd0cd1cb1 Author: William Jon McCann <mccann@jhu.edu> -Date: Wed Jan 23 11:04:23 2008 -0500 +Date: Wed Jan 23 11:04:23 2008 -0500 add GetSessions method to Manager interface - doc/spec/ck-manager.xml | 17 +++++++++++++++++ - doc/xml/ref-ck-manager.xml | 10 +++++++++- - src/ck-manager.c | 25 +++++++++++++++++++++++++ - src/ck-manager.h | 3 +++ - src/ck-manager.xml | 3 +++ + doc/spec/ck-manager.xml | 17 +++++++++++++++++ + doc/xml/ref-ck-manager.xml | 10 +++++++++- + src/ck-manager.c | 25 +++++++++++++++++++++++++ + src/ck-manager.h | 3 +++ + src/ck-manager.xml | 3 +++ 5 files changed, 57 insertions(+), 1 deletions(-) commit 4b866a4af70fb19e8b0652637815ab24ad630065 Author: William Jon McCann <mccann@jhu.edu> -Date: Wed Jan 23 09:37:55 2008 -0500 +Date: Wed Jan 23 09:37:55 2008 -0500 add error type to manager @@ -1423,7 +1762,7 @@ Date: Wed Jan 23 09:37:55 2008 -0500 commit 5ce97e6f22fd25279793fbc75211d2e86413ae73 Author: William Jon McCann <mccann@jhu.edu> -Date: Tue Jan 22 17:03:46 2008 -0500 +Date: Tue Jan 22 17:03:46 2008 -0500 initial stop/restart support @@ -1431,30 +1770,30 @@ Date: Tue Jan 22 17:03:46 2008 -0500 Manager object to System in the near future. Use libpolkit to determine authorization. - configure.ac | 2 + - data/ConsoleKit.policy | 48 +++ - data/Makefile.am | 4 + - doc/spec/ck-manager.xml | 18 + - doc/xml/ref-ck-manager.xml | 10 +- - src/ck-manager.c | 667 + configure.ac | 2 + + data/ConsoleKit.policy | 48 +++ + data/Makefile.am | 4 + + doc/spec/ck-manager.xml | 18 + + doc/xml/ref-ck-manager.xml | 10 +- + src/ck-manager.c | 667 +++++++++++++++++++++++++++++++++++---- - src/ck-manager.h | 10 +- - src/ck-manager.xml | 6 + - tools/Makefile.am | 10 + - tools/freebsd/Makefile.am | 38 +++ + src/ck-manager.h | 10 +- + src/ck-manager.xml | 6 + + tools/Makefile.am | 10 + + tools/freebsd/Makefile.am | 38 +++ tools/freebsd/ck-system-restart | 12 + - tools/freebsd/ck-system-stop | 18 + - tools/linux/Makefile.am | 38 ++- - tools/linux/ck-system-restart | 12 + - tools/linux/ck-system-stop | 12 + - tools/solaris/Makefile.am | 38 +++ + tools/freebsd/ck-system-stop | 18 + + tools/linux/Makefile.am | 38 ++- + tools/linux/ck-system-restart | 12 + + tools/linux/ck-system-stop | 12 + + tools/solaris/Makefile.am | 38 +++ tools/solaris/ck-system-restart | 12 + - tools/solaris/ck-system-stop | 12 + + tools/solaris/ck-system-stop | 12 + 18 files changed, 890 insertions(+), 77 deletions(-) commit 2fba24e67597bf59ae00db2867df7a348c81b094 Author: Peter Jones <pjones@redhat.com> -Date: Sat Dec 8 23:04:03 2007 -0500 +Date: Sat Dec 8 23:04:03 2007 -0500 use VT_GETSTATE and tty0 to identify a console_ioctl on linux @@ -1479,7 +1818,7 @@ Date: Sat Dec 8 23:04:03 2007 -0500 commit 751b95f2aa2eb2cea7fe9e0dec0848865d118ad0 Author: Michael Biebl <mbiebl@gmail.com> -Date: Sat Dec 8 22:50:17 2007 -0500 +Date: Sat Dec 8 22:50:17 2007 -0500 remove obsolete sysv init script @@ -1488,14 +1827,14 @@ Date: Sat Dec 8 22:50:17 2007 -0500 distros will not use this init script anyways as they have special policies for their init script and provide their own. - data/ConsoleKit.in | 70 + data/ConsoleKit.in | 70 ---------------------------------------------------- - data/Makefile.am | 15 +---------- + data/Makefile.am | 15 +---------- 2 files changed, 1 insertions(+), 84 deletions(-) commit eb610a07a17db29138df50cafa4cf131a645332e Author: Michael Biebl <mbiebl@gmail.com> -Date: Sat Dec 8 22:45:42 2007 -0500 +Date: Sat Dec 8 22:45:42 2007 -0500 start CK service on-demand using D-Bus system activation @@ -1504,39 +1843,39 @@ Date: Sat Dec 8 22:45:42 2007 -0500 init script obsolete. Requirements are dbus >= 1.1.2 - data/Makefile.am | 9 ++++++++- - data/org.freedesktop.ConsoleKit.service.in | 4 ++++ + data/Makefile.am | 9 ++++++++- + data/org.freedesktop.ConsoleKit.service.in | 4 ++++ 2 files changed, 12 insertions(+), 1 deletions(-) commit 7d167e65868cb2aa40273ee8ccd33cca5968438b Author: William Jon McCann <mccann@jhu.edu> -Date: Mon Oct 22 21:23:08 2007 -0400 +Date: Mon Oct 22 21:23:08 2007 -0400 dump session leader info - src/ck-manager.c | 9 +++++++++ + src/ck-manager.c | 9 +++++++++ src/ck-session-leader.c | 15 ++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) commit 7b65ac249a1e28c9af25eb91919d898c3e0f8162 Author: William Jon McCann <mccann@jhu.edu> -Date: Mon Oct 22 21:00:16 2007 -0400 +Date: Mon Oct 22 21:00:16 2007 -0400 error out if unknown options are passed on command line - src/main.c | 11 +++++++++-- + src/main.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) commit 5db2f7fdc2d1c5a45bc33d916d82c23178568923 Author: William Jon McCann <mccann@jhu.edu> -Date: Mon Oct 22 20:54:10 2007 -0400 +Date: Mon Oct 22 20:54:10 2007 -0400 move session leader stuff into a separate class This will make it easier to dump/restore. - src/Makefile.am | 2 + - src/ck-manager.c | 482 +++++++++-------------------------------- + src/Makefile.am | 2 + + src/ck-manager.c | 482 +++++++++-------------------------------- src/ck-session-leader.c | 558 +++++++++++++++++++++++++++++++++++++++++++++++ src/ck-session-leader.h | 97 ++++++++ @@ -1544,7 +1883,7 @@ Date: Mon Oct 22 20:54:10 2007 -0400 commit 252f542201036d36aa01ade9bd381624391cfb34 Author: William Jon McCann <mccann@jhu.edu> -Date: Mon Oct 22 16:57:47 2007 -0400 +Date: Mon Oct 22 16:57:47 2007 -0400 try to handle log rotation @@ -1554,11 +1893,11 @@ Date: Mon Oct 22 16:57:47 2007 -0400 commit 4c842f1e108a0e9a412ac599cc4cfc954d801e62 Author: William Jon McCann <mccann@jhu.edu> -Date: Mon Oct 22 16:14:07 2007 -0400 +Date: Mon Oct 22 16:14:07 2007 -0400 add support for reporting from logrotated files - configure.ac | 30 +++++++++-- + configure.ac | 30 +++++++++-- src/ck-event-logger.c | 9 +++- tools/Makefile.am | 6 ++- tools/ck-history.c | 128 @@ -1567,7 +1906,7 @@ Date: Mon Oct 22 16:14:07 2007 -0400 commit 7e30b7d07d2f6216b6a8d2f75f3494d3947f0584 Author: William Jon McCann <mccann@jhu.edu> -Date: Mon Oct 22 11:34:02 2007 -0400 +Date: Mon Oct 22 11:34:02 2007 -0400 add a basic --frequent report @@ -1578,24 +1917,24 @@ Date: Mon Oct 22 11:34:02 2007 -0400 commit 73f5875de6c8d2e3f79fcb2c5d570836f6df74d5 Merge: e419ced 7b834cb Author: William Jon McCann <mccann@jhu.edu> -Date: Sun Oct 21 23:59:55 2007 -0400 +Date: Sun Oct 21 23:59:55 2007 -0400 Merge branch 'master' of git+ssh://git.freedesktop.org/git/ConsoleKit commit e419ced301a9e0d5f98c8cee030fe50158a2d291 Author: William Jon McCann <mccann@jhu.edu> -Date: Sun Oct 21 23:59:32 2007 -0400 +Date: Sun Oct 21 23:59:32 2007 -0400 add last mode, filtering by user/seat; shorten logged ids - src/ck-manager.c | 34 +++++++--- + src/ck-manager.c | 34 +++++++--- tools/ck-history.c | 177 ++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 190 insertions(+), 21 deletions(-) commit 7b834cbcc29a2a8423569a738cef3bce3c9f10bd Author: William Jon McCann <mccannwj@acsnb1.pha.jhu.edu> -Date: Sat Oct 20 19:17:52 2007 -0400 +Date: Sat Oct 20 19:17:52 2007 -0400 add bugzilla url @@ -1604,34 +1943,34 @@ Date: Sat Oct 20 19:17:52 2007 -0400 commit 7880c2eacaa45196b83a9032371f487f6fe312e4 Author: William Jon McCann <mccann@jhu.edu> -Date: Fri Oct 19 16:46:43 2007 -0400 +Date: Fri Oct 19 16:46:43 2007 -0400 check for oldest being null - tools/ck-history.c | 6 ++++-- + tools/ck-history.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) commit 2ef61beadf1b4c938bb13bb3b460f69bcc720193 Author: William Jon McCann <mccann@jhu.edu> -Date: Fri Oct 19 16:30:52 2007 -0400 +Date: Fri Oct 19 16:30:52 2007 -0400 rename --last to --last-compat - tools/ck-history.c | 6 +++--- + tools/ck-history.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit 92c036e50f2d0989651c43e2db78110a2a2fd5b0 Author: William Jon McCann <mccann@jhu.edu> -Date: Fri Oct 19 16:28:24 2007 -0400 +Date: Fri Oct 19 16:28:24 2007 -0400 a few fixes for last patch - tools/ck-history.c | 29 +++++++++++++++++++++++++---- + tools/ck-history.c | 29 +++++++++++++++++++++++++---- 1 files changed, 25 insertions(+), 4 deletions(-) commit 489396ba206bb1e3b82bb504151b0a83d405b33d Author: William Jon McCann <mccann@jhu.edu> -Date: Fri Oct 19 16:16:18 2007 -0400 +Date: Fri Oct 19 16:16:18 2007 -0400 add a last compatible outout format to ck-history @@ -1641,39 +1980,39 @@ Date: Fri Oct 19 16:16:18 2007 -0400 commit 36419b9ca34a89721746950eb78bb78c4bfb6206 Author: William Jon McCann <mccann@jhu.edu> -Date: Thu Oct 18 16:43:00 2007 -0400 +Date: Thu Oct 18 16:43:00 2007 -0400 use AC_GNU_SOURCE instead of #define - configure.ac | 3 +++ + configure.ac | 3 +++ src/ck-event-logger.c | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) commit 1773b5f77b9c575ab8fc3e3d692e8a7056fe2959 Author: William Jon McCann <mccann@jhu.edu> -Date: Wed Oct 17 17:09:03 2007 -0400 +Date: Wed Oct 17 17:09:03 2007 -0400 add a basic ck-history command - Refactor some event logging code to share with ck-history. At the + Refactor some event logging code to share with ck-history. At the moment the command only prints the events. - src/Makefile.am | 10 +- - src/ck-event-logger.c | 486 +--------------------- - src/ck-event-logger.h | 99 +----- - src/ck-log-event.c | 1084 + src/Makefile.am | 10 +- + src/ck-event-logger.c | 486 +--------------------- + src/ck-event-logger.h | 99 +----- + src/ck-log-event.c | 1084 +++++++++++++++++++++++++++++++++++++++++++++++ - src/ck-log-event.h | 131 ++++++ - src/ck-manager.c | 42 +- + src/ck-log-event.h | 131 ++++++ + src/ck-manager.c | 42 +- src/test-event-logger.c | 10 +- - tools/Makefile.am | 10 + - tools/ck-history.c | 157 +++++++ - tools/list-sessions.c | 58 ++-- + tools/Makefile.am | 10 + + tools/ck-history.c | 157 +++++++ + tools/list-sessions.c | 58 ++-- 10 files changed, 1458 insertions(+), 629 deletions(-) commit 0011a7aa94a9dbb00a322a1c08d5ac6a6dfdc21c Author: William Jon McCann <mccann@jhu.edu> -Date: Tue Oct 16 16:40:44 2007 -0400 +Date: Tue Oct 16 16:40:44 2007 -0400 add event logging capability @@ -1683,17 +2022,17 @@ Date: Tue Oct 16 16:40:44 2007 -0400 for creating graphical logins that remember the most recent/frequent logins. - src/Makefile.am | 13 + - src/ck-event-logger.c | 828 + src/Makefile.am | 13 + + src/ck-event-logger.c | 828 +++++++++++++++++++++++++++++++++++++++++++++++ - src/ck-event-logger.h | 161 +++++++++ - src/ck-manager.c | 340 +++++++++++++++++++- + src/ck-event-logger.h | 161 +++++++++ + src/ck-manager.c | 340 +++++++++++++++++++- src/test-event-logger.c | 94 ++++++ 5 files changed, 1430 insertions(+), 6 deletions(-) commit a0a1ff87b1f4c93c147d5222a164138cb83ba149 Author: William Jon McCann <mccann@jhu.edu> -Date: Thu Oct 11 15:06:14 2007 -0400 +Date: Thu Oct 11 15:06:14 2007 -0400 remove emacs modeline @@ -1702,7 +2041,7 @@ Date: Thu Oct 11 15:06:14 2007 -0400 commit b2be103bd606291319dc312f07d1f3fcbfdf634c Author: David Zeuthen <davidz@redhat.com> -Date: Wed Oct 10 13:39:15 2007 -0400 +Date: Wed Oct 10 13:39:15 2007 -0400 maintain a file with the dump of the local database @@ -1715,15 +2054,15 @@ Date: Wed Oct 10 13:39:15 2007 -0400 src/Makefile.am | 2 + src/ck-manager.c | 204 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- - src/ck-seat.c | 86 ++++++++++++++++++++++- - src/ck-seat.h | 4 + + src/ck-seat.c | 86 ++++++++++++++++++++++- + src/ck-seat.h | 4 + src/ck-session.c | 38 ++++++++++ src/ck-session.h | 3 + 6 files changed, 330 insertions(+), 7 deletions(-) commit bd43c78b3ab2ec7f85b17cca46d4b46f8671cd29 Author: William Jon McCann <mccann@jhu.edu> -Date: Wed Oct 10 12:53:45 2007 -0400 +Date: Wed Oct 10 12:53:45 2007 -0400 remove session/seat from list before signaling @@ -1733,12 +2072,12 @@ Date: Wed Oct 10 12:53:45 2007 -0400 src/ck-manager.c | 57 ++++++++++++++++++++++++++++++++++++++++++----------- - src/ck-seat.c | 28 +++++++++++++++++++------ + src/ck-seat.c | 28 +++++++++++++++++++------ 2 files changed, 66 insertions(+), 19 deletions(-) commit a90ecd3544f03c16f6c5a97aafb1c0b33b58101c Author: David Zeuthen <davidz@redhat.com> -Date: Thu Oct 4 20:39:09 2007 -0400 +Date: Thu Oct 4 20:39:09 2007 -0400 add a way to synchronously run programs on session add/remove/activity_change @@ -1779,9 +2118,9 @@ Date: Thu Oct 4 20:39:09 2007 -0400 CK_SESSION_TYPE CK_SESSION_SEAT_ID CK_SESSION_USER_UID - CK_SESSION_DISPLAY_DEVICE [*] + CK_SESSION_DISPLAY_DEVICE [*] CK_SESSION_X11_DISPLAY_DEVICE [*] - CK_SESSION_X11_DISPLAY [*] + CK_SESSION_X11_DISPLAY [*] CK_SESSION_REMOTE_HOST_NAME [*] CK_SESSION_IS_ACTIVE CK_SESSION_IS_LOCAL @@ -1790,9 +2129,9 @@ Date: Thu Oct 4 20:39:09 2007 -0400 program is passed exactly one parameter that can assume one of the following values: - - session_active_changed: is_active changed - - session_added: the session was added - - session_removed: the session was removed + - session_active_changed: is_active changed + - session_added: the session was added + - session_removed: the session was removed As a safety hatch, there is a timeout of 15 seconds for each program; if it hasn't exited within 15 seconds, the daemon will send it a @@ -1804,13 +2143,13 @@ Date: Thu Oct 4 20:39:09 2007 -0400 src/ck-run-programs.c | 230 +++++++++++++++++++++++++++++++++++++++++++++++++ src/ck-run-programs.h | 38 ++++++++ - src/ck-seat.c | 5 + + src/ck-seat.c | 5 + src/ck-session.c | 39 ++++++++ 5 files changed, 318 insertions(+), 0 deletions(-) commit ad9dbd345dbec43ffc24481a0d21c261e49347fb Author: Brian Cameron <brian.camerson@sun.com> -Date: Wed Sep 19 21:19:31 2007 -0400 +Date: Wed Sep 19 21:19:31 2007 -0400 don't use VT_GETSTATE when VT is unavailable @@ -1819,17 +2158,17 @@ Date: Wed Sep 19 21:19:31 2007 -0400 commit 03c9196f59c849515f650e2eb1a190a10908a8ee Author: William Jon McCann <mccann@jhu.edu> -Date: Wed Sep 19 11:13:31 2007 -0400 +Date: Wed Sep 19 11:13:31 2007 -0400 try to make things work for systems that don't support VT_ACTIVATE etc - configure.ac | 2 ++ + configure.ac | 2 ++ src/ck-sysdeps-unix.c | 27 +++++++++++++++++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) commit 54582a7287f036bd6b65434e4b4888405972130d Author: William Jon McCann <mccann@jhu.edu> -Date: Wed Sep 19 10:03:22 2007 -0400 +Date: Wed Sep 19 10:03:22 2007 -0400 add wiki to readme @@ -1838,7 +2177,7 @@ Date: Wed Sep 19 10:03:22 2007 -0400 commit 024fe2c942e1b3e5ddec8e829242017c9842393e Author: William Jon McCann <mccann@jhu.edu> -Date: Tue Sep 18 11:12:54 2007 -0400 +Date: Tue Sep 18 11:12:54 2007 -0400 post release version bump @@ -1847,7 +2186,7 @@ Date: Tue Sep 18 11:12:54 2007 -0400 commit eacf90d95c91db99c5946f00c95484fb66ec1b2a Author: William Jon McCann <mccann@jhu.edu> -Date: Tue Sep 18 11:11:38 2007 -0400 +Date: Tue Sep 18 11:11:38 2007 -0400 update for brown bag release @@ -1856,16 +2195,16 @@ Date: Tue Sep 18 11:11:38 2007 -0400 commit f35dee9696d81630216e283bcd91ca491febe153 Author: William Jon McCann <mccann@jhu.edu> -Date: Tue Sep 18 01:09:04 2007 -0400 +Date: Tue Sep 18 01:09:04 2007 -0400 use unix-user instead of user - pam-ck-connector/pam-ck-connector.c | 2 +- + pam-ck-connector/pam-ck-connector.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 6b8dc7403c105dc12dbe93616321850b8f160a8e Author: William Jon McCann <mccann@jhu.edu> -Date: Mon Sep 17 18:27:54 2007 -0400 +Date: Mon Sep 17 18:27:54 2007 -0400 post release version bump @@ -1874,7 +2213,7 @@ Date: Mon Sep 17 18:27:54 2007 -0400 commit e9c5548af759cb9968acb11e1b09dfc34fe13781 Author: William Jon McCann <mccann@jhu.edu> -Date: Mon Sep 17 18:24:11 2007 -0400 +Date: Mon Sep 17 18:24:11 2007 -0400 update NEWS for release @@ -1883,7 +2222,7 @@ Date: Mon Sep 17 18:24:11 2007 -0400 commit 3708b8b25a8e48b627920eb0876203cac81eb36e Author: William Jon McCann <mccann@jhu.edu> -Date: Wed Aug 29 15:56:06 2007 -0400 +Date: Wed Aug 29 15:56:06 2007 -0400 remove policy for gdm user @@ -1892,7 +2231,7 @@ Date: Wed Aug 29 15:56:06 2007 -0400 commit 1c9456a82126f56f4bebca0e7b6671ca844db322 Author: Joe Marcus Clarke <marcus@FreeBSD.org> -Date: Wed Aug 29 10:10:17 2007 -0400 +Date: Wed Aug 29 10:10:17 2007 -0400 fix FreeBSD issues translating VT numbers to devices @@ -1908,20 +2247,20 @@ Date: Wed Aug 29 10:10:17 2007 -0400 commit b508cf9b49ecd1f4810f69e785ebf40a2e5d5677 Author: William Jon McCann <mccann@jhu.edu> -Date: Tue Aug 28 13:20:35 2007 -0400 +Date: Tue Aug 28 13:20:35 2007 -0400 untabify src/ck-file-monitor-inotify.c | 2 +- - src/ck-manager.c | 16 ++++++++-------- - src/ck-session.c | 8 ++++---- - src/ck-sysdeps-unix.c | 6 +++--- - src/main.c | 12 ++++++------ + src/ck-manager.c | 16 ++++++++-------- + src/ck-session.c | 8 ++++---- + src/ck-sysdeps-unix.c | 6 +++--- + src/main.c | 12 ++++++------ 5 files changed, 22 insertions(+), 22 deletions(-) commit 1523b599eeba119c1258e887b7df9b018ce10351 Author: William Jon McCann <mccann@jhu.edu> -Date: Tue Aug 28 11:48:11 2007 -0400 +Date: Tue Aug 28 11:48:11 2007 -0400 fix some compiler warnings, untabify @@ -1934,23 +2273,23 @@ Date: Tue Aug 28 11:48:11 2007 -0400 commit 5e0f4848e5bfd325840d405582bdedf3a27b98f8 Author: William Jon McCann <mccann@jhu.edu> -Date: Mon Aug 27 16:34:45 2007 -0400 +Date: Mon Aug 27 16:34:45 2007 -0400 move some of the freebsd specific stuff into sysdeps - src/ck-sysdeps-freebsd.c | 37 ++++++++++++++++ - src/ck-sysdeps-linux.c | 49 ++++++++++++++++++++++ - src/ck-sysdeps-solaris.c | 48 +++++++++++++++++++++ - src/ck-sysdeps-unix.c | 69 +++++++++++++++++++++++++++++++ - src/ck-sysdeps.h | 6 +++ - src/ck-vt-monitor.c | 96 + src/ck-sysdeps-freebsd.c | 37 ++++++++++++++++ + src/ck-sysdeps-linux.c | 49 ++++++++++++++++++++++ + src/ck-sysdeps-solaris.c | 48 +++++++++++++++++++++ + src/ck-sysdeps-unix.c | 69 +++++++++++++++++++++++++++++++ + src/ck-sysdeps.h | 6 +++ + src/ck-vt-monitor.c | 96 ++++++++---------------------------------- - src/test-tty-idle-monitor.c | 14 +------ + src/test-tty-idle-monitor.c | 14 +------ 7 files changed, 229 insertions(+), 90 deletions(-) commit 54b545beb4b7e65f852f03dd5da025d5eae7ef8f Author: Florent Thoumie <flz@FreeBSD.org> -Date: Mon Aug 27 14:31:53 2007 +0100 +Date: Mon Aug 27 14:31:53 2007 +0100 Don't create rc.d/init.d directory on FreeBSD. @@ -1964,7 +2303,7 @@ Date: Mon Aug 27 14:31:53 2007 +0100 commit d6fa350994ac2c56644332fd5931a4a56d2f32d9 Author: Florent Thoumie <flz@FreeBSD.org> -Date: Sun Aug 26 13:25:23 2007 +0100 +Date: Sun Aug 26 13:25:23 2007 +0100 Disconnect init.d script on FreeBSD. @@ -1978,7 +2317,7 @@ Date: Sun Aug 26 13:25:23 2007 +0100 commit a0a4451df57693a7cd4f69befd4cf17239013161 Author: Joe Marcus Clarke <marcus@shumai.marcuscom.com> -Date: Sat Aug 25 20:23:36 2007 -0400 +Date: Sat Aug 25 20:23:36 2007 -0400 Add support for FreeBSD @@ -1986,12 +2325,12 @@ Date: Sat Aug 25 20:23:36 2007 -0400 Signed-off-by: Florent Thoumie <flz@FreeBSD.org> - src/test-tty-idle-monitor.c | 4 ++++ + src/test-tty-idle-monitor.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) commit d643acbb50eb2cccc50df8b27bd2c08bdc405622 Author: Joe Marcus Clarke <marcus@shumai.marcuscom.com> -Date: Sat Aug 25 20:10:37 2007 -0400 +Date: Sat Aug 25 20:10:37 2007 -0400 Add ck-sysdeps-freebsd.c to the list of dist sources @@ -2005,7 +2344,7 @@ Date: Sat Aug 25 20:10:37 2007 -0400 commit a2426fc2791a896c79d5eb14c2b518df7aca3dcf Author: Florent Thoumie <flz@FreeBSD.org> -Date: Sat Aug 25 21:05:32 2007 +0100 +Date: Sat Aug 25 21:05:32 2007 +0100 Restore copyright. @@ -2,15 +2,15 @@ Installation Instructions ************************* Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008 Free Software Foundation, Inc. +2006, 2007 Free Software Foundation, Inc. - This file is free documentation; the Free Software Foundation gives +This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. Basic Installation ================== - Briefly, the shell commands `./configure; make; make install' should +Briefly, the shell commands `./configure; make; make install' should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for instructions specific to this package. @@ -73,9 +73,9 @@ The simplest way to compile this package is: Compilers and Options ===================== - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. +Some systems require unusual options for compilation or linking that the +`configure' script does not know about. Run `./configure --help' for +details on some of the pertinent environment variables. You can give `configure' initial values for configuration parameters by setting variables in the command line or in the environment. Here @@ -88,7 +88,7 @@ is an example: Compiling For Multiple Architectures ==================================== - You can compile the package for more than one kind of computer at the +You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run @@ -100,24 +100,10 @@ architecture at a time in the source code directory. After you have installed the package for one architecture, use `make distclean' before reconfiguring for another architecture. - On MacOS X 10.5 and later systems, you can create libraries and -executables that work on multiple system types--known as "fat" or -"universal" binaries--by specifying multiple `-arch' options to the -compiler but only a single `-arch' option to the preprocessor. Like -this: - - ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CPP="gcc -E" CXXCPP="g++ -E" - - This is not guaranteed to produce working output in all cases, you -may have to build one architecture at a time and combine the results -using the `lipo' tool if you have problems. - Installation Names ================== - By default, `make install' installs the package's commands under +By default, `make install' installs the package's commands under `/usr/local/bin', include files under `/usr/local/include', etc. You can specify an installation prefix other than `/usr/local' by giving `configure' the option `--prefix=PREFIX'. @@ -140,7 +126,7 @@ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. Optional Features ================= - Some packages pay attention to `--enable-FEATURE' options to +Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE is something like `gnu-as' or `x' (for the X Window System). The @@ -152,36 +138,14 @@ find the X include and library files automatically, but if it doesn't, you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. -Particular systems -================== - - On HP-UX, the default C compiler is not ANSI C compatible. If GNU -CC is not installed, it is recommended to use the following options in -order to use an ANSI C compiler: - - ./configure CC="cc -Ae" - -and if that doesn't work, install pre-built binaries of GCC for HP-UX. - - On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its `<wchar.h>' header file. The option `-nodtk' can be used as -a workaround. If GNU CC is not installed, it is therefore recommended -to try - - ./configure CC="cc" - -and if that doesn't work, try - - ./configure CC="cc -nodtk" - Specifying the System Type ========================== - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the +There may be some features `configure' cannot figure out automatically, +but needs to determine by the type of machine the package will run on. +Usually, assuming the package is built to be run on the _same_ +architectures, `configure' can figure that out, but if it prints a +message saying it cannot guess the machine type, give it the `--build=TYPE' option. TYPE can either be a short name for the system type, such as `sun4', or a canonical name which has the form: @@ -207,9 +171,9 @@ eventually be run) with `--host=TYPE'. Sharing Defaults ================ - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. +If you want to set default values for `configure' scripts to share, you +can create a site shell script called `config.site' that gives default +values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the `CONFIG_SITE' environment variable to the location of the site script. @@ -218,7 +182,7 @@ A warning: not all `configure' scripts look for a site script. Defining Variables ================== - Variables not defined in a site shell script can be set in the +Variables not defined in a site shell script can be set in the environment passed to `configure'. However, some packages may run configure again during the build, and the customized values of these variables may be lost. In order to avoid this problem, you should set @@ -237,19 +201,11 @@ an Autoconf bug. Until the bug is fixed you can use this workaround: `configure' Invocation ====================== - `configure' recognizes the following options to control how it -operates. +`configure' recognizes the following options to control how it operates. `--help' `-h' - Print a summary of all of the options to `configure', and exit. - -`--help=short' -`--help=recursive' - Print a summary of the options unique to this package's - `configure', and exit. The `short' variant lists options used - only in the top level, while the `recursive' variant lists options - also present in any nested packages. + Print a summary of the options to `configure', and exit. `--version' `-V' @@ -276,16 +232,6 @@ operates. Look for the package's source code in directory DIR. Usually `configure' can determine that directory automatically. -`--prefix=DIR' - Use DIR as the installation prefix. *Note Installation Names:: - for more details, including other options available for fine-tuning - the installation locations. - -`--no-create' -`-n' - Run the configure checks, but stop before creating any output - files. - `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. diff --git a/Makefile.in b/Makefile.in index cde2004..996171d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -334,7 +334,7 @@ clean-libtool: -rm -rf .libs _libs distclean-libtool: - -rm -f libtool config.lt + -rm -f libtool # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -411,7 +411,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -1,4 +1,34 @@ ============== +Version 0.4.1 +============== + + * Fix a crasher (William Jon McCann) + * fix a small memory leak (Matthias Clasen) + * update email address (William Jon McCann) + +============== +Version 0.4.0 +============== + + * Starting with this release we will not do session.d/ 'session_active_changed' callouts anymore. (Lennart Poettering) + + * get rid of session.d's session_active_changed callout (Lennart Poettering) + * close file descriptors before exit func (Halton Huo) + * log the kernel release and boot arguments at start time (William Jon McCann) + * show display in host field if the host isn't set (William Jon McCann) + * print the uptime for the reboot items in the report (William Jon McCann) + * fix logic for finding session remove events (William Jon McCann) + * fix a few small leaks (William Jon McCann) + * Add seat.d/ callout directory and guarantee we dump the database before call + * database: write the console database to disk before signalling via dbus (Len + * Enforce that the env array has the right size (Lennart Poettering) + * when printing size_t use %z format string (Lennart Poettering) + * make CK database world readable (Lennart Poettering) + * get rid of ck_seat_set_active_session() prototype since no such function exi + * Move ck_session_run_programs() from ck-run-programs.h to ck-session.h (Lenna + * post release version bump (Ray Strode) + +============== Version 0.3.1 ============== @@ -33,7 +63,7 @@ Version 0.3.0 * still having problems using xinclude (William Jon McCann) * fix the includes (William Jon McCann) * add missing bits (William Jon McCann) - * use spec files directly as introspection xml and try to generate docs on the fly (William Jon McCan + * use spec files directly as introspection xml and try to generate docs on the fly (William Jon McCann) * use object paths for seat added/removed signals per spec (William Jon McCann) * regenerate the docs and xml from the spec (William Jon McCann) * add GetLoginSessionId to exported interface (William Jon McCann) @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.10.2 -*- Autoconf -*- +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -13,7 +13,7 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, +m4_if(AC_AUTOCONF_VERSION, [2.63],, [m4_warning([this file was generated for autoconf 2.63. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. @@ -2933,18 +2933,6 @@ linux* | k*bsd*-gnu) dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -3536,7 +3524,7 @@ linux* | k*bsd*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -4217,7 +4205,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4642,9 +4630,6 @@ m4_if([$1], [CXX], [ cygwin* | mingw* | cegcc*) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' ;; - linux* | k*bsd*-gnu) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -4709,9 +4694,6 @@ dnl Note also adjust exclude_expsyms for C++ above. openbsd*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -4894,7 +4876,7 @@ _LT_EOF fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -5069,7 +5051,6 @@ _LT_EOF if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi - _LT_TAGVAR(link_all_deplibs, $1)=no else # not using gcc if test "$host_cpu" = ia64; then @@ -5308,7 +5289,7 @@ _LT_EOF _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -8485,16 +8466,14 @@ fi]) # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) # --------------------------------------------- m4_define([_PKG_CONFIG], -[if test -n "$PKG_CONFIG"; then - if test -n "$$1"; then - pkg_cv_[]$1="$$1" - else - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - fi -else - pkg_failed=untried +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + else + pkg_failed=untried fi[]dnl ])# _PKG_CONFIG @@ -8538,9 +8517,9 @@ See the pkg-config man page for more details.]) if test $pkg_failed = yes; then _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD @@ -8575,7 +8554,7 @@ else fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -8590,7 +8569,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.10' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10.2], [], +m4_if([$1], [1.10.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -8604,12 +8583,12 @@ m4_define([_AM_AUTOCONF_VERSION], []) # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. +# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10.2])dnl +[AM_AUTOMAKE_VERSION([1.10.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) +_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -8859,68 +8838,57 @@ _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 5 +#serial 3 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files - # are listed without --file. Let's play safe and only enable the eval - # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac - shift - for mf - do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done +[for mf in $CONFIG_FILES; do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" done -} +done ])# _AM_OUTPUT_DEPENDENCY_COMMANDS @@ -9243,13 +9211,13 @@ esac # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 3 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -9266,7 +9234,7 @@ AC_DEFUN([_AM_SET_OPTION], # ---------------------------------- # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], -[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) +[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) # ------------------------------------------- diff --git a/config.guess b/config.guess index da83314..ca2a03c 100755 --- a/config.guess +++ b/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. -timestamp='2009-04-27' +timestamp='2008-01-08' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -324,9 +324,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7; exit ;; esac ;; - s390x:SunOS:*:*) - echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; @@ -334,20 +331,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval $set_cc_for_build - SUN_ARCH="i386" - # If there is a compiler, see if it is configured for 64-bit objects. - # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. - # This test works for both compilers. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - SUN_ARCH="x86_64" - fi - fi - echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize @@ -812,7 +796,7 @@ EOF x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; - EM64T | authenticamd | genuineintel) + EM64T | authenticamd) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; IA64) @@ -951,9 +935,6 @@ EOF if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; - padre:Linux:*:*) - echo sparc-unknown-linux-gnu - exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -1004,6 +985,9 @@ EOF a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" exit ;; + coff-i386) + echo "${UNAME_MACHINE}-pc-linux-gnucoff" + exit ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. @@ -1118,11 +1102,8 @@ EOF pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. - # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that - # this is a cross-build. - echo i586-pc-msdosdjgpp + # the processor, so we play safe by assuming i386. + echo i386-pc-msdosdjgpp exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 @@ -1160,16 +1141,6 @@ EOF 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4; exit; } ;; - NCR*:*:4.2:* | MPRAS*:*:4.2:*) - OS_REL='.3' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} exit ;; @@ -1245,9 +1216,6 @@ EOF BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos exit ;; - BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1356,9 +1324,6 @@ EOF i*86:rdos:*:*) echo ${UNAME_MACHINE}-pc-rdos exit ;; - i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros - exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1519,9 +1484,9 @@ This script, last modified $timestamp, has failed to recognize the operating system you are using. It is advised that you download the most up to date version of the config scripts from - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess and - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub If the version you run ($0) is already up to date, please send the following data and any information you think might be @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. -timestamp='2009-04-17' +timestamp='2008-01-16' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -122,7 +122,6 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` @@ -250,16 +249,13 @@ case $basic_machine in | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ - | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ - | mips64r5900 | mips64r5900el \ | mips64vr | mips64vrel \ + | mips64orion | mips64orionel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ @@ -272,7 +268,6 @@ case $basic_machine in | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ - | moxie \ | mt \ | msp430 \ | nios | nios2 \ @@ -282,7 +277,7 @@ case $basic_machine in | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ @@ -291,7 +286,7 @@ case $basic_machine in | v850 | v850e \ | we32k \ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k | z80) + | z8k) basic_machine=$basic_machine-unknown ;; m6811 | m68hc11 | m6812 | m68hc12) @@ -334,17 +329,14 @@ case $basic_machine in | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ - | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64r5900-* | mips64r5900el-* \ | mips64vr-* | mips64vrel-* \ + | mips64orion-* | mips64orionel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ @@ -366,20 +358,20 @@ case $basic_machine in | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ - | z8k-* | z80-*) + | z8k-*) ;; # Recognize the basic CPU types without company name, with glob match. xtensa*) @@ -447,10 +439,6 @@ case $basic_machine in basic_machine=m68k-apollo os=-bsd ;; - aros) - basic_machine=i386-pc - os=-aros - ;; aux) basic_machine=m68k-apple os=-aux @@ -471,10 +459,6 @@ case $basic_machine in basic_machine=c90-cray os=-unicos ;; - cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -542,10 +526,6 @@ case $basic_machine in basic_machine=m88k-motorola os=-sysv3 ;; - dicos) - basic_machine=i686-pc - os=-dicos - ;; djgpp) basic_machine=i586-pc os=-msdosdjgpp @@ -1148,10 +1128,6 @@ case $basic_machine in basic_machine=z8k-unknown os=-sim ;; - z80-*-coff) - basic_machine=z80-unknown - os=-sim - ;; none) basic_machine=none-none os=-none @@ -1190,7 +1166,7 @@ case $basic_machine in we32k) basic_machine=we32k-att ;; - sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) + sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) @@ -1262,9 +1238,8 @@ case $os in -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ - | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* \ + | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ @@ -1273,7 +1248,7 @@ case $os in | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ + | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ @@ -1413,9 +1388,6 @@ case $os in -zvmoe) os=-zvmoe ;; - -dicos*) - os=-dicos - ;; -none) ;; *) @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for ConsoleKit 0.3.1. +# Generated by GNU Autoconf 2.63 for ConsoleKit 0.4.1. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=ConsoleKit>. # @@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='ConsoleKit' PACKAGE_TARNAME='ConsoleKit' -PACKAGE_VERSION='0.3.1' -PACKAGE_STRING='ConsoleKit 0.3.1' +PACKAGE_VERSION='0.4.1' +PACKAGE_STRING='ConsoleKit 0.4.1' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=ConsoleKit' ac_unique_file="src/ck-manager.c" @@ -1553,7 +1553,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ConsoleKit 0.3.1 to adapt to many kinds of systems. +\`configure' configures ConsoleKit 0.4.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1623,7 +1623,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ConsoleKit 0.3.1:";; + short | recursive ) echo "Configuration of ConsoleKit 0.4.1:";; esac cat <<\_ACEOF @@ -1761,7 +1761,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ConsoleKit configure 0.3.1 +ConsoleKit configure 0.4.1 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1775,7 +1775,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ConsoleKit $as_me 0.3.1, which was +It was created by ConsoleKit $as_me 0.4.1, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2494,7 +2494,7 @@ fi # Define the identity of the package. PACKAGE='ConsoleKit' - VERSION='0.3.1' + VERSION='0.4.1' cat >>confdefs.h <<_ACEOF @@ -6753,7 +6753,7 @@ linux* | k*bsd*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -9441,9 +9441,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie openbsd*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu) - link_all_deplibs=no - ;; esac ld_shlibs=yes @@ -9626,7 +9623,7 @@ _LT_EOF fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -9801,7 +9798,6 @@ _LT_EOF if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi - link_all_deplibs=no else # not using gcc if test "$host_cpu" = ia64; then @@ -10216,7 +10212,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ link_all_deplibs=yes ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -11193,18 +11189,6 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -12138,7 +12122,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12141 "configure" +#line 12125 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12234,7 +12218,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12237 "configure" +#line 12221 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -15125,11 +15109,10 @@ pkg_failed=no { $as_echo "$as_me:$LINENO: checking for CONSOLE_KIT" >&5 $as_echo_n "checking for CONSOLE_KIT... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$CONSOLE_KIT_CFLAGS"; then - pkg_cv_CONSOLE_KIT_CFLAGS="$CONSOLE_KIT_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$CONSOLE_KIT_CFLAGS"; then + pkg_cv_CONSOLE_KIT_CFLAGS="$CONSOLE_KIT_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQUIRED_VERSION gobject-2.0 >= \$GLIB_REQUIRED_VERSION gthread-2.0 >= \$GLIB_REQUIRED_VERSION @@ -15148,15 +15131,13 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$CONSOLE_KIT_LIBS"; then - pkg_cv_CONSOLE_KIT_LIBS="$CONSOLE_KIT_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$CONSOLE_KIT_LIBS"; then + pkg_cv_CONSOLE_KIT_LIBS="$CONSOLE_KIT_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQUIRED_VERSION gobject-2.0 >= \$GLIB_REQUIRED_VERSION gthread-2.0 >= \$GLIB_REQUIRED_VERSION @@ -15175,9 +15156,8 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -15190,15 +15170,15 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - CONSOLE_KIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_REQUIRED_VERSION + CONSOLE_KIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_REQUIRED_VERSION gobject-2.0 >= $GLIB_REQUIRED_VERSION gthread-2.0 >= $GLIB_REQUIRED_VERSION -"` +" 2>&1` else - CONSOLE_KIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_REQUIRED_VERSION + CONSOLE_KIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_REQUIRED_VERSION gobject-2.0 >= $GLIB_REQUIRED_VERSION gthread-2.0 >= $GLIB_REQUIRED_VERSION -"` +" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$CONSOLE_KIT_PKG_ERRORS" >&5 @@ -15269,11 +15249,10 @@ pkg_failed=no { $as_echo "$as_me:$LINENO: checking for POLKIT" >&5 $as_echo_n "checking for POLKIT... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$POLKIT_CFLAGS"; then - pkg_cv_POLKIT_CFLAGS="$POLKIT_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$POLKIT_CFLAGS"; then + pkg_cv_POLKIT_CFLAGS="$POLKIT_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"polkit-gobject-1 >= \$POLKIT_REQUIRED_VERSION\"") >&5 ($PKG_CONFIG --exists --print-errors "polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION") 2>&5 ac_status=$? @@ -15283,15 +15262,13 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$POLKIT_LIBS"; then - pkg_cv_POLKIT_LIBS="$POLKIT_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$POLKIT_LIBS"; then + pkg_cv_POLKIT_LIBS="$POLKIT_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"polkit-gobject-1 >= \$POLKIT_REQUIRED_VERSION\"") >&5 ($PKG_CONFIG --exists --print-errors "polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION") 2>&5 ac_status=$? @@ -15301,9 +15278,8 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -15316,9 +15292,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - POLKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION"` + POLKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION" 2>&1` else - POLKIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION"` + POLKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$POLKIT_PKG_ERRORS" >&5 @@ -15357,11 +15333,10 @@ pkg_failed=no { $as_echo "$as_me:$LINENO: checking for LIBDBUS" >&5 $as_echo_n "checking for LIBDBUS... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$LIBDBUS_CFLAGS"; then - pkg_cv_LIBDBUS_CFLAGS="$LIBDBUS_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$LIBDBUS_CFLAGS"; then + pkg_cv_LIBDBUS_CFLAGS="$LIBDBUS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= \$DBUS_REQUIRED_VERSION \"") >&5 ($PKG_CONFIG --exists --print-errors "dbus-1 >= $DBUS_REQUIRED_VERSION @@ -15374,15 +15349,13 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$LIBDBUS_LIBS"; then - pkg_cv_LIBDBUS_LIBS="$LIBDBUS_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$LIBDBUS_LIBS"; then + pkg_cv_LIBDBUS_LIBS="$LIBDBUS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= \$DBUS_REQUIRED_VERSION \"") >&5 ($PKG_CONFIG --exists --print-errors "dbus-1 >= $DBUS_REQUIRED_VERSION @@ -15395,9 +15368,8 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -15410,11 +15382,11 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBDBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-1 >= $DBUS_REQUIRED_VERSION -"` + LIBDBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1 >= $DBUS_REQUIRED_VERSION +" 2>&1` else - LIBDBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-1 >= $DBUS_REQUIRED_VERSION -"` + LIBDBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1 >= $DBUS_REQUIRED_VERSION +" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBDBUS_PKG_ERRORS" >&5 @@ -15480,11 +15452,10 @@ pkg_failed=no { $as_echo "$as_me:$LINENO: checking for TOOLS" >&5 $as_echo_n "checking for TOOLS... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$TOOLS_CFLAGS"; then - pkg_cv_TOOLS_CFLAGS="$TOOLS_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$TOOLS_CFLAGS"; then + pkg_cv_TOOLS_CFLAGS="$TOOLS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 >= \$X11_REQUIRED_VERSION glib-2.0 >= \$GLIB_REQUIRED_VERSION \"") >&5 @@ -15500,15 +15471,13 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$TOOLS_LIBS"; then - pkg_cv_TOOLS_LIBS="$TOOLS_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$TOOLS_LIBS"; then + pkg_cv_TOOLS_LIBS="$TOOLS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 >= \$X11_REQUIRED_VERSION glib-2.0 >= \$GLIB_REQUIRED_VERSION \"") >&5 @@ -15524,9 +15493,8 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -15539,13 +15507,13 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - TOOLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11 >= $X11_REQUIRED_VERSION + TOOLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 >= $X11_REQUIRED_VERSION glib-2.0 >= $GLIB_REQUIRED_VERSION -"` +" 2>&1` else - TOOLS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11 >= $X11_REQUIRED_VERSION + TOOLS_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 >= $X11_REQUIRED_VERSION glib-2.0 >= $GLIB_REQUIRED_VERSION -"` +" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$TOOLS_PKG_ERRORS" >&5 @@ -15614,11 +15582,10 @@ pkg_failed=no { $as_echo "$as_me:$LINENO: checking for HISTORY" >&5 $as_echo_n "checking for HISTORY... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$HISTORY_CFLAGS"; then - pkg_cv_HISTORY_CFLAGS="$HISTORY_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$HISTORY_CFLAGS"; then + pkg_cv_HISTORY_CFLAGS="$HISTORY_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED_VERSION \"") >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION @@ -15631,15 +15598,13 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$HISTORY_LIBS"; then - pkg_cv_HISTORY_LIBS="$HISTORY_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$HISTORY_LIBS"; then + pkg_cv_HISTORY_LIBS="$HISTORY_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED_VERSION \"") >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION @@ -15652,9 +15617,8 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi @@ -15667,11 +15631,11 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - HISTORY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION -"` + HISTORY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION +" 2>&1` else - HISTORY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION -"` + HISTORY_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION +" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$HISTORY_PKG_ERRORS" >&5 @@ -17774,7 +17738,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ConsoleKit $as_me 0.3.1, which was +This file was extended by ConsoleKit $as_me 0.4.1, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17837,7 +17801,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -ConsoleKit config.status 0.3.1 +ConsoleKit config.status 0.4.1 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -18887,28 +18851,18 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} case $ac_file$ac_mode in - "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files - # are listed without --file. Let's play safe and only enable the eval - # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac - shift - for mf - do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || + "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ X"$mf" : 'X\(//\)$' \| \ @@ -18931,28 +18885,28 @@ $as_echo X"$mf" | q } s/.*/./; q'` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`$as_dirname -- "$file" || + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`$as_dirname -- "$file" || $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$file" : 'X\(//\)[^/]' \| \ X"$file" : 'X\(//\)$' \| \ @@ -18975,7 +18929,7 @@ $as_echo X"$file" | q } s/.*/./; q'` - { as_dir=$dirpart/$fdir + { as_dir=$dirpart/$fdir case $as_dir in #( -*) as_dir=./$as_dir;; esac @@ -19016,11 +18970,10 @@ $as_echo X"$as_dir" | } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 $as_echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" done -} +done ;; "libtool":C) diff --git a/configure.ac b/configure.ac index 100887f..d797241 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ(2.59c) AC_INIT([ConsoleKit], - [0.3.1], + [0.4.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=ConsoleKit], [ConsoleKit]) diff --git a/data/Makefile.in b/data/Makefile.in index 60be3dd..0b5564d 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -258,8 +258,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ exit 1;; \ esac; \ done; \ diff --git a/doc/Makefile.in b/doc/Makefile.in index 1096b77..ac2487c 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -220,8 +220,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ exit 1;; \ esac; \ done; \ @@ -327,7 +327,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS diff --git a/doc/dbus/ConsoleKit.xml b/doc/dbus/ConsoleKit.xml index d898050..e9bb018 100644 --- a/doc/dbus/ConsoleKit.xml +++ b/doc/dbus/ConsoleKit.xml @@ -10,16 +10,15 @@ <book id="index"> <bookinfo> - <title>ConsoleKit 0.3.1 Documentation</title> - <releaseinfo>Version 0.3.1</releaseinfo> - <date>8 March, 2007</date> + <title>ConsoleKit 0.4.1 Documentation</title> + <releaseinfo>Version 0.4.1</releaseinfo> <authorgroup> <author> <firstname>William Jon</firstname> <surname>McCann</surname> <affiliation> <address> - <email>mccann@jhu.edu</email> + <email>william.jon.mccann@gmail.com</email> </address> </affiliation> </author> diff --git a/doc/dbus/ConsoleKit.xml.in b/doc/dbus/ConsoleKit.xml.in index 403e7d0..3ce7aec 100644 --- a/doc/dbus/ConsoleKit.xml.in +++ b/doc/dbus/ConsoleKit.xml.in @@ -12,14 +12,13 @@ <bookinfo> <title>ConsoleKit @VERSION@ Documentation</title> <releaseinfo>Version @VERSION@</releaseinfo> - <date>8 March, 2007</date> <authorgroup> <author> <firstname>William Jon</firstname> <surname>McCann</surname> <affiliation> <address> - <email>mccann@jhu.edu</email> + <email>william.jon.mccann@gmail.com</email> </address> </affiliation> </author> diff --git a/doc/dbus/Makefile.in b/doc/dbus/Makefile.in index 795c69f..e00e869 100644 --- a/doc/dbus/Makefile.in +++ b/doc/dbus/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -244,8 +244,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ exit 1;; \ esac; \ done; \ diff --git a/libck-connector/Makefile.in b/libck-connector/Makefile.in index 177bcb8..455effa 100644 --- a/libck-connector/Makefile.in +++ b/libck-connector/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -309,8 +309,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ exit 1;; \ esac; \ done; \ @@ -451,7 +451,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -65,7 +65,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4 +# $progname: (GNU libtool) 2.2.6 # automake: $automake_version # autoconf: $autoconf_version # @@ -73,7 +73,7 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION="2.2.6 Debian-2.2.6a-4" +VERSION=2.2.6 TIMESTAMP="" package_revision=1.3012 @@ -116,15 +116,15 @@ $lt_unset CDPATH : ${CP="cp -f"} : ${ECHO="echo"} -: ${EGREP="/bin/grep -E"} -: ${FGREP="/bin/grep -F"} -: ${GREP="/bin/grep"} +: ${EGREP="/usr/bin/grep -E"} +: ${FGREP="/usr/bin/grep -F"} +: ${GREP="/usr/bin/grep"} : ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} -: ${SED="/bin/sed"} +: ${SED="/opt/local/bin/gsed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} @@ -5033,10 +5033,7 @@ func_mode_link () case $pass in dlopen) libs="$dlfiles" ;; dlpreopen) libs="$dlprefiles" ;; - link) - libs="$deplibs %DEPLIBS%" - test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" - ;; + link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; esac fi if test "$linkmode,$pass" = "lib,dlpreopen"; then @@ -5347,19 +5344,19 @@ func_mode_link () # It is a libtool convenience library, so add in its objects. convenience="$convenience $ladir/$objdir/$old_library" old_convenience="$old_convenience $ladir/$objdir/$old_library" - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_duplicate_deps ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done elif test "$linkmode" != prog && test "$linkmode" != lib; then func_fatal_error "\`$lib' is not a convenience library" fi + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_duplicate_deps ; then + case "$tmp_libs " in + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + esac + fi + tmp_libs="$tmp_libs $deplib" + done continue fi # $pass = conv @@ -5896,7 +5893,6 @@ func_mode_link () if test "$link_all_deplibs" != no; then # Add the search paths of all dependency libraries for deplib in $dependency_libs; do - path= case $deplib in -L*) path="$deplib" ;; *.la) @@ -6210,9 +6206,6 @@ func_mode_link () revision="$number_minor" lt_irix_increment=no ;; - *) - func_fatal_configuration "$modename: unknown library version type \`$version_type'" - ;; esac ;; no) diff --git a/pam-ck-connector/Makefile.in b/pam-ck-connector/Makefile.in index 6f48f1c..66a53b2 100644 --- a/pam-ck-connector/Makefile.in +++ b/pam-ck-connector/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -301,8 +301,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ exit 1;; \ esac; \ done; \ @@ -412,8 +412,8 @@ install-man8: $(man8_MANS) $(man_MANS) esac; \ done; \ for i in $$list; do \ - if test -f $$i; then file=$$i; \ - else file=$(srcdir)/$$i; fi; \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ case "$$ext" in \ 8*) ;; \ @@ -452,7 +452,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS diff --git a/src/Makefile.am b/src/Makefile.am index cbe8a09..6ab05c8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -205,5 +205,7 @@ MAINTAINERCLEANFILES = \ install-data-local: -mkdir -p $(DESTDIR)$(sysconfdir)/ConsoleKit/run-session.d -mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-session.d + -mkdir -p $(DESTDIR)$(sysconfdir)/ConsoleKit/run-seat.d + -mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d -mkdir -p $(DESTDIR)$(localstatedir)/run/ConsoleKit -mkdir -p $(DESTDIR)$(localstatedir)/log/ConsoleKit diff --git a/src/Makefile.in b/src/Makefile.in index 36bd4a2..c979ab3 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -469,8 +469,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ exit 1;; \ esac; \ done; \ @@ -703,7 +703,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -936,6 +936,8 @@ ck-marshal.h: ck-marshal.list install-data-local: -mkdir -p $(DESTDIR)$(sysconfdir)/ConsoleKit/run-session.d -mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-session.d + -mkdir -p $(DESTDIR)$(sysconfdir)/ConsoleKit/run-seat.d + -mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d -mkdir -p $(DESTDIR)$(localstatedir)/run/ConsoleKit -mkdir -p $(DESTDIR)$(localstatedir)/log/ConsoleKit # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/src/ck-log-event.c b/src/ck-log-event.c index 965a036..66f439c 100644 --- a/src/ck-log-event.c +++ b/src/ck-log-event.c @@ -63,6 +63,8 @@ static void event_system_start_free (CkLogSystemStartEvent *event) { g_assert (event != NULL); + g_free (event->kernel_release); + g_free (event->boot_arguments); } static void @@ -196,6 +198,9 @@ event_system_start_copy (CkLogSystemStartEvent *event, { g_assert (event != NULL); g_assert (event_copy != NULL); + + event_copy->kernel_release = g_strdup (event->kernel_release); + event_copy->boot_arguments = g_strdup (event->boot_arguments); } static void @@ -470,6 +475,10 @@ add_log_for_system_start (GString *str, CkLogSystemStartEvent *e; e = (CkLogSystemStartEvent *)event; + g_string_append_printf (str, + "kernel-release='%s' boot-arguments='%s'", + e->kernel_release ? e->kernel_release : "", + e->boot_arguments ? e->boot_arguments : ""); } static void @@ -855,23 +864,54 @@ parse_log_for_system_restart (const GString *str, static gboolean parse_log_for_system_start (const GString *str, - CkLogEvent *event) + CkLogEvent *event) { gboolean ret; const char *s; + GRegex *re; + GMatchInfo *match_info; + gboolean res; + GError *error; CkLogSystemStartEvent *e; ret = FALSE; + re = NULL; + match_info = NULL; s = skip_header (str->str, str->len); if (s == NULL) { goto out; } + /* kernel-release and boot-arguments are attributes added in 0.4 */ + error = NULL; + re = g_regex_new ("(kernel-release='(?P<release>[^']+)')?[ ]?(boot-arguments='(?P<arguments>.*)')?", 0, 0, &error); + if (re == NULL) { + g_warning (error->message); + goto out; + } + + g_regex_match (re, s, 0, &match_info); + + res = g_match_info_matches (match_info); + if (! res) { + g_warning ("Unable to parse system start event: %s", s); + goto out; + } + e = (CkLogSystemStartEvent *)event; + e->kernel_release = g_match_info_fetch_named (match_info, "release"); + e->boot_arguments = g_match_info_fetch_named (match_info, "arguments"); + ret = TRUE; out: + if (match_info != NULL) { + g_match_info_free (match_info); + } + if (re != NULL) { + g_regex_unref (re); + } return ret; } diff --git a/src/ck-log-event.h b/src/ck-log-event.h index 0c04c1d..65571f0 100644 --- a/src/ck-log-event.h +++ b/src/ck-log-event.h @@ -60,7 +60,8 @@ typedef struct typedef struct { - gpointer dummy; + char *kernel_release; + char *boot_arguments; } CkLogSystemStartEvent; typedef struct diff --git a/src/ck-manager-glue.h b/src/ck-manager-glue.h index a60d5c9..aa360ee 100644 --- a/src/ck-manager-glue.h +++ b/src/ck-manager-glue.h @@ -53,7 +53,7 @@ G_BEGIN_DECLS #endif /* !G_ENABLE_DEBUG */ -/* NONE:STRING,POINTER (/tmp/dbus-binding-tool-c-marshallers.2MBKXU:1) */ +/* NONE:STRING,POINTER (/tmp/dbus-binding-tool-c-marshallers.CGY3YU:1) */ extern void dbus_glib_marshal_ck_manager_VOID__STRING_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, @@ -97,7 +97,7 @@ dbus_glib_marshal_ck_manager_VOID__STRING_POINTER (GClosure *closure, } #define dbus_glib_marshal_ck_manager_NONE__STRING_POINTER dbus_glib_marshal_ck_manager_VOID__STRING_POINTER -/* BOOLEAN:POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.2MBKXU:2) */ +/* BOOLEAN:POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.CGY3YU:2) */ extern void dbus_glib_marshal_ck_manager_BOOLEAN__POINTER_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, @@ -144,15 +144,15 @@ dbus_glib_marshal_ck_manager_BOOLEAN__POINTER_POINTER (GClosure *closure, g_value_set_boolean (return_value, v_return); } -/* NONE:UINT,POINTER (/tmp/dbus-binding-tool-c-marshallers.2MBKXU:3) */ +/* NONE:UINT,POINTER (/tmp/dbus-binding-tool-c-marshallers.CGY3YU:3) */ #define dbus_glib_marshal_ck_manager_VOID__UINT_POINTER g_cclosure_marshal_VOID__UINT_POINTER #define dbus_glib_marshal_ck_manager_NONE__UINT_POINTER dbus_glib_marshal_ck_manager_VOID__UINT_POINTER -/* NONE:POINTER (/tmp/dbus-binding-tool-c-marshallers.2MBKXU:4) */ +/* NONE:POINTER (/tmp/dbus-binding-tool-c-marshallers.CGY3YU:4) */ #define dbus_glib_marshal_ck_manager_VOID__POINTER g_cclosure_marshal_VOID__POINTER #define dbus_glib_marshal_ck_manager_NONE__POINTER dbus_glib_marshal_ck_manager_VOID__POINTER -/* NONE:BOXED,POINTER (/tmp/dbus-binding-tool-c-marshallers.2MBKXU:5) */ +/* NONE:BOXED,POINTER (/tmp/dbus-binding-tool-c-marshallers.CGY3YU:5) */ extern void dbus_glib_marshal_ck_manager_VOID__BOXED_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, diff --git a/src/ck-manager.c b/src/ck-manager.c index bb65d73..99693a3 100644 --- a/src/ck-manager.c +++ b/src/ck-manager.c @@ -200,7 +200,7 @@ ck_manager_dump (CkManager *manager) return; } - fd = g_open (filename_tmp, O_CREAT | O_WRONLY, 0600); + fd = g_open (filename_tmp, O_CREAT | O_WRONLY, 0644); if (fd == -1) { g_warning ("Cannot create file %s: %s", filename_tmp, g_strerror (errno)); goto error; @@ -810,12 +810,9 @@ check_polkit_permissions (CkManager *manager, AuthorizedCallback callback) { const char *sender; - GError *error; PolkitSubject *subject; AuthorizedCallbackData *data; - error = NULL; - g_debug ("constructing polkit data"); /* Check that caller is privileged */ @@ -837,6 +834,7 @@ check_polkit_permissions (CkManager *manager, NULL, (GAsyncReadyCallback)auth_ready_callback, data); + g_object_unref (subject); } static void @@ -873,14 +871,12 @@ get_polkit_permissions (CkManager *manager, { const char *sender; PolkitSubject *subject; - GError *error; g_debug ("get permissions for action %s", action); sender = dbus_g_method_get_sender (context); subject = polkit_system_bus_name_new (sender); - error = NULL; polkit_authority_check_authorization (manager->priv->pol_ctx, subject, action, @@ -890,7 +886,6 @@ get_polkit_permissions (CkManager *manager, (GAsyncReadyCallback) ready_cb, context); g_object_unref (subject); - } #endif @@ -1228,29 +1223,50 @@ ck_manager_can_stop (CkManager *manager, } static void -on_seat_active_session_changed (CkSeat *seat, - const char *ssid, - CkManager *manager) +on_seat_active_session_changed_full (CkSeat *seat, + CkSession *old_session, + CkSession *session, + CkManager *manager) { + char *ssid = NULL; + + if (session != NULL) { + ck_session_get_id (session, &ssid, NULL); + } + ck_manager_dump (manager); + ck_seat_run_programs (seat, old_session, session, "seat_active_session_changed"); + log_seat_active_session_changed_event (manager, seat, ssid); } static void -on_seat_session_added (CkSeat *seat, - const char *ssid, - CkManager *manager) +on_seat_session_added_full (CkSeat *seat, + CkSession *session, + CkManager *manager) { + char *ssid = NULL; + + ck_session_get_id (session, &ssid, NULL); + ck_manager_dump (manager); + ck_session_run_programs (session, "session_added"); + log_seat_session_added_event (manager, seat, ssid); } static void -on_seat_session_removed (CkSeat *seat, - const char *ssid, - CkManager *manager) +on_seat_session_removed_full (CkSeat *seat, + CkSession *session, + CkManager *manager) { + char *ssid = NULL; + + ck_session_get_id (session, &ssid, NULL); + ck_manager_dump (manager); + ck_session_run_programs (session, "session_removed"); + log_seat_session_removed_event (manager, seat, ssid); } @@ -1276,9 +1292,9 @@ static void connect_seat_signals (CkManager *manager, CkSeat *seat) { - g_signal_connect (seat, "active-session-changed", G_CALLBACK (on_seat_active_session_changed), manager); - g_signal_connect (seat, "session-added", G_CALLBACK (on_seat_session_added), manager); - g_signal_connect (seat, "session-removed", G_CALLBACK (on_seat_session_removed), manager); + g_signal_connect (seat, "active-session-changed-full", G_CALLBACK (on_seat_active_session_changed_full), manager); + g_signal_connect (seat, "session-added-full", G_CALLBACK (on_seat_session_added_full), manager); + g_signal_connect (seat, "session-removed-full", G_CALLBACK (on_seat_session_removed_full), manager); g_signal_connect (seat, "device-added", G_CALLBACK (on_seat_device_added), manager); g_signal_connect (seat, "device-removed", G_CALLBACK (on_seat_device_removed), manager); } @@ -1287,9 +1303,9 @@ static void disconnect_seat_signals (CkManager *manager, CkSeat *seat) { - g_signal_handlers_disconnect_by_func (seat, on_seat_active_session_changed, manager); - g_signal_handlers_disconnect_by_func (seat, on_seat_session_added, manager); - g_signal_handlers_disconnect_by_func (seat, on_seat_session_removed, manager); + g_signal_handlers_disconnect_by_func (seat, on_seat_active_session_changed_full, manager); + g_signal_handlers_disconnect_by_func (seat, on_seat_session_added_full, manager); + g_signal_handlers_disconnect_by_func (seat, on_seat_session_removed_full, manager); g_signal_handlers_disconnect_by_func (seat, on_seat_device_added, manager); g_signal_handlers_disconnect_by_func (seat, on_seat_device_removed, manager); } @@ -1304,25 +1320,34 @@ add_new_seat (CkManager *manager, sid = generate_seat_id (manager); seat = ck_seat_new (sid, kind); - if (seat == NULL) { - /* returns null if connection to bus fails */ - g_free (sid); - goto out; - } + + /* First we connect our own signals to the seat, followed by + * the D-Bus signal hookup to make sure we can first dump the + * database and only then send out the D-Bus signals for + * it. GObject guarantees us that the signal handlers are + * called in the same order as they are registered. */ connect_seat_signals (manager, seat); + if (!ck_seat_register (seat)) { + /* returns false if connection to bus fails */ + disconnect_seat_signals (manager, seat); + g_object_unref (seat); + g_free (sid); + return NULL; + } g_hash_table_insert (manager->priv->seats, sid, seat); g_debug ("Added seat: %s kind:%d", sid, kind); ck_manager_dump (manager); + ck_seat_run_programs (seat, NULL, NULL, "seat_added"); + g_debug ("Emitting seat-added: %s", sid); g_signal_emit (manager, signals [SEAT_ADDED], 0, sid); log_seat_added_event (manager, seat); - out: return seat; } @@ -1359,6 +1384,7 @@ remove_seat (CkManager *manager, } ck_manager_dump (manager); + ck_seat_run_programs (seat, NULL, NULL, "seat_removed"); g_debug ("Emitting seat-removed: %s", sid); g_signal_emit (manager, signals [SEAT_REMOVED], 0, sid); @@ -2407,20 +2433,24 @@ add_seat_for_file (CkManager *manager, sid = generate_seat_id (manager); seat = ck_seat_new_from_file (sid, filename); - if (seat == NULL) { - /* returns null if connection to bus fails */ + + connect_seat_signals (manager, seat); + if (!ck_seat_register (seat)) { + /* returns false if connection to bus fails */ + disconnect_seat_signals (manager, seat); + g_object_unref (seat); g_free (sid); return; } - connect_seat_signals (manager, seat); - g_hash_table_insert (manager->priv->seats, sid, seat); g_debug ("Added seat: %s", sid); ck_manager_dump (manager); + ck_seat_run_programs (seat, NULL, NULL, "seat_added"); + g_debug ("Emitting seat-added: %s", sid); g_signal_emit (manager, signals [SEAT_ADDED], 0, sid); log_seat_added_event (manager, seat); diff --git a/src/ck-marshal.c b/src/ck-marshal.c index 8b08794..06dc9b3 100644 --- a/src/ck-marshal.c +++ b/src/ck-marshal.c @@ -124,3 +124,40 @@ ck_marshal_BOOLEAN__POINTER (GClosure *closure, g_value_set_boolean (return_value, v_return); } +/* VOID:OBJECT,OBJECT (ck-marshal.list:3) */ +void +ck_marshal_VOID__OBJECT_OBJECT (GClosure *closure, + GValue *return_value G_GNUC_UNUSED, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint G_GNUC_UNUSED, + gpointer marshal_data) +{ + typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer data1, + gpointer arg_1, + gpointer arg_2, + gpointer data2); + register GMarshalFunc_VOID__OBJECT_OBJECT callback; + register GCClosure *cc = (GCClosure*) closure; + register gpointer data1, data2; + + g_return_if_fail (n_param_values == 3); + + if (G_CCLOSURE_SWAP_DATA (closure)) + { + data1 = closure->data; + data2 = g_value_peek_pointer (param_values + 0); + } + else + { + data1 = g_value_peek_pointer (param_values + 0); + data2 = closure->data; + } + callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback); + + callback (data1, + g_marshal_value_peek_object (param_values + 1), + g_marshal_value_peek_object (param_values + 2), + data2); +} + diff --git a/src/ck-marshal.h b/src/ck-marshal.h index 7553810..e817ae0 100644 --- a/src/ck-marshal.h +++ b/src/ck-marshal.h @@ -22,6 +22,14 @@ extern void ck_marshal_BOOLEAN__POINTER (GClosure *closure, gpointer invocation_hint, gpointer marshal_data); +/* VOID:OBJECT,OBJECT (ck-marshal.list:3) */ +extern void ck_marshal_VOID__OBJECT_OBJECT (GClosure *closure, + GValue *return_value, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint, + gpointer marshal_data); + G_END_DECLS #endif /* __ck_marshal_MARSHAL_H__ */ diff --git a/src/ck-marshal.list b/src/ck-marshal.list index f9eed10..7f60efc 100644 --- a/src/ck-marshal.list +++ b/src/ck-marshal.list @@ -1,2 +1,3 @@ VOID:UINT,STRING BOOLEAN:POINTER +VOID:OBJECT,OBJECT diff --git a/src/ck-run-programs.h b/src/ck-run-programs.h index 77cdf48..07f4086 100644 --- a/src/ck-run-programs.h +++ b/src/ck-run-programs.h @@ -30,9 +30,6 @@ G_BEGIN_DECLS void ck_run_programs (const char *dirpath, const char *action, char **extra_env); -void ck_session_run_programs (CkSession *session, const char *action); - - G_END_DECLS #endif /* __CK_RUN_PROGRAMS_H */ diff --git a/src/ck-seat-glue.h b/src/ck-seat-glue.h index a9db6f2..316d929 100644 --- a/src/ck-seat-glue.h +++ b/src/ck-seat-glue.h @@ -53,7 +53,7 @@ G_BEGIN_DECLS #endif /* !G_ENABLE_DEBUG */ -/* BOOLEAN:POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.RK8LXU:1) */ +/* BOOLEAN:POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.SGA4YU:1) */ extern void dbus_glib_marshal_ck_seat_BOOLEAN__POINTER_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, @@ -100,7 +100,7 @@ dbus_glib_marshal_ck_seat_BOOLEAN__POINTER_POINTER (GClosure *closure, g_value_set_boolean (return_value, v_return); } -/* NONE:BOXED,POINTER (/tmp/dbus-binding-tool-c-marshallers.RK8LXU:2) */ +/* NONE:BOXED,POINTER (/tmp/dbus-binding-tool-c-marshallers.SGA4YU:2) */ extern void dbus_glib_marshal_ck_seat_VOID__BOXED_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, diff --git a/src/ck-seat.c b/src/ck-seat.c index c2f70da..fedd900 100644 --- a/src/ck-seat.c +++ b/src/ck-seat.c @@ -67,8 +67,11 @@ struct CkSeatPrivate enum { ACTIVE_SESSION_CHANGED, - SESSION_ADDED, + ACTIVE_SESSION_CHANGED_FULL, + SESSION_ADDED, /* Carries the session as path for D-Bus */ + SESSION_ADDED_FULL, /* Carries the session as CkSession for other uses */ SESSION_REMOVED, + SESSION_REMOVED_FULL, DEVICE_ADDED, DEVICE_REMOVED, LAST_SIGNAL @@ -480,15 +483,17 @@ static void change_active_session (CkSeat *seat, CkSession *session) { - char *ssid; + char *ssid; + CkSession *old_session; if (seat->priv->active_session == session) { return; } - if (seat->priv->active_session != NULL) { - ck_session_set_active (seat->priv->active_session, FALSE, NULL); - g_object_unref (seat->priv->active_session); + old_session = seat->priv->active_session; + + if (old_session != NULL) { + ck_session_set_active (old_session, FALSE, NULL); } seat->priv->active_session = session; @@ -502,8 +507,21 @@ change_active_session (CkSeat *seat, g_debug ("Active session changed: %s", ssid ? ssid : "(null)"); + /* The order of signal emission matters here. The manager + * dumps the database when receiving the + * 'active-session-changed-full' signal and does callout + * handling. dbus-glib will then send out a D-Bus on the + * 'active-session-changed' signal. Since the D-Bus signal + * must be sent when the database dump is finished it is + * important that the '-full' signalled is emitted first. */ + + g_signal_emit (seat, signals [ACTIVE_SESSION_CHANGED_FULL], 0, old_session, session); g_signal_emit (seat, signals [ACTIVE_SESSION_CHANGED], 0, ssid); + if (old_session != NULL) { + g_object_unref (old_session); + } + g_free (ssid); } @@ -586,9 +604,13 @@ ck_seat_remove_session (CkSeat *seat, * unref until the signal is emitted */ g_hash_table_steal (seat->priv->sessions, ssid); - ck_session_run_programs (session, "session_removed"); - g_debug ("Emitting session-removed: %s", ssid); + + /* The order of signal emission matters here, too, for similar + * reasons as for 'session-added'/'session-added-full'. See + * above. */ + + g_signal_emit (seat, signals [SESSION_REMOVED_FULL], 0, session); g_signal_emit (seat, signals [SESSION_REMOVED], 0, ssid); /* try to change the active session */ @@ -624,10 +646,12 @@ ck_seat_add_session (CkSeat *seat, g_signal_connect_object (session, "activate", G_CALLBACK (session_activate), seat, 0); /* FIXME: attach to property notify signals? */ - ck_session_run_programs (session, "session_added"); - g_debug ("Emitting added signal: %s", ssid); + /* The order of signal emission matters here, too. See + * above. */ + + g_signal_emit (seat, signals [SESSION_ADDED_FULL], 0, session); g_signal_emit (seat, signals [SESSION_ADDED], 0, ssid); maybe_update_active_session (seat); @@ -741,8 +765,8 @@ active_vt_changed (CkVtMonitor *vt_monitor, update_active_vt (seat, num); } -static gboolean -register_seat (CkSeat *seat) +gboolean +ck_seat_register (CkSeat *seat) { GError *error = NULL; @@ -920,6 +944,15 @@ ck_seat_class_init (CkSeatClass *klass) g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); + signals [ACTIVE_SESSION_CHANGED_FULL] = g_signal_new ("active-session-changed-full", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + 0, + NULL, + NULL, + ck_marshal_VOID__OBJECT_OBJECT, + G_TYPE_NONE, + 2, CK_TYPE_SESSION, CK_TYPE_SESSION); signals [SESSION_ADDED] = g_signal_new ("session-added", G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, @@ -929,6 +962,15 @@ ck_seat_class_init (CkSeatClass *klass) g_cclosure_marshal_VOID__BOXED, G_TYPE_NONE, 1, DBUS_TYPE_G_OBJECT_PATH); + signals [SESSION_ADDED_FULL] = g_signal_new ("session-added-full", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + 0, + NULL, + NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, + 1, CK_TYPE_SESSION); signals [SESSION_REMOVED] = g_signal_new ("session-removed", G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, @@ -938,7 +980,15 @@ ck_seat_class_init (CkSeatClass *klass) g_cclosure_marshal_VOID__BOXED, G_TYPE_NONE, 1, DBUS_TYPE_G_OBJECT_PATH); - + signals [SESSION_REMOVED_FULL] = g_signal_new ("session-removed-full", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + 0, + NULL, + NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, + 1, CK_TYPE_SESSION); signals [DEVICE_ADDED] = g_signal_new ("device-added", G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, @@ -1023,19 +1073,12 @@ ck_seat_new (const char *sid, CkSeatKind kind) { GObject *object; - gboolean res; object = g_object_new (CK_TYPE_SEAT, "id", sid, "kind", kind, NULL); - res = register_seat (CK_SEAT (object)); - if (! res) { - g_object_unref (object); - return NULL; - } - return CK_SEAT (object); } @@ -1045,7 +1088,6 @@ ck_seat_new_with_devices (const char *sid, GPtrArray *devices) { GObject *object; - gboolean res; int i; object = g_object_new (CK_TYPE_SEAT, @@ -1059,12 +1101,6 @@ ck_seat_new_with_devices (const char *sid, } } - res = register_seat (CK_SEAT (object)); - if (! res) { - g_object_unref (object); - return NULL; - } - return CK_SEAT (object); } @@ -1083,6 +1119,8 @@ ck_seat_new_from_file (const char *sid, gsize ndevices; gsize i; + seat = NULL; + key_file = g_key_file_new (); error = NULL; res = g_key_file_load_from_file (key_file, @@ -1092,24 +1130,24 @@ ck_seat_new_from_file (const char *sid, if (! res) { g_warning ("Unable to load seats from file %s: %s", path, error->message); g_error_free (error); - return NULL; + goto out; } group = g_key_file_get_start_group (key_file); if (group == NULL || strcmp (group, "Seat Entry") != 0) { g_warning ("Not a seat file: %s", path); - return NULL; + goto out; } hidden = g_key_file_get_boolean (key_file, group, "Hidden", NULL); if (hidden) { g_debug ("Seat is hidden"); - return NULL; + goto out; } device_list = g_key_file_get_string_list (key_file, group, "Devices", &ndevices, NULL); - g_debug ("Creating seat %s with %d devices", sid, ndevices); + g_debug ("Creating seat %s with %zd devices", sid, ndevices); devices = g_ptr_array_sized_new (ndevices); @@ -1137,17 +1175,110 @@ ck_seat_new_from_file (const char *sid, g_strfreev (split); } - + g_strfreev (device_list); g_free (group); seat = ck_seat_new_with_devices (sid, CK_SEAT_KIND_STATIC, devices); - g_ptr_array_free (devices, TRUE); +out: + + g_key_file_free (key_file); + return seat; } static void +env_add_session_info (CkSession *session, + const char *prefix, + char **extra_env, + int *n) +{ + char *s; + gboolean b; + guint u; + + if (session == NULL) { + return; + } + + if (ck_session_get_id (session, &s, NULL) && s != NULL && *s != '\0') { + extra_env[(*n)++] = g_strdup_printf ("%sID=%s", prefix, s); + g_free (s); + } + + if (ck_session_get_session_type (session, &s, NULL) && s != NULL && *s != '\0') { + extra_env[(*n)++] = g_strdup_printf ("%sTYPE=%s", prefix, s); + g_free (s); + } + + if (ck_session_get_unix_user (session, &u, NULL)) { + extra_env[(*n)++] = g_strdup_printf ("%sUSER_UID=%u", prefix, u); + } + + if (ck_session_get_display_device (session, &s, NULL) && s != NULL && *s != '\0') { + extra_env[(*n)++] = g_strdup_printf ("%sDISPLAY_DEVICE=%s", prefix, s); + g_free (s); + } + + if (ck_session_get_x11_display_device (session, &s, NULL) && s != NULL && *s != '\0') { + extra_env[(*n)++] = g_strdup_printf ("%sX11_DISPLAY_DEVICE=%s", prefix, s); + g_free (s); + } + + if (ck_session_get_x11_display (session, &s, NULL) && s != NULL && *s != '\0') { + extra_env[(*n)++] = g_strdup_printf ("%sX11_DISPLAY=%s", prefix, s); + g_free (s); + } + + if (ck_session_get_remote_host_name (session, &s, NULL) && s != NULL && *s != '\0') { + extra_env[(*n)++] = g_strdup_printf ("%sREMOTE_HOST_NAME=%s", prefix, s); + g_free (s); + } + + if (ck_session_is_local (session, &b, NULL)) + extra_env[(*n)++] = g_strdup_printf ("%sIS_LOCAL=%s", prefix, b ? "true" : "false"); +} + +void +ck_seat_run_programs (CkSeat *seat, + CkSession *old_session, + CkSession *new_session, + const char *action) +{ + int n; + char *extra_env[18]; /* be sure to adjust this as needed when + * you add more variables to the callout's + * environment */ + + n = 0; + + extra_env[n++] = g_strdup_printf ("CK_SEAT_ID=%s", seat->priv->id); + + /* Callout scripts/binaries should check if CK_SEAT_SESSION_ID + * resp. CK_SEAT_OLD_SESSON_ID is set to figure out if there + * will be an active session after the switch, or if there was + * one before. At least one of those environment variables + * will be set, possibly both. Only after checking these + * variables the script should check for the other session + * property variables. */ + + env_add_session_info (old_session, "CK_SEAT_OLD_SESSION_", extra_env, &n); + env_add_session_info (new_session, "CK_SEAT_SESSION_", extra_env, &n); + + extra_env[n++] = NULL; + + g_assert(n <= G_N_ELEMENTS(extra_env)); + + ck_run_programs (SYSCONFDIR "/ConsoleKit/run-seat.d", action, extra_env); + ck_run_programs (PREFIX "/lib/ConsoleKit/run-seat.d", action, extra_env); + + for (n = 0; extra_env[n] != NULL; n++) { + g_free (extra_env[n]); + } +} + +static void dump_seat_session_iter (char *id, CkSession *session, GString *str) @@ -1232,4 +1363,3 @@ ck_seat_dump (CkSeat *seat, g_free (group_name); } - diff --git a/src/ck-seat.h b/src/ck-seat.h index 5977781..fb9a955 100644 --- a/src/ck-seat.h +++ b/src/ck-seat.h @@ -91,6 +91,13 @@ CkSeat * ck_seat_new_with_devices (const char *sid, CkSeatKind kind, GPtrArray *devices); +gboolean ck_seat_register (CkSeat *seat); + +void ck_seat_run_programs (CkSeat *seat, + CkSession *old_session, + CkSession *new_session, + const char *action); + void ck_seat_dump (CkSeat *seat, GKeyFile *key_file); @@ -103,9 +110,6 @@ gboolean ck_seat_add_session (CkSeat *seat, gboolean ck_seat_remove_session (CkSeat *seat, CkSession *session, GError **error); -gboolean ck_seat_set_active_session (CkSeat *seat, - CkSession *session, - GError **error); gboolean ck_seat_add_device (CkSeat *seat, GValueArray *device, GError **error); diff --git a/src/ck-session-glue.h b/src/ck-session-glue.h index b121358..2984bda 100644 --- a/src/ck-session-glue.h +++ b/src/ck-session-glue.h @@ -53,7 +53,7 @@ G_BEGIN_DECLS #endif /* !G_ENABLE_DEBUG */ -/* NONE:BOOLEAN,POINTER (/tmp/dbus-binding-tool-c-marshallers.CAALXU:1) */ +/* NONE:BOOLEAN,POINTER (/tmp/dbus-binding-tool-c-marshallers.3QM4YU:1) */ extern void dbus_glib_marshal_ck_session_VOID__BOOLEAN_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, @@ -97,7 +97,7 @@ dbus_glib_marshal_ck_session_VOID__BOOLEAN_POINTER (GClosure *closure, } #define dbus_glib_marshal_ck_session_NONE__BOOLEAN_POINTER dbus_glib_marshal_ck_session_VOID__BOOLEAN_POINTER -/* BOOLEAN:POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.CAALXU:2) */ +/* BOOLEAN:POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.3QM4YU:2) */ extern void dbus_glib_marshal_ck_session_BOOLEAN__POINTER_POINTER (GClosure *closure, GValue *return_value, guint n_param_values, @@ -144,7 +144,7 @@ dbus_glib_marshal_ck_session_BOOLEAN__POINTER_POINTER (GClosure *closure, g_value_set_boolean (return_value, v_return); } -/* NONE:POINTER (/tmp/dbus-binding-tool-c-marshallers.CAALXU:3) */ +/* NONE:POINTER (/tmp/dbus-binding-tool-c-marshallers.3QM4YU:3) */ #define dbus_glib_marshal_ck_session_VOID__POINTER g_cclosure_marshal_VOID__POINTER #define dbus_glib_marshal_ck_session_NONE__POINTER dbus_glib_marshal_ck_session_VOID__POINTER diff --git a/src/ck-session-leader.c b/src/ck-session-leader.c index 322b7fd..3702602 100644 --- a/src/ck-session-leader.c +++ b/src/ck-session-leader.c @@ -689,7 +689,6 @@ ck_session_leader_dump (CkSessionLeader *session_leader, g_key_file_set_string (key_file, group_name, "session", session_leader->priv->session_id); g_key_file_set_integer (key_file, group_name, "uid", session_leader->priv->uid); g_key_file_set_integer (key_file, group_name, "pid", session_leader->priv->pid); - g_key_file_set_string (key_file, group_name, "cookie", session_leader->priv->cookie); g_key_file_set_string (key_file, group_name, "service_name", session_leader->priv->service_name); g_free (group_name); diff --git a/src/ck-session.c b/src/ck-session.c index 4009ee1..d8db9dd 100644 --- a/src/ck-session.c +++ b/src/ck-session.c @@ -399,7 +399,6 @@ ck_session_set_active (CkSession *session, if (session->priv->active != active) { session->priv->active = active; - ck_session_run_programs (session, "session_active_changed"); g_signal_emit (session, signals [ACTIVE_CHANGED], 0, active); } @@ -1285,6 +1284,8 @@ ck_session_run_programs (CkSession *session, extra_env[n++] = g_strdup_printf ("CK_SESSION_IS_LOCAL=%s", session->priv->is_local ? "true" : "false"); extra_env[n++] = NULL; + g_assert(n <= G_N_ELEMENTS(extra_env)); + ck_run_programs (SYSCONFDIR "/ConsoleKit/run-session.d", action, extra_env); ck_run_programs (PREFIX "/lib/ConsoleKit/run-session.d", action, extra_env); @@ -1306,10 +1307,6 @@ ck_session_dump (CkSession *session, group_name, "seat", NONULL_STRING (session->priv->seat_id)); - g_key_file_set_string (key_file, - group_name, - "cookie", - NONULL_STRING (session->priv->cookie)); if (session->priv->session_type != NULL) { g_key_file_set_string (key_file, group_name, @@ -1362,4 +1359,3 @@ ck_session_dump (CkSession *session, g_free (group_name); } - diff --git a/src/ck-session.h b/src/ck-session.h index c9ebd08..b6b565b 100644 --- a/src/ck-session.h +++ b/src/ck-session.h @@ -76,6 +76,9 @@ CkSession * ck_session_new_with_parameters (const char *ss void ck_session_dump (CkSession *session, GKeyFile *key_file); +void ck_session_run_programs (CkSession *session, + const char *action); + gboolean ck_session_set_active (CkSession *session, gboolean active, diff --git a/src/ck-sysdeps-solaris.c b/src/ck-sysdeps-solaris.c index cd17bf7..bc3b695 100644 --- a/src/ck-sysdeps-solaris.c +++ b/src/ck-sysdeps-solaris.c @@ -286,6 +286,7 @@ ck_unix_pid_get_env_hash (pid_t pid) } out: + pclose (fp); return hash; } diff --git a/tools/Makefile.in b/tools/Makefile.in index 0d16d00..7c550a8 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -425,8 +425,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ exit 1;; \ esac; \ done; \ @@ -680,7 +680,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS diff --git a/tools/ck-history.c b/tools/ck-history.c index 716c3ef..606106c 100644 --- a/tools/ck-history.c +++ b/tools/ck-history.c @@ -236,10 +236,10 @@ find_first_matching_remove_event (GList *events, etype = ((CkLogEvent *)l->data)->type; /* skip all non removal events */ - if (etype != CK_LOG_EVENT_SEAT_SESSION_REMOVED - || etype == CK_LOG_EVENT_SYSTEM_START - || etype == CK_LOG_EVENT_SYSTEM_STOP - || etype == CK_LOG_EVENT_SYSTEM_RESTART) { + if (! (etype == CK_LOG_EVENT_SEAT_SESSION_REMOVED + || etype == CK_LOG_EVENT_SYSTEM_START + || etype == CK_LOG_EVENT_SYSTEM_STOP + || etype == CK_LOG_EVENT_SYSTEM_RESTART)) { continue; } @@ -262,6 +262,33 @@ find_first_matching_remove_event (GList *events, return revent; } +static CkLogEvent * +find_first_matching_system_stop_event (GList *events, + CkLogSeatSessionAddedEvent *event) +{ + CkLogEvent *revent; + GList *l; + + revent = NULL; + + for (l = events; l != NULL; l = l->next) { + CkLogEventType etype; + + etype = ((CkLogEvent *)l->data)->type; + + /* skip all non removal events */ + if (! (etype == CK_LOG_EVENT_SYSTEM_STOP + || etype == CK_LOG_EVENT_SYSTEM_RESTART)) { + continue; + } + + revent = (CkLogEvent *)l->data; + break; + } + + return revent; +} + static char * get_user_name_for_uid (int uid) { @@ -309,8 +336,12 @@ get_utline_for_event (CkLogEvent *event) { CkLogSeatSessionAddedEvent *e; e = (CkLogSeatSessionAddedEvent *)event; - if (e->session_x11_display != NULL && e->session_x11_display[0] != '\0') { - utline = g_strdup (e->session_x11_display); + if (e->session_x11_display_device != NULL && e->session_x11_display_device[0] != '\0') { + if (g_str_has_prefix (e->session_x11_display_device, "/dev/")) { + utline = g_strdup (e->session_x11_display_device + 5); + } else { + utline = g_strdup (e->session_x11_display_device); + } } else { if (g_str_has_prefix (e->session_display_device, "/dev/")) { utline = g_strdup (e->session_display_device + 5); @@ -354,23 +385,26 @@ get_user_name_for_event (CkLogEvent *event) static char * get_host_for_event (CkLogEvent *event) { - char *username; + char *name; - username = NULL; + name = NULL; switch (event->type) { case CK_LOG_EVENT_SEAT_SESSION_ADDED: - username = g_strdup (((CkLogSeatSessionAddedEvent *)event)->session_remote_host_name); + name = g_strdup (((CkLogSeatSessionAddedEvent *)event)->session_remote_host_name); + if (name == NULL) { + /* If not set then use the display value */ + name = g_strdup (((CkLogSeatSessionAddedEvent *)event)->session_x11_display); + } break; case CK_LOG_EVENT_SYSTEM_START: - /* FIXME: get kernel version */ - username = g_strdup (""); + name = g_strdup (((CkLogSystemStartEvent *)event)->kernel_release); break; default: g_assert_not_reached (); } - return username; + return name; } static RecordStatus @@ -408,7 +442,14 @@ get_duration (CkLogEvent *event, int days; char *duration; - secs = remove_event->timestamp.tv_sec - event->timestamp.tv_sec; + if (remove_event != NULL) { + secs = remove_event->timestamp.tv_sec - event->timestamp.tv_sec; + } else { + GTimeVal now; + g_get_current_time (&now); + secs = now.tv_sec - event->timestamp.tv_sec; + } + mins = (secs / 60) % 60; hours = (secs / 3600) % 24; days = secs / 86400; @@ -449,7 +490,7 @@ print_last_report_record (GList *list, if (event->type == CK_LOG_EVENT_SEAT_SESSION_ADDED) { e = (CkLogSeatSessionAddedEvent *)event; - remove_event = find_first_matching_remove_event (list, e); + remove_event = find_first_matching_remove_event (list->next, e); status = get_event_record_status (remove_event); session_type = e->session_type; @@ -457,6 +498,7 @@ print_last_report_record (GList *list, seat_id = e->seat_id; } else { status = RECORD_STATUS_REBOOT; + remove_event = find_first_matching_system_stop_event (list->next, e); session_type = ""; session_id = ""; @@ -480,7 +522,7 @@ print_last_report_record (GList *list, addedtime); } else { g_string_printf (str, - "%-8.8s %12s %-10.10s %-7.7s %-12.12s %-16.16s %-16.16s", + "%-8.8s %12s %-10.10s %-7.7s %-12.12s %-28.28s %-16.16s", username, session_type, session_id, @@ -516,9 +558,11 @@ print_last_report_record (GList *list, removedtime = g_strdup (" gone"); break; case RECORD_STATUS_REBOOT: + duration = get_duration (event, remove_event); removedtime = g_strdup (""); break; case RECORD_STATUS_TIMECHANGE: + duration = g_strdup (""); removedtime = g_strdup (""); break; case RECORD_STATUS_NORMAL: diff --git a/tools/ck-log-system-start.c b/tools/ck-log-system-start.c index 4afdfa0..0860429 100644 --- a/tools/ck-log-system-start.c +++ b/tools/ck-log-system-start.c @@ -28,6 +28,7 @@ #include <fcntl.h> #include <sys/types.h> #include <sys/stat.h> +#include <sys/utsname.h> #include <string.h> #include <locale.h> @@ -40,6 +41,7 @@ #define DEFAULT_LOG_FILENAME LOCALSTATEDIR "/log/ConsoleKit/history" +#define LINUX_KERNEL_CMDLINE "/proc/cmdline" /* Adapted from auditd auditd-event.c */ static gboolean @@ -157,16 +159,46 @@ write_log_for_event (CkLogEvent *event) return TRUE; } +static char * +get_boot_arguments (void) +{ + char *contents; + gboolean res; + + contents = NULL; + res = g_file_get_contents (LINUX_KERNEL_CMDLINE, + &contents, + NULL, + NULL); + if (!res) { + g_free (contents); + contents = NULL; + } else { + g_strchomp (contents); + } + + return contents; +} + int main (int argc, char **argv) { CkLogEvent event; + CkLogSystemStartEvent *e; + struct utsname uts; memset (&event, 0, sizeof (CkLogEvent)); event.type = CK_LOG_EVENT_SYSTEM_START; g_get_current_time (&event.timestamp); + e = (CkLogSystemStartEvent *) &event; + + if (uname (&uts) == 0) { + e->kernel_release = uts.release; + } + + e->boot_arguments = get_boot_arguments (); write_log_for_event (&event); diff --git a/tools/freebsd/Makefile.in b/tools/freebsd/Makefile.in index 4019804..f8f71df 100644 --- a/tools/freebsd/Makefile.in +++ b/tools/freebsd/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -242,8 +242,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ exit 1;; \ esac; \ done; \ @@ -368,7 +368,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS diff --git a/tools/linux/Makefile.in b/tools/linux/Makefile.in index 150a2e0..77ae749 100644 --- a/tools/linux/Makefile.in +++ b/tools/linux/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -242,8 +242,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ exit 1;; \ esac; \ done; \ @@ -368,7 +368,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS diff --git a/tools/solaris/Makefile.in b/tools/solaris/Makefile.in index 17b6520..52e1504 100644 --- a/tools/solaris/Makefile.in +++ b/tools/solaris/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -242,8 +242,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ exit 1;; \ esac; \ done; \ @@ -368,7 +368,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS |