Bug #219371: Install C++ libraries and headers as needed. Bug #233633: Fix compile with USE="samba gnutls". Bug #273699: Fix slapd init ordering. Bug #261186: Build plugins with libtool instead of directly. Bug #279461: Update smbk5pwd building.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

6 files changed, 670 insertions, 9 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index 3a591ba8c0e2..8b1b35f3618c 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-nds/openldap
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.344 2009/07/28 02:11:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.345 2009/07/28 21:28:24 robbat2 Exp $
+
+*openldap-2.4.17-r1 (28 Jul 2009)
+
+  28 Jul 2009; Robin H. Johnson <robbat2@gentoo.org>
+  +openldap-2.4.17-r1.ebuild, files/openldap-2.4.17-contrib-smbk5pwd.patch,
+  +files/openldap-2.4.17-fix-lmpasswd-gnutls-symbols.patch,
+  files/slapd-initd:
+  Bug #219371: Install C++ libraries and headers as needed. Bug #233633: Fix
+  compile with USE="samba gnutls". Bug #273699: Fix slapd init ordering. Bug
+  #261186: Build plugins with libtool instead of directly. Bug #279461:
+  Update smbk5pwd building.
 
 *openldap-2.4.17 (28 Jul 2009)
 
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 47721812855e..941177280047 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -10,9 +10,10 @@ AUX openldap-2.4-disable-bdb46.patch 10249 RMD160 d989e7298722c99d104c96eb36dbb5
 AUX openldap-2.4-ppolicy.patch 455 RMD160 653695a9853bb7e1c9f53a779cb7ac2755edaf4e SHA1 8f419fddf0abf1fef48732b04617293c3ca1ed36 SHA256 355a8239355fcc5863ba7430d73af7ccad9e0211ae56180011d15d7418aa5b27
 AUX openldap-2.4.11-libldap_r.patch 515 RMD160 aa778bad59d498601bab84e215b2bcb6d125cf00 SHA1 e2c52828e719c137802966879f8da93a196cfde3 SHA256 3310a89d38bc39e6eb4333799d475411b274482b8bccab212b3edfd4385db70e
 AUX openldap-2.4.15-ppolicy.patch 418 RMD160 5b32da96fbc6002a2d464ea765ad72ebf23727f5 SHA1 cdd7c2bdfb0011561965a39f99e46cbb9f266aba SHA256 98269fa1e8a1a0e62dad9acd36fd9a33614fca9a5830d6e7e606db8eb7f85de5
-AUX openldap-2.4.17-contrib-smbk5pwd.patch 2025 RMD160 4ce3f66cbf631fbaa3430d3907c1d7a65368b20c SHA1 4cb75e01f6f2616013616043a11c9fdf75223238 SHA256 40ba548e5ae023cc167a0b71e2df5db1df64e6478cc141688f89b5cd63d8d7a7
+AUX openldap-2.4.17-contrib-smbk5pwd.patch 2046 RMD160 8e3834159767183535efa2144631e4cdfcd04a11 SHA1 6af3ca3f212414411e05c8766297b74573c103bc SHA256 81c146b2ee96ef03c169665f366ac25ebf93e2f1abb8ff41dc8741cb0927b813
+AUX openldap-2.4.17-fix-lmpasswd-gnutls-symbols.patch 3542 RMD160 7e17304b2b85e2dec12e0bc49b82e35443cc703e SHA1 7a25d0002581ae6f78ffe498c3e05eef0119f7a6 SHA256 31e816eb9f3b52f5f9d183f82adebff75892e45e764187e579a92204c90889cb
 AUX slapd-confd 436 RMD160 764d5e2915d9af33fd1db2489ceac6d953750984 SHA1 a16b4674b45ac1e1c8a8f9e84ad0de519c81aa11 SHA256 1ccb8a3b78b65b125b24779dd065cf8000e2d5e4da267bb0a892e730edd2055d
-AUX slapd-initd 578 RMD160 635aa3fcf59ea2d171a0f49bd7677ce35f9765ac SHA1 30770f53469ad1bd28e4710d0c727e531086b49f SHA256 6dc0aa449566e180307d95192ba809a1a17ce3e2ac813082dab86c2a91a518a8
+AUX slapd-initd 609 RMD160 3e1daa2bbbbec78aad265a1c4190098730a4234d SHA1 56d5f1d1f59e37bbcef2399847328c7963694f0a SHA256 840f984031b1fc84d4c6ba59c5ba0de5794be596215f0089c7739dba88d610d5
 AUX slurpd-initd 494 RMD160 9f3a06bcab2e4ce8e66783af506d26595bbbdcd2 SHA1 8ab66a984510fa91755cbcbac29883cea1435db7 SHA256 b23e010f701620ec34c39cd215891c7c0afc773341392a1e762e84166d9863ff
 DIST openldap-2.3.39.tgz 3807707 RMD160 cd6f652dc68786ca7d2b9f1b2d389e22ec17e3a0 SHA1 e87e60b1269f51d753d88df9b51745a66730a5d4 SHA256 0fc5431b9ca5a5c39e27607668112d8e9533aa68463087251682c1d1fb60b55b
 DIST openldap-2.3.40.tgz 3803330 RMD160 f8c0afd2a8207a55f5698e665104359d846bd8fe SHA1 a96e819662ff459015695a02f3a9f49451829e6c SHA256 ea7251be452611dbca106a7981ff706bf998aac4def7c224c613c46b1629aa51
