Bump 2.3 for init script checkpath change, #444912

Package-Manager: portage-2.2.0_alpha150/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 558 insertions, 6 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index 1a48dc3c0f82..f83d3dbee65e 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-nds/openldap
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.425 2012/12/03 06:23:55 robbat2 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.426 2013/01/14 02:30:20 patrick Exp $
+
+*openldap-2.3.43-r2 (14 Jan 2013)
+
+  14 Jan 2013; Patrick Lauer <patrick@gentoo.org> +openldap-2.3.43-r2.ebuild,
+  files/slapd-initd:
+  Bump 2.3 for init script checkpath change, #444912
 
   03 Dec 2012; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
   Add description for USE=minimal.
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 47aa7fb4ba46..b4a1336d045c 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -20,7 +20,7 @@ AUX openldap-2.4.31-gcc47.patch 480 SHA256 6a0bef52a8681e30c4be7c11df88f5c73d2ab
 AUX openldap-2.4.6-evolution-ntlm.patch 5161 SHA256 3b79d9afaa7c76ca20c5e7aa856dea49931741a1022ae6c3bb264c38f4c22edb SHA512 a553231ad3e2d2ca3a3a195b20da6163c135a723e0a3ed39afcad5601ed4ef01e692533df3f8f96d5ec8cc74ca27cbd16508818007dc1343899a42b5595b980b WHIRLPOOL 624f11c996825bb248dd7c33f64afd3a4e8b9edbbe79c6fdffc7f2d8e57c5d8ac4c651eae7763dbc0a06144b916131b70e599771034bcb6bd8c586a9bf6a8209
 AUX slapd-confd 614 SHA256 901044908fbbbbf333f7f0f1efccd1f0e213aa1a9156b3e659eaf0a0c7fdfc89 SHA512 e4ae52d10294da787016cf39adfd68c6ad812ac1758b00845810ee7936d21734d2ef3793252b878d88f21788414071adffb5f484381d4dc6a29f71a8729486b7 WHIRLPOOL d45df7487a952f899e9098779edda82afd9fb5ca66e42bbaf4a94f9ebdda9be58a026c0358a521a2feb4cc04c1f8477fb034896054ca4575d717bec367e1e2e8
 AUX slapd-confd-2.4.28-r1 1072 SHA256 5bca003ec3b67c7c78519aede1d82002579006ccfecce8f87b559df719f82e92 SHA512 7426c04ee689bcfb29a9a3956367c571eac6bc9620efda938591d09382a05527454458f7a25bdc2fa2ac920f93bae516121e085408ffefbe8ace0c7d8c5da315 WHIRLPOOL b9cb4e249f224ce2435184922df8d053d4c6d058a6408b72ac3c393563bdc0d413f7310e74ef7dcdab6dedc3d25a77d5af0581334356a9b55be5c516d6ee71d4
