Bug #376699: Multi-instance slapd support.

Package-Manager: portage-2.2.0_alpha85/cvs/Linux x86_64

4 files changed, 20 insertions, 9 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index d32b83b1ffd9..e6a44d48097e 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-nds/openldap
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.394 2012/02/12 21:29:26 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.395 2012/02/12 21:35:04 robbat2 Exp $
+
+  12 Feb 2012; Robin H. Johnson <robbat2@gentoo.org>
+  files/slapd-confd-2.4.28-r1, files/slapd-initd-2.4.28-r1:
+  Bug #376699: Multi-instance slapd support.
 
   12 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> metadata.xml,
   openldap-2.4.19-r1.ebuild, openldap-2.4.21.ebuild, openldap-2.4.23.ebuild,
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 7f33c1b65264..16cac623237c 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -16,9 +16,11 @@ AUX openldap-2.4.28-contrib-smbk5pwd.patch 1621 RMD160 3708b0709210b15cc93557fbb
 AUX openldap-2.4.28-gnutls-gcrypt.patch 340 RMD160 69c2c7527aa3723fa24c6ed1895b4f83ea105902 SHA1 af09a9e41adcc2d307c1758fc76b4cb543dac455 SHA256 26dc29a502e45f6b1003674c1ef5bc6c79b71d00fc9b2fc7a145291a314370c0
 AUX openldap-2.4.6-evolution-ntlm.patch 5161 RMD160 abbeb8b17a9011c1bfc3af3215839910a5a6b0ca SHA1 44aa771890530edd63fefa45cf6bef33202dd352 SHA256 3b79d9afaa7c76ca20c5e7aa856dea49931741a1022ae6c3bb264c38f4c22edb
 AUX slapd-confd 614 RMD160 1b1909eb2d81e380b424a9c970199d6ffe231068 SHA1 955b45e018a59d185b19ea86bccd781d3524c069 SHA256 901044908fbbbbf333f7f0f1efccd1f0e213aa1a9156b3e659eaf0a0c7fdfc89
-AUX slapd-confd-2.4.28-r1 942 RMD160 7317df88259b17b3e6d3857843c7037260b5cf8e SHA1 7f00dcd10c2ccecd8dc43f5f671bb29387ec29bd SHA256 4cde0ba01f8414f39f17b64ff8d1c7e9c249d42bb7a28606d23d1450f8e34c5f
+AUX slapd-confd-2.4.28-r1 1072 RMD160 752fa2a79adde3f7d4c0709de2cbdc4383e30504 SHA1 9da7b859d89cc400b0b27a0da94b270423ddaf97 SHA256 5bca003ec3b67c7c78519aede1d82002579006ccfecce8f87b559df719f82e92
 AUX slapd-initd 607 RMD160 056f0389e19dbb970fd82a65d762c4b784509cda SHA1 1738ad164d2f5e53ce412cb1760df5e58236378e SHA256 25c4d06be8f2a5d715a531030ddba5124f17781ece62814543fc6403e68e9e01
-AUX slapd-initd-2.4.28-r1 863 RMD160 040d2c966c1e2302e8ea6573bd4670000008f78b SHA1 67bd1e684c293d253b7960dd8bdf48ec48e8fe6d SHA256 6b4eae7b697b2c61bde2f344a37a9f525bbd0dfbaeabbf820afaf0e5ceefa2d9
+AUX slapd-initd-2.4.28-r1 931 RMD160 e11131560a5d11835450cd0984efd46f0332f25c SHA1 6a00305bf35aa859a506b46a70f024a619d17065 SHA256 f439cd1f9300cc74a19bf4db958c2c2d602e33f3b8fd3ded1f562177e30a41fb
+AUX slapd-initd-2.4.28-r1.orig 863 RMD160 040d2c966c1e2302e8ea6573bd4670000008f78b SHA1 67bd1e684c293d253b7960dd8bdf48ec48e8fe6d SHA256 6b4eae7b697b2c61bde2f344a37a9f525bbd0dfbaeabbf820afaf0e5ceefa2d9
+AUX slapd-initd-2.4.28-r1.rej 1273 RMD160 b4cd826d094071759316b9aa179b0ba286496f50 SHA1 4437a104e939464f1728e850bf226eb91a277df1 SHA256 0418b1dd0d2bfb4070a86b6920fe4be96ff415da3e9572c20c1a8acee6504f6f
 AUX slapd-initd2 622 RMD160 750d7c59d1b7e47b0b21b96d301244c3ec3e28bf SHA1 a438adef50bfb925cc7550156b6dbefd68dcb856 SHA256 abd3ab5c58b18845f6946bbf93c987d833c8a94b88841c587ce453faf738cefa
 AUX slurpd-initd 494 RMD160 9f3a06bcab2e4ce8e66783af506d26595bbbdcd2 SHA1 8ab66a984510fa91755cbcbac29883cea1435db7 SHA256 b23e010f701620ec34c39cd215891c7c0afc773341392a1e762e84166d9863ff
 DIST openldap-2.3.43.tgz 3803011 RMD160 3ecb789e5f4d4c939357e2e7220d793eb05402e7 SHA1 796b5db37ae5243b84f7b9c11217bbec44e0da8c SHA256 d7d2dea05362c8ac7e11bb7bf1da4cdeb07225ba8dc16974bff9f51a9f3d37e1