@@ -33,7 +34,8 @@ EBUILD openldap-2.4.10.ebuild 13891 RMD160 ebcc813a41d99302f78821aa5774bc1e50257
 EBUILD openldap-2.4.11-r1.ebuild 14206 RMD160 c5d60179f9f5ae99887f87964ed6e5652b477154 SHA1 7ab5100c86ebcfaafdf19285a778c6b699a0ffab SHA256 32b55a26202b5469be9e53c18ba926a26a7f8cb4df9e4489cedc7f4ef4c34fb5
 EBUILD openldap-2.4.11.ebuild 13891 RMD160 00bc623c9a8955d4cf703ce3ff8a57884f138118 SHA1 e046ac6e7fb3296c7f6059a3f8fec920c224894d SHA256 a3add7bd5879c571abf5241cc536c9415c4d4134f41d920f76fafecf477dc571
 EBUILD openldap-2.4.16.ebuild 15152 RMD160 54d5cced13910c8f81edc117a3dfb8db86248341 SHA1 a590c2e7aaf4a04459a76e755d26cb3747156305 SHA256 053f2dff9a03af6d2994d61fe01f637245e09744d3fc3a0bd62c7630d7004783
+EBUILD openldap-2.4.17-r1.ebuild 17385 RMD160 dd86f32b4fd49d3aa331cb642fca960464b1962e SHA1 7685cd87f555ee4ddbde02b0397d4f876938a7ed SHA256 9e0433a41dcf12d59c4c78fe7caac1d708b7d63d8e631edd05e602fecbf4c1de
 EBUILD openldap-2.4.17.ebuild 15150 RMD160 c5fec4fe19eee4138f8fa54cb24286fce2f140a4 SHA1 3266854c75d30053bbe85d2243b2f6ecbdcb750f SHA256 4c8cbfcfd36a773bc0eb8084b48ba4fdec6d5ae6483805a870642c92640e1b3f
 EBUILD openldap-2.4.7.ebuild 11110 RMD160 8370caf76665c13440596f9a82426ef00af75b14 SHA1 81e7464fd6595182ea80a382f8d21eb54a253058 SHA256 b5bfc19f8ff07708ede3e86b1c8ae3a1d67faab3afb1bd0b45c78991b095d1b7
-MISC ChangeLog 58722 RMD160 06ce9c60827bfbbac16c9109450c0d2abb343a10 SHA1 fa1c0de134a3ea0d6cfe3f05fd3692096b2dba90 SHA256 c40398f4c9c5ef1fd4d213922009816691ac93b0330b8a42c928f028dca6dd57
+MISC ChangeLog 59222 RMD160 bba45ea9f4506a1cd25baedcd992d3e32d7d0a58 SHA1 d4d040705a857a3daf5abfc473d420d3e3d5b9f4 SHA256 ad348b369dd021677143d2e72b65d0e8e39296ebd62c3eb99ade9db16cf42123
 MISC metadata.xml 493 RMD160 3fd70a0f5e5b400cce6f75e477c8c9eaf0244ff8 SHA1 324691bfdc993bd6de2fff7cbfc10cfad567d32d SHA256 d23200f9c2f9e95e5fa32808c597df2951cd5e88ca9c519c9d5186bc42b0981e
diff --git a/net-nds/openldap/files/openldap-2.4.17-contrib-smbk5pwd.patch b/net-nds/openldap/files/openldap-2.4.17-contrib-smbk5pwd.patch
index 670324929e82..bf59170adef4 100644
--- a/net-nds/openldap/files/openldap-2.4.17-contrib-smbk5pwd.patch
+++ b/net-nds/openldap/files/openldap-2.4.17-contrib-smbk5pwd.patch
@@ -6,7 +6,7 @@ diff -Nuar --exclude 'openldap-2.4*' --exclude p -I '$OpenLDAP' openldap-2.4.17.
  # <http://www.OpenLDAP.org/license.html>.
  
 +#libexecdir=/usr/lib/openldap
-+moduledir=$(libexecdir)/openldap
++moduledir=$(libexecdir)
  LIBTOOL=../../../libtool
 -OPT=-g -O2
 +#OPT=
