Add back the abilitity to run rfcomm bind all to the init script because the service architechture is not mature enough to handle that stuff yet. Fixes bug #181176.

Package-Manager: portage-2.1.2.9

6 files changed, 246 insertions, 8 deletions

diff --git a/net-wireless/bluez-utils/ChangeLog b/net-wireless/bluez-utils/ChangeLog
index ede0b089c971..9151f87f8e1d 100644
--- a/net-wireless/bluez-utils/ChangeLog
+++ b/net-wireless/bluez-utils/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-wireless/bluez-utils
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/ChangeLog,v 1.97 2007/06/01 17:36:27 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/ChangeLog,v 1.98 2007/06/09 11:33:55 betelgeuse Exp $
+
+*bluez-utils-3.11-r2 (09 Jun 2007)
+
+  09 Jun 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +files/3.11/bluetooth-conf.d, +files/3.11/bluetooth-init.d,
+  +bluez-utils-3.11-r2.ebuild:
+  Add back the abilitity to run rfcomm bind all to the init script because the
+  service architechture is not mature enough to handle that stuff yet. Fixes
+  bug #181176.
 
 *bluez-utils-3.11-r1 (01 Jun 2007)
 
diff --git a/net-wireless/bluez-utils/Manifest b/net-wireless/bluez-utils/Manifest
index cf7ea8837395..a89009cdcc0e 100644
--- a/net-wireless/bluez-utils/Manifest
+++ b/net-wireless/bluez-utils/Manifest
@@ -1,6 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 3.11/bluetooth-conf.d 257 RMD160 d3a6cd6e9fb77f6bc0c6aac4833b15c60b781c52 SHA1 c1088c509e2182a3b5987148da03393ab2053101 SHA256 73427f2c46e7be41c24e4c536107ecf8845e0125b34997d74934b92d40f79ee4
+MD5 ad7554482158106ddc9ab8e12a51cbfa files/3.11/bluetooth-conf.d 257
+RMD160 d3a6cd6e9fb77f6bc0c6aac4833b15c60b781c52 files/3.11/bluetooth-conf.d 257
+SHA256 73427f2c46e7be41c24e4c536107ecf8845e0125b34997d74934b92d40f79ee4 files/3.11/bluetooth-conf.d 257
+AUX 3.11/bluetooth-init.d 1311 RMD160 94f2f8b8cb0e374ee9bf9e3b3a367bfe573559e3 SHA1 431cbb5da98199bff4dd09f5b5bd48e0b77cccc8 SHA256 0c07ef606f8016c5de309e74e0e575a7b1b2f5b1d949447fcc0e9014de57cef0
+MD5 0f4818d2f9f19549091ea0177bcf662f files/3.11/bluetooth-init.d 1311
+RMD160 94f2f8b8cb0e374ee9bf9e3b3a367bfe573559e3 files/3.11/bluetooth-init.d 1311
+SHA256 0c07ef606f8016c5de309e74e0e575a7b1b2f5b1d949447fcc0e9014de57cef0 files/3.11/bluetooth-init.d 1311
 AUX 3.11/conf.d-hidd 89 RMD160 31407e00bcb00eb0b9c1adeb7434a922bfb967e9 SHA1 dc6831fa817c8bd2378830e13bc96d3ff3fdffa2 SHA256 8fc50b8c644e0bc69eacef2a9555118b2f4758aafcb42e8ea3ca1293e8f3a211
 MD5 b982f0cbd7bcae0d52779a41338ad0e4 files/3.11/conf.d-hidd 89
 RMD160 31407e00bcb00eb0b9c1adeb7434a922bfb967e9 files/3.11/conf.d-hidd 89
@@ -81,14 +89,18 @@ EBUILD bluez-utils-3.11-r1.ebuild 4488 RMD160 99e532f9f76e93069f5151efbb126b45f0
 MD5 db84c227ea5afc3573833218bf04c716 bluez-utils-3.11-r1.ebuild 4488
 RMD160 99e532f9f76e93069f5151efbb126b45f0107988 bluez-utils-3.11-r1.ebuild 4488
 SHA256 da171ff242c23d2de61362cb41083f09d7d21efac4adf88d4a69cd972ff626c5 bluez-utils-3.11-r1.ebuild 4488
