Accepting request 746076 from home:seife:testing
update to version 5.52 OBS-URL: https://build.opensuse.org/request/show/746076 OBS-URL: https://build.opensuse.org/package/show/Base:System/bluez?expand=0&rev=278
This commit is contained in:
Stefan Seyfried
Git OBS Bridge
parent
46c6c426d4
commit
69f0878f22
@ -1,54 +0,0 @@
|
||||
From d6a0539d1ddf9f115e889d2bdd27f038408eaf31 Mon Sep 17 00:00:00 2001
|
||||
From: Inga Stotland <istotlan@ingas-xps13.amr.corp.intel.com>
|
||||
Date: Tue, 1 Oct 2019 11:51:08 -0700
|
||||
Subject: [PATCH] mesh: Fix segmentation fault on Join() call
|
||||
|
||||
This fixes the following segfault:
|
||||
|
||||
node_init_cb (node=0x0, agent=0x0) at mesh/mesh.c:359
|
||||
reply = dbus_error(join_pending->msg, MESH_ERROR_FAILED,
|
||||
|
||||
user_data=0x5555555be170) at mesh/node.c:1760
|
||||
dbus=<optimized out>) at ell/dbus.c:216
|
||||
user_data=0x5555555a6e00) at ell/dbus.c:279
|
||||
user_data=0x5555555a7ef0) at ell/io.c:126
|
||||
at ell/main.c:642
|
||||
at mesh/main.c:205
|
||||
|
||||
The fault was caused by the premature deletion of preserved state.
|
||||
|
||||
This moves setup of disconnect watch for the application calling the Join()
|
||||
method into the node_init_cb(), after a temporary node has been
|
||||
successfully created.
|
||||
---
|
||||
mesh/mesh.c | 7 +++++--
|
||||
1 file changed, 5 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/mesh/mesh.c b/mesh/mesh.c
|
||||
index b660a7ef2..9b2b2073b 100644
|
||||
--- a/mesh/mesh.c
|
||||
+++ b/mesh/mesh.c
|
||||
@@ -377,6 +377,11 @@ static void node_init_cb(struct mesh_node *node, struct mesh_agent *agent)
|
||||
l_dbus_send(dbus_get_bus(), reply);
|
||||
join_pending->msg = NULL;
|
||||
|
||||
+ /* Setup disconnect watch */
|
||||
+ join_pending->disc_watch = l_dbus_add_disconnect_watch(dbus_get_bus(),
|
||||
+ join_pending->sender,
|
||||
+ prov_disc_cb, NULL, NULL);
|
||||
+
|
||||
return;
|
||||
|
||||
fail:
|
||||
@@ -423,8 +428,6 @@ static struct l_dbus_message *join_network_call(struct l_dbus *dbus,
|
||||
sender = l_dbus_message_get_sender(msg);
|
||||
|
||||
join_pending->sender = l_strdup(sender);
|
||||
- join_pending->disc_watch = l_dbus_add_disconnect_watch(dbus, sender,
|
||||
- prov_disc_cb, NULL, NULL);
|
||||
join_pending->msg = l_dbus_message_ref(msg);
|
||||
join_pending->app_path = app_path;
|
||||
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ebedfb359f62957940822f1d0b39fcee30422380e435608dad06bb3913d5ebba
|
||||
size 1941904
|
||||
3
bluez-5.52.tar.xz
Normal file
3
bluez-5.52.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f7144ce2039202cfac18ccb52426efea11c98e4f6e1bb8041bcb994b8378560a
|
||||
size 1957504
|
||||
@ -2,7 +2,7 @@ Index: b/Makefile.am
|
||||
===================================================================
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -474,7 +474,8 @@ unit_test_lib_SOURCES = unit/test-lib.c
|
||||
@@ -481,7 +481,8 @@ unit_test_lib_SOURCES = unit/test-lib.c
|
||||
unit_test_lib_LDADD = src/libshared-glib.la \
|
||||
lib/libbluetooth-internal.la $(GLIB_LIBS)
|
||||
|
||||
@ -12,7 +12,7 @@ Index: b/Makefile.am
|
||||
|
||||
unit_test_gatt_SOURCES = unit/test-gatt.c
|
||||
unit_test_gatt_LDADD = src/libshared-glib.la \
|
||||
@@ -504,7 +505,8 @@ unit_test_gattrib_LDADD = lib/libbluetoo
|
||||
@@ -511,7 +512,8 @@ unit_test_gattrib_LDADD = lib/libbluetoo
|
||||
$(GLIB_LIBS) $(DBUS_LIBS) -ldl -lrt
|
||||
|
||||
if MIDI
|
||||
@ -22,3 +22,12 @@ Index: b/Makefile.am
|
||||
unit_test_midi_CPPFLAGS = $(AM_CPPFLAGS) $(ALSA_CFLAGS) -DMIDI_TEST
|
||||
unit_test_midi_SOURCES = unit/test-midi.c \
|
||||
profiles/midi/libmidi.h \
|
||||
@@ -521,7 +523,7 @@ unit_test_midi_LDADD = src/libshared-gli
|
||||
endif
|
||||
|
||||
if MESH
|
||||
-unit_tests += unit/test-mesh-crypto
|
||||
+#unit_tests += unit/test-mesh-crypto
|
||||
unit_test_mesh_crypto_CPPFLAGS = $(ell_cflags)
|
||||
unit_test_mesh_crypto_SOURCES = unit/test-mesh-crypto.c \
|
||||
mesh/crypto.h ell/internal ell/ell.h \
|
||||
|
||||
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 4 21:22:20 UTC 2019 - Stefan Seyfried <seife+obs@b1-systems.com>
|
||||
|
||||
- update to version 5.52:
|
||||
* Fix issue with AVDTP session disconnect timeout handling.
|
||||
* Mark media endpoint APIs as stable interfaces.
|
||||
- remove obsolete 0001-mesh-Fix-segmentation-fault-on-Join-call.patch
|
||||
- disable one more segfaulting patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 7 14:56:28 UTC 2019 - Stefan Seyfried <seife+obs@b1-systems.com>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
# contributions via pull requests are welcome!
|
||||
#
|
||||
Name: bluez
|
||||
Version: 5.51
|
||||
Version: 5.52
|
||||
Release: 0
|
||||
Summary: Bluetooth Stack for Linux
|
||||
License: GPL-2.0-or-later
|
||||
@ -37,8 +37,6 @@ Patch2: bluez-sdp-unix-path.patch
|
||||
Patch3: bluez-cups-libexec.patch
|
||||
# workaround for broken tests (reported upstream but not yet fixed)
|
||||
Patch4: bluez-disable-broken-tests.diff
|
||||
# boo#1152672, upstream fix
|
||||
Patch5: 0001-mesh-Fix-segmentation-fault-on-Join-call.patch
|
||||
# Move 43xx firmware path for RPi3 bluetooth support bsc#1140688
|
||||
Patch10: RPi-Move-the-43xx-firmware-into-lib-firmware.patch
|
||||
# Upstream suggests to use btmon instead of hcidump and does not want those patches
|
||||
@ -153,7 +151,6 @@ desktop specific applets like blueman or GNOME or KDE applets).
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch10 -p1
|
||||
%patch101 -p1
|
||||
%patch102 -p1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user