fix bug #43021, change kerberos deps to virtual instead of app-crypt/mit-krb5 (which breaks heimdal). fix bug #42966, version bump. newer, more portable fix for bug #31202 (also fixes a weird problem case).

5 files changed, 280 insertions, 29 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index fba73b41e4ef..d53dc0232a5d 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-nds/openldap
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.62 2004/02/28 01:12:37 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.63 2004/03/09 01:25:53 robbat2 Exp $
+
+*openldap-2.1.27 (08 Mar 2004)
+
+  08 Mar 2004; Robin H. Johnson <robbat2@gentoo.org> openldap-2.1.27.ebuild,
+  files/openldap-2.1.27-perlthreadsfix.patch:
+  fix bug #43021, change kerberos deps to virtual instead of app-crypt/mit-krb5
+  (which breaks heimdal). fix bug #42966, version bump. newer, more portable fix
+  for bug #31202 (also fixes a weird problem case).
 
   27 Feb 2004; Joshua Kinard <kumba@gentoo.org> openldap-2.1.26.ebuild:
   Added ~mips to KEYWORDS to satisfy repoman deps.
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index fcfe6148d359..5866464ae80c 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -1,39 +1,42 @@
-MD5 89da3dacb8b8d1430f11add04433e033 ChangeLog 13031
+MD5 397efce00ce734da5f22c2c0260e7e37 openldap-2.1.27.ebuild~ 7335
+MD5 d8a6056f5b8fbff91eec997ca1630cd8 openldap-2.1.22-r1.ebuild 6034
+MD5 c5ea7a4b41599e60328a98b590528ee5 openldap-2.0.25-r2.ebuild 2606
+MD5 676a14183e57a5bc0b8111ec6654d05f openldap-2.1.27.ebuild 7111
+MD5 d5fa7ae920ec0fda0422783fa09f7540 openldap-2.1.22.ebuild 5264
+MD5 cd50219149c28e0ad5e89bb326312df0 openldap-2.0.27-r5.ebuild 6340
+MD5 aac5fbc779a0fb100a95da253e347a76 openldap-2.0.27.ebuild 2259
+MD5 9fc4af3bb133727b18ab9830f82f9449 openldap-2.0.25-r1.ebuild 2514
+MD5 8c1fc46dcab93872a625cb0a7e82d077 openldap-2.1.26.ebuild 7117
+MD5 db62b406ccff98fdaf8db7e155de7bca openldap-2.1.21.ebuild 5289
+MD5 2761df827f766abd73f69edc8f80c297 ChangeLog 13030
+MD5 ecf82d497e1648f218e1132d87bfd3a0 openldap-2.0.25-r3.ebuild 6256
 MD5 a22acc3272a4f93288731dc9b1dabcab metadata.xml 388
-MD5 d1b69673543f1e3e0699c3f13e7fb5a9 openldap-2.0.25-r1.ebuild 2515
-MD5 4c937f63671eabf2fb234cf3022621e3 openldap-2.0.25-r2.ebuild 2607
-MD5 d7c0bfd04a9e6ef58284b7ba8b504a21 openldap-2.0.25-r3.ebuild 6257
-MD5 edae6757530514ecebe8224853f3fa4c openldap-2.0.27-r4.ebuild 6422
-MD5 3e15013576f0008c9ea6039f5f12b126 openldap-2.0.27-r5.ebuild 6341
-MD5 4bb40877896e1864f96287730524c179 openldap-2.0.27.ebuild 2260
-MD5 0642a0c98ca16ff4de50019021509da4 openldap-2.1.21.ebuild 5290
-MD5 ac7c5e88a70d2f80c77c354599e07236 openldap-2.1.22-r1.ebuild 6035
-MD5 2b76bb06cc9adc38f140d0d6ed3dba33 openldap-2.1.22.ebuild 5265
-MD5 1e386d879e484c0111ef840c6eaf614b openldap-2.1.23.ebuild 6081
-MD5 ebb7ab2cbbe0f34e8bcf25be80e631e0 openldap-2.1.26.ebuild 7116
+MD5 94e4cb5d4a9fbe9514bd673a157ecd95 openldap-2.0.27-r4.ebuild 6421
+MD5 47331879a1a5e8e1c2ed3c05bf54e1a9 openldap-2.1.23.ebuild 6080
+MD5 ab26c55b61650f4081e4a9c28f972671 files/openldap-2.1.22-perlsedfoo.patch 1029
+MD5 646fd34831ae403ecda2103b01f49a0f files/slapd-2.1.conf 278
 MD5 32822e9d47a48af3b1da7e5a3c5c6229 files/digest-openldap-2.0.25-r1 65
 MD5 32822e9d47a48af3b1da7e5a3c5c6229 files/digest-openldap-2.0.25-r2 65
 MD5 32822e9d47a48af3b1da7e5a3c5c6229 files/digest-openldap-2.0.25-r3 65