+EBUILD bluez-utils-3.11-r2.ebuild 4493 RMD160 d72f7befae75df8a80618ac52ea43ffee81eac38 SHA1 d97330fd9dcc9ddacaa23ab11e5a8153cc78464a SHA256 7adfb2f3c41f694f0bd0375ea0283d319e3f5a1319e19f976c615c0239009e96
+MD5 4716c2c521a1c53200cecbec75d0a4a4 bluez-utils-3.11-r2.ebuild 4493
+RMD160 d72f7befae75df8a80618ac52ea43ffee81eac38 bluez-utils-3.11-r2.ebuild 4493
+SHA256 7adfb2f3c41f694f0bd0375ea0283d319e3f5a1319e19f976c615c0239009e96 bluez-utils-3.11-r2.ebuild 4493
 EBUILD bluez-utils-3.11.ebuild 4390 RMD160 f512bc825bd33083997808851fae345310c445c0 SHA1 ce5f924b40cf0b128ccca9a05f88f8bf7b081301 SHA256 edb2e13a425b079e8d1796c65a0e101efc4822cc2391268fe0f71cea4e306c74
 MD5 450384c3120d4c7ba30c724d15273487 bluez-utils-3.11.ebuild 4390
 RMD160 f512bc825bd33083997808851fae345310c445c0 bluez-utils-3.11.ebuild 4390
 SHA256 edb2e13a425b079e8d1796c65a0e101efc4822cc2391268fe0f71cea4e306c74 bluez-utils-3.11.ebuild 4390
-MISC ChangeLog 16753 RMD160 bdfb6972d7997c56e7dbcaf6174282f54b3bc648 SHA1 d8793769ec42d845897ea3b0480fbefc46ddd5c4 SHA256 8225f46b19fb0e9080fb106c66430eac870bd3afefad2a5541a5e6a1b28037fd
-MD5 c80f54bf372d48a8acc0432b0433c8fb ChangeLog 16753
-RMD160 bdfb6972d7997c56e7dbcaf6174282f54b3bc648 ChangeLog 16753
-SHA256 8225f46b19fb0e9080fb106c66430eac870bd3afefad2a5541a5e6a1b28037fd ChangeLog 16753
+MISC ChangeLog 17107 RMD160 75de40f937c62db2440ac510e783a6bd0598bfd6 SHA1 5820a622e0ad94f6f4358cecb541551863e5ec13 SHA256 8096d52bdc999aded17d17612cd61dcc5dbe64191ab44e9e3131ba44d75962a4
+MD5 b2cc4c3b5271f4476f2539b1ee06475d ChangeLog 17107
+RMD160 75de40f937c62db2440ac510e783a6bd0598bfd6 ChangeLog 17107
+SHA256 8096d52bdc999aded17d17612cd61dcc5dbe64191ab44e9e3131ba44d75962a4 ChangeLog 17107
 MISC metadata.xml 379 RMD160 b6c255069f62314f5f4452ad4a893baff8304efd SHA1 243ba54e82b478d5941198402cbaa00badd656d9 SHA256 a104a4d733fb797bc867c3c92090dc716305795aa09441a6b7a4b442ff52e669
 MD5 b996228cd1649e0bf48029de7d85ea6d metadata.xml 379
 RMD160 b6c255069f62314f5f4452ad4a893baff8304efd metadata.xml 379
@@ -108,10 +120,13 @@ SHA256 08578e99cb4138a6823f7c88a1d542326e0ca6868163379c2163177469c92be1 files/di
 MD5 fa37849bea8038575ca22cdcb981a24b files/digest-bluez-utils-3.11-r1 250
 RMD160 cd6eb3862412d047c9c0e6e9b95a8bbf1be48265 files/digest-bluez-utils-3.11-r1 250
 SHA256 08578e99cb4138a6823f7c88a1d542326e0ca6868163379c2163177469c92be1 files/digest-bluez-utils-3.11-r1 250
