[Pkg-utopia-commits] r864 - packages/unstable/dbus/debian

[Sjoerd Simons]

Author: sjoerd
Date: 2006-06-21 07:39:52 +0000 (Wed, 21 Jun 2006)
New Revision: 864

Added:
   packages/unstable/dbus/debian/session.conf
Modified:
   packages/unstable/dbus/debian/changelog
   packages/unstable/dbus/debian/dbus.install
Log:
* debian/session.conf
  + Install a custom dbus session.conf. In the generated one some variables
  aren't expanded, causing the session bus to fail (Closes: #374747)

Modified: packages/unstable/dbus/debian/changelog
===================================================================
--- packages/unstable/dbus/debian/changelog	2006-06-20 23:14:00 UTC (rev 863)
+++ packages/unstable/dbus/debian/changelog	2006-06-21 07:39:52 UTC (rev 864)
@@ -4,8 +4,11 @@
     doesn't accidentally pickup qt4 files
   * debian/libdbus-qt4-1-dev.install: Also install the dbuscpp2xml and
     dbusidl2cpp utilities
+  * debian/session.conf
+    + Install a custom dbus session.conf. In the generated one some variables
+    aren't expanded, causing the session bus to fail (Closes: #374747)
 
- -- Sjoerd Simons <sjoerd at debian.org>  Wed, 21 Jun 2006 01:11:56 +0200
+ -- Sjoerd Simons <sjoerd at debian.org>  Wed, 21 Jun 2006 09:38:06 +0200
 
 
 dbus (0.62-1) unstable; urgency=low

Modified: packages/unstable/dbus/debian/dbus.install
===================================================================
--- packages/unstable/dbus/debian/dbus.install	2006-06-20 23:14:00 UTC (rev 863)
+++ packages/unstable/dbus/debian/dbus.install	2006-06-21 07:39:52 UTC (rev 864)
@@ -1,5 +1,6 @@
 debian/tmp/var/run/dbus
-debian/tmp/etc/dbus-1
+debian/tmp/etc/dbus-1/system.conf
+debian/session.conf etc/dbus-1
 debian/tmp/usr/bin/dbus-daemon
 debian/tmp/usr/bin/dbus-cleanup-sockets
 debian/tmp/usr/bin/dbus-launch

Added: packages/unstable/dbus/debian/session.conf
===================================================================
--- packages/unstable/dbus/debian/session.conf	2006-06-20 23:14:00 UTC (rev 863)
+++ packages/unstable/dbus/debian/session.conf	2006-06-21 07:39:52 UTC (rev 864)
@@ -0,0 +1,30 @@
+<!-- This configuration file controls the per-user-login-session message bus.
+     Add a session-local.conf and edit that rather than changing this 
+     file directly. -->
+
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+  <!-- Our well-known bus type, don't change this -->
+  <type>session</type>
+
+  <listen>unix:tmpdir=/tmp</listen>
+
+  <servicedir>/usr/share/dbus-1/services</servicedir>
+
+  <policy context="default">
+    <!-- Allow everything to be sent -->
+    <allow send_destination="*"/>
+    <!-- Allow everything to be received -->
+    <allow eavesdrop="true"/>
+    <!-- Allow anyone to own anything -->
+    <allow own="*"/>
+  </policy>
+
+  <!-- This is included last so local configuration can override what's 
+       in this standard file -->
+  <include ignore_missing="yes">session-local.conf</include>
+
+  <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include>
+
+</busconfig>