* 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)

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/dbus@864 ceb527fc-18e6-0310-9fe2-813c157c29e7

3 files changed, 36 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index d10bf4fd..9f32278e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,11 @@ dbus (0.62-2) unstable; urgency=low
     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@debian.org>  Wed, 21 Jun 2006 01:11:56 +0200
+ -- Sjoerd Simons <sjoerd@debian.org>  Wed, 21 Jun 2006 09:38:06 +0200
 
 
 dbus (0.62-1) unstable; urgency=low
diff --git a/debian/dbus.install b/debian/dbus.install
index 0f333d56..186f6d4f 100644
--- a/debian/dbus.install
+++ b/debian/dbus.install
@@ -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
diff --git a/debian/session.conf b/debian/session.conf
new file mode 100644
index 00000000..74a911c9
--- /dev/null
+++ b/debian/session.conf
@@ -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>