[arch-commits] Commit in bluez/trunk (3 files)

[Andreas Radke]

    Date: Tuesday, April 5, 2016 @ 19:51:24
  Author: andyrtr
Revision: 263923

upgpkg: bluez 5.39-1

upstream update 5.39

Modified:
  bluez/trunk/PKGBUILD
Deleted:
  bluez/trunk/fix_crash_when_connecting_to_controllers.diff
  bluez/trunk/fix_registering_to_player_events.diff

-----------------------------------------------+
 PKGBUILD                                      |   22 +++-----------
 fix_crash_when_connecting_to_controllers.diff |   37 ------------------------
 fix_registering_to_player_events.diff         |   30 -------------------
 3 files changed, 5 insertions(+), 84 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-04-05 17:49:13 UTC (rev 263922)
+++ PKGBUILD	2016-04-05 17:51:24 UTC (rev 263923)
@@ -5,32 +5,20 @@
 
 pkgbase=bluez
 pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins')
-pkgver=5.38
-pkgrel=3
+pkgver=5.39
+pkgrel=1
 url="http://www.bluez.org/"
 arch=('i686' 'x86_64')
 license=('GPL2')
 makedepends=('dbus' 'libical' 'systemd')
 source=(http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.{xz,sign}
-        bluetooth.modprobe
-        fix_crash_when_connecting_to_controllers.diff
-        fix_registering_to_player_events.diff)
+        bluetooth.modprobe)
 # see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc
-sha256sums=('0618c5440be6715805060ab5eea930526f34089c437bf61819447b160254f4df'
+sha256sums=('21d1bc9150d3576296595217efb98a746b592389d25d5637e8bee5da7272593b'
             'SKIP'
-            '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4'
-            '27296fb6cce5e62a04fbeb0779d852995779ecef553cc2e692d91d89eff8c673'
-            'a3f39bf73a14b7621c36fb1ab8237914c80aaddd7a3dae46d29a515c5121ed38')
+            '46c021be659c9a1c4e55afd04df0c059af1f3d98a96338236412e449bf7477b4')
 validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # Marcel Holtmann <marcel at holtmann.org>
 
-prepare() {
-  cd ${pkgname}-${pkgver}
-  # FS#48644, http://git.kernel.org/cgit/bluetooth/bluez.git/commit/?id=177d27c8c3db4588ec13dae0368f240902c42825
-  patch -Np1 -i ${srcdir}/fix_crash_when_connecting_to_controllers.diff
-  # http://git.kernel.org/cgit/bluetooth/bluez.git/commit/?id=cc235a8d528b36cad2cf9fe6517d54711613331a
-  patch -Np1 -i ${srcdir}/fix_registering_to_player_events.diff
-}
-
 build() {
   cd ${pkgname}-${pkgver}
   ./configure \

Deleted: fix_crash_when_connecting_to_controllers.diff
===================================================================
--- fix_crash_when_connecting_to_controllers.diff	2016-04-05 17:49:13 UTC (rev 263922)
+++ fix_crash_when_connecting_to_controllers.diff	2016-04-05 17:51:24 UTC (rev 263923)
@@ -1,37 +0,0 @@
-From 177d27c8c3db4588ec13dae0368f240902c42825 Mon Sep 17 00:00:00 2001
-From: Luiz Augusto von Dentz <luiz.von.dentz at intel.com>
-Date: Tue, 22 Mar 2016 17:37:18 +0200
-Subject: audio/avrcp: Fix crash when connecting to controllers
-
-Patch 70fdb77d0af137aa859f267da976f610cd9bbbd2 has actually caused the
-following regression since no player is set:
-
-Invalid read of size 8
-  at 0x435B8E: avrcp_player_value_rsp (avrcp.c:2150)
-  by 0x42FB83: control_response (avctp.c:831)
-  by 0x42FB83: session_cb (avctp.c:996)
-  by 0x50C8E39: g_main_context_dispatch (in /usr/lib64/libglib-2.0.so.0.4600.2)
-  by 0x50C91CF: ??? (in /usr/lib64/libglib-2.0.so.0.4600.2)
-  by 0x50C94F1: g_main_loop_run (in /usr/lib64/libglib-2.0.so.0.4600.2)
-  by 0x40C258: main (main.c:687)
-Address 0x58 is not stack'd, malloc'd or (recently) free'd
----
- profiles/audio/avrcp.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c
-index 787643c..0c6279a 100644
---- a/profiles/audio/avrcp.c
-+++ b/profiles/audio/avrcp.c
-@@ -3656,7 +3656,7 @@ static gboolean avrcp_get_capabilities_resp(struct avctp *conn,
- 		}
- 	}
- 
--	if (!session->controller)
-+	if (!session->controller || !session->controller->player)
- 		return FALSE;
- 
- 	if (!(events & (1 << AVRCP_EVENT_SETTINGS_CHANGED)))
--- 
-cgit v0.12
-

Deleted: fix_registering_to_player_events.diff
===================================================================
--- fix_registering_to_player_events.diff	2016-04-05 17:49:13 UTC (rev 263922)
+++ fix_registering_to_player_events.diff	2016-04-05 17:51:24 UTC (rev 263923)
@@ -1,30 +0,0 @@
-From cc235a8d528b36cad2cf9fe6517d54711613331a Mon Sep 17 00:00:00 2001
-From: Luiz Augusto von Dentz <luiz.von.dentz at intel.com>
-Date: Fri, 1 Apr 2016 11:07:15 +0300
-Subject: audio/avrcp: Fix registering to player events
-
-If controller does not have a player skip registering to events which
-requires a player.
----
- profiles/audio/avrcp.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c
-index 0c6279a..37bc291 100644
---- a/profiles/audio/avrcp.c
-+++ b/profiles/audio/avrcp.c
-@@ -3647,8 +3647,9 @@ static gboolean avrcp_get_capabilities_resp(struct avctp *conn,
- 		case AVRCP_EVENT_ADDRESSED_PLAYER_CHANGED:
- 		case AVRCP_EVENT_UIDS_CHANGED:
- 		case AVRCP_EVENT_AVAILABLE_PLAYERS_CHANGED:
--			/* These events above are controller specific */
--			if (!session->controller)
-+			/* These events above requires a player */
-+			if (!session->controller ||
-+						!session->controller->player)
- 				break;
- 		case AVRCP_EVENT_VOLUME_CHANGED:
- 			avrcp_register_notification(session, event);
--- 
-cgit v0.12
-