diff options
Diffstat (limited to 'source/n/bluez')
-rwxr-xr-x | source/n/bluez/bluez.SlackBuild | 3 | ||||
-rw-r--r-- | source/n/bluez/refresh_adv_manager_for_non-LE_devices.diff | 52 |
2 files changed, 0 insertions, 55 deletions
diff --git a/source/n/bluez/bluez.SlackBuild b/source/n/bluez/bluez.SlackBuild index b9d152bbc..de035ce03 100755 --- a/source/n/bluez/bluez.SlackBuild +++ b/source/n/bluez/bluez.SlackBuild @@ -78,9 +78,6 @@ find . \ zcat $CWD/bluez-5.51-obexd_without_systemd-1.patch.gz | patch -p1 --verbose || exit 1 -# Fix bluetoothd crashes: -zcat $CWD/refresh_adv_manager_for_non-LE_devices.diff.gz | patch -p1 --verbose || exit 1 - sed -i -e 's|-lreadline|\0 -lncursesw|g' Makefile.{in,tools} autoreconf -vif diff --git a/source/n/bluez/refresh_adv_manager_for_non-LE_devices.diff b/source/n/bluez/refresh_adv_manager_for_non-LE_devices.diff deleted file mode 100644 index 922d9d383..000000000 --- a/source/n/bluez/refresh_adv_manager_for_non-LE_devices.diff +++ /dev/null @@ -1,52 +0,0 @@ -From 2c3bba7b38be03834162e34069156f1fd49f0528 Mon Sep 17 00:00:00 2001 -From: "antoine.belvire@laposte.net" <antoine.belvire@laposte.net> -Date: Tue, 27 Mar 2018 20:30:26 +0200 -Subject: adapter: Don't refresh adv_manager for non-LE devices - -btd_adv_manager_refresh is called upon MGMT_SETTING_DISCOVERABLE setting change -but as only LE adapters have an adv_manager, this leads to segmentation fault -for non-LE devices: - -0 btd_adv_manager_refresh (manager=0x0) at src/advertising.c:1176 -1 0x0000556fe45fcb02 in settings_changed (settings=<optimized out>, - adapter=0x556fe53f7c70) at src/adapter.c:543 -2 new_settings_callback (index=<optimized out>, length=<optimized out>, - param=<optimized out>, user_data=0x556fe53f7c70) at src/adapter.c:573 -3 0x0000556fe462c278 in request_complete (mgmt=mgmt@entry=0x556fe53f20c0, - status=<optimized out>, opcode=opcode@entry=7, index=index@entry=0, - length=length@entry=4, param=0x556fe53eb5f9) at src/shared/mgmt.c:261 -4 0x0000556fe462cd9d in can_read_data (io=<optimized out>, - user_data=0x556fe53f20c0) at src/shared/mgmt.c:353 -5 0x0000556fe46396e3 in watch_callback (channel=<optimized out>, - cond=<optimized out>, user_data=<optimized out>) - at src/shared/io-glib.c:170 -6 0x00007fe351c980e5 in g_main_context_dispatch () - from /usr/lib64/libglib-2.0.so.0 -7 0x00007fe351c984b0 in ?? () from /usr/lib64/libglib-2.0.so.0 -8 0x00007fe351c987c2 in g_main_loop_run () from /usr/lib64/libglib-2.0.so.0 -9 0x0000556fe45abc75 in main (argc=<optimized out>, argv=<optimized out>) - at src/main.c:770 - -This commit prevents the call to btd_adv_manager_refresh for non-LE devices. ---- - src/adapter.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/adapter.c b/src/adapter.c -index 6b9222b..daccfdc 100644 ---- a/src/adapter.c -+++ b/src/adapter.c -@@ -540,7 +540,8 @@ static void settings_changed(struct btd_adapter *adapter, uint32_t settings) - g_dbus_emit_property_changed(dbus_conn, adapter->path, - ADAPTER_INTERFACE, "Discoverable"); - store_adapter_info(adapter); -- btd_adv_manager_refresh(adapter->adv_manager); -+ if (adapter->supported_settings & MGMT_SETTING_LE) -+ btd_adv_manager_refresh(adapter->adv_manager); - } - - if (changed_mask & MGMT_SETTING_BONDABLE) { --- -cgit v1.1 - - |