From 8d46bbf77913ceac5dab3a59354bb7659198131d Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 05:34:02 +0100 Subject: [PATCH] update to 6.3.008 [release 6.3.008-1mamba;Thu Dec 18 2014] --- ...atch => libreadline-6.3.008-patchset.patch | 94 +++++++++++++++++++ libreadline-autoupdate | 2 +- libreadline.spec | 7 +- 3 files changed, 100 insertions(+), 3 deletions(-) rename libreadline-6.3.006-patchset.patch => libreadline-6.3.008-patchset.patch (75%) diff --git a/libreadline-6.3.006-patchset.patch b/libreadline-6.3.008-patchset.patch similarity index 75% rename from libreadline-6.3.006-patchset.patch rename to libreadline-6.3.008-patchset.patch index 880e7ce..5a0688c 100644 --- a/libreadline-6.3.006-patchset.patch +++ b/libreadline-6.3.008-patchset.patch @@ -298,3 +298,97 @@ Patch (apply with `patch -p0'): # Do not edit -- exists only for use by patch ! 6 + READLINE PATCH REPORT + ===================== + +Readline-Release: 6.3 +Patch-ID: readline63-007 + +Bug-Reported-by: John Lenton +Bug-Reference-ID: +Bug-Reference-URL: https://bugs.launchpad.net/ubuntu/+source/bash/+bug/1317476 + +Bug-Description: + +Readline should allow SIGALRM and SIGVTALRM (if available) to `interrupt' +rl_getc and cause the handler to run when not in a signal handling context. + +Patch (apply with `patch -p0'): + +*** ../readline-6.3-patched/input.c 2014-01-10 15:07:08.000000000 -0500 +--- input.c 2014-05-30 16:20:56.000000000 -0400 +*************** +*** 535,540 **** +--- 538,551 ---- + else if (_rl_caught_signal == SIGHUP || _rl_caught_signal == SIGTERM) + return (RL_ISSTATE (RL_STATE_READCMD) ? READERR : EOF); ++ /* keyboard-generated signals of interest */ + else if (_rl_caught_signal == SIGINT || _rl_caught_signal == SIGQUIT) + RL_CHECK_SIGNALS (); ++ /* non-keyboard-generated signals of interest */ ++ else if (_rl_caught_signal == SIGALRM ++ #if defined (SIGVTALRM) ++ || _rl_caught_signal == SIGVTALRM ++ #endif ++ ) ++ RL_CHECK_SIGNALS (); + + if (rl_signal_event_hook) +*** ../readline-6.3/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: 6.3 +Patch-ID: readline63-008 + +Bug-Reported-by: Jared Yanovich +Bug-Reference-ID: <20140625225019.GJ17044@nightderanger.psc.edu> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-06/msg00070.html + +Bug-Description: + +When the readline `revert-all-at-newline' option is set, pressing newline +when the current line is one retrieved from history results in a double free +and a segmentation fault. + +Patch (apply with `patch -p0'): + +*** ../readline-6.3-patched/misc.c 2012-09-01 18:03:11.000000000 -0400 +--- misc.c 2014-06-30 13:41:19.000000000 -0400 +*************** +*** 462,465 **** +--- 462,466 ---- + /* Set up rl_line_buffer and other variables from history entry */ + rl_replace_from_history (entry, 0); /* entry->line is now current */ ++ entry->data = 0; /* entry->data is now current undo list */ + /* Undo all changes to this history entry */ + while (rl_undo_list) +*************** +*** 469,473 **** + FREE (entry->line); + entry->line = savestring (rl_line_buffer); +- entry->data = 0; + } + entry = previous_history (); +--- 470,473 ---- +*** ../readline-6.3/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 diff --git a/libreadline-autoupdate b/libreadline-autoupdate index bda8406..2e485f9 100644 --- a/libreadline-autoupdate +++ b/libreadline-autoupdate @@ -3,7 +3,7 @@ VERSION=$1 MAJRELEASE=`echo $VERSION | cut -d. -f1-2` MAJRELEASENODOT=`echo $MAJRELEASE | tr -d .` PATCHRELEASE=`echo $VERSION | cut -d. -f3` -libreadline-$VERSION-patchset.patch +> libreadline-$VERSION-patchset.patch for i in `seq 001 $PATCHRELEASE`; do PATCHRELEASEFMT=`printf "%0*d\n" 3 $i` curl -s ftp://ftp.gnu.org/gnu/readline/readline-$MAJRELEASE-patches/readline$MAJRELEASENODOT-$PATCHRELEASEFMT \ diff --git a/libreadline.spec b/libreadline.spec index 6fb8792..b144137 100644 --- a/libreadline.spec +++ b/libreadline.spec @@ -1,8 +1,8 @@ %define majver %(echo %version | cut -d. -f1-2) %define minver %(echo %version | cut -d. -f3) Name: libreadline -Version: 6.3.006 -Release: 2mamba +Version: 6.3.008 +Release: 1mamba Summary: Lets users edit command lines as they are typed in Group: System/Libraries Vendor: openmamba @@ -112,6 +112,9 @@ exit 0 %{_libdir}/lib*.a %changelog +* Thu Dec 18 2014 Silvan Calarco 6.3.008-1mamba +- update to 6.3.008 + * Tue Jul 22 2014 Silvan Calarco 6.3.006-2mamba - fix license