Revision bump for security #303727 (CVE-2009-3560).

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

4 files changed, 61 insertions, 3 deletions

diff --git a/dev-libs/expat/ChangeLog b/dev-libs/expat/ChangeLog
index 17e132ad0c3d..e55f6b56eb18 100644
--- a/dev-libs/expat/ChangeLog
+++ b/dev-libs/expat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/expat
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.89 2009/08/25 16:24:47 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.90 2010/02/17 12:01:23 ssuominen Exp $
+
+*expat-2.0.1-r3 (17 Feb 2010)
+
+  17 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +expat-2.0.1-r3.ebuild, +files/expat-2.0.1-CVE-2009-3560-revised.patch:
+  Revision bump for security #303727 (CVE-2009-3560).
 
   25 Aug 2009; Raúl Porcel <armin76@gentoo.org> expat-2.0.1-r2.ebuild:
   arm/ia64/m68k/s390/sh/sparc stable wrt #280615
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index 81d4c5d6b039..ee0ed99d7f02 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -1,6 +1,8 @@
+AUX expat-2.0.1-CVE-2009-3560-revised.patch 532 RMD160 dea59f98ce296e64cde88910e130f2dda0eab70c SHA1 539bb11a6ae11d83c703c52636fa35d32e7711dc SHA256 1909160d5745b47e54e3db525b94c5992320ddd8ef28a0aaf52c081669cef368
 AUX expat-2.0.1-check_stopped_parser.patch 412 RMD160 bbf6ed4ba1d1f49a00703e5685c043bdf681f75d SHA1 096af876282e06589aa8c4574edb0756d6bc635a SHA256 71e8c5a172115896f170c2867237d78468cb937c836f00bd7456ea8cb3c22de7
 AUX expat-2.0.1-fix_bug_1990430.patch 428 RMD160 7b566a7db9036238a7e781a20157f9b4c13fa0d9 SHA1 5d1c09acaa7d73cae98cda327d79a2d64f3b6926 SHA256 1e491172e983878ca7974c1a40a7327a630b728cc33eb9183f8050b536dcb692
 DIST expat-2.0.1.tar.gz 446456 RMD160 d31bcb152adaff9e358968be1ea901e1b4ed3b2f SHA1 663548c37b996082db1f2f2c32af060d7aa15c2d SHA256 847660b4df86e707c9150e33cd8c25bc5cd828f708c7418e765e3e983a2e5e93
 EBUILD expat-2.0.1-r2.ebuild 912 RMD160 bd2156e3b6b7b157a421534d6522ee4db7c694e1 SHA1 48c5e83c561b3674f7b962f8b71a1fa3a53c884e SHA256 33c25d26f521398e8acbc84efea13523cc8527be34607ca03558f1426921496d
-MISC ChangeLog 11622 RMD160 843f48dd4b32b7e2d16775beff2fa9822a18ecce SHA1 e4edd3fc5a5019b18646bbe061f3ee4319714b38 SHA256 af2a6581c3d94d5920fa346b3756a98c56cd19240aec54ace33de53e198288d0
+EBUILD expat-2.0.1-r3.ebuild 899 RMD160 2f5d3679f057065f10395a7890564d99de52dd5f SHA1 99254d5e2526d16ac8d7fa36659b3bf7ae128216 SHA256 a853477f7f6136f8e9fba482868c7854bf17d7dabbd8e573f4c8614d87c52df5
+MISC ChangeLog 11838 RMD160 a7235eabab7e5850ab248b65adabf8a7186646b8 SHA1 6dd9f188fadcc1992b7494c6457e64aafd96e478 SHA256 36defbf713ed1f7036670b4c3bbf8c3272d59ea10d1c71cf6401d97bb559e1e5
 MISC metadata.xml 166 RMD160 70f6dcdab1516411ac581b270671fb776401f7b3 SHA1 79f7c7e01fdc4b59d924371b4ec75b000948fecc SHA256 a4f7a9f8f89d2da4f8d0c2d6acdacc96c38d4c076d23d8b2081f2a149ff15a56
diff --git a/dev-libs/expat/expat-2.0.1-r3.ebuild b/dev-libs/expat/expat-2.0.1-r3.ebuild
new file mode 100644
index 000000000000..c0c08d05b318
--- /dev/null
+++ b/dev-libs/expat/expat-2.0.1-r3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/expat-2.0.1-r3.ebuild,v 1.1 2010/02/17 12:01:23 ssuominen Exp $
+
+inherit eutils libtool
+
+DESCRIPTION="XML parsing libraries"
+HOMEPAGE="http://expat.sourceforge.net/"
+SRC_URI="mirror://sourceforge/expat/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# fix segmentation fault in python tests (bug #197043)
+	epatch "${FILESDIR}/${P}-check_stopped_parser.patch"
+
+	epatch "${FILESDIR}"/${P}-fix_bug_1990430.patch \
+		"${FILESDIR}"/${P}-CVE-2009-3560-revised.patch
+
+	elibtoolize
+	epunt_cxx
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc Changes README || die
+	dohtml doc/* || die
+}
diff --git a/dev-libs/expat/files/expat-2.0.1-CVE-2009-3560-revised.patch b/dev-libs/expat/files/expat-2.0.1-CVE-2009-3560-revised.patch
new file mode 100644
index 000000000000..301831f0dd69
--- /dev/null
+++ b/dev-libs/expat/files/expat-2.0.1-CVE-2009-3560-revised.patch
@@ -0,0 +1,16 @@
+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/
+
+--- lib/xmlparse.c
++++ 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 */