@@ -38,5 +40,5 @@ EBUILD openldap-2.4.25-r1.ebuild 20776 RMD160 6af3aa22ef44f5bde09657bb91a636716d
 EBUILD openldap-2.4.25.ebuild 20081 RMD160 3a9343f7c83e7d872cb7ab23eac526e3f753dc7b SHA1 a9a490196c313ac3bf788d18fe09b037fd28d26f SHA256 c79c9180221ea5b7b1989eefabb741deef89269782541677f7d32f4e72591c22
 EBUILD openldap-2.4.28-r1.ebuild 21901 RMD160 13a64bcdff85ea8731d89a37c5d4c62ac5f6ca33 SHA1 cfe4e404d0d838fb667bf64756d1ab794290ab53 SHA256 1ad5d34fb93b8cb84febe4574fa306202c412a7ff1ee417068c62d5d283402a6
 EBUILD openldap-2.4.28.ebuild 20773 RMD160 6a0b94ea4c82e1a1463a83a4d728e605ad4ed966 SHA1 c9fb70df7b94dc4f5f92b63b5ea4881a9a14e6c6 SHA256 c028282315adf8d64296ef1abd3d7b8bac32eef40190960708d028fb5ff22d97
-MISC ChangeLog 69019 RMD160 f8347c53db07de427e5f6ec660d527f747816ce8 SHA1 820670ce34e746635f99dca36a593930e73b6509 SHA256 ea2b666081e748ba0988c72ef4da37570a3e485b21274b8b6d8ede0647814ef3
+MISC ChangeLog 69178 RMD160 50b438b86ef5f66d383402cc781aab8cfa5dbe1e SHA1 a200b8864997ed450828a486977b7360cb24c389 SHA256 346a3b4b689875a961320b0612364298986484aba217bae387aa54247fd66aaa
 MISC metadata.xml 556 RMD160 14eae07812da4eecd05e467d1dccf841e6e16be6 SHA1 fa4c8d1aa03dd6bb9c27a7758fbaba5355cfe590 SHA256 405d4cd6f15d8495d0c7365f7b7d6bda9b82775d7e157339f3a6e92d46eed2c8
diff --git a/net-nds/openldap/files/slapd-confd-2.4.28-r1 b/net-nds/openldap/files/slapd-confd-2.4.28-r1
index 75456349a599..ef19899a3796 100644
--- a/net-nds/openldap/files/slapd-confd-2.4.28-r1
+++ b/net-nds/openldap/files/slapd-confd-2.4.28-r1
@@ -4,10 +4,13 @@
 # one uncomment this line or set any other server starting options
 # you may desire.
 
+# If you have multiple slapd instances per #376699, this will provide a default config
+INSTANCE="openldap${SVCNAME#slapd}"
+
 # If you use the classical configuration file:
-OPTS_CONF="-f /etc/openldap/slapd.conf"
+OPTS_CONF="-f /etc/${INSTANCE}/slapd.conf"
 # Uncomment this instead to use the new slapd.d configuration directory for openldap 2.3
-#OPTS_CONF="-F /etc/openldap/slapd.d"
+#OPTS_CONF="-F /etc/${INSTANCE}/slapd.d"
 # (the OPTS_CONF variable is also passed to slaptest during startup)
 
 OPTS="${OPTS_CONF} -h 'ldaps:// ldap:// ldapi://%2fvar%2frun%2fopenldap%2fslapd.sock'"
diff --git a/net-nds/openldap/files/slapd-initd-2.4.28-r1 b/net-nds/openldap/files/slapd-initd-2.4.28-r1
index 712518d842d6..6ea949cef5f5 100644
--- a/net-nds/openldap/files/slapd-initd-2.4.28-r1
+++ b/net-nds/openldap/files/slapd-initd-2.4.28-r1
@@ -1,10 +1,12 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/files/slapd-initd-2.4.28-r1,v 1.1 2012/02/12 21:11:44 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/files/slapd-initd-2.4.28-r1,v 1.2 2012/02/12 21:35:04 robbat2 Exp $
 
 extra_commands="checkconfig"
 
+[ -z "$INSTANCE" ] && INSTANCE="openldap${SVCNAME#slapd}"
+
 depend() {
 	need net
 	before dbus hald avahi-daemon
@@ -18,13 +20,13 @@ start() {
 	fi
 	ebegin "Starting ldap-server"
 	[ -n "$KRB5_KTNAME" ] && export KRB5_KTNAME
-	eval start-stop-daemon --start --pidfile /var/run/openldap/slapd.pid --exec /usr/lib/openldap/slapd -- -u ldap -g ldap "${OPTS}"
+	eval start-stop-daemon --start --pidfile /var/run/openldap/${SVCNAME}.pid --exec /usr/lib/openldap/slapd -- -u ldap -g ldap "${OPTS}"
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping ldap-server"
-	start-stop-daemon --stop --signal 2 --quiet --pidfile /var/run/openldap/slapd.pid 
+	start-stop-daemon --stop --signal 2 --quiet --pidfile /var/run/openldap/${SVCNAME}.pid
 	eend $?
 }