[Pkg-utopia-commits] r2372 - in /packages/unstable/consolekit/debian: changelog patches/ patches/01-dbus_policy.patch rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sun Jul 20 21:08:32 2008
New Revision: 2372

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=2372
Log:
  - Include simple-patchsys.mk for patch management.
* debian/patches/01-dbus_policy.patch
  - Allow only root to call the Restart and Stop D-Bus methods since we are
    not using PolicyKit to restrict the access to those methods.

Added:
    packages/unstable/consolekit/debian/patches/
    packages/unstable/consolekit/debian/patches/01-dbus_policy.patch
Modified:
    packages/unstable/consolekit/debian/changelog
    packages/unstable/consolekit/debian/rules

Modified: packages/unstable/consolekit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/consolekit/debian/changelog?rev=2372&op=diff
==============================================================================
--- packages/unstable/consolekit/debian/changelog (original)
+++ packages/unstable/consolekit/debian/changelog Sun Jul 20 21:08:32 2008
@@ -19,12 +19,16 @@
       Script shamelessly taken from Ubuntu. (Closes: #422349)
   * debian/rules
     - Install pam-foreground-compat.ck into /usr/lib/ConsoleKit/run-session.d. 
+    - Include simple-patchsys.mk for patch management.
   * debian/90consolekit
     - Xsession ConsoleKit integration. Script is taken from Ubuntu but renamed
       to better fit with the existing naming conventions for Xsession scripts.
       (Closes: #452627)
+  * debian/patches/01-dbus_policy.patch
+    - Allow only root to call the Restart and Stop D-Bus methods since we are
+      not using PolicyKit to restrict the access to those methods.
 
- -- Michael Biebl <biebl at debian.org>  Sun, 20 Jul 2008 22:38:05 +0200
+ -- Michael Biebl <biebl at debian.org>  Sun, 20 Jul 2008 22:56:50 +0200
 
 consolekit (0.2.3-3) unstable; urgency=low
 

Added: packages/unstable/consolekit/debian/patches/01-dbus_policy.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/consolekit/debian/patches/01-dbus_policy.patch?rev=2372&op=file
==============================================================================
--- packages/unstable/consolekit/debian/patches/01-dbus_policy.patch (added)
+++ packages/unstable/consolekit/debian/patches/01-dbus_policy.patch Sun Jul 20 21:08:32 2008
@@ -1,0 +1,27 @@
+diff --git a/data/ConsoleKit.conf b/data/ConsoleKit.conf
+index dbe29f8..5f29e7f 100644
+--- a/data/ConsoleKit.conf
++++ b/data/ConsoleKit.conf
+@@ -22,10 +22,6 @@
+           send_interface="org.freedesktop.DBus.Properties" />
+ 
+     <allow send_interface="org.freedesktop.ConsoleKit.Manager"
+-           send_member="Restart"/>
+-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
+-           send_member="Stop"/>
+-    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
+            send_member="OpenSession"/>
+     <allow send_interface="org.freedesktop.ConsoleKit.Manager"
+            send_member="CloseSession"/>
+@@ -93,4 +89,11 @@
+            send_member="GetIdleSinceHint"/>
+   </policy>
+ 
++  <policy user="root">
++    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
++           send_member="Restart"/>
++    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
++           send_member="Stop"/>
++  </policy>
++
+ </busconfig>

Modified: packages/unstable/consolekit/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/consolekit/debian/rules?rev=2372&op=diff
==============================================================================
--- packages/unstable/consolekit/debian/rules (original)
+++ packages/unstable/consolekit/debian/rules Sun Jul 20 21:08:32 2008
@@ -3,6 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_CONFIGURE_LIBEXECDIR := "\$$(prefix)/lib/ConsoleKit"