summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-02-17 12:01:24 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-02-17 12:01:24 +0000
commit09bf736d49d242d5f178b6b500b9233223632eb8 (patch)
tree09236ab0ece6818a841d290466dd5279048cf02a /dev-libs
parentNew ebuild for xdsi (diff)
downloadgentoo-2-09bf736d49d242d5f178b6b500b9233223632eb8.tar.gz
gentoo-2-09bf736d49d242d5f178b6b500b9233223632eb8.tar.bz2
gentoo-2-09bf736d49d242d5f178b6b500b9233223632eb8.zip
Revision bump for security #303727 (CVE-2009-3560).
(Portage version: 2.2_rc62/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/expat/ChangeLog10
-rw-r--r--dev-libs/expat/expat-2.0.1-r3.ebuild34
-rw-r--r--dev-libs/expat/files/expat-2.0.1-CVE-2009-3560-revised.patch16
3 files changed, 58 insertions, 2 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/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 */