Zero out allocated memory, to fix a core on amd64. Bug #190388

Package-Manager: portage-2.1.3.7

5 files changed, 131 insertions, 5 deletions

diff --git a/dev-libs/libxslt/ChangeLog b/dev-libs/libxslt/ChangeLog
index bb4c0928e00a..922045cd8a9a 100644
--- a/dev-libs/libxslt/ChangeLog
+++ b/dev-libs/libxslt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libxslt
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/ChangeLog,v 1.154 2007/06/02 02:44:54 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/ChangeLog,v 1.155 2007/08/29 15:13:01 dang Exp $
+
+*libxslt-1.1.20-r1 (29 Aug 2007)
+
+  29 Aug 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/libxslt-1.1.20-amd64.patch, +libxslt-1.1.20-r1.ebuild:
+  Zero out allocated memory, to fix a core on amd64.  Bug #190388
 
   02 Jun 2007; Brent Baude <ranger@gentoo.org> libxslt-1.1.20.ebuild:
   Marking libxslt-1.1.20 ppc stable for bug #171107
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index 00c1d33856f8..f41eeaa2136b 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -1,7 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libxslt-1.1.16-destdir.patch 571 RMD160 31b3581827c4a623e0dab1d4c1face8c1307fad3 SHA1 9a1b19251ef14606492fe406dc3d140abd5efa92 SHA256 c46ac77f8fd0d876eea0f818e4c801a3d365ff8f8800645e47527542575cc962
 MD5 bde8b0164cdd2c5d451065c16f5df1ac files/libxslt-1.1.16-destdir.patch 571
 RMD160 31b3581827c4a623e0dab1d4c1face8c1307fad3 files/libxslt-1.1.16-destdir.patch 571
 SHA256 c46ac77f8fd0d876eea0f818e4c801a3d365ff8f8800645e47527542575cc962 files/libxslt-1.1.16-destdir.patch 571
+AUX libxslt-1.1.20-amd64.patch 1170 RMD160 ef955eeabc7797d3b6960106da7e98ab0a833cf4 SHA1 204d5d7187bd37de24da79c11211a37e85fa9c1f SHA256 74fc561c39c6507244b5ca8dc2bc758adc5e380dc013673c044bb7423509eb25
+MD5 fe98d427458b8230f692fea2343ef070 files/libxslt-1.1.20-amd64.patch 1170
+RMD160 ef955eeabc7797d3b6960106da7e98ab0a833cf4 files/libxslt-1.1.20-amd64.patch 1170
+SHA256 74fc561c39c6507244b5ca8dc2bc758adc5e380dc013673c044bb7423509eb25 files/libxslt-1.1.20-amd64.patch 1170
 AUX libxslt.m4-libxslt-1.1.8.patch 1292 RMD160 0dcd21978aa0102784df670f2c9835da227f42c8 SHA1 ffa3c5ff84b0636ec4238167e324d377305c4d34 SHA256 0da59fb6cb50bf30e8ac79644df90394707ac07e60337aa3c0e53986781e9e0d
 MD5 a772cd7aafe8f9e0fd59de02b2ea2e85 files/libxslt.m4-libxslt-1.1.8.patch 1292
 RMD160 0dcd21978aa0102784df670f2c9835da227f42c8 files/libxslt.m4-libxslt-1.1.8.patch 1292
@@ -12,14 +19,18 @@ EBUILD libxslt-1.1.17.ebuild 1862 RMD160 5f3e7fcb20ab366ceeaecb69306c53f52d035f4
 MD5 53cf036850bb10e6dfa434ca363eba17 libxslt-1.1.17.ebuild 1862
 RMD160 5f3e7fcb20ab366ceeaecb69306c53f52d035f45 libxslt-1.1.17.ebuild 1862
 SHA256 69da90494cb59640fac1cf9118f4a49bda6a53aca85ff1c64b946d9ce5789e22 libxslt-1.1.17.ebuild 1862
