new 2.2 version to fix bugs #105380 , #110412 , #112554, #114544 , #115741 , #115872 - thanks to Markus Ullmann

Package-Manager: portage-2.0.53

7 files changed, 574 insertions, 2 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index 91123b1e30ad..df48d4c8c38d 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-nds/openldap
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.157 2006/01/13 16:47:11 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.158 2006/01/13 17:58:05 strerror Exp $
+
+*openldap-2.2.28-r4 (13 Jan 2006)
+
+  13 Jan 2006; Benjamin Smee <strerror@gentoo.org>
+  +files/openldap-2.2.28-autoconf-archived-fix.patch,
+  +files/openldap-2.2.28-cleartext-passwords.patch,
+  +files/openldap-2.2.28-tests.patch, +openldap-2.2.28-r4.ebuild:
+  new 2.2 version to fix bugs #105380 , #110412 , #112554, #114544 , #115741 ,
+  #115872 - thanks to Markus Ullmann
 
 *openldap-2.1.30-r7 (13 Jan 2006)
 
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index dd930a53e7c1..f1eb610d2e21 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -1,4 +1,4 @@
-MD5 e71ee524ec382d72d7f12ce77bd5085c ChangeLog 28711
+MD5 5355f2a2c971f3cc261235e5dcfd119a ChangeLog 29086
 MD5 1a7084c17a74e59db33578c0833e4099 files/2.0/slapd 584
 MD5 50257f7d6b63c8e9778b6407c7d2dddb files/2.0/slapd.conf 277
 MD5 d68ba97d9f54b8455c1e2d93c352d24a files/2.0/slurpd 495
@@ -27,6 +27,7 @@ MD5 a8e7c88a9f6b88fb9b88d4e66fae5d92 files/digest-openldap-2.2.28 130
 MD5 a8e7c88a9f6b88fb9b88d4e66fae5d92 files/digest-openldap-2.2.28-r1 130
 MD5 dd664a5abce13e402f1e0322ce2464fd files/digest-openldap-2.2.28-r2 130
 MD5 dd664a5abce13e402f1e0322ce2464fd files/digest-openldap-2.2.28-r3 130
+MD5 dd664a5abce13e402f1e0322ce2464fd files/digest-openldap-2.2.28-r4 130
 MD5 c8d6f4ebeb92ef1085b1bb77d7b4db5f files/gencert.sh 3505
 MD5 c16eada85fafe1c17bf0089d0ef90ae3 files/gencert.sh-2.2.27 2939
 MD5 b10517f0e7be829d47bb8096d86fb519 files/openldap-2.1.27-db40.patch 718
@@ -42,7 +43,10 @@ MD5 2e6d3f7cf49a1d85468befdff2bfc1d8 files/openldap-2.1.30-ximian_connector.patc
 MD5 4c6ef684996786b3a7cc2dc15c4ae7a4 files/openldap-2.2.14-db40.patch 773
 MD5 95a998755d69f0f30cb64b9cb8eeab15 files/openldap-2.2.14-perlthreadsfix.patch 614
 MD5 4591bdcf0bd459c6fdbcabc93f5b6b55 files/openldap-2.2.26-tls-fix-connection-test.patch 663
+MD5 f92be2e2c3b130cc9ff6ff738165e40e files/openldap-2.2.28-autoconf-archived-fix.patch 2001
+MD5 c0b486ddc5a55fa4879cec74e9a11748 files/openldap-2.2.28-cleartext-passwords.patch 1497
 MD5 14cfcdbe422004e2e42bfb14cea16a5e files/openldap-2.2.28-r1-configure.in-rpath.patch 382
+MD5 91f97e6962d63d9a7f12697ff34772f7 files/openldap-2.2.28-tests.patch 385
 MD5 f940f4e9ac544ed0a0f28b87df5cd2c8 files/openldap-2.2.28-ximian_connector.patch 5669
 MD5 7d80c3708d5940a3b7a428740af863d0 files/openldap-2.2.6-ntlm.patch 5011
 MD5 a9fa8b856c438b132dac2edbb2d7171a metadata.xml 392
