From 7e3474c1cc2b7c688b5e54360b25fc0bcc919594 Mon Sep 17 00:00:00 2001 From: Petter Mabäcker Date: Wed, 18 Nov 2015 12:54:25 +0100 Subject: readline: apply missing upstream patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../readline-6.3/readline-dispatch-multikey.patch | 32 ---------------------- 1 file changed, 32 deletions(-) delete mode 100644 meta/recipes-core/readline/readline-6.3/readline-dispatch-multikey.patch (limited to 'meta/recipes-core/readline/readline-6.3/readline-dispatch-multikey.patch') 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 -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 ---- - 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 - -- cgit v1.2.3-54-g00ecf