[Lunar-commits] <moonbase> bluez: version bump and some adjustments to BUILD/init script.

[Dennis 'stumbles' Veatch]

commit fea57fc7c49c9c969ebe6a0ea000bff65bf40f16
Author: Dennis 'stumbles' Veatch <stumbles at lunar-linux.org>
Date:   Mon Jun 8 13:11:51 2009 -0400

    bluez: version bump and some adjustments to BUILD/init script.
    
    One important kernel module for audio via bluetooth headphones is;
    
    CONFIG_INPUT_UINPUT=m
    
    You still need to something like;
    
    mplayer -ao alsa:device=bluetooth
    
    The added patch adds a console entry. This whole thing is likely to evolve.
---
 bluetooth/bluez/BUILD             |   14 +++++++----
 bluetooth/bluez/DETAILS           |    9 ++++--
 bluetooth/bluez/init.d/bluetoothd |   48 +-----------------------------------
 3 files changed, 17 insertions(+), 54 deletions(-)

diff --git a/bluetooth/bluez/BUILD b/bluetooth/bluez/BUILD
index 8a6960d..bb2f83d 100644
--- a/bluetooth/bluez/BUILD
+++ b/bluetooth/bluez/BUILD
@@ -1,5 +1,7 @@
 (  
 
+  patch_it $SOURCE_CACHE/$SOURCE2 0 &&
+
   OPTS+=" --enable-tools    \
           --enable-bccmd    \
           --enable-hid2hci  \
@@ -19,11 +21,13 @@
   sedit "s:#SBCS:SBCS:" audio/audio.conf
   sedit "s:#MPEG:MPEG:" audio/audio.conf
 
-  cp audio/*.conf /etc/bluetooth/    &&
-  cp network/*.conf /etc/bluetooth/  &&
-  cp input/*.conf /etc/bluetooth/    &&
-  if [ -f /etc/udev/bluetooth.rules ]; then
-    mv /etc/udev/bluetooth.rules /lib/udev/rules.d/91.bluetooth.rules
+  cp -f audio/*.conf /etc/bluetooth/    &&
+  cp -f network/*.conf /etc/bluetooth/  &&
+  cp -f input/*.conf /etc/bluetooth/    &&
+
+  if [ ! -d /etc/default ] ; then
+    mkdir -p /etc/default &&
+    cp -f scripts/bluetooth.default /etc/default/bluetooth 
   fi
 
 ) > $C_FIFO 2>&1
diff --git a/bluetooth/bluez/DETAILS b/bluetooth/bluez/DETAILS
index eb36a29..0886671 100644
--- a/bluetooth/bluez/DETAILS
+++ b/bluetooth/bluez/DETAILS
@@ -1,11 +1,14 @@
           MODULE=bluez
-         VERSION=4.39
+         VERSION=4.41
           SOURCE=$MODULE-$VERSION.tar.gz
+         SOURCE2=$MODULE-$VERSION.dbus.access.patch
       SOURCE_URL=http://www.kernel.org/pub/linux/bluetooth/
-      SOURCE_VFY=sha1:5fbc3316c8003df47c9fe3a0f577e4518bb18185
+     SOURCE2_URL=$PATCH_URL
+      SOURCE_VFY=sha1:b983c4062ada1e731c07dc79adbb123fe351a5d9
+     SOURCE2_VFY=sha1:1bea7d4cc74f55b8861544b42b07244b555c8550
         WEB_SITE=http://www.bluez.org
          ENTERED=20090328
-         UPDATED=20090511
+         UPDATED=20090608
            SHORT="support for core Bluetooth layers and protocols"
 
 cat << EOF
diff --git a/bluetooth/bluez/init.d/bluetoothd b/bluetooth/bluez/init.d/bluetoothd
index 247339b..c88b6ea 100644
--- a/bluetooth/bluez/init.d/bluetoothd
+++ b/bluetooth/bluez/init.d/bluetoothd
@@ -5,52 +5,8 @@
 # chkconfig: 345 80 20
 # description: Startup/shutdown script for the Bluetooth daemons
 # processname: /usr/sbin/bluetoothd
-#
-
-. /lib/lsb/init-functions $1
-
-
-set -e
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-NAME=bluetooth
-DESC="Bluetooth subsystem"
-
-DAEMON_NAME=bluetoothd
-HID2HCI_NAME=hid2hci
-
-DAEMON_EXEC="`which $DAEMON_NAME || true`"
-HID2HCI_EXEC="`which $HID2HCI_NAME || true`"
-
-DAEMON_ENABLE=true
-HID2HCI_ENABLE=true
+# config: /etc/bluetooth/main.conf
 
-[ -e /etc/default/bluetooth ] && . /etc/default/bluetooth
+ . /lib/lsb/init-functions $1
 
-case "$1" in
-  start)
-	echo -n "Starting $DESC:"
-	if $DAEMON_ENABLE && [ -x "$DAEMON_EXEC" ]; then
-		$DAEMON_EXEC
-		echo -n " $DAEMON_NAME"
-	fi
-	if $HID2HCI_ENABLE && [ -x "$HID2HCI_EXEC" ] ; then
-		$HID2HCI_EXEC --tohci > /dev/null 2>&1 || true
-		echo -n " $HID2HCI_NAME"
-	fi
-	echo "."
-	;;
-  stop)
-	echo -n "Stopping $DESC:"
-	killall $DAEMON_NAME > /dev/null 2>&1 || true
-	echo -n " $DAEMON_NAME"
-	echo "."
-	;;
-  *)
-	N=/etc/init.d/$NAME
-	echo "Usage: $N {start|stop}" >&2
-	exit 1
-	;;
-esac
 
-exit 0