diff --git a/5.83-fixes.patch b/5.83-fixes.patch new file mode 100644 index 0000000..4df039f --- /dev/null +++ b/5.83-fixes.patch @@ -0,0 +1,174 @@ +From a3a1298c0f4e2387694ad7ecd952cbd0a0b82c83 Mon Sep 17 00:00:00 2001 +From: Luiz Augusto von Dentz +Date: Thu, 3 Jul 2025 13:30:22 -0400 +Subject: [PATCH 1/2] shared/shell: Fix not calling pre_run for main menu + +When calling bt_shell_run the main menu pre_run was not being called +which cause tools with just one menu to not work as intended. + +Fixes: https://github.com/bluez/bluez/issues/1319 +--- + src/shared/shell.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/shared/shell.c b/src/shared/shell.c +index 3e5959fc1868..c69748594955 100644 +--- a/src/shared/shell.c ++++ b/src/shared/shell.c +@@ -1449,6 +1449,9 @@ int bt_shell_run(void) + int status; + const struct queue_entry *submenu; + ++ if (data.menu && data.menu->pre_run) ++ data.menu->pre_run(data.menu); ++ + for (submenu = queue_get_entries(data.submenus); submenu; + submenu = submenu->next) { + struct bt_shell_menu *menu = submenu->data; +-- +2.50.1 + + +From a7ce88a861a0a26b50987ff455f0bb61379aa89c Mon Sep 17 00:00:00 2001 +From: Luiz Augusto von Dentz +Date: Mon, 7 Jul 2025 09:39:43 -0400 +Subject: [PATCH 2/2] shared/shell: Fix not running pre_run on + MODE_NON_INTERACTIVE + +If a command is given to be run in non-interactive mode the code would +not attempt to execute .pre_run first since some (sub)menus requires that +in order to properly initialize things. + +Fixes: https://github.com/bluez/bluez/issues/1394 +Fixes: https://github.com/bluez/bluez/issues/1317 +--- + src/shared/shell.c | 33 +++++++++++++++++++++++---------- + 1 file changed, 23 insertions(+), 10 deletions(-) + +diff --git a/src/shared/shell.c b/src/shared/shell.c +index c69748594955..694ddc0007f5 100644 +--- a/src/shared/shell.c ++++ b/src/shared/shell.c +@@ -423,7 +423,8 @@ static void cmd_script(int argc, char *argv[]) + return bt_shell_noninteractive_quit(EXIT_SUCCESS); + } + +-static const struct bt_shell_menu_entry default_menu[] = { ++static const struct bt_shell_menu default_menu = { ++ .entries = { + { "back", NULL, cmd_back, "Return to main menu", NULL, + NULL, cmd_back_exists }, + { "menu", "", cmd_menu, "Select submenu", +@@ -437,7 +438,7 @@ static const struct bt_shell_menu_entry default_menu[] = { + { "export", NULL, cmd_export, + "Print environment variables" }, + { "script", "", cmd_script, "Run script" }, +- { } ++ {} }, + }; + + static void shell_print_help(void) +@@ -480,7 +481,7 @@ static void shell_print_menu(void) + print_menu(entry->cmd, entry->arg ? : "", entry->desc ? : ""); + } + +- for (entry = default_menu; entry->cmd; entry++) { ++ for (entry = default_menu.entries; entry->cmd; entry++) { + if (entry->exists && !entry->exists(data.menu)) + continue; + +@@ -495,7 +496,7 @@ static void shell_print_menu_zsh_complete(void) + for (entry = data.menu->entries; entry->cmd; entry++) + printf("%s:%s\n", entry->cmd, entry->desc ? : ""); + +- for (entry = default_menu; entry->cmd; entry++) { ++ for (entry = default_menu.entries; entry->cmd; entry++) { + if (entry->exists && !entry->exists(data.menu)) + continue; + +@@ -627,9 +628,11 @@ fail: + return -EINVAL; + } + +-static int menu_exec(const struct bt_shell_menu_entry *entry, ++static int menu_exec(const struct bt_shell_menu *menu, + int argc, char *argv[]) + { ++ const struct bt_shell_menu_entry *entry = menu->entries; ++ + for (; entry->cmd; entry++) { + if (strcmp(argv[0], entry->cmd)) + continue; +@@ -642,6 +645,9 @@ static int menu_exec(const struct bt_shell_menu_entry *entry, + if (data.menu == data.main && !strcmp(entry->cmd, "back")) + continue; + ++ if (data.mode == MODE_NON_INTERACTIVE && menu->pre_run) ++ menu->pre_run(menu); ++ + return cmd_exec(entry, argc, argv); + } + +@@ -673,7 +679,7 @@ static int submenu_exec(int argc, char *argv[]) + memmove(argv[0], argv[0] + len + 1, tlen - len - 1); + memset(argv[0] + tlen - len - 1, 0, len + 1); + +- return menu_exec(submenu->entries, argc, argv); ++ return menu_exec(submenu, argc, argv); + } + + static int shell_exec(int argc, char *argv[]) +@@ -686,9 +692,9 @@ static int shell_exec(int argc, char *argv[]) + if (!argsisutf8(argc, argv)) + return -EINVAL; + +- err = menu_exec(default_menu, argc, argv); ++ err = menu_exec(&default_menu, argc, argv); + if (err == -ENOENT) { +- err = menu_exec(data.menu->entries, argc, argv); ++ err = menu_exec(data.menu, argc, argv); + if (err == -ENOENT) { + err = submenu_exec(argc, argv); + if (err == -ENOENT) { +@@ -980,7 +986,7 @@ static char *cmd_generator(const char *text, int state) + } + + if (default_menu_enabled) { +- cmd = find_cmd(text, default_menu, &index); ++ cmd = find_cmd(text, default_menu.entries, &index); + if (cmd) { + return cmd; + } else { +@@ -1171,7 +1177,7 @@ static char **shell_completion(const char *text, int start, int end) + if (wordexp(rl_line_buffer, &w, WRDE_NOCMD)) + return NULL; + +- matches = menu_completion(default_menu, text, w.we_wordc, ++ matches = menu_completion(default_menu.entries, text, w.we_wordc, + w.we_wordv[0]); + if (!matches) { + matches = menu_completion(data.menu->entries, text, +@@ -1449,6 +1455,12 @@ int bt_shell_run(void) + int status; + const struct queue_entry *submenu; + ++ /* Check if on non-interactive mode skip pre-run since that is on-demand ++ * by shell_exec() only for the menu in use. ++ */ ++ if (data.mode == MODE_NON_INTERACTIVE) ++ goto done; ++ + if (data.menu && data.menu->pre_run) + data.menu->pre_run(data.menu); + +@@ -1460,6 +1472,7 @@ int bt_shell_run(void) + menu->pre_run(menu); + } + ++done: + status = mainloop_run_with_signal(signal_callback, NULL); + + bt_shell_cleanup(); +-- +2.50.1 + diff --git a/bluez.spec b/bluez.spec index 866024a..14794eb 100644 --- a/bluez.spec +++ b/bluez.spec @@ -6,7 +6,7 @@ Name: bluez Version: 5.83 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Bluetooth utilities License: GPLv2+ URL: http://www.bluez.org/ @@ -18,6 +18,8 @@ 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 +# Upstream fixes +Patch3: 5.83-fixes.patch BuildRequires: dbus-devel >= 1.6 BuildRequires: glib2-devel @@ -336,6 +338,10 @@ install emulator/btvirt ${RPM_BUILD_ROOT}/%{_libexecdir}/bluetooth/ %{_userunitdir}/obex.service %changelog +* Mon Aug 18 2025 Bastien Nocera - 5.83-1 +- Fix problem with menu handling + Resolves: RHEL-103966 + * Fri Jun 13 2025 Bastien Nocera - 5.83-1 - Update to 5.83 Resolves: RHEL-94819