[oe-commits] Koen Kooi : bluez4: add less restrictive (and hence less secure) bluetooth dbus config
GIT User account
git at amethyst.openembedded.net
Mon Apr 13 12:33:33 UTC 2009
Module: openembedded.git
Branch: stable/2009
Commit: 697c7afd8428dab02f3da6fd414de97489228a09
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=697c7afd8428dab02f3da6fd414de97489228a09
Author: Koen Kooi <koen at openembedded.org>
Date: Thu Apr 9 00:04:06 2009 +0000
bluez4: add less restrictive (and hence less secure) bluetooth dbus config
* this makes bluetooth actually work for non-root users and when using ssh/vnc/etc
* this also overwrites the bluetooth.conf in the files/ that wasn't used anymore
* this also includes the fixup commit from .dev named "bluez4: fix dbus service file"
Signed-off-by: Koen Kooi <koen at openembedded.org>
Acked-by: Khem Raj <raj.khem at gmail.com>
---
recipes/bluez/bluez4_4.31.bb | 5 ++++-
recipes/bluez/files/bluetooth.conf | 29 ++++++++++++++++-------------
2 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/recipes/bluez/bluez4_4.31.bb b/recipes/bluez/bluez4_4.31.bb
index 15e8b00..8c2f656 100644
--- a/recipes/bluez/bluez4_4.31.bb
+++ b/recipes/bluez/bluez4_4.31.bb
@@ -4,12 +4,13 @@ PRIORITY = "optional"
DEPENDS = "gst-plugins-base alsa-lib libusb-compat dbus-glib"
HOMEPAGE = "http://www.bluez.org"
LICENSE = "GPL"
-PR = "r4"
+PR = "r6"
SRC_URI = "\
http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \
file://fix-dfutool-usb-declaration-mismatch.patch;patch=1 \
file://sbc-thumb.patch;patch=1 \
+ file://bluetooth.conf \
# file://hid2hci_usb_init.patch;patch=1 \
"
S = "${WORKDIR}/bluez-${PV}"
@@ -43,6 +44,8 @@ do_install_append() {
install -m 0644 ${S}/audio/audio.conf ${D}/${sysconfdir}/bluetooth/
install -m 0644 ${S}/network/network.conf ${D}/${sysconfdir}/bluetooth/
install -m 0644 ${S}/input/input.conf ${D}/${sysconfdir}/bluetooth/
+ # at_console doesn't really work with the current state of OE, so punch some more holes so people can actually use BT
+ install -m 0644 ${WORKDIR}/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/
}
PACKAGES =+ "gst-plugin-bluez libasound-module-bluez"
diff --git a/recipes/bluez/files/bluetooth.conf b/recipes/bluez/files/bluetooth.conf
index 8720847..ca5e9e4 100644
--- a/recipes/bluez/files/bluetooth.conf
+++ b/recipes/bluez/files/bluetooth.conf
@@ -1,13 +1,16 @@
-#
-# additional cards for /etc/pcmcia/bluetooth.conf
-# Note for OE: This file is _appended_ to the stock
-# bluetooth.conf in bluez-utils, so no need to duplicate
-# entries for individual cards.
-#
-card "CSR BT01x0M Bluetooth CF Card"
- version "Bluetooth BT0100M", "", ""
- bind "serial_cs" class "bluetooth"
-
-card "Socket Bluetooth CF Card Rev. G"
- manfid 0x0104, 0x0096
- bind "serial_cs" class "bluetooth"
+<!-- 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 context="default">
+ <allow own="org.bluez"/>
+ <allow send_destination="org.bluez"/>
+ <allow send_interface="org.bluez.Agent"/>
+ </policy>
+
+</busconfig>
More information about the Openembedded-commits
mailing list