12 files changed, 9 insertions, 731 deletions
diff --git a/sys-auth/nss_ldap/ChangeLog b/sys-auth/nss_ldap/ChangeLog
index bd74b7f93d58..d52ab00afd21 100644
--- a/sys-auth/nss_ldap/ChangeLog
+++ b/sys-auth/nss_ldap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-auth/nss_ldap
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/ChangeLog,v 1.56 2008/09/24 19:01:23 robbat2 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/ChangeLog,v 1.57 2009/07/28 16:49:56 robbat2 Exp $
+
+  28 Jul 2009; Robin H. Johnson <robbat2@gentoo.org>
+  -nss_ldap-239-r1.ebuild, -nss_ldap-249.ebuild, -nss_ldap-250.ebuild,
+  -nss_ldap-250-r1.ebuild, -files/nss_ldap-250-reconnect-timeouts.patch,
+  -nss_ldap-252.ebuild, -nss_ldap-253.ebuild, -nss_ldap-253-r1.ebuild,
+  -nss_ldap-254.ebuild, -nss_ldap-257.ebuild, -nss_ldap-257.2.ebuild:
+  Bug #271701: Trim old versions that were vulnerable to GLSA 200711-33.
 
 *nss_ldap-262 (24 Sep 2008)
 
diff --git a/sys-auth/nss_ldap/files/nss_ldap-250-reconnect-timeouts.patch b/sys-auth/nss_ldap/files/nss_ldap-250-reconnect-timeouts.patch
deleted file mode 100644
index dc8a37a916ed..000000000000
--- a/sys-auth/nss_ldap/files/nss_ldap-250-reconnect-timeouts.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-This patch changes the default timeouts, so that they are much lower, and do
-not cause major delays when booting a system. This is a workaround until the
-core /etc/{passwd,group} contain all of the data needed for a system boot.
-
-Also add a note that 'ssl on' is broken and TLS should be used instead.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar --exclude '*~' nss_ldap-250.orig/ldap-nss.h nss_ldap-250/ldap-nss.h
---- nss_ldap-250.orig/ldap-nss.h	2006-04-26 18:19:00.000000000 -0700
-+++ nss_ldap-250/ldap-nss.h	2006-06-14 01:58:01.933005492 -0700
-@@ -96,9 +96,9 @@
-  * unacceptable, in which case you may wish to adjust
-  * the constants below.
-  */
--#define LDAP_NSS_TRIES           5	/* number of sleeping reconnect attempts */
--#define LDAP_NSS_SLEEPTIME       4	/* seconds to sleep; doubled until max */
--#define LDAP_NSS_MAXSLEEPTIME    64	/* maximum seconds to sleep */
-+#define LDAP_NSS_TRIES           4	/* number of sleeping reconnect attempts */
-+#define LDAP_NSS_SLEEPTIME       1	/* seconds to sleep; doubled until max */
-+#define LDAP_NSS_MAXSLEEPTIME    16	/* maximum seconds to sleep */
- #define LDAP_NSS_MAXCONNTRIES    2	/* reconnect attempts before sleeping */
- 
- #if defined(HAVE_NSSWITCH_H) || defined(HAVE_IRS_H)
-diff -Nuar --exclude '*~' nss_ldap-250.orig/ldap.conf nss_ldap-250/ldap.conf
---- nss_ldap-250.orig/ldap.conf	2006-04-26 18:19:00.000000000 -0700
-+++ nss_ldap-250/ldap.conf	2006-06-14 02:12:02.008444745 -0700
-@@ -1,4 +1,4 @@
-- @(#)$Id: ldap.conf,v 2.46 2006/04/13 03:25:56 lukeh Exp $
-+# @(#)$Id: ldap.conf,v 2.46 2006/04/13 03:25:56 lukeh Exp $
- #
- # This is the configuration file for the LDAP nameservice
- # switch library and the LDAP PAM module.
-@@ -283,7 +283,8 @@
- # OpenLDAP SSL mechanism
- # start_tls mechanism uses the normal LDAP port, LDAPS typically 636
- #ssl start_tls
--#ssl on
-+###ssl on
-+# Gentoo note: Don't use 'ssl on' in 249/250. They are broken in some cases! Use start_tls instead.
- 
- # OpenLDAP SSL options
- # Require and verify server certificate (yes/no)
-@@ -315,3 +316,27 @@
- # Override the default Kerberos ticket cache location.
- #krb5_ccname FILE:/etc/.ldapcache
- 
-+# Timeout behavior
-+# Upstream nss_ldap hard-codes these values:
-+#nss_reconnect_tries 5			# number of times to double the sleep time
-+#nss_reconnect_sleeptime 4		# initial sleep value
-+#nss_reconnect_maxsleeptime 64	# max sleep value to cap at
-+#nss_reconnect_maxconntries 2	# how many tries before sleeping
-+# This leads to a delay of 124 seconds (4+8+16+32+64=124) per lookup if the
-+# server is not available.
-+
-+# For Gentoo's distribution of nss_ldap, as of 250-r1, we use these values
-+# (The hardwired constants in the code are changed to them as well):
-+nss_reconnect_tries 4			# number of times to double the sleep time
-+nss_reconnect_sleeptime 1		# initial sleep value
-+nss_reconnect_maxsleeptime 16	# max sleep value to cap at
-+nss_reconnect_maxconntries 2	# how many tries before sleeping
-+# This leads to a delay of 15 seconds (1+2+4+8=15)
-+
-+# If you are impatient, and know your LDAP server is reliable, fast or local,
-+# you may wish to use these values instead:
-+#nss_reconnect_tries 1			# number of times to double the sleep time
-+#nss_reconnect_sleeptime 1		# initial sleep value
-+#nss_reconnect_maxsleeptime 1	# max sleep value to cap at
-+#nss_reconnect_maxconntries 3	# how many tries before sleeping
-+# This leads to a delay of 1 second.
diff --git a/sys-auth/nss_ldap/nss_ldap-239-r1.ebuild b/sys-auth/nss_ldap/nss_ldap-239-r1.ebuild
deleted file mode 100644
index dcc26c5fbf7f..000000000000
--- a/sys-auth/nss_ldap/nss_ldap-239-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/nss_ldap-239-r1.ebuild,v 1.13 2007/10/09 23:39:47 robbat2 Exp $
-
-inherit fixheadtails eutils multilib
-
-IUSE="debug"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html"
-SRC_URI="http://www.padl.com/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 hppa mips ppc ppc64 sparc x86"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/nsswitch.ldap.diff
-	epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
-	# fix head/tail stuff
-	ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
-}
-
-src_compile() {
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debugging"
-
-	econf \
-		--with-ldap-lib=openldap \
-		--libdir=/$(get_libdir) \
-		--enable-schema-mapping \
-		--enable-paged-results \
-		--enable-rfc2307bis \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	dodir /$(get_libdir)
-
-	make DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc
-	doins ldap.conf
-
-	dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
-		COPYING CVSVersionInfo.txt README nsswitch.ldap certutil
-	docinto docs; dodoc doc/*
-}
diff --git a/sys-auth/nss_ldap/nss_ldap-249.ebuild b/sys-auth/nss_ldap/nss_ldap-249.ebuild
deleted file mode 100644
index c7bd6c1458fd..000000000000
--- a/sys-auth/nss_ldap/nss_ldap-249.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/nss_ldap-249.ebuild,v 1.8 2007/10/09 23:39:47 robbat2 Exp $
-
-inherit fixheadtails eutils multilib
-
-IUSE="debug"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html"
-SRC_URI="http://www.padl.com/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 hppa mips ppc ppc64 sparc x86"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/nsswitch.ldap.diff
-	epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
-	epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
-	# fix head/tail stuff
-	ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
-}
-
-src_compile() {
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debugging"
-
-	econf \
-		--with-ldap-lib=openldap \
-		--libdir=/$(get_libdir) \
-		--enable-schema-mapping \
-		--enable-paged-results \
-		--enable-rfc2307bis \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	dodir /$(get_libdir)
-
-	make DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc
-	doins ldap.conf
-
-	dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
-		COPYING CVSVersionInfo.txt README nsswitch.ldap certutil
-	docinto docs; dodoc doc/*
-}
diff --git a/sys-auth/nss_ldap/nss_ldap-250-r1.ebuild b/sys-auth/nss_ldap/nss_ldap-250-r1.ebuild
deleted file mode 100644
index e09c222a81d3..000000000000
--- a/sys-auth/nss_ldap/nss_ldap-250-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/nss_ldap-250-r1.ebuild,v 1.3 2007/10/09 23:39:47 robbat2 Exp $
-
-inherit fixheadtails eutils multilib
-
-IUSE="debug sasl"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html"
-SRC_URI="http://www.padl.com/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5
-		sasl? ( dev-libs/cyrus-sasl )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/nsswitch.ldap.diff
-	epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
-	epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
-	epatch "${FILESDIR}"/${PN}-250-reconnect-timeouts.patch
-	# fix head/tail stuff
-	ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
-	# fix build borkage
-	for i in Makefile.{in,am}; do
-	  sed -i.orig \
-	    -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
-	    "${S}"/$i
-	done
-}
-
-src_compile() {
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debugging"
-
-	econf \
-		--with-ldap-lib=openldap \
-		--libdir=/$(get_libdir) \
-		--enable-schema-mapping \
-		--enable-paged-results \
-		--enable-rfc2307bis \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	dodir /$(get_libdir)
-
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc
-	doins ldap.conf
-
-	dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
-		COPYING CVSVersionInfo.txt README nsswitch.ldap certutil
-	docinto docs; dodoc doc/*
-}
diff --git a/sys-auth/nss_ldap/nss_ldap-250.ebuild b/sys-auth/nss_ldap/nss_ldap-250.ebuild
deleted file mode 100644
index e402abc6e5e5..000000000000
--- a/sys-auth/nss_ldap/nss_ldap-250.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/nss_ldap-250.ebuild,v 1.4 2007/10/09 23:39:47 robbat2 Exp $
-
-inherit fixheadtails eutils multilib
-
-IUSE="debug sasl"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html"
-SRC_URI="http://www.padl.com/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5
-		sasl? ( dev-libs/cyrus-sasl )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/nsswitch.ldap.diff
-	epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
-	epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
-	# fix head/tail stuff
-	ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
-	# fix build borkage
-	for i in Makefile.{in,am}; do
-	  sed -i.orig \
-	    -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
-	    "${S}"/$i
-	done
-}
-
-src_compile() {
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debugging"
-
-	econf \
-		--with-ldap-lib=openldap \
-		--libdir=/$(get_libdir) \
-		--enable-schema-mapping \
-		--enable-paged-results \
-		--enable-rfc2307bis \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	dodir /$(get_libdir)
-
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc
-	doins ldap.conf
-
-	dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
-		COPYING CVSVersionInfo.txt README nsswitch.ldap certutil
-	docinto docs; dodoc doc/*
-}
diff --git a/sys-auth/nss_ldap/nss_ldap-252.ebuild b/sys-auth/nss_ldap/nss_ldap-252.ebuild
deleted file mode 100644
index d88c04e486a6..000000000000
--- a/sys-auth/nss_ldap/nss_ldap-252.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/nss_ldap-252.ebuild,v 1.3 2007/10/09 23:39:47 robbat2 Exp $
-
-inherit fixheadtails eutils multilib
-
-IUSE="debug sasl"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html"
-SRC_URI="http://www.padl.com/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5
-		sasl? ( dev-libs/cyrus-sasl )"
-RDEPEND="${DEPEND}
-		!<net-fs/autofs-4.1.3"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/nsswitch.ldap.diff
-	epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
-	epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-252-reconnect-timeouts.patch
-	sed -i.orig \
-		-e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
-		"${S}"/ldap.conf || die "failed to clean up initial version marker"
-	# fix head/tail stuff
-	ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
-	# fix build borkage
-	for i in Makefile.{in,am}; do
-	  sed -i.orig \
-	    -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
-	    "${S}"/$i
-	done
-}
-
-src_compile() {
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debugging"
-
-	econf \
-		--with-ldap-lib=openldap \
-		--libdir=/$(get_libdir) \
-		--enable-schema-mapping \
-		--enable-paged-results \
-		--enable-rfc2307bis \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	dodir /$(get_libdir)
-
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc
-	doins ldap.conf
-
-	dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
-		COPYING CVSVersionInfo.txt README nsswitch.ldap certutil
-	docinto docs; dodoc doc/*
-}
diff --git a/sys-auth/nss_ldap/nss_ldap-253-r1.ebuild b/sys-auth/nss_ldap/nss_ldap-253-r1.ebuild
deleted file mode 100644
index 854d0afae462..000000000000
--- a/sys-auth/nss_ldap/nss_ldap-253-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/nss_ldap-253-r1.ebuild,v 1.2 2007/10/09 23:39:47 robbat2 Exp $
-
-inherit fixheadtails eutils multilib
-
-IUSE="debug sasl kerberos"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html"
-SRC_URI="http://www.padl.com/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5
-		sasl? ( dev-libs/cyrus-sasl )
-		kerberos? ( virtual/krb5 )"
-RDEPEND="${DEPEND}
-		!<net-fs/autofs-4.1.3"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/nsswitch.ldap.diff
-	epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
-	epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-252-reconnect-timeouts.patch
-	sed -i.orig \
-		-e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
-		"${S}"/ldap.conf || die "failed to clean up initial version marker"
-	# fix head/tail stuff
-	ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
-	# fix build borkage
-	for i in Makefile.{in,am}; do
-	  sed -i.orig \
-	    -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
-	    "${S}"/$i
-	done
-}
-
-src_compile() {
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debugging"
-	use kerberos && myconf="${myconf} --enable-configurable-krb5-ccname-gssapi"
-	econf \
-		--with-ldap-lib=openldap \
-		--libdir=/$(get_libdir) \
-		--enable-schema-mapping \
-		--enable-paged-results \
-		--enable-rfc2307bis \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	dodir /$(get_libdir)
-
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc
-	doins ldap.conf
-
-	dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
-		COPYING CVSVersionInfo.txt README nsswitch.ldap certutil
-	docinto docs; dodoc doc/*
-}
diff --git a/sys-auth/nss_ldap/nss_ldap-253.ebuild b/sys-auth/nss_ldap/nss_ldap-253.ebuild
deleted file mode 100644
index 1aabc00ccd59..000000000000
--- a/sys-auth/nss_ldap/nss_ldap-253.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/nss_ldap-253.ebuild,v 1.10 2007/10/09 23:39:47 robbat2 Exp $
-
-inherit fixheadtails eutils multilib
-
-IUSE="debug sasl"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html"
-SRC_URI="http://www.padl.com/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5
-		sasl? ( dev-libs/cyrus-sasl )"
-RDEPEND="${DEPEND}
-		!<net-fs/autofs-4.1.3"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/nsswitch.ldap.diff
-	epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
-	epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-252-reconnect-timeouts.patch
-	sed -i.orig \
-		-e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
-		"${S}"/ldap.conf || die "failed to clean up initial version marker"
-	# fix head/tail stuff
-	ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
-	# fix build borkage
-	for i in Makefile.{in,am}; do
-	  sed -i.orig \
-	    -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
-	    "${S}"/$i
-	done
-}
-
-src_compile() {
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debugging"
-
-	econf \
-		--with-ldap-lib=openldap \
-		--libdir=/$(get_libdir) \
-		--enable-schema-mapping \
-		--enable-paged-results \
-		--enable-rfc2307bis \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	dodir /$(get_libdir)
-
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc
-	doins ldap.conf
-
-	dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
-		COPYING CVSVersionInfo.txt README nsswitch.ldap certutil
-	docinto docs; dodoc doc/*
-}
diff --git a/sys-auth/nss_ldap/nss_ldap-254.ebuild b/sys-auth/nss_ldap/nss_ldap-254.ebuild
deleted file mode 100644
index d8f024b19912..000000000000
--- a/sys-auth/nss_ldap/nss_ldap-254.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/nss_ldap-254.ebuild,v 1.2 2007/10/09 23:39:47 robbat2 Exp $
-
-inherit fixheadtails eutils multilib
-
-IUSE="debug sasl kerberos"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html"
-SRC_URI="http://www.padl.com/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5
-		sasl? ( dev-libs/cyrus-sasl )
-		kerberos? ( virtual/krb5 )"
-RDEPEND="${DEPEND}
-		!<net-fs/autofs-4.1.3"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/nsswitch.ldap.diff
-	epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
-	epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-252-reconnect-timeouts.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-254-nss_getgrent_skipmembers.patch
-	sed -i.orig \
-		-e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
-		"${S}"/ldap.conf || die "failed to clean up initial version marker"
-	# fix head/tail stuff
-	ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
-	# fix build borkage
-	for i in Makefile.{in,am}; do
-	  sed -i.orig \
-	    -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
-	    "${S}"/$i
-	done
-}
-
-src_compile() {
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debugging"
-	use kerberos && myconf="${myconf} --enable-configurable-krb5-ccname-gssapi"
-	econf \
-		--with-ldap-lib=openldap \
-		--libdir=/$(get_libdir) \
-		--enable-schema-mapping \
-		--enable-paged-results \
-		--enable-rfc2307bis \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	dodir /$(get_libdir)
-
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc
-	doins ldap.conf
-
-	dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
-		COPYING CVSVersionInfo.txt README nsswitch.ldap certutil
-	docinto docs; dodoc doc/*
-}
diff --git a/sys-auth/nss_ldap/nss_ldap-257.2.ebuild b/sys-auth/nss_ldap/nss_ldap-257.2.ebuild
deleted file mode 100644
index 2c43d1f28d6b..000000000000
--- a/sys-auth/nss_ldap/nss_ldap-257.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/nss_ldap-257.2.ebuild,v 1.2 2007/11/07 17:51:34 armin76 Exp $
-
-inherit fixheadtails eutils multilib
-
-IUSE="debug sasl kerberos"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html"
-SRC_URI="http://www.padl.com/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5
-		sasl? ( dev-libs/cyrus-sasl )
-		kerberos? ( virtual/krb5 )"
-RDEPEND="${DEPEND}
-		!<net-fs/autofs-4.1.3"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/nsswitch.ldap.diff
-	# Applied by upstream
-	#epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
-	epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-252-reconnect-timeouts.patch
-	# Applied by upstream
-	#EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-254-nss_getgrent_skipmembers.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
-	sed -i.orig \
-		-e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
-		"${S}"/ldap.conf || die "failed to clean up initial version marker"
-	# fix head/tail stuff
-	ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
-	# fix build borkage
-	for i in Makefile.{in,am}; do
-	  sed -i.orig \
-	    -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
-	    "${S}"/$i
-	done
-}
-
-src_compile() {
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debugging"
-	use kerberos && myconf="${myconf} --enable-configurable-krb5-ccname-gssapi"
-	econf \
-		--with-ldap-lib=openldap \
-		--libdir=/$(get_libdir) \
-		--enable-schema-mapping \
-		--enable-paged-results \
-		--enable-rfc2307bis \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	dodir /$(get_libdir)
-
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc
-	doins ldap.conf
-
-	dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
-		COPYING CVSVersionInfo.txt README nsswitch.ldap certutil
-	docinto docs; dodoc doc/*
-}
diff --git a/sys-auth/nss_ldap/nss_ldap-257.ebuild b/sys-auth/nss_ldap/nss_ldap-257.ebuild
deleted file mode 100644
index c2fbd68a83f0..000000000000
--- a/sys-auth/nss_ldap/nss_ldap-257.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/nss_ldap-257.ebuild,v 1.2 2007/10/09 23:39:47 robbat2 Exp $
-
-inherit fixheadtails eutils multilib
-
-IUSE="debug sasl kerberos"
-
-DESCRIPTION="NSS LDAP Module"
-HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html"
-SRC_URI="http://www.padl.com/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=">=net-nds/openldap-2.1.30-r5
-		sasl? ( dev-libs/cyrus-sasl )
-		kerberos? ( virtual/krb5 )"
-RDEPEND="${DEPEND}
-		!<net-fs/autofs-4.1.3"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/nsswitch.ldap.diff
-	# Applied by upstream
-	#epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
-	epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-252-reconnect-timeouts.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-254-nss_getgrent_skipmembers.patch
-	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
-	sed -i.orig \
-		-e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
-		"${S}"/ldap.conf || die "failed to clean up initial version marker"
-	# fix head/tail stuff
-	ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
-	# fix build borkage
-	for i in Makefile.{in,am}; do
-	  sed -i.orig \
-	    -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
-	    "${S}"/$i
-	done
-}
-
-src_compile() {
-	local myconf=""
-	use debug && myconf="${myconf} --enable-debugging"
-	use kerberos && myconf="${myconf} --enable-configurable-krb5-ccname-gssapi"
-	econf \
-		--with-ldap-lib=openldap \
-		--libdir=/$(get_libdir) \
-		--enable-schema-mapping \
-		--enable-paged-results \
-		--enable-rfc2307bis \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	dodir /$(get_libdir)
-
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-
-	insinto /etc
-	doins ldap.conf
-
-	dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
-		COPYING CVSVersionInfo.txt README nsswitch.ldap certutil
-	docinto docs; dodoc doc/*
-}