Added the latest stable openldap and cleaned up src_install, added kerberos patch by kainz.

6 files changed, 145 insertions, 4 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index ecf37061b130..5a5d380afcd6 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,9 +1,20 @@
 # ChangeLog for net-nds/openldap
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.25 2003/01/30 00:18:16 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.26 2003/02/04 07:14:21 raker Exp $
+
+*openldap-2.1.12 (04 Feb 2003)
+
+  04 Feb 2003; Nick Hadaway <raker@gentoo.org> openldap-2.1.12.ebuild,
+  files/digest-openldap-2.1.12, files/kerberos-2.1.diff.bz2 :
+  Fixed typos like in 2.0.27-r2 and added the kainz kerberos diff for 2.1
+  2.1.12 is now considered stable so when db4 moves, so will openldap.
 
 *openldap-2.0.27-r2 (29 Jan 2003)
 
+  04 Feb 2003; Nick Hadaway <raker@gentoo.org> openldap-2.0.27-r2.ebuild,
+  files/kerberos-2.0.diff.bz2 :
+  Added a kerberos configure change as suggested by kainz.
+
   29 Jan 2003; Nick Hadaway <raker@gentoo.org> openldap-2.0.27-r2.ebuild,
   files/digest-openldap-2.0.27-r2 files/slapd-2.1-r1.rc6,
   files/slapd-2.1.conf :
diff --git a/net-nds/openldap/files/digest-openldap-2.1.12 b/net-nds/openldap/files/digest-openldap-2.1.12
new file mode 100644
index 000000000000..16c9c9be876a
--- /dev/null
+++ b/net-nds/openldap/files/digest-openldap-2.1.12
@@ -0,0 +1 @@
+MD5 23a38674ed6067a92b2f2c977f92a485 openldap-2.1.12.tgz 2057617
diff --git a/net-nds/openldap/files/kerberos-2.0.diff.bz2 b/net-nds/openldap/files/kerberos-2.0.diff.bz2
new file mode 100644
index 000000000000..479a057fdf74
--- /dev/null
+++ b/net-nds/openldap/files/kerberos-2.0.diff.bz2
diff --git a/net-nds/openldap/files/kerberos-2.1.diff.bz2 b/net-nds/openldap/files/kerberos-2.1.diff.bz2
new file mode 100644
index 000000000000..0729c6f83a09
--- /dev/null
+++ b/net-nds/openldap/files/kerberos-2.1.diff.bz2
diff --git a/net-nds/openldap/openldap-2.0.27-r2.ebuild b/net-nds/openldap/openldap-2.0.27-r2.ebuild
index b16b8198661e..2e99a2afc98c 100644
--- a/net-nds/openldap/openldap-2.0.27-r2.ebuild
+++ b/net-nds/openldap/openldap-2.0.27-r2.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.0.27-r2.ebuild,v 1.1 2003/01/30 00:18:16 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.0.27-r2.ebuild,v 1.2 2003/02/04 07:14:21 raker Exp $
 
 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"
@@ -20,11 +19,12 @@ DEPEND="virtual/glibc
 	gdbm?     ( >=sys-libs/gdbm-1.8.0 )
 	kerberos? ( >=app-crypt/krb5-1.2.6 )
 	odbc?     ( dev-db/unixODBC )"
-
 RDEPEND="virtual/glibc
 	>=sys-libs/ncurses-5.1
 	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
 
+inherit eutils
+
 pkg_preinst() {
         if ! grep -q ^ldap: /etc/group
         then
@@ -39,6 +39,9 @@ pkg_preinst() {
 
 
 src_compile() {
+
+	epatch ${FILESDIR}/kerberos-2.0.diff.bz2
+
 	local myconf
 
 	if [ -n "$DEBUG" ]; then
diff --git a/net-nds/openldap/openldap-2.1.12.ebuild b/net-nds/openldap/openldap-2.1.12.ebuild
new file mode 100644
index 000000000000..5d5b7b14371e
--- /dev/null
+++ b/net-nds/openldap/openldap-2.1.12.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2002 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.12.ebuild,v 1.1 2003/02/04 07:14:21 raker Exp $
+
+IUSE="ssl tcpd readline ipv6 gdbm ldap sasl kerberos odbc"
+S=${WORKDIR}/${P}
+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="virtual/glibc
+	>=sys-libs/ncurses-5.1
+	>=sys-libs/readline-4.2a
+	>=sys-libs/db-4.0.14
+	>=net-libs/openslp-1.0.9
+	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/krb5-1.2.6 )
+	odbc?     ( dev-db/unixODBC )"
+RDEPEND="virtual/glibc
+	>=sys-libs/ncurses-5.1
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
+
+inherit eutils
+
+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_compile() {
+
+	epatch ${FILESDIR}/kerberos-2.1.diff.bz2 || die
+
+	local myconf
+
+	if [ -z "$DEBUGBUILD" ]; then
+		myconf="--enable-debug"
+	else
+		myconf="--disable-debug"
+	fi
+
+	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"
+
+	use tcpd \
+		&& myconf="${myconf} --enable-wrappers" \
+		|| myconf="${myconf} --disable-wrappers"
+
+	use ipv6 && myconf="${myconf} --enable-ipv6" \
+		|| myconf="${myconf} --disable-ipv6"
+
+        use odbc && myconf="${myconf} --enable-sql" \
+                || myconf="${myconf} --disable-sql"
+
+	econf \
+		--libexecdir=/usr/lib/openldap \
+		--enable-crypt \
+		--enable-dynamic \
+		--enable-lmpasswd \
+		--enable-modules \
+		--enable-phonetic \
+		--enable-rewrite \
+		--enable-slp \
+		--enable-ldap \
+		--enable-meta \
+		--enable-monitor \
+		--enable-passwd \
+		--enable-perl \
+		--enable-shell \
+		--enable-slurpd \
+		--enable-ldbm \
+		--with-ldbm-api=auto \
+		${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"
+
+	chown ldap:ldap ${D}/etc/openldap/slapd.conf
+        dodir /var/lib/openldap-data
+        chown ldap:ldap ${D}var/lib/openldap-data
+
+	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README LICENSE
+	docinto rfc ; dodoc doc/rfc/*.txt
+
+        exeinto /etc/init.d
+        newexe ${FILESDIR}/slapd-2.1-r1.rc6 slapd
+        newexe ${FILESDIR}/slurpd-2.1.rc6 slurpd
+        insinto /etc/conf.d
+        newins ${FILESDIR}/slapd-2.1.conf slapd.conf
+}