warnings and updates to this ebuild, now might even work

svn path=/; revision=38

5 files changed, 349 insertions, 6 deletions

diff --git a/net-wireless/bluez-utils/Manifest b/net-wireless/bluez-utils/Manifest
index f4e907c..c72c55e 100644
--- a/net-wireless/bluez-utils/Manifest
+++ b/net-wireless/bluez-utils/Manifest
@@ -10,6 +10,10 @@ AUX bluez-utils-2.25-init.d 3403 RMD160 9a067d8d0e89daa79a9afd401d2f2562d366485d
 MD5 105cd874b29ee69bd26a0c01d91cb9a9 files/bluez-utils-2.25-init.d 3403
 RMD160 9a067d8d0e89daa79a9afd401d2f2562d366485d files/bluez-utils-2.25-init.d 3403
 SHA256 2203689b54384cbe7134999fc5ba87120090ff3e2acd15f76f142741b15a10eb files/bluez-utils-2.25-init.d 3403
+AUX bluez-utils-3.2-broadcom-iscan.patch 1094 RMD160 ebb04d2d1bc315a37481888aa709a78440043eff SHA1 c50eab1fb98b322fc6909cdecc9b3d8cfc5940b4 SHA256 97b9b265489fdb52809e33e71374d56aff03d29addec46a764216c9094707667
+MD5 560474e13d405e3c56a9dbff343d83e4 files/bluez-utils-3.2-broadcom-iscan.patch 1094
+RMD160 ebb04d2d1bc315a37481888aa709a78440043eff files/bluez-utils-3.2-broadcom-iscan.patch 1094
+SHA256 97b9b265489fdb52809e33e71374d56aff03d29addec46a764216c9094707667 files/bluez-utils-3.2-broadcom-iscan.patch 1094
 AUX bluez-utils-3.2-init.d 3412 RMD160 603b5452c80027e4f85d2edf6da1dd8e94891acb SHA1 5bb9c47406cbec139270d14e359b0721991b7036 SHA256 8d67a0062e466e11c6669cce5c700ad527697d3991ed553aa5956dc76b3469d1
 MD5 e822dd6afb73d5fdbb4ecab874b23333 files/bluez-utils-3.2-init.d 3412
 RMD160 603b5452c80027e4f85d2edf6da1dd8e94891acb files/bluez-utils-3.2-init.d 3412
@@ -19,10 +23,10 @@ MD5 105cd874b29ee69bd26a0c01d91cb9a9 files/bluez-utils-3.2-init.d~ 3403
 RMD160 9a067d8d0e89daa79a9afd401d2f2562d366485d files/bluez-utils-3.2-init.d~ 3403
 SHA256 2203689b54384cbe7134999fc5ba87120090ff3e2acd15f76f142741b15a10eb files/bluez-utils-3.2-init.d~ 3403
 DIST bluez-utils-3.2.tar.gz 608848 RMD160 ac6cd61bf2d0b529338bdd8538ffbbad0cb7cb9a SHA1 a2fb018724d70cd9e1a77e76a38101b80ac2e71a SHA256 f9058f9e8d3910cebbb3524d667ec901809c6716a6fd9baf613576217f0a6b58
