Update to 5.44, Enable deprecated option to keep all usual tools, Ship btattach tool, Minor spec cleanups

This commit is contained in:
Peter Robinson 2017-03-12 15:16:04 +00:00
parent 150da1be62
commit f8d4e0aa62
3 changed files with 18 additions and 62 deletions

View File

@ -1,49 +0,0 @@
From f558fca8d64e3795b0654a90d343af1dd1d8b33c Mon Sep 17 00:00:00 2001
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Date: Tue, 8 Nov 2016 10:38:43 +0200
Subject: [PATCH] core/gatt: Don't register attribute handler until core
service are registered
Wait until GAP and GATT service are registered to register attribute
handlers otherwise it may attempt to generate service changed without
having service changed registered which leads to print errors:
bluetoothd[2376]: Failed to obtain handles for "Service Changed" characteristic
---
src/gatt-database.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/gatt-database.c b/src/gatt-database.c
index 0877b25..d4bf5ad 100644
--- a/src/gatt-database.c
+++ b/src/gatt-database.c
@@ -2600,12 +2600,6 @@ struct btd_gatt_database *btd_gatt_database_new(struct btd_adapter *adapter)
database->profiles = queue_new();
database->ccc_callbacks = queue_new();
- database->db_id = gatt_db_register(database->db, gatt_db_service_added,
- gatt_db_service_removed,
- database, NULL);
- if (!database->db_id)
- goto fail;
-
addr = btd_adapter_get_address(adapter);
database->le_io = bt_io_listen(connect_cb, NULL, NULL, NULL, &gerr,
BT_IO_OPT_SOURCE_BDADDR, addr,
@@ -2641,6 +2635,13 @@ struct btd_gatt_database *btd_gatt_database_new(struct btd_adapter *adapter)
register_core_services(database);
+ database->db_id = gatt_db_register(database->db, gatt_db_service_added,
+ gatt_db_service_removed,
+ database, NULL);
+ if (!database->db_id)
+ goto fail;
+
+
return database;
fail:
--
2.7.4

View File

@ -2,8 +2,8 @@
Name: bluez Name: bluez
Summary: Bluetooth utilities Summary: Bluetooth utilities
Version: 5.43 Version: 5.44
Release: 4%{?dist} Release: 1%{?dist}
License: GPLv2+ License: GPLv2+
Group: Applications/System Group: Applications/System
URL: http://www.bluez.org/ URL: http://www.bluez.org/
@ -18,9 +18,8 @@ Patch2: 0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
Patch3: 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch Patch3: 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
Patch4: 0002-autopair-Don-t-handle-the-iCade.patch Patch4: 0002-autopair-Don-t-handle-the-iCade.patch
Patch5: 0004-agent-Assert-possible-infinite-loop.patch Patch5: 0004-agent-Assert-possible-infinite-loop.patch
Patch6: 0001-core-gatt-Don-t-register-attribute-handler-until-cor.patch
BuildRequires: git BuildRequires: git-core
BuildRequires: dbus-devel >= 1.6 BuildRequires: dbus-devel >= 1.6
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: libical-devel BuildRequires: libical-devel
@ -130,7 +129,7 @@ git am -p1 %{patches} < /dev/null
%build %build
%configure --enable-cups --enable-tools --enable-library \ %configure --enable-cups --enable-tools --enable-library \
--enable-sixaxis \ --enable-sixaxis --enable-deprecated \
--with-systemdsystemunitdir=%{_unitdir} \ --with-systemdsystemunitdir=%{_unitdir} \
--with-systemduserunitdir=%{_userunitdir} --with-systemduserunitdir=%{_userunitdir}
@ -154,7 +153,7 @@ if test -d ${RPM_BUILD_ROOT}/usr/lib64/cups ; then
fi fi
rm -f ${RPM_BUILD_ROOT}/%{_sysconfdir}/udev/*.rules ${RPM_BUILD_ROOT}/usr/lib/udev/rules.d/*.rules rm -f ${RPM_BUILD_ROOT}/%{_sysconfdir}/udev/*.rules ${RPM_BUILD_ROOT}/usr/lib/udev/rules.d/*.rules
install -D -p -m0644 tools/hid2hci.rules ${RPM_BUILD_ROOT}/lib/udev/rules.d/97-hid2hci.rules install -D -p -m0644 tools/hid2hci.rules ${RPM_BUILD_ROOT}/%{_udevrulesdir}/97-hid2hci.rules
install -d -m0755 $RPM_BUILD_ROOT/%{_localstatedir}/lib/bluetooth install -d -m0755 $RPM_BUILD_ROOT/%{_localstatedir}/lib/bluetooth
@ -190,6 +189,9 @@ sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' ${RPM_
%{!?_licensedir:%global license %%doc} %{!?_licensedir:%global license %%doc}
%license COPYING %license COPYING
%doc AUTHORS ChangeLog %doc AUTHORS ChangeLog
%config %{_sysconfdir}/dbus-1/system.d/bluetooth.conf
%config %{_sysconfdir}/bluetooth/main.conf
%{_bindir}/btattach
%{_bindir}/ciptool %{_bindir}/ciptool
%{_bindir}/hcitool %{_bindir}/hcitool
%{_bindir}/l2ping %{_bindir}/l2ping
@ -207,6 +209,7 @@ sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' ${RPM_
%{_bindir}/mpris-proxy %{_bindir}/mpris-proxy
%{_bindir}/gatttool %{_bindir}/gatttool
%{_bindir}/rctest %{_bindir}/rctest
%{_mandir}/man1/btattach.1.gz
%{_mandir}/man1/ciptool.1.gz %{_mandir}/man1/ciptool.1.gz
%{_mandir}/man1/hcitool.1.gz %{_mandir}/man1/hcitool.1.gz
%{_mandir}/man1/rfcomm.1.gz %{_mandir}/man1/rfcomm.1.gz
@ -219,13 +222,10 @@ sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' ${RPM_
%{_mandir}/man1/rctest.1.* %{_mandir}/man1/rctest.1.*
%{_mandir}/man8/* %{_mandir}/man8/*
%{_libexecdir}/bluetooth/bluetoothd %{_libexecdir}/bluetooth/bluetoothd
%exclude %{_mandir}/man1/hid2hci.1*
%config %{_sysconfdir}/dbus-1/system.d/bluetooth.conf
%{_libdir}/bluetooth/ %{_libdir}/bluetooth/
%{_localstatedir}/lib/bluetooth %{_localstatedir}/lib/bluetooth
%{_datadir}/dbus-1/system-services/org.bluez.service %{_datadir}/dbus-1/system-services/org.bluez.service
%{_unitdir}/bluetooth.service %{_unitdir}/bluetooth.service
%config %{_sysconfdir}/bluetooth/main.conf
%files libs %files libs
%{!?_licensedir:%global license %%doc} %{!?_licensedir:%global license %%doc}
@ -234,8 +234,7 @@ sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' ${RPM_
%files libs-devel %files libs-devel
%{_libdir}/libbluetooth.so %{_libdir}/libbluetooth.so
%dir %{_includedir}/bluetooth %{_includedir}/bluetooth
%{_includedir}/bluetooth/*
%{_libdir}/pkgconfig/bluez.pc %{_libdir}/pkgconfig/bluez.pc
%files cups %files cups
@ -244,7 +243,7 @@ sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' ${RPM_
%files hid2hci %files hid2hci
/usr/lib/udev/hid2hci /usr/lib/udev/hid2hci
%{_mandir}/man1/hid2hci.1* %{_mandir}/man1/hid2hci.1*
/lib/udev/rules.d/97-hid2hci.rules %{_udevrulesdir}/97-hid2hci.rules
%files obexd %files obexd
%{_libexecdir}/bluetooth/obexd %{_libexecdir}/bluetooth/obexd
@ -252,6 +251,12 @@ sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' ${RPM_
%{_userunitdir}/obex.service %{_userunitdir}/obex.service
%changelog %changelog
* Sun Mar 12 2017 Peter Robinson <pbrobinson@fedoraproject.org> 5.44-1
- Update to 5.44
- Enable deprecated option to keep all usual tools
- Ship btattach tool
- Minor spec cleanups
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.43-4 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.43-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

View File

@ -1 +1 @@
698def88df96840dfbb0858bb6d73350 bluez-5.43.tar.xz SHA512 (bluez-5.44.tar.xz) = 4ef568816a38cdc990c22ffcb1c1ce7eb44577eafd0dd31178314f5b5c864c5a43c0b4e34c5f013683518c3f2072f18dff6c78660b45aa9ce8554c4b6d43ecf5