Date: Wednesday, June 20, 2012 @ 06:11:10 Author: tomegun Revision: 162113
upgpkg: bluez 4.100-2 tidy up the rc script a bit Modified: bluez/trunk/PKGBUILD bluez/trunk/rc.bluetooth --------------+ PKGBUILD | 4 ++-- rc.bluetooth | 25 +++++++++---------------- 2 files changed, 11 insertions(+), 18 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-06-20 09:34:34 UTC (rev 162112) +++ PKGBUILD 2012-06-20 10:11:10 UTC (rev 162113) @@ -5,7 +5,7 @@ pkgname=bluez pkgver=4.100 -pkgrel=1 +pkgrel=2 pkgdesc="Libraries and tools for the Bluetooth protocol stack" url="http://www.bluez.org/"; arch=('i686' 'x86_64') @@ -83,5 +83,5 @@ } md5sums=('54809d476c52665ff64594b6828016b5' '7412982b440f29fa7f76a41a87fef985' - '8f9498707f809506928b2e480d3b6789' + '864cbd24e6efc3592e9284b0b5fb2cfd' '54c7de598327bf11d56592235d0702f4') Modified: rc.bluetooth =================================================================== --- rc.bluetooth 2012-06-20 09:34:34 UTC (rev 162112) +++ rc.bluetooth 2012-06-20 10:11:10 UTC (rev 162113) @@ -21,14 +21,14 @@ DAEMON_ENABLE="true" HIDD_ENABLE="false" RFCOMM_ENABLE="false" +PAND_ENABLE="false" DUND_ENABLE="false" -PAND_ENABLE="false" RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" HIDD_OPTIONS="" +PAND_OPTIONS="" DUND_OPTIONS="" -PAND_OPTIONS="" [ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth @@ -40,10 +40,6 @@ $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 @@ stat_append " $RFCOMM_NAME" $RFCOMM_EXEC -f $RFCOMM_CONFIG bind all 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 - if [ "$PAND_ENABLE" = "true" -a -x "$PAND_EXEC" -a -n "$PAND_OPTIONS" ]; then - stat_append " $PAND_NAME" - $PAND_EXEC $PAND_OPTIONS - fi add_daemon bluetooth stat_done ;; stop) stat_busy "Stopping bluetooth subsystem:" + stat_append " $DUND_NAME" + killall $DUND_NAME >/dev/null 2>&1 + 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 @@ -80,9 +76,6 @@ 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
