From 81b5b9a7d20d08375086023ff1e49d2767c127fa Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 4 Apr 2021 22:28:40 +0100 Subject: [PATCH] 5.58 --- ...ing-all-seps-when-loading-from-cache.patch | 41 ------------------- bluez.spec | 8 ++-- sources | 2 +- 3 files changed, 6 insertions(+), 45 deletions(-) delete mode 100644 bluez-avdtp-fix-removing-all-seps-when-loading-from-cache.patch diff --git a/bluez-avdtp-fix-removing-all-seps-when-loading-from-cache.patch b/bluez-avdtp-fix-removing-all-seps-when-loading-from-cache.patch deleted file mode 100644 index c2e3415..0000000 --- a/bluez-avdtp-fix-removing-all-seps-when-loading-from-cache.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 28ddec8d6b829e002fa268c07b71e4c564ba9e16 Mon Sep 17 00:00:00 2001 -From: Luiz Augusto von Dentz -Date: Thu, 11 Mar 2021 07:36:07 -0800 -Subject: [PATCH] avdtp: Fix removing all remote SEPs when loading from cache - -If avdtp_discover is called after cache has been loaded it end up -removing all remote SEPs as they have not been discovered yet. - -Fixes: https://github.com/bluez/bluez/issues/102 ---- - profiles/audio/avdtp.c | 16 ++++++++++++---- - 1 file changed, 12 insertions(+), 4 deletions(-) - -diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c -index 088ca58b3..1d5871c62 100644 ---- a/profiles/audio/avdtp.c -+++ b/profiles/audio/avdtp.c -@@ -3381,10 +3381,18 @@ int avdtp_discover(struct avdtp *session, avdtp_discover_cb_t cb, - session->discover = g_new0(struct discover_callback, 1); - - if (session->seps) { -- session->discover->cb = cb; -- session->discover->user_data = user_data; -- session->discover->id = g_idle_add(process_discover, session); -- return 0; -+ struct avdtp_remote_sep *sep = session->seps->data; -+ -+ /* Check that SEP have been discovered as it may be loaded from -+ * cache. -+ */ -+ if (sep->discovered) { -+ session->discover->cb = cb; -+ session->discover->user_data = user_data; -+ session->discover->id = g_idle_add(process_discover, -+ session); -+ return 0; -+ } - } - - err = send_request(session, FALSE, NULL, AVDTP_DISCOVER, NULL, 0); - diff --git a/bluez.spec b/bluez.spec index 2592283..f9d5778 100644 --- a/bluez.spec +++ b/bluez.spec @@ -5,8 +5,8 @@ %endif Name: bluez -Version: 5.56 -Release: 4%{?dist} +Version: 5.58 +Release: 1%{?dist} Summary: Bluetooth utilities License: GPLv2+ URL: http://www.bluez.org/ @@ -22,7 +22,6 @@ Patch11: 0002-systemd-Add-PrivateTmp-and-NoNewPrivileges-options.patch Patch12: 0003-systemd-Add-more-filesystem-lockdown.patch Patch13: 0004-systemd-More-lockdown.patch Patch14: 0005-media-rename-local-function-conflicting-with-pause-2.patch -Patch15: bluez-avdtp-fix-removing-all-seps-when-loading-from-cache.patch BuildRequires: dbus-devel >= 1.6 BuildRequires: glib2-devel @@ -315,6 +314,9 @@ install emulator/btvirt ${RPM_BUILD_ROOT}/%{_libexecdir}/bluetooth/ %{_userunitdir}/obex.service %changelog +* Sun Apr 04 2021 Peter Robinson - 5.58-1 +- Update to 5.58 + * Sun Mar 14 2021 Peter Robinson - 5.56-4 - Fix for avdtp audio disconnexts diff --git a/sources b/sources index 08d7bcc..7d6e26d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bluez-5.56.tar.xz) = b320ee9d49a516f5cecb5fbc410ba42e9127f44ebcfb95647f68bd5d300147d0eaf633f8e8d0678631a2184ea3afae7b01b5f228157328874fa2a87832ed0ae1 +SHA512 (bluez-5.58.tar.xz) = 159b554e0afd56af5da6f8333383f2fdf96d77a0e82d762bf4b37786e7312b7e61fbbae0f18b26442a606e0a232f48e0f45a4b38b95de36c7daf384f582315a3