NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/{bluez5_utils, bluez5_utils-headers}: bump to version 5.64

Browse Source 
Removed all patches after being applied upstream:
https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=ec8c8f22efb66ccae533fbd55a236570ffcf756c
https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=710220f861b100856711a0a4d4a852874228a57a
https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=9f09e69ecb077082301dafb745856e1f3731aaa7
https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=cfab569484b18407fc117bb96634525cc76ea1f5
https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac
https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=58dec00edcaa316909cdd5309bd7bd3239ee221a

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Bernd Kuhls 2022-03-20 12:54:01 +01:00 committed by Thomas Petazzoni
parent 1bb495e8ca
commit a0d806dea6
9 changed files with 3 additions and 1924 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/bluez5_utils-headers/bluez5_utils-headers.mk
View File

@ -5,7 +5,7 @@
################################################################################
# Keep the version and patches in sync with bluez5_utils
BLUEZ5_UTILS_HEADERS_VERSION = 5.63
BLUEZ5_UTILS_HEADERS_VERSION = 5.64
BLUEZ5_UTILS_HEADERS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz
BLUEZ5_UTILS_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth
BLUEZ5_UTILS_HEADERS_DL_SUBDIR = bluez5_utils

33
package/bluez5_utils/0001-tools-mesh-cfgtest-include-limits.h.patch
View File

@ -1,33 +0,0 @@
From 5158827fded7cb4daf550a5956aff0c74f6c38fc Mon Sep 17 00:00:00 2001
From: Michael Nosthoff <bluez@heine.tech>
Date: Thu, 22 Jul 2021 21:36:13 +0200
Subject: [PATCH] tools/mesh-cfgtest: include limits.h
mesh-cfgtest.c uses PATH_MAX so it should include limits.h.
fixes compilation error when enabling mesh support with musl-based
toolchains observed in buildroot autobuilders.
http://autobuild.buildroot.net/results/20cc47f54de0b0d4bdf108c3715c590ae8ab476f/
http://autobuild.buildroot.net/results/003968b25906579dbcf5a95d1e43fec0ab504ef5/
Signed-off-by: Michael Nosthoff <buildroot@heine.tech>
---
tools/mesh-cfgtest.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/mesh-cfgtest.c b/tools/mesh-cfgtest.c
index fa0474faa..116ab7f16 100644
--- a/tools/mesh-cfgtest.c
+++ b/tools/mesh-cfgtest.c
@@ -21,6 +21,7 @@
#include <ftw.h>
#include <getopt.h>
#include <libgen.h>
+#include <limits.h>
#include <signal.h>
#include <stdio.h>
#include <time.h>
--
2.32.0

67
package/bluez5_utils/0002-shared-util-Rename-btd_malloc-to-util_malloc.patch
View File

