changed ldap data dir and updated configure options

4 files changed, 17 insertions, 10 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index f08ac8c2cd89..a224f398b5ba 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,10 +1,16 @@
 # 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.22 2003/01/01 22:02:35 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.23 2003/01/02 11:13:09 raker Exp $
 
 *openldap-2.0.27-r1 (01 Jan 2002)
 *openldap-2.1.10 (01 Jan 2002)
 
+  02 Jan 2002; Nick Hadaway <raker@gentoo.org> openldap-2.0.27-r1.ebuild,
+  openldap-2.1.10.ebuild. files/slapd-2.1.rc6 :
+  Added --enable-ldap to openldap-2.1.10 and changed the ldap data dir
+  from /var/state/openldap/openldap-ldbm to /var/lib/openldap-data.
+  Both of these fixes/updates come from Eric Renfro.  Many thanks!
+
   01 Jan 2002; Nick Hadaway <raker@gentoo.org> openldap-2.0.27-r1.ebuild,
   openldap-2.1.10.ebuild, files/digest-openldap-2.0.27-r1,
   files/digest-openldap-2.1.10, files/slapd-2.1.rc6,
diff --git a/net-nds/openldap/files/slapd-2.1.rc6 b/net-nds/openldap/files/slapd-2.1.rc6
index f51d9568a959..c243ad38693b 100644
--- a/net-nds/openldap/files/slapd-2.1.rc6
+++ b/net-nds/openldap/files/slapd-2.1.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2002 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/slapd-2.1.rc6,v 1.1 2003/01/01 22:02:35 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/files/slapd-2.1.rc6,v 1.2 2003/01/02 11:13:09 raker Exp $
 
 depend() {
 	need net
@@ -9,12 +9,12 @@ depend() {
 
 start() {
 	ebegin "Starting ldap-server"
-	start-stop-daemon --start --quiet --pidfile /var/state/openldap/slapd.pid --exec /usr/lib/openldap/slapd -- -u ldap -g ldap
+	start-stop-daemon --start --quiet --pidfile /var/lib/openldap-data/slapd.pid --exec /usr/lib/openldap/slapd -- -u ldap -g ldap
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping ldap-server"
-	start-stop-daemon --stop --quiet --pidfile /var/state/openldap/slapd.pid --exec /usr/lib/openldap/slapd -- -u ldap -g ldap
+	start-stop-daemon --stop --quiet --pidfile /var/lib/openldap-data/slapd.pid --exec /usr/lib/openldap/slapd
 	eend $?
 }
diff --git a/net-nds/openldap/openldap-2.0.27-r1.ebuild b/net-nds/openldap/openldap-2.0.27-r1.ebuild
index fc9a4135eeb0..bf74cbfc4301 100644
--- a/net-nds/openldap/openldap-2.0.27-r1.ebuild
+++ b/net-nds/openldap/openldap-2.0.27-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2003/01/01 22:02:35 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.0.27-r1.ebuild,v 1.2 2003/01/02 11:13:09 raker Exp $
 
 DESCRIPTION="LDAP suite of application and development tools"
 SRC_URI="ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/${P}.tgz"
@@ -98,8 +98,8 @@ src_install() {
 	make DESTDIR=${D} install || die "make install failed"
 
 	chmod ldap:ldap ${D}/etc/openldap/slapd.conf
-	dodir /var/state/openldap/openldap-ldbm
-	chmod ldap:ldap ${D}var/state/openldap/openldap-ldbm
+	dodir /var/lib/openldap-data
+	chmod ldap:ldap ${D}var/lib/openldap-data
 
 	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README LICENSE
 	docinto rfc ; dodoc doc/rfc/*.txt
diff --git a/net-nds/openldap/openldap-2.1.10.ebuild b/net-nds/openldap/openldap-2.1.10.ebuild
index 03b07e8494ae..9b27cb680fdd 100644
--- a/net-nds/openldap/openldap-2.1.10.ebuild
+++ b/net-nds/openldap/openldap-2.1.10.ebuild
@@ -1,6 +1,6 @@
 # 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.10.ebuild,v 1.1 2003/01/01 22:02:35 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.1.10.ebuild,v 1.2 2003/01/02 11:13:09 raker Exp $
 
 IUSE="ssl tcpd readline ipv6 gdbm ldap sasl kerberos odbc"
 
@@ -86,6 +86,7 @@ src_compile() {
 		--enable-phonetic \
 		--enable-rewrite \
 		--enable-slp \
+		--enable-ldap \
 		--enable-meta \
 		--enable-monitor \
 		--enable-passwd \
@@ -109,8 +110,8 @@ src_install() {
 	make DESTDIR=${D} install || die "make install failed"
 
 	chmod ldap:ldap ${D}/etc/openldap/slapd.conf
-        dodir /var/state/openldap/openldap-ldbm
-        chmod ldap:ldap ${D}var/state/openldap/openldap-ldbm
+        dodir /var/lib/openldap-data
+        chmod ldap:ldap ${D}var/lib/openldap-data
 
 	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README LICENSE
 	docinto rfc ; dodoc doc/rfc/*.txt