@@ -70,4 +74,5 @@ MD5 44d54b94ad9be3c6a595e530ffde8e24 openldap-2.2.27.ebuild 12424
 MD5 d0b2e396543e06107bd1b2f492c246f2 openldap-2.2.28-r1.ebuild 13109
 MD5 a6c77f6fc6a7c7af923cc334d2bab94a openldap-2.2.28-r2.ebuild 13214
 MD5 bb134104d80c1eafe50d526e99a75032 openldap-2.2.28-r3.ebuild 13715
+MD5 2056935c62653a4bd11900925ab054bf openldap-2.2.28-r4.ebuild 14820
 MD5 72bade434d8afe3c9c9f665518a6d786 openldap-2.2.28.ebuild 12908
diff --git a/net-nds/openldap/files/digest-openldap-2.2.28-r4 b/net-nds/openldap/files/digest-openldap-2.2.28-r4
new file mode 100644
index 000000000000..15100a316d72
--- /dev/null
+++ b/net-nds/openldap/files/digest-openldap-2.2.28-r4
@@ -0,0 +1,2 @@
+MD5 e2ae8148c4bed07d7a70edd930bdc403 openldap-2.1.30.tgz 2044673
+MD5 b51db7328430b9cbe527696da726f1fb openldap-2.2.28.tgz 2630427
diff --git a/net-nds/openldap/files/openldap-2.2.28-autoconf-archived-fix.patch b/net-nds/openldap/files/openldap-2.2.28-autoconf-archived-fix.patch
new file mode 100644
index 000000000000..2a0aae9c00d3
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.2.28-autoconf-archived-fix.patch
@@ -0,0 +1,70 @@
+--- build/openldap.m4.orig	2005-12-19 01:43:17.000000000 +0100
++++ build/openldap.m4	2005-12-19 01:44:05.000000000 +0100
+@@ -1298,3 +1298,30 @@
+ 		[define if struct msghdr has msg_accrights])
+   fi
+ ])dnl
++
++AC_DEFUN([OL_AC_COMPILE_CHECK_SIZEOF],
++[changequote(<<, >>)dnl
++dnl The name to #define.
++define(<<AC_TYPE_NAME>>, translit(sizeof_$1, [a-z *], [A-Z_P]))dnl
++dnl The cache variable name.
++define(<<AC_CV_NAME>>, translit(ac_cv_sizeof_$1, [ *], [_p]))dnl
++changequote([, ])dnl
++AC_MSG_CHECKING(size of $1)
++AC_CACHE_VAL(AC_CV_NAME,
++[for ac_size in 4 8 1 2 16 32 64 $2 ; do # List sizes in rough order of prevalence.
++  AC_TRY_COMPILE([#include "confdefs.h"
++#include <sys/types.h>
++#include <stddef.h>
++$2
++], [switch (0) case 0: case (sizeof ($1) == $ac_size):;], AC_CV_NAME=$ac_size)
++  if test x$AC_CV_NAME != x ; then break; fi
++done
++])
++if test x$AC_CV_NAME = x ; then
++  AC_MSG_ERROR([cannot determine a size for $1])
++fi
++AC_MSG_RESULT($AC_CV_NAME)
++AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [The number of bytes in type $1])
++undefine([AC_TYPE_NAME])dnl
++undefine([AC_CV_NAME])dnl
++])
+--- ./configure.in.orig	2005-12-19 01:48:49.000000000 +0100
++++ ./configure.in	2005-12-19 01:50:12.000000000 +0100
+@@ -590,8 +590,8 @@
+ 
+ dnl ----------------------------------------------------------------
+ dnl Checks for system services
+-AC_CYGWIN
+-AC_MINGW32
++dnl AC_CYGWIN
++dnl AC_MINGW32
+ AC_EXEEXT
+ AC_OBJEXT
+ 
+@@ -2174,7 +2174,7 @@
+ AC_TYPE_MODE_T
+ AC_TYPE_OFF_T
+ AC_TYPE_PID_T
+-AM_TYPE_PTRDIFF_T
++AC_CHECK_TYPES([ptrdiff_t])
+ AC_TYPE_SIGNAL
+ AC_TYPE_SIZE_T
+ 
+@@ -2204,10 +2204,10 @@
+ 	AC_C_BIGENDIAN
+ fi
+ 
+-AC_COMPILE_CHECK_SIZEOF(short) 
+-AC_COMPILE_CHECK_SIZEOF(int) 
+-AC_COMPILE_CHECK_SIZEOF(long)
+-AC_COMPILE_CHECK_SIZEOF(wchar_t)
++OL_AC_COMPILE_CHECK_SIZEOF(short) 
++OL_AC_COMPILE_CHECK_SIZEOF(int) 
++OL_AC_COMPILE_CHECK_SIZEOF(long)
++OL_AC_COMPILE_CHECK_SIZEOF(wchar_t)
+ 
+ if test "$ac_cv_sizeof_int" -lt 4 ; then
+ 	AC_MSG_WARN([OpenLDAP requires 'int' to be 32 bits or greater.])
diff --git a/net-nds/openldap/files/openldap-2.2.28-cleartext-passwords.patch b/net-nds/openldap/files/openldap-2.2.28-cleartext-passwords.patch
new file mode 100644
index 000000000000..ceb6ece58fd2
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.2.28-cleartext-passwords.patch
@@ -0,0 +1,54 @@
+--- libraries.orig/liblutil/passwd.c	Tue Oct 11 16:22:46 2005
++++ libraries/liblutil/passwd.c	Tue Oct 11 19:27:24 2005
+@@ -79,6 +79,10 @@
+ static char *salt_format = NULL;
+ #endif
+ 
++/* KLUDGE:
++ *  chk_fn is NULL iff name is {CLEARTEXT}
++ *     otherwise, things will break
++ */
+ struct pw_scheme {
+ 	struct berval name;
+ 	LUTIL_PASSWD_CHK_FUNC *chk_fn;
+@@ -161,7 +165,7 @@
+ 
+ #ifdef SLAPD_CLEARTEXT
+ 	/* pseudo scheme */
+-	{ {0, "{CLEARTEXT}"},		NULL, hash_clear },
++	{ BER_BVC("{CLEARTEXT}"),	NULL, hash_clear },
+ #endif
+ 
+ 	{ BER_BVNULL, NULL, NULL }
+@@ -223,9 +227,7 @@
+ 	bv.bv_val = (char *) scheme;
+ 
+ 	for( pws=pw_schemes; pws; pws=pws->next ) {
+-		if( bv.bv_len != pws->s.name.bv_len )
+-			continue;
+-		if( strncasecmp(bv.bv_val, pws->s.name.bv_val, bv.bv_len ) == 0 ) {
++		if ( ber_bvstrcasecmp(&bv, &pws->s.name ) == 0 ) {
+ 			return &(pws->s);
+ 		}
+ 	}
+@@ -317,10 +319,17 @@
+ 	}
+ 
+ #ifdef SLAPD_CLEARTEXT
++	/* Do we think there is a scheme specifier here that we
++	* didn't recognize? Assume a scheme name is at least 1 character.
++	*/
++	if (( passwd->bv_val[0] == '{' ) &&
++		( strchr( passwd->bv_val, '}' ) > passwd->bv_val+1 ))
++	{
++		return 1;
++	}
+ 	if( is_allowed_scheme("{CLEARTEXT}", schemes ) ) {
+-		return (( passwd->bv_len == cred->bv_len ) &&
+-				( passwd->bv_val[0] != '{' /*'}'*/ ))
+-			? memcmp( passwd->bv_val, cred->bv_val, passwd->bv_len )
++		return ( passwd->bv_len == cred->bv_len ) ?
++			memcmp( passwd->bv_val, cred->bv_val, passwd->bv_len )
+ 			: 1;
+ 	}
+ #endif
diff --git a/net-nds/openldap/files/openldap-2.2.28-tests.patch b/net-nds/openldap/files/openldap-2.2.28-tests.patch
new file mode 100644
index 000000000000..3845707b2c21
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.2.28-tests.patch
@@ -0,0 +1,12 @@
+--- ./Makefile.in.orig	2005-01-20 18:01:19.000000000 +0100
++++ ./Makefile.in	2005-12-15 15:02:15.000000000 +0100
+@@ -20,6 +20,9 @@
+ BUILD_HDB=@BUILD_HDB@
+ BUILD_LDBM=@BUILD_LDBM@
+ 
++LD_LIBRARY_PATH=${pwd}../libraries/libldap_r/.libs:${pwd}../libraries/liblber/.libs:${pwd}../libraries/libldap/.libs:$LD_LIBRARY_PATH
++export LD_LIBRARY_PATH
++
+ test tests:
+ 	@$(MAKE) bdb
+ 	@$(MAKE) hdb
diff --git a/net-nds/openldap/openldap-2.2.28-r4.ebuild b/net-nds/openldap/openldap-2.2.28-r4.ebuild
new file mode 100644
index 000000000000..cc53f3b3d3d6
--- /dev/null
+++ b/net-nds/openldap/openldap-2.2.28-r4.ebuild
@@ -0,0 +1,420 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.28-r4.ebuild,v 1.1 2006/01/13 17:58:05 strerror Exp $
+
+inherit flag-o-matic toolchain-funcs eutils multilib
+
+OLD_PV="2.1.30"
+OLD_P="${PN}-${OLD_PV}"
+OLD_S="${WORKDIR}/${OLD_P}"
+
+DESCRIPTION="LDAP suite of application and development tools"
+HOMEPAGE="http://www.OpenLDAP.org/"
+SRC_URI="mirror://openldap/openldap-release/${P}.tgz
+	mirror://openldap/openldap-release/${OLD_P}.tgz"
+
+LICENSE="OPENLDAP"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="berkdb crypt debug gdbm ipv6 kerberos minimal odbc perl readline samba sasl slp ssl tcpd selinux"
+
+RDEPEND=">=sys-libs/ncurses-5.1
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	readline? ( >=sys-libs/readline-4.1 )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.7-r3 )
+	odbc? ( dev-db/unixODBC )
+	slp? ( >=net-libs/openslp-1.0 )
+	perl? ( >=dev-lang/perl-5.6 )
+	samba? ( >=dev-libs/openssl-0.9.6 )
+	kerberos? ( virtual/krb5 )"
+
+# note that the 'samba' USE flag pulling in OpenSSL is NOT an error.  OpenLDAP
+# uses OpenSSL for LanMan/NTLM hashing (which is used in some enviroments, like
+# mine at work)!
+# Robin H. Johnson <robbat2@gentoo.org> March 8, 2004
+
+# if USE=berkdb
+#	pull in sys-libs/db
+# else if USE=gdbm
+#	pull in sys-libs/gdbm
+# else
+#	pull in sys-libs/db
+RDEPEND_BERKDB=">=sys-libs/db-4.2.52_p2-r1"
+RDEPEND_GDBM=">=sys-libs/gdbm-1.8.0"
+RDEPEND="${RDEPEND}
+	berkdb? ( ${RDEPEND_BERKDB} )
+	!berkdb? (
+		gdbm? ( ${RDEPEND_GDBM} )
+		!gdbm? ( ${RDEPEND_BERKDB} )
+	)
+	selinux? ( sec-policy/selinux-openldap )"
+
+DEPEND="${RDEPEND}
+		>=sys-devel/libtool-1.5.18-r1
+		>=sys-apps/sed-4"
+
+# for tracking versions
+OPENLDAP_VERSIONTAG="/var/lib/openldap-data/.version-tag"
+
+#DEPEND="${DEPEND} !<net-nds/openldap-2.2"
+
+openldap_upgrade_warning() {
+	ewarn "If you are upgrading from OpenLDAP-2.1, and run slapd on this"
+	ewarn "machine please see the ebuild for upgrade instructions, otherwise"
+	ewarn "you may corrupt your database!"
+	echo
+	ewarn "Part of the configuration file syntax has changed:"
+	ewarn "'access to attribute=' is now 'access to attrs='"
+	echo
+	ewarn "You must also run revdep-rebuild after upgrading from 2.1 to 2.2:"
+	ewarn "# revdep-rebuild --soname liblber.so.2"
+	ewarn "# revdep-rebuild --soname libldap.so.2"
+	ewarn "# revdep-rebuild --soname libldap_r.so.2"
+}
+
+pkg_setup() {
+	# grab lines
+	openldap_datadirs=""
+	if [ -f ${ROOT}/etc/openldap/slapd.conf ]; then
+		openldap_datadirs="$(awk '{if($1 == "directory") print $2 }' ${ROOT}/etc/openldap/slapd.conf)"
+	fi
+	datafiles=""
+	for d in $openldap_datadirs; do
+		datafiles="${datafiles} $(ls $d/*db* 2>/dev/null)"
+	done
+	# remove extra spaces
+	datafiles="$(echo ${datafiles// })"
+	# TODO: read OPENLDAP_VERSIONTAG instead in future
+	if has_version '<net-nds/openldap-2.2' && [ -n "$datafiles" ]; then
+		eerror "A possible old installation of OpenLDAP was detected"
+		eerror "As major version upgrades to 2.2 can corrupt your database"
+		eerror "You need to dump your database and re-create it afterwards."
+		eerror ""
+		d="$(date -u +%s)"
+		l="/root/ldapdump.${d}"
+		i="${l}.raw"
+		eerror " 1. /etc/init.d/slurpd stop ; /etc/init.d/slapd stop"
+		eerror " 2. slapcat -l ${i}"
+		eerror " 3. egrep -v '^entryCSN:' <${i} >${l}"
+		eerror " 4. emerge unmerge '<=net-nds/openldap-2.1*'"
+		eerror " 5. mv /var/lib/openldap-data/ /var/lib/openldap-data,2.1/"
+		eerror " 6. emerge '>=net-nds/openldap-2.2'"
+		eerror " 7. etc-update, and ensure that you apply the changes"
+		eerror " 8. slapadd -l ${l}"
+		eerror " 9. chown ldap:ldap /var/lib/openldap-data/*"
+		eerror "10. /etc/init.d/slapd start"
+		eerror "11. check that your data is intact."
+		eerror "12. set up the new replication system."
+		eerror ""
+		eerror "This install will not proceed until your old data directory"
+		eerror "is at least moved out of the way."
+		#exit 1
+		die "Warning direct upgrade unsafe!"
+	fi
+	openldap_upgrade_warning
+	if use perl && built_with_use dev-lang/perl minimal ; then
+		die "You must have a complete (USE='-minimal') Perl install to use the perl backend!"
+	fi
+}
+
+pkg_preinst() {
+	openldap_upgrade_warning
+	enewgroup ldap 439
+	enewuser ldap 439 -1 /usr/$(get_libdir)/openldap ldap
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# According to MDK, the link order needs to be changed so that
+	# on systems w/ MD5 passwords the system crypt library is used
+	# (the net result is that "passwd" can be used to change ldap passwords w/
+	#  proper pam support)
+	sed -i -e 's/$(SECURITY_LIBS) $(LDIF_LIBS) $(LUTIL_LIBS)/$(LUTIL_LIBS) $(SECURITY_LIBS) $(LDIF_LIBS)/' \
+		${S}/servers/slapd/Makefile.in
+
+	# Fix up DB-4.0 linking problem
+	# remember to autoconf! this expands configure by 500 lines (4 lines to m4
+	# stuff).
+	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.14-db40.patch
+
+	# supersedes old fix for bug #31202
+	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.14-perlthreadsfix.patch
+
+	# Security bug #96767
+	# http://bugzilla.padl.com/show_bug.cgi?id=210
+	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.26-tls-fix-connection-test.patch
+
+	# ensure correct SLAPI path by default
+	sed -i -e 's,\(#define LDAPI_SOCK\).*,\1 "/var/run/openldap/slapd.sock",' \
+		${S}/include/ldap_defaults.h
+
+	# fix up some automake stuff
+	#sed -i -e 's,^AC_CONFIG_HEADER,AM_CONFIG_HEADER,' ${S}/configure.in
+
+	# ximian connector 1.4.7 ntlm patch
+	#EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.28-ximian_connector.patch
+	EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.6-ntlm.patch
+
+	# fix up stuff for newer autoconf that simulates autoconf-2.13, but doesn't
+	# do it perfectly.
+	cd ${S}/build
+	ln -s shtool install
+	ln -s shtool install.sh
+
+	export WANT_AUTOMAKE="1.9"
+	export WANT_AUTOCONF="2.5"
+
+	# make files ready for new autoconf
+	EPATCH_OPTS="-p0 -d ${OLD_S}" epatch ${FILESDIR}/${PN}-2.1.30-autoconf25.patch
+	EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${PN}-2.1.30-autoconf25.patch
+
+	# fix AC calls bug #114544
+	EPATCH_OPTS="-p0 -d ${OLD_S}/build" epatch ${FILESDIR}/${PN}-2.1.30-m4_underquoted.patch
+	EPATCH_OPTS="-p0 -d ${S}/build" epatch ${FILESDIR}/${PN}-2.1.30-m4_underquoted.patch
+
+	# make tests rpath ready
+	EPATCH_OPTS="-p0 -d ${S}/tests" epatch ${FILESDIR}/${PN}-2.2.28-tests.patch
+
+	# make autoconf-archive compatible
+	EPATCH_OPTS="-p0 -d ${OLD_S}" epatch ${FILESDIR}/${PN}-2.1.30-autoconf-archived-fix.patch
+	EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.28-autoconf-archived-fix.patch
+
+	# add cleartext passwords backport bug #112554
+	EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${PN}-2.2.28-cleartext-passwords.patch
+
+	# reconf compat and current for RPATH solve
+	cd ${WORKDIR}/${OLD_P}
+	einfo "Running libtoolize on ${OLD_P}"
+	libtoolize --copy --force --automake
+	einfo "Running aclocal on ${OLD_P}"
+	aclocal || die "aclocal failed"
+	EPATCH_OPTS="-p0 -d ${WORKDIR}/${OLD_P}" epatch ${FILESDIR}/${PN}-2.1.30-rpath.patch
+	einfo "Running autoconf on ${OLD_P}"
+	autoconf || die "autoconf failed"
+
+	cd ${S}
+	einfo "Running libtoolize on ${P}"
+	libtoolize --copy --force --automake
+	einfo "Running aclocal on ${P}"
+	aclocal || die "aclocal failed"
+	EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${PN}-2.1.30-rpath.patch
+	einfo "Running autoconf on ${P}"
+	autoconf || die "autoconf failed"
+}
+
+src_compile() {
+	local myconf
+
+	# HDB is only available with BerkDB
+	myconf_berkdb='--enable-bdb --with-ldbm-api=berkeley --enable-hdb=mod'
+	myconf_gdbm='--disable-bdb --with-ldbm-api=gdbm --disable-hdb'
+
+	use debug && myconf="${myconf} --enable-debug" # there is no disable-debug
+
+	# enable slapd/slurpd servers if not doing a minimal build
+	if ! use minimal; then
+		myconf="${myconf} --enable-slapd --enable-slurpd"
+		# base backend stuff
+		myconf="${myconf} --enable-ldbm"
+		if use berkdb; then
+			einfo "Using Berkeley DB for local backend"
+			myconf="${myconf} ${myconf_berkdb}"
+		elif use gdbm; then
+			einfo "Using GDBM for local backend"
+			myconf="${myconf} ${myconf_gdbm}"
+		else
+			ewarn "Neither gdbm or berkdb USE flags present, falling back to"
+			ewarn "Berkeley DB for local backend"
+			myconf="${myconf} ${myconf_berkdb}"
+		fi
+		# extra backend stuff
+		myconf="${myconf} --enable-passwd=mod --enable-phonetic=mod"
+		myconf="${myconf} --enable-dnssrv=mod --enable-ldap"
+		myconf="${myconf} --enable-meta=mod --enable-monitor=mod"
+		myconf="${myconf} --enable-null=mod --enable-shell=mod"
+		myconf="${myconf} `use_enable perl perl mod`"
+		myconf="${myconf} `use_enable odbc sql mod`"
+		# slapd options
+		myconf="${myconf} `use_enable crypt` `use_enable slp`"
+		myconf="${myconf} --enable-rewrite --enable-rlookups"
+		myconf="${myconf} --enable-aci --enable-modules"
+		myconf="${myconf} --enable-cleartext --enable-slapi"
+		myconf="${myconf} `use_with samba lmpasswd`"
+		# disabled options:
+		# --with-bdb-module=dynamic
+		# alas, for BSD only:
+		# --with-fetch
+		# slapd overlay options
+		myconf="${myconf} --enable-dyngroup --enable-proxycache"
+	else
+		myconf="${myconf} --disable-slapd --disable-slurpd"
+		myconf="${myconf} --disable-bdb --disable-monitor"
+		myconf="${myconf} --disable-slurpd"
+	fi
+	# basic functionality stuff
+	myconf="${myconf} --enable-syslog --enable-dynamic"
+	myconf="${myconf} --enable-local --enable-proctitle"
+
+	myconf="${myconf} `use_enable ipv6` `use_enable readline`"
+	myconf="${myconf} `use_with sasl cyrus-sasl` `use_enable sasl spasswd`"
+	myconf="${myconf} `use_enable tcpd wrappers` `use_with ssl tls`"
+
+	if [ $(get_libdir) != "lib" ] ; then
+		append-ldflags -L/usr/$(get_libdir)
+	fi
+
+	econf \
+		--enable-static \
+		--enable-shared \
+		--libexecdir=/usr/$(get_libdir)/openldap \
+		${myconf} || die "configure failed"
+
+	make depend || die "make depend failed"
+	make || die "make failed"
+
+	# special kerberos stuff
+	tc-export CC
+	if ! use minimal && use kerberos ; then
+		cd ${S}/contrib/slapd-modules/passwd/ && \
+		${CC} -shared -I../../../include ${CFLAGS} -fPIC \
+		-DHAVE_KRB5 -o pw-kerberos.so kerberos.c || \
+		die "failed to compile kerberos module"
+	fi
+
+	# now build old compat lib
+	cd ${OLD_S} && \
+	econf \
+		--disable-static --enable-shared \
+		--libexecdir=/usr/$(get_libdir)/openldap \
+		--disable-slapd --disable-aci --disable-cleartext --disable-crypt \
+		--disable-lmpasswd --disable-spasswd --enable-modules \
+		--disable-phonetic --disable-rewrite --disable-rlookups --disable-slp \
+		--disable-wrappers --disable-bdb --disable-dnssrv --disable-ldap \
+		--disable-ldbm --disable-meta --disable-monitor --disable-null \
+		--disable-passwd --disable-perl --disable-shell --disable-sql \
+		--disable-slurpd || die "configure-2.1 failed"
+	make depend || die "make-2.1 depend failed"
+	cd ${OLD_S}/libraries/liblber && make liblber.la || die "make-2.1 liblber.la failed"
+	cd ${OLD_S}/libraries/libldap && make libldap.la || die "make-2.1 libldap.la failed"
+	cd ${OLD_S}/libraries/libldap_r && make libldap_r.la || die "make-2.1 libldap_r.la failed"
+}
+
+src_test() {
+	einfo "Doing tests"
+	cd tests ; make tests || die "make tests failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+
+	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README LICENSE ${FILESDIR}/DB_CONFIG.fast.example
+	docinto rfc ; dodoc doc/rfc/*.txt
+
+	# openldap modules go here
+	# TODO: write some code to populate slapd.conf with moduleload statements
+	keepdir /usr/$(get_libdir)/openldap/openldap/
+
+	# make state directories
+	for x in data slurp ldbm; do
+		keepdir /var/lib/openldap-${x}
+		fowners ldap:ldap /var/lib/openldap-${x}
+		fperms 0700 /var/lib/openldap-${x}
+	done
+
+	echo "OLDPF='${PF}'" >${D}${OPENLDAP_VERSIONTAG}
+	echo "# do NOT delete this. it is used" >>${D}${OPENLDAP_VERSIONTAG}
+	echo "# to track versions for upgrading." >>${D}${OPENLDAP_VERSIONTAG}
+
+	# manually remove /var/tmp references in .la
+	# because it is packaged with an ancient libtool
+	for x in ${D}/usr/$(get_libdir)/lib*.la; do
+		sed -i -e "s:-L${S}[/]*libraries::" ${x}
+	done
+
+	# change slapd.pid location in configuration file
+	keepdir /var/run/openldap
+	fowners ldap:ldap /var/run/openldap
+	fperms 0755 /var/run/openldap
+
+	if ! use minimal; then
+		# config modifications
+		for f in /etc/openldap/slapd.conf /etc/openldap/slapd.conf.default; do
+			sed -e "s:/var/lib/run/slapd.:/var/run/openldap/slapd.:" -i ${D}/${f}
+			sed -e "/database\tbdb$/acheckpoint	32	30 # <kbyte> <min>" -i ${D}/${f}
+			fowners root:ldap ${f}
+			fperms 0640 ${f}
+		done
+		# install our own init scripts
+		exeinto /etc/init.d
+		newexe ${FILESDIR}/2.0/slapd slapd
+		newexe ${FILESDIR}/2.0/slurpd slurpd
+		if [ $(get_libdir) != lib ]; then
+			sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i ${D}/etc/init.d/{slapd,slurpd}
+		fi
+		insinto /etc/conf.d
+		newins ${FILESDIR}/2.0/slapd.conf slapd
+		if use kerberos && [ -f ${S}/contrib/slapd-modules/passwd/pw-kerberos.so ]; then
+			insinto /usr/$(get_libdir)/openldap/openldap
+			doins ${S}/contrib/slapd-modules/passwd/pw-kerberos.so || \
+			die "failed to install kerberos passwd module"
+		fi
+	fi
+
+	# install MDK's ssl cert script
+	if use ssl || use samba; then
+		dodir /etc/openldap/ssl
+		exeinto /etc/openldap/ssl
+		#newexe ${FILESDIR}/gencert.sh-2.2.27 gencert.sh
+		doexe ${FILESDIR}/gencert.sh
+	fi
+
+	dolib.so ${OLD_S}/libraries/liblber/.libs/liblber.so.2.0.130 || \
+	die "failed to install old liblber"
+	dolib.so ${OLD_S}/libraries/libldap/.libs/libldap.so.2.0.130 || \
+	die "failed to install old libldap"
+	dolib.so ${OLD_S}/libraries/libldap_r/.libs/libldap_r.so.2.0.130 || \
+	die "failed to install old libldap_r"
+}
+
+pkg_postinst() {
+	if use ssl; then
+		# make a self-signed ssl cert (if there isn't one there already)
+		if [ ! -e /etc/openldap/ssl/ldap.pem ]
+		then
+			cd /etc/openldap/ssl
+			yes "" | sh gencert.sh
+			chmod 640 ldap.pem
+			chown root:ldap ldap.pem
+		else
+			einfo "An LDAP cert already appears to exist, no creating"
+		fi
+	fi
+
+	# Since moving to running openldap as user ldap there are some
+	# permissions problems with directories and files.
+	# Let's make sure these permissions are correct.
+	chown ldap:ldap /var/run/openldap
+	chmod 0755 /var/run/openldap
+	chown root:ldap /etc/openldap/slapd.conf{,.default}
+	chmod 0640 /etc/openldap/slapd.conf{,.default}
+	chown ldap:ldap /var/lib/openldap-{data,ldbm,slurp}
+
+	if use ssl; then
+		ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
+		ewarn "add 'TLS_REQCERT never' if you want to use them."
+	fi
+	openldap_upgrade_warning
+
+	# Reference inclusion bug #77330
+	echo
+	einfo "Getting started using OpenLDAP? There is some documentation available:"
+	einfo "Gentoo Guide to OpenLDAP Authentication"
+	einfo "(http://www.gentoo.org/doc/en/ldap-howto.xml)"
+
+	# note to bug #110412
+	echo
+	einfo "An example file for tuning BDB backends with openldap is:"
+	einfo "/usr/share/doc/${P}/DB_CONFIG.fast.example.gz"
+}