diff options
| author |   Petter Mabäcker <petter@technux.se> | 2015-11-18 12:54:25 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-01 21:31:00 +0000 |
| commit | 7b1fde3f65b674f5973800731c0c284f7d415248 (patch) | |
| tree | 3e6e0e519bed8111adf7e1dd51c21b0592712665 /meta/recipes-core/readline/readline-6.3/readline-dispatch-multikey.patch | |
| parent | d454d1c06247b658c6b7d12de610eb6ac72cd7d4 (diff) | |
| download | openembedded-core-contrib-7b1fde3f65b674f5973800731c0c284f7d415248.tar.gz | |
readline: apply missing upstream patches
Some readline-6.3 upstream patches was missing. Also ensure that the
upstream patches are applied in the same way as in readline-5.2.
Remove 'readline-dispatch-multikey.patch' and
'readline-cve-2014-2524.patch' since they are already included in
upstream patches 'readline63-002' and 'readline63-003'.
[YOCTO #8451]
Signed-off-by: Petter Mabäcker <petter@technux.se>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-core/readline/readline-6.3/readline-dispatch-multikey.patch')
| -rw-r--r-- | meta/recipes-core/readline/readline-6.3/readline-dispatch-multikey.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/meta/recipes-core/readline/readline-6.3/readline-dispatch-multikey.patch b/meta/recipes-core/readline/readline-6.3/readline-dispatch-multikey.patch deleted file mode 100644 index 54d1ac6eb9..0000000000 --- a/meta/recipes-core/readline/readline-6.3/readline-dispatch-multikey.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8ef852a5be72c75e17f2510bea52455f809b56ce Mon Sep 17 00:00:00 2001 -From: Chet Ramey <chet.ramey@case.edu> -Date: Fri, 28 Mar 2014 14:07:42 -0400 -Subject: [PATCH 04/10] Readline-6.3 patch 2 - -Fixes multi-key issue identified in this thread: -http://lists.gnu.org/archive/html/bug-readline/2014-03/msg00010.html - -Upstream-Status: Backport - -Signed-off-by: Saul Wold <sgw@linux.intel.com> ---- - readline.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/readline.c b/readline.c -index eb4eae3..abb29a0 100644 ---- a/readline.c -+++ b/readline.c -@@ -744,7 +744,8 @@ _rl_dispatch_callback (cxt) - r = _rl_subseq_result (r, cxt->oldmap, cxt->okey, (cxt->flags & KSEQ_SUBSEQ)); - - RL_CHECK_SIGNALS (); -- if (r == 0) /* success! */ -+ /* 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 (); - RL_UNSETSTATE (RL_STATE_MULTIKEY); --- -1.8.3.1 - |