[whinlatter,01/67] bluez5: upgrade 5.84 -> 5.85

From: Guðni Már Gilbert <gudni.m.g@gmail.com>

Changelog:
- Fix issue with handling display of battery charge level.
- Fix issue with BASS permissions not requiring encryption.
- Fix issue with handling abort for OBEX SRM operation.
- Fix issue with handling device privacy.
- Add support for HFP call answer support.
- Add support for HFP simple 3-way call support.

Full changelog:
https://github.com/bluez/bluez/compare/5.84...5.85

----
Other notes:
- A new testing tool is added called 6lowpan-tester
- A patch is removed since it is included in the 5.85 release

Signed-off-by: Guðni Már Gilbert <gudni.m.g@gmail.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
(cherry picked from commit 83812b010cf9c8bd022ad9702be2285de21ac67e)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 meta/recipes-connectivity/bluez5/bluez5.inc   |  1 -
 ...-fix-pac_config_cb-error-code-return.patch | 29 -------------------
 .../bluez5/{bluez5_5.84.bb => bluez5_5.85.bb} |  3 +-
 3 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 meta/recipes-connectivity/bluez5/bluez5/0001-media-fix-pac_config_cb-error-code-return.patch
 rename meta/recipes-connectivity/bluez5/{bluez5_5.84.bb => bluez5_5.85.bb} (93%)

This patch doesn't bring any critical bug fix can be dropped.

On Sat, Dec 13, 2025 at 3:29 PM <ankur.tyagi85@gmail.com> wrote:
>
> From: Guðni Már Gilbert <gudni.m.g@gmail.com>
>
> Changelog:
> - Fix issue with handling display of battery charge level.
> - Fix issue with BASS permissions not requiring encryption.
> - Fix issue with handling abort for OBEX SRM operation.
> - Fix issue with handling device privacy.
> - Add support for HFP call answer support.
> - Add support for HFP simple 3-way call support.
>
> Full changelog:
> https://github.com/bluez/bluez/compare/5.84...5.85
>
> ----
> Other notes:
> - A new testing tool is added called 6lowpan-tester
> - A patch is removed since it is included in the 5.85 release
>
> Signed-off-by: Guðni Már Gilbert <gudni.m.g@gmail.com>
> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
> (cherry picked from commit 83812b010cf9c8bd022ad9702be2285de21ac67e)
> Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
> ---
>  meta/recipes-connectivity/bluez5/bluez5.inc   |  1 -
>  ...-fix-pac_config_cb-error-code-return.patch | 29 -------------------
>  .../bluez5/{bluez5_5.84.bb => bluez5_5.85.bb} |  3 +-
>  3 files changed, 2 insertions(+), 31 deletions(-)
>  delete mode 100644 meta/recipes-connectivity/bluez5/bluez5/0001-media-fix-pac_config_cb-error-code-return.patch
>  rename meta/recipes-connectivity/bluez5/{bluez5_5.84.bb => bluez5_5.85.bb} (93%)
>
> diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
> index aac38a54a9..24a41f92df 100644
> --- a/meta/recipes-connectivity/bluez5/bluez5.inc
> +++ b/meta/recipes-connectivity/bluez5/bluez5.inc
> @@ -64,7 +64,6 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
>             file://init \
>             file://run-ptest \
>             file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \
> -           file://0001-media-fix-pac_config_cb-error-code-return.patch \
>             "
>  S = "${UNPACKDIR}/bluez-${PV}"
>
> diff --git a/meta/recipes-connectivity/bluez5/bluez5/0001-media-fix-pac_config_cb-error-code-return.patch b/meta/recipes-connectivity/bluez5/bluez5/0001-media-fix-pac_config_cb-error-code-return.patch
> deleted file mode 100644
> index a67fd07137..0000000000
> --- a/meta/recipes-connectivity/bluez5/bluez5/0001-media-fix-pac_config_cb-error-code-return.patch
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -From d7966dbb7bcf39f9615c906c47ef7ad895796756 Mon Sep 17 00:00:00 2001
> -From: Pauli Virtanen <pav@iki.fi>
> -Date: Thu, 18 Sep 2025 20:19:35 +0300
> -Subject: [PATCH] media: fix pac_config_cb() error code return
> -
> -Fixes: a887b1a1b91f ("audio: Add support for specific error codes for A2DP configuration")
> -
> -Upstream-Status: Backport [https://github.com/bluez/bluez/commit/6b0a08776ae44a9102d7c6875a77e83dc6a11a37]
> -Signed-off-by: Guðni Már Gilbert <gudni.m.g@gmail.com>
> ----
> - profiles/audio/media.c | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/profiles/audio/media.c b/profiles/audio/media.c
> -index 332f643bb..deb321e6c 100644
> ---- a/profiles/audio/media.c
> -+++ b/profiles/audio/media.c
> -@@ -1110,7 +1110,7 @@ static void pac_config_cb(struct media_endpoint *endpoint, void *ret, int size,
> -       if (!transport)
> -               return;
> -
> --      data->cb(data->stream, error_code == 0 ? 0 : -EINVAL);
> -+      data->cb(data->stream, (error_code && *error_code == 0) ? 0 : -EINVAL);
> - }
> -
> - static struct media_transport *pac_ucast_config(struct bt_bap_stream *stream,
> ---
> -2.43.0
> -
> diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.84.bb b/meta/recipes-connectivity/bluez5/bluez5_5.85.bb
> similarity index 93%
> rename from meta/recipes-connectivity/bluez5/bluez5_5.84.bb
> rename to meta/recipes-connectivity/bluez5/bluez5_5.85.bb
> index 874db9df64..d8965fef4b 100644
> --- a/meta/recipes-connectivity/bluez5/bluez5_5.84.bb
> +++ b/meta/recipes-connectivity/bluez5/bluez5_5.85.bb
> @@ -1,6 +1,6 @@
>  require bluez5.inc
>
> -SRC_URI[sha256sum] = "5ba73d030f7b00087d67800b0e321601aec0f892827c72e5a2c8390d8c886b11"
> +SRC_URI[sha256sum] = "ad028e49254bc4551a13f08fe7904c63d02ba650d77be8ae15bb3b0a0ad94a6f"
>
>  CVE_STATUS[CVE-2020-24490] = "cpe-incorrect: This issue has kernel fixes rather than bluez fixes"
>
> @@ -35,6 +35,7 @@ NOINST_TOOLS_TESTING ?= " \
>      tools/iso-tester \
>      tools/mesh-tester \
>      tools/ioctl-tester \
> +    tools/6lowpan-tester \
>  "
>
>  # noinst programs in Makefile.tools that are conditional on TOOLS