Merge ~dirksu/bluez:plucky into ~bluetooth/bluez:plucky

[Dirk Su]

Update merged patch to reflect the upstream commit changes

Upstream revert commit https://github.com/bluez/bluez/commit/ea3f4047e452b081e34d017cce316aba9d623301 and replace it with https://github.com/bluez/bluez/commit/78aabd896dbe3e23faaebbc97b8ecd711b2502fc

diff --git a/debian/changelog b/debian/changelog
index cd13323..ceda2ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+bluez (5.79-2ubuntu1.3) plucky; urgency=medium
+
+   [ Dirk Su ]
+  * Improve audio profiles compatibility (LP: #2122382)
+    d/patches: audio-upgrade-versions-to-latest-possible-to-qualify.patch
+    d/patches: cleanup-endpoints-when-devices-been-removed.patch
+    d/patches: profiles-avdtp-Fix-reply-for-bad-media-transport-for.patch
+
+ -- Dirk Su <[e-mail]>  Wed, 17 Sep 2025 11:38:49 +0800
+
 bluez (5.79-2ubuntu1.2) plucky; urgency=medium
 
   [ Dirk Su ]
diff --git a/debian/patches/a2dp-Remove-Endpoints-cache-entries-on-device-remova.patch b/debian/patches/a2dp-Remove-Endpoints-cache-entries-on-device-remova.patch
deleted file mode 100644
index ca376c1..0000000
--- a/debian/patches/a2dp-Remove-Endpoints-cache-entries-on-device-remova.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From ea3f4047e452b081e34d017cce316aba9d623301 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Danis?= <[e-mail]>
-Date: Mon, 17 Feb 2025 12:48:02 +0100
-Subject: [PATCH] a2dp: Remove Endpoints cache entries on device removal
-
-When a device is removed, currently the endpoints and last used info
-are kept in cache:
-  [General]
-  Name=Frederic's Phone
-
-  [Endpoints]
-  01=00:00:01:29f50235
-  02=00:02:01:80010484e200
-  LastUsed=01:02
-
-This may prevent future connection, after a new pairing, to use the
-best codec available.
-
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/2122382
----
- profiles/audio/a2dp.c | 40 ++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 40 insertions(+)
-
-diff --git a/profiles/audio/a2dp.c b/profiles/audio/a2dp.c
-index 0eac151db..81dbbfae3 100644
---- a/profiles/audio/a2dp.c
-+++ b/profiles/audio/a2dp.c
-@@ -880,6 +880,44 @@ static void store_remote_seps(struct a2dp_channel *chan)
- 	g_key_file_free(key_file);
- }
- 
-+static void remove_endpoints_cache(struct btd_service *service)
-+{
-+	struct btd_device *device = btd_service_get_device(service);
-+	char filename[PATH_MAX];
-+	char dst_addr[18];
-+	GKeyFile *key_file;
-+	GError *gerr = NULL;
-+	char *data;
-+	gsize length = 0;
-+
-+	ba2str(device_get_address(device), dst_addr);
-+
-+	create_filename(filename, PATH_MAX, "/%s/cache/%s",
-+		btd_adapter_get_storage_dir(device_get_adapter(device)),
-+		dst_addr);
-+
-+	key_file = g_key_file_new();
-+	if (!g_key_file_load_from_file(key_file, filename, 0, &gerr)) {
-+		g_error_free(gerr);
-+		g_key_file_free(key_file);
-+		return;
-+	}
-+	g_key_file_remove_group(key_file, "Endpoints", NULL);
-+
-+	data = g_key_file_to_data(key_file, &length, NULL);
-+	if (length > 0) {
-+		create_file(filename, 0600);
-+		if (!g_file_set_contents(filename, data, length, &gerr)) {
-+			error("Unable set contents for %s: (%s)", filename,
-+								gerr->message);
-+			g_error_free(gerr);
-+		}
-+	}
-+
-+	g_free(data);
-+	g_key_file_free(key_file);
-+}
-+
- static void invalidate_remote_cache(struct a2dp_setup *setup,
- 						struct avdtp_error *err)
- {
-@@ -3352,6 +3390,7 @@ static int a2dp_source_probe(struct btd_service *service)
- static void a2dp_source_remove(struct btd_service *service)
- {
- 	source_unregister(service);
-+	remove_endpoints_cache(service);
- }
- 
- static int a2dp_sink_probe(struct btd_service *service)
-@@ -3366,6 +3405,7 @@ static int a2dp_sink_probe(struct btd_service *service)
- static void a2dp_sink_remove(struct btd_service *service)
- {
- 	sink_unregister(service);
-+	remove_endpoints_cache(service);
- }
- 
- static int a2dp_source_connect(struct btd_service *service)
--- 
-2.43.0
-
diff --git a/debian/patches/cleanup-endpoints-when-devices-been-removed.patch b/debian/patches/cleanup-endpoints-when-devices-been-removed.patch
new file mode 100644
index 0000000..00400a7
--- /dev/null
+++ b/debian/patches/cleanup-endpoints-when-devices-been-removed.patch
@@ -0,0 +1,18 @@
+Description: Cleanup endpoints when device been removed
+ This patch merge two upstream commit
+ https://github.com/bluez/bluez/commit/ea3f4047e452b081e34d017cce316aba9d623301
+ https://github.com/bluez/bluez/commit/78aabd896dbe3e23faaebbc97b8ecd711b2502fc
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2122382
+---
+Index: bluez-5.72/src/device.c
+===================================================================
+--- bluez-5.72.orig/src/device.c	2025-09-16 16:02:14.000000000 +0800
++++ bluez-5.72/src/device.c	2025-09-16 16:03:12.615527575 +0800
+@@ -4645,6 +4645,7 @@
+ 	}
+ 	g_key_file_remove_group(key_file, "ServiceRecords", NULL);
+ 	g_key_file_remove_group(key_file, "Attributes", NULL);
++	g_key_file_remove_group(key_file, "Endpoints", NULL);
+
+ 	data = g_key_file_to_data(key_file, &length, NULL);
+ 	if (length > 0) {
diff --git a/debian/patches/series b/debian/patches/series
index 484b084..8ba7060 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,5 +16,5 @@ raspi-bcm43xx-3wire.patch
 ubuntu_error_restart.patch
 reconnect-hsp-on-a2dp-reconnect.patch
 profiles-avdtp-Fix-reply-for-bad-media-transport-for.patch
-a2dp-Remove-Endpoints-cache-entries-on-device-remova.patch
+cleanup-endpoints-when-devices-been-removed.patch
 audio-upgrade-versions-to-latest-possible-to-qualify.patch