Merge lp:~kzapalowicz/bluez/feature-bluez-5.40-ble-fix into lp:~bluetooth/bluez/ubuntu

[Konrad Zapałowicz]

New upstream version and drop of legacy hci init

This commit fixes the issues with BLE keyboards by first
upgrading the BlueZ version to the newest upstream which
is 5.40; second by dropping the legacy udev rules for hci
initialization in favor of auto discovery.

New upstream version and drop of legacy hci init

This commit fixes the issues with BLE keyboards by first
upgrading the BlueZ version to the newest upstream which
is 5.40; second by dropping the legacy udev rules for hci
initialization in favor of auto discovery.

Unmerged revisions

21. By Konrad Zapałowicz on 2016-07-06

New upstream version
  - bluez 5.40
  - remove patches that are now upstream

20. By Simon Fels on 2016-03-02

* debian/50-bluetooth-hci-auto-poweron.rules:
  - Get rid of legacy udev rule to power on bluetooth controllers on
    startup. Using hciconfig for that is the legacy way and will lead
    to different problems as the kernel side stack wont initialize
    all needed subsystems when used. BlueZ introduced a replacement
    for this with 5.36 which basically tells the bluetoothd through
    a config option to turn on all found Bluetooth controllers by
    default. With changing this there should be no change in terms
    of functionality.

=== removed file 'debian/50-bluetooth-hci-auto-poweron.rules'
--- debian/50-bluetooth-hci-auto-poweron.rules	2015-08-14 10:04:55 +0000
+++ debian/50-bluetooth-hci-auto-poweron.rules	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-# Set bluetooth power up
-ACTION=="add", SUBSYSTEM=="bluetooth", KERNEL=="hci[0-9]*", RUN+="/bin/hciconfig %k up"

=== modified file 'debian/bluez.install'
--- debian/bluez.install	2016-02-02 17:16:14 +0000
+++ debian/bluez.install	2016-07-06 10:47:25 +0000
@@ -1,4 +1,4 @@
-src/main.conf etc/bluetooth
+debian/main.conf etc/bluetooth
 profiles/input/input.conf etc/bluetooth
 # profiles/audio/audio.conf etc/bluetooth
 profiles/network/network.conf etc/bluetooth
@@ -25,7 +25,6 @@
 lib/udev/hid2hci
 lib/udev/rules.d/97-hid2hci.rules
 attrib/gatttool usr/bin
-debian/50-bluetooth-hci-auto-poweron.rules lib/udev/rules.d
 #-- for systemd
 lib/systemd/system/bluetooth.service
 etc/dbus-1/system.d/bluetooth.conf

