worked with robbat2 to perfect the ebuild. Marking stable for x86.

6 files changed, 20 insertions, 12 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index de050f4b4859..81f02c6a8d3a 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,13 @@
 # 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.39 2003/07/09 01:26:12 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.40 2003/07/09 07:35:30 raker Exp $
+
+  09 Jul 2003; Nick Hadaway <raker@gentoo.org> openldap-2.0.27-r4,
+  files/2.0/slapd, files/2.0/slapd.conf:
+  Updated example to include ldapi.  Added eval to the slapd init.d
+  so the %2f is parsed properly.  Changed the location of the slapd.args
+  in the default config and installed config.  Thanks to robbat2 for
+  working this solution out.  Marking stable for x86.
 
   08 Jul 2003; Nick Hadaway <raker@gentoo.org> openldap-2.0.27-r4:
   Fixed the conf.d slapd filename and added some code to pkg_postinst
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 863137eacb99..746d65df369e 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -1,11 +1,10 @@
 MD5 63a967c1c320ba41db8fcacae617976a openldap-2.0.25-r2.ebuild 2609
-MD5 5f9e081b9be4ec33dea8b4d169d2ed2b openldap-2.1.22.ebuild 5295
 MD5 405655723adfa7c4470f1984f5463dd1 openldap-2.0.27.ebuild 2325
 MD5 6b611092dd59bc62ddba9578e60e23b2 openldap-2.0.25-r1.ebuild 2530
 MD5 5f9e081b9be4ec33dea8b4d169d2ed2b openldap-2.1.21.ebuild 5295
-MD5 0ccbb6110e8b504d9170d547d1737209 ChangeLog 9077
-MD5 08c8ec765ea2301221039a34d7b59784 openldap-2.0.27-r4.ebuild 5197
-MD5 44c7dbcfe29bc1df9e576e5010c4674f files/slapd-2.1.conf 251
+MD5 3c5dbb7da711a6e0192ec8f23b231f93 ChangeLog 9448
+MD5 73486deb574aaf0eac847110edb92aac openldap-2.0.27-r4.ebuild 5390
+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 bc676758f2d1726b75e1d04fd936d029 files/digest-openldap-2.0.27-r4 65
@@ -20,6 +19,6 @@ MD5 43181f48b522ce05011ff4d0a0b061f7 files/digest-openldap-2.1.21 65
 MD5 b7f252f92c11c2041e7bc864c344ecf1 files/slapd.rc6 591
 MD5 427c91c528ea2cc1719df18d5339706f files/slurpd.rc6 504
 MD5 1de3e9592a8549c165bd43ba11b887f4 files/kerberos-2.1.diff.bz2 402
-MD5 8bf2548e493eeb626fa085f668cf9fa4 files/2.0/slapd 615
-MD5 81f8395de0b75ac0db688d616d3d5720 files/2.0/slapd.conf 231
+MD5 95618d3f3a0a6cf2462ca513013cd9f9 files/2.0/slapd 620
+MD5 646fd34831ae403ecda2103b01f49a0f files/2.0/slapd.conf 278
 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 09055709caa7..a8e49c0854eb 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.2 2003/06/14 17:51:14 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/files/2.0/slapd,v 1.3 2003/07/09 07:35:30 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}"
+	eval 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 e407f7e0a032..bf5689253abb 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:// ldap://"
+# OPTS="-h 'ldaps:// ldap:// ldapi://%2fvar%2frun%2fopenldap%2fslapd.sock'"
 
diff --git a/net-nds/openldap/files/slapd-2.1.conf b/net-nds/openldap/files/slapd-2.1.conf
index 9a82209503ea..bf5689253abb 100644
--- a/net-nds/openldap/files/slapd-2.1.conf
+++ b/net-nds/openldap/files/slapd-2.1.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:// ldapi://%2fvar%2frun%2fopenldap%2fslapd.sock'"
 
diff --git a/net-nds/openldap/openldap-2.0.27-r4.ebuild b/net-nds/openldap/openldap-2.0.27-r4.ebuild
index d9b5ec101e80..7ff1b205d3d1 100644
--- a/net-nds/openldap/openldap-2.0.27-r4.ebuild
+++ b/net-nds/openldap/openldap-2.0.27-r4.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.0.27-r4.ebuild,v 1.4 2003/07/09 01:26:12 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.0.27-r4.ebuild,v 1.5 2003/07/09 07:35:30 raker Exp $
 
 inherit eutils
 
@@ -144,6 +144,8 @@ src_install() {
 	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