rpm/bluez
SHA256
1
0
Fork 0
forked from pool/bluez
Code Pull Requests Activity

Accepting request 239753 from home:seife:testing

Browse Source 
update to version 5.21

OBS-URL: https://build.opensuse.org/request/show/239753
OBS-URL: https://build.opensuse.org/package/show/Base:System/bluez?expand=0&rev=169
This commit is contained in:
Marcus Meissner 2014-07-09 11:57:10 +00:00 committed by Git OBS Bridge
parent cd754159f2
commit 415b1e719c
5 changed files with 19 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
bluez-5.20-fix-queue.patch
View File

@ -1,60 +0,0 @@
From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH BlueZ] shared/queue: Fix invalid read
Date: Fri, 27 Jun 2014 13:47:49 +0300
Message-Id: <1403866069-15394-1-git-send-email-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
If the queue elements are destroyed by queue_destroy the head will point
to freed memory causing the following error when unit/test-queue is run:
Invalid read of size 8
at 0x401040: queue_foreach (queue.c:194)
by 0x4E9E5E0: ??? (in /usr/lib64/libglib-2.0.so.0.3800.2)
by 0x4E9E7A5: ??? (in /usr/lib64/libglib-2.0.so.0.3800.2)
by 0x4E9EB1A: g_test_run_suite (in /usr/lib64/libglib-2.0.so.0.3800.2)
by 0x40083E: main (test-queue.c:109)
Address 0x7f65738 is 8 bytes inside a block of size 16 free'd
at 0x4C28577: free (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
by 0x400E29: queue_destroy (queue.c:93)
by 0x40102C: queue_foreach (queue.c:219)
by 0x4E9E5E0: ??? (in /usr/lib64/libglib-2.0.so.0.3800.2)
by 0x4E9E7A5: ??? (in /usr/lib64/libglib-2.0.so.0.3800.2)
by 0x4E9EB1A: g_test_run_suite (in /usr/lib64/libglib-2.0.so.0.3800.2)
by 0x40083E: main (test-queue.c:109)
---
src/shared/queue.c | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/src/shared/queue.c b/src/shared/queue.c
index 4013293..3bdc1ec 100644
--- a/src/shared/queue.c
+++ b/src/shared/queue.c
@@ -75,23 +75,10 @@ struct queue *queue_new(void)
void queue_destroy(struct queue *queue, queue_destroy_func_t destroy)
{
- struct queue_entry *entry;
-
if (!queue)
return;
- entry = queue->head;
-
- while (entry) {
- struct queue_entry *tmp = entry;
-
- if (destroy)
- destroy(entry->data);
-
- entry = entry->next;
-
- free(tmp);
- }
+ queue_remove_all(queue, NULL, NULL, destroy);
queue_unref(queue);
}
--
1.9.3

3
bluez-5.20.tar.xz
View File

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

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

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

15
bluez.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Sun Jul 6 11:47:10 UTC 2014 - seife+obs@b1-systems.com
- update to version 5.21
Bugfixes and improvements throughout the tree. Fixes to
bluetoothctl to allow using it for scripting.
An important detail of this release is that it supports several
new features that are on their way to the 3.17 kernel. Perhaps
the most important one of these is LE passive scanning. When
run on a kernel that supports it, instead of doing a kind of
"fake" background scanning using the Start Discovery command,
bluetoothd will now tell the kernel the relevant information and
the kernel will then commence passive scanning for devices.
- remove bluez-5.20-fix-queue.patch (fixed upstream)
-------------------------------------------------------------------
Fri Jun 27 10:56:22 UTC 2014 - seife+obs@b1-systems.com

5
bluez.spec
View File

@ -24,7 +24,7 @@ BuildRequires: libcap-ng-devel
BuildRequires: systemd-devel
BuildRequires: pkgconfig(dbus-1) >= 1.4
%{?systemd_requires}
Version: 5.20
Version: 5.21
Release: 0
Summary: Bluetooth Stack for Linux
License: GPL-2.0+
@ -38,8 +38,6 @@ Source99: README.packagers
# fix some logitech HID devices, bnc#681049, bnc#850478 --seife+obs@b1-systems.com
Patch1: bluez-5.11-logitech-hid2hci.patch
Patch2: bluez-sdp-unix-path.patch
# PATCH-FIX-UPSTREAM bluez-5.20-fix-queue.patch fix testcase failure (and broken code :-) --seife
Patch100: bluez-5.20-fix-queue.patch
BuildRequires: alsa-devel
BuildRequires: automake
BuildRequires: check-devel
@ -115,7 +113,6 @@ BLUETOOTH trademarks are owned by Bluetooth SIG, Inc., U.S.A.
%setup -q
%patch1 -p1
%patch2 -p1
%patch100 -p1
cp %{SOURCE6} .
mkdir dbus-apis
cp -a doc/*.txt dbus-apis/