New version, possible fix for bug #83879.

(Portage version: 2.0.51.20-r5)

5 files changed, 127 insertions, 1 deletions

diff --git a/net-libs/nss_ldap/ChangeLog b/net-libs/nss_ldap/ChangeLog
index 8efeab19cead..81c8992e085c 100644
--- a/net-libs/nss_ldap/ChangeLog
+++ b/net-libs/nss_ldap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/nss_ldap
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nss_ldap/ChangeLog,v 1.43 2005/04/16 08:04:55 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nss_ldap/ChangeLog,v 1.44 2005/04/29 20:21:15 robbat2 Exp $
+
+*nss_ldap-238 (29 Apr 2005)
+
+  29 Apr 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +files/nss_ldap-238-whitespace-fix.diff, +nss_ldap-238.ebuild:
+  New version, possible fix for bug #83879.
 
   16 Apr 2005; Markus Rothe <corsair@gentoo.org> nss_ldap-220.ebuild,
   nss_ldap-226.ebuild:
diff --git a/net-libs/nss_ldap/Manifest b/net-libs/nss_ldap/Manifest
index 16ddd6d55918..eb1fed8709f1 100644
--- a/net-libs/nss_ldap/Manifest
+++ b/net-libs/nss_ldap/Manifest
@@ -1,7 +1,12 @@
 MD5 d1f319154e4a3e88058b361cb14a9887 ChangeLog 6047
 MD5 5ba8c9c9be079ebcbc93c08f838665bd metadata.xml 255
 MD5 9091d3e50ef7b1b97d621847e1d948cd nss_ldap-174-r2.ebuild 995
+<<<<<<< Manifest
+MD5 100c9381eebe668d54a028336619d6c9 nss_ldap-238.ebuild 1273
+MD5 7588515f6c79c3a44c15d8c6c8e0be23 nss_ldap-233.ebuild 1273
+=======
 MD5 8391330fe9404d9f49092ed360d37e51 nss_ldap-202.ebuild 1004
+>>>>>>> 1.52
 MD5 5c3b7496acabe0f8b769cc29fd655f31 nss_ldap-207-r1.ebuild 984
 MD5 d59cceae731cb9ad10c7d0529f2d005f nss_ldap-207.ebuild 1044
 MD5 ec408deef599a294ad2a5a0d301186e7 nss_ldap-210.ebuild 1442
@@ -25,5 +30,10 @@ MD5 2fdb02aab9086996c9129865cff0f0de files/digest-nss_ldap-220 64
 MD5 94ff5d327f98e3aceb7fa140493e8dd5 files/digest-nss_ldap-226 64
 MD5 3c0eac03246d1f38124da6c86821ce4c files/digest-nss_ldap-233 64
 MD5 7d2b7694b9c68b4538679a6973c23d49 files/digest-nss_ldap-234 64
+<<<<<<< Manifest
+MD5 f4606a6bf13f616f9fda25ac76493653 files/digest-nss_ldap-238 64
+MD5 a4302c4120b75a23e43cc824423169c8 files/db4_1.85.diff 1569
+=======
 MD5 2af7b597298bb9269f739cbb8a25224d files/nss_ldap-220-db4.2-patch.diff 1707
+>>>>>>> 1.52
 MD5 1fe060c70b1c673346b696dbe194260a files/nsswitch.ldap.diff 575