-EBUILD bluez-utils-3.2.ebuild 2579 RMD160 d29314699f01773b31d75c8bd6b0dcb4420d469f SHA1 2494a0bd6b4b462c417213cd18c0397f3351d9fc SHA256 f66e2e70dfa0eec29d6ddd029420912332864a98b63ac1532ddeab1d641a5f74
-MD5 7016b0827b14ee017680c22686b412e5 bluez-utils-3.2.ebuild 2579
-RMD160 d29314699f01773b31d75c8bd6b0dcb4420d469f bluez-utils-3.2.ebuild 2579
-SHA256 f66e2e70dfa0eec29d6ddd029420912332864a98b63ac1532ddeab1d641a5f74 bluez-utils-3.2.ebuild 2579
+EBUILD bluez-utils-3.2.ebuild 3159 RMD160 6ec624d3b446aa0f5c0953d21c2fdfea4020b51a SHA1 63e8d4c747211e8cc70bc0dbafac22ef76733bf0 SHA256 712afd4447c93e973cbcbafc038a12db9144ebbc06d98027e8372e7389b66f92
+MD5 7d12600746b63886493c76386af87ecd bluez-utils-3.2.ebuild 3159
+RMD160 6ec624d3b446aa0f5c0953d21c2fdfea4020b51a bluez-utils-3.2.ebuild 3159
+SHA256 712afd4447c93e973cbcbafc038a12db9144ebbc06d98027e8372e7389b66f92 bluez-utils-3.2.ebuild 3159
 MD5 5a31772064e0e402e9f5c0ea5286796f files/digest-bluez-utils-3.2 247
 RMD160 3be3fb6f7a1683a551f39179839cfbc5c0d88f51 files/digest-bluez-utils-3.2 247
 SHA256 09c1dab2039e290f9100ef4148cd3db360a81588953a4cf46129f7c3033fad46 files/digest-bluez-utils-3.2 247
