summaryrefslogtreecommitdiffstats
path: root/source/n/bluez/patches
diff options
context:
space:
mode:
Diffstat (limited to 'source/n/bluez/patches')
-rw-r--r--source/n/bluez/patches/bluez-dbus-config.patch25
-rw-r--r--source/n/bluez/patches/bluez-run_udev_helper.patch12
-rw-r--r--source/n/bluez/patches/bluez-unbreak_dell_mouse.patch14
3 files changed, 51 insertions, 0 deletions
diff --git a/source/n/bluez/patches/bluez-dbus-config.patch b/source/n/bluez/patches/bluez-dbus-config.patch
new file mode 100644
index 000000000..4160600a5
--- /dev/null
+++ b/source/n/bluez/patches/bluez-dbus-config.patch
@@ -0,0 +1,25 @@
+Use the plugdev group for bluetooth on Slackware, and allow this to
+ work as expected with our current setup.
+
+diff -Nur bluez-4.61.orig//src/bluetooth.conf bluez-4.61/src/bluetooth.conf
+--- bluez-4.61.orig//src/bluetooth.conf 2010-02-18 17:48:50.434527785 -0600
++++ bluez-4.61/src/bluetooth.conf 2010-02-18 17:47:30.727431004 -0600
+@@ -11,11 +11,16 @@
+ <allow own="org.bluez"/>
+ <allow send_destination="org.bluez"/>
+ <allow send_interface="org.bluez.Agent"/>
++ <allow send_interface="org.bluez.Adapter"/>
+ <allow send_interface="org.bluez.HandsfreeAgent"/>
+ </policy>
+
+- <policy at_console="true">
+- <allow send_destination="org.bluez"/>
++ <policy group="plugdev">
++ <allow send_destination="org.bluez"/>
++ <allow send_interface="org.bluez.Agent"/>
++ <allow send_interface="org.bluez.Adapter"/>
++ <allow send_destination="org.bluez"
++ send_interface="org.freedesktop.DBus.Introspectable"/>
+ </policy>
+
+ <!-- allow users of lp group (printing subsystem) to
diff --git a/source/n/bluez/patches/bluez-run_udev_helper.patch b/source/n/bluez/patches/bluez-run_udev_helper.patch
new file mode 100644
index 000000000..188607453
--- /dev/null
+++ b/source/n/bluez/patches/bluez-run_udev_helper.patch
@@ -0,0 +1,12 @@
+Instead of automatically starting the bluetooth subsystem when devices
+ are added, let's invoke a wrapper script in /lib/udev and have that
+ wrapper check whether /etc/rc.d/rc.bluetooth is executable first.
+
+diff -Nur bluez-4.59.orig/scripts/bluetooth.rules.in bluez-4.59/scripts/bluetooth.rules.in
+--- bluez-4.59.orig/scripts/bluetooth.rules.in 2009-07-06 15:21:40.000000000 -0500
++++ bluez-4.59/scripts/bluetooth.rules.in 2009-12-30 11:50:37.069164823 -0600
+@@ -1,3 +1,3 @@
+ # Run helper every time a Bluetooth device appears
+ # On remove actions, bluetoothd should go away by itself
+-ACTION=="add", SUBSYSTEM=="bluetooth", RUN+="@prefix@/sbin/bluetoothd --udev"
++ACTION=="add", SUBSYSTEM=="bluetooth", RUN+="/lib/udev/bluetooth.sh"
diff --git a/source/n/bluez/patches/bluez-unbreak_dell_mouse.patch b/source/n/bluez/patches/bluez-unbreak_dell_mouse.patch
new file mode 100644
index 000000000..ec0b4a96b
--- /dev/null
+++ b/source/n/bluez/patches/bluez-unbreak_dell_mouse.patch
@@ -0,0 +1,14 @@
+One of the Dell USB mice gets broken by this rule, so we'll unbreak it.
+
+diff -Nur bluez-4.59.orig/scripts/bluetooth-hid2hci.rules bluez-4.59/scripts/bluetooth-hid2hci.rules
+--- bluez-4.59.orig/scripts/bluetooth-hid2hci.rules 2009-05-19 04:04:10.000000000 -0500
++++ bluez-4.59/scripts/bluetooth-hid2hci.rules 2009-12-30 12:34:14.165164370 -0600
+@@ -8,7 +8,7 @@
+ # 413c:8154
+ # 413c:8158
+ # 413c:8162
+-ACTION=="add", ENV{ID_VENDOR}=="413c", ENV{ID_CLASS}=="mouse", ATTRS{bmAttributes}=="e0", KERNEL=="mouse*", RUN+="/usr/sbin/hid2hci --method dell -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hci"
++# ACTION=="add", ENV{ID_VENDOR}=="413c", ENV{ID_CLASS}=="mouse", ATTRS{bmAttributes}=="e0", KERNEL=="mouse*", RUN+="/usr/sbin/hid2hci --method dell -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hci"
+
+ # Logitech devices
+ ACTION=="add", ENV{ID_VENDOR}=="046d", ENV{ID_MODEL}=="c703" RUN+="/usr/sbin/hid2hci --method logitech -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hci"