Commit b817e8c5 authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Thomas Petazzoni
Browse files

readline: bump to patchlevel 8 



Fixes various issues, one in particular reported by Pascal de Bruijn on
IRC where bash won't timeout when using readline as in 'read -e -t 10',
which should escape back to shell when left alone for 10 seconds.

Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 7ff67b5d

package/readline/0001-patchlevel-1.patch

0 → 100644
+47 −0
Original line number Diff line number Diff line 
From http://ftp.gnu.org/pub/gnu/readline/readline-6.3-patches/readline63-001



Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>



			   READLINE PATCH REPORT

			   =====================



Readline-Release: 6.3

Patch-ID: readline63-001



Bug-Reported-by:	Daan van Rossum <daan@flash.uchicago.edu>

Bug-Reference-ID:	<20140307072523.GA14250@flash.uchicago.edu>

Bug-Reference-URL:	



Bug-Description:



The `.' command in vi mode cannot undo multi-key commands beginning with

`c', `d', and `y' (command plus motion specifier).



Patch (apply with `patch -p0'):



*** a/readline-6.3/readline.c	2013-10-28 14:58:06.000000000 -0400

--- b/readline.c	2014-03-07 15:20:33.000000000 -0500

***************

*** 965,969 ****

    if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap &&

        key != ANYOTHERKEY &&

!       rl_key_sequence_length == 1 &&	/* XXX */

        _rl_vi_textmod_command (key))

      _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign);

--- 965,969 ----

    if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap &&

        key != ANYOTHERKEY &&

!       _rl_dispatching_keymap == vi_movement_keymap &&

        _rl_vi_textmod_command (key))

      _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign);

*** a/readline-6.3/patchlevel	2013-11-15 08:11:11.000000000 -0500

--- b/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

  

! 1

package/readline/0002-patchlevel-2.patch

0 → 100644
+48 −0
Original line number Diff line number Diff line 
From http://ftp.gnu.org/pub/gnu/readline/readline-6.3-patches/readline63-002



Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>



			   READLINE PATCH REPORT

			   =====================



Readline-Release: 6.3

Patch-ID: readline63-002



Bug-Reported-by:	Anatol Pomozov <anatol.pomozov@gmail.com>

Bug-Reference-ID:	<CAOMFOmXy3mT2So5GQ5F-smCVArQuAeBwZ2QKzgCtMeXJoDeYOQ@mail.gmail.com>

Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-readline/2014-03/msg00010.html



Bug-Description:



When in callback mode, some readline commands can cause readline to seg

fault by passing invalid contexts to callback functions.



Patch (apply with `patch -p0'):



*** a/readline-6.3/readline.c	2013-10-28 14:58:06.000000000 -0400

--- b/readline.c	2014-03-10 14:15:02.000000000 -0400

***************

*** 745,749 ****

  

    RL_CHECK_SIGNALS ();

!   if (r == 0)			/* success! */

      {

        _rl_keyseq_chain_dispose ();

--- 745,750 ----

  

    RL_CHECK_SIGNALS ();

!   /* We only treat values < 0 specially to simulate recursion. */

!   if (r >= 0 || (r == -1 && (cxt->flags & KSEQ_SUBSEQ) == 0))	/* success! or failure! */

      {

        _rl_keyseq_chain_dispose ();

*** a/readline-6.3/patchlevel	2013-11-15 08:11:11.000000000 -0500

--- b/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

package/readline/0003-patchlevel-3.patch

0 → 100644
+51 −0
Original line number Diff line number Diff line 
From http://ftp.gnu.org/pub/gnu/readline/readline-6.3-patches/readline63-003



Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>



			   READLINE PATCH REPORT

			   =====================



Readline-Release: 6.3

Patch-ID: readline63-003



Bug-Reported-by:

Bug-Reference-ID:

Bug-Reference-URL:



Bug-Description:



There are debugging functions in the readline release that are theoretically

exploitable as security problems.  They are not public functions, but have

global linkage.



Patch (apply with `patch -p0'):



*** a/readline-6.3/util.c	2013-09-02 13:36:12.000000000 -0400

--- b/util.c	2014-03-20 10:25:53.000000000 -0400

***************

*** 477,480 ****

--- 479,483 ----

  }

  

+ #if defined (DEBUG)

  #if defined (USE_VARARGS)

  static FILE *_rl_tracefp;

***************

*** 539,542 ****

--- 542,546 ----

  }

  #endif

+ #endif /* DEBUG */

  

  

*** a/readline-6.3/patchlevel	2013-11-15 08:11:11.000000000 -0500

--- b/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

package/readline/0004-patchlevel-4.patch

0 → 100644
+49 −0
Original line number Diff line number Diff line 
From http://ftp.gnu.org/pub/gnu/readline/readline-6.3-patches/readline63-004



Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>



			   READLINE PATCH REPORT

			   =====================



Readline-Release: 6.3

Patch-ID: readline63-004



Bug-Reported-by:	Egmont Koblinger <egmont@gmail.com>

Bug-Reference-ID:	<CAGWcZk+bU5Jo1M+tutGvL-250UBE9DXjpeJVofYJSFcqFEVfMg@mail.gmail.com>

Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2014-03/msg00153.html



Bug-Description:



The signal handling changes to bash and readline (to avoid running any code

in a signal handler context) cause the cursor to be placed on the wrong

line of a multi-line command after a ^C interrupts editing.



Patch (apply with `patch -p0'):



*** a/readline-6.3-patched/display.c	2013-12-27 13:10:56.000000000 -0500

--- b/display.c	2014-03-27 11:52:45.000000000 -0400

***************

*** 2678,2682 ****

    if (_rl_echoing_p)

      {

!       _rl_move_vert (_rl_vis_botlin);

        _rl_vis_botlin = 0;

        fflush (rl_outstream);

--- 2678,2683 ----

    if (_rl_echoing_p)

      {

!       if (_rl_vis_botlin > 0)	/* minor optimization plus bug fix */

! 	_rl_move_vert (_rl_vis_botlin);

        _rl_vis_botlin = 0;

        fflush (rl_outstream);

*** a/readline-6.3/patchlevel	2013-11-15 08:11:11.000000000 -0500

--- b/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