update to 8.2.010 [release 8.2.010-1mamba;Fri Feb 23 2024]
This commit is contained in:
parent
3309771ee8
commit
60d847f9b3
@ -1,41 +0,0 @@
|
|||||||
diff -up readline-6.2/shlib/Makefile.in.shlib readline-6.2/shlib/Makefile.in
|
|
||||||
--- readline-6.2/shlib/Makefile.in.shlib 2010-12-28 21:56:21.000000000 +0100
|
|
||||||
+++ readline-6.2/shlib/Makefile.in 2011-02-14 17:34:38.821537496 +0100
|
|
||||||
@@ -170,7 +170,7 @@ $(SHARED_READLINE): $(SHARED_OBJ)
|
|
||||||
|
|
||||||
$(SHARED_HISTORY): $(SHARED_HISTOBJ) xmalloc.so xfree.so
|
|
||||||
$(RM) $@
|
|
||||||
- $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so xfree.so $(SHLIB_LIBS)
|
|
||||||
+ $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so xfree.so
|
|
||||||
|
|
||||||
# Since tilde.c is shared between readline and bash, make sure we compile
|
|
||||||
# it with the right flags when it's built as part of readline
|
|
||||||
diff -up readline-6.2/support/shlib-install.shlib readline-6.2/support/shlib-install
|
|
||||||
--- readline-6.2/support/shlib-install.shlib 2009-10-28 14:30:18.000000000 +0100
|
|
||||||
+++ readline-6.2/support/shlib-install 2011-02-14 17:33:07.611768164 +0100
|
|
||||||
@@ -72,7 +72,7 @@ fi
|
|
||||||
case "$host_os" in
|
|
||||||
hpux*|darwin*|macosx*|linux*)
|
|
||||||
if [ -z "$uninstall" ]; then
|
|
||||||
- chmod 555 ${INSTALLDIR}/${LIBNAME}
|
|
||||||
+ chmod 755 ${INSTALLDIR}/${LIBNAME}
|
|
||||||
fi ;;
|
|
||||||
cygwin*|mingw*)
|
|
||||||
IMPLIBNAME=`echo ${LIBNAME} \
|
|
||||||
diff -up readline-6.2/support/shobj-conf.shlib readline-6.2/support/shobj-conf
|
|
||||||
--- readline-6.2/support/shobj-conf.shlib 2009-10-28 14:20:21.000000000 +0100
|
|
||||||
+++ readline-6.2/support/shobj-conf 2011-02-14 17:33:07.612767986 +0100
|
|
||||||
@@ -112,10 +112,11 @@ sunos5*|solaris2*)
|
|
||||||
linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo)
|
|
||||||
SHOBJ_CFLAGS=-fPIC
|
|
||||||
SHOBJ_LD='${CC}'
|
|
||||||
- SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
|
|
||||||
+ SHOBJ_LDFLAGS='$(CFLAGS) -shared -Wl,-soname,$@'
|
|
||||||
|
|
||||||
- SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
|
|
||||||
+ SHLIB_XLDFLAGS='-Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
|
|
||||||
SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
|
|
||||||
+ SHLIB_LIBS='-ltermcap'
|
|
||||||
;;
|
|
||||||
|
|
||||||
freebsd2*)
|
|
||||||
612
libreadline-8.2.010-patchset.patch
Normal file
612
libreadline-8.2.010-patchset.patch
Normal file
@ -0,0 +1,612 @@
|
|||||||
|
READLINE PATCH REPORT
|
||||||
|
=====================
|
||||||
|
|
||||||
|
Readline-Release: 8.2
|
||||||
|
Patch-ID: readline82-001
|
||||||
|
|
||||||
|
Bug-Reported-by: Kan-Ru Chen <koster@debian.org>
|
||||||
|
Bug-Reference-ID:
|
||||||
|
Bug-Reference-URL: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1021109
|
||||||
|
|
||||||
|
Bug-Description:
|
||||||
|
|
||||||
|
Starting a readline application with an invalid locale specification for
|
||||||
|
LC_ALL/LANG/LC_CTYPE can cause it crash on the first call to readline.
|
||||||
|
|
||||||
|
Patch (apply with `patch -p0'):
|
||||||
|
|
||||||
|
*** ../readline-8.2-patched/nls.c 2022-08-15 09:38:51.000000000 -0400
|
||||||
|
--- nls.c 2022-10-05 09:23:22.000000000 -0400
|
||||||
|
***************
|
||||||
|
*** 142,145 ****
|
||||||
|
--- 142,149 ----
|
||||||
|
lspec = "";
|
||||||
|
ret = setlocale (LC_CTYPE, lspec); /* ok, since it does not change locale */
|
||||||
|
+ if (ret == 0 || *ret == 0)
|
||||||
|
+ ret = setlocale (LC_CTYPE, (char *)NULL);
|
||||||
|
+ if (ret == 0 || *ret == 0)
|
||||||
|
+ ret = RL_DEFAULT_LOCALE;
|
||||||
|
#else
|
||||||
|
ret = (lspec == 0 || *lspec == 0) ? RL_DEFAULT_LOCALE : lspec;
|
||||||
|
|
||||||
|
*** ../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
|
||||||
|
|
||||||
|
! 0
|
||||||
|
--- 1,3 ----
|
||||||
|
# Do not edit -- exists only for use by patch
|
||||||
|
|
||||||
|
! 1
|
||||||
|
READLINE PATCH REPORT
|
||||||
|
=====================
|
||||||
|
|
||||||
|
Readline-Release: 8.2
|
||||||
|
Patch-ID: readline82-002
|
||||||
|
|
||||||
|
Bug-Reported-by: srobertson@peratonlabs.com
|
||||||
|
Bug-Reference-ID:
|
||||||
|
Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2022-09/msg00049.html
|
||||||
|
|
||||||
|
Bug-Description:
|
||||||
|
|
||||||
|
It's possible for readline to try to zero out a line that's not null-
|
||||||
|
terminated, leading to a memory fault.
|
||||||
|
|
||||||
|
Patch (apply with `patch -p0'):
|
||||||
|
|
||||||
|
*** ../readline-8.2-patched/display.c 2022-04-05 10:47:31.000000000 -0400
|
||||||
|
--- display.c 2022-12-13 13:11:22.000000000 -0500
|
||||||
|
***************
|
||||||
|
*** 2684,2692 ****
|
||||||
|
|
||||||
|
if (visible_line)
|
||||||
|
! {
|
||||||
|
! temp = visible_line;
|
||||||
|
! while (*temp)
|
||||||
|
! *temp++ = '\0';
|
||||||
|
! }
|
||||||
|
rl_on_new_line ();
|
||||||
|
forced_display++;
|
||||||
|
--- 2735,2740 ----
|
||||||
|
|
||||||
|
if (visible_line)
|
||||||
|
! memset (visible_line, 0, line_size);
|
||||||
|
!
|
||||||
|
rl_on_new_line ();
|
||||||
|
forced_display++;
|
||||||
|
*** ../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
|
||||||
|
|
||||||
|
! 1
|
||||||
|
--- 1,3 ----
|
||||||
|
# Do not edit -- exists only for use by patch
|
||||||
|
|
||||||
|
! 2
|
||||||
|
READLINE PATCH REPORT
|
||||||
|
=====================
|
||||||
|
|
||||||
|
Readline-Release: 8.2
|
||||||
|
Patch-ID: readline82-003
|
||||||
|
|
||||||
|
Bug-Reported-by: Stefan Klinger <readline-gnu.org@stefan-klinger.de>
|
||||||
|
Bug-Reference-ID:
|
||||||
|
Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2023-08/msg00018.html
|
||||||
|
|
||||||
|
Bug-Description:
|
||||||
|
|
||||||
|
Patch (apply with `patch -p0'):
|
||||||
|
|
||||||
|
The custom color prefix that readline uses to color possible completions
|
||||||
|
must have a leading `.'.
|
||||||
|
|
||||||
|
*** ../readline-8.2-patched/colors.c 2021-12-08 11:38:25.000000000 -0500
|
||||||
|
--- colors.c 2023-08-28 16:40:04.000000000 -0400
|
||||||
|
***************
|
||||||
|
*** 74,78 ****
|
||||||
|
static void restore_default_color (void);
|
||||||
|
|
||||||
|
! #define RL_COLOR_PREFIX_EXTENSION "readline-colored-completion-prefix"
|
||||||
|
|
||||||
|
COLOR_EXT_TYPE *_rl_color_ext_list = 0;
|
||||||
|
--- 74,78 ----
|
||||||
|
static void restore_default_color (void);
|
||||||
|
|
||||||
|
! #define RL_COLOR_PREFIX_EXTENSION ".readline-colored-completion-prefix"
|
||||||
|
|
||||||
|
COLOR_EXT_TYPE *_rl_color_ext_list = 0;
|
||||||
|
*** ../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
|
||||||
|
|
||||||
|
! 2
|
||||||
|
--- 1,3 ----
|
||||||
|
# Do not edit -- exists only for use by patch
|
||||||
|
|
||||||
|
! 3
|
||||||
|
READLINE PATCH REPORT
|
||||||
|
=====================
|
||||||
|
|
||||||
|
Readline-Release: 8.2
|
||||||
|
Patch-ID: readline82-004
|
||||||
|
|
||||||
|
Bug-Reported-by: Henry Bent <henry.r.bent@gmail.com>
|
||||||
|
Bug-Reference-ID:
|
||||||
|
Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2022-11/msg00044.html
|
||||||
|
|
||||||
|
Bug-Description:
|
||||||
|
|
||||||
|
Patch (apply with `patch -p0'):
|
||||||
|
|
||||||
|
There are systems that supply one of select or pselect, but not both.
|
||||||
|
|
||||||
|
*** ../readline-8.2-patched/input.c 2022-04-08 15:43:24.000000000 -0400
|
||||||
|
--- input.c 2022-11-28 09:41:08.000000000 -0500
|
||||||
|
***************
|
||||||
|
*** 152,156 ****
|
||||||
|
--- 152,158 ----
|
||||||
|
int _rl_timeout_init (void);
|
||||||
|
int _rl_timeout_sigalrm_handler (void);
|
||||||
|
+ #if defined (RL_TIMEOUT_USE_SELECT)
|
||||||
|
int _rl_timeout_select (int, fd_set *, fd_set *, fd_set *, const struct timeval *, const sigset_t *);
|
||||||
|
+ #endif
|
||||||
|
|
||||||
|
static void _rl_timeout_handle (void);
|
||||||
|
***************
|
||||||
|
*** 249,253 ****
|
||||||
|
int chars_avail, k;
|
||||||
|
char input;
|
||||||
|
! #if defined(HAVE_SELECT)
|
||||||
|
fd_set readfds, exceptfds;
|
||||||
|
struct timeval timeout;
|
||||||
|
--- 251,255 ----
|
||||||
|
int chars_avail, k;
|
||||||
|
char input;
|
||||||
|
! #if defined (HAVE_PSELECT) || defined (HAVE_SELECT)
|
||||||
|
fd_set readfds, exceptfds;
|
||||||
|
struct timeval timeout;
|
||||||
|
***************
|
||||||
|
*** 806,810 ****
|
||||||
|
unsigned char c;
|
||||||
|
int fd;
|
||||||
|
! #if defined (HAVE_PSELECT)
|
||||||
|
sigset_t empty_set;
|
||||||
|
fd_set readfds;
|
||||||
|
--- 815,819 ----
|
||||||
|
unsigned char c;
|
||||||
|
int fd;
|
||||||
|
! #if defined (HAVE_PSELECT) || defined (HAVE_SELECT)
|
||||||
|
sigset_t empty_set;
|
||||||
|
fd_set readfds;
|
||||||
|
*** ../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
|
||||||
|
|
||||||
|
! 3
|
||||||
|
--- 1,3 ----
|
||||||
|
# Do not edit -- exists only for use by patch
|
||||||
|
|
||||||
|
! 4
|
||||||
|
READLINE PATCH REPORT
|
||||||
|
=====================
|
||||||
|
|
||||||
|
Readline-Release: 8.2
|
||||||
|
Patch-ID: readline82-005
|
||||||
|
|
||||||
|
Bug-Reported-by: Simon Marchi <simon.marchi@polymtl.ca>
|
||||||
|
Bug-Reference-ID:
|
||||||
|
Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2022-09/msg00005.html
|
||||||
|
|
||||||
|
Bug-Description:
|
||||||
|
|
||||||
|
If an application is using readline in callback mode, and a signal arrives
|
||||||
|
after readline checks for it in rl_callback_read_char() but before it
|
||||||
|
restores the application's signal handlers, it won't get processed until the
|
||||||
|
next time the application calls rl_callback_read_char(). Readline needs to
|
||||||
|
check for and resend any pending signals after restoring the application's
|
||||||
|
signal handlers.
|
||||||
|
|
||||||
|
Patch (apply with `patch -p0'):
|
||||||
|
|
||||||
|
*** ../readline-8.2-patched/callback.c 2022-04-29 12:02:56.000000000 -0400
|
||||||
|
--- callback.c 2022-10-11 10:59:06.000000000 -0400
|
||||||
|
***************
|
||||||
|
*** 116,120 ****
|
||||||
|
do { \
|
||||||
|
if (rl_persistent_signal_handlers == 0) \
|
||||||
|
! rl_clear_signals (); \
|
||||||
|
return; \
|
||||||
|
} while (0)
|
||||||
|
--- 116,123 ----
|
||||||
|
do { \
|
||||||
|
if (rl_persistent_signal_handlers == 0) \
|
||||||
|
! { \
|
||||||
|
! rl_clear_signals (); \
|
||||||
|
! if (_rl_caught_signal) _rl_signal_handler (_rl_caught_signal); \
|
||||||
|
! } \
|
||||||
|
return; \
|
||||||
|
} while (0)
|
||||||
|
*** ../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
|
||||||
|
|
||||||
|
! 4
|
||||||
|
--- 1,3 ----
|
||||||
|
# Do not edit -- exists only for use by patch
|
||||||
|
|
||||||
|
! 5
|
||||||
|
READLINE PATCH REPORT
|
||||||
|
=====================
|
||||||
|
|
||||||
|
Readline-Release: 8.2
|
||||||
|
Patch-ID: readline82-006
|
||||||
|
|
||||||
|
Bug-Reported-by: Tom de Vries <tdevries@suse.de>
|
||||||
|
Bug-Reference-ID:
|
||||||
|
Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2022-09/msg00001.html
|
||||||
|
|
||||||
|
Bug-Description:
|
||||||
|
|
||||||
|
This is a variant of the same issue as the one fixed by patch 5. In this
|
||||||
|
case, the signal arrives and is pending before readline calls rl_getc().
|
||||||
|
When this happens, the pending signal will be handled by the loop, but may
|
||||||
|
alter or destroy some state that the callback uses. Readline needs to treat
|
||||||
|
this case the same way it would if a signal interrupts pselect/select, so
|
||||||
|
compound operations like searches and reading numeric arguments get cleaned
|
||||||
|
up properly.
|
||||||
|
|
||||||
|
Patch (apply with `patch -p0'):
|
||||||
|
|
||||||
|
*** ../readline-8.2-patched/input.c 2022-12-22 16:15:48.000000000 -0500
|
||||||
|
--- input.c 2023-01-10 11:53:45.000000000 -0500
|
||||||
|
***************
|
||||||
|
*** 812,816 ****
|
||||||
|
rl_getc (FILE *stream)
|
||||||
|
{
|
||||||
|
! int result;
|
||||||
|
unsigned char c;
|
||||||
|
int fd;
|
||||||
|
--- 812,816 ----
|
||||||
|
rl_getc (FILE *stream)
|
||||||
|
{
|
||||||
|
! int result, ostate, osig;
|
||||||
|
unsigned char c;
|
||||||
|
int fd;
|
||||||
|
***************
|
||||||
|
*** 823,828 ****
|
||||||
|
--- 823,842 ----
|
||||||
|
while (1)
|
||||||
|
{
|
||||||
|
+ osig = _rl_caught_signal;
|
||||||
|
+ ostate = rl_readline_state;
|
||||||
|
+
|
||||||
|
RL_CHECK_SIGNALS ();
|
||||||
|
|
||||||
|
+ #if defined (READLINE_CALLBACKS)
|
||||||
|
+ /* Do signal handling post-processing here, but just in callback mode
|
||||||
|
+ for right now because the signal cleanup can change some of the
|
||||||
|
+ callback state, and we need to either let the application have a
|
||||||
|
+ chance to react or abort some current operation that gets cleaned
|
||||||
|
+ up by rl_callback_sigcleanup(). If not, we'll just run through the
|
||||||
|
+ loop again. */
|
||||||
|
+ if (osig != 0 && (ostate & RL_STATE_CALLBACK))
|
||||||
|
+ goto postproc_signal;
|
||||||
|
+ #endif
|
||||||
|
+
|
||||||
|
/* We know at this point that _rl_caught_signal == 0 */
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 888,891 ****
|
||||||
|
--- 902,908 ----
|
||||||
|
|
||||||
|
handle_error:
|
||||||
|
+ osig = _rl_caught_signal;
|
||||||
|
+ ostate = rl_readline_state;
|
||||||
|
+
|
||||||
|
/* If the error that we received was EINTR, then try again,
|
||||||
|
this is simply an interrupted system call to read (). We allow
|
||||||
|
***************
|
||||||
|
*** 928,933 ****
|
||||||
|
--- 945,959 ----
|
||||||
|
#endif /* SIGALRM */
|
||||||
|
|
||||||
|
+ postproc_signal:
|
||||||
|
+ /* POSIX says read(2)/pselect(2)/select(2) don't return EINTR for any
|
||||||
|
+ reason other than being interrupted by a signal, so we can safely
|
||||||
|
+ call the application's signal event hook. */
|
||||||
|
if (rl_signal_event_hook)
|
||||||
|
(*rl_signal_event_hook) ();
|
||||||
|
+ #if defined (READLINE_CALLBACKS)
|
||||||
|
+ else if (osig == SIGINT && (ostate & RL_STATE_CALLBACK) && (ostate & (RL_STATE_ISEARCH|RL_STATE_NSEARCH|RL_STATE_NUMERICARG)))
|
||||||
|
+ /* just these cases for now */
|
||||||
|
+ _rl_abort_internal ();
|
||||||
|
+ #endif
|
||||||
|
}
|
||||||
|
}
|
||||||
|
*** ../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
|
||||||
|
|
||||||
|
! 5
|
||||||
|
--- 1,3 ----
|
||||||
|
# Do not edit -- exists only for use by patch
|
||||||
|
|
||||||
|
! 6
|
||||||
|
READLINE PATCH REPORT
|
||||||
|
=====================
|
||||||
|
|
||||||
|
Readline-Release: 8.2
|
||||||
|
Patch-ID: readline82-007
|
||||||
|
|
||||||
|
Bug-Reported-by: Kevin Pulo <kev@pulo.com.au>
|
||||||
|
Bug-Reference-ID:
|
||||||
|
Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2022-11/msg00002.html
|
||||||
|
|
||||||
|
Bug-Description:
|
||||||
|
|
||||||
|
If readline is called with no prompt, it should display a newline if return
|
||||||
|
is typed on an empty line. It should still suppress the final newline if
|
||||||
|
return is typed on the last (empty) line of a multi-line command.
|
||||||
|
|
||||||
|
Patch (apply with `patch -p0'):
|
||||||
|
|
||||||
|
*** ../readline-8.2-patched/display.c 2022-04-05 10:47:31.000000000 -0400
|
||||||
|
--- display.c 2022-12-13 13:11:22.000000000 -0500
|
||||||
|
***************
|
||||||
|
*** 3342,3348 ****
|
||||||
|
&last_face[_rl_screenwidth - 1 + woff], 1);
|
||||||
|
}
|
||||||
|
! _rl_vis_botlin = 0;
|
||||||
|
! if (botline_length > 0 || _rl_last_c_pos > 0)
|
||||||
|
rl_crlf ();
|
||||||
|
fflush (rl_outstream);
|
||||||
|
rl_display_fixed++;
|
||||||
|
--- 3394,3400 ----
|
||||||
|
&last_face[_rl_screenwidth - 1 + woff], 1);
|
||||||
|
}
|
||||||
|
! if ((_rl_vis_botlin == 0 && botline_length == 0) || botline_length > 0 || _rl_last_c_pos > 0)
|
||||||
|
rl_crlf ();
|
||||||
|
+ _rl_vis_botlin = 0;
|
||||||
|
fflush (rl_outstream);
|
||||||
|
rl_display_fixed++;
|
||||||
|
*** ../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
|
||||||
|
|
||||||
|
! 6
|
||||||
|
--- 1,3 ----
|
||||||
|
# Do not edit -- exists only for use by patch
|
||||||
|
|
||||||
|
! 7
|
||||||
|
READLINE PATCH REPORT
|
||||||
|
=====================
|
||||||
|
|
||||||
|
Readline-Release: 8.2
|
||||||
|
Patch-ID: readline82-008
|
||||||
|
|
||||||
|
Bug-Reported-by:
|
||||||
|
Bug-Reference-ID:
|
||||||
|
Bug-Reference-URL:
|
||||||
|
|
||||||
|
Bug-Description:
|
||||||
|
|
||||||
|
Add missing prototypes for several function declarations.
|
||||||
|
|
||||||
|
Patch (apply with `patch -p0'):
|
||||||
|
|
||||||
|
*** ../readline-8.2-patched/text.c Wed Oct 27 11:03:59 2021
|
||||||
|
--- text.c Thu Nov 16 16:24:58 2023
|
||||||
|
***************
|
||||||
|
*** 1765,1770 ****
|
||||||
|
#if defined (READLINE_CALLBACKS)
|
||||||
|
static int
|
||||||
|
! _rl_char_search_callback (data)
|
||||||
|
! _rl_callback_generic_arg *data;
|
||||||
|
{
|
||||||
|
_rl_callback_func = 0;
|
||||||
|
--- 1765,1769 ----
|
||||||
|
#if defined (READLINE_CALLBACKS)
|
||||||
|
static int
|
||||||
|
! _rl_char_search_callback (_rl_callback_generic_arg *data)
|
||||||
|
{
|
||||||
|
_rl_callback_func = 0;
|
||||||
|
*** ../readline-8.2-patched/bind.c Wed Feb 9 11:02:22 2022
|
||||||
|
--- bind.c Thu Nov 16 16:25:17 2023
|
||||||
|
***************
|
||||||
|
*** 1168,1174 ****
|
||||||
|
|
||||||
|
static int
|
||||||
|
! parse_comparison_op (s, indp)
|
||||||
|
! const char *s;
|
||||||
|
! int *indp;
|
||||||
|
{
|
||||||
|
int i, peekc, op;
|
||||||
|
--- 1168,1172 ----
|
||||||
|
|
||||||
|
static int
|
||||||
|
! parse_comparison_op (const char *s, int *indp)
|
||||||
|
{
|
||||||
|
int i, peekc, op;
|
||||||
|
*** ../readline-8.2-patched/rltty.c Fri Feb 18 11:14:22 2022
|
||||||
|
--- rltty.c Thu Nov 16 16:25:36 2023
|
||||||
|
***************
|
||||||
|
*** 81,86 ****
|
||||||
|
to get the tty settings. */
|
||||||
|
static void
|
||||||
|
! set_winsize (tty)
|
||||||
|
! int tty;
|
||||||
|
{
|
||||||
|
#if defined (TIOCGWINSZ)
|
||||||
|
--- 81,85 ----
|
||||||
|
to get the tty settings. */
|
||||||
|
static void
|
||||||
|
! set_winsize (int tty)
|
||||||
|
{
|
||||||
|
#if defined (TIOCGWINSZ)
|
||||||
|
|
||||||
|
*** ../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
|
||||||
|
|
||||||
|
! 7
|
||||||
|
--- 1,3 ----
|
||||||
|
# Do not edit -- exists only for use by patch
|
||||||
|
|
||||||
|
! 8
|
||||||
|
READLINE PATCH REPORT
|
||||||
|
=====================
|
||||||
|
|
||||||
|
Readline-Release: 8.2
|
||||||
|
Patch-ID: readline82-009
|
||||||
|
|
||||||
|
Bug-Reported-by: Stefan H. Holek <stefan@epy.co.at>
|
||||||
|
Bug-Reference-ID: <50F8DA45-B7F3-4DE1-AB94-19AE42649CDC@epy.co.at>
|
||||||
|
Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2022-10/msg00021.html
|
||||||
|
|
||||||
|
Bug-Description:
|
||||||
|
|
||||||
|
Fix issue where the directory name portion of the word to be completed (the
|
||||||
|
part that is passed to opendir()) requires both tilde expansion and dequoting.
|
||||||
|
Readline only performed tilde expansion in this case, so filename completion
|
||||||
|
would fail.
|
||||||
|
|
||||||
|
Patch (apply with `patch -p0'):
|
||||||
|
|
||||||
|
*** ../readline-8.2-patched/complete.c 2022-04-05 10:47:06.000000000 -0400
|
||||||
|
--- complete.c 2022-10-26 15:08:51.000000000 -0400
|
||||||
|
***************
|
||||||
|
*** 2527,2531 ****
|
||||||
|
xfree (dirname);
|
||||||
|
dirname = temp;
|
||||||
|
! tilde_dirname = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
--- 2527,2532 ----
|
||||||
|
xfree (dirname);
|
||||||
|
dirname = temp;
|
||||||
|
! if (*dirname != '~')
|
||||||
|
! tilde_dirname = 1; /* indicate successful tilde expansion */
|
||||||
|
}
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 2546,2554 ****
|
||||||
|
users_dirname = savestring (dirname);
|
||||||
|
}
|
||||||
|
! else if (tilde_dirname == 0 && rl_completion_found_quote && rl_filename_dequoting_function)
|
||||||
|
{
|
||||||
|
! /* delete single and double quotes */
|
||||||
|
xfree (dirname);
|
||||||
|
! dirname = savestring (users_dirname);
|
||||||
|
}
|
||||||
|
directory = opendir (dirname);
|
||||||
|
--- 2547,2560 ----
|
||||||
|
users_dirname = savestring (dirname);
|
||||||
|
}
|
||||||
|
! else if (rl_completion_found_quote && rl_filename_dequoting_function)
|
||||||
|
{
|
||||||
|
! /* We already ran users_dirname through the dequoting function.
|
||||||
|
! If tilde_dirname == 1, we successfully performed tilde expansion
|
||||||
|
! on dirname. Now we need to reconcile those results. We either
|
||||||
|
! just copy the already-dequoted users_dirname or tilde expand it
|
||||||
|
! if we tilde-expanded dirname. */
|
||||||
|
! temp = tilde_dirname ? tilde_expand (users_dirname) : savestring (users_dirname);
|
||||||
|
xfree (dirname);
|
||||||
|
! dirname = temp;
|
||||||
|
}
|
||||||
|
directory = opendir (dirname);
|
||||||
|
|
||||||
|
*** ../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
|
||||||
|
|
||||||
|
! 8
|
||||||
|
--- 1,3 ----
|
||||||
|
# Do not edit -- exists only for use by patch
|
||||||
|
|
||||||
|
! 9
|
||||||
|
READLINE PATCH REPORT
|
||||||
|
=====================
|
||||||
|
|
||||||
|
Readline-Release: 8.2
|
||||||
|
Patch-ID: readline82-010
|
||||||
|
|
||||||
|
Bug-Reported-by: Martin Castillo <castilma@uni-bremen.de>
|
||||||
|
Bug-Reference-ID: <2d42153b-cf65-caba-dff1-cd3bc6268c7e@uni-bremen.de>
|
||||||
|
Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2023-01/msg00000.html
|
||||||
|
|
||||||
|
Bug-Description:
|
||||||
|
|
||||||
|
Fix the case where text to be completed from the line buffer (quoted) is
|
||||||
|
compared to the common prefix of the possible matches (unquoted) and the
|
||||||
|
quoting makes the former appear to be longer than the latter. Readline
|
||||||
|
assumes the match doesn't add any characters to the word and doesn't display
|
||||||
|
multiple matches.
|
||||||
|
|
||||||
|
Patch (apply with `patch -p0'):
|
||||||
|
|
||||||
|
*** ../readline-8.2-patched/complete.c Tue Apr 5 10:47:06 2022
|
||||||
|
--- complete.c Sat Jan 7 14:19:45 2023
|
||||||
|
***************
|
||||||
|
*** 2032,2038 ****
|
||||||
|
text = rl_copy_text (start, end);
|
||||||
|
matches = gen_completion_matches (text, start, end, our_func, found_quote, quote_char);
|
||||||
|
/* nontrivial_lcd is set if the common prefix adds something to the word
|
||||||
|
being completed. */
|
||||||
|
! nontrivial_lcd = matches && compare_match (text, matches[0]) != 0;
|
||||||
|
if (what_to_do == '!' || what_to_do == '@')
|
||||||
|
tlen = strlen (text);
|
||||||
|
--- 2038,2060 ----
|
||||||
|
text = rl_copy_text (start, end);
|
||||||
|
matches = gen_completion_matches (text, start, end, our_func, found_quote, quote_char);
|
||||||
|
+ /* If TEXT contains quote characters, it will be dequoted as part of
|
||||||
|
+ generating the matches, and the matches will not contain any quote
|
||||||
|
+ characters. We need to dequote TEXT before performing the comparison.
|
||||||
|
+ Since compare_match performs the dequoting, and we only want to do it
|
||||||
|
+ once, we don't call compare_matches after dequoting TEXT; we call
|
||||||
|
+ strcmp directly. */
|
||||||
|
/* nontrivial_lcd is set if the common prefix adds something to the word
|
||||||
|
being completed. */
|
||||||
|
! if (rl_filename_completion_desired && rl_filename_quoting_desired &&
|
||||||
|
! rl_completion_found_quote && rl_filename_dequoting_function)
|
||||||
|
! {
|
||||||
|
! char *t;
|
||||||
|
! t = (*rl_filename_dequoting_function) (text, rl_completion_quote_character);
|
||||||
|
! xfree (text);
|
||||||
|
! text = t;
|
||||||
|
! nontrivial_lcd = matches && strcmp (text, matches[0]) != 0;
|
||||||
|
! }
|
||||||
|
! else
|
||||||
|
! nontrivial_lcd = matches && strcmp (text, matches[0]) != 0;
|
||||||
|
if (what_to_do == '!' || what_to_do == '@')
|
||||||
|
tlen = strlen (text);
|
||||||
|
|
||||||
|
*** ../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
|
||||||
|
|
||||||
|
! 9
|
||||||
|
--- 1,3 ----
|
||||||
|
# Do not edit -- exists only for use by patch
|
||||||
|
|
||||||
|
! 10
|
||||||
@ -1,17 +1,16 @@
|
|||||||
%define majver %(echo %version | cut -d. -f1-2)
|
%define majver %(echo %version | cut -d. -f1-2)
|
||||||
%define minver %(echo %version | cut -d. -f3)
|
%define minver %(echo %version | cut -d. -f3)
|
||||||
Name: libreadline
|
Name: libreadline
|
||||||
Version: 8.2
|
Version: 8.2.010
|
||||||
Release: 1mamba
|
Release: 1mamba
|
||||||
Summary: Lets users edit command lines as they are typed in
|
Summary: Lets users edit command lines as they are typed in
|
||||||
Group: System/Libraries
|
Group: System/Libraries
|
||||||
Vendor: openmamba
|
Vendor: openmamba
|
||||||
Distribution: openmamba
|
Distribution: openmamba
|
||||||
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
||||||
URL: https://directory.fsf.org/wiki/GNU/readline
|
URL: https://tiswww.case.edu/php/chet/readline/rltop.html
|
||||||
Source0: ftp://ftp.gnu.org/gnu/readline/readline-%{majver}.tar.gz
|
Source0: https://ftp.gnu.org/gnu/readline/readline-%{majver}.tar.gz
|
||||||
Source1: libreadline-autoupdate
|
Source1: libreadline-autoupdate
|
||||||
Patch0: %{name}-6.2-shlib.patch
|
|
||||||
Patch1: libreadline-%{version}-patchset.patch
|
Patch1: libreadline-%{version}-patchset.patch
|
||||||
License: GPL
|
License: GPL
|
||||||
## AUTOBUILDREQ-BEGIN
|
## AUTOBUILDREQ-BEGIN
|
||||||
@ -46,7 +45,7 @@ The %{name}-static package contains the static version of the readline library.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n readline-%{majver}
|
%setup -q -n readline-%{majver}
|
||||||
%patch1 -p0
|
%patch 1 -p0
|
||||||
|
|
||||||
# remove RPATH from shared objects (FS#14366)
|
# remove RPATH from shared objects (FS#14366)
|
||||||
sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf
|
sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf
|
||||||
@ -59,11 +58,8 @@ sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf
|
|||||||
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
||||||
%makeinstall
|
%makeinstall
|
||||||
|
|
||||||
## fixup strange shared library permissions
|
|
||||||
#chmod 755 %{buildroot}%{_libdir}/*.so*
|
|
||||||
|
|
||||||
## remove unpackaged files
|
## remove unpackaged files
|
||||||
#rm -fr %{buildroot}%{_datadir}/readline
|
rm -fr %{buildroot}%{_infodir}/dir
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
||||||
@ -117,6 +113,9 @@ exit 0
|
|||||||
%{_libdir}/lib*.a
|
%{_libdir}/lib*.a
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Feb 23 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 8.2.010-1mamba
|
||||||
|
- update to 8.2.010
|
||||||
|
|
||||||
* Wed Sep 28 2022 Automatic Build System <autodist@mambasoft.it> 8.2-1mamba
|
* Wed Sep 28 2022 Automatic Build System <autodist@mambasoft.it> 8.2-1mamba
|
||||||
- automatic version update by autodist
|
- automatic version update by autodist
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user