[arch-commits] CVS update of arch/build/system/bluez-utils (5 files)
Thomas Baechler
thomas at archlinux.org
Fri Jul 13 22:31:25 UTC 2007
Date: Friday, July 13, 2007 @ 18:31:25
Author: thomas
Path: /home/cvs-arch/arch/build/system/bluez-utils
Added: bluetooth.conf.d (1.1) bluetooth.rc (1.1)
Modified: PKGBUILD (1.28 -> 1.29)
Removed: bluepin.patch (1.1) initscript.patch (1.1)
upgpkg: bluez-utils 3.12-1
------------------+
PKGBUILD | 26 ++++++------
bluepin.patch | 12 -----
bluetooth.conf.d | 36 +++++++++++++++++
bluetooth.rc | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++
initscript.patch | 19 --------
5 files changed, 161 insertions(+), 44 deletions(-)
Index: arch/build/system/bluez-utils/PKGBUILD
diff -u arch/build/system/bluez-utils/PKGBUILD:1.28 arch/build/system/bluez-utils/PKGBUILD:1.29
--- arch/build/system/bluez-utils/PKGBUILD:1.28 Wed May 30 18:27:08 2007
+++ arch/build/system/bluez-utils/PKGBUILD Fri Jul 13 18:31:24 2007
@@ -1,31 +1,31 @@
-# $Id: PKGBUILD,v 1.28 2007/05/30 22:27:08 tpowa Exp $
+# $Id: PKGBUILD,v 1.29 2007/07/13 22:31:24 thomas Exp $
pkgname=bluez-utils
-pkgver=3.11
+pkgver=3.12
pkgrel=1
pkgdesc="Utilities for the Linux Bluetooth protocol stack"
arch=(i686 x86_64)
url="http://www.bluez.org/"
-depends=('bluez-libs>=3.11' 'libusb' 'dbus>=0.93')
+depends=('bluez-libs>=3.12' 'libusb' 'dbus>=0.93')
license=('GPL')
backup=(etc/bluetooth/{hcid.conf,rfcomm.conf,pin} etc/conf.d/bluetooth)
source=(http://bluez.sf.net/download/bluez-utils-${pkgver}.tar.gz
- initscript.patch)
+ bluetooth.rc bluetooth.conf.d)
+md5sums=('ce95f814d65390c5b8221b74381a0f9a'
+ '1291c1c1547af77a4955416fd34cfc1f'
+ 'dda606b16264859b007ec777c7a5627d')
build() {
cd ${startdir}/src/${pkgname}-${pkgver}
- patch -Np0 -i ${startdir}/src/initscript.patch || return 1
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --enable-pcmcia
make || return 1
# appease the RedHat-centric Makefile
mkdir -p ${startdir}/pkg/etc/init.d
- make DESTDIR=${startdir}/pkg install
+ make DESTDIR=${startdir}/pkg install || return 1
rm -rf ${startdir}/pkg/etc/init.d ${startdir}/pkg/etc/rc.d
- install -D -m755 scripts/bluetooth.init ${startdir}/pkg/etc/rc.d/bluetooth
- sed -i 's|default|conf.d|g' ${startdir}/pkg/etc/rc.d/bluetooth
- install -D -m644 scripts/bluetooth.default ${startdir}/pkg/etc/conf.d/bluetooth
- install -D -m755 ${startdir}/src/bluez-utils-${pkgver}/daemon/passkey-agent ${startdir}/pkg/usr/bin/passkey-agent
-}
+
+ install -D -m755 ${startdir}/src/bluetooth.rc ${startdir}/pkg/etc/rc.d/bluetooth
+ install -D -m644 ${startdir}/src/bluetooth.conf.d ${startdir}/pkg/etc/conf.d/bluetooth
-md5sums=('703fed8e09e25b5e1f01be337576e343'
- '7a3f6b6fcac57a0944271c19744f3604')
+ install -D -m755 ${startdir}/src/bluez-utils-${pkgver}/daemon/passkey-agent ${startdir}/pkg/usr/bin/passkey-agent || return 1
+}
Index: arch/build/system/bluez-utils/bluepin.patch
diff -u arch/build/system/bluez-utils/bluepin.patch:1.1 arch/build/system/bluez-utils/bluepin.patch:removed
--- arch/build/system/bluez-utils/bluepin.patch:1.1 Wed Jan 26 14:40:53 2005
+++ arch/build/system/bluez-utils/bluepin.patch Fri Jul 13 18:31:24 2007
@@ -1,12 +0,0 @@
-diff -Naur bluez-utils-2.14-orig/scripts/bluepin bluez-utils-2.14/scripts/bluepin
---- bluez-utils-2.14-orig/scripts/bluepin 2004-03-05 15:14:00.000000000 -0800
-+++ bluez-utils-2.14/scripts/bluepin 2005-01-26 11:19:35.000000000 -0800
-@@ -28,7 +28,7 @@
- break
-
- os.environ['DISPLAY'] = disp
-- os.environ['XAUTHORITY'] = auth
-+# os.environ['XAUTHORITY'] = auth
-
- # Set X display before initializing GTK
- set_display()
Index: arch/build/system/bluez-utils/bluetooth.conf.d
diff -u /dev/null arch/build/system/bluez-utils/bluetooth.conf.d:1.1
--- /dev/null Fri Jul 13 18:31:24 2007
+++ arch/build/system/bluez-utils/bluetooth.conf.d Fri Jul 13 18:31:25 2007
@@ -0,0 +1,36 @@
+# Bluetooth configuraton file
+
+# Bluetooth services (allowed values are "true" and "false")
+
+# Run the hcid daemon (default: true)
+#DAEMON_ENABLE="true"
+
+# Run hid2hci (default: false)
+#HID2HCI_ENABLE="false"
+
+# Run the sdp daemon (default: false)
+# If this is disabled, hcid's internal sdp daemon will be used
+#SDPD_ENABLE="false"
+
+# Run the bluetooth HID daemon (default: false)
+#HIDD_ENABLE="false"
+
+# Activate rfcomm ports (default: false)
+#RFCOMM_ENABLE="false"
+
+# Run bluetooth dial-up networking daemon (default: false)
+#DUND_ENABLE="false"
+
+# Run bluetooth PAN daemon (default: false)
+#PAND_ENABLE="false"
+
+# hcid configuration file (default: /etc/bluetooth/hcid.conf)
+#DAEMON_CONFIG="/etc/bluetooth/hcid.conf"
+
+# rfcomm configuration file (default: /etc/bluetooth/rfcomm.conf)
+#RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
+
+# Options for hidd, dund and pand (default: none)
+#HIDD_OPTIONS=""
+#DUND_OPTIONS=""
+#PAND_OPTIONS=""
Index: arch/build/system/bluez-utils/bluetooth.rc
diff -u /dev/null arch/build/system/bluez-utils/bluetooth.rc:1.1
--- /dev/null Fri Jul 13 18:31:24 2007
+++ arch/build/system/bluez-utils/bluetooth.rc Fri Jul 13 18:31:25 2007
@@ -0,0 +1,112 @@
+#!/bin/sh
+#
+# Start/stop the Bluetooth daemons
+#
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+DAEMON_NAME="hcid"
+HID2HCI_NAME="hid2hci"
+SDPD_NAME="sdpd"
+HIDD_NAME="hidd"
+RFCOMM_NAME="rfcomm"
+PAND_NAME="pand"
+DUND_NAME="dund"
+
+DAEMON_EXEC="/usr/sbin/hcid"
+HID2HCI_EXEC="/usr/sbin/hid2hci"
+SDPD_EXEC="/usr/sbin/sdpd"
+HIDD_EXEC="/usr/bin/hidd"
+RFCOMM_EXEC="/usr/bin/rfcomm"
+PAND_EXEC="/usr/bin/pand"
+DUND_EXEC="/usr/bin/dund"
+
+DAEMON_ENABLE="true"
+HID2HCI_ENABLE="false"
+SDPD_ENABLE="false"
+HIDD_ENABLE="false"
+RFCOMM_ENABLE="false"
+DUND_ENABLE="false"
+PAND_ENABLE="false"
+
+DAEMON_CONFIG="/etc/bluetooth/hcid.conf"
+RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
+
+HIDD_OPTIONS=""
+DUND_OPTIONS=""
+PAND_OPTIONS=""
+
+[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth
+
+case "$1" in
+ start)
+ stat_busy "Starting bluetooth subsystem:"
+ if [ "$DAEMON_ENABLE" = "true" -a -x "$DAEMON_EXEC" -a -f "$DAEMON_CONFIG" ] ; then
+ stat_append " $DAEMON_NAME"
+ if [ "$SDPD_ENABLE" = "true" ]; then
+ $DAEMON_EXEC -f $DAEMON_CONFIG
+ else
+ $DAEMON_EXEC -s -f $DAEMON_CONFIG
+ fi
+ fi
+ if [ "$HID2HCI_ENABLE" = "true" -a -x "$HID2HCI_EXEC" ] ; then
+ stat_append " $HID2HCI_NAME"
+ $HID2HCI_EXEC --tohci > /dev/null 2>&1 || true
+ fi
+ if [ "$SDPD_ENABLE" = "true" -a -x "$SDPD_EXEC" ] ; then
+ stat_append " $SDPD_NAME"
+ $SDPD_EXEC
+ fi
+ if [ "$HIDD_ENABLE" = "true" -a -x "$HIDD_EXEC" ]; then
+ stat_append " $HIDD_NAME"
+ $HIDD_EXEC $HIDD_OPTIONS --server
+ fi
+ if [ "$RFCOMM_ENABLE" = "true" -a -x "$RFCOMM_EXEC" -a -f "$RFCOMM_CONFIG" ]; then
+ stat_append " $RFCOMM_NAME"
+ $RFCOMM_EXEC -f $RFCOMM_CONFIG bind all
+ fi
+ if [ "$DUND_ENABLE" = "true" -a -x "$DUND_EXEC" -a -n "$DUND_OPTIONS" ]; then
+ stat_append " $DUND_NAME"
+ $DUND_EXEC $DUND_OPTIONS
+ fi
+ if [ "$PAND_ENABLE" = "true" -a -x "$PAND_EXEC" -a -n "$PAND_OPTIONS" ]; then
+ stat_append " $PAND_NAME"
+ $PAND_EXEC $PAND_OPTIONS
+ fi
+ stat_done
+ ;;
+ stop)
+ stat_busy "Stopping bluetooth subsystem:"
+
+ stat_append " $PAND_NAME"
+ killall $PAND_NAME >/dev/null 2>&1
+
+ stat_append " $DUND_NAME"
+ killall $DUND_NAME >/dev/null 2>&1
+
+ if [ -x "$RFCOMM_EXEC" ]; then
+ stat_append " $RFCOMM_NAME"
+ $RFCOMM_EXEC release all >/dev/null 2>&1
+ fi
+
+ stat_append " $HIDD_NAME"
+ killall $HIDD_NAME >/dev/null 2>&1
+
+ stat_append " $SDPD_NAME"
+ killall $SDPD_NAME >/dev/null 2>&1
+
+ stat_append " $DAEMON_NAME"
+ killall $DAEMON_NAME >/dev/null 2>&1
+
+ stat_done
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
Index: arch/build/system/bluez-utils/initscript.patch
diff -u arch/build/system/bluez-utils/initscript.patch:1.1 arch/build/system/bluez-utils/initscript.patch:removed
--- arch/build/system/bluez-utils/initscript.patch:1.1 Sun Oct 15 09:43:09 2006
+++ arch/build/system/bluez-utils/initscript.patch Fri Jul 13 18:31:24 2007
@@ -1,19 +0,0 @@
---- scripts/bluetooth.init.orig 2006-10-15 13:39:22.000000000 +0000
-+++ scripts/bluetooth.init 2006-10-15 13:40:06.000000000 +0000
-@@ -93,9 +93,14 @@
- echo -n " $HCID_NAME"
- echo "."
- ;;
-+ restart)
-+ $0 stop
-+ sleep 1
-+ $0 start
-+ ;;
- *)
-- N=/etc/init.d/$NAME
-- echo "Usage: $N {start|stop}" >&2
-+ N=/etc/rc.d/$NAME
-+ echo "Usage: $N {start|stop|restart}" >&2
- exit 1
- ;;
- esac
More information about the arch-commits
mailing list