Группа :: Сети/Прочее
Пакет: bluez
навигация по пакетам
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: bluez-4.47-alt1.patch
Скачать
Скачать
.gear/rules | 2 +
.../tags/b76adb9b8d42d2154610eefe65d3002991140240 | 6 +
.gear/tags/list | 1 +
audio/Makefile.am | 4 +-
bluez.spec | 456 ++++++++++++++++++++
cups/Makefile.am | 2 +-
input/Makefile.am | 4 +-
network/Makefile.am | 4 +-
scripts/90-bluetooth-hid2hci.rules | 33 ++
scripts/bluetooth.alt.init | 62 +++
scripts/bluetooth_serial | 4 +-
serial/Makefile.am | 4 +-
src/hcid.conf | 8 +-
tools/Makefile.am | 5 +-
14 files changed, 580 insertions(+), 15 deletions(-)
diff --git a/.gear/rules b/.gear/rules
new file mode 100644
index 0000000..4fcfd99
--- /dev/null
+++ b/.gear/rules
@@ -0,0 +1,2 @@
+tar: @version@:.
+diff: @version@:. .
diff --git a/.gear/tags/b76adb9b8d42d2154610eefe65d3002991140240 b/.gear/tags/b76adb9b8d42d2154610eefe65d3002991140240
new file mode 100644
index 0000000..62ab7c8
--- /dev/null
+++ b/.gear/tags/b76adb9b8d42d2154610eefe65d3002991140240
@@ -0,0 +1,6 @@
+object 653d0457bc99debe89c7990a6f16f0e230439987
+type commit
+tag 4.47
+tagger Marcel Holtmann <marcel@holtmann.org> 1249165948 -0700
+
+Release 4.47
diff --git a/.gear/tags/list b/.gear/tags/list
new file mode 100644
index 0000000..0d7aa63
--- /dev/null
+++ b/.gear/tags/list
@@ -0,0 +1 @@
+b76adb9b8d42d2154610eefe65d3002991140240 4.47
diff --git a/audio/Makefile.am b/audio/Makefile.am
index 52ad212..a6ebbef 100644
--- a/audio/Makefile.am
+++ b/audio/Makefile.am
@@ -16,8 +16,8 @@ nodist_audio_la_SOURCES = $(BUILT_SOURCES)
audio_la_LDFLAGS = -module -avoid-version -no-undefined
-LDADD = $(top_builddir)/common/libhelper.a \
- @GDBUS_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
+LDADD = $(top_builddir)/common/libhelper.a
+audio_la_LIBADD = @GDBUS_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
if ALSA
alsadir = $(libdir)/alsa-lib
diff --git a/bluez.spec b/bluez.spec
new file mode 100644
index 0000000..0addca1
--- /dev/null
+++ b/bluez.spec
@@ -0,0 +1,456 @@
+Name: bluez
+Version: 4.47
+Release: alt1
+Summary: Bluetooth utilities
+License: GPLv2+
+Group: Networking/Other
+URL: http://www.bluez.org/
+
+Packager: Valery Inozemtsev <shrek@altlinux.ru>
+
+Requires: libusb > 1.0-alt2
+Requires: lib%{name}4 = %version-%release+Conflicts: bluez-utils < %version-%release
+
+Source: %name-%version.tar
+Patch: %name-%version-%release.patch
+
+BuildRequires: flex gst-plugins-devel gtk-doc libalsa-devel libdbus-devel libnl-devel libsndfile-devel libusb-compat-devel
+
+%description
+Bluetooth protocol stack for Linux
+
+%package -n lib%{name}4+Summary: Libraries for use in Bluetooth applications
+Group: System/Libraries
+
+%description -n lib%{name}4+Libraries for use in Bluetooth applications.
+
+%package -n lib%{name}4-devel+Summary: Development libraries for Bluetooth applications
+Group: Development/C
+Requires: lib%{name}4 = %version-%release+Conflicts: lib%name-devel < %version-%release
+
+%description -n lib%{name}4-devel+lib%{name}4-devel contains development libraries and headers for+use in Bluetooth applications.
+
+%package cups
+Summary: CUPS printer backend for Bluetooth printers
+Group: Networking/Other
+Requires: %name = %version-%release
+Conflicts: %name-utils-cups < %version-%release
+
+%description cups
+This package contains the CUPS backend
+
+%package gstreamer
+Summary: GStreamer support for SBC audio format
+Group: Networking/Other
+Requires: %name = %version-%release
+Conflicts: %name-utils-gstreamer < %version-%release
+
+%description gstreamer
+This package contains gstreamer plugins for the Bluetooth SBC audio format
+
+%package alsa
+Summary: ALSA support for Bluetooth audio devices
+Group: Networking/Other
+Requires: %name = %version-%release
+Conflicts: %name-utils-alsa < %version-%release
+
+%description alsa
+This package contains ALSA support for Bluetooth audio devices
+
+%prep
+%setup -q
+%patch -p1
+
+%build
+%autoreconf
+%configure \
+ --enable-cups \
+ --enable-hid2hci \
+ --enable-dfutool \
+ --enable-tools \
+ --enable-bccmd \
+ --enable-gstreamer \
+ --enable-hidd \
+ --enable-pand \
+ --enable-dund \
+ --enable-netlink \
+ --enable-gtk-doc \
+ --enable-initscripts \
+ --disable-udevrules \
+ --localstatedir=%_var
+%make_build
+
+%install
+%make DESTDIR=%buildroot install
+
+install -pD -m644 scripts/90-bluetooth-hid2hci.rules %buildroot%_sysconfdir/udev/rules.d/90-bluetooth-hid2hci.rules
+install -pD -m755 scripts/bluetooth.alt.init %buildroot%_initdir/bluetoothd
+install -m644 audio/audio.conf \
+ input/input.conf \
+ network/network.conf \
+ serial/serial.conf \
+ src/hcid.conf \
+ %buildroot%_sysconfdir/bluetooth/
+
+mkdir %buildroot%_sysconfdir/modprobe.d
+cat > %buildroot%_sysconfdir/modprobe.d/btusb << __EOF__
+# use "reset=1" as default, since it should be safe for recent devices and
+# solves all kind of problems.
+options btusb reset=1
+__EOF__
+
+find %buildroot%_libdir -name \*.la -delete
+
+%post
+%post_service bluetoothd
+if [ $1 = 1 ]; then
+ chkconfig bluetoothd on
+fi
+
+%preun
+%preun_service bluetoothd
+
+%triggerin -- %name <= 4.37-alt1
+chkconfig bluetoothd on
+
+%files
+%_initdir/bluetoothd
+%dir %_sysconfdir/bluetooth
+%config(noreplace) %_sysconfdir/bluetooth/*
+%config(noreplace) %_sysconfdir/udev/rules.d/90-bluetooth-hid2hci.rules
+%config %_sysconfdir/dbus-1/system.d/bluetooth.conf
+%_sysconfdir/modprobe.d/btusb
+/sbin/*
+%_bindir/*
+%_sbindir/*
+%_libdir/bluetooth
+%_localstatedir/bluetooth
+%_man1dir/*.1*
+%_man8dir/*.8*
+
+%files -n lib%{name}4+%doc AUTHORS ChangeLog README
+%_libdir/*.so.*
+
+%files -n lib%{name}4-devel+%_includedir/bluetooth
+%_libdir/*.so
+%_pkgconfigdir/*.pc
+%_datadir/gtk-doc/html/bluez
+
+%files cups
+%_prefix/lib/cups/backend/bluetooth
+
+%files gstreamer
+%_libdir/gstreamer-*/*.so
+
+%files alsa
+%dir %_sysconfdir/alsa
+%config(noreplace) %_sysconfdir/alsa/bluetooth.conf
+%_libdir/alsa-lib/*.so
+
+%changelog
+* Sun Aug 02 2009 Valery Inozemtsev <shrek@altlinux.ru> 4.47-alt1
+- 4.47
+
+* Sat Aug 01 2009 Valery Inozemtsev <shrek@altlinux.ru> 4.46-alt2
+- used limited discoverable mode only when 0 < discov_timeout <= 60
+
+* Sun Jul 19 2009 Valery Inozemtsev <shrek@altlinux.ru> 4.46-alt1
+- 4.46
+
+* Wed Jul 08 2009 Valery Inozemtsev <shrek@altlinux.ru> 4.45-alt1
+- 4.45
+
+* Tue Jul 07 2009 Valery Inozemtsev <shrek@altlinux.ru> 4.44-alt1
+- 4.44
+
+* Fri Jul 03 2009 Valery Inozemtsev <shrek@altlinux.ru> 4.43-alt1
+- 4.43
+
+* Mon Jun 22 2009 Valery Inozemtsev <shrek@altlinux.ru> 4.42-alt1
+- 4.42
+
+* Sun Jun 07 2009 Valery Inozemtsev <shrek@altlinux.ru> 4.41-alt1
+- 4.41
+
+* Wed May 20 2009 Valery Inozemtsev <shrek@altlinux.ru> 4.40-alt2
+- hid2hci run from udev
+
+* Wed May 20 2009 Valery Inozemtsev <shrek@altlinux.ru> 4.40-alt1
+- 4.40
+
+* Tue May 12 2009 Valery Inozemtsev <shrek@altlinux.ru> 4.39-alt1
+- 4.39
+
+* Mon May 04 2009 Valery Inozemtsev <shrek@altlinux.ru> 4.38-alt1
+- 4.38
+
+* Wed Apr 29 2009 Valery Inozemtsev <shrek@altlinux.ru> 4.37-alt3
+- condrestart does nothing
+
+* Sun Apr 26 2009 Valery Inozemtsev <shrek@altlinux.ru> 4.37-alt2
+- enable service bluetoothd by default (closes: #19771)
+
+* Thu Apr 23 2009 Valery Inozemtsev <shrek@altlinux.ru> 4.37-alt1
+- 4.37
+
+* Sat Apr 18 2009 Valery Inozemtsev <shrek@altlinux.ru> 4.36-alt3
+- bluetoothd start after haldaemon
+
+* Fri Apr 17 2009 Valery Inozemtsev <shrek@altlinux.ru> 4.36-alt2
+- enabled netlink
+
+* Fri Apr 17 2009 Valery Inozemtsev <shrek@altlinux.ru> 4.36-alt1
+- 4.36
+
+* Sun Apr 12 2009 Valery Inozemtsev <shrek@altlinux.ru> 4.35-alt1
+- 4.35
+
+* Tue Apr 07 2009 Valery Inozemtsev <shrek@altlinux.ru> 4.34-alt1
+- 4.34
+
+* Mon Mar 16 2009 Valery Inozemtsev <shrek@altlinux.ru> 4.33-alt1
+- 4.33
+
+* Tue Mar 03 2009 Valery Inozemtsev <shrek@altlinux.ru> 4.32-alt1
+- 4.32
+
+* Thu Feb 26 2009 Valery Inozemtsev <shrek@altlinux.ru> 4.31-alt1
+- 4.31
+
+* Fri Feb 13 2009 Valery Inozemtsev <shrek@altlinux.ru> 4.30-alt1
+- 4.30
+
+* Sun Feb 08 2009 Valery Inozemtsev <shrek@altlinux.ru> 4.29-alt1
+- 4.29
+
+* Mon Feb 02 2009 Valery Inozemtsev <shrek@altlinux.ru> 4.28-alt1
+- 4.28
+
+* Sat Jan 31 2009 Valery Inozemtsev <shrek@altlinux.ru> 4.27-alt1
+- 4.27
+- renamed to bluez
+
+* Sat Jan 31 2009 Valery Inozemtsev <shrek@altlinux.ru> 3.36-alt3
+- dropped tests
+- dropped .service dbus file
+- fixed init scripts
+- fixed udev rules
+- fixed dbus config
+
+* Tue Oct 14 2008 Alexey Shabalin <shaba@altlinux.ru> 3.36-alt2
+- use standart path for alsa library(#17555)
+- drop buildrequires on libpulse-devel
+
+* Mon Aug 04 2008 Alexey Shabalin <shaba@altlinux.ru> 3.36-alt1
+- 3.36
+- fix build with netlink (change buildreq libnetlink-devel to libnl-devel)
+
+* Mon Jul 07 2008 Alexey Shabalin <shaba@altlinux.ru> 3.35-alt2
+- install /etc/sysconfig/bluetooth from SOURCE2
+- add parameter HID2HCI_UNDO to conf and init
+- add a .service dbus file
+- build with enabled network, serial, input, audio
+- install audio.conf and network.conf
+- rename udev rules to 81-bluetooth-pcmcia.rules
+- add udev rules 80-bluetooth.rules from udev-rules package
+- split packages alsa, gstreamer
+
+* Mon Jul 07 2008 Andrey Rahmatullin <wrar@altlinux.ru> 3.35-alt1
+- 3.35
+
+* Wed Jun 25 2008 Andrey Rahmatullin <wrar@altlinux.ru> 3.34-alt1
+- 3.34
+
+* Sat Jun 21 2008 Andrey Rahmatullin <wrar@altlinux.ru> 3.33-alt1
+- 3.33
+
+* Tue May 27 2008 Andrey Rahmatullin <wrar@altlinux.ru> 3.32-alt1
+- 3.32
+
+* Fri May 09 2008 Andrey Rahmatullin <wrar@altlinux.ru> 3.31-alt1
+- 3.31
+- restore setserial support
+- link bluetoothctl -> initscript, not vice versa (ldv@)
+
+* Fri Apr 04 2008 Andrey Rahmatullin <wrar@altlinux.ru> 3.30-alt1
+- 3.30
+- disable setserial in /lib/udev/bluetooth_serial
+
+* Sat Mar 22 2008 Andrey Rahmatullin <wrar@altlinux.ru> 3.29-alt1
+- 3.29
+- package dbus docs
+
+* Thu Mar 06 2008 Andrey Rahmatullin <wrar@altlinux.ru> 3.28-alt1
+- 3.28
+
+* Sun Feb 17 2008 Andrey Rahmatullin <wrar@altlinux.ru> 3.26-alt1
+- 3.26
+
+* Sat Feb 02 2008 Andrey Rahmatullin <wrar@altlinux.ru> 3.25-alt1
+- 3.25
+
+* Thu Jan 31 2008 Andrey Rahmatullin <wrar@altlinux.ru> 3.24-alt1.1
+- rebuild
+
+* Wed Dec 26 2007 Andrey Rahmatullin <wrar@altlinux.ru> 3.24-alt1
+- 3.24
+
+* Tue Dec 11 2007 Andrey Rahmatullin <wrar@altlinux.ru> 3.23-alt1
+- 3.23
+
+* Fri Oct 26 2007 Andrey Rahmatullin <wrar@altlinux.ru> 3.22-alt1
+- 3.22
+- update buildreqs
+- update License:
+
+* Fri Oct 05 2007 Andrey Rahmatullin <wrar@altlinux.ru> 3.20-alt1
+- 3.20
+
+* Sun Sep 16 2007 Andrey Rahmatullin <wrar@altlinux.ru> 3.19-alt1
+- 3.19
+
+* Sat Sep 08 2007 Andrey Rahmatullin <wrar@altlinux.ru> 3.18-alt1
+- 3.18
+
+* Thu May 24 2007 Andrey Rahmatullin <wrar@altlinux.ru> 3.11-alt1
+- 3.11
+- remove l2test and rctest from the main package, add Conflicts (#11815)
+
+* Tue May 15 2007 Andrey Rahmatullin <wrar@altlinux.ru> 3.10-alt2
+- increase dbus find time to 5 min
+- do not build sdpd
+- fix apitest for new python-modules-dbus (SuSE)
+
+* Fri May 11 2007 Andrey Rahmatullin <wrar@altlinux.ru> 3.10-alt1
+- 3.10
+- spec cleanup
+- fix dev files location (shrek, #11567)
+- enable Major Service Class: Telephony in default CoD (Guest007)
+- disable discoverable mode timeout (#11676)
+
+* Wed Feb 14 2007 Andrey Rahmatullin <wrar@altlinux.ru> 3.9-alt2
+- enable rfcomm by default (#10825)
+- initscript:
+ + enable sdpd support in hcid if sdpd daemon is disabled
+ + check whether hcid and sdpd are enabled when stopping them
+ + remove `killall rfcommd' and `rmmod' calls
+ + package as %%_sbindir/bluetoothctl, leaving symlink in %%_initdir
+ (#10726)
+
+* Fri Feb 09 2007 Andrey Rahmatullin <wrar@altlinux.ru> 3.9-alt1
+- 3.9
+- hcid on start now retries to find dbus for 1 minute after start
+ (patch from Daniel Gollub, SuSE)
+- hcid.conf:
+ + change default device class to 104 (Desktop)
+ + add comment about device class numbers (from SuSE)
+- package test utils separately, add missing obsoletes/provides
+ for bluez-hciemu
+- remove alsa subpackage
+- install cups backend to prefix/lib even on x86_64 (#10762)
+
+* Wed Dec 27 2006 Andrey Rahmatullin <wrar@altlinux.ru> 3.8-alt1
+- 3.8
+- remove wildcards from %%files
+- enable _unpackaged_files_terminate_build
+- remove --enable-all, explicitly enable what is needed
+- disable FUSE "support"
+- enable PIE linking
+- sync module aliases with Debian (remove old lines, add hidp)
+- add Requires: dbus
+- add Requires: libbluez >= %%version
+
+* Tue Nov 07 2006 Andrey Rahmatullin <wrar@altlinux.ru> 3.7-alt1
+- 3.7
+- spec cleanup
+- remove kernel-headers-std26-up from buildreqs
+- fix statedir path and package it (#8885)
+- set default PIN to "1234" (Debian)
+- set default device ident string to "%%h-%%d" (Debian)
+- install passkey-agent (#10176)
+- add patch from http://kmobiletools.org/node/228 for compatibility
+ with old helpers
+
+* Wed Aug 23 2006 Grigory Milev <week@altlinux.ru> 3.3-alt1
+- new version released
+- removed bluepin
+- removed package pcmcia
+- added D-Bus support
+- added udev support
+
+* Tue Feb 21 2006 Grigory Milev <week@altlinux.ru> 2.25-alt1
+- new version released (Read ChangeLog in doc dir)
+
+* Mon Aug 22 2005 Grigory Milev <week@altlinux.ru> 2.19-alt1
+- new version released
+- added cups and alsa support
+
+* Thu Apr 14 2005 Grigory Milev <week@altlinux.ru> 2.15-alt4
+- return unpackage file hcitool
+
+* Thu Mar 17 2005 Grigory Milev <week@altlinux.ru> 2.15-alt3
+- move misc tool to separate package
+
+* Tue Mar 15 2005 Grigory Milev <week@altlinux.ru> 2.15-alt2
+- Fix build requires
+
+* Mon Mar 14 2005 Grigory Milev <week@altlinux.ru> 2.15-alt1
+- new version released
+
+* Mon Mar 14 2005 Grigory Milev <week@altlinux.ru> 2.13-alt3
+- remove requires to python
+
+* Wed Jan 12 2005 Grigory Milev <week@altlinux.ru> 2.13-alt2
+- fixed build requires
+
+* Tue Jan 11 2005 Grigory Milev <week@altlinux.ru> 2.13-alt1
+- new version released
+- turn off HIDD_ENABLE on default config
+
+* Tue Nov 2 2004 Grigory Milev <week@altlinux.ru> 2.10-alt2
+- Start bluez utils after hotplug
+
+* Thu Sep 23 2004 Grigory Milev <week@altlinux.ru> 2.10-alt1
+- new version released
+
+* Wed Jul 14 2004 Grigory Milev <week@altlinux.ru> 2.7-alt3
+- fixed startup script for work with chkconfig
+
+* Mon Jun 28 2004 Grigory Milev <week@altlinux.ru> 2.7-alt2
+- fix requires
+
+* Mon Jun 21 2004 Grigory Milev <week@altlinux.ru> 2.7-alt1
+- fixating init script (not all)
+- bluez-sdp orphaned, currently moved to bluez-utils
+- new version released
+
+* Thu Jun 3 2004 Grigory Milev <week@altlinux.ru> 2.4-alt2
+- rebuild with new python
+
+* Tue Feb 24 2004 Grigory Milev <week@altlinux.ru> 2.4-alt1
+- new version released
+- move pcmcia scripts to separate package
+- fix bluepin script
+
+* Tue Oct 14 2003 Grigory Milev <week@altlinux.ru> 2.3-alt1
+- new version released
+- fix initscript for start/stop daemon support
+- add modutils configuration
+
+* Mon Mar 31 2003 Grigory Milev <week@altlinux.ru> 2.2-alt2
+- move /dev/vhci to package MAKEDEV
+
+* Tue Feb 18 2003 Grigory Milev <week@altlinux.ru> 2.2-alt1
+- new version released
+
+* Fri Dec 20 2002 Grigory Milev <week@altlinux.ru> 2.1-alt1
+- Initial build.
diff --git a/cups/Makefile.am b/cups/Makefile.am
index 70a8ba8..b4e05f0 100644
--- a/cups/Makefile.am
+++ b/cups/Makefile.am
@@ -1,6 +1,6 @@
if CUPS
-cupsdir = $(libdir)/cups/backend
+cupsdir = $(prefix)/lib/cups/backend
cups_PROGRAMS = bluetooth
diff --git a/input/Makefile.am b/input/Makefile.am
index 98ce928..71b2c40 100644
--- a/input/Makefile.am
+++ b/input/Makefile.am
@@ -8,8 +8,8 @@ input_la_SOURCES = main.c manager.h manager.c \
server.h server.c device.h device.c \
fakehid.c fakehid.h
-LDADD = $(top_builddir)/common/libhelper.a \
- @GDBUS_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
+LDADD = $(top_builddir)/common/libhelper.a
+input_la_LIBADD = @GDBUS_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
endif
AM_LDFLAGS = -module -avoid-version -no-undefined
diff --git a/network/Makefile.am b/network/Makefile.am
index f5cb320..ab877e6 100644
--- a/network/Makefile.am
+++ b/network/Makefile.am
@@ -8,8 +8,8 @@ network_la_SOURCES = main.c manager.h manager.c \
server.h server.c bridge.h bridge.c \
connection.h connection.c common.h common.c
-LDADD = $(top_builddir)/common/libhelper.a \
- @GDBUS_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
+LDADD = $(top_builddir)/common/libhelper.a
+network_la_LIBADD = @GDBUS_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
endif
AM_LDFLAGS = -module -avoid-version -no-undefined
diff --git a/scripts/90-bluetooth-hid2hci.rules b/scripts/90-bluetooth-hid2hci.rules
new file mode 100644
index 0000000..283514e
--- /dev/null
+++ b/scripts/90-bluetooth-hid2hci.rules
@@ -0,0 +1,33 @@
+ACTION!="add", SUBSYSTEM!="usb", GOTO="hid2hci_end"
+# Variety of Dell Bluetooth devices
+#
+# it looks like a bit of an odd rule, because it is matching
+# on a mouse device that is self powered, but that is where
+# a HID report needs to be sent to switch modes.
+#
+# Known supported devices:
+# 413c:8154
+# 413c:8158
+# 413c:8162
+ENV{ID_VENDOR}=="413c", ENV{ID_CLASS}=="mouse", ATTRS{bmAttributes}=="e0", KERNEL=="mouse*", RUN+="/sbin/hid2hci --method dell -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hci"+
+# CSR devices (in HID mode)
+ENV{ID_VENDOR}=="0a12", ENV{ID_MODEL}=="1000", RUN+="/sbin/hid2hci --method csr -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hci"+ENV{ID_VENDOR}=="0458", ENV{ID_MODEL}=="1000", RUN+="/sbin/hid2hci --method csr -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hci"+ENV{ID_VENDOR}=="05ac", ENV{ID_MODEL}=="1000", RUN+="/sbin/hid2hci --method csr -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hci"+
+# Logitech devices
+KERNEL!="hiddev*", ATTRS{idVendor}!="046d", GOTO="hid2hci_end"+ATTRS{idProduct}=="c703", RUN+="/sbin/hid2hci --method logitech -v 046d -p c703 --mode hci"+ATTRS{idProduct}=="c704", RUN+="/sbin/hid2hci --method logitech -v 046d -p c704 --mode hci"+ATTRS{idProduct}=="c705", RUN+="/sbin/hid2hci --method logitech -v 046d -p c705 --mode hci"+ATTRS{idProduct}=="c70a", RUN+="/sbin/hid2hci --method logitech -v 046d -p c70a --mode hci"+ATTRS{idProduct}=="c70b", RUN+="/sbin/hid2hci --method logitech -v 046d -p c70b --mode hci"+ATTRS{idProduct}=="c70c", RUN+="/sbin/hid2hci --method logitech -v 046d -p c70c --mode hci"+ATTRS{idProduct}=="c70e", RUN+="/sbin/hid2hci --method logitech -v 046d -p c70e --mode hci"+ATTRS{idProduct}=="c713", RUN+="/sbin/hid2hci --method logitech -v 046d -p c713 --mode hci"+ATTRS{idProduct}=="c714", RUN+="/sbin/hid2hci --method logitech -v 046d -p c714 --mode hci"+ATTRS{idProduct}=="c71b", RUN+="/sbin/hid2hci --method logitech -v 046d -p c71b --mode hci"+ATTRS{idProduct}=="c71c", RUN+="/sbin/hid2hci --method logitech -v 046d -p c71c --mode hci"+
+LABEL="hid2hci_end"
diff --git a/scripts/bluetooth.alt.init b/scripts/bluetooth.alt.init
new file mode 100644
index 0000000..4c4ff73
--- /dev/null
+++ b/scripts/bluetooth.alt.init
@@ -0,0 +1,62 @@
+#!/bin/sh
+#
+# bluetooth Bluetooth subsystem starting and stopping
+#
+# chkconfig: 345 12 91
+# description: Bluetooth subsystem
+#
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+HCID=bluetoothd
+LOCKFILE=/var/lock/subsys/bluetooth
+RETVAL=0
+
+start()
+{+ start_daemon --lockfile "$LOCKFILE" $HCID
+ RETVAL=$?
+ return $RETVAL
+}
+
+stop()
+{+ stop_daemon --lockfile "$LOCKFILE" $HCID
+ RETVAL=$?
+ return $RETVAL
+}
+
+restart()
+{+ stop
+ start
+}
+
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ reload|restart)
+ restart
+ ;;
+ condstop)
+ if [ -e "$LOCKFILE" ]; then
+ stop
+ fi
+ ;;
+ condrestart)
+ ;;
+ status)
+ status "$HCID"
+ ;;
+ *)
+ echo "Usage: ${0##*/} {start|stop|reload|restart|condstop|condrestart|status}"+ RETVAL=1
+ ;;
+esac
+
+exit $RETVAL
diff --git a/scripts/bluetooth_serial b/scripts/bluetooth_serial
index e5be6c2..b2c8070 100644
--- a/scripts/bluetooth_serial
+++ b/scripts/bluetooth_serial
@@ -21,9 +21,9 @@ start_serial()
stop_serial()
{- [ -x /bin/fuser ] || return 1
+ [ -x /sbin/fuser ] || return 1
- /bin/fuser -k -HUP $DEVNAME > /dev/null
+ /sbin/fuser -k -HUP $DEVNAME > /dev/null
}
case "$ACTION" in
diff --git a/serial/Makefile.am b/serial/Makefile.am
index f8f26e2..40f1bed 100644
--- a/serial/Makefile.am
+++ b/serial/Makefile.am
@@ -8,8 +8,8 @@ serial_la_SOURCES = main.c \
manager.h manager.c port.h port.c \
proxy.h proxy.c
-LDADD = $(top_builddir)/common/libhelper.a \
- @GDBUS_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
+LDADD = $(top_builddir)/common/libhelper.a
+serial_la_LIBADD = @GDBUS_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
endif
AM_LDFLAGS = -module -avoid-version -no-undefined
diff --git a/src/hcid.conf b/src/hcid.conf
index b6ce3b4..5e9681d 100644
--- a/src/hcid.conf
+++ b/src/hcid.conf
@@ -21,7 +21,7 @@ options {pairing multi;
# Default PIN code for incoming connections
- passkey "BlueZ";
+ passkey "1234";
}
# Default settings for HCI devices
@@ -29,7 +29,7 @@ device {# Local device name
# %d - device id
# %h - host name
- name "BlueZ (%d)";
+ name "%h-%d";
# Local device class
class 0x000100;
@@ -38,7 +38,9 @@ device {#pkt_type DH1,DM1,HV1;
# Inquiry and Page scan
- iscan enable; pscan enable;
+ iscan enable;
+ discovto 0;
+ pscan enable;
# Default link mode
# none - no specific policy
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 5589a5a..8869998 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,3 +1,4 @@
+slashsbindir = /sbin
if TOOLS
tools_programs = l2ping hcitool sdptool ciptool
@@ -37,7 +38,9 @@ else
usb_programs =
endif
-sbin_PROGRAMS = hciattach hciconfig $(bccmd_programs) $(avctrl_programs) $(hid2hci_programs)
+slashsbin_PROGRAMS = $(hid2hci_programs)
+
+sbin_PROGRAMS = hciattach hciconfig $(bccmd_programs) $(avctrl_programs)
bin_PROGRAMS = $(tools_programs) $(dfutool_programs) $(dfubabel_programs)