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-cve-2014-2524.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-cve-2014-2524.patch')
-rw-r--r-- | meta/recipes-core/readline/readline-6.3/readline-cve-2014-2524.patch | 43 |
1 files changed, 0 insertions, 43 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 @@ | |||
1 | readline: Security Advisory - readline - CVE-2014-2524 | ||
2 | |||
3 | Upstream-Status: Backport | ||
4 | |||
5 | Signed-off-by: Yue Tao <yue.tao@windriver.com> | ||
6 | |||
7 | READLINE PATCH REPORT | ||
8 | ===================== | ||
9 | |||
10 | Readline-Release: 6.3 | ||
11 | Patch-ID: readline63-003 | ||
12 | |||
13 | Bug-Reported-by: | ||
14 | Bug-Reference-ID: | ||
15 | Bug-Reference-URL: | ||
16 | |||
17 | Bug-Description: | ||
18 | |||
19 | There are debugging functions in the readline release that are theoretically | ||
20 | exploitable as security problems. They are not public functions, but have | ||
21 | global linkage. | ||
22 | |||
23 | Patch (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 | |||