-MD5 bc676758f2d1726b75e1d04fd936d029 files/digest-openldap-2.0.27 65
 MD5 bc676758f2d1726b75e1d04fd936d029 files/digest-openldap-2.0.27-r4 65
 MD5 bc676758f2d1726b75e1d04fd936d029 files/digest-openldap-2.0.27-r5 65
+MD5 2f3032e2a972520d1a5d428e11a6eb82 files/openldap-2.0.27-db3-gentoo.patch 5995
+MD5 c8d6f4ebeb92ef1085b1bb77d7b4db5f files/gencert.sh 3505
+MD5 d4aef53a2d2ebe6e6df8cfcf33494908 files/digest-openldap-2.1.22-r1 65
+MD5 798b6e9ea9800924d153a4aed3c00117 files/slapd-2.1.rc6 603
+MD5 97907dada58b504e9fb662b011d62c99 files/rfc2252-bork.patch 1319
+MD5 a0d6c549a55560e9a402e0f7156b0253 files/slurpd-2.1.rc6 497
+MD5 3eb7c8291ca6bc10c5350a59acfb90ce files/slapd-2.1-r1.rc6 698
+MD5 8a8a025bf2de63f76d33f244624c3851 files/kerberos-2.0.diff.bz2 385
+MD5 bc676758f2d1726b75e1d04fd936d029 files/digest-openldap-2.0.27 65
 MD5 43181f48b522ce05011ff4d0a0b061f7 files/digest-openldap-2.1.21 65
 MD5 d4aef53a2d2ebe6e6df8cfcf33494908 files/digest-openldap-2.1.22 65
-MD5 d4aef53a2d2ebe6e6df8cfcf33494908 files/digest-openldap-2.1.22-r1 65
 MD5 d1d8e016f9e53ab6886a5d507537f3d1 files/digest-openldap-2.1.23 65
 MD5 30ef1dc504563809f990b72ffe2be6c0 files/digest-openldap-2.1.26 65
-MD5 c8d6f4ebeb92ef1085b1bb77d7b4db5f files/gencert.sh 3505
-MD5 8a8a025bf2de63f76d33f244624c3851 files/kerberos-2.0.diff.bz2 385
+MD5 f829d2ebaab2e3e020a6b25522734331 files/digest-openldap-2.1.27 65
+MD5 88b5588f87bd5e5ffbaa1439c37e0489 files/slapd.rc6 580
+MD5 ce21ce168d56a88031a07bbb4162dd28 files/slurpd.rc6 493
 MD5 1de3e9592a8549c165bd43ba11b887f4 files/kerberos-2.1.diff.bz2 402