@@ -56,6 +56,6 @@ diff -Nuar --exclude 'openldap-2.4*' --exclude p -I '$OpenLDAP' openldap-2.4.17.
 -	mkdir -p $(PREFIX)/lib/openldap
 -	$(LIBTOOL) --mode=install cp smbk5pwd.la $(PREFIX)/lib/openldap
 -	$(LIBTOOL) --finish $(PREFIX)/lib
-+	mkdir -p $(moduledir)
-+	$(LIBTOOL) --mode=install cp smbk5pwd.la $(moduledir)
-+	$(LIBTOOL) --finish $(libexecdir)
++	mkdir -p $(DESTDIR)$(moduledir)
++	$(LIBTOOL) --mode=install cp smbk5pwd.la $(DESTDIR)$(moduledir)
++	$(LIBTOOL) --finish $(DESTDIR)$(libexecdir)
diff --git a/net-nds/openldap/files/openldap-2.4.17-fix-lmpasswd-gnutls-symbols.patch b/net-nds/openldap/files/openldap-2.4.17-fix-lmpasswd-gnutls-symbols.patch
new file mode 100644
index 000000000000..e5117468f809
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.4.17-fix-lmpasswd-gnutls-symbols.patch
@@ -0,0 +1,109 @@
+If GnuTLS is used, the lmpasswd module for USE=samba does not compile.
+Forward-port an old Debian patch that upstream never applied.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+Signed-off-by: Steffen Hau <steffen@hauihau.de>
+X-Gentoo-Bug: http://bugs.gentoo.org/show_bug.cgi?id=233633
+X-Upstream-Bug: http://www.openldap.org/its/index.cgi/Software%20Enhancements?id=4997
+X-Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=245341
+
+--- openldap-2.4.17.orig/libraries/liblutil/passwd.c	2009-07-27 18:59:19.635995474 -0700
++++ openldap-2.4.17/libraries/liblutil/passwd.c	2009-07-27 19:01:13.588069010 -0700
+@@ -51,6 +51,26 @@ typedef unsigned char des_data_block[8];
+ typedef PK11Context *des_context[1];
+ #define DES_ENCRYPT CKA_ENCRYPT
+ 
++#elif defined(HAVE_GNUTLS_GNUTLS_H) && !defined(DES_ENCRYPT)
++#	include <gcrypt.h>
++static int gcrypt_init = 0;
++
++typedef const void* des_key;
++typedef unsigned char des_cblock[8];
++typedef des_cblock des_data_block;
++typedef int des_key_schedule; /* unused */
++typedef des_key_schedule des_context; /* unused */
++#define des_failed(encrypted) 0
++#define des_finish(key, schedule) 
++
++#define des_set_key_unchecked( key, key_sched ) \
++  gcry_cipher_setkey( hd, key, 8 )
++
++#define des_ecb_encrypt( input, output, key_sched, enc ) \
++  gcry_cipher_encrypt( hd, *output, 8, *input, 8 )
++
++#define des_set_odd_parity( key ) do {} while(0)
++
+ #endif
+ 
+ #endif /* SLAPD_LMHASH */
+@@ -651,7 +671,7 @@ static int chk_md5(
+ 
+ #ifdef SLAPD_LMHASH
+ 
+-#if defined(HAVE_OPENSSL)
++#if defined(HAVE_OPENSSL) || defined(HAVE_GNUTLS_GNUTLS_H)
+ 
+ /*
+  * abstract away setting the parity.
+@@ -841,6 +861,19 @@ static int chk_lanman(
+ 	des_data_block StdText = "KGS!@#$%";
+ 	des_data_block PasswordHash1, PasswordHash2;
+ 	char PasswordHash[33], storedPasswordHash[33];
++
++#if defined(HAVE_GNUTLS_GNUTLS_H) && !defined(DES_ENCRYPT)
++	gcry_cipher_hd_t hd;
++
++	if ( !gcrypt_init ) {
++	  gcry_check_version( GCRYPT_VERSION );
++	  gcrypt_init = 1;
++	}
++
++	schedule = schedule; /* unused - avoid warning */
++
++	gcry_cipher_open( &hd, GCRY_CIPHER_DES, GCRY_CIPHER_MODE_ECB, 0 );
++#endif /* HAVE_GNUTLS_GNUTLS_H && !DES_ENCRYPT */
+ 	
+ 	for( i=0; i<cred->bv_len; i++) {
+ 		if(cred->bv_val[i] == '\0') {
+@@ -883,6 +916,10 @@ static int chk_lanman(
+ 	strncpy( storedPasswordHash, passwd->bv_val, 32 );
+ 	storedPasswordHash[32] = '\0';
+ 	ldap_pvt_str2lower( storedPasswordHash );
++
++#if defined(HAVE_GNUTLS_GNUTLS_H) && !defined(DES_ENCRYPT)
++	gcry_cipher_close( hd );
++#endif /* HAVE_GNUTLS_GNUTLS_H && !DES_ENCRYPT */
+ 	
+ 	return memcmp( PasswordHash, storedPasswordHash, 32) ? LUTIL_PASSWD_ERR : LUTIL_PASSWD_OK;
+ }
+@@ -1138,6 +1175,19 @@ static int hash_lanman(
+ 	des_data_block PasswordHash1, PasswordHash2;
+ 	char PasswordHash[33];
+ 	
++#if defined(HAVE_GNUTLS_GNUTLS_H) && !defined(DES_ENCRYPT)
++	gcry_cipher_hd_t hd;
++
++	if ( !gcrypt_init ) {
++	  gcry_check_version( GCRYPT_VERSION );
++	  gcrypt_init = 1;
++	}
++
++	schedule = schedule; /* unused - avoid warning */
++
++	gcry_cipher_open( &hd, GCRY_CIPHER_DES, GCRY_CIPHER_MODE_ECB, 0 );
++#endif /* HAVE_GNUTLS_GNUTLS_H && !DES_ENCRYPT */
++
+ 	for( i=0; i<passwd->bv_len; i++) {
+ 		if(passwd->bv_val[i] == '\0') {
+ 			return LUTIL_PASSWD_ERR;	/* NUL character in password */
+@@ -1168,6 +1218,10 @@ static int hash_lanman(
+ 	
+ 	hash->bv_val = PasswordHash;
+ 	hash->bv_len = 32;
++
++#if defined(HAVE_GNUTLS_GNUTLS_H) && !defined(DES_ENCRYPT)
++	gcry_cipher_close( hd );
++#endif /* HAVE_GNUTLS_GNUTLS_H && !DES_ENCRYPT */
+ 	
+ 	return pw_string( scheme, hash );
+ }
diff --git a/net-nds/openldap/files/slapd-initd b/net-nds/openldap/files/slapd-initd
index 963188af0448..0746cf47cd4e 100644
--- a/net-nds/openldap/files/slapd-initd
+++ b/net-nds/openldap/files/slapd-initd
@@ -1,10 +1,11 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/files/slapd-initd,v 1.2 2008/10/14 10:29:44 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/files/slapd-initd,v 1.3 2009/07/28 21:28:25 robbat2 Exp $
 
 depend() {
 	need net
+	before dbus hald avahi-daemon
 }
 
 start() {
diff --git a/net-nds/openldap/openldap-2.4.17-r1.ebuild b/net-nds/openldap/openldap-2.4.17-r1.ebuild
new file mode 100644
index 000000000000..18cd1166e2ed
--- /dev/null
+++ b/net-nds/openldap/openldap-2.4.17-r1.ebuild
@@ -0,0 +1,538 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.17-r1.ebuild,v 1.1 2009/07/28 21:28:24 robbat2 Exp $
+
+EAPI="2"
+inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
+
+DESCRIPTION="LDAP suite of application and development tools"
+HOMEPAGE="http://www.OpenLDAP.org/"
+SRC_URI="mirror://openldap/openldap-release/${P}.tgz"
+
+LICENSE="OPENLDAP"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+
+IUSE_DAEMON="crypt icu samba slp tcpd experimental minimal"
+IUSE_BACKEND="+berkdb"
+IUSE_OVERLAY="overlays perl"
+IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 syslog selinux"
+IUSE_CONTRIB="smbkrb5passwd kerberos"
+IUSE_CONTRIB="${IUSE_CONTRIB} cxx"
+IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
+
+# openssl is needed to generate lanman-passwords required by samba
+RDEPEND="sys-libs/ncurses
+	icu? ( dev-libs/icu )
+	tcpd? ( sys-apps/tcp-wrappers )
+	ssl? ( !gnutls? ( dev-libs/openssl )
+		gnutls? ( net-libs/gnutls ) )
+	sasl? ( dev-libs/cyrus-sasl )
+	!minimal? (
+		odbc? ( !iodbc? ( dev-db/unixODBC )
+			iodbc? ( dev-db/libiodbc ) )
+		slp? ( net-libs/openslp )
+		perl? ( dev-lang/perl[-build] )
+		samba? ( dev-libs/openssl )
+		berkdb? ( sys-libs/db )
+		smbkrb5passwd? (
+			dev-libs/openssl
+			app-crypt/heimdal )
+		kerberos? ( virtual/krb5 )
+		cxx? ( dev-libs/cyrus-sasl )
+	)
+	selinux? ( sec-policy/selinux-openldap )"
+DEPEND="${RDEPEND}"
+
+# for tracking versions
+OPENLDAP_VERSIONTAG=".version-tag"
+OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
+
+openldap_find_versiontags() {
+	# scan for all datadirs
+	openldap_datadirs=""
+	if [ -f "${ROOT}"/etc/openldap/slapd.conf ]; then
+		openldap_datadirs="$(awk '{if($1 == "directory") print $2 }' ${ROOT}/etc/openldap/slapd.conf)"
+	fi
+	openldap_datadirs="${openldap_datadirs} ${OPENLDAP_DEFAULTDIR_VERSIONTAG}"
+
+	einfo
+	einfo "Scanning datadir(s) from slapd.conf and"
+	einfo "the default installdir for Versiontags"
+	einfo "(${OPENLDAP_DEFAULTDIR_VERSIONTAG} may appear twice)"
+	einfo
+
+	# scan datadirs if we have a version tag
+	openldap_found_tag=0
+	for each in ${openldap_datadirs}; do
+		CURRENT_TAGDIR=${ROOT}`echo ${each} | sed "s:\/::"`
+		CURRENT_TAG=${CURRENT_TAGDIR}/${OPENLDAP_VERSIONTAG}
+		if [ -d ${CURRENT_TAGDIR} ] &&	[ ${openldap_found_tag} == 0 ] ; then
+			einfo "- Checking ${each}..."
+			if [ -r ${CURRENT_TAG} ] ; then
+				# yey, we have one :)
+				einfo "   Found Versiontag in ${each}"
+				source ${CURRENT_TAG}
+				if [ "${OLDPF}" == "" ] ; then
+					eerror "Invalid Versiontag found in ${CURRENT_TAGDIR}"
+					eerror "Please delete it"
+					eerror
+					die "Please kill the invalid versiontag in ${CURRENT_TAGDIR}"
+				fi
+
+				OLD_MAJOR=`get_version_component_range 2-3 ${OLDPF}`
+
+				# are we on the same branch?
+				if [ "${OLD_MAJOR}" != "${PV:0:3}" ] ; then
+					ewarn "   Versiontag doesn't match current major release!"
+					if [[ `ls -a ${CURRENT_TAGDIR} | wc -l` -gt 5 ]] ; then
+						eerror "   Versiontag says other major and you (probably) have datafiles!"
+						echo
+						openldap_upgrade_howto
+					else
+						einfo "   No real problem, seems there's no database."
+					fi
+				else
+					einfo "   Versiontag is fine here :)"
+				fi
+			else
+				einfo "   Non-tagged dir ${each}"
+				if [[ `ls -a ${each} | wc -l` > 5 ]] ; then
+					einfo "   EEK! Non-empty non-tagged datadir, counting `ls -a ${each} | wc -l` files"
+					echo
+
+					eerror
+					eerror "Your OpenLDAP Installation has a non tagged datadir that"
+					eerror "possibly contains a database at ${CURRENT_TAGDIR}"
+					eerror
+					eerror "Please export data if any entered and empty or remove"
+					eerror "the directory, installation has been stopped so you"
+					eerror "can take required action"
+					eerror
+					eerror "For a HOWTO on exporting the data, see instructions in the ebuild"
+					eerror
+					die "Please move the datadir ${CURRENT_TAGDIR} away"
+				fi
+			fi
+			einfo
+		fi
+	done
+
+	echo
+	einfo
+	einfo "All datadirs are fine, proceeding with merge now..."
+	einfo
+}
+
+openldap_upgrade_howto() {
+	eerror
+	eerror "A (possible old) installation of OpenLDAP was detected,"
+	eerror "installation will not proceed for now."
+	eerror
+	eerror "As major version upgrades 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. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
+	eerror " 5. emerge --update \=net-nds/${PF}"
+	eerror " 6. etc-update, and ensure that you apply the changes"
+	eerror " 7. slapadd -l ${l}"
+	eerror " 8. chown ldap:ldap /var/lib/openldap-data/*"
+	eerror " 9. /etc/init.d/slapd start"
+	eerror "10. check that your data is intact."
+	eerror "11. set up the new replication system."
+	eerror
+	if [ "${FORCE_UPGRADE}" != "1" ]; then
+		die "You need to upgrade your database first"
+	else
+		eerror "You have the magical FORCE_UPGRADE=1 in place."
+		eerror "Don't say you weren't warned about data loss."
+	fi
+}
+
+pkg_setup() {
+	if ! use sasl && use cxx ; then
+		die "To build the ldapc++ library you must emerge openldap with sasl support"
+	fi
+	if use minimal && has_version "net-nds/openldap" && built_with_use net-nds/openldap minimal ; then
+		einfo
+		einfo "Skipping scan for previous datadirs as requested by minimal useflag"
+		einfo
+	else
+		openldap_find_versiontags
+	fi
+
+	enewgroup ldap 439
+	enewuser ldap 439 -1 /usr/$(get_libdir)/openldap ldap
+}
+
+src_prepare() {
+	# ensure correct SLAPI path by default
+	sed -i -e 's,\(#define LDAPI_SOCK\).*,\1 "/var/run/openldap/slapd.sock",' \
+		"${S}"/include/ldap_defaults.h
+
+	epatch \
+		"${FILESDIR}"/${PN}-2.2.14-perlthreadsfix.patch \
+		"${FILESDIR}"/${PN}-2.4.15-ppolicy.patch
+
+	# bug #116045 - still present in 2.4.17
+	epatch "${FILESDIR}"/${PN}-2.4.17-contrib-smbk5pwd.patch
+
+	# bug #189817
+	epatch "${FILESDIR}"/${PN}-2.4.11-libldap_r.patch
+	
+	# bug #233633
+	epatch "${FILESDIR}"/${PN}-2.4.17-fix-lmpasswd-gnutls-symbols.patch
+
+	cd "${S}"/build
+	einfo "Making sure upstream build strip does not do stripping too early"
+	sed -i.orig \
+		-e '/^STRIP/s,-s,,g' \
+		top.mk || die "Failed to block stripping"
+
+	# wrong assumption that /bin/sh is /bin/bash
+	sed -i \
+		-e 's|/bin/sh|/bin/bash|g' \
+		"${S}"/tests/scripts/* || die "sed failed"
+}
+
+build_contrib_module() {
+	lt="${S}/libtool"
+	# <dir> <sources> <outputname>
+	cd "${S}/contrib/slapd-modules/$1"
+	einfo "Compiling contrib-module: $3"
+	"${lt}" --mode=compile --tag=CC \
+		"${CC}" \
+		-I../../../include -I../../../servers/slapd ${CFLAGS} \
+		-o ${2%.c}.lo -c $2 || die "compiling $3 failed"
+	einfo "Linking contrib-module: $3"
+	"${lt}" --mode=link --tag=CC \
+		"${CC}" -module \
+		${CFLAGS} \
+		${LDFLAGS} \
+		-rpath /usr/$(get_libdir)/openldap/openldap \
+		-o $3.la ${2%.c}.lo || die "linking $3 failed"
+}
+
+src_configure() {
+	local myconf
+
+	#Fix for glibc-2.8 and ucred. Bug 228457.
+	append-flags -D_GNU_SOURCE
+
+	use debug && myconf="${myconf} $(use_enable debug)"
+
+	# ICU usage is not configurable
+	export ac_cv_header_unicode_utypes_h="$(use icu && echo yes || echo no)"
+
+	if ! use minimal ; then
+		# backends
+		myconf="${myconf} --enable-slapd"
+		if use berkdb ; then
+			einfo "Using Berkeley DB for local backend"
+			myconf="${myconf} --enable-bdb --enable-hdb"
+			# We need to include the slotted db.h dir for FreeBSD
+			append-cppflags -I$(db_includedir)
+		else
+			ewarn
+			ewarn "Note: if you disable berkdb, you can only use remote-backends!"
+			ewarn
+			ebeep 5
+			myconf="${myconf} --disable-bdb --disable-hdb"
+		fi
+		for backend in dnssrv ldap meta monitor null passwd relay shell sock; do
+			myconf="${myconf} --enable-${backend}=mod"
+		done
+
+		myconf="${myconf} $(use_enable perl perl mod)"
+
+		myconf="${myconf} $(use_enable odbc sql mod)"
+		if use odbc ; then
+			local odbc_lib="unixodbc"
+			use iodbc && odbc_lib="iodbc"
+			myconf="${myconf} --with-odbc=${odbc_lib}"
+		fi
+
+		# slapd options
+		myconf="${myconf} $(use_enable crypt) $(use_enable slp)"
+		myconf="${myconf} $(use_enable samba lmpasswd)"
+		if use experimental ; then
+			myconf="${myconf} --enable-dynacl"
+			myconf="${myconf} --enable-aci=mod"
+		fi
+		for option in aci cleartext modules rewrite rlookups slapi; do
+			myconf="${myconf} --enable-${option}"
+		done
+
+		# slapd overlay options
+		# Compile-in the syncprov, the others as module
+		myconf="${myconf} --enable-syncprov=yes"
+		use overlays && myconf="${myconf} --enable-overlays=mod"
+	else
+		myconf="${myconf} --disable-slapd --disable-bdb --disable-hdb"
+		myconf="${myconf} --disable-overlays"
+	fi
+
+	# basic functionality stuff
+	myconf="${myconf} $(use_enable ipv6)"
+	myconf="${myconf} $(use_with sasl cyrus-sasl) $(use_enable sasl spasswd)"
+	myconf="${myconf} $(use_enable tcpd wrappers)"
+
+	local ssl_lib="no"
+	if use ssl || ( use ! minimal && use samba ) ; then
+		ssl_lib="openssl"
+		use gnutls && ssl_lib="gnutls"
+	fi
+
+	myconf="${myconf} --with-tls=${ssl_lib}"
+
+	for basicflag in dynamic local proctitle shared static syslog; do
+		myconf="${myconf} --enable-${basicflag}"
+	done
+
+	tc-export CC AR CXX
+	STRIP=/bin/true \
+	econf \
+		--libexecdir=/usr/$(get_libdir)/openldap \
+		${myconf}
+
+	if ! use minimal ; then
+		 if use cxx ; then
+		 	local myconf_ldapcpp
+		 	myconf_ldapcpp="${myconf_ldapcpp} --with-ldap-includes=../../include"
+		 	cd "${S}/contrib/ldapc++"
+		 	OLD_LDFLAGS="$LDFLAGS"
+		 	OLD_CPPFLAGS="$CPPFLAGS"
+		 	append-ldflags "-L../../libraries/liblber/.libs -L../../libraries/libldap/.libs"
+		 	append-ldflags "-L../../../libraries/liblber/.libs -L../../../libraries/libldap/.libs"
+		 	append-cppflags "-I../../../include"
+		 	econf ${myconf_ldapcpp} \
+		 		CC="${CC}" \
+		 		CXX="${CXX}" \
+		 		|| die "econf ldapc++ failed"
+		 	CPPFLAGS="$OLD_CPPFLAGS"
+		 fi
+	fi
+}
+
+src_compile() {
+	emake depend || die "emake depend failed"
+	emake CC="${CC}" AR="${AR}" || die "emake failed"
+	lt="${S}/libtool"
+	export echo="echo"
+
+	if ! use minimal ; then
+		 if use cxx ; then
+		 	einfo "Building contrib library: ldapc++"
+		 	cd "${S}/contrib/ldapc++"
+		 	emake \
+		 		CC="${CC}" CXX="${CXX}" \
+		 		|| die "emake ldapc++ failed"
+		 fi
+
+		if use smbkrb5passwd ; then
+			einfo "Building contrib-module: smbk5pwd"
+			cd "${S}/contrib/slapd-modules/smbk5pwd"
+
+			emake \
+				DEFS="-DDO_SAMBA -DDO_KRB5" \
+				KRB5_INC="$(krb5-config --cflags)" \
+				CC="${CC}" libexecdir="/usr/$(get_libdir)/openldap" \
+				|| die "emake smbk5pwd failed"
+		fi
+
+		if use kerberos ; then
+			cd "${S}/contrib/slapd-modules/passwd"
+			einfo "Compiling contrib-module: pw-kerberos"
+			"${lt}" --mode=compile --tag=CC \
+				"${CC}" \
+				-I../../../include \
+				${CFLAGS} \
+				$(krb5-config --cflags) \
+				-DHAVE_KRB5 \
+				-o kerberos.lo \
+				-c kerberos.c || die "compiling pw-kerberos failed"
+			einfo "Linking contrib-module: pw-kerberos"
+			"${lt}" --mode=link --tag=CC \
+				"${CC}" -module \
+				${CFLAGS} \
+				${LDFLAGS} \
+				-rpath /usr/$(get_libdir)/openldap/openldap \
+				-o pw-kerberos.la \
+				kerberos.lo || die "linking pw-kerberos failed"
+		fi
+		# We could build pw-radius if GNURadius would install radlib.h
+		cd "${S}/contrib/slapd-modules/passwd"
+		einfo "Compiling contrib-module: pw-netscape"
+		"${lt}" --mode=compile --tag=CC \
+			"${CC}" \
+			-I../../../include \
+			${CFLAGS} \
+			-o netscape.lo \
+			-c netscape.c || die "compiling pw-netscape failed"
+		einfo "Linking contrib-module: pw-netscape"
+		"${lt}" --mode=link --tag=CC \
+			"${CC}" -module \
+			${CFLAGS} \
+			${LDFLAGS} \
+			-rpath /usr/$(get_libdir)/openldap/openldap \
+			-o pw-netscape.la \
+			netscape.lo || die "linking pw-netscape failed"
+
+		build_contrib_module "addpartial" "addpartial-overlay.c" "addpartial-overlay"
+		build_contrib_module "allop" "allop.c" "overlay-allop"
+		build_contrib_module "autogroup" "autogroup.c" "autogroup"
+		build_contrib_module "denyop" "denyop.c" "denyop-overlay"
+		build_contrib_module "dsaschema" "dsaschema.c" "dsaschema-plugin"
+		# lastmod may not play well with other overlays
+		build_contrib_module "lastmod" "lastmod.c" "lastmod"
+		build_contrib_module "nops" "nops.c" "nops-overlay"
+	    build_contrib_module "trace" "trace.c" "trace"
+		# build slapi-plugins
+		cd "${S}/contrib/slapi-plugins/addrdnvalues"
+		einfo "Building contrib-module: addrdnvalues plugin"
+		"${CC}" -shared \
+			-I../../../include \
+			${CFLAGS} \
+			-fPIC \
+			${LDFLAGS} \
+			-o libaddrdnvalues-plugin.so \
+			addrdnvalues.c || die "Building libaddrdnvalues-plugin.so failed"
+
+	fi
+}
+
+src_test() {
+	cd tests ; make tests || die "make tests failed"
+}
+
+src_install() {
+	lt="${S}/libtool"
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README "${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/
+
+	# initial data storage dir
+	keepdir /var/lib/openldap-data
+	fowners ldap:ldap /var/lib/openldap-data
+	fperms 0700 /var/lib/openldap-data
+
+	echo "OLDPF='${PF}'" > "${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+	echo "# do NOT delete this. it is used"	>> "${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+	echo "# to track versions for upgrading." >> "${D}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+
+	# 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
+		# use our config
+		rm "${D}"etc/openldap/slapd.conf
+		insinto /etc/openldap
+		newins "${FILESDIR}"/${PN}-2.3.34-slapd-conf slapd.conf
+		configfile="${D}"etc/openldap/slapd.conf
+
+		# populate with built backends
+		ebegin "populate config with built backends"
+		for x in "${D}"usr/$(get_libdir)/openldap/openldap/back_*.so; do
+			elog "Adding $(basename ${x})"
+			sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}"
+		done
+		sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t/usr/$(get_libdir)/openldap/openldap:" -i "${configfile}"
+		fowners root:ldap /etc/openldap/slapd.conf
+		fperms 0640 /etc/openldap/slapd.conf
+		cp "${configfile}" "${configfile}".default
+		eend
+
+		# install our own init scripts
+		newinitd "${FILESDIR}"/slapd-initd slapd
+		newconfd "${FILESDIR}"/slapd-confd slapd
+		if [ $(get_libdir) != lib ]; then
+			sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i "${D}"etc/init.d/slapd
+		fi
+
+		 if use cxx ; then
+		 	einfo "Install the ldapc++ library"
+		 	cd "${S}/contrib/ldapc++"
+		 	emake DESTDIR="${D}" libexecdir="/usr/$(get_libdir)/openldap" install || die "emake install ldapc++ failed"
+		 	newdoc README ldapc++-README
+		 fi
+
+		if use smbkrb5passwd ; then
+			einfo "Install the smbk5pwd module"
+			cd "${S}/contrib/slapd-modules/smbk5pwd"
+			emake DESTDIR="${D}" libexecdir="/usr/$(get_libdir)/openldap" install || die "emake install smbk5pwd failed"
+			newdoc README smbk5pwd-README
+		fi
+
+		einfo "Installing contrib modules"
+		cd "${S}/contrib/slapd-modules"
+		for l in */*.la; do
+			"${lt}" --mode=install cp ${l} \
+				"${D}"usr/$(get_libdir)/openldap/openldap || \
+				die "installing ${l} failed"
+		done
+		docinto contrib
+		newdoc addpartial/README addpartial-README
+		newdoc allop/README allop-README
+		doman allop/slapo-allop.5
+		newdoc autogroup/README autogroup-README
+		newdoc denyop/denyop.c denyop-denyop.c
+		newdoc dsaschema/README dsaschema-README
+		doman lastmod/slapo-lastmod.5
+		doman nops/slapo-nops.5
+		newdoc passwd/README passwd-README
+		cd "${S}/contrib/slapi-plugins"
+		insinto /usr/$(get_libdir)/openldap/openldap
+		doins  */*.so
+		docinto contrib
+		newdoc addrdnvalues/README addrdnvalues-README
+	fi
+}
+
+pkg_preinst() {
+	# keep old libs if any
+	preserve_old_lib usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.3.so.0
+}
+
+pkg_postinst() {
+	if ! use minimal ; then
+		# You cannot build SSL certificates during src_install that will make
+		# binary packages containing your SSL key, which is both a security risk
+		# and a misconfiguration if multiple machines use the same key and cert.
+		if use ssl; then
+			install_cert /etc/openldap/ssl/ldap
+			chown ldap:ldap "${ROOT}"etc/openldap/ssl/ldap.*
+			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
+			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
+			ewarn "add 'TLS_REQCERT never' if you want to use them."
+		fi
+
+		# These lines force the permissions of various content to be correct
+		chown ldap:ldap "${ROOT}"var/run/openldap
+		chmod 0755 "${ROOT}"var/run/openldap
+		chown root:ldap "${ROOT}"etc/openldap/slapd.conf{,.default}
+		chmod 0640 "${ROOT}"etc/openldap/slapd.conf{,.default}
+		chown ldap:ldap "${ROOT}"var/lib/openldap-{data,ldbm}
+	fi
+
+	elog "Getting started using OpenLDAP? There is some documentation available:"
+	elog "Gentoo Guide to OpenLDAP Authentication"
+	elog "(http://www.gentoo.org/doc/en/ldap-howto.xml)"
+	elog "---"
+	elog "An example file for tuning BDB backends with openldap is"
+	elog "DB_CONFIG.fast.example in /usr/share/doc/${PF}/"
+
+	preserve_old_lib_notify usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.3.so.0
+}