Accepting request 587052 from home:seife:testing

update to version 5.49

OBS-URL: https://build.opensuse.org/request/show/587052
OBS-URL: https://build.opensuse.org/package/show/Base:System/bluez?expand=0&rev=247
This commit is contained in:
Stefan Seyfried 2018-03-14 18:50:47 +00:00 committed by Git OBS Bridge
parent 1b85554ac7
commit 92bbd7b637
5 changed files with 23 additions and 84 deletions

View File

@ -1,71 +0,0 @@
From 1873096352f518d3247f8efb3c2e0aa8804e50ac Mon Sep 17 00:00:00 2001
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Date: Wed, 7 Feb 2018 09:35:07 -0200
Subject: [PATCH] core: Fixes order InterfaceAdded
Registering on the callback of MGMT_OP_READ_ADV_FEATURES causes
InterfacesAdded to be reschedule after the device objects which causes
tools such as PulseAudio to consider it invalid.
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1534857
---
src/advertising.c | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/advertising.c b/src/advertising.c
index 94a8c4050..970c3d87b 100644
--- a/src/advertising.c
+++ b/src/advertising.c
@@ -1032,14 +1032,6 @@ static void read_adv_features_callback(uint8_t status, uint16_t length,
if (manager->max_ads == 0)
return;
- if (!g_dbus_register_interface(btd_get_dbus_connection(),
- adapter_get_path(manager->adapter),
- LE_ADVERTISING_MGR_IFACE, methods,
- NULL, properties, manager, NULL)) {
- error("Failed to register " LE_ADVERTISING_MGR_IFACE);
- return;
- }
-
/* Reset existing instances */
if (feat->num_instances)
remove_advertising(manager, 0);
@@ -1061,19 +1053,29 @@ static struct btd_adv_manager *manager_create(struct btd_adapter *adapter)
}
manager->mgmt_index = btd_adapter_get_index(adapter);
+ manager->clients = queue_new();
+ manager->supported_flags = MGMT_ADV_FLAG_LOCAL_NAME;
+
+ if (!g_dbus_register_interface(btd_get_dbus_connection(),
+ adapter_get_path(manager->adapter),
+ LE_ADVERTISING_MGR_IFACE, methods,
+ NULL, properties, manager, NULL)) {
+ error("Failed to register " LE_ADVERTISING_MGR_IFACE);
+ goto fail;
+ }
if (!mgmt_send(manager->mgmt, MGMT_OP_READ_ADV_FEATURES,
manager->mgmt_index, 0, NULL,
read_adv_features_callback, manager, NULL)) {
error("Failed to read advertising features");
- manager_destroy(manager);
- return NULL;
+ goto fail;
}
- manager->clients = queue_new();
- manager->supported_flags = MGMT_ADV_FLAG_LOCAL_NAME;
-
return manager;
+
+fail:
+ manager_destroy(manager);
+ return NULL;
}
struct btd_adv_manager *btd_adv_manager_new(struct btd_adapter *adapter)
--
2.16.1

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b9a8723072ef66bae7ec301c774902ebcb444c9c5b149b5a199e60a1ba970e90
size 1733952

3
bluez-5.49.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:33301d7a514c73d535ee1f91c2aed1af1f2e53efe11d3ac06bcf0d7abed2ce95
size 1744860

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Mon Mar 12 17:44:33 UTC 2018 - seife+obs@b1-systems.com
- update to version 5.49:
This is mostly a bug fix release, with fixes to features such as
AVCTP, OBEX, GATT and Mesh. There are however some notable new
features also, such as improved heartbeat management support in
meshctl as well as a new experimental ConnectDevice D-Bus method
on the Adapter interface, which can be used for quick device
object creation for testing purpose or when information about the
device has been received over some Out-of-Band channel.
- remove 0001-core-Fixes-order-InterfaceAdded.patch (upstream)
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Feb 11 21:12:36 UTC 2018 - seife+obs@b1-systems.com Sun Feb 11 21:12:36 UTC 2018 - seife+obs@b1-systems.com

View File

