diff options
author | Tiziano Müller <dev-zero@gentoo.org> | 2008-11-28 21:21:36 +0000 |
---|---|---|
committer | Tiziano Müller <dev-zero@gentoo.org> | 2008-11-28 21:21:36 +0000 |
commit | 05acbedf184696e614431c61165ef52da13b16b6 (patch) | |
tree | 90d2371d60badb8929cae23dae8e30356378042b /net-wireless | |
parent | ppc stable, bug #249039 (diff) | |
download | historical-05acbedf184696e614431c61165ef52da13b16b6.tar.gz historical-05acbedf184696e614431c61165ef52da13b16b6.tar.bz2 historical-05acbedf184696e614431c61165ef52da13b16b6.zip |
Initial commit, keeping the keywords the same as for bluez-libs/-utils since it's mostly the same. Most patches are taken from bluez-libs/-utils. (bug #236357)
Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.27.5 x86_64
Diffstat (limited to 'net-wireless')
-rw-r--r-- | net-wireless/bluez/ChangeLog | 15 | ||||
-rw-r--r-- | net-wireless/bluez/Manifest | 11 | ||||
-rw-r--r-- | net-wireless/bluez/bluez-4.19.ebuild | 157 | ||||
-rw-r--r-- | net-wireless/bluez/files/4.18/bluetooth-conf.d | 10 | ||||
-rw-r--r-- | net-wireless/bluez/files/4.18/bluetooth-init.d | 48 | ||||
-rw-r--r-- | net-wireless/bluez/files/4.18/conf.d-hidd | 5 | ||||
-rw-r--r-- | net-wireless/bluez/files/4.18/cups-location.patch | 18 | ||||
-rw-r--r-- | net-wireless/bluez/files/4.18/init.d-hidd | 29 | ||||
-rw-r--r-- | net-wireless/bluez/files/bluez-4.18-udev.rules | 5 | ||||
-rw-r--r-- | net-wireless/bluez/files/bluez-4.18-udev.script | 28 | ||||
-rw-r--r-- | net-wireless/bluez/metadata.xml | 17 |
11 files changed, 343 insertions, 0 deletions
diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog new file mode 100644 index 000000000000..30960dbf8d27 --- /dev/null +++ b/net-wireless/bluez/ChangeLog @@ -0,0 +1,15 @@ +# ChangeLog for net-wireless/bluez +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.1 2008/11/28 21:21:35 dev-zero Exp $ + +*bluez-4.19 (28 Nov 2008) + + 28 Nov 2008; Tiziano Müller <dev-zero@gentoo.org> + +files/bluez-4.18-udev.rules, +files/4.18/bluetooth-conf.d, + +files/4.18/conf.d-hidd, +files/bluez-4.18-udev.script, + +files/4.18/bluetooth-init.d, +files/4.18/cups-location.patch, + +files/4.18/init.d-hidd, +metadata.xml, +bluez-4.19.ebuild: + Initial commit, keeping the keywords the same as for bluez-libs/-utils + since it's mostly the same. Most patches are taken from bluez-libs/-utils. + (bug #236357) + diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest new file mode 100644 index 000000000000..d9cc961d8139 --- /dev/null +++ b/net-wireless/bluez/Manifest @@ -0,0 +1,11 @@ +AUX 4.18/bluetooth-conf.d 257 RMD160 d3a6cd6e9fb77f6bc0c6aac4833b15c60b781c52 SHA1 c1088c509e2182a3b5987148da03393ab2053101 SHA256 73427f2c46e7be41c24e4c536107ecf8845e0125b34997d74934b92d40f79ee4 +AUX 4.18/bluetooth-init.d 1171 RMD160 6ef1d5dc53200f282ccd02aacd5ff50d78484d78 SHA1 ef39d708cf433d9ec2d8e59b1bd3729586895449 SHA256 e314970474e19b33598272c0539bb540b45fd6e65a2d1d165648f50d54308b6e +AUX 4.18/conf.d-hidd 89 RMD160 31407e00bcb00eb0b9c1adeb7434a922bfb967e9 SHA1 dc6831fa817c8bd2378830e13bc96d3ff3fdffa2 SHA256 8fc50b8c644e0bc69eacef2a9555118b2f4758aafcb42e8ea3ca1293e8f3a211 +AUX 4.18/cups-location.patch 480 RMD160 3da74418b140c2ea05d2c9e0d743eaf004deba5d SHA1 3605b1633c92b2b7eefc7e6b78e98df3e12088a8 SHA256 cede5fed7e4ece7cf4977d40e7fd8f9a22200660b06cca15d39c9c40542ab33d +AUX 4.18/init.d-hidd 779 RMD160 8dc919f4d0aa2df8464e3326c14b6f5a9f0c360f SHA1 45901988313787db4f1d5a0fdc44009ffa3d650b SHA256 d5816349cc85313a8f7f1b79112918aeda863ff59f298b99462611860605c737 +AUX bluez-4.18-udev.rules 228 RMD160 ab9b4ce8907c62eb9d1f14406cc2ff3f5ec69a19 SHA1 14e652de6cfed28f215727800460e600129007c2 SHA256 7577c2ed295b67f960f17ac65a44889c6536c125b34e33860d6d9f128a59fa82 +AUX bluez-4.18-udev.script 752 RMD160 d8f60749dbe497bef7362a4c3f56b2b83ca079cb SHA1 0c39b4b4f4c57fb334daa793f89c0ffac046b956 SHA256 cb41a4eeea5137fb27d82d74f34e5e7dd725ddf8442c39ea623afe0d3c041fcf +DIST bluez-4.19.tar.gz 928788 RMD160 c5067ce8a6e57f26cd6728a620d50355311bfd57 SHA1 bfc54d947e725b2f36a37f099fcd66cd7f95facf SHA256 73943a1710af29988775a2af726ebc9d924b367b27c10cf7f0d1cfa9a012cffc +EBUILD bluez-4.19.ebuild 4750 RMD160 c5a6c85ff9ea5758f9b9a50f249e76408e8da1b3 SHA1 941fa1f52c6d779f2e935b3cc27d72905687ee83 SHA256 c0e5d16090c431fddc5c447be00df0e5770989022cd86c81a08390eff0906411 +MISC ChangeLog 705 RMD160 b649fb8568e9bb0f4d9f5327e9e5f0971b6b5c79 SHA1 512f218e9fcd5b90d1da33fae7c134561a90efe1 SHA256 3b3ab9f950261d0b403886cfaed5568104c8e8b4180015695fef5ca9a6ddff20 +MISC metadata.xml 514 RMD160 89fa06d58b02ddf9cf942c3e8662cbdc70e14587 SHA1 5f91b2a84e74029a5f8eb7362d6412b36518cdec SHA256 03647e723337dcd35c89f4dfcecaeeefba99883d690e6e91320804d5f8a22f9e diff --git a/net-wireless/bluez/bluez-4.19.ebuild b/net-wireless/bluez/bluez-4.19.ebuild new file mode 100644 index 000000000000..676bc99c4e08 --- /dev/null +++ b/net-wireless/bluez/bluez-4.19.ebuild @@ -0,0 +1,157 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.19.ebuild,v 1.1 2008/11/28 21:21:35 dev-zero Exp $ + +inherit autotools multilib eutils + +DESCRIPTION="Bluetooth Tools and System Daemons for Linux" +HOMEPAGE="http://bluez.sourceforge.net/" +SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.gz" +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86" + +IUSE="alsa cups debug doc examples gstreamer old-daemons test-programs usb" + +RDEPEND="alsa? ( media-libs/alsa-lib ) + gstreamer? ( + >=media-libs/gstreamer-0.10 + >=media-libs/gst-plugins-base-0.10 ) + usb? ( dev-libs/libusb ) + cups? ( net-print/cups ) + sys-fs/udev + dev-libs/glib + sys-apps/dbus + !net-wireless/bluez-libs + !net-wireless/bluez-utils" +DEPEND="!<dev-libs/libnl-1.1 + sys-devel/flex + dev-util/pkgconfig + doc? ( dev-util/gtk-doc ) + ${RDEPEND}" + +src_unpack() { + unpack ${A} + cd "${S}" + + if use cups; then + epatch "${FILESDIR}/4.18/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 + + econf \ + $(use_enable doc gtk-doc) \ + --enable-network \ + --enable-serial \ + --enable-input \ + --enable-audio \ + --enable-service \ + $(use_enable gstreamer) \ + $(use_enable alsa) \ + $(use_enable usb) \ + --enable-netlink \ + --enable-tools \ + --enable-bccmd \ + --enable-hid2hci \ + --enable-dfutool \ + $(use_enable old-daemons hidd) \ + $(use_enable old-daemons pand) \ + $(use_enable old-daemons dund) \ + $(use_enable cups) \ + $(use_enable test-programs test) \ + --enable-manpages \ + --enable-configfiles \ + --disable-initscripts \ + --disable-pcmciarules \ + $(use_enable debug) \ + --localstatedir=/var + + emake || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + + dodoc AUTHORS ChangeLog README || die + + if use test-programs ; then + dobin input/test-input || die + + # a very simple example daemon + dobin test/passkey-agent || die + dobin test/auth-agent || die + fi + + newinitd "${FILESDIR}/4.18/bluetooth-init.d" bluetooth || die + newconfd "${FILESDIR}/4.18/bluetooth-conf.d" bluetooth || die + + if use old-daemons; then + newconfd "${FILESDIR}/4.18/conf.d-hidd" hidd || die + newinitd "${FILESDIR}/4.18/init.d-hidd" hidd || die + fi + + # bug #84431 + insinto /etc/udev/rules.d/ + newins "${FILESDIR}/${PN}-4.18-udev.rules" 70-bluetooth.rules || die + newins "${S}/scripts/bluetooth.rules" 70-bluetooth-pcmcia.rules || die + + exeinto /$(get_libdir)/udev/ + newexe "${FILESDIR}/${PN}-4.18-udev.script" bluetooth.sh || die + doexe "${S}/scripts/bluetooth_serial" || die + + insinto /etc/bluetooth + doins \ + input/input.conf \ + audio/audio.conf \ + network/network.conf +} + +pkg_postinst() { + udevadm control --reload_rules && udevadm trigger + + 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 "3.15 adds support for the audio service. See" + elog "http://wiki.bluez.org/wiki/HOWTO/AudioDevices for configuration help." + elog "" + 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 + elog + ewarn "On first install you need to run /etc/init.d/dbus reload or hcid" + ewarn "will fail to start." +} diff --git a/net-wireless/bluez/files/4.18/bluetooth-conf.d b/net-wireless/bluez/files/4.18/bluetooth-conf.d new file mode 100644 index 000000000000..c84ac4f1175c --- /dev/null +++ b/net-wireless/bluez/files/4.18/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/files/4.18/bluetooth-init.d b/net-wireless/bluez/files/4.18/bluetooth-init.d new file mode 100644 index 000000000000..d66708495cf7 --- /dev/null +++ b/net-wireless/bluez/files/4.18/bluetooth-init.d @@ -0,0 +1,48 @@ +#!/sbin/runscript +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/4.18/bluetooth-init.d,v 1.1 2008/11/28 21:21:35 dev-zero Exp $ + +depend() { + after coldplug + need dbus localmount +} + +start() { + ebegin "Starting Bluetooth" + local result=0 + + ebegin " Starting bluetoothd" + # -s enables internal sdp server + start-stop-daemon --start \ + --exec /usr/sbin/bluetoothd + result=$? + eend ${result} + + if [ "${HID2HCI_ENABLE}" = "true" -a -x /usr/sbin/hid2hci ]; then + ebegin " Running hid2hci" + /usr/sbin/hid2hci --tohci -q #be quiet + [ ${result} == 0 ] && result=$? + eend ${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 + [ ${result} == 0 ] && result=$? + eend ${result} + 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/bluetoothd + eend $? +} diff --git a/net-wireless/bluez/files/4.18/conf.d-hidd b/net-wireless/bluez/files/4.18/conf.d-hidd new file mode 100644 index 000000000000..1677ef0f3556 --- /dev/null +++ b/net-wireless/bluez/files/4.18/conf.d-hidd @@ -0,0 +1,5 @@ +# Bluetooth hidd daemon configuraton file + +# Arguments to hidd +HIDD_OPTIONS="--encrypt" + diff --git a/net-wireless/bluez/files/4.18/cups-location.patch b/net-wireless/bluez/files/4.18/cups-location.patch new file mode 100644 index 000000000000..e0ddc020062b --- /dev/null +++ b/net-wireless/bluez/files/4.18/cups-location.patch @@ -0,0 +1,18 @@ +? cups/.deps +? cups/Makefile +? cups/Makefile.in +Index: cups/Makefile.am +=================================================================== +RCS file: /cvsroot/bluez/utils/cups/Makefile.am,v +retrieving revision 1.9 +diff -u -r1.9 Makefile.am +--- cups/Makefile.am 20 Aug 2006 02:21:03 -0000 1.9 ++++ cups/Makefile.am 1 Jun 2007 15:47:14 -0000 +@@ -1,6 +1,6 @@ + + if CUPS +-cupsdir = $(libdir)/cups/backend ++cupsdir = `cups-config --serverbin`/backend + + cups_PROGRAMS = bluetooth + else diff --git a/net-wireless/bluez/files/4.18/init.d-hidd b/net-wireless/bluez/files/4.18/init.d-hidd new file mode 100644 index 000000000000..9e61281a48fe --- /dev/null +++ b/net-wireless/bluez/files/4.18/init.d-hidd @@ -0,0 +1,29 @@ +#!/sbin/runscript +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/4.18/init.d-hidd,v 1.1 2008/11/28 21:21:35 dev-zero Exp $ + +depend() { + need bluetooth +} + +start() { + ebegin "Starting hidd" + start-stop-daemon --start --quiet \ + --exec /usr/bin/hidd -- ${HIDD_OPTIONS} --server + local result="$?" + local service="/etc/bluetooth/input.service" + if [ "${result}" != "0" ] && grep -q "Autostart=true" ${service}; then + eerror "You have Autostart=true in ${service}." + eerror "Change this to false if you want to use hidd." + fi + eend ${result} +} + +stop() { + ebegin "Stopping hidd" + hidd --killall + start-stop-daemon --stop --quiet --exec /usr/bin/hidd + eend $? +} + diff --git a/net-wireless/bluez/files/bluez-4.18-udev.rules b/net-wireless/bluez/files/bluez-4.18-udev.rules new file mode 100644 index 000000000000..b3ccd5bbbaec --- /dev/null +++ b/net-wireless/bluez/files/bluez-4.18-udev.rules @@ -0,0 +1,5 @@ +# Start/Stop bluetooth service on device insertion. Gentoo specific. +SUBSYSTEM=="bluetooth", KERNEL=="hci[0-9]*", RUN+="bluetooth.sh" + +# So that normal users can dial out. +SUBSYSTEM=="tty", SUBSYSTEMS=="bluetooth", GROUP="uucp" diff --git a/net-wireless/bluez/files/bluez-4.18-udev.script b/net-wireless/bluez/files/bluez-4.18-udev.script new file mode 100644 index 000000000000..a532e2652cdb --- /dev/null +++ b/net-wireless/bluez/files/bluez-4.18-udev.script @@ -0,0 +1,28 @@ +#!/bin/sh +# +# bluetooth.sh: udev external RUN script +# +# Copyright: +# 2005-2006 Henrik Brix Andersen <brix@gentoo.org> +# 2007 Petteri Räty <betelgeuse@gentoo.org> +# 2008 Tiziano Müller <dev-zero@gentoo.org> +# Distributed under the terms of the GNU General Public License v2 + +script=/etc/init.d/bluetooth + +# Find out where sysfs is mounted. Exit if not available +sysfs=`grep -F sysfs /proc/mounts | awk '{print $2}'` +if [ "$sysfs" = "" ]; then + echo "sysfs is required" + exit 1 +fi + +if [ ! -d $sysfs/class/bluetooth/hci[0-9]* -a ! -d $sysfs/bus/bluetooth/devices/hci[0-9]* ]; then + if $script --quiet status; then + IN_HOTPLUG=1 $script --quiet stop + fi +else + if ! $script --quiet status; then + IN_HOTPLUG=1 $script --quiet start + fi +fi diff --git a/net-wireless/bluez/metadata.xml b/net-wireless/bluez/metadata.xml new file mode 100644 index 000000000000..4df5da7d6d51 --- /dev/null +++ b/net-wireless/bluez/metadata.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>mobile</herd> + <herd>pda</herd> + <maintainer> + <email>dev-zero@gentoo.org</email> + </maintainer> + <maintainer> + <email>betelgeuse@gentoo.org</email> + </maintainer> + <use> + <flag name='old-daemons'>Install old daemons like hidd and sdpd that are + deprecated by the new Service framework</flag> + <flag name='test-programs'>Install l2test and rctest</flag> + </use> +</pkgmetadata> |