See bug #34717. We finally are compatible with db4 and db4.1!

5 files changed, 130 insertions, 8 deletions

diff --git a/net-libs/nss_ldap/ChangeLog b/net-libs/nss_ldap/ChangeLog
index dd055c2c8ee3..d8e296476cd4 100644
--- a/net-libs/nss_ldap/ChangeLog
+++ b/net-libs/nss_ldap/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-libs/nss_ldap
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/nss_ldap/ChangeLog,v 1.19 2004/01/30 06:55:05 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nss_ldap/ChangeLog,v 1.20 2004/03/19 01:58:07 raker Exp $
+
+*nss_ldap-215-r1 (18 Mar 2004)
+
+  18 Mar 2004; Nick Hadaway <raker@gentoo.org> nss_ldap-215-r1.ebuild,
+  files/db4_1.85.diff:
+  Your mileage probably did vary.  Loosening the dependancy was an
+  appropriate change but did nothing for db4 people.  Thanks to
+  Holger on bug #34717, we now have fixed .in files that appropriately
+  search for db{4,4.1} stuff.
 
 *nss_ldap-215 (29 Jan 2004)
 
diff --git a/net-libs/nss_ldap/Manifest b/net-libs/nss_ldap/Manifest
index a02d19fab9be..1e6cf39bf803 100644
--- a/net-libs/nss_ldap/Manifest
+++ b/net-libs/nss_ldap/Manifest
@@ -1,18 +1,21 @@
-MD5 8dfcee704ff028145623f36fcbed1ac6 ChangeLog 3003
 MD5 bbefcdee0b752c8c7b20f2b9a9c6fc57 nss_ldap-174-r2.ebuild 1012
-MD5 e60cf713adbf02ace612603a5501da61 nss_ldap-202.ebuild 1021
 MD5 19e8d8d543cdacc4b27eb1ea43931fb0 nss_ldap-207-r1.ebuild 991
-MD5 3612286efc8caf0d83d4e804c27ca339 nss_ldap-207.ebuild 1061
-MD5 0a352a7878463aacdddf3504a568ab79 nss_ldap-209.1.ebuild 1459
+MD5 32e349d127fa93c207f6fba13aa2d067 nss_ldap-215.ebuild 1312
 MD5 dbd46cfbf491384f65b858a28e9b0965 nss_ldap-210.ebuild 1449
+MD5 0a352a7878463aacdddf3504a568ab79 nss_ldap-209.1.ebuild 1459
+MD5 48bee711652f79dc431e5f6ed8135362 nss_ldap-215-r1.ebuild 1435
 MD5 3fe5b3f993b56f7748c04767ecb4371b nss_ldap-211.ebuild 1450
+MD5 3612286efc8caf0d83d4e804c27ca339 nss_ldap-207.ebuild 1061
+MD5 e60cf713adbf02ace612603a5501da61 nss_ldap-202.ebuild 1021
+MD5 8dfcee704ff028145623f36fcbed1ac6 ChangeLog 3003
 MD5 12158b386c76f1fa317b9b474abfb30e metadata.xml 249
-MD5 32e349d127fa93c207f6fba13aa2d067 nss_ldap-215.ebuild 1312
 MD5 5d7731acb703d8ae122072ad73cbc2a6 files/digest-nss_ldap-174-r2 129
+MD5 8d358c3dda5ce728c6fd5f8f4bc448d2 files/digest-nss_ldap-207-r1 64
+MD5 b2dc517b69cad6d24fce3d19a7879dcf files/digest-nss_ldap-215-r1 64
 MD5 d8021fe04d76482091c816f28edad140 files/digest-nss_ldap-202 64
 MD5 8d358c3dda5ce728c6fd5f8f4bc448d2 files/digest-nss_ldap-207 64
-MD5 8d358c3dda5ce728c6fd5f8f4bc448d2 files/digest-nss_ldap-207-r1 64
-MD5 66e79b5d5f9f5105ad2988280f27475d files/digest-nss_ldap-209.1 66
 MD5 c1919ec630e0278d0e09787a14d497a9 files/digest-nss_ldap-210 64
 MD5 4dc20eb7ee3f4a562d6ad00a0609cfbc files/digest-nss_ldap-211 64
 MD5 b2dc517b69cad6d24fce3d19a7879dcf files/digest-nss_ldap-215 64