=== modified file 'debian/changelog'
--- debian/changelog	2016-03-01 15:19:16 +0000
+++ debian/changelog	2016-07-06 10:47:25 +0000
@@ -1,3 +1,23 @@
+bluez (5.40-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream version
+
+ -- Konrad Zapałowicz <[e-mail]>  Wed, 06 Jul 2016 12:11:00 +0200
+
+bluez (5.37-0ubuntu6) UNRELEASED; urgency=medium
+
+  * debian/50-bluetooth-hci-auto-poweron.rules:
+    - Get rid of legacy udev rule to power on bluetooth controllers on
+      startup. Using hciconfig for that is the legacy way and will lead
+      to different problems as the kernel side stack wont initialize
+      all needed subsystems when used. BlueZ introduced a replacement
+      for this with 5.36 which basically tells the bluetoothd through
+      a config option to turn on all found Bluetooth controllers by
+      default. With changing this there should be no change in terms
+      of functionality.
+
+ -- Simon Fels <[e-mail]>  Wed, 02 Mar 2016 08:20:11 +0100
+
 bluez (5.37-0ubuntu5) xenial; urgency=medium
 
   [Tony Espy ]

=== added file 'debian/main.conf'
--- debian/main.conf	1970-01-01 00:00:00 +0000
+++ debian/main.conf	2016-07-06 10:47:25 +0000
@@ -0,0 +1,89 @@
+[General]
+
+# Default adaper name
+# Defaults to 'BlueZ X.YZ'
+#Name = BlueZ
+
+# Default device class. Only the major and minor device class bits are
+# considered. Defaults to '0x000000'.
+#Class = 0x000100
+
+# How long to stay in discoverable mode before going back to non-discoverable
+# The value is in seconds. Default is 180, i.e. 3 minutes.
+# 0 = disable timer, i.e. stay discoverable forever
+#DiscoverableTimeout = 0
+
+# How long to stay in pairable mode before going back to non-discoverable
+# The value is in seconds. Default is 0.
+# 0 = disable timer, i.e. stay pairable forever
+#PairableTimeout = 0
+
+# Automatic connection for bonded devices driven by platform/user events.
+# If a platform plugin uses this mechanism, automatic connections will be
+# enabled during the interval defined below. Initially, this feature
+# intends to be used to establish connections to ATT channels. Default is 60.
+#AutoConnectTimeout = 60
+
+# Use vendor id source (assigner), vendor, product and version information for
+# DID profile support. The values are separated by ":" and assigner, VID, PID
+# and version.
+# Possible vendor id source values: bluetooth, usb (defaults to usb)
+#DeviceID = bluetooth:1234:5678:abcd
+
+# Do reverse service discovery for previously unknown devices that connect to
+# us. This option is really only needed for qualification since the BITE tester
+# doesn't like us doing reverse SDP for some test cases (though there could in
+# theory be other useful purposes for this too). Defaults to 'true'.
+#ReverseServiceDiscovery = true
+
+# Enable name resolving after inquiry. Set it to 'false' if you don't need
+# remote devices name and want shorter discovery cycle. Defaults to 'true'.
+#NameResolving = true
+
+# Enable runtime persistency of debug link keys. Default is false which
+# makes debug link keys valid only for the duration of the connection
+# that they were created for.
+#DebugKeys = false
+
+# Restricts all controllers to the specified transport. Default value
+# is "dual", i.e. both BR/EDR and LE enabled (when supported by the HW).
+# Possible values: "dual", "bredr", "le"
+#ControllerMode = dual
+
+# Enables Multi Profile Specification support. This allows to specify if
+# system supports only Multiple Profiles Single Device (MPSD) configuration
+# or both Multiple Profiles Single Device (MPSD) and Multiple Profiles Multiple
+# Devices (MPMD) configurations.
+# Possible values: "off", "single", "multiple"
+#MultiProfile = off
+
+# Permanently enables the Fast Connectable setting for adapters that
+# support it. When enabled other devices can connect faster to us,
+# however the tradeoff is increased power consumptions. This feature
+# will fully work only on kernel version 4.1 and newer. Defaults to
+# 'false'.
+#FastConnectable = false
+
+[Policy]
+
+# The ReconnectUUIDs defines the set of remote services that should try
+# to be reconnected to in case of a link loss (link supervision
+# timeout). The policy plugin should contain a sane set of values by
+# default, but this list can be overridden here. By setting the list to
+# empty the reconnection feature gets disabled.
+#ReconnectUUIDs=00001112-0000-1000-8000-00805f9b34fb, 0000111f-0000-1000-8000-00805f9b34fb, 0000110a-0000-1000-8000-00805f9b34fb
+
+# ReconnectAttempts define the number of attempts to reconnect after a link
+# lost. Setting the value to 0 disables reconnecting feature.
+#ReconnectAttempts=7
+
+# ReconnectIntervals define the set of intervals in seconds to use in between
+# attempts.
+# If the number of attempts defined in ReconnectAttempts is bigger than the
+# set of intervals the last interval is repeated until the last attempt.
+#ReconnectIntervals=1, 2, 4, 8, 16, 32, 64
+
+# AutoEnable defines option to enable all controllers when they are found.
+# This includes adapters present on start as well as adapters that are plugged
+# in later on. Defaults to 'false'.
+AutoEnable=true

=== removed file 'debian/patches/0001-profiles-audio-add-big-endian-structure-definition-f.patch'
--- debian/patches/0001-profiles-audio-add-big-endian-structure-definition-f.patch	2016-02-11 13:46:45 +0000
+++ debian/patches/0001-profiles-audio-add-big-endian-structure-definition-f.patch	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-From d3056811f75aa788382f56848e3a871ae3cbbf33 Mon Sep 17 00:00:00 2001
-From: Simon Fels <[e-mail]>
-Date: Thu, 11 Feb 2016 14:45:19 +0100
-Subject: [PATCH] profiles: audio: add big endian structure definition for LDAC
- codec
-
----
- profiles/audio/a2dp-codecs.h | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/profiles/audio/a2dp-codecs.h b/profiles/audio/a2dp-codecs.h
-index e9da0bf..4fb5c0c 100644
---- a/profiles/audio/a2dp-codecs.h
-+++ b/profiles/audio/a2dp-codecs.h
-@@ -234,6 +234,11 @@ typedef struct {
- 	uint8_t channel_mode:4;
- } __attribute__ ((packed)) a2dp_aptx_t;
- 
-+typedef struct {
-+	a2dp_vendor_codec_t info;
-+	uint8_t unknown[2];
-+} __attribute__ ((packed)) a2dp_ldac_t;
-+
- #else
- #error "Unknown byte order"
- #endif
--- 
-2.5.0
-

=== removed file 'debian/patches/0005-audio-media-return-empty-string-when-player-name-is-.patch'
--- debian/patches/0005-audio-media-return-empty-string-when-player-name-is-.patch	2016-01-24 00:07:20 +0000
+++ debian/patches/0005-audio-media-return-empty-string-when-player-name-is-.patch	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-From c9055958af1dec734b66bf4c941ee7392034c958 Mon Sep 17 00:00:00 2001
-From: Simon Fels <[e-mail]>
-Date: Wed, 2 Dec 2015 11:58:54 +0100
-Subject: [PATCH 5/5] audio/media: return empty string when player name is not
- available
-
-If the name for the player is set as NULL we will crash later on
-so taking a valid default is required.
-
-Crash observed without this:
-
-Program terminated with signal SIGSEGV, Segmentation fault.
-0  strlen () at ../sysdeps/arm/armv6t2/strlen.S:85
-85      ../sysdeps/arm/armv6t2/strlen.S: No such file or directory.
-(gdb) bt
-0  strlen () at ../sysdeps/arm/armv6t2/strlen.S:85
-1  0xb6f13ebc in avrcp_handle_media_player_list (session=0xb8f339c0,
-    session=0xb8f339c0, end_item=<optimized out>, start_item=<optimized out>,
-    pdu=0xb8f43283) at profiles/audio/avrcp.c:1917
-2  avrcp_handle_get_folder_items (session=0xb8f339c0, pdu=0xb8f43283,
-    transaction=<optimized out>) at profiles/audio/avrcp.c:1968
-3  0xb6f13fb8 in handle_browsing_pdu (conn=<optimized out>,
-    transaction=<optimized out>, operands=0xb8f43283 "q\b",
-    operand_count=<optimized out>, user_data=0xb8f339c0)
-    at profiles/audio/avrcp.c:2028
-4  0xb6f0f088 in session_browsing_cb (chan=<optimized out>,
-    cond=<optimized out>, data=0xb8f3ba28) at profiles/audio/avctp.c:930
-5  0xb6e19e90 in g_main_dispatch (context=0xb8f28100)
-    at /build/buildd/glib2.0-2.44.1/./glib/gmain.c:3122
-6  g_main_context_dispatch (context=context@entry=0xb8f28100)
-    at /build/buildd/glib2.0-2.44.1/./glib/gmain.c:3737
-7  0xb6e1a114 in g_main_context_iterate (context=0xb8f28100,
-    block=block@entry=1, dispatch=dispatch@entry=1, self=<optimized out>)
-    at /build/buildd/glib2.0-2.44.1/./glib/gmain.c:3808
-8  0xb6e1a3b0 in g_main_loop_run (loop=0xb8f28030)
-    at /build/buildd/glib2.0-2.44.1/./glib/gmain.c:4002
-9  0xb6efef3e in main (argc=1, argv=0xbebdde04) at src/main.c:661
----
- profiles/audio/media.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-Index: bluez-5.37/profiles/audio/media.c
-===================================================================
---- bluez-5.37.orig/profiles/audio/media.c
-+++ bluez-5.37/profiles/audio/media.c
-@@ -1018,6 +1018,9 @@ static const char *get_player_name(void
- {
- 	struct media_player *mp = user_data;
- 
-+	if (!mp->name)
-+		return "";
-+
- 	return mp->name;
- }
- 

=== modified file 'debian/patches/series'
--- debian/patches/series	2016-02-11 13:46:45 +0000
+++ debian/patches/series	2016-07-06 10:47:25 +0000
@@ -14,5 +14,3 @@
 # dropped with one of the next releases
 0003-tools-mpris-proxy-allow-user-to-specify-different-mp.patch
 0004-obexd-enable-ebook-backend-conditionally.patch
-0005-audio-media-return-empty-string-when-player-name-is-.patch
-0001-profiles-audio-add-big-endian-structure-definition-f.patch