From 1e258fc15e3abfc861cbe46eca7169b3835c87d2 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@fedoraproject.org>
Date: Dec 09 2008 11:28:35 +0000
Subject: - Fix D-Bus configuration for latest D-Bus (#475069)


---

diff --git a/bluez.spec b/bluez.spec
index 593fee2..6615d1a 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -1,13 +1,14 @@
 Summary: Bluetooth utilities
 Name: bluez
 Version: 4.22
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
 Source1: bluetooth.init
 Source2: bluetooth.conf
 Source3: bluez-uinput.modules
+Source4: dbus-bluetooth.conf
 Patch1: bluez-utils-oui-usage.patch
 Patch2: 0001-Add-icon-for-other-audio-device.patch
 
@@ -100,6 +101,8 @@ use in Bluetooth applications.
 %patch1 -p0 -b .oui
 %patch2 -p1
 
+cp -a %{SOURCE4} src/bluetooth.conf
+
 %build
 %configure --enable-cups --enable-hid2hci --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund
 make
@@ -189,6 +192,9 @@ fi
 %{_libdir}/alsa-lib/*.so
 
 %changelog
+* Tue Dec 09 2008 - Bastien Nocera <bnocera@redhat.com> - 4.22-2
+- Fix D-Bus configuration for latest D-Bus (#475069)
+
 * Mon Dec 08 2008 - Bastien Nocera <bnocera@redhat.com> - 4.22-1
 - Update to 4.22
 
diff --git a/dbus-bluetooth.conf b/dbus-bluetooth.conf
new file mode 100644
index 0000000..c047623
--- /dev/null
+++ b/dbus-bluetooth.conf
@@ -0,0 +1,24 @@
+<!-- This configuration file specifies the required security policies
+     for Bluetooth core daemon to work. -->
+
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+  <!-- ../system.conf have denied everything, so we just punch some holes -->
+
+  <policy user="root">
+    <allow own="org.bluez"/>
+    <allow send_destination="org.bluez"/>
+    <allow send_interface="org.bluez.Agent"/>
+  </policy>
+
+  <policy at_console="true">
+    <allow send_destination="org.bluez"/>
+  </policy>
+
+  <policy context="default">
+    <deny send_destination="org.bluez"/>
+  </policy>
+
+</busconfig>