From 49506d318d0de840124750524484ef71ed418de2 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Thu, 16 Feb 2017 22:30:51 +1000 Subject: [PATCH] New version 5.43 Add 97-bluetooth.rules udev rules --- .abf.yml | 2 +- 97-bluetooth.rules | 4 ++++ bluez.spec | 36 +++++++++++++++++++++++------------- 3 files changed, 28 insertions(+), 14 deletions(-) create mode 100644 97-bluetooth.rules diff --git a/.abf.yml b/.abf.yml index 5b80141..c5771e1 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - bluez-5.41.tar.xz: a912b80299f6fe4f9d48502b3cf8c99854ed54b3 + bluez-5.43.tar.xz: 183eadadd19eb96f71827220a46db1d5990935d7 diff --git a/97-bluetooth.rules b/97-bluetooth.rules new file mode 100644 index 0000000..5079a24 --- /dev/null +++ b/97-bluetooth.rules @@ -0,0 +1,4 @@ +# Run helper every time a Bluetooth device appears +# On remove actions, bluetoothd should go away by itself +ACTION=="add", SUBSYSTEM=="bluetooth", RUN{fail_event_on_error}+="/usr/bin/bluetoothd" +ACTION=="change", SUBSYSTEM=="bluetooth", RUN+="/usr/bin/bluetoothd" diff --git a/bluez.spec b/bluez.spec index e1c6b05..611e2af 100644 --- a/bluez.spec +++ b/bluez.spec @@ -4,16 +4,17 @@ Summary: Official Linux Bluetooth protocol stack Name: bluez -Version: 5.41 -Release: 3 +Version: 5.43 +Release: 1 License: GPLv2+ Group: Communications Url: http://www.bluez.org/ Source0: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.xz -Source6: pand.conf -Source7: dund.conf -Source8: hidd.conf -Source9: rfcomm.conf +Source1: pand.conf +Source2: dund.conf +Source3: hidd.conf +Source4: rfcomm.conf +Source5: 97-bluetooth.rules Source10: bluez-uinput.modules # Revert this commit, it leads to huge delay on boot in Plasma 5 Patch0: bluez-5.36-systemd-conditional.patch @@ -25,7 +26,7 @@ Patch3: 0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch Patch4: 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch Patch5: 0002-autopair-Don-t-handle-the-iCade.patch -Patch7: 0004-agent-Assert-possible-infinite-loop.patch +Patch6: 0004-agent-Assert-possible-infinite-loop.patch BuildRequires: bison BuildRequires: flex BuildRequires: cups-devel @@ -89,6 +90,7 @@ These are the official Bluetooth communication libraries for Linux. %dir %{_libdir}/bluetooth %dir %{_libdir}/bluetooth/plugins %{_libdir}/bluetooth/plugins/sixaxis.so +%{_udevrulesdir}/97-bluetooth.rules %post %_post_service bluetooth @@ -202,7 +204,7 @@ BLUETOOTH trademarks are owned by Bluetooth SIG, Inc., U.S.A. %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch7 -p1 +%patch6 -p1 libtoolize -f -c autoreconf -fi @@ -224,7 +226,10 @@ autoreconf -fi --with-systemduserunitdir=%{_userunitdir} \ --with-udevdir=/lib/udev \ --enable-datafiles \ - --enable-experimental + --enable-experimental \ + --enable-nfc \ + --enable-sap \ + --enable-health %make @@ -236,10 +241,10 @@ echo "1234" > %{buildroot}%{_sysconfdir}/bluetooth/pin chmod 600 %{buildroot}%{_sysconfdir}/bluetooth/pin -install -m644 %{SOURCE6} -D %{buildroot}%{_sysconfdir}/sysconfig/pand -install -m644 %{SOURCE7} -D %{buildroot}%{_sysconfdir}/sysconfig/dund -install -m644 %{SOURCE8} -D %{buildroot}%{_sysconfdir}/sysconfig/hidd -install -m644 %{SOURCE9} -D %{buildroot}%{_sysconfdir}/sysconfig/rfcomm +install -m644 %{SOURCE1} -D %{buildroot}%{_sysconfdir}/sysconfig/pand +install -m644 %{SOURCE2} -D %{buildroot}%{_sysconfdir}/sysconfig/dund +install -m644 %{SOURCE3} -D %{buildroot}%{_sysconfdir}/sysconfig/hidd +install -m644 %{SOURCE4} -D %{buildroot}%{_sysconfdir}/sysconfig/rfcomm mkdir -p %{buildroot}/%{_lib} mv %{buildroot}%{_libdir}/libbluetooth.so.%{major}* %{buildroot}/%{_lib} @@ -256,6 +261,8 @@ cp test/simple-agent %{buildroot}%{_bindir}/simple-agent rm %{buildroot}%{_sysconfdir}/udev/rules.d/*.rules install -p -m644 tools/hid2hci.rules -D %{buildroot}/lib/udev/rules.d/97-hid2hci.rules +install -m644 %{SOURCE5} -D %{buildroot}%{_udevrulesdir}/97-bluetooth.rules +sed -s,"/usr/bin/bluetoothd","%{_libexecdir}/bluetooth/bluetoothd",g %{buildroot}%{_udevrulesdir}/97-bluetooth.rules #install more config files install -m0644 profiles/network/network.conf %{buildroot}%{_sysconfdir}/bluetooth/ @@ -266,3 +273,6 @@ install -m0644 profiles/proximity/proximity.conf %{buildroot}%{_sysconfdir}/blue install -d -m0755 %{buildroot}%{_localstatedir}/lib/bluetooth ln -s bluetooth.service %{buildroot}%{_unitdir}/dbus-org.bluez.service + +sed 's|#AutoEnable=false|AutoEnable=true|' -i %{buildroot}%{_sysconfdir}/bluetooth/main.conf +