@ -18,10 +18,10 @@
Name: bluez Name: bluez
Version: 5.48 Version: 5.49
Release: 0 Release: 0
Summary: Bluetooth Stack for Linux Summary: Bluetooth Stack for Linux
License: GPL-2.0+ License: GPL-2.0-or-later
Group: Hardware/Mobile Group: Hardware/Mobile
Url: http://www.bluez.org Url: http://www.bluez.org
Source: http://www.kernel.org/pub/linux/bluetooth/bluez-%{version}.tar.xz Source: http://www.kernel.org/pub/linux/bluetooth/bluez-%{version}.tar.xz
@ -38,8 +38,6 @@ Patch4: bluez-5.45-disable-broken-tests.diff
Patch5: 0001-obexd-use-AM_LDFLAGS-for-linking.patch Patch5: 0001-obexd-use-AM_LDFLAGS-for-linking.patch
# disable tests for bypass boo#1078285 # disable tests for bypass boo#1078285
Patch6: disable_some_obex_tests.patch Patch6: disable_some_obex_tests.patch
# PATCH-FIX-UPSTREAM: fix errors with hotplugging, boo#1076898 --seife+obs@b1-systems.com
Patch7: 0001-core-Fixes-order-InterfaceAdded.patch
BuildRequires: automake BuildRequires: automake
BuildRequires: flex BuildRequires: flex
BuildRequires: libtool BuildRequires: libtool
@ -75,7 +73,7 @@ BlueZ provides support for the core Bluetooth layers and protocols.
%package devel %package devel
Summary: Files needed for BlueZ development Summary: Files needed for BlueZ development
License: GPL-2.0+ License: GPL-2.0-or-later
Group: Development/Languages/C and C++ Group: Development/Languages/C and C++
Requires: libbluetooth3 = %{version} Requires: libbluetooth3 = %{version}
@ -85,7 +83,7 @@ stack.
%package -n libbluetooth3 %package -n libbluetooth3
Summary: Bluetooth Libraries Summary: Bluetooth Libraries
License: GPL-2.0+ License: GPL-2.0-or-later
Group: System/Libraries Group: System/Libraries
Provides: bluez-libs = 3.36 Provides: bluez-libs = 3.36
Obsoletes: bluez-libs <= 3.36 Obsoletes: bluez-libs <= 3.36
@ -102,7 +100,7 @@ It is uses a modular implementation. It has many interesting features:
%package cups %package cups
Summary: CUPS Driver for Bluetooth Printers Summary: CUPS Driver for Bluetooth Printers
License: GPL-2.0+ License: GPL-2.0-or-later
Group: Hardware/Printing Group: Hardware/Printing
%description cups %description cups
@ -111,7 +109,7 @@ printers.
%package test %package test
Summary: Tools for testing of various Bluetooth-functions Summary: Tools for testing of various Bluetooth-functions
License: GPL-2.0+ and MIT License: GPL-2.0-or-later AND MIT
Group: Development/Tools/Debuggers Group: Development/Tools/Debuggers
Requires: dbus-1-python Requires: dbus-1-python
Requires: python-gobject2 Requires: python-gobject2
@ -122,7 +120,7 @@ BLUETOOTH trademarks are owned by Bluetooth SIG, Inc., U.S.A.
%package auto-enable-devices %package auto-enable-devices
Summary: Configuration that automatically enables all bluetooth devices Summary: Configuration that automatically enables all bluetooth devices
License: GPL-2.0+ License: GPL-2.0-or-later
Group: Hardware/Mobile Group: Hardware/Mobile
BuildArch: noarch BuildArch: noarch
@ -147,7 +145,6 @@ desktop specific applets like blueman or GNOME or KDE applets).
%ifarch ppc ppc64 ppc64le %ifarch ppc ppc64 ppc64le
%patch6 -p1 %patch6 -p1
%endif %endif
%patch7 -p1
mkdir dbus-apis mkdir dbus-apis
cp -a doc/*.txt dbus-apis/ cp -a doc/*.txt dbus-apis/
# FIXME: Change the dbus service to be a real service, not systemd launched # FIXME: Change the dbus service to be a real service, not systemd launched