ports/contrib
3
3
Fork 2
Code Issues 1 Pull Requests Activity

bluez: cherry-picked two commits from upstream; moved alsa-lib to optional deps; new optional dependency: json-c

Browse Source
This commit is contained in:
Tim Biermann 2023-12-22 20:30:31 +01:00
parent 1adf27ccd0
commit c4773cf779
Signed by: tb
GPG Key ID: 42F8B4E30B673606
5 changed files with 237 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bluez/.footprint
View File

@ -3,6 +3,11 @@ drwxr-xr-x root/root etc/bluetooth/
-rw-r--r-- root/root etc/bluetooth/main.conf
drwxr-xr-x root/root etc/rc.d/
-rwxr-xr-x root/root etc/rc.d/bluetoothd
drwxr-xr-x root/root lib/
drwxr-xr-x root/root lib/udev/
-rwxr-xr-x root/root lib/udev/hid2hci
drwxr-xr-x root/root lib/udev/rules.d/
-rw-r--r-- root/root lib/udev/rules.d/97-hid2hci.rules
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/bluemoon

8
bluez/.signature
View File

@ -1,6 +1,8 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF38FRbvPwD9YMLOKUAASuGL+6RWfHt9lqBSvmDKL8Yb/uJ6hFRcIneKJOX0Fw0TPSr7tF0OBOShVymSJD4BNoMAk=
SHA256 (Pkgfile) = 02441745865fc3e790e78bbbc6563c7c1788f044976af1677c017f6f8a0eab95
SHA256 (.footprint) = 63ca4c17736790663b9e51141b3125bf07b8eef8495ba5f25e9f9df649fbf34d
RWSagIOpLGJF3w567m4RnImOlkoBXnoTBg1jr3SLsmBm1YErxsRzvBArjQJLqZYzee7883UHExpj/J3OLWjkMQ2qFv7sSzdC1gE=
SHA256 (Pkgfile) = ab69c77fab0df011ed0da33fb5a99890ae46fb77e9079c5973f76b5b872b0c13
SHA256 (.footprint) = a2b63e3b3a200e23cd7b29abca0ee094dfca6cd624320b2ab2a62001bc4f2356
SHA256 (bluez-5.71.tar.xz) = b828d418c93ced1f55b616fb5482cf01537440bfb34fbda1a564f3ece94735d8
SHA256 (fix-bluez-5.71-autoconnection.diff) = d851ba385d3e37f89bebb8e411e240e0f7786dd47e67f6ea8ca6b75092ed0ccc
SHA256 (fix-bluez-5.71-coredump-on-a2dp-suspend.diff) = f03b0c6cbc090937064ad0777435c660b190a70ffc23bf3932944729bbd51df2
SHA256 (bluetoothd) = b24a219ea4b457a8efdd1b5e0880022056b7b85a3e469f5e3678fa5e4d4be6b6

15
bluez/Pkgfile
View File

