From 8465e8865e6708b4fc1693aab0ae12347ce9522d Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@fedoraproject.org>
Date: Jan 14 2009 05:26:12 +0000
Subject: - Add patch to fix up dbus permissions


---

diff --git a/ConsoleKit.spec b/ConsoleKit.spec
index e1b2bcb..e747814 100644
--- a/ConsoleKit.spec
+++ b/ConsoleKit.spec
@@ -25,6 +25,8 @@ BuildRequires: zlib-devel
 BuildRequires: xmlto
 
 Patch0: ConsoleKit-0.3.0-get-vt-from-display-instead-of-controlling-tty.patch
+# http://bugs.freedesktop.org/show_bug.cgi?id=19020
+Patch1: consolekit-dbus-permissions.patch
 
 %description
 ConsoleKit is a system daemon for tracking what users are logged
@@ -80,6 +82,7 @@ This package contains developer documentation for ConsoleKit.
 %prep
 %setup -q
 %patch0 -p1 -b .get-vt-from-display-instead-of-controlling-tty
+%patch1 -p0 -b .consolekit
 
 %build
 %configure --with-pid-file=%{_localstatedir}/run/console-kit-daemon.pid --enable-pam-module --with-pam-module-dir=/%{_lib}/security --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version}
@@ -160,6 +163,9 @@ fi
 %doc %{_datadir}/doc/%{name}-%{version}/spec/*
 
 %changelog
+* Wed Jan 14 2009 Colin Walters <walters@verbum.org> - 0.3.0-4
+- Add patch to fix up dbus permissions
+
 * Fri Nov 21 2008 Matthias Clasen  <mclasen@redhat.com> - 0.3.0-3
 - Tweak descriptions
 
diff --git a/consolekit-dbus-permissions.patch b/consolekit-dbus-permissions.patch
new file mode 100644
index 0000000..d52992e
--- /dev/null
+++ b/consolekit-dbus-permissions.patch
@@ -0,0 +1,171 @@
+--- data/ConsoleKit.conf	2008-04-19 01:39:49.000000000 -0400
++++ /home/walters/ConsoleKit.conf.in	2008-12-11 14:05:46.000000000 -0500
+@@ -8,88 +8,128 @@
+     <allow own="org.freedesktop.ConsoleKit"/>
+ 
+     <!-- Allow all methods on interfaces -->
+-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"/>
+-    <allow send_interface="org.freedesktop.ConsoleKit.Seat"/>
+-    <allow send_interface="org.freedesktop.ConsoleKit.Session"/>
++    <allow send_destination="org.freedesktop.ConsoleKit"/>
+   </policy>
+ 
+   <!-- Deny all and then allow some methods on interfaces -->
+   <policy context="default">
+-    <deny send_interface="org.freedesktop.ConsoleKit.Manager"/>
+-    <deny send_interface="org.freedesktop.ConsoleKit.Seat"/>
+-    <deny send_interface="org.freedesktop.ConsoleKit.Session"/>
++    <allow send_destination="org.freedesktop.ConsoleKit"
++           send_interface="org.freedesktop.DBus.Introspectable"/>
++    <deny send_destination="org.freedesktop.ConsoleKit" 
++          send_interface="org.freedesktop.ConsoleKit.Manager"/>
++    <deny send_destination="org.freedesktop.ConsoleKit" 
++          send_interface="org.freedesktop.ConsoleKit.Seat"/>
++    <deny send_destination="org.freedesktop.ConsoleKit" 
++          send_interface="org.freedesktop.ConsoleKit.Session"/>
+     <deny send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.DBus.Properties" />
+ 
+-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
++    <allow send_destination="org.freedesktop.ConsoleKit"
++           send_interface="org.freedesktop.ConsoleKit.Manager"
+            send_member="Restart"/>
+-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
++    <allow send_destination="org.freedesktop.ConsoleKit"
++           send_interface="org.freedesktop.ConsoleKit.Manager"
+            send_member="Stop"/>
+-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
++    <allow send_destination="org.freedesktop.ConsoleKit"
++           send_interface="org.freedesktop.ConsoleKit.Manager"
+            send_member="OpenSession"/>
+-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
++    <allow send_destination="org.freedesktop.ConsoleKit"
++           send_interface="org.freedesktop.ConsoleKit.Manager"
+            send_member="CloseSession"/>
+-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
++    <allow send_destination="org.freedesktop.ConsoleKit"
++           send_interface="org.freedesktop.ConsoleKit.Manager"
+            send_member="GetSeats"/>
+-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
++    <allow send_destination="org.freedesktop.ConsoleKit"
++           send_interface="org.freedesktop.ConsoleKit.Manager"
+            send_member="GetSessionForCookie"/>
+-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
++    <allow send_destination="org.freedesktop.ConsoleKit"
++           send_interface="org.freedesktop.ConsoleKit.Manager"
+            send_member="GetSessionForUnixProcess"/>
+-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
++    <allow send_destination="org.freedesktop.ConsoleKit"
++           send_interface="org.freedesktop.ConsoleKit.Manager"
+            send_member="GetCurrentSession"/>
+-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
++    <allow send_destination="org.freedesktop.ConsoleKit"
++           send_interface="org.freedesktop.ConsoleKit.Manager"
+            send_member="GetSessionsForUnixUser"/>
+-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
++    <allow send_destination="org.freedesktop.ConsoleKit"
++           send_interface="org.freedesktop.ConsoleKit.Manager"
+            send_member="GetSessionsForUser"/>
+-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
++    <allow send_destination="org.freedesktop.ConsoleKit"
++           send_interface="org.freedesktop.ConsoleKit.Manager"
+            send_member="GetSystemIdleHint"/>
+-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
++    <allow send_destination="org.freedesktop.ConsoleKit"
++           send_interface="org.freedesktop.ConsoleKit.Manager"
+            send_member="GetSystemIdleSinceHint"/>
+ 
+-    <allow send_interface="org.freedesktop.ConsoleKit.Seat"
++    <allow send_destination="org.freedesktop.ConsoleKit"
++           send_interface="org.freedesktop.ConsoleKit.Seat"
+            send_member="GetId"/>
+-    <allow send_interface="org.freedesktop.ConsoleKit.Seat"
++    <allow send_destination="org.freedesktop.ConsoleKit"
++           send_interface="org.freedesktop.ConsoleKit.Seat"
+            send_member="GetSessions"/>
+-    <allow send_interface="org.freedesktop.ConsoleKit.Seat"
++    <allow send_destination="org.freedesktop.ConsoleKit"
++           send_interface="org.freedesktop.ConsoleKit.Seat"
+            send_member="GetDevices"/>
+-    <allow send_interface="org.freedesktop.ConsoleKit.Seat"
++    <allow send_destination="org.freedesktop.ConsoleKit"
++           send_interface="org.freedesktop.ConsoleKit.Seat"
+            send_member="GetActiveSession"/>
+-    <allow send_interface="org.freedesktop.ConsoleKit.Seat"
++    <allow send_destination="org.freedesktop.ConsoleKit"
++           send_interface="org.freedesktop.ConsoleKit.Seat"
+            send_member="CanActivateSessions"/>
+-    <allow send_interface="org.freedesktop.ConsoleKit.Seat"
++    <allow send_destination="org.freedesktop.ConsoleKit"
++           send_interface="org.freedesktop.ConsoleKit.Seat"
+            send_member="ActivateSession"/>
+ 
+-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
++    <allow send_destination="org.freedesktop.ConsoleKit"
++           send_interface="org.freedesktop.ConsoleKit.Session"
+            send_member="GetId"/>
+-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
++    <allow send_destination="org.freedesktop.ConsoleKit"
++           send_interface="org.freedesktop.ConsoleKit.Session"
+            send_member="GetSeatId"/>
+-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
++    <allow send_destination="org.freedesktop.ConsoleKit"
++           send_interface="org.freedesktop.ConsoleKit.Session"
+            send_member="GetLoginSessionId"/>
+-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
++    <allow send_destination="org.freedesktop.ConsoleKit"
++           send_interface="org.freedesktop.ConsoleKit.Session"
+            send_member="GetSessionType"/>
+-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
++    <allow send_destination="org.freedesktop.ConsoleKit"
++           send_interface="org.freedesktop.ConsoleKit.Session"
+            send_member="GetUser"/>
+-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
++    <allow send_destination="org.freedesktop.ConsoleKit"
++           send_interface="org.freedesktop.ConsoleKit.Session"
+            send_member="GetUnixUser"/>
+-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
++    <allow send_destination="org.freedesktop.ConsoleKit"
++           send_interface="org.freedesktop.ConsoleKit.Session"
+            send_member="GetX11Display"/>
+-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
++    <allow send_destination="org.freedesktop.ConsoleKit"
++           send_interface="org.freedesktop.ConsoleKit.Session"
+            send_member="GetX11DisplayDevice"/>
+-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
++    <allow send_destination="org.freedesktop.ConsoleKit"
++           send_interface="org.freedesktop.ConsoleKit.Session"
+            send_member="GetDisplayDevice"/>
+-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
++    <allow send_destination="org.freedesktop.ConsoleKit"
++           send_interface="org.freedesktop.ConsoleKit.Session"
+            send_member="GetRemoteHostName"/>
+-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
++    <allow send_destination="org.freedesktop.ConsoleKit"
++           send_interface="org.freedesktop.ConsoleKit.Session"
+            send_member="IsActive"/>
+-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
++    <allow send_destination="org.freedesktop.ConsoleKit"
++           send_interface="org.freedesktop.ConsoleKit.Session"
+            send_member="IsLocal"/>
+-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
++    <allow send_destination="org.freedesktop.ConsoleKit"
++           send_interface="org.freedesktop.ConsoleKit.Session"
+            send_member="GetCreationTime"/>
+-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
++    <allow send_destination="org.freedesktop.ConsoleKit"
++           send_interface="org.freedesktop.ConsoleKit.Session"
+            send_member="Activate"/>
+-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
++    <allow send_destination="org.freedesktop.ConsoleKit"
++           send_interface="org.freedesktop.ConsoleKit.Session"
+            send_member="GetIdleHint"/>
+-    <allow send_interface="org.freedesktop.ConsoleKit.Session"
++    <allow send_destination="org.freedesktop.ConsoleKit"
++           send_interface="org.freedesktop.ConsoleKit.Session"
++           send_member="SetIdleHint"/>
++    <allow send_destination="org.freedesktop.ConsoleKit"
++           send_interface="org.freedesktop.ConsoleKit.Session"
+            send_member="GetIdleSinceHint"/>
+   </policy>
+