diff options
author | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
---|---|---|
committer | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
commit | 1c7d6584a7811b7785ae5c1e378f14b5ba0971cf (patch) | |
tree | cd70a267a5ef105ba32f200aa088e281fbd85747 /external/poky/meta/recipes-core/expat | |
parent | 4204309872da5cb401cbb2729d9e2d4869a87f42 (diff) |
basesystem-jjsandbox/ToshikazuOhiwa/master-jj
recipes
Diffstat (limited to 'external/poky/meta/recipes-core/expat')
-rw-r--r-- | external/poky/meta/recipes-core/expat/expat/CVE-2018-20843.patch | 26 | ||||
-rw-r--r-- | external/poky/meta/recipes-core/expat/expat/autotools.patch | 25 | ||||
-rw-r--r-- | external/poky/meta/recipes-core/expat/expat_2.2.9.bb (renamed from external/poky/meta/recipes-core/expat/expat_2.2.6.bb) | 6 |
3 files changed, 2 insertions, 55 deletions
diff --git a/external/poky/meta/recipes-core/expat/expat/CVE-2018-20843.patch b/external/poky/meta/recipes-core/expat/expat/CVE-2018-20843.patch deleted file mode 100644 index af6641ef..00000000 --- a/external/poky/meta/recipes-core/expat/expat/CVE-2018-20843.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 11f8838bf99ea0a6f0b76f9760c43704d00c4ff6 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Wed, 12 Jun 2019 15:42:22 +0200 -Subject: [PATCH] xmlparse.c: Fix extraction of namespace prefix from XML name - (#186) - -Upstream-Status: Backport -CVE: CVE-2018-20843 -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> ---- - expat/lib/xmlparse.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c -index 30d55c5c..737d7cd2 100644 ---- a/expat/lib/xmlparse.c -+++ b/expat/lib/xmlparse.c -@@ -6071,7 +6071,7 @@ setElementTypePrefix(XML_Parser parser, ELEMENT_TYPE *elementType) - else - poolDiscard(&dtd->pool); - elementType->prefix = prefix; -- -+ break; - } - } - return 1; diff --git a/external/poky/meta/recipes-core/expat/expat/autotools.patch b/external/poky/meta/recipes-core/expat/expat/autotools.patch deleted file mode 100644 index 104717ea..00000000 --- a/external/poky/meta/recipes-core/expat/expat/autotools.patch +++ /dev/null @@ -1,25 +0,0 @@ -Avoid using expat's m4 files - -Upstream-Status: Inappropriate [Other] -Workaround specific to our build system. - -Signed-off-by: Kevin Tian <kevin.tian@intel.com> -Signed-off-by: Scott Garman <scott.a.garman@intel.com> - -Updated to apply over expat 2.1.0 - -Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> - -Index: expat-2.2.5/configure.ac -=================================================================== ---- expat-2.2.5.orig/configure.ac -+++ expat-2.2.5/configure.ac -@@ -53,8 +53,6 @@ LIBAGE=6 # CMakeLists.txt! - CPPFLAGS="${CPPFLAGS} -DHAVE_EXPAT_CONFIG_H" - AC_CONFIG_HEADER(expat_config.h) - --sinclude(conftools/ac_c_bigendian_cross.m4) -- - AC_LIBTOOL_WIN32_DLL - AC_PROG_LIBTOOL - diff --git a/external/poky/meta/recipes-core/expat/expat_2.2.6.bb b/external/poky/meta/recipes-core/expat/expat_2.2.9.bb index 0cef7055..8f3db413 100644 --- a/external/poky/meta/recipes-core/expat/expat_2.2.6.bb +++ b/external/poky/meta/recipes-core/expat/expat_2.2.9.bb @@ -7,13 +7,11 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \ - file://autotools.patch \ file://libtool-tag.patch \ - file://CVE-2018-20843.patch;striplevel=2 \ " -SRC_URI[md5sum] = "ca047ae951b40020ac831c28859161b2" -SRC_URI[sha256sum] = "17b43c2716d521369f82fc2dc70f359860e90fa440bea65b3b85f0b246ea81f2" +SRC_URI[md5sum] = "875a2c2ff3e8eb9e5a5cd62db2033ab5" +SRC_URI[sha256sum] = "f1063084dc4302a427dabcca499c8312b3a32a29b7d2506653ecc8f950a9a237" inherit autotools lib_package |