forked from pool/bluez
Accepting request 615918 from home:seife:testing
update to version 5.50 OBS-URL: https://build.opensuse.org/request/show/615918 OBS-URL: https://build.opensuse.org/package/show/Base:System/bluez?expand=0&rev=253
This commit is contained in:
Stefan Seyfried
Git OBS Bridge
parent
205bf4a19b
commit
cea9570806
@ -1,54 +0,0 @@
|
||||
From 38269efb4fd130b45275e359c72fc28e3c1e484a Mon Sep 17 00:00:00 2001
|
||||
From: Antoine Belvire <antoine.belvire@opensuse.org>
|
||||
Date: Sun, 25 Mar 2018 14:14:28 +0200
|
||||
Subject: [PATCH] Don't refresh adv_manager for non-LE devices
|
||||
|
||||
Commit 91d4b17160 'advertising: Configure discoverable flag based on adapter
|
||||
settings' introduced a call to btd_adv_manager_refresh upon
|
||||
MGMT_SETTING_DISCOVERABLE flag 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 | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/adapter.c b/src/adapter.c
|
||||
index 6d7d61504..ff51deb62 100644
|
||||
--- a/src/adapter.c
|
||||
+++ b/src/adapter.c
|
||||
@@ -540,7 +540,9 @@ 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) {
|
||||
--
|
||||
2.16.2
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:33301d7a514c73d535ee1f91c2aed1af1f2e53efe11d3ac06bcf0d7abed2ce95
|
||||
size 1744860
|
||||
3
bluez-5.50.tar.xz
Normal file
3
bluez-5.50.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5ffcaae18bbb6155f1591be8c24898dc12f062075a40b538b745bfd477481911
|
||||
size 1755384
|
||||
@ -1,3 +1,26 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 4 19:15:59 UTC 2018 - seife+obs@b1-systems.com
|
||||
|
||||
- update to version 5.50:
|
||||
- Fix issue with GATT and reading long values.
|
||||
- Fix issue with GATT and reading multiple includes.
|
||||
- Fix issue with GATT and service changes when offline.
|
||||
- Fix issue with handling secondary service discovery.
|
||||
- Fix issue with handling persistency of CCC values.
|
||||
- Fix issue with handling Mesh session on disconnection.
|
||||
- Fix issue with handling Mesh proxy PDU SAR message length.
|
||||
- Fix issue with handling Mesh default heartbeat TTL value.
|
||||
- Add support for Mesh node-reset operation handling.
|
||||
- Add support for GATT authorization request handling.
|
||||
- Add support for GATT minimum key size requirements.
|
||||
- Add support for GATT server and included services.
|
||||
- Add support for handling additional advertising data.
|
||||
- Add support for handling separate discoverable state.
|
||||
- Add support for enabling HFP version 1.7 features.
|
||||
- Add support for dedicated Bluetooth logging daemon.
|
||||
- remove 0001-Don-t-refresh-adv_manager-for-non-LE-devices.patch,
|
||||
fixed upstream
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 11 07:14:16 UTC 2018 - acho@suse.com
|
||||
|
||||
|
||||
14
bluez.spec
14
bluez.spec
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
Name: bluez
|
||||
Version: 5.49
|
||||
Version: 5.50
|
||||
Release: 0
|
||||
Summary: Bluetooth Stack for Linux
|
||||
License: GPL-2.0-or-later
|
||||
@ -38,8 +38,8 @@ Patch4: bluez-5.45-disable-broken-tests.diff
|
||||
Patch5: 0001-obexd-use-AM_LDFLAGS-for-linking.patch
|
||||
# disable tests for bypass boo#1078285
|
||||
Patch6: disable_some_obex_tests.patch
|
||||
# PATCH-FIX-UPSTREAM: crasher bug, boo#1086731 --seife+obs@b1-systems.com
|
||||
Patch7: 0001-Don-t-refresh-adv_manager-for-non-LE-devices.patch
|
||||
# Upstream suggests to use btmon instead of hcidump and does not want those patches
|
||||
# => PATCH-FIX-OPENSUSE for those two :-)
|
||||
# fix some memory leak with malformed packet (reported upstream but not yet fixed)
|
||||
Patch101: CVE-2016-9800-tool-hcidump-Fix-memory-leak-with-malformed-packet.patch
|
||||
Patch102: CVE-2016-9804-tool-hcidump-Fix-memory-leak-with-malformed-packet.patch
|
||||
@ -52,6 +52,7 @@ BuildRequires: systemd-rpm-macros
|
||||
BuildRequires: pkgconfig(alsa)
|
||||
BuildRequires: pkgconfig(check)
|
||||
BuildRequires: pkgconfig(dbus-1) >= 1.6
|
||||
BuildRequires: pkgconfig(ell) >= 0.3
|
||||
BuildRequires: pkgconfig(glib-2.0) >= 2.28
|
||||
# json-c is needed for --enable-mesh
|
||||
BuildRequires: pkgconfig(json-c)
|
||||
@ -150,7 +151,6 @@ desktop specific applets like blueman or GNOME or KDE applets).
|
||||
%ifarch ppc ppc64 ppc64le
|
||||
%patch6 -p1
|
||||
%endif
|
||||
%patch7 -p1
|
||||
%patch101 -p1
|
||||
%patch102 -p1
|
||||
mkdir dbus-apis
|
||||
@ -241,7 +241,8 @@ make check V=0
|
||||
|
||||
%files
|
||||
%defattr(-, root, root)
|
||||
%doc AUTHORS COPYING ChangeLog README dbus-apis
|
||||
%doc AUTHORS ChangeLog README dbus-apis
|
||||
%license COPYING
|
||||
%{_bindir}/bluemoon
|
||||
%{_bindir}/btattach
|
||||
%{_bindir}/gatttool
|
||||
@ -296,7 +297,8 @@ make check V=0
|
||||
%files -n libbluetooth3
|
||||
%defattr(-, root, root)
|
||||
%{_libdir}/libbluetooth.so.*
|
||||
%doc AUTHORS COPYING ChangeLog README
|
||||
%doc AUTHORS ChangeLog README
|
||||
%license COPYING
|
||||
|
||||
%files cups
|
||||
%defattr(-,root,root)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user