From eb20a1b3983e2932129f1e334d5684ec5fd82f1f Mon Sep 17 00:00:00 2001
From: Bastien Nocera <bnocera@redhat.com>
Date: Mon, 28 Apr 2025 11:18:28 +0200
Subject: [PATCH] Fix startup warnings

Resolves: RHEL-88703
---
 bluez.spec             |  8 ++++-
 startup-warnings.patch | 81 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 88 insertions(+), 1 deletion(-)
 create mode 100644 startup-warnings.patch

diff --git a/bluez.spec b/bluez.spec
index 840aacd..966ecf2 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -6,7 +6,7 @@
 
 Name:    bluez
 Version: 5.77
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: Bluetooth utilities
 License: GPL-2.0-or-later
 URL:     http://www.bluez.org/
@@ -23,6 +23,8 @@ Patch2: 0001-shared-shell-Free-memory-allocated-by-wordexp.patch
 Patch3: static-analysis-issues-6.patch
 # Coverity downstream patches
 Patch4: coverity-workarounds.patch
+# https://patchwork.kernel.org/project/bluetooth/list/?series=912795&state=*
+Patch5: startup-warnings.patch
 
 BuildRequires: dbus-devel >= 1.6
 BuildRequires: glib2-devel
@@ -339,6 +341,10 @@ install emulator/btvirt ${RPM_BUILD_ROOT}/%{_libexecdir}/bluetooth/
 %{_userunitdir}/obex.service
 
 %changelog
+* Mon Apr 28 2025 Bastien Nocera <bnocera@redhat.com> - 5.77-8
+- Fix startup warnings
+- Resolves: RHEL-88703
+
 * Tue Feb 11 2025 Bastien Nocera <bnocera@redhat.com> - 5.77-7
 - Add OSCI tests
 - Resolves: RHEL-77171
diff --git a/startup-warnings.patch b/startup-warnings.patch
new file mode 100644
index 0000000..6092680
--- /dev/null
+++ b/startup-warnings.patch
@@ -0,0 +1,81 @@
+From fdcde2ce2112df852ab3df6e49b158621177f946 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 746e538fcacd..062475e56c49 100644
+--- a/profiles/audio/media.c
++++ b/profiles/audio/media.c
+@@ -1249,7 +1249,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.49.0
+
+
+From 252883241228f3149566f119336ce2c49a8d861e 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 e6d05be4ce08..00d3d7b6a0b5 100644
+--- a/src/plugin.c
++++ b/src/plugin.c
+@@ -50,7 +50,7 @@ static int init_plugin(const struct bluetooth_plugin_desc *desc)
+ 	err = desc->init();
+ 	if (err < 0) {
+ 		if (err == -ENOSYS || err == -ENOTSUP)
+-			warn("System does not support %s plugin",
++			DBG("System does not support %s plugin",
+ 						desc->name);
+ 		else
+ 			error("Failed to init %s plugin",
+-- 
+2.49.0
+