@ -1,67 +0,0 @@
From f3263fed28bf510a1225661fe2b5f598300c11cd Mon Sep 17 00:00:00 2001
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Date: Wed, 5 Jan 2022 15:53:35 -0800
Subject: [PATCH] shared/util: Rename btd_malloc to util_malloc
util functions are not limited to daemon only which is normally the case
when using btd prefix.
(cherry picked from commit 710220f861b100856711a0a4d4a852874228a57a)
Signed-off-by: Thomas Devoogdt <thomas.devoogdt@gmail.com>
---
profiles/audio/avdtp.c | 2 +-
src/shared/util.c | 2 +-
src/shared/util.h | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c
index d3dfbf96d..f2b461330 100644
--- a/profiles/audio/avdtp.c
+++ b/profiles/audio/avdtp.c
@@ -1333,7 +1333,7 @@ static GSList *caps_to_list(uint8_t *data, size_t size,
break;
}
- cpy = btd_malloc(sizeof(*cpy) + cap->length);
+ cpy = util_malloc(sizeof(*cpy) + cap->length);
memcpy(cpy, cap, sizeof(*cap) + cap->length);
size -= sizeof(*cap) + cap->length;
diff --git a/src/shared/util.c b/src/shared/util.c
index 81b20d86f..93110047b 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -25,7 +25,7 @@
#include "src/shared/util.h"
-void *btd_malloc(size_t size)
+void *util_malloc(size_t size)
{
if (__builtin_expect(!!size, 1)) {
void *ptr;
diff --git a/src/shared/util.h b/src/shared/util.h
index ac70117ca..11d09979d 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -75,7 +75,7 @@ do { \
size_t __n = (size_t) (count); \
size_t __s = sizeof(type); \
void *__p; \
- __p = btd_malloc(__n * __s); \
+ __p = util_malloc(__n * __s); \
memset(__p, 0, __n * __s); \
__p; \
}))
@@ -86,7 +86,7 @@ do { \
char *strdelimit(char *str, char *del, char c);
int strsuffix(const char *str, const char *suffix);
-void *btd_malloc(size_t size);
+void *util_malloc(size_t size);
typedef void (*util_debug_func_t)(const char *str, void *user_data);
--
2.17.1

57
package/bluez5_utils/0003-shared-util-Add-util_memdup.patch
View File

@ -1,57 +0,0 @@
From 28f1c140374d1ecda65e3d59cca72352c3a07774 Mon Sep 17 00:00:00 2001
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Date: Thu, 6 Jan 2022 11:45:12 -0800
Subject: [PATCH] shared/util: Add util_memdup
This adds util_memdup which is intended to replace g_memdup since
replacing that with g_memdup2 requires bumping the glib version.
(cherry picked from commit 9f09e69ecb077082301dafb745856e1f3731aaa7)
Signed-off-by: Thomas Devoogdt <thomas.devoogdt@gmail.com>
---
src/shared/util.c | 16 ++++++++++++++++
src/shared/util.h | 1 +
2 files changed, 17 insertions(+)
diff --git a/src/shared/util.c b/src/shared/util.c
index 93110047b..6e1c83057 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -41,6 +41,22 @@ void *util_malloc(size_t size)
return NULL;
}
+void *util_memdup(const void *src, size_t size)
+{
+ void *cpy;
+
+ if (!src || !size)
+ return NULL;
+
+ cpy = util_malloc(size);
+ if (!cpy)
+ return NULL;
+
+ memcpy(cpy, src, size);
+
+ return cpy;
+}
+
void util_debug_va(util_debug_func_t function, void *user_data,
const char *format, va_list va)
{
diff --git a/src/shared/util.h b/src/shared/util.h
index 11d09979d..8ef6132c4 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -87,6 +87,7 @@ char *strdelimit(char *str, char *del, char c);
int strsuffix(const char *str, const char *suffix);
void *util_malloc(size_t size);
+void *util_memdup(const void *src, size_t size);
typedef void (*util_debug_func_t)(const char *str, void *user_data);
--
2.17.1

1411
package/bluez5_utils/0004-build-Replace-use-of-g_memdup-with-util_memdup.patch
View File

File diff suppressed because it is too large Load Diff

312
package/bluez5_utils/0005-build-Fix-errors-with-glibc-2-25.patch
View File

@ -1,312 +0,0 @@
From fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Mon, 14 Feb 2022 21:17:39 +0100
Subject: build: Fix errors with glibc < 2.25
getrandom and sys/random.h are only available since glibc 2.25:
https://www.gnu.org/software/gnulib/manual/html_node/sys_002frandom_002eh.html
resulting in the following build failures since version 5.63 and
https://git.kernel.org/pub/scm/bluetooth/bluez.git/log/?qt=grep&q=getrandom:
plugins/autopair.c:20:24: fatal error: sys/random.h: No such file or directory
#include <sys/random.h>
^
To fix this build failure, add util_getrandom and a fallback (borrowed
from pipewire and licensed under MIT):
https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/master/src/pipewire/utils.c
Fixes:
- http://autobuild.buildroot.org/results/6b8870d12e0804d6154230a7322c49416c1dc0e2
[Retrieved from:
https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
configure.ac | 4 +++-
emulator/le.c | 3 +--
emulator/phy.c | 3 +--
peripheral/main.c | 4 ++--
plugins/autopair.c | 4 ++--
profiles/health/hdp.c | 4 ++--
profiles/health/mcap.c | 6 +++---
src/shared/util.c | 25 +++++++++++++++++++++++++
src/shared/util.h | 2 ++
tools/btgatt-server.c | 3 +--
10 files changed, 42 insertions(+), 16 deletions(-)
diff --git a/configure.ac b/configure.ac
index 07d068a4d..441bd5f29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,6 +54,8 @@ AC_ARG_ENABLE(threads, AS_HELP_STRING([--enable-threads],
AC_CHECK_FUNCS(explicit_bzero)
+AC_CHECK_FUNCS(getrandom)
+
AC_CHECK_FUNCS(rawmemchr)
AC_CHECK_FUNC(signalfd, dummy=yes,
@@ -68,7 +70,7 @@ AC_CHECK_LIB(pthread, pthread_create, dummy=yes,
AC_CHECK_LIB(dl, dlopen, dummy=yes,
AC_MSG_ERROR(dynamic linking loader is required))
-AC_CHECK_HEADERS(linux/types.h linux/if_alg.h linux/uinput.h linux/uhid.h)
+AC_CHECK_HEADERS(linux/types.h linux/if_alg.h linux/uinput.h linux/uhid.h sys/random.h)
PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28, dummy=yes,
AC_MSG_ERROR(GLib >= 2.28 is required))
diff --git a/emulator/le.c b/emulator/le.c
index f8f313f2c..7656a657c 100644
--- a/emulator/le.c
+++ b/emulator/le.c
@@ -20,7 +20,6 @@
#include <sys/socket.h>
#include <sys/un.h>
#include <sys/uio.h>
-#include <sys/random.h>
#include <time.h>
#include "lib/bluetooth.h"
@@ -509,7 +508,7 @@ static unsigned int get_adv_delay(void)
/* The advertising delay is a pseudo-random value with a range
* of 0 ms to 10 ms generated for each advertising event.
*/
- if (getrandom(&val, sizeof(val), 0) < 0) {
+ if (util_getrandom(&val, sizeof(val), 0) < 0) {
/* If it fails to get the random number, use a static value */
val = 5;
}
diff --git a/emulator/phy.c b/emulator/phy.c
index 44cace438..7de85fb05 100644
--- a/emulator/phy.c
+++ b/emulator/phy.c
@@ -19,7 +19,6 @@
#include <stdlib.h>
#include <string.h>
#include <sys/socket.h>
-#include <sys/random.h>
#include <netinet/in.h>
#include <netinet/ip.h>
#include <time.h>
@@ -174,7 +173,7 @@ struct bt_phy *bt_phy_new(void)
mainloop_add_fd(phy->rx_fd, EPOLLIN, phy_rx_callback, phy, NULL);
if (!get_random_bytes(&phy->id, sizeof(phy->id))) {
- if (getrandom(&phy->id, sizeof(phy->id), 0) < 0) {
+ if (util_getrandom(&phy->id, sizeof(phy->id), 0) < 0) {
mainloop_remove_fd(phy->rx_fd);
close(phy->tx_fd);
close(phy->rx_fd);
diff --git a/peripheral/main.c b/peripheral/main.c
index 91adb45fc..b82d7caf6 100644
--- a/peripheral/main.c
+++ b/peripheral/main.c
@@ -25,13 +25,13 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/mount.h>
-#include <sys/random.h>
#ifndef WAIT_ANY
#define WAIT_ANY (-1)
#endif
#include "src/shared/mainloop.h"
+#include "src/shared/util.h"
#include "peripheral/efivars.h"
#include "peripheral/attach.h"
#include "peripheral/gap.h"
@@ -192,7 +192,7 @@ int main(int argc, char *argv[])
addr, 6) < 0) {
printf("Generating new persistent static address\n");
- if (getrandom(addr, sizeof(addr), 0) < 0) {
+ if (util_getrandom(addr, sizeof(addr), 0) < 0) {
perror("Failed to get random static address");
return EXIT_FAILURE;
}
diff --git a/plugins/autopair.c b/plugins/autopair.c
index a75ecebe4..0b09e893f 100644
--- a/plugins/autopair.c
+++ b/plugins/autopair.c
@@ -17,7 +17,6 @@
#include <fcntl.h>
#include <unistd.h>
#include <errno.h>
-#include <sys/random.h>
#include <glib.h>
@@ -29,6 +28,7 @@
#include "src/device.h"
#include "src/log.h"
#include "src/storage.h"
+#include "src/shared/util.h"
/*
* Plugin to handle automatic pairing of devices with reduced user
@@ -131,7 +131,7 @@ static ssize_t autopair_pincb(struct btd_adapter *adapter,
if (attempt >= 4)
return 0;
- if (getrandom(&val, sizeof(val), 0) < 0) {
+ if (util_getrandom(&val, sizeof(val), 0) < 0) {
error("Failed to get a random pincode");
return 0;
}
diff --git a/profiles/health/hdp.c b/profiles/health/hdp.c
index 9d9d1e824..b6590cd3a 100644
--- a/profiles/health/hdp.c
+++ b/profiles/health/hdp.c
@@ -16,7 +16,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <sys/random.h>
#include <glib.h>
@@ -33,6 +32,7 @@
#include "src/device.h"
#include "src/sdpd.h"
#include "src/shared/timeout.h"
+#include "src/shared/util.h"
#include "btio/btio.h"
#include "hdp_types.h"
@@ -1490,7 +1490,7 @@ static void *generate_echo_packet(void)
if (!buf)
return NULL;
- if (getrandom(buf, HDP_ECHO_LEN, 0) < 0) {
+ if (util_getrandom(buf, HDP_ECHO_LEN, 0) < 0) {
g_free(buf);
return NULL;
}
diff --git a/profiles/health/mcap.c b/profiles/health/mcap.c
index aad0a08a3..5d2bac3d9 100644
--- a/profiles/health/mcap.c
+++ b/profiles/health/mcap.c
@@ -19,7 +19,6 @@
#include <errno.h>
#include <unistd.h>
#include <time.h>
-#include <sys/random.h>
#include <glib.h>
@@ -28,6 +27,7 @@
#include "btio/btio.h"
#include "src/log.h"
#include "src/shared/timeout.h"
+#include "src/shared/util.h"
#include "mcap.h"
@@ -1905,7 +1905,7 @@ gboolean mcap_create_mcl(struct mcap_instance *mi,
mcl->state = MCL_IDLE;
bacpy(&mcl->addr, addr);
set_default_cb(mcl);
- if (getrandom(&val, sizeof(val), 0) < 0) {
+ if (util_getrandom(&val, sizeof(val), 0) < 0) {
mcap_instance_unref(mcl->mi);
g_free(mcl);
return FALSE;
@@ -2049,7 +2049,7 @@ static void connect_mcl_event_cb(GIOChannel *chan, GError *gerr,
mcl->mi = mcap_instance_ref(mi);
bacpy(&mcl->addr, &dst);
set_default_cb(mcl);
- if (getrandom(&val, sizeof(val), 0) < 0) {
+ if (util_getrandom(&val, sizeof(val), 0) < 0) {
mcap_instance_unref(mcl->mi);
g_free(mcl);
goto drop;
diff --git a/src/shared/util.c b/src/shared/util.c
index 6e1c83057..33196bf8b 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -13,6 +13,7 @@
#endif
#define _GNU_SOURCE
+#include <fcntl.h>
#include <stdio.h>
#include <ctype.h>
#include <stdbool.h>
@@ -23,6 +24,10 @@
#include <limits.h>
#include <string.h>
+#ifdef HAVE_SYS_RANDOM_H
+#include <sys/random.h>
+#endif
+
#include "src/shared/util.h"
void *util_malloc(size_t size)
@@ -138,6 +143,26 @@ unsigned char util_get_dt(const char *parent, const char *name)
return DT_UNKNOWN;
}
+/* Helper for getting a random in case getrandom unavailable (glibc < 2.25) */
+ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags)
+{
+#ifdef HAVE_GETRANDOM
+ return getrandom(buf, buflen, flags);
+#else
+ int fd;
+ ssize_t bytes;
+
+ fd = open("/dev/urandom", O_CLOEXEC);
+ if (fd < 0)
+ return -1;
+
+ bytes = read(fd, buf, buflen);
+ close(fd);
+
+ return bytes;
+#endif
+}
+
/* Helpers for bitfield operations */
/* Find unique id in range from 1 to max but no bigger than 64. */
diff --git a/src/shared/util.h b/src/shared/util.h
index 8ef6132c4..c01eccf8a 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -103,6 +103,8 @@ void util_hexdump(const char dir, const unsigned char *buf, size_t len,
unsigned char util_get_dt(const char *parent, const char *name);
+ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags);
+
uint8_t util_get_uid(uint64_t *bitmap, uint8_t max);
void util_clear_uid(uint64_t *bitmap, uint8_t id);
diff --git a/tools/btgatt-server.c b/tools/btgatt-server.c
index 15d49a464..4a5d2b720 100644
--- a/tools/btgatt-server.c
+++ b/tools/btgatt-server.c
@@ -20,7 +20,6 @@
#include <getopt.h>
#include <unistd.h>
#include <errno.h>
-#include <sys/random.h>
#include "lib/bluetooth.h"
#include "lib/hci.h"
@@ -287,7 +286,7 @@ static bool hr_msrmt_cb(void *user_data)
uint32_t cur_ee;
uint32_t val;
- if (getrandom(&val, sizeof(val), 0) < 0)
+ if (util_getrandom(&val, sizeof(val), 0) < 0)
return false;
pdu[0] = 0x06;
--
cgit

39
package/bluez5_utils/0006-src-shared-util.h-include-sys-types.h.patch
View File

@ -1,39 +0,0 @@
From 1d21878d84f16e28e16c61b36799a62e22732d97 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Thu, 24 Feb 2022 18:19:33 +0100
Subject: [PATCH] src/shared/util.h: include sys/types.h
Include sys/types.h to avoid the following build failure on musl raised
since commit fb57ad9b9d107856e5f1c8135da04ffa2f7a11ac:
In file included from src/shared/queue.c:15:
./src/shared/util.h:106:1: error: unknown type name 'ssize_t'; did you mean 'size_t'?
106 | ssize_t util_getrandom(void *buf, size_t buflen, unsigned int flags);
| ^~~~~~~
| size_t
Fixes:
- http://autobuild.buildroot.org/results/83eaeb3863040645409f5787fdbdde79385c5257
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status:
https://patchwork.kernel.org/project/bluetooth/patch/20220224173104.479809-1-fontaine.fabrice@gmail.com]
---
src/shared/util.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/shared/util.h b/src/shared/util.h
index c01eccf8a..554481e1e 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -14,6 +14,7 @@
#include <alloca.h>
#include <byteswap.h>
#include <string.h>
+#include <sys/types.h>
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
#define BIT(n) (1 << (n))
--
2.34.1

2
package/bluez5_utils/bluez5_utils.hash
View File

@ -1,5 +1,5 @@
# From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc:
sha256 9349e11e8160bb3d720835d271250d8a7424d3690f5289e6db6fe07cc66c6d76 bluez-5.63.tar.xz
sha256 ae437e65b6b3070c198bc5b0109fe9cdeb9eaa387380e2072f9de65fe8a1de34 bluez-5.64.tar.xz
# Locally computed
sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING
sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING.LIB

4
package/bluez5_utils/bluez5_utils.mk
View File

@ -5,7 +5,7 @@
################################################################################
# Keep the version and patches in sync with bluez5_utils-headers
BLUEZ5_UTILS_VERSION = 5.63
BLUEZ5_UTILS_VERSION = 5.64
BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz
BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth
BLUEZ5_UTILS_INSTALL_STAGING = YES
@ -13,8 +13,6 @@ BLUEZ5_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+
BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB
BLUEZ5_UTILS_CPE_ID_VENDOR = bluez
BLUEZ5_UTILS_CPE_ID_PRODUCT = bluez
# We're patching Makefile.am and configure.ac
BLUEZ5_UTILS_AUTORECONF = YES
BLUEZ5_UTILS_DEPENDENCIES = \
$(if $(BR2_PACKAGE_BLUEZ5_UTILS_HEADERS),bluez5_utils-headers) \