diff options
| author | root <root@rshg054.dnsready.net> | 2012-06-26 00:01:48 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-06-26 00:01:48 +0000 |
| commit | 9a6b691757346035549dbd12d1323301d04a6675 (patch) | |
| tree | 5e06d2322b58a73254a0ca2c05d2083cb0209db2 /extra/bluez | |
| parent | 3b99c42eb8ca744e86e4e17197b1bf10642c6785 (diff) | |
Tue Jun 26 00:01:48 UTC 2012
Diffstat (limited to 'extra/bluez')
| -rw-r--r-- | extra/bluez/PKGBUILD | 14 | ||||
| -rw-r--r-- | extra/bluez/rc.bluetooth | 25 |
2 files changed, 14 insertions, 25 deletions
diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD index 3e167e710..f6270a7ad 100644 --- a/extra/bluez/PKGBUILD +++ b/extra/bluez/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 162066 2012-06-19 12:10:02Z tomegun $ +# $Id: PKGBUILD 162308 2012-06-24 20:46:50Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> pkgname=bluez -pkgver=4.100 +pkgver=4.101 pkgrel=1 pkgdesc="Libraries and tools for the Bluetooth protocol stack" url="http://www.bluez.org/" @@ -26,14 +26,11 @@ backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf 'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf') source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2" 'bluetooth.conf.d' - 'rc.bluetooth' - 'org.bluez.service') + 'rc.bluetooth') build() { cd "${srcdir}/${pkgname}-${pkgver}" - cp ../org.bluez.service src/ - ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -81,7 +78,6 @@ package() { "${pkgdir}"/usr/bin/bluez-test-device \ "${pkgdir}"/usr/bin/bluez-test-input } -md5sums=('54809d476c52665ff64594b6828016b5' +md5sums=('902b390af95c6c5d6d1a17d94c8344ab' '7412982b440f29fa7f76a41a87fef985' - '8f9498707f809506928b2e480d3b6789' - '54c7de598327bf11d56592235d0702f4') + '864cbd24e6efc3592e9284b0b5fb2cfd') diff --git a/extra/bluez/rc.bluetooth b/extra/bluez/rc.bluetooth index a46ee2abb..0feeaeab6 100644 --- a/extra/bluez/rc.bluetooth +++ b/extra/bluez/rc.bluetooth @@ -21,14 +21,14 @@ DUND_EXEC="/usr/bin/dund" DAEMON_ENABLE="true" HIDD_ENABLE="false" RFCOMM_ENABLE="false" -DUND_ENABLE="false" PAND_ENABLE="false" +DUND_ENABLE="false" RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" HIDD_OPTIONS="" -DUND_OPTIONS="" PAND_OPTIONS="" +DUND_OPTIONS="" [ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth @@ -40,10 +40,6 @@ case "$1" in $DAEMON_EXEC sleep 1 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 @@ -52,26 +48,26 @@ case "$1" in 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 + if [ "$DUND_ENABLE" = "true" -a -x "$DUND_EXEC" -a -n "$DUND_OPTIONS" ]; then + stat_append " $DUND_NAME" + $DUND_EXEC $DUND_OPTIONS + fi add_daemon bluetooth 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 + stat_append " $PAND_NAME" + killall $PAND_NAME >/dev/null 2>&1 + if [ -x "$RFCOMM_EXEC" ]; then stat_append " $RFCOMM_NAME" $RFCOMM_EXEC release all >/dev/null 2>&1 @@ -80,9 +76,6 @@ case "$1" in 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 |