Update to 5.83

Resolves: RHEL-94819
  Resolves: RHEL-56073
  Resolves: RHEL-1924
  Resolves: RHEL-77151
This commit is contained in:
Bastien Nocera 2025-06-13 10:10:52 +02:00
parent 574ac9e29b
commit 3eacd708e0
4 changed files with 24 additions and 88 deletions

View File

@ -5,8 +5,8 @@
%endif
Name: bluez
Version: 5.72
Release: 4%{?dist}
Version: 5.83
Release: 1%{?dist}
Summary: Bluetooth utilities
License: GPLv2+
URL: http://www.bluez.org/
@ -18,9 +18,6 @@ Source1: bluez.gitignore
Patch1: 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
# https://patchwork.kernel.org/project/bluetooth/patch/20240214155019.325715-1-hadess@hadess.net/
Patch2: 0001-Add-missing-mesh-gatt-JSON-files.patch
# https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=fdcde2ce2112df852ab3df6e49b158621177f946
# https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=252883241228f3149566f119336ce2c49a8d861e
Patch3: plugin_init-startup-warnings.patch
BuildRequires: dbus-devel >= 1.6
BuildRequires: glib2-devel
@ -239,6 +236,8 @@ install emulator/btvirt ${RPM_BUILD_ROOT}/%{_libexecdir}/bluetooth/
# https://github.com/bluez/bluez/issues/329#issuecomment-1102459104
%attr(0555, root, root) %dir %{_sysconfdir}/bluetooth
%config %{_sysconfdir}/bluetooth/main.conf
%config(noreplace) %{_sysconfdir}/bluetooth/input.conf
%config(noreplace) %{_sysconfdir}/bluetooth/network.conf
%{_bindir}/avinfo
%{_bindir}/bluemoon
%{_bindir}/bluetoothctl
@ -262,6 +261,7 @@ install emulator/btvirt ${RPM_BUILD_ROOT}/%{_libexecdir}/bluetooth/
%{_datadir}/dbus-1/system-services/org.bluez.service
%{_datadir}/dbus-1/system.d/bluetooth.conf
%{_unitdir}/bluetooth.service
%{_userunitdir}/mpris-proxy.service
%{_datadir}/zsh/site-functions/_bluetoothctl
%if %{with deprecated}
@ -298,6 +298,11 @@ install emulator/btvirt ${RPM_BUILD_ROOT}/%{_libexecdir}/bluetooth/
%{_mandir}/man1/isotest.1.*
%{_mandir}/man1/rctest.1.*
%{_mandir}/man5/org.bluez.*.5.*
%{_mandir}/man7/hci.7.*
%{_mandir}/man7/l2cap.7.*
%{_mandir}/man7/mgmt.7.*
%{_mandir}/man7/rfcomm.7.*
%{_mandir}/man7/sco.7.*
%{_libdir}/pkgconfig/bluez.pc
%dir %{_libexecdir}/bluetooth
%{_libexecdir}/bluetooth/btvirt
@ -326,9 +331,17 @@ install emulator/btvirt ${RPM_BUILD_ROOT}/%{_libexecdir}/bluetooth/
%files obexd
%{_libexecdir}/bluetooth/obexd
%{_datadir}/dbus-1/services/org.bluez.obex.service
/usr/lib/systemd/user/dbus-org.bluez.obex.service
%{_datadir}/dbus-1/system.d/obex.conf
%{_userunitdir}/obex.service
%changelog
* Fri Jun 13 2025 Bastien Nocera <bnocera@redhat.com> - 5.83-1
- Update to 5.83
Resolves: RHEL-94819
Resolves: RHEL-56073
Resolves: RHEL-1924
* Fri Jan 24 2025 Bastien Nocera <bnocera@redhat.com> - 5.72-4
- Fix plugin_init() startup warnings
Related: RHEL-68934

View File

