Clean up old, vulnerable revision, bug #271742.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 6 insertions, 102 deletions

diff --git a/dev-libs/libxslt/ChangeLog b/dev-libs/libxslt/ChangeLog
index ccfc77dcff08..c2bf2c93e25a 100644
--- a/dev-libs/libxslt/ChangeLog
+++ b/dev-libs/libxslt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libxslt
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/ChangeLog,v 1.188 2008/08/04 22:38:49 eva Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/ChangeLog,v 1.189 2009/05/31 18:37:29 eva Exp $
+
+  31 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/libxslt-1.1.20-amd64.patch, -libxslt-1.1.22.ebuild:
+  Clean up old, vulnerable revision, bug #271742.
 
   04 Aug 2008; Gilles Dartiguelongue <eva@gentoo.org>
   -libxslt-1.1.23.ebuild, -libxslt-1.1.24.ebuild:
diff --git a/dev-libs/libxslt/files/libxslt-1.1.20-amd64.patch b/dev-libs/libxslt/files/libxslt-1.1.20-amd64.patch
deleted file mode 100644
index ab9b4766c18d..000000000000
--- a/dev-libs/libxslt/files/libxslt-1.1.20-amd64.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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.22.ebuild b/dev-libs/libxslt/libxslt-1.1.22.ebuild
deleted file mode 100644
index 587195c0eb27..000000000000
--- a/dev-libs/libxslt/libxslt-1.1.22.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.22.ebuild,v 1.12 2008/03/26 03:41:42 ricmm 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 examples 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}"/${PN}-1.1.20-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() {
-	emake DESTDIR="${D}" install || die "Installation failed"
-
-	dodoc AUTHORS ChangeLog Copyright FEATURES NEWS README TODO
-
-	if ! use examples; then
-		rm -rf "${D}/usr/share/doc/${PN}-python-${PV}/examples"
-	fi
-}