Fixes as noted in bug #22657, and a version bump of the 2.1 series

7 files changed, 217 insertions, 25 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index fae2e12409ed..60a1815a00bb 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-nds/openldap
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.35 2003/06/11 00:49:20 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.36 2003/06/14 17:51:14 raker Exp $
+
+*openldap-2.1.21 (14 Jun 2003)
+
+  14 Jun 2003; Nick Hadaway <raker@gentoo.org> openldap-2.1.21.ebuild,
+  files/digest-openldap-2.1.21, files/2.0/slapd, files/2.0/slapd.conf:
+  Bug fixes as noted in bug #22657.  Version bump.
 
 *openldap-2.0.27-r4 (28 May 2003)
 
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 7006863d3f54..cca1c9123317 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -1,32 +1,34 @@
-MD5 87620c2148de8bd087978d0ac249814a ChangeLog 8207
-MD5 7e223bf5e395fd7b935ed34f7833724a openldap-2.0.25-r1.ebuild 2420
-MD5 1dd0b58c9536e8b869458bb755671bf0 openldap-2.0.27-r3.ebuild 3921
 MD5 64852ab3a70cd145c0c2c26df950a160 openldap-2.1.19.ebuild 4283
+MD5 196f3a6a062cb18c6d2b8ab686a2157e openldap-2.1.20.ebuild 5287
 MD5 c2c34f94c7826e325e1d114aaf17cd1e openldap-2.0.25-r2.ebuild 2583
-MD5 7dcaf1334f954817aee891ffb51db8f4 openldap-2.0.27-r2.ebuild 3047
+MD5 1dd0b58c9536e8b869458bb755671bf0 openldap-2.0.27-r3.ebuild 3921
 MD5 455636add4e308ff6dcfdd873ee638d7 openldap-2.0.27.ebuild 2314
-MD5 196f3a6a062cb18c6d2b8ab686a2157e openldap-2.1.20.ebuild 5287
+MD5 7e223bf5e395fd7b935ed34f7833724a openldap-2.0.25-r1.ebuild 2420
+MD5 7dcaf1334f954817aee891ffb51db8f4 openldap-2.0.27-r2.ebuild 3047
+MD5 80437e0ac6542e2e7c8150a20d464e86 openldap-2.1.21.ebuild 5282
 MD5 0660f8517150bb85efa7442e785449b2 openldap-2.1.12.ebuild 3342
+MD5 87620c2148de8bd087978d0ac249814a ChangeLog 8207
 MD5 44504b7fefa587532782f057a83ba290 openldap-2.0.27-r4.ebuild 4795
-MD5 bc676758f2d1726b75e1d04fd936d029 files/digest-openldap-2.0.27-r3 65
+MD5 44c7dbcfe29bc1df9e576e5010c4674f files/slapd-2.1.conf 251
 MD5 32822e9d47a48af3b1da7e5a3c5c6229 files/digest-openldap-2.0.25-r1 65
-MD5 cc41a12a9b455803861b9919a0b86d55 files/digest-openldap-2.1.19 65
-MD5 bc676758f2d1726b75e1d04fd936d029 files/digest-openldap-2.0.27 65
 MD5 32822e9d47a48af3b1da7e5a3c5c6229 files/digest-openldap-2.0.25-r2 65
 MD5 bc676758f2d1726b75e1d04fd936d029 files/digest-openldap-2.0.27-r2 65
-MD5 d2c6433b373280aa1ad949d7626986cc files/digest-openldap-2.1.20 65
-MD5 bd86dfd482d437884ca6305acc3aa2a1 files/digest-openldap-2.1.12 65
+MD5 bc676758f2d1726b75e1d04fd936d029 files/digest-openldap-2.0.27-r3 65
+MD5 bc676758f2d1726b75e1d04fd936d029 files/digest-openldap-2.0.27-r4 65
+MD5 2f3032e2a972520d1a5d428e11a6eb82 files/openldap-2.0.27-db3-gentoo.patch 5995
 MD5 8da86adedbe551c680dd6e102dfc303d files/gencert.sh 3505
-MD5 8a8a025bf2de63f76d33f244624c3851 files/kerberos-2.0.diff.bz2 385
-MD5 1de3e9592a8549c165bd43ba11b887f4 files/kerberos-2.1.diff.bz2 402
-MD5 b6dfea76b039b194c4f403d9e7cebde0 files/slapd-2.1-r1.rc6 709
-MD5 44c7dbcfe29bc1df9e576e5010c4674f files/slapd-2.1.conf 251
 MD5 460d3869f98a805e246ce497ac7f5dc5 files/slapd-2.1.rc6 614
-MD5 b7f252f92c11c2041e7bc864c344ecf1 files/slapd.rc6 591
 MD5 a10c9fd548df5774f91a6a10ed604041 files/slurpd-2.1.rc6 508