diff --git a/net-wireless/bluez-utils/bluez-utils-3.2.ebuild b/net-wireless/bluez-utils/bluez-utils-3.2.ebuild
index 1fa7219..67b30a7 100644
--- a/net-wireless/bluez-utils/bluez-utils-3.2.ebuild
+++ b/net-wireless/bluez-utils/bluez-utils-3.2.ebuild
@@ -30,9 +30,21 @@ DEPEND="sys-devel/bison
 		${RDEPEND}"
 
 pkg_setup() {
-	ewarn "This verison of Bluez does not include a GTK pin entry, but"
-	ewarn "instead you have to use the temporary passkey-agent, eg:"
+	ewarn "bluez-utils-3.x uses a new DBUS Passkey API to do PIN"
+	ewarn "authentication, and none of the GUI input mechanisms are"
+	ewarn "available yet. To perform pin authentication, you must"
+	ewarn "run a fake passkey-agent like this:"
+	ewarn ""
 	ewarn "/usr/bin/passkey-agent --default <pin number>"
+	ewarn ""
+	ewarn "bluez-utils-3.x ignores pscan/iscan configure options in"
+	ewarn "hciconfig. Instead, you must enable it through the DBUS"
+	ewarn "API using bluez-dbus-test, for example:"
+	ewarn ""
+	ewarn "bluez-dbus-test -i hci0 SetMode discoverable"
+	ewarn ""
+	ewarn "This should be temporary until proper DBUS support is in"
+	ewarn "kdebluetooth or gnome-bluetooth."
 }
 
 src_unpack() {
@@ -52,6 +64,9 @@ src_unpack() {
 	if use cups; then
 		sed -i -e "s:\$(libdir)/cups:$(cups-config --serverbin):" ${S}/cups/Makefile.{am,in}
 	fi
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-broadcom-iscan.patch
 }
 
 src_compile() {
@@ -80,6 +95,7 @@ src_install() {
 	# optional bluetooth utils
 	dosbin tools/hcisecfilter tools/ppporc 
 	dobin hcid/passkey-agent
+	newbin hcid/dbus-test bluez-dbus-test
 
 	newinitd ${FILESDIR}/${PN}-2.25-init.d bluetooth
 	newconfd ${S}/scripts/bluetooth.default bluetooth
diff --git a/net-wireless/bluez-utils/files/bluez-utils-3.2-broadcom-iscan.patch b/net-wireless/bluez-utils/files/bluez-utils-3.2-broadcom-iscan.patch
new file mode 100644
index 0000000..18e47dc
--- /dev/null
+++ b/net-wireless/bluez-utils/files/bluez-utils-3.2-broadcom-iscan.patch
@@ -0,0 +1,40 @@
+Index: hcid/device.c
+===================================================================
+RCS file: /cvsroot/bluez/utils/hcid/device.c,v
+retrieving revision 1.14
+diff -u -r1.14 device.c
+--- hcid/device.c	26 Jul 2006 13:42:10 -0000	1.14
++++ hcid/device.c	28 Jul 2006 01:30:41 -0000
+@@ -189,6 +189,7 @@
+ 	if (hci_read_local_version(dd, &ver, 1000) < 0) {
+ 		error("Can't read version info for hci%d: %s (%d)",
+ 					dev_id, strerror(errno), errno);
++		hci_close_dev(dd);
+ 		return -errno;
+ 	}
+ 
+@@ -200,19 +201,24 @@
+ 	if (hci_read_local_features(dd, features, 1000) < 0) {
+ 		error("Can't read features for hci%d: %s (%d)",
+ 					dev_id, strerror(errno), errno);
++		hci_close_dev(dd);
+ 		return -errno;
+ 	}
+ 
+ 	memcpy(dev->features, features, 8);
+ 
+ 	inqmode = get_inquiry_mode(dev);
++	if (inqmode < 1)
++		goto done;
+ 
+ 	if (hci_write_inquiry_mode(dd, inqmode, 1000) < 0) {
+ 		error("Can't write inquiry mode for hci%d: %s (%d)",
+ 					dev_id, strerror(errno), errno);
++		hci_close_dev(dd);
+ 		return -errno;
+ 	}
+ 
++done:
+ 	hci_close_dev(dd);
+ 
+ 	info("Device hci%d has been activated", dev_id);
diff --git a/net-wireless/bluez-utils/files/bluez-utils-3.2-init.d b/net-wireless/bluez-utils/files/bluez-utils-3.2-init.d
new file mode 100644
index 0000000..85c2e7a
--- /dev/null
+++ b/net-wireless/bluez-utils/files/bluez-utils-3.2-init.d
@@ -0,0 +1,142 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/files/bluez-utils-2.25-init.d,v 1.1 2006/02/07 14:04:40 liquidx Exp $
+
+UART_CONF="/etc/bluetooth/uart"
+
+depend() {
+	after coldplug
+	after dbus
+}
+
+start_uarts() {
+	[ -f /usr/sbin/hciattach -a -f ${UART_CONF} ] || return
+	grep -v '^#' ${UART_CONF} | while read i; do
+		/usr/sbin/hciattach $i
+	done
+}
+
+stop_uarts() {
+	killall hciattach > /dev/null 2>&1
+}
+
+start() {
+   	ebegin "Starting Bluetooth"
+
+	if [ "${HID2HCI_ENABLE}" = "true" -a -x /usr/sbin/hid2hci ]; then
+		ebegin "    Running hid2hci"
+		/usr/sbin/hid2hci -0 -q    #be quiet
+		/bin/sleep 1 # delay for hid's to be detected by hotplug
+		eend $?
+	fi
+
+	if [ "${HCID_ENABLE}" = "true" -a -x /usr/sbin/hcid ]; then
+	    if [ -f "${HCID_CONFIG}" ]; then
+			ebegin "    Starting hcid"
+			start-stop-daemon --start --quiet \
+				--exec /usr/sbin/hcid -- -f $HCID_CONFIG
+			eend $?
+	    else
+			ewarn "Not enabling hcid because HCID_CONFIG is missing."
+	    fi
+	    
+	fi
+
+	if [ "${SDPD_ENABLE}" = "true" -a -x /usr/sbin/sdpd ]; then
+		ebegin "    Starting sdpd"
+		start-stop-daemon --start --quiet --exec /usr/sbin/sdpd
+		eend $?
+	fi
+
+	if [ "${HIDD_ENABLE}" = "true" -a -x /usr/bin/hidd ]; then
+		ebegin "    Starting hidd"
+		start-stop-daemon --start --quiet \
+			--exec /usr/bin/hidd -- ${HIDD_OPTIONS} --server
+		eend $?
+	fi
+
+	if [ "${RFCOMM_ENABLE}" = "true" -a -x /usr/bin/rfcomm ]; then
+		if [ -f "${RFCOMM_CONFIG}" ]; then
+			ebegin "    Starting rfcomm"
+			/usr/bin/rfcomm -f ${RFCOMM_CONFIG} bind all
+			eend $?
+		else
+			ewarn "Not enabling rfcomm because RFCOMM_CONFIG does not exists"
+		fi
+	fi
+
+	if [ "${DUND_ENABLE}" = "true" -a -x /usr/bin/dund ]; then
+		if [ -n "${DUND_OPTIONS}" ]; then
+			ebegin "    Starting dund"
+			start-stop-daemon --start --quiet \
+				--exec /usr/bin/dund -- ${DUND_OPTIONS}
+			eend $?
+		else
+			ewarn "Not starting dund because DUND_OPTIONS not defined."
+		fi
+	fi
+
+	if [ "${PAND_ENABLE}" = "true" -a -x /usr/bin/pand ]; then
+		if [ -n "${PAND_OPTIONS}" ]; then
+			ebegin "    Starting pand"
+			start-stop-daemon --start --quiet \
+				--exec /usr/bin/pand -- ${PAND_OPTIONS}
+			eend $?
+		else
+			ewarn "Not starting pand because PAND_OPTIONS not defined."
+		fi
+	fi
+
+	start_uarts
+	eend 0
+}
+
+stop() {
+	ebegin "Shutting down Bluetooth"
+
+	if [ "${PAND_ENABLE}" = "true" -a -x /usr/bin/pand ]; then
+		ebegin "    Stopping pand"
+		start-stop-daemon --stop --quiet --exec /usr/bin/pand
+		eend $?
+	fi
+
+	if [ "${DUND_ENABLE}" = "true" -a -x /usr/bin/dund ]; then
+		ebegin "    Stopping dund"
+		start-stop-daemon --stop --quiet --exec /usr/bin/dund
+		eend $?
+	fi
+
+	if [ "${RFCOMM_ENABLE}" = "true" -a -x /usr/bin/rfcomm ]; then
+		ebegin "    Stopping rfcomm"
+		/usr/bin/rfcomm release all
+		eend $?
+	fi
+
+	if [ "${HIDD_ENABLE}" = "true" -a -x /usr/bin/hidd ]; then
+		ebegin "    Stopping hidd"
+		start-stop-daemon --stop --quiet --exec /usr/bin/hidd
+		eend $?
+	fi
+
+
+	if [ "${SDPD_ENABLE}" = "true" -a -x /usr/sbin/sdpd ]; then
+		ebegin "    Stopping sdpd"
+		start-stop-daemon --stop --quiet --exec /usr/sbin/sdpd
+		eend $?
+	fi
+
+	if [ "${HCID_ENABLE}" = "true" -a -x /usr/sbin/hcid ]; then
+		ebegin "    Stopping hcid"
+		start-stop-daemon --stop --quiet --exec /usr/sbin/hcid
+		eend $?
+	fi
+
+	stop_uarts
+	eend 0
+}
+
+restart() {
+	svc_stop
+	svc_start
+}
diff --git a/net-wireless/bluez-utils/files/bluez-utils-3.2-init.d~ b/net-wireless/bluez-utils/files/bluez-utils-3.2-init.d~
new file mode 100644
index 0000000..30105f0
--- /dev/null
+++ b/net-wireless/bluez-utils/files/bluez-utils-3.2-init.d~
@@ -0,0 +1,141 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/files/bluez-utils-2.25-init.d,v 1.1 2006/02/07 14:04:40 liquidx Exp $
+
+UART_CONF="/etc/bluetooth/uart"
+
+depend() {
+	after coldplug
+	after dbus
+}
+
+start_uarts() {
+	[ -f /usr/sbin/hciattach -a -f ${UART_CONF} ] || return
+	grep -v '^#' ${UART_CONF} | while read i; do
+		/usr/sbin/hciattach $i
+	done
+}
+
+stop_uarts() {
+	killall hciattach > /dev/null 2>&1
+}
+
+start() {
+   	ebegin "Starting Bluetooth"
+
+	if [ "${HID2HCI_ENABLE}" = "true" -a -x /usr/sbin/hid2hci ]; then
+		ebegin "    Running hid2hci"
+		/usr/sbin/hid2hci -0 -q    #be quiet
+		/bin/sleep 1 # delay for hid's to be detected by hotplug
+		eend $?
+	fi
+
+	if [ "${HCID_ENABLE}" = "true" -a -x /usr/sbin/hcid ]; then
+		if [ -f "${HCID_CONFIG}" ]; then
+			ebegin "    Starting hcid"
+			start-stop-daemon --start --quiet \
+				--exec /usr/sbin/hcid -- -f $HCID_CONFIG
+			eend $?
+	    else
+			ewarn "Not enabling hcid because HCID_CONFIG is missing."
+	    fi
+	fi
+
+	if [ "${SDPD_ENABLE}" = "true" -a -x /usr/sbin/sdpd ]; then
+		ebegin "    Starting sdpd"
+		start-stop-daemon --start --quiet --exec /usr/sbin/sdpd
+		eend $?
+	fi
+
+	if [ "${HIDD_ENABLE}" = "true" -a -x /usr/bin/hidd ]; then
+		ebegin "    Starting hidd"
+		start-stop-daemon --start --quiet \
+			--exec /usr/bin/hidd -- ${HIDD_OPTIONS} --server
+		eend $?
+	fi
+
+	if [ "${RFCOMM_ENABLE}" = "true" -a -x /usr/bin/rfcomm ]; then
+		if [ -f "${RFCOMM_CONFIG}" ]; then
+			ebegin "    Starting rfcomm"
+			/usr/bin/rfcomm -f ${RFCOMM_CONFIG} bind all
+			eend $?
+		else
+			ewarn "Not enabling rfcomm because RFCOMM_CONFIG does not exists"
+		fi
+	fi
+
+	if [ "${DUND_ENABLE}" = "true" -a -x /usr/bin/dund ]; then
+		if [ -n "${DUND_OPTIONS}" ]; then
+			ebegin "    Starting dund"
+			start-stop-daemon --start --quiet \
+				--exec /usr/bin/dund -- ${DUND_OPTIONS}
+			eend $?
+		else
+			ewarn "Not starting dund because DUND_OPTIONS not defined."
+		fi
+	fi
+
+	if [ "${PAND_ENABLE}" = "true" -a -x /usr/bin/pand ]; then
+		if [ -n "${PAND_OPTIONS}" ]; then
+			ebegin "    Starting pand"
+			start-stop-daemon --start --quiet \
+				--exec /usr/bin/pand -- ${PAND_OPTIONS}
+			eend $?
+		else
+			ewarn "Not starting pand because PAND_OPTIONS not defined."
+		fi
+	fi
+
+	start_uarts
+	eend 0
+}
+
+stop() {
+	ebegin "Shutting down Bluetooth"
+
+	if [ "${PAND_ENABLE}" = "true" -a -x /usr/bin/pand ]; then
+		ebegin "    Stopping pand"
+		start-stop-daemon --stop --quiet --exec /usr/bin/pand
+		eend $?
+	fi
+
+	if [ "${DUND_ENABLE}" = "true" -a -x /usr/bin/dund ]; then
+		ebegin "    Stopping dund"
+		start-stop-daemon --stop --quiet --exec /usr/bin/dund
+		eend $?
+	fi
+
+	if [ "${RFCOMM_ENABLE}" = "true" -a -x /usr/bin/rfcomm ]; then
+		ebegin "    Stopping rfcomm"
+		/usr/bin/rfcomm release all
+		eend $?
+	fi
+
+	if [ "${HIDD_ENABLE}" = "true" -a -x /usr/bin/hidd ]; then
+		ebegin "    Stopping hidd"
+		start-stop-daemon --stop --quiet --exec /usr/bin/hidd
+		eend $?
+	fi
+
+
+	if [ "${SDPD_ENABLE}" = "true" -a -x /usr/sbin/sdpd ]; then
+		ebegin "    Stopping sdpd"
+		start-stop-daemon --stop --quiet --exec /usr/sbin/sdpd
+		eend $?
+	fi
+
+	if [ "${HCID_ENABLE}" = "true" -a -x /usr/sbin/hcid ]; then
+		ebegin "    Stopping hcid"
+		start-stop-daemon --stop --quiet --exec /usr/sbin/hcid
+		eend $?
+	fi
+
+	stop_uarts
+	eend 0
+}
+
+restart() {
+	svc_stop
+	svc_start
+}