diff --git a/.gitignore b/.gitignore index 0125a36..26c8e4d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,8 @@ -ConsoleKit-0.4.1.tar.bz2 +/ConsoleKit-0.4.1.tar.bz2 /ConsoleKit-0.4.2.tar.bz2 /ConsoleKit-0.4.3.tar.bz2 +.build-*.log +ConsoleKit-*.src.rpm +x86_64 +/ConsoleKit-0.4.4.tar.bz2 +/ConsoleKit-0.4.5.tar.bz2 diff --git a/0001-systemd-make-sure-the-file-system-is-writable-before.patch b/0001-systemd-make-sure-the-file-system-is-writable-before.patch deleted file mode 100644 index 5aa97af..0000000 --- a/0001-systemd-make-sure-the-file-system-is-writable-before.patch +++ /dev/null @@ -1,59 +0,0 @@ -From c163d26a97f4f69422ec4ea0cfe4c7e211d824c1 Mon Sep 17 00:00:00 2001 -From: Lennart Poettering -Date: Tue, 14 Sep 2010 01:08:06 +0200 -Subject: [PATCH] systemd: make sure the file system is writable before we write log data - ---- - data/console-kit-log-system-restart.service.in | 3 ++- - data/console-kit-log-system-start.service.in | 3 ++- - data/console-kit-log-system-stop.service.in | 3 ++- - 3 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/data/console-kit-log-system-restart.service.in b/data/console-kit-log-system-restart.service.in -index 905b330..ad8f624 100644 ---- a/data/console-kit-log-system-restart.service.in -+++ b/data/console-kit-log-system-restart.service.in -@@ -1,8 +1,9 @@ - [Unit] - Description=Console System Reboot Logging - DefaultDependencies=no -+Wants=local-fs.target sysinit.target -+After=local-fs.target sysinit.target console-kit-system-start.service - Before=poweroff.service reboot.service halt.service killall.service --After=console-kit-system-start.service - - [Service] - Type=oneshot -diff --git a/data/console-kit-log-system-start.service.in b/data/console-kit-log-system-start.service.in -index 56e1022..ccda7f4 100644 ---- a/data/console-kit-log-system-start.service.in -+++ b/data/console-kit-log-system-start.service.in -@@ -1,8 +1,9 @@ - [Unit] - Description=Console System Startup Logging - DefaultDependencies=no -+Wants=local-fs.target sysinit.target -+After=local-fs.target sysinit.target - Before=poweroff.service reboot.service halt.service killall.service --After=local-fs.target - - [Service] - Type=oneshot -diff --git a/data/console-kit-log-system-stop.service.in b/data/console-kit-log-system-stop.service.in -index 3292238..928e6bf 100644 ---- a/data/console-kit-log-system-stop.service.in -+++ b/data/console-kit-log-system-stop.service.in -@@ -1,8 +1,9 @@ - [Unit] - Description=Console System Shutdown Logging - DefaultDependencies=no -+Wants=local-fs.target sysinit.target -+After=local-fs.target sysinit.target console-kit-system-start.service - Before=poweroff.service reboot.service halt.service killall.service --After=console-kit-system-start.service - - [Service] - Type=oneshot --- -1.7.2.3 - diff --git a/ConsoleKit.spec b/ConsoleKit.spec index 214b58e..e8fc98a 100644 --- a/ConsoleKit.spec +++ b/ConsoleKit.spec @@ -5,8 +5,8 @@ Summary: System daemon for tracking users, sessions and seats Name: ConsoleKit -Version: 0.4.3 -Release: 5%{?dist} +Version: 0.4.5 +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.freedesktop.org/wiki/Software/ConsoleKit @@ -192,9 +192,18 @@ fi %doc %{_datadir}/doc/%{name}-%{version}/spec/* %changelog +* Tue Feb 7 2012 Lennart Poettering - 0.4.5-2 +- Forward port changes from f15 which were never applied to master + * Thu Jan 12 2012 Fedora Release Engineering - 0.4.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild +* Tue May 3 2011 Lennart Poettering - 0.4.5-1 +- New upstream release + +* Thu Feb 17 2011 Lennart Poettering - 0.4.4-1 +- New upstream release + * Fri Feb 11 2011 Matthias Clasen - 0.4.3-4 - Co-own /etc/init directory (#645082) diff --git a/nodaemon.patch b/nodaemon.patch deleted file mode 100644 index c4c08e9..0000000 --- a/nodaemon.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -up ConsoleKit-0.4.1/data/org.freedesktop.ConsoleKit.service.in.nodaemon ConsoleKit-0.4.1/data/org.freedesktop.ConsoleKit.service.in ---- ConsoleKit-0.4.1/data/org.freedesktop.ConsoleKit.service.in.nodaemon 2009-12-15 10:56:39.839818556 -0500 -+++ ConsoleKit-0.4.1/data/org.freedesktop.ConsoleKit.service.in 2009-12-15 10:56:50.177792048 -0500 -@@ -1,4 +1,4 @@ - [D-BUS Service] - Name=org.freedesktop.ConsoleKit --Exec=@sbindir@/console-kit-daemon -+Exec=@sbindir@/console-kit-daemon --no-daemon - User=root diff --git a/reorder-initialization.patch b/reorder-initialization.patch deleted file mode 100644 index f65abd5..0000000 --- a/reorder-initialization.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -up ConsoleKit-0.4.1/src/main.c.reorder-initialization ConsoleKit-0.4.1/src/main.c ---- ConsoleKit-0.4.1/src/main.c.reorder-initialization 2009-12-18 14:51:38.821212946 -0500 -+++ ConsoleKit-0.4.1/src/main.c 2009-12-18 14:52:19.246211176 -0500 -@@ -294,11 +294,19 @@ main (int argc, - - setup_debug_log (debug); - -+ g_debug ("initializing console-kit-daemon %s", VERSION); -+ - connection = get_system_bus (); - if (connection == NULL) { - goto out; - } - -+ manager = ck_manager_new (); -+ -+ if (manager == NULL) { -+ goto out; -+ } -+ - bus_proxy = get_bus_proxy (connection); - if (bus_proxy == NULL) { - g_warning ("Could not construct bus_proxy object; bailing out"); -@@ -310,16 +318,8 @@ main (int argc, - goto out; - } - -- g_debug ("initializing console-kit-daemon %s", VERSION); -- - create_pid_file (); - -- manager = ck_manager_new (); -- -- if (manager == NULL) { -- goto out; -- } -- - loop = g_main_loop_new (NULL, FALSE); - - g_signal_connect (bus_proxy, diff --git a/small-fixes.patch b/small-fixes.patch deleted file mode 100644 index 2586ec9..0000000 --- a/small-fixes.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -up ConsoleKit-0.3.1/src/ck-manager.c.small-fixes ConsoleKit-0.3.1/src/ck-manager.c ---- ConsoleKit-0.3.1/src/ck-manager.c.small-fixes 2009-07-31 22:32:32.382848777 -0400 -+++ ConsoleKit-0.3.1/src/ck-manager.c 2009-07-31 22:34:55.159597733 -0400 -@@ -810,12 +810,9 @@ check_polkit_permissions (CkManager - 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 - NULL, - (GAsyncReadyCallback)auth_ready_callback, - data); -+ g_object_unref (subject); - } - - static void -@@ -873,14 +871,12 @@ get_polkit_permissions (CkManager *man - { - 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 *man - (GAsyncReadyCallback) ready_cb, - context); - g_object_unref (subject); -- - } - #endif - diff --git a/sources b/sources index 147e519..5cfa616 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4c39c6eacc75334b890f21eead1d2945 ConsoleKit-0.4.3.tar.bz2 +f2657f93761206922d558471a936fbc3 ConsoleKit-0.4.5.tar.bz2