Bug #401801: Fix slapd/net/dbus circular init dependency loop for nss_ldap usecase

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

4 files changed, 18 insertions, 8 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index 8dd4c24162ec..369871c5e9bc 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,11 @@
 # 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.390 2012/02/12 00:54:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.391 2012/02/12 01:02:33 robbat2 Exp $
+
+  12 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> files/slapd-confd,
+  files/slapd-initd:
+  Bug #401801: Fix slapd/net/dbus circular init dependency loop for nss_ldap
+  usecase
 
   12 Feb 2012; Robin H. Johnson <robbat2@gentoo.org>
   +files/openldap-2.4.28-gnutls-gcrypt.patch, openldap-2.4.21.ebuild,
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index b04ce777a37a..0679dc6ebfe0 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -14,8 +14,8 @@ AUX openldap-2.4.17-gcc44.patch 509 RMD160 07c1b8400e1b24cb8f20f2647b1354d2b28f6
 AUX openldap-2.4.19-contrib-smbk5pwd.patch 1555 RMD160 ce8f5caafa4b3d89dc11537f0045335b25c59404 SHA1 372906228b2ab6be13a689f895e173abb4862f2e SHA256 8e08af4235529cbc0c4541a28d5cf7e8cf3f41f7504af41527e993e1399fee92
 AUX openldap-2.4.28-contrib-smbk5pwd.patch 1621 RMD160 3708b0709210b15cc93557fbb816c9ca064f2ec1 SHA1 883730e1f10849f817d9a7198514159ca305b73d SHA256 62937bd82d218cddc8637d194c6aedc316cd1eb6179c00ba70cef0381b4e841b
 AUX openldap-2.4.28-gnutls-gcrypt.patch 340 RMD160 69c2c7527aa3723fa24c6ed1895b4f83ea105902 SHA1 af09a9e41adcc2d307c1758fc76b4cb543dac455 SHA256 26dc29a502e45f6b1003674c1ef5bc6c79b71d00fc9b2fc7a145291a314370c0
-AUX slapd-confd 436 RMD160 764d5e2915d9af33fd1db2489ceac6d953750984 SHA1 a16b4674b45ac1e1c8a8f9e84ad0de519c81aa11 SHA256 1ccb8a3b78b65b125b24779dd065cf8000e2d5e4da267bb0a892e730edd2055d
-AUX slapd-initd 609 RMD160 3e1daa2bbbbec78aad265a1c4190098730a4234d SHA1 56d5f1d1f59e37bbcef2399847328c7963694f0a SHA256 840f984031b1fc84d4c6ba59c5ba0de5794be596215f0089c7739dba88d610d5
+AUX slapd-confd 614 RMD160 1b1909eb2d81e380b424a9c970199d6ffe231068 SHA1 955b45e018a59d185b19ea86bccd781d3524c069 SHA256 901044908fbbbbf333f7f0f1efccd1f0e213aa1a9156b3e659eaf0a0c7fdfc89
+AUX slapd-initd 607 RMD160 056f0389e19dbb970fd82a65d762c4b784509cda SHA1 1738ad164d2f5e53ce412cb1760df5e58236378e SHA256 25c4d06be8f2a5d715a531030ddba5124f17781ece62814543fc6403e68e9e01
 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
@@ -33,5 +33,5 @@ EBUILD openldap-2.4.24.ebuild 20173 RMD160 49fe1c0a3d415691858f50728a5dd218c2de4
 EBUILD openldap-2.4.25-r1.ebuild 20879 RMD160 85f10aed763b082a0f94f28967c7fa5dde548b9a SHA1 9936f70278756bb82279dd0d3313a545a215394a SHA256 54a76ebd749c5a24a435d2b6d69f45efa20377ab5cb02212f8ad523e5a327063
 EBUILD openldap-2.4.25.ebuild 20184 RMD160 1f8c50d7af86a7b4fa443db1f9137125cffc6e00 SHA1 81ceaee7464a4b0032025a633dd81c7b3f8021ce SHA256 b75c30e30cc5d30011c731d5212a627cafc7f5f2b485fbdc651611fc2109223f
 EBUILD openldap-2.4.28.ebuild 20876 RMD160 b63e24a39c5a2b926fa1bd9c5e6ca27935e733ef SHA1 67c596c1738dcb177896510f0b75c2365258f1ad SHA256 4d6c64089973745eff3176677d603ef419d82e567136d75977b3ed315a5830cf
-MISC ChangeLog 67457 RMD160 b0213312773ef9b7185ca0d804924fa6be1c537d SHA1 23e0bb262acb01a3d215637350b1708ffa9e87ed SHA256 80bebc61e1590739cc44de08b7f6e718a887b5480e16bcc5936725d2d7942bcf
+MISC ChangeLog 67638 RMD160 abd5608f5279a8ef432f36af892c20c9253a4120 SHA1 55bb9125ce5253781a3a0acdae9037253d6921c2 SHA256 8fbcd240298d70a42cdf585d102edc77d0d65a548bd9bae42b98303d56ab9071
 MISC metadata.xml 556 RMD160 14eae07812da4eecd05e467d1dccf841e6e16be6 SHA1 fa4c8d1aa03dd6bb9c27a7758fbaba5355cfe590 SHA256 405d4cd6f15d8495d0c7365f7b7d6bda9b82775d7e157339f3a6e92d46eed2c8
diff --git a/net-nds/openldap/files/slapd-confd b/net-nds/openldap/files/slapd-confd
index 2240ad3f3022..28e9d23520b7 100644
--- a/net-nds/openldap/files/slapd-confd
+++ b/net-nds/openldap/files/slapd-confd
@@ -7,3 +7,8 @@
 # OPTS="-h 'ldaps:// ldap:// ldapi://%2fvar%2frun%2fopenldap%2fslapd.sock'"
 # Uncomment the below to use the new slapd configuration for openldap 2.3
 #OPTS="-F /etc/openldap/slapd.d -h 'ldaps:// ldap:// ldapi://%2fvar%2frun%2fopenldap%2fslapd.sock'"
+#
+# If you change the above listen statement to bind on a specific IP for
+# listening, you should ensure that interface is up here (change eth0 as
+# needed).
+#rc_need="net.eth0"
diff --git a/net-nds/openldap/files/slapd-initd b/net-nds/openldap/files/slapd-initd
index 0746cf47cd4e..51e607e2e4ab 100644
--- a/net-nds/openldap/files/slapd-initd
+++ b/net-nds/openldap/files/slapd-initd
@@ -1,11 +1,11 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# 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,v 1.3 2009/07/28 21:28:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/files/slapd-initd,v 1.4 2012/02/12 01:02:32 robbat2 Exp $
 
 depend() {
-	need net
-	before dbus hald avahi-daemon
+	need net.lo
+	before hald avahi-daemon
 }
 
 start() {