[Lunar-commits] <moonbase> bluez: version bump and a few more adjustments.

[Dennis `stumbles` Veatch]

commit 5ab6160a42aa66657c586baaef4e782e6c11ced9
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Fri Sep 25 08:19:16 2009 -0400

    bluez: version bump and a few more adjustments.
---
 bluetooth/bluez/BUILD                   |   30 ++++++++++++++---------
 bluetooth/bluez/CONFIGURE               |    2 +-
 bluetooth/bluez/DETAILS                 |    6 ++--
 bluetooth/bluez/init.d/bluetooth_serial |   39 -------------------------------
 4 files changed, 22 insertions(+), 55 deletions(-)

diff --git a/bluetooth/bluez/BUILD b/bluetooth/bluez/BUILD
index 9e5178e..8a05c12 100644
--- a/bluetooth/bluez/BUILD
+++ b/bluetooth/bluez/BUILD
@@ -1,6 +1,6 @@
 (  
 
-  patch_it $SOURCE_CACHE/$SOURCE2 0  &&
+#  patch_it $SOURCE_CACHE/$SOURCE2 0  &&
 
   OPTS+=" --build=$BUILD          \
           --host=$BUILD           \
@@ -10,16 +10,22 @@
 
   default_build  &&
 
-  sedit "s:#\[A:\[A:" audio/audio.conf   &&
-  sedit "s:#SBCS:SBCS:" audio/audio.conf &&
-  sedit "s:#MPEG:MPEG:" audio/audio.conf &&
-  sedit "s:#AutoConnect:AutoConnect:" audio/audio.conf &&
-
-  mkdir -p /etc/bluetooth                 &&
-  cp -f audio/audio.conf /etc/bluetooth/  &&
-  cp -f network/*.conf /etc/bluetooth/    &&
-  cp -f input/*.conf /etc/bluetooth/      &&
-  cp -f audio/bluetooth.conf /etc/asound.conf  &&
-  cp -f serial/serial.conf /etc/bluetooth/
+#  sedit "s:#\[A:\[A:" audio/audio.conf   &&
+#  sedit "s:#SBCS:SBCS:" audio/audio.conf &&
+#  sedit "s:#MPEG:MPEG:" audio/audio.conf &&
+#  sedit "s:#AutoConnect:AutoConnect:" audio/audio.conf &&
+
+  mkdir -p /etc/bluetooth                  &&
+  cp -f audio/audio.conf /etc/bluetooth/   &&
+  cp -f network/*.conf /etc/bluetooth/     &&
+  cp -f input/*.conf /etc/bluetooth/       &&
+  cp -f serial/serial.conf /etc/bluetooth/ &&
+
+  mkdir -p /etc/alsa &&
+  cp -f audio/bluetooth.conf /etc/alsa  &&
+
+  echo -e "@hooks [\n\t{\n\t\tfunc load\n\t\tfiles [\n\t\t\t"/etc/alsa/bluetooth.conf"\n\t\t]\n\
+          \t\terrors false\n\t}\n]" > $SOURCE_DIRECTORY/asound.conf &&
+  install -m644 asound.conf /etc/ 
 
 ) > $C_FIFO 2>&1
diff --git a/bluetooth/bluez/CONFIGURE b/bluetooth/bluez/CONFIGURE
index b546596..c985af4 100644
--- a/bluetooth/bluez/CONFIGURE
+++ b/bluetooth/bluez/CONFIGURE
@@ -6,4 +6,4 @@ mquery HIDD "Install HID daemon?" y "--enable-hidd" "--disable-hidd"
 mquery PAND "Install PAN daemon?" y "--enable-pand" "--disable-pand"
 mquery DUND "Install DUN daemon?" y "--enable-dund" "--disable-dund"
 mquery TEST "Install test programs?" y "--enable-test" "--disable-test"
-mquery CONFILES "Install Bluetooth configuration files" n "--enable-configfiles" "--disable-configfiles"
+ mquery CONFILES "Install Bluetooth configuration files" n "--enable-configfiles" "--disable-configfiles"
diff --git a/bluetooth/bluez/DETAILS b/bluetooth/bluez/DETAILS
index 01d47a8..b61f0f8 100644
--- a/bluetooth/bluez/DETAILS
+++ b/bluetooth/bluez/DETAILS
@@ -1,14 +1,14 @@
           MODULE=bluez
-         VERSION=4.53
+         VERSION=4.54
           SOURCE=$MODULE-$VERSION.tar.gz
          SOURCE2=$MODULE-4.41.dbus.access.patch
       SOURCE_URL=http://www.kernel.org/pub/linux/bluetooth/
      SOURCE2_URL=$PATCH_URL
-      SOURCE_VFY=sha1:3b6493f2a9b91bb9146918a86a960383e9de7ccd
+      SOURCE_VFY=sha1:b61ea5eebf524c3d3fad41fda649e8b63feb3383
      SOURCE2_VFY=sha1:1bea7d4cc74f55b8861544b42b07244b555c8550
         WEB_SITE=http://www.bluez.org
          ENTERED=20090328
-         UPDATED=20090910
+         UPDATED=20090925
            SHORT="support for core Bluetooth layers and protocols"
 
 cat << EOF
diff --git a/bluetooth/bluez/init.d/bluetooth_serial b/bluetooth/bluez/init.d/bluetooth_serial
deleted file mode 100644
index 6250624..0000000
--- a/bluetooth/bluez/init.d/bluetooth_serial
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-#
-# chkconfig: 345 80 20
-# description: Startup/shutdown script for Bluetooth serial PCMCIA card initialization
-
- . /lib/lsb/init-functions $1
-
-start_serial()
-{
-	if [ ! -x /bin/setserial -o ! -x /usr/sbin/hciattach ]; then
-		logger "$0: setserial or hciattach not executable, cannot start $DEVNAME"
-		return 1
-	fi
-
-	if [ "$BAUDBASE" != "" ]; then
-		/bin/setserial $DEVNAME baud_base $BAUDBASE
-	fi
-
-	/usr/sbin/hciattach $DEVNAME $HCIOPTS 2>&1 | logger -t hciattach
-}
-
-stop_serial()
-{
-	[ -x /bin/fuser ] || return 1 
-
-	/bin/fuser -k -HUP $DEVNAME > /dev/null
-}
-
-case "$ACTION" in
-   add)
-	start_serial
-	;;
-   remove)
-	stop_serial
-	;;
-   *)
-	logger "Unknown action received $0: $ACTION"
-	;;
-esac