+EBUILD libxslt-1.1.20-r1.ebuild 1889 RMD160 420ae5b5e1acef4b51c038095e8e0bae31b8764a SHA1 218ee5b0cf20370abfdb3432bb6d2ed556b7b857 SHA256 3ac799947a1e3bbaa0a1bd4d5d2a45dd63d7519dfc70643b7a7cbd171c9d1fbf
+MD5 78e77b46022e4c5a41894baed8bec64a libxslt-1.1.20-r1.ebuild 1889
+RMD160 420ae5b5e1acef4b51c038095e8e0bae31b8764a libxslt-1.1.20-r1.ebuild 1889
+SHA256 3ac799947a1e3bbaa0a1bd4d5d2a45dd63d7519dfc70643b7a7cbd171c9d1fbf libxslt-1.1.20-r1.ebuild 1889
 EBUILD libxslt-1.1.20.ebuild 1783 RMD160 2872da9a52bbb848dac43e90167f9ec28167ea0f SHA1 a432585e49568f58f57ee16aea56e23e4e15319f SHA256 0967d2316021bea5cda2c24c13b77bb6979f4dffc7d8cbfebf8e9f92f4d2aab9
 MD5 82a660b05acda67ae68300d98dbb5292 libxslt-1.1.20.ebuild 1783
 RMD160 2872da9a52bbb848dac43e90167f9ec28167ea0f libxslt-1.1.20.ebuild 1783
 SHA256 0967d2316021bea5cda2c24c13b77bb6979f4dffc7d8cbfebf8e9f92f4d2aab9 libxslt-1.1.20.ebuild 1783
-MISC ChangeLog 18315 RMD160 925996bf001bcbb69319c228db155bde85eb3e0a SHA1 ac8f3ae648bf5d2efc17541de4f90d37455ed0be SHA256 f48da530bbe0b9c5c02a7e7bafe72cabdd1911c5a5b8950998cca80a4dcb7daf
-MD5 7abfee2cc44cbb18b9be1d1ccdc1eadd ChangeLog 18315
-RMD160 925996bf001bcbb69319c228db155bde85eb3e0a ChangeLog 18315
-SHA256 f48da530bbe0b9c5c02a7e7bafe72cabdd1911c5a5b8950998cca80a4dcb7daf ChangeLog 18315
+MISC ChangeLog 18529 RMD160 f8fc1d6a573c035d36e4f0c2f20367790ab34eb9 SHA1 0c2b44186ace6b854e917ea97b43c55220e3cd9d SHA256 d19ea6337a7508feaccbf30af032786f64e0913f5bf9ea7c5d732d19de493aa8
+MD5 2f4cc4ab2535fef1f666686ce23be15e ChangeLog 18529
+RMD160 f8fc1d6a573c035d36e4f0c2f20367790ab34eb9 ChangeLog 18529
+SHA256 d19ea6337a7508feaccbf30af032786f64e0913f5bf9ea7c5d732d19de493aa8 ChangeLog 18529
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -30,3 +41,13 @@ SHA256 bcac935f425e6c21dd66d26f727bbf95a41198c1a7f0f849dbacdf8f4df80f23 files/di
 MD5 aeaafc14aa1ac506cd18b42ea42a1fe3 files/digest-libxslt-1.1.20 247
 RMD160 30dd568dc454b8df81b51c82a479e2cc2bb5a8fb files/digest-libxslt-1.1.20 247
 SHA256 ce94b935eebefcf50d28ad6c7eb03351f2291bbf6cf5b13344a923ae422f2030 files/digest-libxslt-1.1.20 247