-AUX slapd-initd 607 SHA256 25c4d06be8f2a5d715a531030ddba5124f17781ece62814543fc6403e68e9e01 SHA512 3bb30661bb68afdcc4332a075483b075259e4ace5184c6799eab1055543d4f8600a3da28ca6279cf6a40b38d85331286cb5e05ad1d7de0ff26699fb41adea850 WHIRLPOOL f02ecdee1a236cee81b82d02df52d6d9fb2e7f0265d10481528d29744231a634d195f068401fa66509e6289cc57ba848eb078b4adfc495fd7c0cbcd378f95ba7
+AUX slapd-initd 801 SHA256 864ecf620d38d34e1d100cd09758c5e77200a20dbe029f04c9e613b754b81e78 SHA512 aae2e12144504aa428871d8e769cc6ae0b24966b7c89ec52182df041dd6c3f41938bc4580de05d4e92235ec899afce9034b1a8e874678f121b86b56480d8385a WHIRLPOOL 469d7f4f97cf739945233fdeca80f77f510b4d1b1df62a52515088a8c4d3946f671b38de776cc417a3c5c97c8f826c44ac2b9c24a483466b76d6f7628321b835
 AUX slapd-initd-2.4.28-r1 981 SHA256 1fc515a6816b8a750db513df0b3b9bf8dd8bd4c4e9051205521acadfdebeae0f SHA512 e57f1e26d3635cb9328aa021c7033abca5a02959eeb2ff9534c4cae6f89b1e4e4992590dd3ae9fcc5529fa6ab109973624d06bcfe3aac126214cfca08e8aed0e WHIRLPOOL bddd056cbf759ef5e9f510165eb786ed3153b1ed7f53191325ffff999adfc4360139da79873e2190d7988345559e62692dd5327f24fad1c28c7a8b6f38e8eb9f
 AUX slapd-initd2 622 SHA256 abd3ab5c58b18845f6946bbf93c987d833c8a94b88841c587ce453faf738cefa SHA512 36faef3b274fbb8f958893a6375e8ba99949705f73ed06d0022b09e7e4531ff3fdc1f87b026a787fafab05a9d227b3381d769c79d54662542c5bc15f1fec3afa WHIRLPOOL dba6e25b5e7ceb0f72c5a46f39d6271e0e76410296584dee96e46c5c18793a995183154fa98dd76f4f926c76a8dc988c87dbe1912e9d8048bd7cf1bbffc1103c
 AUX slurpd-initd 494 SHA256 b23e010f701620ec34c39cd215891c7c0afc773341392a1e762e84166d9863ff SHA512 d47c8ea473f3d9495583449d455581766b7bd3b913a314d720c514cfeae6b4e01973f1f2aa060f5cc5f2335fe57c2f4e78a56d02ba7859fc113cf69f6c233359 WHIRLPOOL 60bd05139e6af4710d265e71efe4aacaec468ae4289e8524870f157c2a36f427ef480cefed0f94c53414a2e31864127a6f5bf9ce3ebe0a217ff5e6aeaea020ef
@@ -38,6 +38,7 @@ DIST openldap-2.4.33.tgz 5463850 SHA256 81e9eca20f17a69a5d15ebc4c66a323106da4f4f
 DIST rfc2307bis.schema-20100722 9718 SHA256 c61c72e04b45d1e774de1e4084fb2a596210307fc94fe6532b257cdae283b86b SHA512 f71ec7f5ebf826524ef263c2d7e1fc17b7238bd82c3118bfdae2eddbb00e9777ea918c644f0416e818cf60f44807555a0ca48c20cc8738fcbf1675cff7292f17 WHIRLPOOL 77dd13ebbb87f44298cda6f48940662d288a7bf6fbcde3ad88656eee00b470fee11d8ecbd5a6008d3ca3263c48447b30310393881922a258d81722a56e05deb7
 DIST rfc2307bis.schema-20120525 11922 SHA256 41f90e2eafab34925b8223887fa378fc4bbb2801937fdfd3e5a8cf3517229c38 SHA512 cf313fcbbc79d2d1085f7547ed277f58605d931592d70298204f80f40092bf6450561162178e23add2fa5baf19c0b8fff82f69fbf9c2fde6744e9f29f4dac699 WHIRLPOOL b5dd02f0a5ab183b2f981995d886a6e193ec37c0247195a5eb30bc622aa8762130a053f6cad76923bffd55635e0c4e0904aabf0c1124dc9d69080d33f3f53e1c
 EBUILD openldap-2.3.43-r1.ebuild 18084 SHA256 37c30c55bde2936c78c1243caf64b6dd390703135225db8fc45a3e498e38da70 SHA512 860b2714437d81177694c0fe4e4e737007f7ad7d8479dbab12fcc012fd5c4593bd0c5f0470291fb3a50276560e14fe8d4cac94ec3242767a22923e8b2d70f9e1 WHIRLPOOL db82423f023ed7496c77e8bfa33b9ff6018d96f03f42ad9f4fe1d2b14cde4aa8e55bb7f91a6271d3d22d47aa8ee81b4393637fc63343be7dac882a3e9a726d78
