summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2012-03-27 19:58:07 -0300
committerPeter Korsgaard <jacmet@sunsite.dk>2012-04-02 23:31:04 +0200
commit52201e2d1151f3a6fb61f73c7bf54814cf26b672 (patch)
treeac6955ebe2c7cff2e5bc07839b3dc45c1c054a8a
parent71cec7c82ce01706ec85155cb18850e025af8156 (diff)
expat: security bump to version 2.1.0
Fixes for CVE-2012-1147, CVE-2009-3720, CVE-2009-3560, CVE-2012-1148 and CVE-2012-0876. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/expat/expat-2.0.1-CVE-2009-3560.patch14
-rw-r--r--package/expat/expat.mk4
2 files changed, 2 insertions, 16 deletions
diff --git a/package/expat/expat-2.0.1-CVE-2009-3560.patch b/package/expat/expat-2.0.1-CVE-2009-3560.patch
deleted file mode 100644
index 7cadc47b0..000000000
--- a/package/expat/expat-2.0.1-CVE-2009-3560.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://nvd.nist.gov/nvd.cfm?cvename=CVE-2009-3560
-
---- a/lib/xmlparse.c
-+++ b/lib/xmlparse.c
-@@ -3703,6 +3703,9 @@ doProlog(XML_Parser parser,
- return XML_ERROR_UNCLOSED_TOKEN;
- case XML_TOK_PARTIAL_CHAR:
- return XML_ERROR_PARTIAL_CHAR;
-+ case -XML_TOK_PROLOG_S:
-+ tok = -tok;
-+ break;
- case XML_TOK_NONE:
- #ifdef XML_DTD
- /* for internal PE NOT referenced between declarations */
diff --git a/package/expat/expat.mk b/package/expat/expat.mk
index b179383ff..ea008db01 100644
--- a/package/expat/expat.mk
+++ b/package/expat/expat.mk
@@ -4,8 +4,8 @@
#
#############################################################
-EXPAT_VERSION = 2.0.1
-EXPAT_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/expat
+EXPAT_VERSION = 2.1.0
+EXPAT_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/project/expat/expat/$(EXPAT_VERSION)
EXPAT_INSTALL_STAGING = YES
EXPAT_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) installlib
EXPAT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) installlib