summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArun Raghavan <ford_prefect@gentoo.org>2008-07-26 20:17:56 +0000
committerArun Raghavan <ford_prefect@gentoo.org>2008-07-26 20:17:56 +0000
commitd2af1ca090a8d8308a46f330ceccbb1be6d4b4ee (patch)
tree451c7acbaf7c53aba068f6e14fbc6a8d48b562dc /dev-libs
parentRemove gst-plugins-opengl from tree since it disappeared from upstream package. (diff)
downloadhistorical-d2af1ca090a8d8308a46f330ceccbb1be6d4b4ee.tar.gz
historical-d2af1ca090a8d8308a46f330ceccbb1be6d4b4ee.tar.bz2
historical-d2af1ca090a8d8308a46f330ceccbb1be6d4b4ee.zip
Add patch from upstream svn to prevent a crash in Python expat bindings (bug #197043)
Package-Manager: portage-2.2_rc3/cvs/Linux 2.6.26 i686
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/expat/ChangeLog9
-rw-r--r--dev-libs/expat/Manifest4
-rw-r--r--dev-libs/expat/expat-2.0.1-r1.ebuild40
-rw-r--r--dev-libs/expat/files/expat-2.0.1-check_stopped_parser.patch11
4 files changed, 62 insertions, 2 deletions
diff --git a/dev-libs/expat/ChangeLog b/dev-libs/expat/ChangeLog
index 2a291871872e..6222082fd0c1 100644
--- a/dev-libs/expat/ChangeLog
+++ b/dev-libs/expat/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-libs/expat
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.70 2008/03/10 01:39:03 ricmm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.71 2008/07/26 20:17:56 ford_prefect Exp $
+
+*expat-2.0.1-r1 (26 Jul 2008)
+
+ 26 Jul 2008; Arun Raghavan <ford_prefect@gentoo.org>
+ +files/expat-2.0.1-check_stopped_parser.patch, +expat-2.0.1-r1.ebuild:
+ Add patch from upstream svn to prevent a crash in Python expat bindings
+ (bug #197043)
10 Mar 2008; <ricmm@gentoo.org> expat-1.95.8.ebuild:
Drop to ~mips due to unstable deps
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index b44c79abd025..7218d426ae9b 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -1,6 +1,8 @@
+AUX expat-2.0.1-check_stopped_parser.patch 412 RMD160 bbf6ed4ba1d1f49a00703e5685c043bdf681f75d SHA1 096af876282e06589aa8c4574edb0756d6bc635a SHA256 71e8c5a172115896f170c2867237d78468cb937c836f00bd7456ea8cb3c22de7
DIST expat-1.95.8.tar.gz 318349 RMD160 1b3e5a50a28e2c8efb79188d4c3071318fe1d0dd SHA1 73cb8fc326d04c44ae0e3b3f797f0e6ba9c4121f SHA256 c6aaa0b427e775a0fd5a956a75ae41e5110f22760723d9bda316100010e891ca
DIST expat-2.0.1.tar.gz 446456 RMD160 d31bcb152adaff9e358968be1ea901e1b4ed3b2f SHA1 663548c37b996082db1f2f2c32af060d7aa15c2d SHA256 847660b4df86e707c9150e33cd8c25bc5cd828f708c7418e765e3e983a2e5e93
EBUILD expat-1.95.8.ebuild 1000 RMD160 0fd8745758f3ed8370527656eb1a7016b26e6905 SHA1 009bfc1745adfd9bd6a4ed23885b58377ba4cf2c SHA256 951b7a0c58e00d1064c634cf38aa0d3b1415c720cbcff840dc94dcdd4f150da8
+EBUILD expat-2.0.1-r1.ebuild 1056 RMD160 fa25229c5ac105c5f2c8198258e1c5378dde91d0 SHA1 dc8d97d1ce3f4e2b9b8d4d7197aa8559959210b6 SHA256 9b6db9f6f01a7f729119903f1cc802268ce0f26c063f48f8f174ccb06e107df8
EBUILD expat-2.0.1.ebuild 915 RMD160 22d0186a53af96e033cb838ef62c0a03b39b4bf1 SHA1 7e6b38696569e37e6f3ac452752d0f5b059a210f SHA256 50a8abb3165617467166b2e48ad2e31a1bac18af5030aeaab385111961861f0f
-MISC ChangeLog 9052 RMD160 73f749e1429c9fff1317d0bba4f20e52192d9e57 SHA1 7d20b1099bf464acaa1e46a0ad01130a7544a4f5 SHA256 9d261b5f0e18954f76296d2cee159b89da75a241e64b1cd6283b284f0ddf85f7
+MISC ChangeLog 9309 RMD160 38eb9a7e62b624502d1e62a68a1c74de76e0a088 SHA1 45566532d25685bc793c6bc4f5c28285a4290b62 SHA256 fcca5690563921c81895b79dc7cf6cdee1e5881e84a11eb4e059d6ea11d65434
MISC metadata.xml 166 RMD160 70f6dcdab1516411ac581b270671fb776401f7b3 SHA1 79f7c7e01fdc4b59d924371b4ec75b000948fecc SHA256 a4f7a9f8f89d2da4f8d0c2d6acdacc96c38d4c076d23d8b2081f2a149ff15a56
diff --git a/dev-libs/expat/expat-2.0.1-r1.ebuild b/dev-libs/expat/expat-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..2289f7db429f
--- /dev/null
+++ b/dev-libs/expat/expat-2.0.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2008 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-r1.ebuild,v 1.1 2008/07/26 20:17:56 ford_prefect Exp $
+
+inherit eutils libtool
+
+DESCRIPTION="XML parsing libraries"
+HOMEPAGE="http://expat.sourceforge.net/"
+SRC_URI="mirror://sourceforge/expat/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ # fix segmentation fault in python tests (bug #197043)
+ epatch "${FILESDIR}/${P}-check_stopped_parser.patch"
+
+ elibtoolize
+}
+
+src_install() {
+ make install DESTDIR="${D}" || die
+ dodoc Changes README
+ dohtml doc/*
+}
+
+pkg_postinst() {
+ ewarn "Please note that the soname of the library changed!"
+ ewarn "If you are upgrading from a previous version you need"
+ ewarn "to fix dynamic linking inconsistencies by executing:"
+ ewarn "revdep-rebuild -X --library libexpat.so.0"
+}
diff --git a/dev-libs/expat/files/expat-2.0.1-check_stopped_parser.patch b/dev-libs/expat/files/expat-2.0.1-check_stopped_parser.patch
new file mode 100644
index 000000000000..23cebfdc43a5
--- /dev/null
+++ b/dev-libs/expat/files/expat-2.0.1-check_stopped_parser.patch
@@ -0,0 +1,11 @@
+--- lib/xmlparse.c 2007-05-08 05:25:35.000000000 +0300
++++ lib/xmlparse.c 2008-01-08 13:17:07.000000000 +0200
+@@ -2563,6 +2563,8 @@
+ (int)(dataPtr - (ICHAR *)dataBuf));
+ if (s == next)
+ break;
++ if (ps_parsing == XML_FINISHED || ps_parsing == XML_SUSPENDED)
++ break;
+ *eventPP = s;
+ }
+ }