Author: megabajt Date: Fri May 15 15:21:43 2009 GMT Module: packages Tag: HEAD ---- Log message: - use official patch
---- Files affected: packages/ConsoleKit: ConsoleKit-dbus.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: packages/ConsoleKit/ConsoleKit-dbus.patch diff -u packages/ConsoleKit/ConsoleKit-dbus.patch:1.1 packages/ConsoleKit/ConsoleKit-dbus.patch:1.2 --- packages/ConsoleKit/ConsoleKit-dbus.patch:1.1 Mon Dec 8 17:27:28 2008 +++ packages/ConsoleKit/ConsoleKit-dbus.patch Fri May 15 17:21:38 2009 @@ -1,14 +1,181 @@ ---- data/ConsoleKit.conf~ 2008-04-19 07:39:49.000000000 +0200 -+++ data/ConsoleKit.conf 2008-12-08 17:25:21.910537449 +0100 -@@ -7,6 +7,11 @@ - <policy user="root"> - <allow own="org.freedesktop.ConsoleKit"/> +From e0d9cc359b3099307067107b59ec691418e280b8 Mon Sep 17 00:00:00 2001 +From: Colin Walters <[email protected]> +Date: Sun, 18 Jan 2009 18:06:37 +0000 +Subject: fix up D-Bus permissions -+ <!-- Allow receiving of messages to ConsoleKit interfaces --> -+ <allow receive_interface="org.freedesktop.ConsoleKit.Manager"/> -+ <allow receive_interface="org.freedesktop.ConsoleKit.Seat"/> -+ <allow receive_interface="org.freedesktop.ConsoleKit.Session"/> -+ +--- +diff --git a/data/ConsoleKit.conf b/data/ConsoleKit.conf +index 710d32a..ccbc500 100644 +--- a/data/ConsoleKit.conf ++++ b/data/ConsoleKit.conf +@@ -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.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"/> + <allow send_interface="org.freedesktop.ConsoleKit.Session" + send_member="SetIdleHint"/> +-- +cgit v0.8.2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ConsoleKit/ConsoleKit-dbus.patch?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
