mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 13:29:49 +00:00
bluez5: upgrade 5.77 -> 5.78
* Fix issue with handling notification of scanned BISes to BASS * Fix issue with handling checking BIS caps against peer caps. * Fix issue with handling MGMT Set Device Flags overwrites. * Fix issue with handling ASE notification order. * Fix issue with handling BIG Info report events. * Fix issue with handling PACS Server role. * Fix issue with registering UHID_START multiple times. * Fix issue with pairing method not setting auto-connect. (From OE-Core rev: 77aa3ecaf6ad7fe777a10655542349a1489b7ad3) Signed-off-by: Guðni Már Gilbert <gudni.m.g@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
66390a274b
commit
0c87811b71
+70
-66
@@ -1,7 +1,7 @@
|
|||||||
From 9000923c07a68857e8ea32a49bfca660b1d1001a Mon Sep 17 00:00:00 2001
|
From 44e24350aae771daa93e5a85378856f91358688f Mon Sep 17 00:00:00 2001
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
Date: Mon, 26 Aug 2024 09:55:03 -0700
|
Date: Mon, 26 Aug 2024 09:55:03 -0700
|
||||||
Subject: [PATCH BlueZ] Provide GNU basename compatible implementation
|
Subject: [PATCH] Provide GNU basename compatible implementation
|
||||||
|
|
||||||
Call to basename() relies on a GNU extension
|
Call to basename() relies on a GNU extension
|
||||||
to take a const char * vs a char *. Let's define
|
to take a const char * vs a char *. Let's define
|
||||||
@@ -13,65 +13,21 @@ Fixes Issue: https://github.com/bluez/bluez/issues/843
|
|||||||
Upstream-Status: Submitted [https://lore.kernel.org/linux-bluetooth/20240826173844.2918630-1-raj.khem@gmail.com/T/#u]
|
Upstream-Status: Submitted [https://lore.kernel.org/linux-bluetooth/20240826173844.2918630-1-raj.khem@gmail.com/T/#u]
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
---
|
---
|
||||||
Makefile.mesh | 2 ++
|
configure.ac | 11 ++++++++++-
|
||||||
Makefile.tools | 3 ++-
|
mesh/mesh-config-json.c | 4 +++-
|
||||||
mesh/mesh-config-json.c | 6 ++++--
|
mesh/missing.h | 21 +++++++++++++++++++++
|
||||||
mesh/rpl.c | 3 ++-
|
mesh/rpl.c | 1 +
|
||||||
src/shared/util.h | 7 +++++++
|
tools/hex2hcd.c | 1 +
|
||||||
tools/hex2hcd.c | 3 ++-
|
tools/missing.h | 21 +++++++++++++++++++++
|
||||||
6 files changed, 19 insertions(+), 5 deletions(-)
|
6 files changed, 57 insertions(+), 2 deletions(-)
|
||||||
|
create mode 100644 mesh/missing.h
|
||||||
|
create mode 100644 tools/missing.h
|
||||||
|
|
||||||
Index: bluez-5.77/mesh/mesh-config-json.c
|
diff --git a/configure.ac b/configure.ac
|
||||||
===================================================================
|
index a7fb51f..254f1a7 100644
|
||||||
--- bluez-5.77.orig/mesh/mesh-config-json.c
|
--- a/configure.ac
|
||||||
+++ bluez-5.77/mesh/mesh-config-json.c
|
+++ b/configure.ac
|
||||||
@@ -28,6 +28,7 @@
|
@@ -70,7 +70,16 @@ AC_CHECK_LIB(pthread, pthread_create, dummy=yes,
|
||||||
#include <ell/ell.h>
|
|
||||||
#include <json-c/json.h>
|
|
||||||
|
|
||||||
+#include "mesh/missing.h"
|
|
||||||
#include "mesh/mesh-defs.h"
|
|
||||||
#include "mesh/util.h"
|
|
||||||
#include "mesh/mesh-config.h"
|
|
||||||
@@ -2694,7 +2695,8 @@ bool mesh_config_load_nodes(const char *
|
|
||||||
|
|
||||||
void mesh_config_destroy_nvm(struct mesh_config *cfg)
|
|
||||||
{
|
|
||||||
- char *node_dir, *node_name;
|
|
||||||
+ char *node_dir;
|
|
||||||
+ const char* node_name;
|
|
||||||
char uuid[33];
|
|
||||||
|
|
||||||
if (!cfg)
|
|
||||||
Index: bluez-5.77/mesh/rpl.c
|
|
||||||
===================================================================
|
|
||||||
--- bluez-5.77.orig/mesh/rpl.c
|
|
||||||
+++ bluez-5.77/mesh/rpl.c
|
|
||||||
@@ -24,6 +24,7 @@
|
|
||||||
|
|
||||||
#include <ell/ell.h>
|
|
||||||
|
|
||||||
+#include "mesh/missing.h"
|
|
||||||
#include "mesh/mesh-defs.h"
|
|
||||||
|
|
||||||
#include "mesh/node.h"
|
|
||||||
Index: bluez-5.77/tools/hex2hcd.c
|
|
||||||
===================================================================
|
|
||||||
--- bluez-5.77.orig/tools/hex2hcd.c
|
|
||||||
+++ bluez-5.77/tools/hex2hcd.c
|
|
||||||
@@ -24,6 +24,7 @@
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <stdbool.h>
|
|
||||||
#include <sys/stat.h>
|
|
||||||
+#include "tools/missing.h"
|
|
||||||
|
|
||||||
static ssize_t process_record(int fd, const char *line, uint16_t *upper_addr)
|
|
||||||
{
|
|
||||||
Index: bluez-5.77/configure.ac
|
|
||||||
===================================================================
|
|
||||||
--- bluez-5.77.orig/configure.ac
|
|
||||||
+++ bluez-5.77/configure.ac
|
|
||||||
@@ -70,7 +70,16 @@ AC_CHECK_LIB(pthread, pthread_create, du
|
|
||||||
AC_CHECK_LIB(dl, dlopen, dummy=yes,
|
AC_CHECK_LIB(dl, dlopen, dummy=yes,
|
||||||
AC_MSG_ERROR(dynamic linking loader is required))
|
AC_MSG_ERROR(dynamic linking loader is required))
|
||||||
|
|
||||||
@@ -89,10 +45,33 @@ Index: bluez-5.77/configure.ac
|
|||||||
|
|
||||||
PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28)
|
PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28)
|
||||||
|
|
||||||
Index: bluez-5.77/tools/missing.h
|
diff --git a/mesh/mesh-config-json.c b/mesh/mesh-config-json.c
|
||||||
===================================================================
|
index c198627..e3b0a18 100644
|
||||||
|
--- a/mesh/mesh-config-json.c
|
||||||
|
+++ b/mesh/mesh-config-json.c
|
||||||
|
@@ -28,6 +28,7 @@
|
||||||
|
#include <ell/ell.h>
|
||||||
|
#include <json-c/json.h>
|
||||||
|
|
||||||
|
+#include "mesh/missing.h"
|
||||||
|
#include "mesh/mesh-defs.h"
|
||||||
|
#include "mesh/util.h"
|
||||||
|
#include "mesh/mesh-config.h"
|
||||||
|
@@ -2694,7 +2695,8 @@ bool mesh_config_load_nodes(const char *cfgdir_name, mesh_config_node_func_t cb,
|
||||||
|
|
||||||
|
void mesh_config_destroy_nvm(struct mesh_config *cfg)
|
||||||
|
{
|
||||||
|
- char *node_dir, *node_name;
|
||||||
|
+ char *node_dir;
|
||||||
|
+ const char* node_name;
|
||||||
|
char uuid[33];
|
||||||
|
|
||||||
|
if (!cfg)
|
||||||
|
diff --git a/mesh/missing.h b/mesh/missing.h
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..eaf3281
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ bluez-5.77/tools/missing.h
|
+++ b/mesh/missing.h
|
||||||
@@ -0,0 +1,21 @@
|
@@ -0,0 +1,21 @@
|
||||||
+// SPDX-License-Identifier: LGPL-2.1-or-later
|
+// SPDX-License-Identifier: LGPL-2.1-or-later
|
||||||
+/*
|
+/*
|
||||||
@@ -115,10 +94,35 @@ Index: bluez-5.77/tools/missing.h
|
|||||||
+ return base ? base + 1 : path;
|
+ return base ? base + 1 : path;
|
||||||
+}
|
+}
|
||||||
+#endif
|
+#endif
|
||||||
Index: bluez-5.77/mesh/missing.h
|
diff --git a/mesh/rpl.c b/mesh/rpl.c
|
||||||
===================================================================
|
index fb225dd..2fa17d7 100644
|
||||||
|
--- a/mesh/rpl.c
|
||||||
|
+++ b/mesh/rpl.c
|
||||||
|
@@ -24,6 +24,7 @@
|
||||||
|
|
||||||
|
#include <ell/ell.h>
|
||||||
|
|
||||||
|
+#include "mesh/missing.h"
|
||||||
|
#include "mesh/mesh-defs.h"
|
||||||
|
|
||||||
|
#include "mesh/node.h"
|
||||||
|
diff --git a/tools/hex2hcd.c b/tools/hex2hcd.c
|
||||||
|
index e6dca5a..452ab2b 100644
|
||||||
|
--- a/tools/hex2hcd.c
|
||||||
|
+++ b/tools/hex2hcd.c
|
||||||
|
@@ -24,6 +24,7 @@
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <stdbool.h>
|
||||||
|
#include <sys/stat.h>
|
||||||
|
+#include "tools/missing.h"
|
||||||
|
|
||||||
|
static ssize_t process_record(int fd, const char *line, uint16_t *upper_addr)
|
||||||
|
{
|
||||||
|
diff --git a/tools/missing.h b/tools/missing.h
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..eaf3281
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ bluez-5.77/mesh/missing.h
|
+++ b/tools/missing.h
|
||||||
@@ -0,0 +1,21 @@
|
@@ -0,0 +1,21 @@
|
||||||
+// SPDX-License-Identifier: LGPL-2.1-or-later
|
+// SPDX-License-Identifier: LGPL-2.1-or-later
|
||||||
+/*
|
+/*
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
From eeb62ab04b3789a27074236cd0bed7cc64759f4d Mon Sep 17 00:00:00 2001
|
From b8371d1111e21a9b3285ec0864b78e98d7acf79f Mon Sep 17 00:00:00 2001
|
||||||
From: Mingli Yu <Mingli.Yu@windriver.com>
|
From: Mingli Yu <Mingli.Yu@windriver.com>
|
||||||
Date: Fri, 24 Aug 2018 12:04:03 +0800
|
Date: Fri, 24 Aug 2018 12:04:03 +0800
|
||||||
Subject: [PATCH] test-gatt: Fix hung issue
|
Subject: [PATCH] test-gatt: Fix hung issue
|
||||||
|
|||||||
+2
-2
@@ -1,4 +1,4 @@
|
|||||||
From c06fecbb009f4c42f01d86383d4571c96ba872f0 Mon Sep 17 00:00:00 2001
|
From bbfecd4407b6425f409c4657ac96e67f0a995a12 Mon Sep 17 00:00:00 2001
|
||||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||||
Date: Fri, 1 Apr 2016 17:07:34 +0300
|
Date: Fri, 1 Apr 2016 17:07:34 +0300
|
||||||
Subject: [PATCH] tests: add a target for building tests without running them
|
Subject: [PATCH] tests: add a target for building tests without running them
|
||||||
@@ -10,7 +10,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
|||||||
1 file changed, 3 insertions(+)
|
1 file changed, 3 insertions(+)
|
||||||
|
|
||||||
diff --git a/Makefile.am b/Makefile.am
|
diff --git a/Makefile.am b/Makefile.am
|
||||||
index 0ae7211..c8bcaca 100644
|
index 68bf058..a376d10 100644
|
||||||
--- a/Makefile.am
|
--- a/Makefile.am
|
||||||
+++ b/Makefile.am
|
+++ b/Makefile.am
|
||||||
@@ -713,6 +713,9 @@ endif
|
@@ -713,6 +713,9 @@ endif
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
From 705235d674f574bee08ea3138208938a086e1b53 Mon Sep 17 00:00:00 2001
|
From 409b2247f0003bc474a73aed78fa4c5a86bc30ec Mon Sep 17 00:00:00 2001
|
||||||
From: Alexander Kanavin <alex@linutronix.de>
|
From: Alexander Kanavin <alex@linutronix.de>
|
||||||
Date: Mon, 12 Dec 2022 13:10:19 +0100
|
Date: Mon, 12 Dec 2022 13:10:19 +0100
|
||||||
Subject: [PATCH] src/shared/util.c: include linux/limits.h
|
Subject: [PATCH] src/shared/util.c: include linux/limits.h
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
require bluez5.inc
|
require bluez5.inc
|
||||||
|
|
||||||
SRC_URI[sha256sum] = "5d032fdc1d4a085813554f57591e2e1fb0ceb2b3616ee56f689bc00e1d150812"
|
SRC_URI[sha256sum] = "830fed1915c5d375b8de0f5e6f45fcdea0dcc5ff5ffb3d31db6ed0f00d73c5e3"
|
||||||
|
|
||||||
CVE_STATUS[CVE-2020-24490] = "cpe-incorrect: This issue has kernel fixes rather than bluez fixes"
|
CVE_STATUS[CVE-2020-24490] = "cpe-incorrect: This issue has kernel fixes rather than bluez fixes"
|
||||||
|
|
||||||
Reference in New Issue
Block a user