diff --git a/0001-Fix-crash-after-pair-command.patch b/0001-Fix-crash-after-pair-command.patch deleted file mode 100644 index 7c09b0b92e3dfca6e2a33b5aff0c45dc257a7a0c..0000000000000000000000000000000000000000 --- a/0001-Fix-crash-after-pair-command.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 60d60166e4bfae8555fb671e5a99952586cc6b56 Mon Sep 17 00:00:00 2001 -From: Vinit Mehta -Date: 2023-12-19 11:58:01 +0530 -Subject: [PATCH] Fix crash after pair command - -After pair command, if the user doesn't provide any input on bluetoothctl -CLI interface after receiving the prompt(yes/no) below crash is observed: - -dbus[782]: arguments to dbus_message_get_no_reply() were incorrect, -assertion "message != NULL" failed in file -/usr/src/debug/dbus/1.14.10-r0/dbus/dbus-message.c line 3250. -This is normally a bug in some application using the D-Bus library. -/usr/lib/libc.so.6(+0x27534) [0xffffa1b67534] -/usr/lib/libc.so.6(__libc_start_main+0x9c) [0xffffa1b6760c] -bluetoothctl(+0x188f0) [0xaaaac9c088f0] -Aborted (core dumped) ---- - client/agent.c | 15 +++++++++------ - client/mgmt.c | 12 +++++++++--- - 2 files changed, 18 insertions(+), 9 deletions(-) - -diff --git a/client/agent.c b/client/agent.c -index 35b4041..ff5e57f 100644 ---- a/client/agent.c -+++ b/client/agent.c -@@ -77,14 +77,17 @@ static void confirm_response(const char *input, void *user_data) - { - DBusConnection *conn = user_data; - -- if (!strcmp(input, "yes")) -- g_dbus_send_reply(conn, pending_message, DBUS_TYPE_INVALID); -- else if (!strcmp(input, "no")) -- g_dbus_send_error(conn, pending_message, -+ if (pending_message != NULL) { -+ if (!strcmp(input, "yes")) -+ g_dbus_send_reply(conn, pending_message, -+ DBUS_TYPE_INVALID); -+ else if (!strcmp(input, "no")) -+ g_dbus_send_error(conn, pending_message, - "org.bluez.Error.Rejected", NULL); -- else -- g_dbus_send_error(conn, pending_message, -+ else -+ g_dbus_send_error(conn, pending_message, - "org.bluez.Error.Canceled", NULL); -+ } - } - - static void agent_release(DBusConnection *conn) -diff --git a/client/mgmt.c b/client/mgmt.c -index 947d8fc..e9ebb3d 100644 ---- a/client/mgmt.c -+++ b/client/mgmt.c -@@ -849,10 +849,16 @@ static void prompt_input(const char *input, void *user_data) - &prompt.addr); - break; - case MGMT_EV_USER_CONFIRM_REQUEST: -- if (input[0] == 'y' || input[0] == 'Y') -- mgmt_confirm_reply(prompt.index, &prompt.addr); -- else -+ if (len) { -+ if (input[0] == 'y' || input[0] == 'Y') -+ mgmt_confirm_reply(prompt.index, &prompt.addr); -+ else -+ mgmt_confirm_neg_reply(prompt.index, -+ &prompt.addr); -+ } else { - mgmt_confirm_neg_reply(prompt.index, &prompt.addr); -+ bt_shell_set_prompt(PROMPT_ON); -+ } - break; - } - } --- -2.33.0 - diff --git a/bluez-5.71.tar.xz b/bluez-5.71.tar.xz deleted file mode 100644 index 5554c90a1f03b6bbcc780784dc84e50d31a84c75..0000000000000000000000000000000000000000 Binary files a/bluez-5.71.tar.xz and /dev/null differ diff --git a/bluez-5.76.tar.xz b/bluez-5.76.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..a4b7c06e0fe52ec5528d9690a1ab7eb3027000c2 Binary files /dev/null and b/bluez-5.76.tar.xz differ diff --git a/bluez.spec b/bluez.spec index 60c07e27c976b3448100bf7199aac92687428c23..8298441c89b2983692fbd6b3f5384ac02d4a71b0 100644 --- a/bluez.spec +++ b/bluez.spec @@ -1,7 +1,7 @@ Name: bluez Summary: Bluetooth utilities -Version: 5.71 -Release: 3 +Version: 5.76 +Release: 1 License: GPLv2+ URL: http://www.bluez.org/ Source0: http://www.kernel.org/pub/linux/bluetooth/bluez-%{version}.tar.xz @@ -17,8 +17,7 @@ Patch6000: backport-bluez-disable-test-mesh-crypto.patch %ifarch sw_64 Patch6013: bluez-5.54-sw.patch %endif -Patch7000: 0001-Fix-crash-after-pair-command.patch -Patch7001: Fix-memory-leak.patch +Patch7000: Fix-memory-leak.patch BuildRequires: dbus-devel >= 1.6 libell-devel >= 0.28 autoconf BuildRequires: glib2-devel libical-devel readline-devel @@ -98,6 +97,9 @@ install -d %{buildroot}/%{_libdir}/bluetooth/ # Copy bluetooth config file install -D -p -m0644 src/main.conf %{buildroot}/etc/bluetooth/main.conf install -D -p -m0644 mesh/mesh-main.conf %{buildroot}/etc/bluetooth/mesh-main.conf +install -D -p -m0644 profiles/input/input.conf %${buildroot}/etc/bluetooth/input.conf +install -D -p -m0644 profiles/network/network.conf %${buildroot}/etc/bluetooth/network.conf + # Setup auto enable sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' ${RPM_BUILD_ROOT}/%{_sysconfdir}/bluetooth/main.conf @@ -132,6 +134,8 @@ make check %doc AUTHORS ChangeLog %license COPYING %config %{_sysconfdir}/bluetooth/main.conf +%config %{_sysconfdir}/bluetooth/input.conf +%config %{_sysconfdir}/bluetooth/network.conf %config %{_sysconfdir}/bluetooth/mesh-main.conf %{_datadir}/dbus-1/system.d/bluetooth.conf %{_datadir}/dbus-1/system.d/bluetooth-mesh.conf @@ -148,6 +152,7 @@ make check %{_unitdir}/bluetooth-mesh.service %{_datadir}/zsh/site-functions/_bluetoothctl %{_datadir}/dbus-1/services/org.bluez.obex.service +%{_userunitdir}/dbus-org.bluez.obex.service %{_datadir}/dbus-1/system-services/org.bluez.service %{_datadir}/dbus-1/system-services/org.bluez.mesh.service %{_userunitdir}/obex.service @@ -176,6 +181,9 @@ make check %{_mandir}/man8/* %changelog +* Thu Jul 11 2024 dillon chen - 5.76-1 +- update to 5.76 + * Tue Jun 4 2024 xuchenchen - 5.71-3 - sync patches from community, shared/csip: Fix memory leak