diff --git a/net-libs/nss_ldap/files/digest-nss_ldap-238 b/net-libs/nss_ldap/files/digest-nss_ldap-238
new file mode 100644
index 000000000000..cf5812d6278e
--- /dev/null
+++ b/net-libs/nss_ldap/files/digest-nss_ldap-238
@@ -0,0 +1 @@
+MD5 97fd929b381329b972b3c3ddca5a4bbf nss_ldap-238.tar.gz 219945
diff --git a/net-libs/nss_ldap/files/nss_ldap-238-whitespace-fix.diff b/net-libs/nss_ldap/files/nss_ldap-238-whitespace-fix.diff
new file mode 100644
index 000000000000..9a4778046278
--- /dev/null
+++ b/net-libs/nss_ldap/files/nss_ldap-238-whitespace-fix.diff
@@ -0,0 +1,53 @@
+diff -Nuar nss_ldap-238.orig/ldap.conf nss_ldap-238/ldap.conf
+--- nss_ldap-238.orig/ldap.conf	2005-03-23 16:03:40.000000000 -0800
++++ nss_ldap-238/ldap.conf	2005-03-28 21:57:53.326218832 -0800
+@@ -1,4 +1,4 @@
+- @(#)$Id: nss_ldap-238-whitespace-fix.diff,v 1.1 2005/04/29 20:21:15 robbat2 Exp $
++# @(#)$Id: nss_ldap-238-whitespace-fix.diff,v 1.1 2005/04/29 20:21:15 robbat2 Exp $
+ #
+ # This is the configuration file for the LDAP nameservice
+ # switch library and the LDAP PAM module.
+@@ -167,27 +167,27 @@
+ # and filter is a filter to be &'d with the
+ # default filter.
+ # You can omit the suffix eg:
+-# nss_base_passwd ou=People,
++# nss_base_passwd 	ou=People,
+ # to append the default base DN but this
+ # may incur a small performance impact.
+-#nss_base_passwdou=People,dc=padl,dc=com?one
+-#nss_base_shadowou=People,dc=padl,dc=com?one
+-#nss_base_group	ou=Group,dc=padl,dc=com?one
+-#nss_base_hosts	ou=Hosts,dc=padl,dc=com?one
+-#nss_base_servicesou=Services,dc=padl,dc=com?one
+-#nss_base_networksou=Networks,dc=padl,dc=com?one
+-#nss_base_protocolsou=Protocols,dc=padl,dc=com?one
+-#nss_base_rpc	ou=Rpc,dc=padl,dc=com?one
+-#nss_base_ethersou=Ethers,dc=padl,dc=com?one
+-#nss_base_netmasksou=Networks,dc=padl,dc=com?ne
+-#nss_base_bootparamsou=Ethers,dc=padl,dc=com?one
+-#nss_base_aliasesou=Aliases,dc=padl,dc=com?one
+-#nss_base_netgroupou=Netgroup,dc=padl,dc=com?one
++#nss_base_passwd	ou=People,dc=padl,dc=com?one
++#nss_base_shadow	ou=People,dc=padl,dc=com?one
++#nss_base_group		ou=Group,dc=padl,dc=com?one
++#nss_base_hosts		ou=Hosts,dc=padl,dc=com?one
++#nss_base_services	ou=Services,dc=padl,dc=com?one
++#nss_base_networks	ou=Networks,dc=padl,dc=com?one
++#nss_base_protocols	ou=Protocols,dc=padl,dc=com?one
++#nss_base_rpc		ou=Rpc,dc=padl,dc=com?one
++#nss_base_ethers	ou=Ethers,dc=padl,dc=com?one
++#nss_base_netmasks	ou=Networks,dc=padl,dc=com?ne
++#nss_base_bootparams	ou=Ethers,dc=padl,dc=com?one
++#nss_base_aliases	ou=Aliases,dc=padl,dc=com?one
++#nss_base_netgroup	ou=Netgroup,dc=padl,dc=com?one
+ 
+ # attribute/objectclass mapping
+ # Syntax:
+-#nss_map_attributerfc2307attribute	mapped_attribute
+-#nss_map_objectclassrfc2307objectclass	mapped_objectclass
++#nss_map_attribute	rfc2307attribute	mapped_attribute
++#nss_map_objectclass	rfc2307objectclass	mapped_objectclass
+ 
+ # configure --enable-nds is no longer supported.
+ # NDS mappings
diff --git a/net-libs/nss_ldap/nss_ldap-238.ebuild b/net-libs/nss_ldap/nss_ldap-238.ebuild
new file mode 100644
index 000000000000..8a083502b62e
--- /dev/null
+++ b/net-libs/nss_ldap/nss_ldap-238.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nss_ldap/nss_ldap-238.ebuild,v 1.1 2005/04/29 20:21:15 robbat2 Exp $
+
+inherit fixheadtails eutils gnuconfig
+
+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="~x86 ~sparc ~amd64 ~ppc ~hppa ~alpha"
+
+DEPEND=">=net-nds/openldap-1.2.11"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/nsswitch.ldap.diff
+	epatch ${FILESDIR}/${P}-whitespace-fix.diff
+	# fix head/tail stuff
+	ht_fix_file ${S}/Makefile.am ${S}/Makefile.in ${S}/depcomp
+	# update config.{guess,sub}
+	gnuconfig_update
+}
+
+src_compile() {
+	local myconf=""
+	use debug && myconf="${myconf} --enable-debugging"
+
+	econf \
+		--with-ldap-lib=openldap \
+		--libdir=/lib \
+		--enable-schema-mapping \
+		--enable-paged-results \
+		--enable-rfc2307bis \
+		${myconf} || die "configure failed"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	dodir /lib
+
+	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/*
+}