+MD5 66e79b5d5f9f5105ad2988280f27475d files/digest-nss_ldap-209.1 66
+MD5 a4302c4120b75a23e43cc824423169c8 files/db4_1.85.diff 1569
diff --git a/net-libs/nss_ldap/files/db4_1.85.diff b/net-libs/nss_ldap/files/db4_1.85.diff
new file mode 100644
index 000000000000..7584fc63331b
--- /dev/null
+++ b/net-libs/nss_ldap/files/db4_1.85.diff
@@ -0,0 +1,46 @@
+diff -urN nss_ldap-215/configure.in nss_ldap-215-modified/configure.in
+--- nss_ldap-215/configure.in	2004-01-07 07:02:15.000000000 -0600
++++ nss_ldap-215-modified/configure.in	2004-03-18 19:47:13.111404704 -0600
+@@ -133,6 +133,8 @@
+ AC_CHECK_HEADERS(db1/db.h)
+ AC_CHECK_HEADERS(db_185.h)
+ AC_CHECK_HEADERS(db3/db_185.h)
++AC_CHECK_HEADERS(db4/db_185.h)
++AC_CHECK_HEADERS(db4.1/db_185.h)
+ AC_CHECK_HEADERS(alignof.h)
+ AC_CHECK_HEADERS(rpc/rpcent.h)
+ AC_CHECK_HEADERS(sys/byteorder.h)
+diff -urN nss_ldap-215/ldap-nss.c nss_ldap-215-modified/ldap-nss.c
+--- nss_ldap-215/ldap-nss.c	2004-01-07 07:02:15.000000000 -0600
++++ nss_ldap-215-modified/ldap-nss.c	2004-03-18 19:48:19.139366928 -0600
+@@ -72,7 +72,11 @@
+ #include <sasl.h>
+ #endif
+ #ifdef AT_OC_MAP
+-#ifdef HAVE_DB3_DB_185_H
++#ifdef HAVE_DB4_1_DB_185_H
++#include <db4.1/db_185.h>
++#elif defined(HAVE_DB4_DB_185_H)
++#include <db4/db_185.h>
++#elif defined(HAVE_DB3_DB_185_H)
+ #include <db3/db_185.h>
+ #elif defined(HAVE_DB_185_H)
+ #include <db_185.h>
+diff -urN nss_ldap-215/util.c nss_ldap-215-modified/util.c
+--- nss_ldap-215/util.c	2004-01-07 07:02:15.000000000 -0600
++++ nss_ldap-215-modified/util.c	2004-03-18 19:49:16.347669944 -0600
+@@ -84,7 +84,13 @@
+  * right API!
+  */
+ #if defined(RFC2307BIS) || defined(AT_OC_MAP)
+-#ifdef HAVE_DB3_DB_185_H
++#ifdef HAVE_DB4_1_DB_185_H
++#include <db4.1/db_185.h>
++#define DN2UID_CACHE
++#elif defined(HAVE_DB4_DB_185_H)
++#include <db4/db_185.h>
++#define DN2UID_CACHE
++#elif defined(HAVE_DB3_DB_185_H)
+ #include <db3/db_185.h>
+ #define DN2UID_CACHE
+ #elif defined(HAVE_DB_185_H)
diff --git a/net-libs/nss_ldap/files/digest-nss_ldap-215-r1 b/net-libs/nss_ldap/files/digest-nss_ldap-215-r1
new file mode 100644
index 000000000000..38bf07a63446
--- /dev/null
+++ b/net-libs/nss_ldap/files/digest-nss_ldap-215-r1
@@ -0,0 +1 @@
+MD5 c642a3f0dbaf2aacc3bfb1a9dc6c29d6 nss_ldap-215.tar.gz 202566
diff --git a/net-libs/nss_ldap/nss_ldap-215-r1.ebuild b/net-libs/nss_ldap/nss_ldap-215-r1.ebuild
new file mode 100644
index 000000000000..e7a7d41f6f3e
--- /dev/null
+++ b/net-libs/nss_ldap/nss_ldap-215-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/nss_ldap/nss_ldap-215-r1.ebuild,v 1.1 2004/03/19 01:58:07 raker Exp $
+
+inherit fixheadtails
+
+IUSE="berkdb 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"
+
+DEPEND=">=net-nds/openldap-1.2.11
+	berkdb? ( >=sys-libs/db-3 )"
+
+src_unpack() {
+	unpack ${A}
+	# bug #34717
+	epatch ${FILESDIR}/db4_1.85.diff
+}
+
+src_compile() {
+	aclocal || die "aclocal failed"
+	autoheader || die "autoheader failed"
+	automake || die "automake failed"
+	autoconf || die "autoconf failed"
+
+	# fix head/tail stuff
+	ht_fix_file ${S}/Makefile.am ${S}/Makefile.in ${S}/depcomp ${S}/config.guess
+
+	local myconf=""
+
+	use berkdb && myconf="${myconf} --enable-rfc2307bis"
+
+	use debug && myconf="${myconf} --enable-debugging"
+
+	econf \
+		--with-ldap-lib=openldap \
+		--libdir=/lib \
+		--enable-schema-mapping \
+		--enable-paged-results \
+		${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 \
+		LICENSE*
+	docinto docs; dodoc doc/*
+}