+MD5 b6dfea76b039b194c4f403d9e7cebde0 files/slapd-2.1-r1.rc6 709
+MD5 8a8a025bf2de63f76d33f244624c3851 files/kerberos-2.0.diff.bz2 385
+MD5 bc676758f2d1726b75e1d04fd936d029 files/digest-openldap-2.0.27 65
+MD5 bd86dfd482d437884ca6305acc3aa2a1 files/digest-openldap-2.1.12 65
+MD5 cc41a12a9b455803861b9919a0b86d55 files/digest-openldap-2.1.19 65
+MD5 d2c6433b373280aa1ad949d7626986cc files/digest-openldap-2.1.20 65
+MD5 43181f48b522ce05011ff4d0a0b061f7 files/digest-openldap-2.1.21 65
+MD5 b7f252f92c11c2041e7bc864c344ecf1 files/slapd.rc6 591
 MD5 427c91c528ea2cc1719df18d5339706f files/slurpd.rc6 504
-MD5 2f3032e2a972520d1a5d428e11a6eb82 files/openldap-2.0.27-db3-gentoo.patch 5995
-MD5 bc676758f2d1726b75e1d04fd936d029 files/digest-openldap-2.0.27-r4 65
-MD5 44c7dbcfe29bc1df9e576e5010c4674f files/2.0/slapd.conf 251
-MD5 0ca38c285b94f57088a73fedcecb9e34 files/2.0/slapd 615
+MD5 1de3e9592a8549c165bd43ba11b887f4 files/kerberos-2.1.diff.bz2 402
+MD5 22ffe7fb5782bd78549530df5ff8fa2c files/2.0/slapd 617
+MD5 81f8395de0b75ac0db688d616d3d5720 files/2.0/slapd.conf 231
 MD5 80adb9dc3133bd47fbc1168fd29788ee files/2.0/slurpd 505
