summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetter Mabäcker <petter@technux.se>2015-11-18 12:54:25 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-01 21:32:10 +0000
commit7e3474c1cc2b7c688b5e54360b25fc0bcc919594 (patch)
tree245177965a87bf8caa5e50e2e7b8b6d1c17875fc
parent99b9d52ce4bb3be88aa8029225ca05dad215ed0b (diff)
downloadpoky-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>
-rw-r--r--meta/recipes-core/readline/readline-6.3/readline-cve-2014-2524.patch43
-rw-r--r--meta/recipes-core/readline/readline-6.3/readline-dispatch-multikey.patch32
-rw-r--r--meta/recipes-core/readline/readline_6.3.bb31
3 files changed, 27 insertions, 79 deletions
diff --git a/meta/recipes-core/readline/readline-6.3/readline-cve-2014-2524.patch b/meta/recipes-core/readline/readline-6.3/readline-cve-2014-2524.patch
deleted file mode 100644
index 98a9d810b6..0000000000
--- a/meta/recipes-core/readline/readline-6.3/readline-cve-2014-2524.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1readline: Security Advisory - readline - CVE-2014-2524
2
3Upstream-Status: Backport
4
5Signed-off-by: Yue Tao <yue.tao@windriver.com>
6
7 READLINE PATCH REPORT
8 =====================
9
10Readline-Release: 6.3
11Patch-ID: readline63-003
12
13Bug-Reported-by:
14Bug-Reference-ID:
15Bug-Reference-URL:
16
17Bug-Description:
18
19There are debugging functions in the readline release that are theoretically
20exploitable as security problems. They are not public functions, but have
21global linkage.
22
23Patch (apply with `patch -p0'):
24
25*** ../readline-6.3/util.c 2013-09-02 13:36:12.000000000 -0400
26--- util.c 2014-03-20 10:25:53.000000000 -0400
27***************
28*** 477,480 ****
29--- 479,483 ----
30 }
31
32+ #if defined (DEBUG)
33 #if defined (USE_VARARGS)
34 static FILE *_rl_tracefp;
35***************
36*** 539,542 ****
37--- 542,546 ----
38 }
39 #endif
40+ #endif /* DEBUG */
41
42
43
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 @@
1From 8ef852a5be72c75e17f2510bea52455f809b56ce Mon Sep 17 00:00:00 2001
2From: Chet Ramey <chet.ramey@case.edu>
3Date: Fri, 28 Mar 2014 14:07:42 -0400
4Subject: [PATCH 04/10] Readline-6.3 patch 2
5
6Fixes multi-key issue identified in this thread:
7http://lists.gnu.org/archive/html/bug-readline/2014-03/msg00010.html
8
9Upstream-Status: Backport
10
11Signed-off-by: Saul Wold <sgw@linux.intel.com>
12---
13 readline.c | 3 ++-
14 1 files changed, 2 insertions(+), 1 deletions(-)
15
16diff --git a/readline.c b/readline.c
17index 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--
311.8.3.1
32
diff --git a/meta/recipes-core/readline/readline_6.3.bb b/meta/recipes-core/readline/readline_6.3.bb
index dbb9f0a946..8ec7c4ada0 100644
--- a/meta/recipes-core/readline/readline_6.3.bb
+++ b/meta/recipes-core/readline/readline_6.3.bb
@@ -1,11 +1,34 @@
1require readline.inc 1require readline.inc
2 2
3SRC_URI += "file://configure-fix.patch \ 3SRC_URI += "${GNU_MIRROR}/readline/readline-6.3-patches/readline63-001;name=patch1;apply=yes;striplevel=0 \
4 ${GNU_MIRROR}/readline/readline-6.3-patches/readline63-002;name=patch2;apply=yes;striplevel=0 \
5 ${GNU_MIRROR}/readline/readline-6.3-patches/readline63-003;name=patch3;apply=yes;striplevel=0 \
6 ${GNU_MIRROR}/readline/readline-6.3-patches/readline63-004;name=patch4;apply=yes;striplevel=0 \
7 ${GNU_MIRROR}/readline/readline-6.3-patches/readline63-005;name=patch5;apply=yes;striplevel=0 \
8 ${GNU_MIRROR}/readline/readline-6.3-patches/readline63-006;name=patch6;apply=yes;striplevel=0 \
9 ${GNU_MIRROR}/readline/readline-6.3-patches/readline63-007;name=patch7;apply=yes;striplevel=0 \
10 ${GNU_MIRROR}/readline/readline-6.3-patches/readline63-008;name=patch8;apply=yes;striplevel=0 \
11 file://configure-fix.patch \
4 file://config-dirent-symbols.patch \ 12 file://config-dirent-symbols.patch \
5 file://norpath.patch \ 13 file://norpath.patch"
6 file://readline-cve-2014-2524.patch;striplevel=0 \
7 file://readline-dispatch-multikey.patch"
8 14
9SRC_URI[archive.md5sum] = "33c8fb279e981274f485fd91da77e94a" 15SRC_URI[archive.md5sum] = "33c8fb279e981274f485fd91da77e94a"
10SRC_URI[archive.sha256sum] = "56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" 16SRC_URI[archive.sha256sum] = "56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43"
11 17
18SRC_URI[patch1.md5sum] = "4343f5ea9b0f42447f102fb61576b398"
19SRC_URI[patch1.sha256sum] = "1a79bbb6eaee750e0d6f7f3d059b30a45fc54e8e388a8e05e9c3ae598590146f"
20SRC_URI[patch2.md5sum] = "700295212f7e2978577feaee584afddb"
21SRC_URI[patch2.sha256sum] = "39e304c7a526888f9e112e733848215736fb7b9d540729b9e31f3347b7a1e0a5"
22SRC_URI[patch3.md5sum] = "af4963862f5156fbf9111c2c6fa86ed7"
23SRC_URI[patch3.sha256sum] = "ec41bdd8b00fd884e847708513df41d51b1243cecb680189e31b7173d01ca52f"
24SRC_URI[patch4.md5sum] = "11f9def89803a5052db3ba72394ce14f"
25SRC_URI[patch4.sha256sum] = "4547b906fb2570866c21887807de5dee19838a60a1afb66385b272155e4355cc"
26SRC_URI[patch5.md5sum] = "93721c31cd225393f80cb3aadb165544"
27SRC_URI[patch5.sha256sum] = "877788f9228d1a9907a4bcfe3d6dd0439c08d728949458b41208d9bf9060274b"
28SRC_URI[patch6.md5sum] = "71dc6ecce66d1489b96595f55d142a52"
29SRC_URI[patch6.sha256sum] = "5c237ab3c6c97c23cf52b2a118adc265b7fb411b57c93a5f7c221d50fafbe556"
30SRC_URI[patch7.md5sum] = "062a08ed60679d3c4878710b3d595b65"
31SRC_URI[patch7.sha256sum] = "4d79b5a2adec3c2e8114cbd3d63c1771f7c6cf64035368624903d257014f5bea"
32SRC_URI[patch8.md5sum] = "ee1c04072154826870848d8b218d7b04"
33SRC_URI[patch8.sha256sum] = "3bc093cf526ceac23eb80256b0ec87fa1735540d659742107b6284d635c43787"
34