@ -1,81 +0,0 @@
From 42043c35ac62dcf3b880974b3d0fb762583733ff Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Wed, 27 Nov 2024 12:49:52 +0100
Subject: [PATCH 1/2] profiles/audio: Quiet plug-in warnings
A normal daemon start should not throw warnings on a system in the
default configuration. Quiet the plug-in warnings that require
experimental features to be enabled. They will still appear in the debug
output.
bluetoothd[896]: profiles/audio/micp.c:micp_init() D-Bus experimental not enabled
---
profiles/audio/media.c | 2 +-
profiles/audio/micp.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/profiles/audio/media.c b/profiles/audio/media.c
index 1faa1c28969f..efd1d667c270 100644
--- a/profiles/audio/media.c
+++ b/profiles/audio/media.c
@@ -1214,7 +1214,7 @@ static bool endpoint_init_pac(struct media_endpoint *endpoint, uint8_t type,
char *name;
if (!(g_dbus_get_flags() & G_DBUS_FLAG_ENABLE_EXPERIMENTAL)) {
- warn("D-Bus experimental not enabled");
+ DBG("D-Bus experimental not enabled");
*err = -ENOTSUP;
return false;
}
diff --git a/profiles/audio/micp.c b/profiles/audio/micp.c
index 452027c75da2..3f0845dcb328 100644
--- a/profiles/audio/micp.c
+++ b/profiles/audio/micp.c
@@ -318,7 +318,7 @@ static unsigned int micp_id;
static int micp_init(void)
{
if (!(g_dbus_get_flags() & G_DBUS_FLAG_ENABLE_EXPERIMENTAL)) {
- warn("D-Bus experimental not enabled");
+ DBG("D-Bus experimental not enabled");
return -ENOTSUP;
}
--
2.48.1
From bca2b4b7d69df7158dc1024c4bf7510ff771f189 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Wed, 27 Nov 2024 12:49:53 +0100
Subject: [PATCH 2/2] plugin: Quiet start-up warnings
It's not an error for a plug-in not to start if the hardware doesn't
support it. Quiet the warnings that require specific hardware.
The messages will still appear in the debug output.
bluetoothd[896]: src/plugin.c:plugin_init() System does not support csip plugin
bluetoothd[896]: src/plugin.c:plugin_init() System does not support micp plugin
bluetoothd[896]: src/plugin.c:plugin_init() System does not support vcp plugin
bluetoothd[896]: src/plugin.c:plugin_init() System does not support mcp plugin
bluetoothd[896]: src/plugin.c:plugin_init() System does not support bass plugin
bluetoothd[896]: src/plugin.c:plugin_init() System does not support bap plugin
---
src/plugin.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plugin.c b/src/plugin.c
index 80990f8c3c7e..42ed75ab31f3 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -187,7 +187,7 @@ start:
err = plugin->desc->init();
if (err < 0) {
if (err == -ENOSYS || err == -ENOTSUP)
- warn("System does not support %s plugin",
+ DBG("System does not support %s plugin",
plugin->desc->name);
else
error("Failed to init %s plugin",
--
2.48.1

5
rpminspect.yaml Normal file
View File

@ -0,0 +1,5 @@
---
badfuncs:
allowed:
/usr/bin/btmon:
- inet_addr

View File

@ -1,2 +1 @@
SHA512 (bluez-5.64.tar.xz) = f11f9974b29c5c6fce3890d7e42425c1cb02e42c1b8f49c5cc4b249234e67b64317d0e5e82721e2fbf1b53269c8569a9c869d59ce42b5e927f6622f0753e53cd
SHA512 (bluez-5.72.tar.xz) = 1c6560f60ac0654d7c25ed8ab2f0f3a3a9ca8688ee28e1c476ffc7ae38737e739d27bbb88789c86b03fc600a8a68496d90a7b395ec393dd2bbf69be62357991a
SHA512 (bluez-5.83.tar.xz) = d2ab04e5d2458249964305c991c5d0c1678d24927019e5b6e10d2f8e1350e3f7d7c783fd3770874dc621a699171b68de6678bead1dcb6e6e73c9863248f26aaa