Fix inkscape extension loader problem per bug #285125, patch import from upstream bug #595128, thanks to Andreas Proteus <proteuss@sdf.lonestar.org> for tests

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

4 files changed, 187 insertions, 12 deletions

diff --git a/dev-libs/libxml2/ChangeLog b/dev-libs/libxml2/ChangeLog
index d6fdc58618a2..63dc6c0ef84e 100644
--- a/dev-libs/libxml2/ChangeLog
+++ b/dev-libs/libxml2/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/libxml2
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.273 2009/09/13 23:05:47 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.274 2009/09/16 08:05:17 mrpouet Exp $
+
+*libxml2-2.7.4-r1 (16 Sep 2009)
+
+  16 Sep 2009; Romain Perier <mrpouet@gentoo.org>
+  +libxml2-2.7.4-r1.ebuild, +files/libxml2-2.7.4-parser-grow.patch:
+  Fix inkscape extension loader problem per bug #285125, patch import from
+  upstream bug #595128, thanks to Andreas Proteus
+  <proteuss@sdf.lonestar.org> for tests.
 
 *libxml2-2.7.4 (13 Sep 2009)
 
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 17557b44e065..766051f1e5af 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX libxml2-2.7.3-CVE-2009-2414-CVE-2009-2416.patch 6356 RMD160 a8c9086e5f0c1816ae1f8de8e27ae828c05c6a04 SHA1 28c2219b8e3b3a693d7e2553d239863ad21b41d5 SHA256 03f26db3f24e7fb91c489208f992f327c767135949e8e25d180df8b76065e7ef
 AUX libxml2-2.7.3-printf-rename.patch 17280 RMD160 920065d543127026c526f00856e9a2a8fb41e42d SHA1 9a9515a1ea7c7313aa8e6bb607f987560504aaed SHA256 a7206cbd8a675e2d944f330255d648502d143472a2d96daa4753e422614b8520
+AUX libxml2-2.7.4-parser-grow.patch 1309 RMD160 7364ec69b3929ed5976d8faf3c6cdb2359d2fce6 SHA1 6f703b7a3e32ad2728827a0ca976b93953719d27 SHA256 0003cf89dc6de0ea8be4e063745f4f585b329ab47bfdc71c81e4918dfd461584
 DIST libxml2-2.7.3.tar.gz 4789450 RMD160 14018347531fd135366cee9fd9d760a1988546e2 SHA1 fd4e427fb55c977876bc74c0e552ef7d3d794a07 SHA256 432464d8c9bd8060d9c1fdef1cfa75803c1a363ceac20b21f8c7e34e056e5a98
 DIST libxml2-2.7.4.tar.gz 4835073 RMD160 c1d29b6b869cb07cfd78a93ac9b8dd24c2b801b1 SHA1 5db9fd452d465422f576592c9e5bcf17ce1b53a2 SHA256 f10ff01a25750913828b69625ac9d1f1f82039aa8401ca843c1d335763cbf5b1
 DIST xsts-2002-01-16.tar.gz 6894439 RMD160 e8905fe1451a1c367b0104af24edca73bad1db08 SHA1 ca6344e6c47f8c28231f5b213d0c8deb0311a409 SHA256 55e5c08db29946a91ea8e70e8f2418d3fd30d8b6777941dfba7f54726ffd9914
 DIST xsts-2004-01-14.tar.gz 2761085 RMD160 faff2d7826e47ae9968564bc83dab1b54c5e4bf6 SHA1 5896c2aa2cda464246306c5cf0577ed506eefaab SHA256 09bdf9f81f381ebf9bc158a9472e498e896f7a02eb7461146e9abe1b9493ca17
 EBUILD libxml2-2.7.3-r2.ebuild 4453 RMD160 37ffaaee427f6eec4d8e683cd0c209dd11ee58b8 SHA1 22b2e24584a39d2f5d372aa15c335fb803bd5de2 SHA256 b9aa76091d1d31340fe8b5092f313ed4b1662b55ac25dfaa07984240c660b38e
+EBUILD libxml2-2.7.4-r1.ebuild 4132 RMD160 d313e81bf5b06954ac0e456794ea332e3158ae95 SHA1 3638a3a4975e81a678b140ed70e8401995537395 SHA256 82112586dfb40bfef83dbcf62d72ba9f0ace95c1a81a36348d50227b2cbdaf7d
 EBUILD libxml2-2.7.4.ebuild 3981 RMD160 427d2424c57712cbccf4b31857be48abb7517727 SHA1 49b0b6f3fd405cbe07188bac8aef8c8bb18a6dd4 SHA256 955cd843cfa579c47cb640fd0d0f439d497dc6962cf74ff77a493b9cd9fb9f41
-MISC ChangeLog 36498 RMD160 e7a972b608e518cc1decd7f74b985235c3f7c694 SHA1 a503fc7896c8fca11441a32b0d035a89296a1f55 SHA256 0375a0b361dd67bb3ce0011af0ad9ddfa5ac596e432ed3bed63ebe75816085fa
+MISC ChangeLog 36820 RMD160 1e6ca9464ee29bc8acb65fb6fbce72baeb05e0c8 SHA1 32939b7135ef451402c31c71b1f6f393df799a66 SHA256 1feb975ad009d393ba4f597e4c62004d89944a0bc47e5e6ceb98d39b5803fdc3
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqtetIACgkQ1fmVwcYIWAaUHACgsvC4qEbdMhrCcicsHS2ZmEWr
-wWAAnjifIE3E7NjX/t65qn0WK6dqIsDQ
-=QyvA
------END PGP SIGNATURE-----
diff --git a/dev-libs/libxml2/files/libxml2-2.7.4-parser-grow.patch b/dev-libs/libxml2/files/libxml2-2.7.4-parser-grow.patch
new file mode 100644
index 000000000000..8784a83ec459
--- /dev/null
+++ b/dev-libs/libxml2/files/libxml2-2.7.4-parser-grow.patch
@@ -0,0 +1,34 @@
+From 9d3d141c412baa5c713ad3df48f1a4d179e07b05 Mon Sep 17 00:00:00 2001
+From: Daniel Veillard <veillard@redhat.com>
+Date: Tue, 15 Sep 2009 16:41:30 +0000
+Subject: Fix a parsing problem with little data at startup
+
+* parser.c: inkscape extension loader (and possibly others) feed
+  data to the parser very slowly, 0 at start, 4 bytes on first GROW
+  and this broke after the fix for
+  https://bugzilla.gnome.org/show_bug.cgi?id=566012
+  http://git.gnome.org/cgit/libxml2/commit/?id=7e385bd4e28a0cc12b6b26ed178c620e3c3ab8d8
+  leading to another bug
+  https://bugzilla.redhat.com/show_bug.cgi?id=523002
+  this detects the situation and GROW when needed for proper processing.
+---
+diff --git a/parser.c b/parser.c
+index e415339..b41dcc3 100644
+--- a/parser.c
++++ b/parser.c
+@@ -10130,8 +10130,12 @@ xmlParseDocument(xmlParserCtxtPtr ctxt) {
+     /*
+      * Check for the XMLDecl in the Prolog.
+      * do not GROW here to avoid the detected encoder to decode more
+-     * than just the first line
++     * than just the first line, unless the amount of data is really
++     * too small to hold "<?xml version="1.0" encoding="foo"
+      */
++    if ((ctxt->input->end - ctxt->input->cur) < 35) {
++       GROW;
++    }
+     if ((CMP5(CUR_PTR, '<', '?', 'x', 'm', 'l')) && (IS_BLANK_CH(NXT(5)))) {
+ 
+ 	/*
+--
+cgit v0.8.2
diff --git a/dev-libs/libxml2/libxml2-2.7.4-r1.ebuild b/dev-libs/libxml2/libxml2-2.7.4-r1.ebuild
new file mode 100644
index 000000000000..e3e46bbd0aed
--- /dev/null
+++ b/dev-libs/libxml2/libxml2-2.7.4-r1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.7.4-r1.ebuild,v 1.1 2009/09/16 08:05:17 mrpouet Exp $
+
+EAPI="2"
+
+inherit libtool flag-o-matic eutils python
+
+DESCRIPTION="Version 2 of the library to manipulate XML files"
+HOMEPAGE="http://www.xmlsoft.org/"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="debug doc examples ipv6 python readline test"
+
+XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
+XSTS_NAME_1="xmlschema2002-01-16"
+XSTS_NAME_2="xmlschema2004-01-14"
+XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
+XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
+
+SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz
+	test? (
+		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
+		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} )"
+
+RDEPEND="sys-libs/zlib
+	python? ( dev-lang/python )
+	readline? ( sys-libs/readline )"
+
+DEPEND="${RDEPEND}
+	hppa? ( >=sys-devel/binutils-2.15.92.0.2 )"
+
+src_unpack() {
+	# ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR,
+	# as they are needed as tarballs in ${S}/xstc instead and not unpacked
+	unpack ${P}.tar.gz
+	cd "${S}"
+
+	if use test; then
+		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
+			"${DISTDIR}/${XSTS_TARBALL_2}" \
+			"${S}"/xstc/ \
+			|| die "Failed to install test tarballs"
+	fi
+
+	# Fix inkscape extension loader problem, bug #285125,
+	# patch import from upstream bug #595128.
+	epatch "${FILESDIR}"/${P}-parser-grow.patch
+}
+
+src_prepare() {
+	epunt_cxx
+}
+
+src_configure() {
+	# USE zlib support breaks gnome2
+	# (libgnomeprint for instance fails to compile with
+	# fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
+
+	# The meaning of the 'debug' USE flag does not apply to the --with-debug
+	# switch (enabling the libxml2 debug module). See bug #100898.
+
+	# --with-mem-debug causes unusual segmentation faults (bug #105120).
+
+	local myconf="--with-zlib \
+		--with-html-subdir=${PF}/html \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_with debug run-debug)  \
+		$(use_with python)           \
+		$(use_with readline)         \
+		$(use_with readline history) \
+		$(use_enable ipv6) \
+		PYTHON_SITE_PACKAGES=$(python_get_sitedir)"
+
+	# Please do not remove, as else we get references to PORTAGE_TMPDIR
+	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
+	elibtoolize
+
+	# filter seemingly problematic CFLAGS (#26320)
+	filter-flags -fprefetch-loop-arrays -funroll-loops
+
+	econf $myconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		EXAMPLES_DIR=/usr/share/doc/${PF}/examples \
+		docsdir=/usr/share/doc/${PF}/python \
+		exampledir=/usr/share/doc/${PF}/python/examples \
+		install || die "Installation failed"
+
+	rm "${D}"/usr/share/doc/${P}/{AUTHORS,ChangeLog,Copyright,NEWS,README*,TODO*}
+	dodoc AUTHORS ChangeLog Copyright NEWS README* TODO* || die "dodoc failed"
+
+	if ! use python; then
+		rm -rf "${D}"/usr/share/doc/${PF}/python
+		rm -rf "${D}"/usr/share/doc/${PN}-python-${PV}
+	fi
+
+	if ! use doc; then
+		rm -rf "${D}"/usr/share/gtk-doc
+		rm -rf "${D}"/usr/share/doc/${PF}/html
+	fi
+
+	if ! use examples; then
+		rm -rf "${D}/usr/share/doc/${PF}/examples"
+		rm -rf "${D}/usr/share/doc/${PF}/python/examples"
+	fi
+}
+
+pkg_postinst() {
+	if use python; then
+		python_need_rebuild
+		python_mod_optimize $(python_get_sitedir)
+	fi
+
+	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
+	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
+	if [ "${ROOT}" != "/" ]
+	then
+		elog "Skipping XML catalog creation for stage building (bug #208887)."
+	else
+		# need an XML catalog, so no-one writes to a non-existent one
+		CATALOG="${ROOT}etc/xml/catalog"
+
+		# we dont want to clobber an existing catalog though,
+		# only ensure that one is there
+		# <obz@gentoo.org>
+		if [ ! -e ${CATALOG} ]; then
+			[ -d "${ROOT}etc/xml" ] || mkdir -p "${ROOT}etc/xml"
+			/usr/bin/xmlcatalog --create > ${CATALOG}
+			einfo "Created XML catalog in ${CATALOG}"
+		fi
+	fi
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages
+}