summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--abs/extra-testing/bluez/PKGBUILD22
-rw-r--r--abs/extra-testing/bluez/bluez.install4
-rw-r--r--abs/extra-testing/bluez/run.dund4
-rw-r--r--abs/extra-testing/bluez/run.hid2hci15
-rw-r--r--abs/extra-testing/bluez/run.hidd2
-rw-r--r--abs/extra-testing/bluez/run.pand4
-rw-r--r--abs/extra-testing/bluez/run.rfcomm4
-rw-r--r--abs/extra-testing/bluez/run.sdpd14
8 files changed, 18 insertions, 51 deletions
diff --git a/abs/extra-testing/bluez/PKGBUILD b/abs/extra-testing/bluez/PKGBUILD
index f39539a..83ad50d 100644
--- a/abs/extra-testing/bluez/PKGBUILD
+++ b/abs/extra-testing/bluez/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Geoffroy Carrier <geoffroy@archlinux.org>
pkgname=bluez
-pkgver=4.62
-pkgrel=2
+pkgver=4.63
+pkgrel=1
pkgdesc="Libraries and tools for the Bluetooth protocol stack"
url="http://www.bluez.org/"
arch=('i686' 'x86_64')
@@ -16,8 +16,8 @@ install='bluez.install'
backup=(etc/bluetooth/{main,rfcomm,audio,network,input}.conf
etc/conf.d/bluetooth)
source=("http://www.kernel.org/pub/linux/bluetooth/$pkgname-$pkgver.tar.bz2"
- bluetooth.conf.d run.bluetoothd run.sdpd run.hidd run.dund run.pand
- run.rfcomm run.hid2hci)
+ bluetooth.conf.d run.bluetoothd run.hidd run.dund run.pand
+ run.rfcomm)
build() {
cd "$srcdir/$pkgname-$pkgver"
@@ -49,19 +49,15 @@ build() {
install -D -m644 "$srcdir/$pkgname-$pkgver/audio/audio.conf" "$pkgdir/etc/bluetooth/" || return 1
install -D -m644 "$srcdir/bluetooth.conf.d" "$pkgdir/etc/conf.d/bluetooth" || return 1
install -D -m755 "$srcdir/run.bluetoothd" "$pkgdir/etc/sv/bluetoothd/run" || return 1
- install -D -m755 "$srcdir/run.sdpd" "$pkgdir/etc/sv/sdpd/run" || return 1
install -D -m755 "$srcdir/run.hidd" "$pkgdir/etc/sv/hidd/run" || return 1
install -D -m755 "$srcdir/run.dund" "$pkgdir/etc/sv/dund/run" || return 1
install -D -m755 "$srcdir/run.pand" "$pkgdir/etc/sv/pand/run" || return 1
install -D -m755 "$srcdir/run.rfcomm" "$pkgdir/etc/sv/rfcomm/run" || return 1
- install -D -m755 "$srcdir/run.hid2hci" "$pkgdir/etc/sv/hid2hci/run" || return 1
}
-md5sums=('3c2187a97f5b43ae84b4bbd4b34671e0'
+md5sums=('bb388f3dbb69cd253f23fc32b0f49ffa'
'd12be5b494525bb1ba6eac5c3983dd3e'
'1c88fcd455920ad8ee0c7cae3fe15771'
- 'fc8cdfd1fb0044a674b79c41d5d88388'
- '2483128d1cb93aeaf15d66058c052dc2'
- '95bfe0ff91559d719e5feecb0388b4e1'
- 'b130f90a3cab7dd8a40c558d95c540a2'
- 'a416cdf7cc7c954f6b09d6c2a1d1c0d3'
- 'dd046ee5a232ba7cdbe8006d90b479e5')
+ 'a9c1b4da8b5a3969865272bd0fb01da2'
+ '89c073f43a074844b87e28103e48623d'
+ '8ee99afea417561d01012b8047fd06d5'
+ '934a9eaa25c275d18115068101fb75e8')
diff --git a/abs/extra-testing/bluez/bluez.install b/abs/extra-testing/bluez/bluez.install
index 30bd262..f9b757b 100644
--- a/abs/extra-testing/bluez/bluez.install
+++ b/abs/extra-testing/bluez/bluez.install
@@ -2,12 +2,12 @@ post_install() {
add_service.sh bluetoothd
echo ">>> Only the bluetoothd daemon is started by default."
echo ">>> You can optionally add the following as required:"
- echo ">>> hidd dund pand sdpd rfcomm hid2hci"
+ echo ">>> hidd dund pand rfcomm"
echo ">>> $ sudo add_service.sh <service_name>"
}
pre_remove() {
- for d in { bluetoothd,hidd,dund,pand,sdpd,rfcomm,hid2hci } ; do
+ for d in { bluetoothd,hidd,dund,pand,rfcomm } ; do
if [ -d /var/service/${d} ] ; then
remove_servcie.sh $d
fi
diff --git a/abs/extra-testing/bluez/run.dund b/abs/extra-testing/bluez/run.dund
index 2991813..c42cfa1 100644
--- a/abs/extra-testing/bluez/run.dund
+++ b/abs/extra-testing/bluez/run.dund
@@ -8,7 +8,7 @@
[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth
-svwaitup 3 /var/service/bluetoothd || exit 1
+svwaitup -s 3 /var/service/bluetoothd || exit 1
stat_runit "Starting BlueZ Bluetooth dial-up networking daemon"
- exec /usr/bin/dund -n
+ exec /usr/bin/dund -n -s
diff --git a/abs/extra-testing/bluez/run.hid2hci b/abs/extra-testing/bluez/run.hid2hci
deleted file mode 100644
index 6ef1f47..0000000
--- a/abs/extra-testing/bluez/run.hid2hci
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-#
-# Start/stop the Bluetooth daemons
-#
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth
-
-svwaitup 3 /var/service/bluetoothd || exit 1
-
- stat_runit "Starting Bluetooth HID to HCI mode switching utility"
- /usr/bin/hid2hci --tohci > /dev/null 2>&1 || true
- /sbin/sv down .
diff --git a/abs/extra-testing/bluez/run.hidd b/abs/extra-testing/bluez/run.hidd
index 0887333..e4f66d3 100644
--- a/abs/extra-testing/bluez/run.hidd
+++ b/abs/extra-testing/bluez/run.hidd
@@ -8,7 +8,7 @@
[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth
-svwaitup 3 /var/service/bluetoothd || exit 1
+svwaitup -s 3 /var/service/bluetoothd || exit 1
stat_runit "Starting Bluetooth HID daemon:"
exec /usr/bin/hidd -n --server
diff --git a/abs/extra-testing/bluez/run.pand b/abs/extra-testing/bluez/run.pand
index 937419f..ab15ef6 100644
--- a/abs/extra-testing/bluez/run.pand
+++ b/abs/extra-testing/bluez/run.pand
@@ -8,7 +8,7 @@
[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth
-svwaitup 3 /var/service/bluetoohd || exit 1
+svwaitup -s 3 /var/service/bluetoothd || exit 1
stat_runit "Starting BlueZ Bluetooth PAN daemon"
- exec /usr/bin/pand -n
+ exec /usr/bin/pand -n -s
diff --git a/abs/extra-testing/bluez/run.rfcomm b/abs/extra-testing/bluez/run.rfcomm
index 72b3e0f..8bc619b 100644
--- a/abs/extra-testing/bluez/run.rfcomm
+++ b/abs/extra-testing/bluez/run.rfcomm
@@ -10,8 +10,8 @@
RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
-svwaitup 3 /var/service/bluetoothd || exit 1
+svwaitup -s 3 /var/service/bluetoothd || exit 1
stat_runit "Starting RFCOMM for the bluetooth subsystem"
- /usr/bin/rfcomm -f $RFCOMM_CONFIG bind all
+ /usr/bin/rfcomm -f $RFCOMM_CONFIG bind all
/sbin/sv down .
diff --git a/abs/extra-testing/bluez/run.sdpd b/abs/extra-testing/bluez/run.sdpd
deleted file mode 100644
index aff51ac..0000000
--- a/abs/extra-testing/bluez/run.sdpd
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-#
-# Start/stop the Bluetooth daemons
-#
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth
-
-svwaitup 3 /var/service/bluetoothd || exit 1
-
- stat_runit "Starting bluetooth SDP daemon"
- exec /usr/bin/sdpd -n
generated by cgit v0.12 at 2024-11-04 17:20:44 (GMT)