expat: Update to 2.1.0

This commit is contained in:
Eelco Dolstra 2012-09-26 15:04:27 -04:00
parent 99df2b42a7
commit 013b137325
2 changed files with 6 additions and 26 deletions

View File

@ -1,18 +0,0 @@
From: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/expat/files/expat-2.0.1-CVE-2009-3560-revised.patch?revision=1.1
http://nvd.nist.gov/nvd.cfm?cvename=CVE-2009-3560
http://bugs.gentoo.org/show_bug.cgi?id=303727
http://cvs.fedoraproject.org/viewvc/rpms/expat/devel/
--- 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 */

View File

@ -1,17 +1,15 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "expat-2.0.1";
stdenv.mkDerivation rec {
name = "expat-2.1.0";
src = fetchurl {
url = mirror://sourceforge/expat/expat-2.0.1.tar.gz;
sha256 = "14sy5qx9hgjyfs743iq8ywldhp5w4n6cscqf2p4hgrw6vys60xl4";
url = "mirror://sourceforge/expat/${name}.tar.gz";
sha256 = "11pblz61zyxh68s5pdcbhc30ha1b2vfjd83aiwfg4vc15x3hadw2";
};
patches = [ ./cve-2009-3560.patch ];
meta = {
homepage = http://expat.sourceforge.net/;
homepage = http://www.libexpat.org/;
description = "A stream-oriented XML parser library written in C";
};
}