+MD5 fa37849bea8038575ca22cdcb981a24b files/digest-bluez-utils-3.11-r2 250
+RMD160 cd6eb3862412d047c9c0e6e9b95a8bbf1be48265 files/digest-bluez-utils-3.11-r2 250
+SHA256 08578e99cb4138a6823f7c88a1d542326e0ca6868163379c2163177469c92be1 files/digest-bluez-utils-3.11-r2 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGYFkgcxLzpIGCsLQRAvE2AJ4gDzQ8mekHlFI5JDZuhcD580DSsACZAf3P
-6qLM00nut7tNVKYKxh83zFA=
-=pnhp
+iD8DBQFGapArcxLzpIGCsLQRApUxAJ9MTeTPOb1FJSCd+wqGQx5aV1RlZACeI0C+
+Py11B73fC9ZPl7eJhUiNYGQ=
+=HC1m
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/bluez-utils/bluez-utils-3.11-r2.ebuild b/net-wireless/bluez-utils/bluez-utils-3.11-r2.ebuild
new file mode 100644
index 000000000000..e2ad59e415b4
--- /dev/null
+++ b/net-wireless/bluez-utils/bluez-utils-3.11-r2.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/bluez-utils-3.11-r2.ebuild,v 1.1 2007/06/09 11:33:55 betelgeuse Exp $
+
+inherit autotools eutils
+
+DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
+HOMEPAGE="http://bluez.sourceforge.net/"
+SRC_URI="http://bluez.sourceforge.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+
+IUSE="cups debug examples hal old-daemons test-programs usb"
+
+DEPEND="
+	>=net-wireless/bluez-libs-${PV}
+	hal? ( sys-apps/hal )
+	usb? ( dev-libs/libusb )
+	cups? ( net-print/cups )
+	sys-fs/udev
+	dev-libs/glib
+	sys-apps/dbus"
+
+src_unpack() {
+	unpack ${A}
+	# bundled glib
+	cd "${S}"
+	rm -r eglib/{*.c,*.h}  || die
+	if use cups; then
+		epatch "${FILESDIR}/3.11/cups-location.patch"
+		eautoreconf
+	fi
+}
+
+src_compile() {
+	# the order is the same as ./configure --help
+
+	# we don't need the other daemons either with the new
+	# service architechture
+	# hcid has in integrated sdpd now that we use
+
+	# These are currently under work and don't work properly:
+	# --enable-alsa
+	# --enable-sync
+	# --enable-obex
+	# Only for embedded devices
+	# --enable-audio
+
+	econf \
+		$(use_enable debug) \
+		--enable-inotify \
+		$(use_enable hal) \
+		$(use_enable usb) \
+		--enable-glib  \
+		--disable-obex \
+		--disable-alsa \
+		--enable-network \
+		--enable-serial \
+		--enable-input \
+		--disable-audio \
+		--disable-sync \
+		$(use_enable examples echo) \
+		--enable-hcid \
+		$(use_enable test-programs test) \
+		$(use_enable old-daemons sdpd) \
+		$(use_enable old-daemons hidd) \
+		$(use_enable old-daemons pand) \
+		$(use_enable cups) \
+		--enable-configfiles \
+		--disable-initscripts \
+		--disable-pcmciarules \
+		--enable-bccmd \
+		--enable-avctrl \
+		--enable-hid2hci \
+		--enable-dfutool \
+		--localstatedir=/var \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS ChangeLog README || die
+
+	# a very simple example daemon
+	dobin daemon/passkey-agent || die
+
+	newinitd "${FILESDIR}/3.11/bluetooth-init.d" bluetooth || die
+	newconfd "${FILESDIR}/3.11/bluetooth-conf.d" bluetooth || die
+
+	if use old-daemons; then
+		sed -re 's/^(Autostart=)true/\1false/' \
+			-i "${D}/etc/bluetooth/input.service" || die
+		newconfd "${FILESDIR}/3.11/conf.d-hidd" hidd || die
+		newinitd "${FILESDIR}/3.11/init.d-hidd" hidd || die
+	fi
+
+	# bug #84431
+	insinto /etc/udev/rules.d/
+	newins "${FILESDIR}/${PN}-3.10.1-udev.rules" 70-bluetooth.rules || die
+	newins "${S}/scripts/bluetooth.rules" 70-bluetooth-pcmcia.rules || die
+
+	exeinto /lib/udev/
+	newexe "${FILESDIR}/${PN}-3.10.1-udev.script" bluetooth.sh || die
+	doexe  "${S}/scripts/bluetooth_serial" || die
+}
+
+pkg_postinst() {
+	udevcontrol reload_rules && udevtrigger
+
+	elog
+	elog "To use dial up networking you must install net-dialup/ppp."
+	elog ""
+	elog "Since 3.0 bluez has changed the passkey handling to use a dbus based"
+	elog "API so please remember to update your /etc/bluetooth/hcid.conf."
+	elog "For a password agent, there is for example net-wireless/bluez-gnome"
+	elog "for gnome and net-wireless/kdebluetooth for kde."
+	elog ""
+	elog "Since 3.10.1 we don't install the old style daemons any more but rely"
+	elog "on the new service architechture:"
+	elog "	http://wiki.bluez.org/wiki/Services"
+	elog ""
+	elog "Edit /etc/bluetooth/*.service to enable the services."
+	elog "Use the old-daemons use flag to get the old daemons like hidd"
+	elog "installed. Please note that the init script doesn't stop the old"
+	elog "daemons after you update it so it's recommended to run:"
+	elog "  /etc/init.d/bluetooth stop"
+	elog "before updating your configuration files or you can manually kill"
+	elog "the extra daemons you previously enabled in /etc/conf.d/bluetooth."
+	elog ""
+	elog "If you want to use rfcomm as a normal user, you need to add the user"
+	elog "to the uucp group."
+	elog ""
+	if use old-daemons; then
+		elog "The hidd init script was installed because you have the old-daemons"
+		elog "use flag on. It is not started by default via udev so please add it"
+		elog "to the required runleves using rc-update <runlevel> add hidd. If"
+		elog "you need init scripts for the other daemons, please file requests"
+		elog "to https://bugs.gentoo.org."
+	else
+		elog "The bluetooth service should be started automatically by udev"
+		elog "when the required hardware is inserted next time."
+	fi
+}
diff --git a/net-wireless/bluez-utils/files/3.11/bluetooth-conf.d b/net-wireless/bluez-utils/files/3.11/bluetooth-conf.d
new file mode 100644
index 000000000000..c84ac4f1175c
--- /dev/null
+++ b/net-wireless/bluez-utils/files/3.11/bluetooth-conf.d
@@ -0,0 +1,10 @@
+# Bluetooth configuraton file
+
+# Run hid2hci (allowed values are "true" and "false")
+HID2HCI_ENABLE=false
+
+# Bind rfcomm devices (allowed values are "true" and "false")
+RFCOMM_ENABLE=true
+
+# Config file for rfcomm
+RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
diff --git a/net-wireless/bluez-utils/files/3.11/bluetooth-init.d b/net-wireless/bluez-utils/files/3.11/bluetooth-init.d
new file mode 100644
index 000000000000..778794934557
--- /dev/null
+++ b/net-wireless/bluez-utils/files/3.11/bluetooth-init.d
@@ -0,0 +1,53 @@
+#!/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/3.11/bluetooth-init.d,v 1.1 2007/06/09 11:33:55 betelgeuse Exp $
+
+depend() {
+	after coldplug
+	need dbus localmount
+}
+
+start() {
+   	ebegin "Starting Bluetooth"
+	local result=0
+	HCID_CONFIG="${HCID_CONFIG:-/etc/bluetooth/hcid.conf}"
+
+	if [ -f "${HCID_CONFIG}" ]; then
+		ebegin "    Starting hcid"
+		# -s enables internal sdp server
+		start-stop-daemon --start \
+			--exec /usr/sbin/hcid -- -s -f "${HCID_CONFIG}"
+		eend $?
+	else
+		eerror "Can't start hcid because HCID_CONFIG is missing."
+	    eend 1
+		result=1
+	fi
+
+	if [ "${HID2HCI_ENABLE}" = "true" -a -x /usr/sbin/hid2hci ]; then
+		ebegin "    Running hid2hci"
+		/usr/sbin/hid2hci --tohci -q    #be quiet
+		eend $?
+		[ "${result}" = "0" ] && result=$?
+	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
+
+	eend ${result}
+}
+
+stop() {
+	ebegin "Shutting down Bluetooth"
+
+	start-stop-daemon --stop --quiet --exec /usr/sbin/hcid
+	eend $?
+}
diff --git a/net-wireless/bluez-utils/files/digest-bluez-utils-3.11-r2 b/net-wireless/bluez-utils/files/digest-bluez-utils-3.11-r2
new file mode 100644
index 000000000000..92e7c6768bde
--- /dev/null
+++ b/net-wireless/bluez-utils/files/digest-bluez-utils-3.11-r2
@@ -0,0 +1,3 @@
+MD5 703fed8e09e25b5e1f01be337576e343 bluez-utils-3.11.tar.gz 810657
+RMD160 0960cd1d76f29df383397ba33e0bf52648cf393b bluez-utils-3.11.tar.gz 810657
+SHA256 6f442988bf11d8066ee1ed416acea04ed4be764ab3189780bd2148536e9d76d8 bluez-utils-3.11.tar.gz 810657