diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-09-26 15:04:27 -0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-09-26 15:04:27 -0400 |
| commit | 013b137325430bd8d13beccfa2874d0f44169989 (patch) | |
| tree | b14892b0984cafc395ad379ee37925fc07663659 | |
| parent | 99df2b42a719d9729508c1e2e6f59835f5d7c743 (diff) | |
| download | nixpkgs-013b137325430bd8d13beccfa2874d0f44169989.tar nixpkgs-013b137325430bd8d13beccfa2874d0f44169989.tar.gz nixpkgs-013b137325430bd8d13beccfa2874d0f44169989.tar.bz2 nixpkgs-013b137325430bd8d13beccfa2874d0f44169989.tar.lz nixpkgs-013b137325430bd8d13beccfa2874d0f44169989.tar.xz nixpkgs-013b137325430bd8d13beccfa2874d0f44169989.tar.zst nixpkgs-013b137325430bd8d13beccfa2874d0f44169989.zip | |
expat: Update to 2.1.0
| -rw-r--r-- | pkgs/development/libraries/expat/cve-2009-3560.patch | 18 | ||||
| -rw-r--r-- | pkgs/development/libraries/expat/default.nix | 14 |
2 files changed, 6 insertions, 26 deletions
diff --git a/pkgs/development/libraries/expat/cve-2009-3560.patch b/pkgs/development/libraries/expat/cve-2009-3560.patch deleted file mode 100644 index 71da9e39351..00000000000 --- a/pkgs/development/libraries/expat/cve-2009-3560.patch +++ /dev/null @@ -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 */ diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index 35a2945207b..6b675230119 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -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"; }; } |