summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-10-06 14:04:20 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-08 13:27:34 +0000
commit2761a2bd8b215e35830e21725c3dfd2e5598ba32 (patch)
tree6cf62822fdf156396c53654dc8686b4491409752
parentddb058ca089a9564e21d558d457800d991183bd8 (diff)
downloadast2050-yocto-poky-2761a2bd8b215e35830e21725c3dfd2e5598ba32.zip
ast2050-yocto-poky-2761a2bd8b215e35830e21725c3dfd2e5598ba32.tar.gz
readline: actually apply readline63-003 (aka CVE-2014-2524)
This file wasn't named as a patch, nor told to apply explicity, so it was just unpacked to the work directory and not applied. Rename the file so the patch is applied correctly. (thanks to Petter Mabäcker <petter@technux.se> for spotting this) (From OE-Core master rev: 02be728762c77962f9c3034cd7995ad51afaee95) (From OE-Core rev: 7f2e2d57c7496547b7970377547482ead2e152cf) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/readline/readline-6.3/readline63-003.patch (renamed from meta/recipes-core/readline/readline-6.3/readline63-003)0
-rw-r--r--meta/recipes-core/readline/readline_6.3.bb2
2 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/readline/readline-6.3/readline63-003 b/meta/recipes-core/readline/readline-6.3/readline63-003.patch
index 98a9d81..98a9d81 100644
--- a/meta/recipes-core/readline/readline-6.3/readline63-003
+++ b/meta/recipes-core/readline/readline-6.3/readline63-003.patch
diff --git a/meta/recipes-core/readline/readline_6.3.bb b/meta/recipes-core/readline/readline_6.3.bb
index 55964a6..6ba1c18 100644
--- a/meta/recipes-core/readline/readline_6.3.bb
+++ b/meta/recipes-core/readline/readline_6.3.bb
@@ -1,6 +1,6 @@
require readline.inc
-SRC_URI += "file://readline63-003 \
+SRC_URI += "file://readline63-003.patch;striplevel=0 \
file://readline-dispatch-multikey.patch"
SRC_URI[archive.md5sum] = "33c8fb279e981274f485fd91da77e94a"
OpenPOWER on IntegriCloud