+EBUILD openldap-2.3.43-r2.ebuild 18085 SHA256 45bf441772b3de71978758a89f76f9e761cf9833c493f0a7796db97c2ce8512b SHA512 08a1d036ec2ac156eccdc5d32d8377fb031287466dfbc550c8f4cb6648ceafebfd48faa9b7f3a4a9572b46fb2aa92c3bc45d46b066a48195034aba59bc0dc606 WHIRLPOOL dd78b872f3bb7064943ee04d3115453e0af4da916a7f08da4e3a90912a89e5af000208fa6c4e5e34e8b595b553c285fa0f25f0e3a9b84f2ca1228d983a3c0e3a
 EBUILD openldap-2.4.19-r1.ebuild 19730 SHA256 4e358e5b094537aaa633b9d9470b5045a5bd000c61b2ee4356fb4cc750d0a581 SHA512 8117fb7ab2e4401b8f418cd448ec33d6dc0ef1e3e5aaf1c9c3fb42ef3a3cb99a020ad037e4524b4c0a47a51cbaf7fa96fc789d3b25facf2b0cbbac81ef73b63d WHIRLPOOL 3d6a15c9d00f75f067c4c8cf25b7664f37f2f446f94d76bc808835910221a869baafcad6781c68f63ba713d2a1e3e7efe1d401094a6589dfd32ca0f7479199e6
 EBUILD openldap-2.4.21.ebuild 20065 SHA256 3fc415bf0949dc46a7cbeaa6d847e1735b1868574cfef6a5cb4cd7ca079b4014 SHA512 54c0d111e4de7f79c789fdea7587eef4d0c55d7b09d51379e438f85f0c7c1665a5caa0294e3cd9ecdac19f6348d42f450325a34ad0da53553ab960451b0959e3 WHIRLPOOL 24a9a32875a4d627dc1032526dbc2451fcad6158331eb2431e05ee802966f3b94890610f8f29a903e236904de4b42ee0e33442ac1c23e1627c04cdaeb53c564d
 EBUILD openldap-2.4.23.ebuild 20055 SHA256 93343e668f213c833d09e51c567384cdedf6119387cd3e38dd9fe9989e30f823 SHA512 259efec792ae32994cb6a8aa42ce9b2f6cf2ae1982c73b3080630a96ece803856e9924d2d8ac073f8ff4e082f730affdb8ebe8d1ae82fe0655dc0bd50749b7b5 WHIRLPOOL 753b36331ca1aa702f54a6430cefc23fff906d604a3fd5b98ff65f4cc9d247484e69767b893fc54ff9ac125071950e174ee196eac8a610c19f893ac53bca78e3
@@ -52,5 +53,5 @@ EBUILD openldap-2.4.31.ebuild 22248 SHA256 8f76f5f12a09c6031241049f882642d4b31ff
 EBUILD openldap-2.4.32.ebuild 22310 SHA256 cd4bf618094f84cffc878dce3c3a9fcd8c3c94a9713f5016cc689c795ca04d57 SHA512 453fa140f41a840e3bfcd8b2ac4725749c693d32e62a785c3e160717eaf19d974cbc76205ed748def9d517e2e81329b15f4a88493e0e8a400d7f2ef806b4861a WHIRLPOOL cad6b0437c6abef6fecff2d14223da8e78744b7775ba4b18fdbd690cf937614bb72fec5b887fbb79032e4fd4dddb1df265ca78f12b2204170062fe0d117cbf2b
 EBUILD openldap-2.4.33-r1.ebuild 22123 SHA256 996e857f18cf65acba22b4d059e23e6df18f248fb355f21853d1cf839f672536 SHA512 37c169ebb161d945290e34d1c17add620b14e342a3b2679d6bb0e8d29151f7d3256b487f85af651e0be3d1025d70f42b346bd158e3b1ff95fc32293fac37aa62 WHIRLPOOL 2389dff4b6f10d86810b76a146039bbdf0a64eaf3cccbadf37c6cb9af52549127a1f4dd8bf4a2a98ffeedcba0183b91f9c65d21fd41300ace6b39c033edf5678
 EBUILD openldap-2.4.33.ebuild 22310 SHA256 393a83a8f143de61221387aa25052581e3b7eee02e35be58abef610c3d8d9f6e SHA512 adbc96c8e3c441f22fe4feefe494a4a9c520e8eae23308b28ec5c111be5d25d991ca26c14e84b37d8079761814c161b30982444181abf290d1278e61ee8a8376 WHIRLPOOL d468542433b1d88b05517c5ef9cec3810f99039e2c99a4758fdafd97de3a0c75ba3fd10b65059810429c1b6f546f18bb1f00c5ce1e725f7f80f4aff1d7c97f1c
