From 5d557f4f13ff6b3a1d2c5022ce20bdec58a8dd83 Mon Sep 17 00:00:00 2001 From: Ludwig Schwardt Date: Fri, 18 Oct 2024 14:08:17 +0200 Subject: [PATCH] Build against readline 8.2 (patch-level 13) The latest readline patches where released on 2 August 2024. Bump the package version number to an alpha release. --- rl/build.sh | 3 + rl/readline82-011 | 75 +++++++++++++++ rl/readline82-012 | 93 ++++++++++++++++++ rl/readline82-013 | 234 ++++++++++++++++++++++++++++++++++++++++++++++ setup.py | 2 +- 5 files changed, 406 insertions(+), 1 deletion(-) create mode 100644 rl/readline82-011 create mode 100644 rl/readline82-012 create mode 100644 rl/readline82-013 diff --git a/rl/build.sh b/rl/build.sh index 1dfe05a..b0889b2 100755 --- a/rl/build.sh +++ b/rl/build.sh @@ -58,6 +58,9 @@ patch -p0 < ../readline82-007 patch -p0 < ../readline82-008 patch -p0 < ../readline82-009 patch -p0 < ../readline82-010 +patch -p0 < ../readline82-011 +patch -p0 < ../readline82-012 +patch -p0 < ../readline82-013 # Force compiler to CC/cc in the case of Darwin ./configure CPPFLAGS='-DNEED_EXTERN_PC -fPIC' $cc_override # Only the static libraries are required diff --git a/rl/readline82-011 b/rl/readline82-011 new file mode 100644 index 0000000..3ad7a8f --- /dev/null +++ b/rl/readline82-011 @@ -0,0 +1,75 @@ + READLINE PATCH REPORT + ===================== + +Readline-Release: 8.2 +Patch-ID: readline82-011 + +Bug-Reported-by: Grisha Levit +Bug-Reference-ID: +Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2024-02/msg00075.html + +Bug-Description: + +Patch (apply with `patch -p0'): + +Some systems (e.g., macOS) send signals early on in interactive initialization, +so readline should retry a failed open of the init file. + +*** ../readline-8.2-patched/bind.c Wed Feb 9 11:02:22 2022 +--- bind.c Tue Apr 23 15:07:13 2024 +*************** +*** 979,987 **** + int i, file; + +! file = -1; +! if (((file = open (filename, O_RDONLY, 0666)) < 0) || (fstat (file, &finfo) < 0)) + { + if (file >= 0) + close (file); + return ((char *)NULL); + } +--- 969,986 ---- + int i, file; + +! file = open (filename, O_RDONLY, 0666); +! /* If the open is interrupted, retry once */ +! if (file < 0 && errno == EINTR) + { ++ RL_CHECK_SIGNALS (); ++ file = open (filename, O_RDONLY, 0666); ++ } ++ ++ if ((file < 0) || (fstat (file, &finfo) < 0)) ++ { ++ i = errno; + if (file >= 0) + close (file); ++ errno = i; + return ((char *)NULL); + } +*************** +*** 992,999 **** +--- 991,1001 ---- + if (file_size != finfo.st_size || file_size + 1 < file_size) + { ++ i = errno; + if (file >= 0) + close (file); + #if defined (EFBIG) + errno = EFBIG; ++ #else ++ errno = i; + #endif + return ((char *)NULL); + +*** ../readline-8.2/patchlevel 2013-11-15 08:11:11.000000000 -0500 +--- patchlevel 2014-03-21 08:28:40.000000000 -0400 +*************** +*** 1,3 **** + # Do not edit -- exists only for use by patch + +! 10 +--- 1,3 ---- + # Do not edit -- exists only for use by patch + +! 11 diff --git a/rl/readline82-012 b/rl/readline82-012 new file mode 100644 index 0000000..cbcb4cd --- /dev/null +++ b/rl/readline82-012 @@ -0,0 +1,93 @@ + READLINE PATCH REPORT + ===================== + +Readline-Release: 8.2 +Patch-ID: readline82-012 + +Bug-Reported-by: Grisha Levit +Bug-Reference-ID: +Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2023-11/msg00019.html + +Bug-Description: + +If a user happens to bind do-lowercase-version to something that isn't a +capital letter, so _rl_to_lower doesn't change anything and the result is +still bound to do-lowercase-version, readline can recurse infinitely. + +Patch (apply with `patch -p0'): + +*** ../readline-8.2-patched/readline.c Thu Aug 11 18:35:37 2022 +--- readline.c Fri Feb 2 12:05:36 2024 +*************** +*** 900,905 **** + /* Special case rl_do_lowercase_version (). */ + if (func == rl_do_lowercase_version) +! /* Should we do anything special if key == ANYOTHERKEY? */ +! return (_rl_dispatch (_rl_to_lower ((unsigned char)key), map)); + + rl_executing_keymap = map; +--- 912,926 ---- + /* Special case rl_do_lowercase_version (). */ + if (func == rl_do_lowercase_version) +! { +! /* Should we do anything special if key == ANYOTHERKEY? */ +! newkey = _rl_to_lower ((unsigned char)key); +! if (newkey != key) +! return (_rl_dispatch (newkey, map)); +! else +! { +! rl_ding (); /* gentle failure */ +! return 0; +! } +! } + + rl_executing_keymap = map; +*************** +*** 1110,1114 **** + func = m[ANYOTHERKEY].function; + if (type == ISFUNC && func == rl_do_lowercase_version) +! r = _rl_dispatch (_rl_to_lower ((unsigned char)key), map); + else if (type == ISFUNC) + { +--- 1131,1139 ---- + func = m[ANYOTHERKEY].function; + if (type == ISFUNC && func == rl_do_lowercase_version) +! { +! int newkey = _rl_to_lower ((unsigned char)key); +! /* check that there is actually a lowercase version to avoid infinite recursion */ +! r = (newkey != key) ? _rl_dispatch (newkey, map) : 1; +! } + else if (type == ISFUNC) + { + +*** ../readline-8.2-patched/isearch.c Thu Aug 11 18:35:37 2022 +--- isearch.c Fri Feb 2 12:05:36 2024 +*************** +*** 429,433 **** + f = cxt->keymap[c].function; + if (f == rl_do_lowercase_version) +! f = cxt->keymap[_rl_to_lower (c)].function; + } + +--- 431,439 ---- + f = cxt->keymap[c].function; + if (f == rl_do_lowercase_version) +! { +! f = cxt->keymap[_rl_to_lower (c)].function; +! if (f == rl_do_lowercase_version) +! f = rl_insert; +! } + } + + +*** ../readline-8.2/patchlevel 2013-11-15 08:11:11.000000000 -0500 +--- patchlevel 2014-03-21 08:28:40.000000000 -0400 +*************** +*** 1,3 **** + # Do not edit -- exists only for use by patch + +! 11 +--- 1,3 ---- + # Do not edit -- exists only for use by patch + +! 12 diff --git a/rl/readline82-013 b/rl/readline82-013 new file mode 100644 index 0000000..cb4164f --- /dev/null +++ b/rl/readline82-013 @@ -0,0 +1,234 @@ + READLINE PATCH REPORT + ===================== + +Readline-Release: 8.2 +Patch-ID: readline82-013 + +Bug-Reported-by: Grisha Levit +Bug-Reference-ID: