Applied fix for missing dictionary in xslt.c which was causing crashes in kopete. Should be fixed in 1.1.14 (it's in CVS). See bug #86327, and the linked upstream bug

Package-Manager: portage-2.0.51.19

5 files changed, 85 insertions, 2 deletions

diff --git a/dev-libs/libxslt/ChangeLog b/dev-libs/libxslt/ChangeLog
index 793a71996819..5faa578479bd 100644
--- a/dev-libs/libxslt/ChangeLog
+++ b/dev-libs/libxslt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/libxslt
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/ChangeLog,v 1.96 2005/03/22 02:46:17 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/ChangeLog,v 1.97 2005/03/25 02:00:53 obz Exp $
+
+*libxslt-1.1.13-r1 (25 Mar 2005)
+
+  25 Mar 2005; Mike Gardiner <obz@gentoo.org>
+  +files/libxslt-1.1.13-xslt.patch, +libxslt-1.1.13-r1.ebuild:
+  Applied fix for missing dictionary in xslt.c which was causing crashes in
+  kopete. Should be fixed in 1.1.14 (it's in CVS). See bug #86327, and the
+  linked upstream bug
 
   22 Mar 2005; Mike Gardiner <obz@gentoo.org> libxslt-1.1.13.ebuild:
   Requires >=dev-libs/libxml2-2.6.17, see bug #86157
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index 38d65ab3c2b4..ace1cf71e3c5 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -1,11 +1,14 @@
-MD5 16217725dee3f7df8e8b4b80a407702c ChangeLog 11351
+MD5 f312079d5aae08b8bc34c46b857c2867 ChangeLog 11668
 MD5 ed13d05407071759b2b03e9c7b62b94e libxslt-1.1.6.ebuild 700
+MD5 2eecf4b687f32617215484eebd34c297 libxslt-1.1.13-r1.ebuild 1196
 MD5 b78b05c0d2dee0e5531e11c61242427f libxslt-1.1.9-r1.ebuild 982
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 7a9330a8af2546205073f0ca629f183f libxslt-1.1.12.ebuild 989
 MD5 66a192c6c3f8ed39532b82f4711eb780 libxslt-1.1.13.ebuild 994
 MD5 119f25b7ef082d3e7d32396885432652 files/digest-libxslt-1.1.6 67
+MD5 ba955ecf3fb1912956c89db250c6e233 files/libxslt-1.1.13-xslt.patch 819
 MD5 f7a67da65c2cf6f2a4979ff10bb3987c files/digest-libxslt-1.1.9-r1 67
 MD5 a772cd7aafe8f9e0fd59de02b2ea2e85 files/libxslt.m4-libxslt-1.1.8.patch 1292
 MD5 0036be4a6749d5a3fc499f2732f59031 files/digest-libxslt-1.1.12 68
 MD5 780e9916a203e55f64b65de63eccae51 files/digest-libxslt-1.1.13 68
+MD5 780e9916a203e55f64b65de63eccae51 files/digest-libxslt-1.1.13-r1 68
diff --git a/dev-libs/libxslt/files/digest-libxslt-1.1.13-r1 b/dev-libs/libxslt/files/digest-libxslt-1.1.13-r1
new file mode 100644
index 000000000000..e11ed90d303b
--- /dev/null
+++ b/dev-libs/libxslt/files/digest-libxslt-1.1.13-r1
@@ -0,0 +1 @@
+MD5 a3926a140d71d40a5178905538b04644 libxslt-1.1.13.tar.bz2 1812311
diff --git a/dev-libs/libxslt/files/libxslt-1.1.13-xslt.patch b/dev-libs/libxslt/files/libxslt-1.1.13-xslt.patch
new file mode 100644
index 000000000000..65a8682526b6
--- /dev/null
+++ b/dev-libs/libxslt/files/libxslt-1.1.13-xslt.patch
@@ -0,0 +1,25 @@
+diff -ur libxslt-1.1.13/libxslt/xslt.c libxslt-1.1.13-patched/libxslt/xslt.c
+--- libxslt-1.1.13/libxslt/xslt.c	2005-01-23 04:58:02.000000000 +0800
++++ libxslt-1.1.13-patched/libxslt/xslt.c	2005-03-25 09:48:03.705023480 +0800
+@@ -1534,14 +1534,17 @@
+ 			while (text != NULL) {
+ 			    if ((text->content != NULL) &&
+ 			        (!xmlDictOwns(style->dict, text->content))) {
+-				xmlChar *old = (xmlChar *) text->content;
+ 
+ 				/*
+ 				 * internalize the text string
+ 				 */
+-				text->content = (xmlChar *)
+-					xmlDictLookup(style->dict, old, -1);
+-				xmlFree(old);
++				if (text->doc->dict != NULL) {
++				    xmlChar *old = (xmlChar *) text->content;
++				    text->content = 
++					(xmlChar *) xmlDictLookup(
++						text->doc->dict, old, -1);
++				    xmlFree(old);
++				}
+ 			    }
+ 
+ 			    next = text->next;
diff --git a/dev-libs/libxslt/libxslt-1.1.13-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.13-r1.ebuild
new file mode 100644
index 000000000000..18ca9b3d7bf5
--- /dev/null
+++ b/dev-libs/libxslt/libxslt-1.1.13-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.13-r1.ebuild,v 1.1 2005/03/25 02:00:53 obz Exp $
+
+inherit libtool gnome.org eutils python
+
+DESCRIPTION="XSLT libraries and tools"
+HOMEPAGE="http://www.xmlsoft.org/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="python crypt"
+
+DEPEND=">=dev-libs/libxml2-2.6.17
+	crypt? ( >=dev-libs/libgcrypt-1.1.92 )
+	python? ( dev-lang/python )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# we still require the 1.1.8 patch for the .m4 file, to add
+	# the CXXFLAGS defines <obz@gentoo.org>
+	epatch ${FILESDIR}/libxslt.m4-${PN}-1.1.8.patch
+
+	# patch for xslt missing dictionary, see:
+	# http://bugs.gentoo.org/show_bug.cgi?id=86327 and
+	# http://bugzilla.gnome.org/show_bug.cgi?id=170533
+	# <obz@gentoo.org>
+	epatch ${FILESDIR}/${P}-xslt.patch
+
+	elibtoolize
+}
+
+src_compile() {
+	econf \
+		$(use_with python) \
+		$(use_with crypt crypto) \
+		|| die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install
+	dodoc AUTHORS ChangeLog README NEWS TODO
+}