@ -1,20 +1,27 @@
# Description: Bluetooth libraries and utilities
# URL: https://www.bluez.org/
# Maintainer: Tim Biermann, tbier at posteo dot de
# Depends on: alsa-lib dbus glib
# Optional: cups docutils libical
# Depends on: dbus glib
# Optional: alsa-lib cups docutils json-c libical
name=bluez
version=5.71
release=1
release=2
source=(https://mirrors.edge.kernel.org/pub/linux/bluetooth/bluez-$version.tar.xz
fix-bluez-5.71-autoconnection.diff
fix-bluez-5.71-coredump-on-a2dp-suspend.diff
bluetoothd)
build() {
cd bluez-$version
patch -Np1 -i $SRC/fix-bluez-5.71-autoconnection.diff
patch -Np1 -i $SRC/fix-bluez-5.71-coredump-on-a2dp-suspend.diff
prt-get isinst alsa-lib && PKGMK_BLUEZ+=' --enable-midi'
prt-get isinst cups && PKGMK_BLUEZ+=' --enable-cups' || PKGMK_BLUEZ+=' --disable-cups'
prt-get isinst docutils || PKGMK_BLUEZ+=' --disable-manpages'
prt-get isinst json-c && PKGMK_BLUEZ+=' --enable-mesh'
prt-get isinst libical && PKGMK_BLUEZ+=' --enable-obex' || PKGMK_BLUEZ+=' --disable-obex'
./configure $PKGMK_BLUEZ \
@ -22,7 +29,7 @@ build() {
--sysconfdir=/etc \
--localstatedir=/var \
--libexecdir=/usr/lib \
--enable-{a2dp,experimental,library,midi,tools} \
--enable-{a2dp,experimental,hid2hci,library,tools} \
--disable-systemd
make
make DESTDIR=$PKG install

163
bluez/fix-bluez-5.71-autoconnection.diff Normal file
View File

@ -0,0 +1,163 @@
From 7ad5669402c9acff8e4cc808edc12a41df36654e Mon Sep 17 00:00:00 2001
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Date: Wed, 20 Dec 2023 12:20:03 -0500
Subject: [PATCH] adapter: Fix link key address type for old kernels
On old kernels only BDADDR_BREDR is supported so this attempts to detect
that and retry.
Fixes: https://github.com/bluez/bluez/issues/686
---
src/adapter.c | 59 ++++++++++++++++++++++++++++++++++++++-------------
1 file changed, 44 insertions(+), 15 deletions(-)
diff --git a/src/adapter.c b/src/adapter.c
index ee70b00d2..022390f0d 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -311,6 +311,7 @@ struct btd_adapter {
bool pincode_requested; /* PIN requested during last bonding */
GSList *connections; /* Connected devices */
GSList *devices; /* Devices structure pointers */
+ GSList *load_keys; /* Devices keys to be loaded */
GSList *connect_list; /* Devices to connect when found */
struct btd_device *connect_le; /* LE device waiting to be connected */
sdp_list_t *services; /* Services associated to adapter */
@@ -4284,6 +4285,9 @@ static int set_privacy(struct btd_adapter *adapter, uint8_t privacy)
return -1;
}
+static void load_link_keys(struct btd_adapter *adapter, bool debug_keys,
+ bool retry);
+
static void load_link_keys_complete(uint8_t status, uint16_t length,
const void *param, void *user_data)
{
@@ -4293,18 +4297,31 @@ static void load_link_keys_complete(uint8_t status, uint16_t length,
btd_error(adapter->dev_id,
"Failed to load link keys for hci%u: %s (0x%02x)",
adapter->dev_id, mgmt_errstr(status), status);
+
+ if (status == MGMT_STATUS_INVALID_PARAMS) {
+ load_link_keys(adapter, btd_opts.debug_keys, true);
+ /* Release keys after retry since we shall only retry
+ * once.
+ */
+ goto done;
+ }
+
return;
}
DBG("link keys loaded for hci%u", adapter->dev_id);
+
+done:
+ g_slist_free_full(adapter->load_keys, g_free);
+ adapter->load_keys = NULL;
}
-static void load_link_keys(struct btd_adapter *adapter, GSList *keys,
- bool debug_keys)
+static void load_link_keys(struct btd_adapter *adapter, bool debug_keys,
+ bool retry)
{
struct mgmt_cp_load_link_keys *cp;
struct mgmt_link_key_info *key;
- size_t key_count, cp_size;
+ size_t count, cp_size;
unsigned int id;
GSList *l;
@@ -4318,12 +4335,14 @@ static void load_link_keys(struct btd_adapter *adapter, GSList *keys,
if (!(adapter->supported_settings & MGMT_SETTING_BREDR))
return;
- key_count = g_slist_length(keys);
+ count = g_slist_length(adapter->load_keys);
+ if (!count)
+ return;
- DBG("hci%u keys %zu debug_keys %d", adapter->dev_id, key_count,
- debug_keys);
+ DBG("hci%u keys %zu debug_keys %d retry %s", adapter->dev_id, count,
+ debug_keys, retry ? "true" : "false");
- cp_size = sizeof(*cp) + (key_count * sizeof(*key));
+ cp_size = sizeof(*cp) + (count * sizeof(*key));
cp = g_try_malloc0(cp_size);
if (cp == NULL) {
@@ -4341,13 +4360,18 @@ static void load_link_keys(struct btd_adapter *adapter, GSList *keys,
* behavior for debug keys.
*/
cp->debug_keys = debug_keys;
- cp->key_count = htobs(key_count);
+ cp->key_count = htobs(count);
- for (l = keys, key = cp->keys; l != NULL; l = g_slist_next(l), key++) {
+ for (l = adapter->load_keys, key = cp->keys; l != NULL;
+ l = g_slist_next(l), key++) {
struct link_key_info *info = l->data;
bacpy(&key->addr.bdaddr, &info->bdaddr);
- key->addr.type = info->bdaddr_type;
+ /* Old kernels might only support loading with type set to
+ * BDADDR_BREDR so on retry set that instead of using the stored
+ * info.
+ */
+ key->addr.type = retry ? BDADDR_BREDR : info->bdaddr_type;
key->type = info->type;
memcpy(key->val, info->key, 16);
key->pin_len = info->pin_len;
@@ -4359,9 +4383,12 @@ static void load_link_keys(struct btd_adapter *adapter, GSList *keys,
g_free(cp);
- if (id == 0)
+ if (id == 0) {
btd_error(adapter->dev_id, "Failed to load link keys for hci%u",
adapter->dev_id);
+ g_slist_free_full(adapter->load_keys, g_free);
+ adapter->load_keys = NULL;
+ }
}
static void load_ltks_complete(uint8_t status, uint16_t length,
@@ -4873,7 +4900,6 @@ static void load_defaults(struct btd_adapter *adapter)
static void load_devices(struct btd_adapter *adapter)
{
char dirname[PATH_MAX];
- GSList *keys = NULL;
GSList *ltks = NULL;
GSList *irks = NULL;
GSList *params = NULL;
@@ -4964,7 +4990,8 @@ static void load_devices(struct btd_adapter *adapter)
}
if (key_info)
- keys = g_slist_append(keys, key_info);
+ adapter->load_keys = g_slist_append(adapter->load_keys,
+ key_info);
if (ltk_info)
ltks = g_slist_append(ltks, ltk_info);
@@ -5013,8 +5040,7 @@ static void load_devices(struct btd_adapter *adapter)
closedir(dir);
- load_link_keys(adapter, keys, btd_opts.debug_keys);
- g_slist_free_full(keys, g_free);
+ load_link_keys(adapter, btd_opts.debug_keys, false);
load_ltks(adapter, ltks);
g_slist_free_full(ltks, g_free);
@@ -6930,6 +6956,9 @@ static void adapter_remove(struct btd_adapter *adapter)
g_slist_free(adapter->devices);
adapter->devices = NULL;
+ g_slist_free(adapter->load_keys);
+ adapter->load_keys = NULL;
+
discovery_cleanup(adapter, 0);
unload_drivers(adapter);

53
bluez/fix-bluez-5.71-coredump-on-a2dp-suspend.diff Normal file
View File

@ -0,0 +1,53 @@
From: Vlad Pruteanu <vlad.pruteanu@nxp.com>
To: linux-bluetooth@vger.kernel.org
Cc: claudia.rosu@nxp.com, mihai-octavian.urzica@nxp.com,
silviu.barbulescu@nxp.com, iulia.tanasescu@nxp.com,
andrei.istodorescu@nxp.com, luiz.dentz@gmail.com,
Vlad Pruteanu <vlad.pruteanu@nxp.com>
Subject: [PATCH 1/1] transport: Check if transport is bcast before it's cast to bap_transport
Date: Tue, 19 Dec 2023 14:49:16 +0200 [thread overview]
Message-ID: <20231219124916.44173-2-vlad.pruteanu@nxp.com> (raw)
In-Reply-To: <20231219124916.44173-1-vlad.pruteanu@nxp.com>
Currently, when a transport is released it is cast to bap_transport without
checking if the transport is actually a broadcast one. Then, based on this
cast it is released. Problems may occur with transports that are not
broadcast, but are still cast to bap_transport. This commit fixes this
problem.
---
profiles/audio/transport.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c
index e2073451c..555da99a8 100644
--- a/profiles/audio/transport.c
+++ b/profiles/audio/transport.c
@@ -643,7 +643,6 @@ static DBusMessage *release(DBusConnection *conn, DBusMessage *msg,
{
struct media_transport *transport = data;
struct media_owner *owner = transport->owner;
- struct bap_transport *bap = transport->data;
const char *sender;
struct media_request *req;
guint id;
@@ -675,9 +674,17 @@ static DBusMessage *release(DBusConnection *conn, DBusMessage *msg,
req = media_request_create(msg, id);
media_owner_add(owner, req);
- if (bt_bap_stream_get_type(bap->stream) ==
- BT_BAP_STREAM_TYPE_BCAST) {
- bap_disable_complete(bap->stream, 0x00, 0x00, owner);
+ if (!strcmp(media_endpoint_get_uuid(transport->endpoint),
+ BAA_SERVICE_UUID)
+ || !strcmp(media_endpoint_get_uuid(transport->endpoint),
+ BCAA_SERVICE_UUID)) {
+
+ struct bap_transport *bap = transport->data;
+
+ if (bt_bap_stream_get_type(bap->stream) ==
+ BT_BAP_STREAM_TYPE_BCAST) {
+ bap_disable_complete(bap->stream, 0x00, 0x00, owner);
+ }
}
return NULL;