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:32:10 +0000 |
commit | 7e3474c1cc2b7c688b5e54360b25fc0bcc919594 (patch) | |
tree | 245177965a87bf8caa5e50e2e7b8b6d1c17875fc /meta/recipes-core/readline/readline-6.3/readline-dispatch-multikey.patch | |
parent | 99b9d52ce4bb3be88aa8029225ca05dad215ed0b (diff) | |
download | poky-7e3474c1cc2b7c688b5e54360b25fc0bcc919594.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]
(From OE-Core rev: 7b1fde3f65b674f5973800731c0c284f7d415248)
Signed-off-by: Petter Mabäcker <petter@technux.se>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 @@ | |||
1 | From 8ef852a5be72c75e17f2510bea52455f809b56ce Mon Sep 17 00:00:00 2001 | ||
2 | From: Chet Ramey <chet.ramey@case.edu> | ||
3 | Date: Fri, 28 Mar 2014 14:07:42 -0400 | ||
4 | Subject: [PATCH 04/10] Readline-6.3 patch 2 | ||
5 | |||
6 | Fixes multi-key issue identified in this thread: | ||
7 | http://lists.gnu.org/archive/html/bug-readline/2014-03/msg00010.html | ||
8 | |||
9 | Upstream-Status: Backport | ||
10 | |||
11 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
12 | --- | ||
13 | readline.c | 3 ++- | ||
14 | 1 files changed, 2 insertions(+), 1 deletions(-) | ||
15 | |||
16 | diff --git a/readline.c b/readline.c | ||
17 | index eb4eae3..abb29a0 100644 | ||
18 | --- a/readline.c | ||
19 | +++ b/readline.c | ||
20 | @@ -744,7 +744,8 @@ _rl_dispatch_callback (cxt) | ||
21 | r = _rl_subseq_result (r, cxt->oldmap, cxt->okey, (cxt->flags & KSEQ_SUBSEQ)); | ||
22 | |||
23 | RL_CHECK_SIGNALS (); | ||
24 | - if (r == 0) /* success! */ | ||
25 | + /* We only treat values < 0 specially to simulate recursion. */ | ||
26 | + if (r >= 0 || (r == -1 && (cxt->flags & KSEQ_SUBSEQ) == 0)) /* success! or failure! */ | ||
27 | { | ||
28 | _rl_keyseq_chain_dispose (); | ||
29 | RL_UNSETSTATE (RL_STATE_MULTIKEY); | ||
30 | -- | ||
31 | 1.8.3.1 | ||
32 | |||