[Pkg-utopia-commits] r2704 - in /packages/unstable/consolekit/debian/patches: 05-dbus_policy.patch series

[smcv at users.alioth.debian.org]

Author: smcv
Date: Tue Jan  6 03:11:15 2009
New Revision: 2704

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=2704
Log:
Add patch to series, and amend it so it actually applies to Debian's CK

Modified:
    packages/unstable/consolekit/debian/patches/05-dbus_policy.patch
    packages/unstable/consolekit/debian/patches/series

Modified: packages/unstable/consolekit/debian/patches/05-dbus_policy.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/consolekit/debian/patches/05-dbus_policy.patch?rev=2704&op=diff
==============================================================================
--- packages/unstable/consolekit/debian/patches/05-dbus_policy.patch (original)
+++ packages/unstable/consolekit/debian/patches/05-dbus_policy.patch Tue Jan  6 03:11:15 2009
@@ -1,4 +1,5 @@
-Patch from Colin Walters for http://bugs.freedesktop.org/show_bug.cgi?id=19020.
+Patch from Colin Walters for http://bugs.freedesktop.org/show_bug.cgi?id=19020,
+adapted to apply to Debian's ConsoleKit.
 
 He writes:
 > This patch is relatively conservative; it adds send_destination= to all the
@@ -14,9 +15,9 @@
 > the policy file can be *much* simpler; see:
 > http://lists.freedesktop.org/archives/dbus/2008-December/010717.html
 
---- 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 @@
+--- a/data/ConsoleKit.conf	2009-01-06 02:59:15.000000000 +0000
++++ b/data/ConsoleKit.conf	2009-01-06 03:04:38.000000000 +0000
+@@ -8,89 +8,129 @@
      <allow own="org.freedesktop.ConsoleKit"/>
  
      <!-- Allow all methods on interfaces -->
@@ -33,23 +34,15 @@
 -    <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" 
++    <deny send_destination="org.freedesktop.ConsoleKit"
 +          send_interface="org.freedesktop.ConsoleKit.Manager"/>
-+    <deny send_destination="org.freedesktop.ConsoleKit" 
++    <deny send_destination="org.freedesktop.ConsoleKit"
 +          send_interface="org.freedesktop.ConsoleKit.Seat"/>
-+    <deny send_destination="org.freedesktop.ConsoleKit" 
++    <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"
@@ -127,10 +120,6 @@
 -    <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"
@@ -179,9 +168,21 @@
 -    <allow send_interface="org.freedesktop.ConsoleKit.Session"
 +    <allow send_destination="org.freedesktop.ConsoleKit"
 +           send_interface="org.freedesktop.ConsoleKit.Session"
-+           send_member="SetIdleHint"/>
+            send_member="GetIdleSinceHint"/>
++
 +    <allow send_destination="org.freedesktop.ConsoleKit"
 +           send_interface="org.freedesktop.ConsoleKit.Session"
-            send_member="GetIdleSinceHint"/>
++           send_member="SetIdleHint"/>
    </policy>
  
+   <policy user="root">
+-    <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"/>
+   </policy>
+ 

Modified: packages/unstable/consolekit/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/consolekit/debian/patches/series?rev=2704&op=diff
==============================================================================
--- packages/unstable/consolekit/debian/patches/series (original)
+++ packages/unstable/consolekit/debian/patches/series Tue Jan  6 03:11:15 2009
@@ -2,3 +2,4 @@
 02-exit_with_dbus.patch
 03-cleanup_console_tags.patch
 04-defer_daemonizing.patch
+05-dbus_policy.patch