diff mbox series

[2/2] package/{bluez5_utils, bluez5_utils-headers}: bump to version 5.68

Message ID 20230702164026.3466342-2-bernd@kuhls.net
State Accepted
Headers show
Series [1/2] package/bluez-alsa: bump version to 4.1.1 | expand

Commit Message

Bernd Kuhls July 2, 2023, 4:40 p.m. UTC
Changelog:
https://git.kernel.org/pub/scm/bluetooth/bluez.git/tree/ChangeLog

Removed patch which is included in this release.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 .../bluez5_utils-headers.mk                   |  2 +-
 .../bluez5_utils/0001-musl-max-input.patch    | 37 -------------------
 package/bluez5_utils/bluez5_utils.hash        |  2 +-
 package/bluez5_utils/bluez5_utils.mk          |  2 +-
 4 files changed, 3 insertions(+), 40 deletions(-)
 delete mode 100644 package/bluez5_utils/0001-musl-max-input.patch
diff mbox series

Patch

diff --git a/package/bluez5_utils-headers/bluez5_utils-headers.mk b/package/bluez5_utils-headers/bluez5_utils-headers.mk
index 8ca3764935..0790dd7e0e 100644
--- a/package/bluez5_utils-headers/bluez5_utils-headers.mk
+++ b/package/bluez5_utils-headers/bluez5_utils-headers.mk
@@ -5,7 +5,7 @@ 
 ################################################################################
 
 # Keep the version and patches in sync with bluez5_utils
-BLUEZ5_UTILS_HEADERS_VERSION = 5.66
+BLUEZ5_UTILS_HEADERS_VERSION = 5.68
 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
diff --git a/package/bluez5_utils/0001-musl-max-input.patch b/package/bluez5_utils/0001-musl-max-input.patch
deleted file mode 100644
index 8612bac07f..0000000000
--- a/package/bluez5_utils/0001-musl-max-input.patch
+++ /dev/null
@@ -1,37 +0,0 @@ 
-From ca6546fe521360fcf905bc115b893f322e706cb2 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 31 Jan 2023 05:52:58 +0000
-Subject: shared: define MAX_INPUT for musl
-
-musl systems don't have MAX_INPUT. Just define it to _POSIX_MAX_INPUT
-which musl does have if it's not already defined.
-
-Note that on glibc, the values match anyway (as of glibc-2.36), and
-indeed POSIX_MAX_INPUT has the same value on musl too.
-
-Bug: https://bugs.gentoo.org/888467
-Upstream: https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=ca6546fe521360fcf905bc115b893f322e706cb2
-Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
----
- src/shared/util.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/shared/util.c b/src/shared/util.c
-index 2f0ae0e86..b466fb001 100644
---- a/src/shared/util.c
-+++ b/src/shared/util.c
-@@ -28,6 +28,11 @@
- #include <sys/random.h>
- #endif
- 
-+/* define MAX_INPUT for musl */
-+#ifndef MAX_INPUT
-+#define MAX_INPUT _POSIX_MAX_INPUT
-+#endif
-+
- #include "src/shared/util.h"
- 
- void *util_malloc(size_t size)
--- 
-cgit 
-
diff --git a/package/bluez5_utils/bluez5_utils.hash b/package/bluez5_utils/bluez5_utils.hash
index 9467647592..45952e60f1 100644
--- a/package/bluez5_utils/bluez5_utils.hash
+++ b/package/bluez5_utils/bluez5_utils.hash
@@ -1,5 +1,5 @@ 
 # From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc:
-sha256  39fea64b590c9492984a0c27a89fc203e1cdc74866086efb8f4698677ab2b574  bluez-5.66.tar.xz
+sha256  fc505e6445cb579a55cacee6821fe70d633921522043d322b696de0a175ff933  bluez-5.68.tar.xz
 # Locally computed
 sha256  b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259  COPYING
 sha256  ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5  COPYING.LIB
diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk
index 37a2e79a7a..1e87041610 100644
--- a/package/bluez5_utils/bluez5_utils.mk
+++ b/package/bluez5_utils/bluez5_utils.mk
@@ -5,7 +5,7 @@ 
 ################################################################################
 
 # Keep the version and patches in sync with bluez5_utils-headers
-BLUEZ5_UTILS_VERSION = 5.66
+BLUEZ5_UTILS_VERSION = 5.68
 BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz
 BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth
 BLUEZ5_UTILS_INSTALL_STAGING = YES