diff --git a/net-nds/openldap/files/2.0/slapd b/net-nds/openldap/files/2.0/slapd
index ed67f9daf983..09055709caa7 100644
--- a/net-nds/openldap/files/2.0/slapd
+++ b/net-nds/openldap/files/2.0/slapd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/files/2.0/slapd,v 1.1 2003/05/11 19:18:21 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/files/2.0/slapd,v 1.2 2003/06/14 17:51:14 raker Exp $
 
 depend() {
 	need net
@@ -9,7 +9,7 @@ depend() {
 
 start() {
 	ebegin "Starting ldap-server"
-	start-stop-daemon --start --quiet --pidfile /var/run/openldap/slapd.pid --exec /usr/lib/openldap/slapd -- -u ldap -g ldap ${OPTS}
+	start-stop-daemon --start --quiet --pidfile /var/run/openldap/slapd.pid --exec /usr/lib/openldap/slapd -- -u ldap -g ldap "${OPTS}"
 	eend $?
 }
 
diff --git a/net-nds/openldap/files/2.0/slapd.conf b/net-nds/openldap/files/2.0/slapd.conf
index 9a82209503ea..e407f7e0a032 100644
--- a/net-nds/openldap/files/2.0/slapd.conf
+++ b/net-nds/openldap/files/2.0/slapd.conf
@@ -4,5 +4,5 @@
 # one uncomment this line or set any other server starting options
 # you may desire.
 #
-# OPTS="-h \'ldaps://0.0.0.0/ ldap://0.0.0.0/\'"
+# OPTS="-h ldaps:// ldap://"
 
diff --git a/net-nds/openldap/files/digest-openldap-2.1.21 b/net-nds/openldap/files/digest-openldap-2.1.21
new file mode 100644
index 000000000000..6ced62d386a2
--- /dev/null
+++ b/net-nds/openldap/files/digest-openldap-2.1.21
@@ -0,0 +1 @@
+MD5 285097d048bf17e7bbb35878173a63c9 openldap-2.1.21.tgz 2033668
diff --git a/net-nds/openldap/openldap-2.1.20.ebuild b/net-nds/openldap/openldap-2.1.20.ebuild
index a078fe0c79ca..177c2fc4365e 100644
--- a/net-nds/openldap/openldap-2.1.20.ebuild
+++ b/net-nds/openldap/openldap-2.1.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.20.ebuild,v 1.4 2003/06/11 00:49:20 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.1.20.ebuild,v 1.5 2003/06/14 17:51:14 raker Exp $
 
 IUSE="ssl tcpd readline ipv6 gdbm sasl kerberos odbc perl slp"
 
@@ -162,7 +162,7 @@ src_install() {
 	newexe ${FILESDIR}/2.0/slapd slapd
 	newexe ${FILESDIR}/2.0/slurpd slurpd
 	insinto /etc/conf.d
-	newins ${FILESDIR}/2.0/slapd.conf slapd.conf
+	newins ${FILESDIR}/2.0/slapd.conf slapd
 
 	# install MDK's ssl cert script
 	dodir /etc/openldap/ssl
diff --git a/net-nds/openldap/openldap-2.1.21.ebuild b/net-nds/openldap/openldap-2.1.21.ebuild
new file mode 100644
index 000000000000..8c3561ce4bda
--- /dev/null
+++ b/net-nds/openldap/openldap-2.1.21.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2003 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.21.ebuild,v 1.1 2003/06/14 17:51:14 raker Exp $
+
+IUSE="ssl tcpd readline ipv6 gdbm sasl kerberos odbc perl slp"
+
+inherit eutils
+
+DESCRIPTION="LDAP suite of application and development tools"
+SRC_URI="ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/${P}.tgz"
+HOMEPAGE="http://www.OpenLDAP.org/"
+
+SLOT="0"
+KEYWORDS="~x86 -ppc"
+LICENSE="OPENLDAP"
+
+DEPEND=">=sys-libs/ncurses-5.1
+	>=sys-apps/sed-4
+	berkdb? ( >=sys-libs/db-4.0.14 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	readline? ( >=sys-libs/readline-4.1 )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	sasl? ( >=dev-libs/cyrus-sasl-2.1.7-r3 )
+	kerberos? ( >=app-crypt/mit-krb5-1.2.6 )
+	odbc? ( dev-db/unixODBC )
+	slp? ( >=net-libs/openslp-1.0 )
+	perl? ( >=dev-lang/perl-5.6 )"
+
+pkg_preinst() {
+	if ! grep -q ^ldap: /etc/group
+	then
+		groupadd -g 439 ldap || die "problem adding group ldap"
+	fi
+	if ! grep -q ^ldap: /etc/passwd
+	then
+		useradd -u 439 -d /usr/lib/openldap -g ldap -s /dev/null ldap \
+			|| die "problem adding user ldap"
+	fi
+}
+
+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
+}
+
+src_compile() {
+
+	local myconf
+
+	# enable debugging to syslog
+	myconf="--enable-debug --enable-syslog"
+	# enable slapd/slurpd servers
+	myconf="${myconf} --enable-ldap"
+	myconf="${myconf} --enable-slapd --enable-slurpd"
+
+	use crypt \
+		&& myconf="${myconf} --enable-crypt" \
+		|| myconf="${myconf} --disable-crypt"
+
+	use ipv6 \
+		&& myconf="${myconf} --enable-ipv6" \
+		|| myconf="${myconf} --disable-ipv6"
+
+	use sasl \
+		&& myconf="${myconf} --with-cyrus-sasl --enable-spasswd" \
+		|| myconf="${myconf} --without-cyrus-sasl --disable-spasswd"
+
+	use kerberos \
+		&& myconf="${myconf} --with-kerberos --enable-kpasswd" \
+		|| myconf="${myconf} --without-kerberos --disable-kpasswd"
+
+	use readline \
+		&& myconf="${myconf} --with-readline" \
+		|| myconf="${myconf} --without-readline"
+
+	use ssl \
+		&& myconf="${myconf} --with-tls" \
+		|| myconf="${myconf} --without-tls"
+
+	# slapd options
+
+	use tcpd \
+		&& myconf="${myconf} --enable-wrappers" \
+		|| myconf="${myconf} --disable-wrappers"
+
+	use odbc \
+		&& myconf="${myconf} --enable-sql" \
+		|| myconf="${myconf} --disable-sql"
+
+	use berkdb \
+		&& myconf="${myconf} --enable-ldbm --enable-bdb --with-ldbm-api=berkeley"
+
+	# only turn off bdb if berkdb is not in USE
+	use gdbm && [ ! `use berkdb` ] \
+		&& myconf="${myconf} --enable-ldbm --disable-bdb --with-ldbm-api=gdbm" \
+   		|| myconf="${myconf} --enable-ldbm --enable-bdb --with-ldbm-api=berkeley"
+
+	use perl \
+		&& myconf="${myconf} --enable-perl" \
+		|| myconf="${myconf} --disable-perl"
+
+	use slp \
+		&& myconf="${myconf} --enable-slp" \
+		|| myconf="${myconf} --disable-slp"
+
+	myconf="${myconf} --enable-dynamic --enable-modules"
+	myconf="${myconf} --enable-rewrite --enable-rlookups"
+	myconf="${myconf} --enable-meta --enable-monitor"
+	myconf="${myconf} --enable-null --enable-shell"
+
+	# disabled options
+	# --enable-bdb --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
+	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
+	dodir /etc/openldap/ssl
+	exeinto /etc/openldap/ssl
+	doexe ${FILESDIR}/gencert.sh
+
+}
+
+pkg_postinst() {
+	# 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
+	fi
+}