-MISC ChangeLog 74483 SHA256 1486fd9730b7b3dcf02b45786b8bec7eb5667c530701f1ae2046596f51f2e57f SHA512 83f5615cd26df1e76435018b343e9006483945a8648037b11ab5a685eff17384bedd8af4b51c58f3cd54c288356d2c8a14cc9ebe86dfda195618cbcaab04860e WHIRLPOOL 0071d7d0ace00665b9cd5342eb93e53ae7eae9f04f26a5bd19248870230bd8b0ac8e5b44bd0ec697e72ef61e806b945edbb62b0da248c114f3ba8351c0326a7e
+MISC ChangeLog 74671 SHA256 b1686cc7c75a01aa4a319f94b0af03743a5d691d2872de884ff6c7af15525f16 SHA512 475b21a77551b166b1e8290b3cd3671435b84e38b72192230e5d837a80fb64967e4bbffbec52ab838a53de23cf737d71225ae62f329cc3d2043d143051f4dad9 WHIRLPOOL 45202cb22077885c7e752ae64daa4a085209828d751ff20acbf310bfe18323e3ec2730db356dfebc24e5231c6ec712751843eb735d92c64d2346f6f7054a6ab5
 MISC metadata.xml 664 SHA256 70c2b3ca29517c6cafffef5802fcd6a513517d320a118bf2205b0033ffa384ea SHA512 55e576a18ae7c71f3fa413b252a40945059d9f9308f4036739124bd241cc6c409816124c7e4fd30df965963d93907bce03ee117489fdb3443e62bf00dac9da25 WHIRLPOOL ce3c30df03e9026415bd72d5f3c132bb3273a597a6ca8e8928957baae1b4bc6d80ab8f7f0698d72cd8d5773a957ee2a929d3c2bdd4f5a6cd6ba88f9b9e0aa4c7
