summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-support/libyaml/files/libyaml-CVE-2014-9130.patch32
-rw-r--r--meta/recipes-support/libyaml/libyaml_0.1.6.bb21
2 files changed, 53 insertions, 0 deletions
diff --git a/meta/recipes-support/libyaml/files/libyaml-CVE-2014-9130.patch b/meta/recipes-support/libyaml/files/libyaml-CVE-2014-9130.patch
new file mode 100644
index 0000000000..3c4a00ef3e
--- /dev/null
+++ b/meta/recipes-support/libyaml/files/libyaml-CVE-2014-9130.patch
@@ -0,0 +1,32 @@
1# HG changeset patch
2# User Kirill Simonov <xi@resolvent.net>
3# Date 1417197312 21600
4# Node ID 2b9156756423e967cfd09a61d125d883fca6f4f2
5# Parent 053f53a381ff6adbbc93a31ab7fdee06a16c8a33
6Removed invalid simple key assertion (thank to Jonathan Gray).
7
8The patch comes from
9
10https://bitbucket.org/xi/libyaml/commits/2b9156756423e967cfd09a61d125d883fca6f4f2
11
12Upstream-Status: Backport
13
14Signed-off-by: Yue Tao <yue.tao@windriver.com>
15
16diff -r 053f53a381ff -r 2b9156756423 src/scanner.c
17--- a/src/scanner.c Wed Mar 26 13:55:54 2014 -0500
18+++ b/src/scanner.c Fri Nov 28 11:55:12 2014 -0600
19@@ -1106,13 +1106,6 @@
20 && parser->indent == (ptrdiff_t)parser->mark.column);
21
22 /*
23- * A simple key is required only when it is the first token in the current
24- * line. Therefore it is always allowed. But we add a check anyway.
25- */
26-
27- assert(parser->simple_key_allowed || !required); /* Impossible. */
28-
29- /*
30 * If the current position may start a simple key, save it.
31 */
32
diff --git a/meta/recipes-support/libyaml/libyaml_0.1.6.bb b/meta/recipes-support/libyaml/libyaml_0.1.6.bb
new file mode 100644
index 0000000000..b0155774d2
--- /dev/null
+++ b/meta/recipes-support/libyaml/libyaml_0.1.6.bb
@@ -0,0 +1,21 @@
1SUMMARY = "LibYAML is a YAML 1.1 parser and emitter written in C."
2DESCRIPTION = "LibYAML is a C library for parsing and emitting data in YAML 1.1, \
3a human-readable data serialization format. "
4HOMEPAGE = "http://pyyaml.org/wiki/LibYAML"
5SECTION = "libs/devel"
6
7LICENSE = "MIT"
8LIC_FILES_CHKSUM = "file://LICENSE;md5=6015f088759b10e0bc2bf64898d4ae17"
9
10SRC_URI = "http://pyyaml.org/download/libyaml/yaml-${PV}.tar.gz \
11 file://libyaml-CVE-2014-9130.patch \
12 "
13
14SRC_URI[md5sum] = "5fe00cda18ca5daeb43762b80c38e06e"
15SRC_URI[sha256sum] = "7da6971b4bd08a986dd2a61353bc422362bd0edcc67d7ebaac68c95f74182749"
16
17S = "${WORKDIR}/yaml-${PV}"
18
19inherit autotools
20
21BBCLASSEXTEND = "native"