-MD5 2f3032e2a972520d1a5d428e11a6eb82 files/openldap-2.0.27-db3-gentoo.patch 5995
-MD5 ab26c55b61650f4081e4a9c28f972671 files/openldap-2.1.22-perlsedfoo.patch 1029
-MD5 97907dada58b504e9fb662b011d62c99 files/rfc2252-bork.patch 1319
-MD5 b6dfea76b039b194c4f403d9e7cebde0 files/slapd-2.1-r1.rc6 709
-MD5 646fd34831ae403ecda2103b01f49a0f files/slapd-2.1.conf 278
-MD5 460d3869f98a805e246ce497ac7f5dc5 files/slapd-2.1.rc6 614
-MD5 b7f252f92c11c2041e7bc864c344ecf1 files/slapd.rc6 591
-MD5 a10c9fd548df5774f91a6a10ed604041 files/slurpd-2.1.rc6 508
-MD5 427c91c528ea2cc1719df18d5339706f files/slurpd.rc6 504
-MD5 646fd34831ae403ecda2103b01f49a0f files/2.0/slapd.conf 278
-MD5 62149973636ec267f047c3ebd0f89901 files/2.0/slapd 620
-MD5 80adb9dc3133bd47fbc1168fd29788ee files/2.0/slurpd 505
+MD5 3b6efea8027a38b5ce0f37b5c1f20010 files/2.0/slapd 610
+MD5 50257f7d6b63c8e9778b6407c7d2dddb files/2.0/slapd.conf 277
+MD5 171a8cc18baee0dd5a85ee14b706e73c files/2.0/slurpd 493
diff --git a/net-nds/openldap/files/digest-openldap-2.1.27 b/net-nds/openldap/files/digest-openldap-2.1.27
new file mode 100644
index 000000000000..34dcd143ab05
--- /dev/null
+++ b/net-nds/openldap/files/digest-openldap-2.1.27
@@ -0,0 +1 @@
+MD5 b3aff479e1f946ce9906c5d3b0eb451d openldap-2.1.27.tgz 2044311
diff --git a/net-nds/openldap/files/openldap-2.1.27-perlthreadsfix.patch b/net-nds/openldap/files/openldap-2.1.27-perlthreadsfix.patch
new file mode 100644
index 000000000000..978ebb3ff0fe
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.1.27-perlthreadsfix.patch
@@ -0,0 +1,31 @@
+--- servers/slapd/back-perl.orig/Makefile.in	2002-06-20 18:15:09.000000000 -0700
++++ servers/slapd/back-perl/Makefile.in	2004-03-08 16:38:51.000000000 -0800
+@@ -28,7 +28,7 @@
+ 
+ shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
+ NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+-UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
++UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) `perl -MExtUtils::Embed -e ldopts`
+ 
+ LIBBASE = back_perl
+ 
+--- servers/slapd/back-perl.orig/perl_back.h	2003-03-12 17:09:09.000000000 -0800
++++ servers/slapd/back-perl/perl_back.h	2004-03-08 16:39:35.000000000 -0800
+@@ -2,6 +2,8 @@
+ #ifndef PERL_BACK_H
+ #define PERL_BACK_H 1
+ 
++#include <perl.h>
++
+ LDAP_BEGIN_DECL
+ 
+ /*
+@@ -23,7 +25,7 @@
+ # define na	PL_na
+ #endif
+ 
+-#ifdef HAVE_WIN32_ASPERL
++#if defined(HAVE_WIN32_ASPERL) || defined(USE_ITHREADS)
+ /* pTHX is needed often now */
+ # define PERL_INTERPRETER			my_perl
+ # define PERL_BACK_XS_INIT_PARAMS		pTHX
diff --git a/net-nds/openldap/openldap-2.1.27.ebuild b/net-nds/openldap/openldap-2.1.27.ebuild
new file mode 100644
index 000000000000..9544d5740677
--- /dev/null
+++ b/net-nds/openldap/openldap-2.1.27.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.1.27.ebuild,v 1.1 2004/03/09 01:25:53 robbat2 Exp $
+
+inherit eutils
+
+DESCRIPTION="LDAP suite of application and development tools"
+HOMEPAGE="http://www.OpenLDAP.org/"
+SRC_URI="ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/${P}.tgz"
+
+LICENSE="OPENLDAP"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ppc64 ~mips"
+IUSE="berkdb crypt debug gdbm ipv6 kerberos odbc perl readline samba sasl slp ssl tcpd"
+
+DEPEND=">=sys-libs/ncurses-5.1
+	>=sys-apps/sed-4
+	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 )
+	kerberos? ( virtual/krb5 )
+	odbc? ( dev-db/unixODBC )
+	slp? ( >=net-libs/openslp-1.0 )
+	perl? ( >=dev-lang/perl-5.6 )
+	samba? ( >=dev-libs/openssl-0.9.6 )"
+
+# 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
+DEPEND="${DEPEND}
+	berkdb? ( >=sys-libs/db-4.1.25_p1-r3 ) : ( gdbm? ( >=sys-libs/gdbm-1.8.0 ) : ( >=sys-libs/db-4.1.25_p1-r3 ) )"
+
+pkg_preinst() {
+	enewgroup ldap 439
+	enewuser ldap 439 /dev/null /usr/lib/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 -ie 's/$(SECURITY_LIBS) $(LDIF_LIBS) $(LUTIL_LIBS)/$(LUTIL_LIBS) $(SECURITY_LIBS) $(LDIF_LIBS)/' \
+		${S}/servers/slapd/Makefile.in
+
+	# supersedes old fix for bug #31202
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-2.1.27-perlthreadsfix.patch
+}
+
+src_compile() {
+	local myconf
+
+	# enable debugging to syslog
+	use debug && myconf="${myconf} --enable-debug"
+	myconf="${myconf} --enable-syslog"
+
+	# enable slapd/slurpd servers
+	myconf="${myconf} --enable-ldap"
+	myconf="${myconf} --enable-slapd --enable-slurpd"
+
+	myconf="${myconf} `use_enable crypt`"
+	myconf="${myconf} `use_enable ipv6`"
+	myconf="${myconf} `use_with sasl cyrus-sasl` `use_enable sasl spasswd`"
+	myconf="${myconf} `use_with kerberos` `use_enable kerberos kpasswd`"
+	myconf="${myconf} `use_with readline`"
+	myconf="${myconf} `use_with ssl tls` `use_with samba lmpasswd`"
+	myconf="${myconf} `use_enable tcpd wrappers`"
+	myconf="${myconf} `use_enable odbc sql`"
+	myconf="${myconf} `use_enable perl`"
+	myconf="${myconf} `use_enable slp`"
+
+	myconf="${myconf} --enable-ldbm"
+	myconf_berkdb='--enable-bdb --with-ldbm-api=berkeley'
+	myconf_gdbm='--disable-bdb --with-ldbm-api=gdbm'
+	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
+
+	# alas, for BSD only
+	#myconf="${myconf} --with-fetch"
+
+	myconf="${myconf} --enable-dynamic --enable-modules"
+	myconf="${myconf} --enable-rewrite --enable-rlookups"
+	myconf="${myconf} --enable-passwd --enable-phonetic"
+	myconf="${myconf} --enable-dnssrv --enable-ldap"
+	myconf="${myconf} --enable-meta --enable-monitor"
+	myconf="${myconf} --enable-null --enable-shell"
+	myconf="${myconf} --enable-local --enable-proctitle"
+
+	# disabled options
+	# --with-bdb-module=dynamic
+	# --enable-dnsserv --with-dnsserv-module=dynamic
+
+	econf \
+		--libexecdir=/usr/lib/openldap \
+		${myconf} || die "configure failed"
+
+	make depend || die "make depend failed"
+	make || die "make failed"
+	#cd tests ; make || die "make tests failed"
+
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+
+	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README LICENSE
+	docinto rfc ; dodoc doc/rfc/*.txt
+
+	# 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
+
+	# manually remove /var/tmp references in .la
+	# because it is packaged with an ancient libtool
+	for x in ${D}/usr/lib/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
+	sed -i -e "s:/var/lib/slapd.pid:/var/run/openldap/slapd.pid:" ${D}/etc/openldap/slapd.conf
+	sed -i -e "s:/var/lib/slapd.pid:/var/run/openldap/slapd.pid:" ${D}/etc/openldap/slapd.conf.default
+	sed -i -e "s:/var/lib/slapd.args:/var/run/openldap/slapd.args:" ${D}/etc/openldap/slapd.conf
+	sed -i -e "s:/var/lib/slapd.args:/var/run/openldap/slapd.args:" ${D}/etc/openldap/slapd.conf.default
+	fowners root:ldap /etc/openldap/slapd.conf
+	fperms 0640 /etc/openldap/slapd.conf
+	fowners root:ldap /etc/openldap/slapd.conf.default
+	fperms 0640 /etc/openldap/slapd.conf.default
+
+	# install our own init scripts
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/2.0/slapd slapd
+	newexe ${FILESDIR}/2.0/slurpd slurpd
+	insinto /etc/conf.d
+	newins ${FILESDIR}/2.0/slapd.conf slapd
+
+	# install MDK's ssl cert script
+	if [ "`use ssl`" -o "`use samba`" ]; then
+		dodir /etc/openldap/ssl
+		exeinto /etc/openldap/ssl
+		doexe ${FILESDIR}/gencert.sh
+	fi
+}
+
+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
+	chmod 0640 /etc/openldap/slapd.conf
+	chown root:ldap /etc/openldap/slapd.conf.default
+	chmod 0640 /etc/openldap/slapd.conf.default
+	chown ldap:ldap /var/lib/openldap-{data,ldbm,slurp}
+
+	# notes from bug #41297, bug #41039
+	ewarn "If you are upgrading from OpenLDAP 2.0, major changes have occured:"
+	ewarn "- bind_anon_dn is now disabled by default for security"
+	ewarn "  add 'allow bind_anon_dn' to your config for the old behavior."
+	ewarn "- Default schemas have changed, you should slapcat your entire DB to"
+	ewarn "  a file, delete your DB, and then slapadd it again. Alternatively"
+	ewarn "  you can try slapindex which should work in almost all cases. Be"
+	ewarn "  sure to check the permissions on the database files afterwards!"
+	if use ssl; then
+		ewarn "- Self-signed SSL certificates are treated harshly by OpenLDAP 2.1"
+		ewarn "  add 'TLS_REQCERT never' if you want to use them."
+	fi
+}