[gentoo-commits] proj/musl:master commit in: net-wireless/bluez/, net-wireless/bluez/files/

["Jory Pratt" <anarchy@gentoo.org>]

commit:     d10f7e2d9925e124c854491a7d944607403a4b36
Author:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 11 02:31:08 2021 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sat Dec 11 02:31:08 2021 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=d10f7e2d

net-wireless/bluez: sync with ::gentoo

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>

 .../{bluez-5.62-r2.ebuild => bluez-5.62-r3.ebuild} |   9 +
 ...1-Revert-attrib-Make-use-of-bt_att_resend.patch | 188 +++++++++++++++++++++
 .../bluez/files/bluez-5.62-fix-disconnecting.patch |  54 ++++++
 3 files changed, 251 insertions(+)

diff --git a/net-wireless/bluez/bluez-5.62-r2.ebuild b/net-wireless/bluez/bluez-5.62-r3.ebuild
similarity index 96%
rename from net-wireless/bluez/bluez-5.62-r2.ebuild
rename to net-wireless/bluez/bluez-5.62-r3.ebuild
index 4b736fbc..aafa275e 100644
--- a/net-wireless/bluez/bluez-5.62-r2.ebuild
+++ b/net-wireless/bluez/bluez-5.62-r3.ebuild
@@ -70,6 +70,15 @@ PATCHES=(
 
 	# Required for musl support
 	"${FILESDIR}"/0001-include-limits.h-for-PATH_MAX-for-musl-support.patch
+
+	# This reverts commit ac2c2e10b3adb432a572b618c6f53cabb6b3c80b. It
+	# causes problems with Logitech MX wireless input devices (see
+	# https://github.com/bluez/bluez/issues/220 )
+	"${FILESDIR}"/0001-Revert-attrib-Make-use-of-bt_att_resend.patch
+
+	# gatt-client: Fix disconnecting due to GattCharacteristic1.MTU
+	# (from 'master')
+	"${FILESDIR}"/${P}-fix-disconnecting.patch
 )
 
 pkg_setup() {

diff --git a/net-wireless/bluez/files/0001-Revert-attrib-Make-use-of-bt_att_resend.patch b/net-wireless/bluez/files/0001-Revert-attrib-Make-use-of-bt_att_resend.patch
new file mode 100644
index 00000000..a8475b0c
--- /dev/null
+++ b/net-wireless/bluez/files/0001-Revert-attrib-Make-use-of-bt_att_resend.patch
@@ -0,0 +1,188 @@
+From 697866e210e4e2dce14c95f7a7243e9b9128d01f Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam@redhat.com>
+Date: Sun, 7 Nov 2021 15:10:53 -0800
+Subject: [PATCH] Revert "attrib: Make use of bt_att_resend"
+
+This reverts commit ac2c2e10b3adb432a572b618c6f53cabb6b3c80b. It
+causes problems with Logitech MX wireless input devices (see
+https://github.com/bluez/bluez/issues/220 and
+https://bugzilla.redhat.com/show_bug.cgi?id=2019970 ).
+---
+ attrib/gattrib.c | 95 +++++++++++++++++++++++++++++++++++++-----------
+ 1 file changed, 73 insertions(+), 22 deletions(-)
+
+diff --git a/attrib/gattrib.c b/attrib/gattrib.c
+index 270a37ebe..bc7d4f22c 100644
+--- a/attrib/gattrib.c
++++ b/attrib/gattrib.c
+@@ -41,8 +41,13 @@ struct _GAttrib {
+ 	struct queue *track_ids;
+ };
+ 
++struct id_pair {
++	unsigned int org_id;
++	unsigned int pend_id;
++};
++
+ struct attrib_callbacks {
+-	unsigned int id;
++	struct id_pair *id;
+ 	GAttribResultFunc result_func;
+ 	GAttribNotifyFunc notify_func;
+ 	GDestroyNotify destroy_func;
+@@ -51,6 +56,32 @@ struct attrib_callbacks {
+ 	uint16_t notify_handle;
+ };
+ 
++static bool find_with_org_id(const void *data, const void *user_data)
++{
++	const struct id_pair *p = data;
++	unsigned int orig_id = PTR_TO_UINT(user_data);
++
++	return (p->org_id == orig_id);
++}
++
++static struct id_pair *store_id(GAttrib *attrib, unsigned int org_id,
++							unsigned int pend_id)
++{
++	struct id_pair *t;
++
++	t = new0(struct id_pair, 1);
++	if (!t)
++		return NULL;
++
++	t->org_id = org_id;
++	t->pend_id = pend_id;
++
++	if (queue_push_tail(attrib->track_ids, t))
++		return t;
++
++	return NULL;
++}
++
+ GAttrib *g_attrib_new(GIOChannel *io, guint16 mtu, bool ext_signed)
+ {
+ 	gint fd;
+@@ -119,6 +150,9 @@ static void attrib_callbacks_destroy(void *data)
+ 	if (cb->destroy_func)
+ 		cb->destroy_func(cb->user_data);
+ 
++	if (queue_remove(cb->parent->track_ids, cb->id))
++		free(cb->id);
++
+ 	free(data);
+ }
+ 
+@@ -148,7 +182,7 @@ void g_attrib_unref(GAttrib *attrib)
+ 	bt_att_unref(attrib->att);
+ 
+ 	queue_destroy(attrib->callbacks, attrib_callbacks_destroy);
+-	queue_destroy(attrib->track_ids, NULL);
++	queue_destroy(attrib->track_ids, free);
+ 
+ 	free(attrib->buf);
+ 
+@@ -261,6 +295,7 @@ guint g_attrib_send(GAttrib *attrib, guint id, const guint8 *pdu, guint16 len,
+ 	struct attrib_callbacks *cb = NULL;
+ 	bt_att_response_func_t response_cb = NULL;
+ 	bt_att_destroy_func_t destroy_cb = NULL;
++	unsigned int pend_id;
+ 
+ 	if (!attrib)
+ 		return 0;
+@@ -282,47 +317,62 @@ guint g_attrib_send(GAttrib *attrib, guint id, const guint8 *pdu, guint16 len,
+ 
+ 	}
+ 
+-	if (id == 0)
+-		id = bt_att_send(attrib->att, pdu[0], (void *) pdu + 1,
+-					len - 1, response_cb, cb, destroy_cb);
+-	else {
+-		int err;
+-
+-		err = bt_att_resend(attrib->att, id, pdu[0], (void *) pdu + 1,
+-					len - 1, response_cb, cb, destroy_cb);
+-		if (err)
+-			return 0;
+-	}
++	pend_id = bt_att_send(attrib->att, pdu[0], (void *) pdu + 1, len - 1,
++						response_cb, cb, destroy_cb);
+ 
+-	if (!id)
+-		return id;
++	/*
++	 * We store here pair as it is easier to handle it in response and in
++	 * case where user request us to use specific id request - see below.
++	 */
++	if (id == 0)
++		id = pend_id;
+ 
+ 	/*
+ 	 * If user what us to use given id, lets keep track on that so we give
+ 	 * user a possibility to cancel ongoing request.
+ 	 */
+-	if (cb) {
+-		cb->id = id;
+-		queue_push_tail(attrib->track_ids, UINT_TO_PTR(id));
+-	}
++	if (cb)
++		cb->id = store_id(attrib, id, pend_id);
+ 
+ 	return id;
+ }
+ 
+ gboolean g_attrib_cancel(GAttrib *attrib, guint id)
+ {
++	struct id_pair *p;
++
+ 	if (!attrib)
+ 		return FALSE;
+ 
++	/*
++	 * If request belongs to gattrib and is not yet done it has to be on
++	 * the tracking id queue
++	 *
++	 * FIXME: It can happen that on the queue there is id_pair with
++	 * given id which was provided by the user. In the same time it might
++	 * happen that other attrib user got dynamic allocated req_id with same
++	 * value as the one provided by the other user.
++	 * In such case there are two clients having same request id and in
++	 * this point of time we don't know which one calls cancel. For
++	 * now we cancel request in which id was specified by the user.
++	 */
++	p = queue_remove_if(attrib->track_ids, find_with_org_id,
++							UINT_TO_PTR(id));
++	if (!p)
++		return FALSE;
++
++	id = p->pend_id;
++	free(p);
++
+ 	return bt_att_cancel(attrib->att, id);
+ }
+ 
+ static void cancel_request(void *data, void *user_data)
+ {
+-	unsigned int id = PTR_TO_UINT(data);
++	struct id_pair *p = data;
+ 	GAttrib *attrib = user_data;
+ 
+-	bt_att_cancel(attrib->att, id);
++	bt_att_cancel(attrib->att, p->pend_id);
+ }
+ 
+ gboolean g_attrib_cancel_all(GAttrib *attrib)
+@@ -330,8 +380,9 @@ gboolean g_attrib_cancel_all(GAttrib *attrib)
+ 	if (!attrib)
+ 		return FALSE;
+ 
++	/* Cancel only request which belongs to gattrib */
+ 	queue_foreach(attrib->track_ids, cancel_request, attrib);
+-	queue_remove_all(attrib->track_ids, NULL, NULL, NULL);
++	queue_remove_all(attrib->track_ids, NULL, NULL, free);
+ 
+ 	return TRUE;
+ }
+-- 
+2.33.1
+

diff --git a/net-wireless/bluez/files/bluez-5.62-fix-disconnecting.patch b/net-wireless/bluez/files/bluez-5.62-fix-disconnecting.patch
new file mode 100644
index 00000000..8eff9dc0
--- /dev/null
+++ b/net-wireless/bluez/files/bluez-5.62-fix-disconnecting.patch
@@ -0,0 +1,54 @@
+From ebf2d7935690c00c7fd12768177e2023fc63c9fe Mon Sep 17 00:00:00 2001
+From: Javier de San Pedro <dev.git@javispedro.com>
+Date: Sat, 27 Nov 2021 23:21:36 +0100
+Subject: gatt-client: Fix disconnecting due to GattCharacteristic1.MTU
+
+After the MTU dbus property patches in 5.62 we are seeing bluetoothd
+terminate frequently with "Disconnected from D-Bus. Exiting." msgs.
+Apparently this is because bluetoothd sent an invalid reply to a D-Bus
+Property Get (for GattCharacteristic1's MTU).
+Multiple issues in bluez Github.com project reported similar behavior;
+at least #235 (see Fixes:), #219, and likely #238.
+
+When the Characteristic1 object is still cached/alive, but the
+underlying att connection is not (e.g. someone just called Disconnect),
+the property getter (characteristic_get_mtu) right now returns false.
+However, gdbus seems to ignore the return value and sends the empty reply
+message anyway (rather than a dbus error?), and this seems to cause
+the dbus connection to be terminated (due to the ill-formed reply?).
+bluetoothd then aborts.
+
+This patch makes the property value BT_ATT_DEFAULT_LE_MTU if the
+underlying att object does not exist, rather than returning an invalid
+message. This is consistent with the existing PropertyChanged signal
+behavior (we will emit a PropertyChange only if a larger MTU is
+exchanged), and fixes the issue on my machines.
+An alternative could be to change gdbus behavior, but I'm not sure if we
+are allowed to return an error here anyway without causing problems in
+other dbus libraries/wrappers.
+
+Fixes: aaa0c4996ae9 ("gatt: Add implementation of GattCharacteristic1.MTU")
+Fixes: https://github.com/bluez/bluez/issues/235
+---
+ src/gatt-client.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/src/gatt-client.c b/src/gatt-client.c
+index de18bea97..6ee984db9 100644
+--- a/src/gatt-client.c
++++ b/src/gatt-client.c
+@@ -883,10 +883,7 @@ static gboolean characteristic_get_mtu(const GDBusPropertyTable *property,
+ 	uint16_t mtu;
+ 
+ 	att = bt_gatt_client_get_att(gatt);
+-	if (!att)
+-		return FALSE;
+-
+-	mtu = bt_att_get_mtu(att);
++	mtu = att ? bt_att_get_mtu(att) : BT_ATT_DEFAULT_LE_MTU;
+ 
+ 	dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT16, &mtu);
+ 
+-- 
+cgit 1.2.3-1.el7
+