diff --git a/net-nds/openldap/files/slapd-initd b/net-nds/openldap/files/slapd-initd
index 51e607e2e4ab..723bfcf74831 100644
--- a/net-nds/openldap/files/slapd-initd
+++ b/net-nds/openldap/files/slapd-initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.4 2012/02/12 01:02:32 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/files/slapd-initd,v 1.5 2013/01/14 02:30:20 patrick Exp $
 
 depend() {
 	need net.lo
@@ -9,6 +9,11 @@ depend() {
 }
 
 start() {
+        checkpath -q -d /var/run/openldap/ -o ldap:ldap 
+        if ! checkconfig -Q ; then
+                eerror "There is a problem with your slapd.conf!"
+                return 1
+        fi
 	ebegin "Starting ldap-server"
 	eval start-stop-daemon --start --pidfile /var/run/openldap/slapd.pid --exec /usr/lib/openldap/slapd -- -u ldap -g ldap "${OPTS}"
 	eend $?
diff --git a/net-nds/openldap/openldap-2.3.43-r2.ebuild b/net-nds/openldap/openldap-2.3.43-r2.ebuild
new file mode 100644
index 000000000000..c7d154f870dd
--- /dev/null
+++ b/net-nds/openldap/openldap-2.3.43-r2.ebuild
@@ -0,0 +1,540 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43-r2.ebuild,v 1.1 2013/01/14 02:30:20 patrick Exp $
+
+EAPI="2"
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+AT_M4DIR="./build"
+inherit autotools db-use eutils flag-o-matic multilib ssl-cert toolchain-funcs versionator
+
+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="berkdb crypt debug gdbm ipv6 kerberos minimal odbc overlays perl samba sasl slp smbkrb5passwd ssl tcpd selinux"
+
+# 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
+
+RDEPEND="sys-libs/ncurses
+	tcpd? ( sys-apps/tcp-wrappers )
+	ssl? ( dev-libs/openssl )
+	sasl? ( dev-libs/cyrus-sasl )
+	!minimal? (
+		odbc? ( dev-db/unixODBC )
+		slp? ( net-libs/openslp )
+		perl? ( dev-lang/perl[-build] )
+		samba? ( dev-libs/openssl )
+		kerberos? ( virtual/krb5 )
+		berkdb? (
+			|| ( 	sys-libs/db:4.5
+				sys-libs/db:4.4
+				sys-libs/db:4.3
+				>=sys-libs/db-4.2.52_p2-r1:4.2
+			)
+		)
+		!berkdb? (
+			gdbm? ( sys-libs/gdbm )
+			!gdbm? (
+				|| (	sys-libs/db:4.5
+					sys-libs/db:4.4
+					sys-libs/db:4.3
+					>=sys-libs/db-4.2.52_p2-r1:4.2
+				)
+			)
+		)
+		smbkrb5passwd? (
+			dev-libs/openssl
+			app-crypt/heimdal
+		)
+	)
+	selinux? ( sec-policy/selinux-ldap )"
+DEPEND="${RDEPEND}"
+
+# for tracking versions
+OPENLDAP_VERSIONTAG=".version-tag"
+OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
+
+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 '^(entry|context)CSN:' <${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
+}
+
+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
+
+}
+
+pkg_setup() {
+	if has_version "<=dev-lang/perl-5.8.8_rc1" && built_with_use dev-lang/perl minimal ; then
+		die "You must have a complete (USE='-minimal') Perl install to use the perl backend!"
+	fi
+
+	if use samba && ! use ssl ; then
+		eerror "LAN manager passwords need ssl flag set"
+		die "Please set ssl useflag"
+	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() {
+	# 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
+
+	# supersedes old fix for bug #31202
+	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-2.2.14-perlthreadsfix.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
+
+	EPATCH_OPTS="-p0 -d ${S}"
+
+	# ximian connector 1.4.7 ntlm patch
+	epatch "${FILESDIR}"/${PN}-2.2.6-ntlm.patch
+
+	# bug #132263
+	epatch "${FILESDIR}"/${PN}-2.3.21-ppolicy.patch
+
+	# bug #189817
+	epatch "${FILESDIR}"/${PN}-2.3.37-libldap_r.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
+	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"
+
+	# bug #116045
+	# patch contrib modules
+	if ! use minimal ; then
+		cd "${S}"/contrib
+		epatch "${FILESDIR}"/${PN}-2.3.24-contrib-smbk5pwd.patch
+	fi
+	# Fix gcc-4.4 compat, bug 264761
+	epatch "${FILESDIR}/openldap-2.3.XY-gcc44.patch"
+}
+
+src_configure() {
+	local myconf
+
+	#Fix for glibc-2.8 and ucred. Bug 228457.
+	append-flags -D_GNU_SOURCE
+
+	# HDB is only available with BerkDB
+	myconf_berkdb='--enable-bdb --enable-ldbm-api=berkeley --enable-hdb=mod'
+	myconf_gdbm='--disable-bdb --enable-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}"
+			# We need to include the slotted db.h dir for FreeBSD
+			append-cppflags -I$(db_includedir 4.5 4.4 4.3 4.2 )
+		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}"
+			# We need to include the slotted db.h dir for FreeBSD
+			append-cppflags -I$(db_includedir 4.5 4.4 4.3 4.2 )
+		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} --enable-relay=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_enable samba lmpasswd)"
+		# slapd overlay options
+		myconf="${myconf} --enable-dyngroup --enable-proxycache"
+		use overlays && myconf="${myconf} --enable-overlays=mod"
+		myconf="${myconf} --enable-syncprov"
+	else
+		myconf="${myconf} --disable-slapd --disable-slurpd"
+		myconf="${myconf} --disable-bdb --disable-ldbm"
+		myconf="${myconf} --disable-hdb --disable-monitor"
+		myconf="${myconf} --disable-slurpd --disable-overlays"
+		myconf="${myconf} --disable-relay"
+	fi
+
+	# basic functionality stuff
+	myconf="${myconf} --enable-syslog --enable-dynamic"
+	myconf="${myconf} --enable-local --enable-proctitle"
+
+	myconf="${myconf} $(use_enable ipv6)"
+	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
+
+	STRIP=/bin/true \
+	econf \
+		--enable-static \
+		--enable-shared \
+		--libexecdir=/usr/$(get_libdir)/openldap \
+		${myconf} || die "configure failed"
+}
+
+src_compile() {
+	emake depend || die "make depend failed"
+	emake || die "make failed"
+
+	# openldap/contrib
+	tc-export CC
+	if ! use minimal ; then
+		# dsaschema
+			einfo "Building contributed dsaschema"
+			cd "${S}"/contrib/slapd-modules/dsaschema
+			${CC} -shared -I../../../include ${CFLAGS} -fPIC \
+			-Wall -o libdsaschema-plugin.so dsaschema.c || \
+			die "failed to compile dsaschema module"
+		# kerberos passwd
+		if use kerberos ; then
+			einfo "Building contributed pw-kerberos"
+			cd "${S}"/contrib/slapd-modules/passwd/ && \
+			${CC} -shared -I../../../include ${CFLAGS} -fPIC \
+			$(krb5-config --cflags) \
+			-DHAVE_KRB5 -o pw-kerberos.so kerberos.c || \
+			die "failed to compile kerberos password module"
+		fi
+		# netscape mta-md5 password
+			einfo "Building contributed pw-netscape"
+			cd "${S}"/contrib/slapd-modules/passwd/ && \
+			${CC} -shared -I../../../include ${CFLAGS} -fPIC \
+			-o pw-netscape.so netscape.c || \
+			die "failed to compile netscape password module"
+		# smbk5pwd overlay
+		# Note: this modules builds, but may not work with
+		#	Gentoo's MIT-Kerberos.	It was designed for Heimdal
+		#	Kerberos.
+		if use smbkrb5passwd ; then
+			einfo "Building contributed smbk5pwd"
+			local mydef
+			local mykrb5inc
+			mydef="-DDO_SAMBA -DDO_KRB5"
+			mykrb5inc="$(krb5-config --cflags)"
+			cd "${S}"/contrib/slapd-modules/smbk5pwd && \
+			libexecdir="/usr/$(get_libdir)/openldap" \
+			DEFS="${mydef}" KRB5_INC="${mykrb5inc}" emake || \
+			die "failed to compile smbk5pwd module"
+		fi
+		# addrdnvalues
+			einfo "Building contributed addrdnvalues"
+			cd "${S}"/contrib/slapi-plugins/addrdnvalues/ && \
+			${CC} -shared -I../../../include ${CFLAGS} -fPIC \
+			-o libaddrdnvalues-plugin.so addrdnvalues.c || \
+			die "failed to compile addrdnvalues plugin"
+	fi
+}
+
+src_test() {
+	einfo "Doing tests"
+	cd tests ; make tests || die "make tests failed"
+}
+
+src_install() {
+	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/
+
+	# make state directories
+	local dirlist="data"
+	if ! use minimal; then
+		dirlist="${dirlist} slurp ldbm"
+	fi
+	for x in ${dirlist}; 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_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}"
+
+	# 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
+		# use our config
+		rm "${D}"etc/openldap/slapd.con*
+		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
+		newinitd "${FILESDIR}"/slurpd-initd slurpd
+		newconfd "${FILESDIR}"/slapd-confd slapd
+
+		if [ $(get_libdir) != lib ]; then
+			sed -e "s,/usr/lib/,/usr/$(get_libdir)/," -i "${D}"etc/init.d/{slapd,slurpd}
+		fi
+
+		# install contributed modules
+		docinto /
+		if [ -e "${S}"/contrib/slapd-modules/dsaschema/libdsaschema-plugin.so ];
+		then
+			cd "${S}"/contrib/slapd-modules/dsaschema/
+			newdoc README README.contrib.dsaschema
+			exeinto /usr/$(get_libdir)/openldap/openldap
+			doexe libdsaschema-plugin.so || \
+			die "failed to install dsaschema module"
+		fi
+		if [ -e "${S}"/contrib/slapd-modules/passwd/pw-kerberos.so ]; then
+			cd "${S}"/contrib/slapd-modules/passwd/
+			newdoc README README.contrib.passwd
+			exeinto /usr/$(get_libdir)/openldap/openldap
+			doexe pw-kerberos.so || \
+			die "failed to install kerberos passwd module"
+		fi
+		if [ -e "${S}"/contrib/slapd-modules/passwd/pw-netscape.so ]; then
+			cd "${S}"/contrib/slapd-modules/passwd/
+			newdoc README README.contrib.passwd
+			exeinto /usr/$(get_libdir)/openldap/openldap
+			doexe "${S}"/contrib/slapd-modules/passwd/pw-netscape.so || \
+			die "failed to install Netscape MTA-MD5 passwd module"
+		fi
+		if [ -e "${S}"/contrib/slapd-modules/smbk5pwd/.libs/smbk5pwd.so ]; then
+			cd "${S}"/contrib/slapd-modules/smbk5pwd
+			newdoc README README.contrib.smbk5pwd
+			libexecdir="/usr/$(get_libdir)/openldap" \
+			emake DESTDIR="${D}" install-mod || \
+			die "failed to install smbk5pwd overlay module"
+		fi
+		if [ -e "${S}"/contrib/slapd-tools/statslog ]; then
+			cd "${S}"/contrib/slapd-tools
+			exeinto /usr/bin
+			newexe statslog ldapstatslog || \
+			die "failed to install ldapstatslog script"
+		fi
+		if [ -e "${S}"/contrib/slapi-plugins/addrdnvalues/libaddrdnvalues-plugin.so ];
+		then
+			cd "${S}"/contrib/slapi-plugins/addrdnvalues
+			newdoc README README.contrib.addrdnvalues
+			exeinto /usr/$(get_libdir)/openldap/openldap
+			doexe libaddrdnvalues-plugin.so || \
+			die "failed to install addrdnvalues plugin"
+		fi
+	fi
+}
+
+pkg_preinst() {
+	# keep old libs if any
+	LIBSUFFIXES=".so.2.0.130 -2.2.so.7"
+	for LIBSUFFIX in ${LIBSUFFIXES} ; do
+		for each in libldap libldap_r liblber ; do
+			preserve_old_lib "usr/$(get_libdir)/${each}${LIBSUFFIX}"
+		done
+	done
+}
+
+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.
+		# Additionally, it overwrites
+		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,slurp}
+	fi
+
+	# Reference inclusion bug #77330
+	echo
+	elog
+	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
+
+	# note to bug #110412
+	echo
+	elog
+	elog "An example file for tuning BDB backends with openldap is"
+	elog "DB_CONFIG.fast.example in /usr/share/doc/${PF}/"
+	elog
+
+	LIBSUFFIXES=".so.2.0.130 -2.2.so.7"
+	for LIBSUFFIX in ${LIBSUFFIXES} ; do
+		for each in liblber libldap libldap_r ; do
+			preserve_old_lib_notify "usr/$(get_libdir)/${each}${LIBSUFFIX}"
+		done
+	done
+}