+MD5 aeaafc14aa1ac506cd18b42ea42a1fe3 files/digest-libxslt-1.1.20-r1 247
+RMD160 30dd568dc454b8df81b51c82a479e2cc2bb5a8fb files/digest-libxslt-1.1.20-r1 247
+SHA256 ce94b935eebefcf50d28ad6c7eb03351f2291bbf6cf5b13344a923ae422f2030 files/digest-libxslt-1.1.20-r1 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.6 (GNU/Linux)
+
+iD8DBQFG1Y05omPajV0RnrERAtZwAJ4rBoGWZQw6Y/E7A74nNjAPsfHnwACeK08f
+vPAV/45yYJmyOYqMyOgYhDE=
+=P8h9
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libxslt/files/digest-libxslt-1.1.20-r1 b/dev-libs/libxslt/files/digest-libxslt-1.1.20-r1
new file mode 100644
index 000000000000..5432130408ce
--- /dev/null
+++ b/dev-libs/libxslt/files/digest-libxslt-1.1.20-r1
@@ -0,0 +1,3 @@
+MD5 4ea2dc22a23bf2aa570f868aa86357f8 libxslt-1.1.20.tar.gz 3689759
+RMD160 f2882ff47312de3b6317136ef751d4b42ab15a53 libxslt-1.1.20.tar.gz 3689759
+SHA256 ce92f00031c885e04cb65ea76c4675b07aa98af9607572fb0d68180c34bf5346 libxslt-1.1.20.tar.gz 3689759
diff --git a/dev-libs/libxslt/files/libxslt-1.1.20-amd64.patch b/dev-libs/libxslt/files/libxslt-1.1.20-amd64.patch
new file mode 100644
index 000000000000..ab9b4766c18d
--- /dev/null
+++ b/dev-libs/libxslt/files/libxslt-1.1.20-amd64.patch
@@ -0,0 +1,29 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN libxslt-1.1.20.orig/python/libxslt.c libxslt-1.1.20/python/libxslt.c
+--- libxslt-1.1.20.orig/python/libxslt.c	2007-01-15 07:51:48.000000000 -0500
++++ libxslt-1.1.20/python/libxslt.c	2007-08-29 10:36:36.000000000 -0400
+@@ -740,7 +740,7 @@ libxslt_xsltApplyStylesheet(PyObject *se
+     PyObject *pyobj_doc;
+     PyObject *pyobj_params;
+     const char **params = NULL;
+-    int len = 0, i = 0, j;
++    int len = 0, i = 0, j, params_size;
+     PyObject *name;
+     PyObject *value;
+ 
+@@ -752,13 +752,14 @@ libxslt_xsltApplyStylesheet(PyObject *se
+ 	if (PyDict_Check(pyobj_params)) {
+ 	    len = PyDict_Size(pyobj_params);
+ 	    if (len > 0) {
+-		params = (const char **) xmlMalloc((len + 1) * 2 *
+-			                           sizeof(char *));
++		params_size = (len + 1) * 2 * sizeof(char *);
++		params = (const char **) xmlMalloc(params_size);
+ 		if (params == NULL) {
+ 		    printf("libxslt_xsltApplyStylesheet: out of memory\n");
+ 		    Py_INCREF(Py_None);
+ 		    return(Py_None);
+ 		}
++		memset(params, 0, params_size);
+ 		j = 0;
+ 		while (PyDict_Next(pyobj_params, &i, &name, &value)) {
+ 		    const char *tmp;
diff --git a/dev-libs/libxslt/libxslt-1.1.20-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.20-r1.ebuild
new file mode 100644
index 000000000000..a48e7025592b
--- /dev/null
+++ b/dev-libs/libxslt/libxslt-1.1.20-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.20-r1.ebuild,v 1.1 2007/08/29 15:13:01 dang Exp $
+
+inherit libtool eutils python
+
+DESCRIPTION="XSLT libraries and tools"
+HOMEPAGE="http://www.xmlsoft.org/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="crypt debug python"
+
+DEPEND=">=dev-libs/libxml2-2.6.27
+	crypt? ( >=dev-libs/libgcrypt-1.1.92 )
+	python? ( dev-lang/python )"
+
+SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
+
+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
+
+	# Using the python bindings causes a core; bug #190388
+	epatch "${FILESDIR}"/${P}-amd64.patch
+
+	# Patch Makefile to fix bug #99382 so that html gets installed in ${PF}
+	sed -i -e 's:libxslt-$(VERSION):${PF}:' doc/Makefile.in
+
+	epunt_cxx
+	elibtoolize
+}
+
+src_compile() {
+	# Always pass --with-debugger. It is required by third parties (see
+	# e.g. bug #98345)
+	local myconf="--with-debugger \
+		$(use_with python)       \
+		$(use_with crypt crypto) \
+		$(use_with debug)        \
+		$(use_with debug mem-debug)"
+
+	econf ${myconf} || die "configure failed"
+
+	# Patching the Makefiles to respect get_libdir
+	# Fixes BUG #86756, please keep this.
+	# Danny van Dyk <kugelfang@gentoo.org> 2005/03/26
+	for x in $(find "${S}" -name "Makefile") ; do
+		sed \
+			-e "s|^\(PYTHON_SITE_PACKAGES\ =\ \/usr\/\).*\(\/python.*\)|\1$(get_libdir)\2|g" \
+			-i ${x} \
+			|| die "sed failed"
+	done
+
+	emake || die "Compilation failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Installation failed"
+
+	dodoc AUTHORS ChangeLog Copyright FEATURES NEWS README TODO
+}