From 6aaf12331918c220bbd1bdb7db7a375d36310bd9 Mon Sep 17 00:00:00 2001 From: Henrik Brix Andersen Date: Sun, 23 Oct 2005 13:00:24 +0000 Subject: Version bump, bug #105886. Also fixes bug #94562, bug #103498 and bug #108823. (Portage version: 2.0.51.22-r3) --- net-wireless/bluez-utils/ChangeLog | 9 +- net-wireless/bluez-utils/Manifest | 39 +++--- net-wireless/bluez-utils/bluez-utils-2.21.ebuild | 107 +++++++++++++++ .../bluez-utils/files/bluez-utils-2.21-init.d | 143 +++++++++++++++++++++ .../bluez-utils/files/bluez-utils-2.21-pin | 1 + .../files/bluez-utils-2.21-pin-helper.sh | 4 + .../bluez-utils/files/digest-bluez-utils-2.21 | 1 + 7 files changed, 281 insertions(+), 23 deletions(-) create mode 100644 net-wireless/bluez-utils/bluez-utils-2.21.ebuild create mode 100644 net-wireless/bluez-utils/files/bluez-utils-2.21-init.d create mode 100644 net-wireless/bluez-utils/files/bluez-utils-2.21-pin create mode 100644 net-wireless/bluez-utils/files/bluez-utils-2.21-pin-helper.sh create mode 100644 net-wireless/bluez-utils/files/digest-bluez-utils-2.21 (limited to 'net-wireless/bluez-utils') diff --git a/net-wireless/bluez-utils/ChangeLog b/net-wireless/bluez-utils/ChangeLog index 0d0a42359069..241f83d5a39f 100644 --- a/net-wireless/bluez-utils/ChangeLog +++ b/net-wireless/bluez-utils/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-wireless/bluez-utils # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/ChangeLog,v 1.57 2005/08/17 13:11:55 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/ChangeLog,v 1.58 2005/10/23 13:00:24 brix Exp $ + +*bluez-utils-2.21 (23 Oct 2005) + + 23 Oct 2005; Henrik Brix Andersen + +files/bluez-utils-2.21-init.d, +files/bluez-utils-2.21-pin, + +files/bluez-utils-2.21-pin-helper.sh, +bluez-utils-2.21.ebuild: + Version bump, bug #105886. Also fixes bug #94562, bug #103498 and bug #108823. 17 Aug 2005; Gustavo Zacarias bluez-utils-2.19.ebuild: diff --git a/net-wireless/bluez-utils/Manifest b/net-wireless/bluez-utils/Manifest index 66b7bf02117b..3e147af5eae2 100644 --- a/net-wireless/bluez-utils/Manifest +++ b/net-wireless/bluez-utils/Manifest @@ -1,35 +1,30 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +MD5 838a643da52d54cabdebfe48f0a247ed bluez-utils-2.21.ebuild 2496 MD5 b049b8c4d26d949b96515f79c805084c bluez-utils-2.10-r1.ebuild 2591 MD5 586132a6bb409ecbfce3c0ff6b44c201 bluez-utils-2.19.ebuild 2875 -MD5 439de383d422683abddb9ff8b75aa67b metadata.xml 235 -MD5 b8902fd2efa31a57e83025541cddca86 bluez-utils-2.15.ebuild 2511 MD5 b89a3826074ef2159ebbce5317d1c338 bluez-utils-2.17-r1.ebuild 2735 MD5 5fb15e85a2a314a3177e67893e720933 bluez-utils-2.16-r1.ebuild 2682 MD5 e5e21f985e130805eefe32a4e72f2412 bluez-utils-2.18.ebuild 2873 -MD5 334753447e6a790ca345625e28884744 ChangeLog 8710 -MD5 7274187d952212ca6469a2306efb0d42 files/2.15-bluepin.patch 355 -MD5 336de3d1eba238735777d7d8f8e0c282 files/bluez-utils-2.3-bluepin.patch 461 -MD5 7449a658ef08ac7e86b221b3c43961af files/pin.sample 26 +MD5 b8902fd2efa31a57e83025541cddca86 bluez-utils-2.15.ebuild 2511 +MD5 88a09a9a91c79a8c242679382ebe56ca ChangeLog 9009 +MD5 439de383d422683abddb9ff8b75aa67b metadata.xml 235 +MD5 ce3b08e1df53875d1060e9e246810907 files/bluez-utils-2.3-rfcomm_fflush.patch 966 MD5 2fcf0c81d0479f85cb7244f2b1900c6d files/bluez-utils-2.10-handsfree.patch 540 -MD5 4a3141759c84210a8e1303a9d6f11b43 files/digest-bluez-utils-2.16-r1 68 +MD5 7449a658ef08ac7e86b221b3c43961af files/pin.sample 26 +MD5 336de3d1eba238735777d7d8f8e0c282 files/bluez-utils-2.3-bluepin.patch 461 MD5 d552cb6515bf251c019ca4a95dd266eb files/bluez-utils-2.3-bluepin-gtk2.patch 3295 -MD5 44ca243c60a83967c811537a38b92549 files/bluetooth.rc 1166 +MD5 992426019dbbd772c9326512d2a0033d files/bluez-utils-2.21-pin-helper.sh 49 +MD5 06aa410f5fe0f8459273a2bcda7db8cc files/digest-bluez-utils-2.10-r1 68 +MD5 4a3141759c84210a8e1303a9d6f11b43 files/digest-bluez-utils-2.16-r1 68 MD5 7316e8b8851edb4c09b59e386d6b16fb files/digest-bluez-utils-2.17-r1 68 -MD5 ce3b08e1df53875d1060e9e246810907 files/bluez-utils-2.3-rfcomm_fflush.patch 966 +MD5 e7df7cd2ca07f4f1ab415d457a6e1c13 files/bluez-utils-2.21-pin 5 +MD5 7274187d952212ca6469a2306efb0d42 files/2.15-bluepin.patch 355 MD5 7b0985abd13b5bbc75fe58e206372a65 files/digest-bluez-utils-2.15 68 -MD5 5b6549a4300097637d65ab565a6c9535 files/digest-bluez-utils-2.19 68 -MD5 06aa410f5fe0f8459273a2bcda7db8cc files/digest-bluez-utils-2.10-r1 68 MD5 7300259b4a7fdd010164c37004269877 files/digest-bluez-utils-2.18 68 +MD5 5b6549a4300097637d65ab565a6c9535 files/digest-bluez-utils-2.19 68 +MD5 f98d1052bca4dd960f4d92ad331ba348 files/digest-bluez-utils-2.21 68 +MD5 8640fa9eafee8ea600121af7792b7ad9 files/bluez-utils-2.21-init.d 3396 +MD5 44ca243c60a83967c811537a38b92549 files/bluetooth.rc 1166 MD5 8640fa9eafee8ea600121af7792b7ad9 files/2.16/bluetooth.rc 3396 +MD5 e7df7cd2ca07f4f1ab415d457a6e1c13 files/2.10-r1/pin 5 MD5 992426019dbbd772c9326512d2a0033d files/2.10-r1/pin-helper.sh 49 MD5 cba196ec0ce8e3622a29f93b030ed027 files/2.10-r1/bluetooth.rc 3340 -MD5 e7df7cd2ca07f4f1ab415d457a6e1c13 files/2.10-r1/pin 5 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux) - -iD8DBQFDAzemKRy60XGEcJIRAnhnAJ4z1ipDAS10LkRMNRBDOv5S+DWIUQCgsWnf -06sXmfTi8+Y/9xBKa6w62XY= -=aaUO ------END PGP SIGNATURE----- diff --git a/net-wireless/bluez-utils/bluez-utils-2.21.ebuild b/net-wireless/bluez-utils/bluez-utils-2.21.ebuild new file mode 100644 index 000000000000..c6a2ab439280 --- /dev/null +++ b/net-wireless/bluez-utils/bluez-utils-2.21.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/bluez-utils-2.21.ebuild,v 1.1 2005/10/23 13:00:24 brix Exp $ + +DESCRIPTION="Bluetooth Tools and System Daemons for using Bluetooth under Linux" +HOMEPAGE="http://bluez.sourceforge.net/" +SRC_URI="http://bluez.sourceforge.net/download/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" + +IUSE="alsa cups dbus gtk pcmcia" + +RDEPEND="!net-wireless/bluez-pan + >=net-wireless/bluez-libs-2.21 + dev-libs/libusb + alsa? ( >=media-libs/alsa-lib-1.0.9 ) + cups? ( net-print/cups ) + dbus? ( >=sys-apps/dbus-0.31 ) + gtk? ( >=dev-python/pygtk-2.2 ) + pcmcia? ( virtual/pcmcia + sys-apps/setserial )" +DEPEND="sys-devel/bison + sys-devel/flex + >=sys-apps/sed-4 + ${RDEPEND}" + +src_unpack() { + unpack ${A} + + sed -i \ + -e "s:^HIDD_ENABLE=.*:HIDD_ENABLE=false:" \ + -e "s:^HID2HCI_ENABLE=.*:HID2HCI_ENABLE=false:" \ + ${S}/scripts/bluetooth.default + + sed -i \ + -e "s:security .*;:security user;:" \ + ${S}/hcid/hcid.conf + + if use gtk; then + sed -i -e "s:\(pin_helper \).*:\1/usr/bin/bluepin;:" \ + ${S}/hcid/hcid.conf + else + sed -i -e "s:\(pin_helper \).*:\1/etc/bluetooth/pin-helper;:" \ + ${S}/hcid/hcid.conf + fi +} + +src_compile() { + econf \ + $(use_enable alsa) \ + $(use_enable cups) \ + $(use_enable dbus) \ + $(use_enable pcmcia) \ + $(use_enable gtk bluepin) \ + --enable-avctrl \ + --enable-bcm203x \ + --enable-dfutool \ + --enable-hid2hci \ + --enable-obex \ + --disable-initscripts \ + --localstatedir=/var \ + || die "econf failed" + + emake || die "emake failed" +} + +src_install() { + make DESTDIR="${D}" install || die "make install failed" + + dodoc AUTHORS ChangeLog README + + # optional bluetooth utils + cd ${S}/tools + dosbin bccmd hcisecfilter ppporc pskey + + exeinto /etc/bluetooth + newexe ${FILESDIR}/${P}-pin-helper.sh pin-helper + + insinto /etc/bluetooth + newins ${FILESDIR}/${P}-pin pin + fperms 0600 /etc/bluetooth/pin + + newinitd ${FILESDIR}/${P}-init.d bluetooth + newconfd ${S}/scripts/bluetooth.default bluetooth + + # bug #103498 + if use pcmcia; then + fperms 755 /etc/pcmcia/bluetooth + fi +} + +pkg_postinst() { + einfo + einfo "A startup script has been installed in /etc/init.d/bluetooth." + einfo + einfo "If you need to set a default PIN, edit /etc/bluetooth/pin, and change" + einfo "/etc/bluetooth/hcid.conf option 'pin_helper' to /etc/bluetooth/pin-helper." + einfo + + if use gtk; then + einfo "By default, /usr/bin/bluepin will be launched on the desktop display" + einfo "for pin number input." + einfo + fi +} diff --git a/net-wireless/bluez-utils/files/bluez-utils-2.21-init.d b/net-wireless/bluez-utils/files/bluez-utils-2.21-init.d new file mode 100644 index 000000000000..61a8b7a86f06 --- /dev/null +++ b/net-wireless/bluez-utils/files/bluez-utils-2.21-init.d @@ -0,0 +1,143 @@ +#!/sbin/runscript +# Copyright 1999-2004 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.21-init.d,v 1.1 2005/10/23 13:00:24 brix Exp $ + +UART_CONF="/etc/bluetooth/uart" + +depend() { + after coldplug +} + +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-2.21-pin b/net-wireless/bluez-utils/files/bluez-utils-2.21-pin new file mode 100644 index 000000000000..81c545efebe5 --- /dev/null +++ b/net-wireless/bluez-utils/files/bluez-utils-2.21-pin @@ -0,0 +1 @@ +1234 diff --git a/net-wireless/bluez-utils/files/bluez-utils-2.21-pin-helper.sh b/net-wireless/bluez-utils/files/bluez-utils-2.21-pin-helper.sh new file mode 100644 index 000000000000..b8c05b48b219 --- /dev/null +++ b/net-wireless/bluez-utils/files/bluez-utils-2.21-pin-helper.sh @@ -0,0 +1,4 @@ +#!/bin/sh +echo -n "PIN:" +cat /etc/bluetooth/pin + diff --git a/net-wireless/bluez-utils/files/digest-bluez-utils-2.21 b/net-wireless/bluez-utils/files/digest-bluez-utils-2.21 new file mode 100644 index 000000000000..94411df0615a --- /dev/null +++ b/net-wireless/bluez-utils/files/digest-bluez-utils-2.21 @@ -0,0 +1 @@ +MD5 f61b3b87177d876c4fcfaba890b049b4 bluez-utils-2.21.tar.gz 506081 -- cgit v1.2.3-65-gdbad