From cd754159f2c07243f91014f1ab90458db10528995c720368fdfacd9d1436ac35 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 3 Jul 2014 04:55:43 +0000 Subject: [PATCH 1/2] Accepting request 238871 from home:seife:testing update to version 5.20 OBS-URL: https://build.opensuse.org/request/show/238871 OBS-URL: https://build.opensuse.org/package/show/Base:System/bluez?expand=0&rev=168 --- bluez-5.19.tar.xz | 3 -- bluez-5.20-fix-queue.patch | 60 ++++++++++++++++++++++++++++++++++++++ bluez-5.20.tar.xz | 3 ++ bluez.changes | 13 +++++++++ bluez.spec | 5 +++- 5 files changed, 80 insertions(+), 4 deletions(-) delete mode 100644 bluez-5.19.tar.xz create mode 100644 bluez-5.20-fix-queue.patch create mode 100644 bluez-5.20.tar.xz diff --git a/bluez-5.19.tar.xz b/bluez-5.19.tar.xz deleted file mode 100644 index 4d7ce61..0000000 --- a/bluez-5.19.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:12778f3b66e71eec50eeb2e652de94a2578f33b8c8bd57c981fa00adab524c8a -size 1343284 diff --git a/bluez-5.20-fix-queue.patch b/bluez-5.20-fix-queue.patch new file mode 100644 index 0000000..7dc77b8 --- /dev/null +++ b/bluez-5.20-fix-queue.patch @@ -0,0 +1,60 @@ +From: Luiz Augusto von Dentz +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 + +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 diff --git a/bluez-5.20.tar.xz b/bluez-5.20.tar.xz new file mode 100644 index 0000000..082c08a --- /dev/null +++ b/bluez-5.20.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:531fbaa0a9baf7b1f76fb8fd8975c20d3cc61cdc772a39d63df1d6abfc2a7481 +size 1368176 diff --git a/bluez.changes b/bluez.changes index 6703a7f..4d5567c 100644 --- a/bluez.changes +++ b/bluez.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Jun 27 10:56:22 UTC 2014 - seife+obs@b1-systems.com + +- add bluez-5.20-fix-queue.patch to fix test case failure + +------------------------------------------------------------------- +Sat Jun 21 21:30:12 UTC 2014 - seife+obs@b1-systems.com + +- update to version 5.20 + For non-Android related parts this is mostly a bug-fix release + with minor fixes here and there as well as improved handling of + PS3 controllers. + ------------------------------------------------------------------- Tue May 20 06:24:05 UTC 2014 - seife+obs@b1-systems.com diff --git a/bluez.spec b/bluez.spec index ff083ed..1cf802d 100644 --- a/bluez.spec +++ b/bluez.spec @@ -24,7 +24,7 @@ BuildRequires: libcap-ng-devel BuildRequires: systemd-devel BuildRequires: pkgconfig(dbus-1) >= 1.4 %{?systemd_requires} -Version: 5.19 +Version: 5.20 Release: 0 Summary: Bluetooth Stack for Linux License: GPL-2.0+ @@ -38,6 +38,8 @@ 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 @@ -113,6 +115,7 @@ 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/ From 415b1e719c28f93415f08f3fa923f9f0f272ad9a079c4598b37e455bc5428812 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 9 Jul 2014 11:57:10 +0000 Subject: [PATCH 2/2] Accepting request 239753 from home:seife:testing 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 --- bluez-5.20-fix-queue.patch | 60 -------------------------------------- bluez-5.20.tar.xz | 3 -- bluez-5.21.tar.xz | 3 ++ bluez.changes | 15 ++++++++++ bluez.spec | 5 +--- 5 files changed, 19 insertions(+), 67 deletions(-) delete mode 100644 bluez-5.20-fix-queue.patch delete mode 100644 bluez-5.20.tar.xz create mode 100644 bluez-5.21.tar.xz diff --git a/bluez-5.20-fix-queue.patch b/bluez-5.20-fix-queue.patch deleted file mode 100644 index 7dc77b8..0000000 --- a/bluez-5.20-fix-queue.patch +++ /dev/null @@ -1,60 +0,0 @@ -From: Luiz Augusto von Dentz -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 - -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 diff --git a/bluez-5.20.tar.xz b/bluez-5.20.tar.xz deleted file mode 100644 index 082c08a..0000000 --- a/bluez-5.20.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:531fbaa0a9baf7b1f76fb8fd8975c20d3cc61cdc772a39d63df1d6abfc2a7481 -size 1368176 diff --git a/bluez-5.21.tar.xz b/bluez-5.21.tar.xz new file mode 100644 index 0000000..f0d568a --- /dev/null +++ b/bluez-5.21.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:81eb073516f39ff1fa02fa40120e834f40fdb0b772f8f4153a9ab566cc0a1f4f +size 1387560 diff --git a/bluez.changes b/bluez.changes index 4d5567c..2a13208 100644 --- a/bluez.changes +++ b/bluez.changes @@ -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 diff --git a/bluez.spec b/bluez.spec index 1cf802d..9fc613d 100644 --- a/bluez.spec +++ b/bluez.spec @@ -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/