summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJoão Henrique Ferreira de Freitas <joaohf@gmail.com>2025-11-03 15:14:09 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-11-06 09:45:17 +0000
commit4c92caf6224adc47ee7a31420781139b054805c0 (patch)
tree64d7db8ffdcc2fa81bca371dd28a9b76383a6896 /meta
parentec569c235dc5eabbeb9353ab1d8e0a3eeef574e1 (diff)
downloadpoky-4c92caf6224adc47ee7a31420781139b054805c0.tar.gz
readline: backport a patch to fix for caller setting rl_prompt to NULL
I've observed this issue affecting iwctl and connmanctl. Patching readline solves the issue. The original patch from [5] mixes many fixes in one commit. I've extract only what matters to solve the issues observed with connman and iwd. The final patch is the same patch sent by readline author to readline's mail list [6]. References: 1: https://gitlab.archlinux.org/archlinux/packaging/packages/readline/-/issues/1 2: https://gitlab.archlinux.org/archlinux/packaging/packages/readline/-/commit/b30636dc66fc783a091af51b049dc5240f861dd0 3: https://lists.gnu.org/archive/html/bug-readline/2025-07/msg00007.html 4: https://lore.kernel.org/connman/20251018212411.181909-1-jsbronder@cold-front.org/ 5: https://cgit.git.savannah.gnu.org/cgit/readline.git/commit/display.c?h=devel&id=488d7edc22894d30b6de7f2d4190bf7403f63ffd 6: https://lists.gnu.org/archive/html/bug-readline/2025-07/txtmA7rksnmmi.txt Fixes [YOCTO #16047] CC Paul Barker <paul@pbarker.dev> CC: Jose Quaresma <quaresma.jose@gmail.com> CC: Khem Raj <raj.khem@gmail.com> (From OE-Core rev: 8ce0359c4eade11b445bc227c42f7f1212a2d9c3) Signed-off-by: João Henrique Ferreira de Freitas <joaohf@gmail.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/readline/readline/fix-for-caller-setting-rl_prompt-to-NULL.patch40
-rw-r--r--meta/recipes-core/readline/readline_8.3.bb1
2 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-core/readline/readline/fix-for-caller-setting-rl_prompt-to-NULL.patch b/meta/recipes-core/readline/readline/fix-for-caller-setting-rl_prompt-to-NULL.patch
new file mode 100644
index 0000000000..a23e2f3bce
--- /dev/null
+++ b/meta/recipes-core/readline/readline/fix-for-caller-setting-rl_prompt-to-NULL.patch
@@ -0,0 +1,40 @@
1From a0a4c011c0c5e598c5b51cbf81d3b4501fa72e0c Mon Sep 17 00:00:00 2001
2From: Chet Ramey <chet.ramey@case.edu>
3Date: Thu, 30 Oct 2025 14:19:41 -0300
4Subject: [PATCH] fix for caller setting rl_prompt to NULL
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9The original patch came from [1, 2] and it has been integrated into
10readline git repository, commit (488d7edc22894d30b6de7f2d4190bf7403f63ffd)
11
12This patch has only the fix needed to solve the follow issues [3,4].
13
14I added the original author as this patch has been sent through readline mail
15list.
16
171: https://lists.gnu.org/archive/html/bug-readline/2025-07/msg00007.html
182: https://lists.gnu.org/archive/html/bug-readline/2025-07/txtmA7rksnmmi.txt
193: https://lore.kernel.org/connman/20251018212411.181909-1-jsbronder@cold-front.org/
204: https://gitlab.archlinux.org/archlinux/packaging/packages/readline/-/issues/1
21
22Upstream-Status: Backport [https://cgit.git.savannah.gnu.org/cgit/readline.git/commit/display.c?h=devel&id=488d7edc22894d30b6de7f2d4190bf7403f63ffd]
23Signed-off-by: João Henrique Ferreira de Freitas <joaohf@gmail.com>
24---
25 display.c | 2 +-
26 1 file changed, 1 insertion(+), 1 deletion(-)
27
28diff --git a/display.c b/display.c
29index 9aa8c7b..edb525d 100644
30--- a/display.c
31+++ b/display.c
32@@ -783,7 +783,7 @@ _rl_optimize_redisplay (void)
33
34 /* Useful shorthand used by rl_redisplay, update_line, rl_move_cursor_relative */
35 #define INVIS_FIRST() (local_prompt_invis_chars[0])
36-#define WRAP_OFFSET(line, offset) ((line <= prompt_last_screen_line) ? local_prompt_invis_chars[line] : 0)
37+#define WRAP_OFFSET(line, offset) ((line <= prompt_last_screen_line && local_prompt_invis_chars) ? local_prompt_invis_chars[line] : 0)
38
39 #define W_OFFSET(line, offset) ((line) == 0 ? offset : 0)
40 #define VIS_LLEN(l) ((l) > _rl_vis_botlin ? 0 : (vis_lbreaks[l+1] - vis_lbreaks[l]))
diff --git a/meta/recipes-core/readline/readline_8.3.bb b/meta/recipes-core/readline/readline_8.3.bb
index a2f23eb353..b425b78e1f 100644
--- a/meta/recipes-core/readline/readline_8.3.bb
+++ b/meta/recipes-core/readline/readline_8.3.bb
@@ -2,6 +2,7 @@ require readline.inc
2 2
3SRC_URI += "file://norpath.patch \ 3SRC_URI += "file://norpath.patch \
4 file://fix-for-readline-event-hook.patch \ 4 file://fix-for-readline-event-hook.patch \
5 file://fix-for-caller-setting-rl_prompt-to-NULL.patch \
5 " 6 "
6 7
7SRC_URI[archive.sha256sum] = "fe5383204467828cd495ee8d1d3c037a7eba1389c22bc6a041f627976f9061cc" 8SRC_URI[archive.sha256sum] = "fe5383204467828cd495ee8d1d3c037a7eba1389c22bc6a041f627976f9061cc"