diff options
| -rw-r--r-- | net-nds/openldap/ChangeLog | 5 | ||||
| -rw-r--r-- | net-nds/openldap/Manifest | 4 | ||||
| -rw-r--r-- | net-nds/openldap/files/slapd-initd | 8 |
3 files changed, 12 insertions, 5 deletions
diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog index 633dae44c175..86d8f6c34e63 100644 --- a/net-nds/openldap/ChangeLog +++ b/net-nds/openldap/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-nds/openldap # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.427 2013/01/14 02:46:20 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.428 2013/01/15 03:53:29 patrick Exp $ + + 15 Jan 2013; Patrick Lauer <patrick@gentoo.org> files/slapd-initd: + Rectifying incomplete fix to 2.3 init script 14 Jan 2013; Patrick Lauer <patrick@gentoo.org> openldap-2.3.43-r1.ebuild, openldap-2.3.43-r2.ebuild, openldap-2.4.19-r1.ebuild, openldap-2.4.21.ebuild, diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest index a5c92161f3b4..7bf401059f52 100644 --- a/net-nds/openldap/Manifest +++ b/net-nds/openldap/Manifest @@ -20,7 +20,7 @@ AUX openldap-2.4.31-gcc47.patch 480 SHA256 6a0bef52a8681e30c4be7c11df88f5c73d2ab AUX openldap-2.4.6-evolution-ntlm.patch 5161 SHA256 3b79d9afaa7c76ca20c5e7aa856dea49931741a1022ae6c3bb264c38f4c22edb SHA512 a553231ad3e2d2ca3a3a195b20da6163c135a723e0a3ed39afcad5601ed4ef01e692533df3f8f96d5ec8cc74ca27cbd16508818007dc1343899a42b5595b980b WHIRLPOOL 624f11c996825bb248dd7c33f64afd3a4e8b9edbbe79c6fdffc7f2d8e57c5d8ac4c651eae7763dbc0a06144b916131b70e599771034bcb6bd8c586a9bf6a8209 AUX slapd-confd 614 SHA256 901044908fbbbbf333f7f0f1efccd1f0e213aa1a9156b3e659eaf0a0c7fdfc89 SHA512 e4ae52d10294da787016cf39adfd68c6ad812ac1758b00845810ee7936d21734d2ef3793252b878d88f21788414071adffb5f484381d4dc6a29f71a8729486b7 WHIRLPOOL d45df7487a952f899e9098779edda82afd9fb5ca66e42bbaf4a94f9ebdda9be58a026c0358a521a2feb4cc04c1f8477fb034896054ca4575d717bec367e1e2e8 AUX slapd-confd-2.4.28-r1 1072 SHA256 5bca003ec3b67c7c78519aede1d82002579006ccfecce8f87b559df719f82e92 SHA512 7426c04ee689bcfb29a9a3956367c571eac6bc9620efda938591d09382a05527454458f7a25bdc2fa2ac920f93bae516121e085408ffefbe8ace0c7d8c5da315 WHIRLPOOL b9cb4e249f224ce2435184922df8d053d4c6d058a6408b72ac3c393563bdc0d413f7310e74ef7dcdab6dedc3d25a77d5af0581334356a9b55be5c516d6ee71d4 -AUX slapd-initd 801 SHA256 864ecf620d38d34e1d100cd09758c5e77200a20dbe029f04c9e613b754b81e78 SHA512 aae2e12144504aa428871d8e769cc6ae0b24966b7c89ec52182df041dd6c3f41938bc4580de05d4e92235ec899afce9034b1a8e874678f121b86b56480d8385a WHIRLPOOL 469d7f4f97cf739945233fdeca80f77f510b4d1b1df62a52515088a8c4d3946f671b38de776cc417a3c5c97c8f826c44ac2b9c24a483466b76d6f7628321b835 +AUX slapd-initd 1277 SHA256 b0769a9790a6da8adfedcffc53b6d0d21756c299d94894ea635c3d9dea506844 SHA512 8bc6384ccf83900cac17ecc001251dedbbae945d48d7d51a65c3aaa4d2714a4a2f9de558a16a39d679aa2b0bd45c66a1fe1704e14021756bc0dd8512ecbb1345 WHIRLPOOL 799de21cdd8c836dee1751830431d7823e1741327062795891e14aac3421f67fe01ee1fcef27f6b3b79817003708527049114503d0f539c5380c34d14bf7e930 AUX slapd-initd-2.4.28-r1 981 SHA256 1fc515a6816b8a750db513df0b3b9bf8dd8bd4c4e9051205521acadfdebeae0f SHA512 e57f1e26d3635cb9328aa021c7033abca5a02959eeb2ff9534c4cae6f89b1e4e4992590dd3ae9fcc5529fa6ab109973624d06bcfe3aac126214cfca08e8aed0e WHIRLPOOL bddd056cbf759ef5e9f510165eb786ed3153b1ed7f53191325ffff999adfc4360139da79873e2190d7988345559e62692dd5327f24fad1c28c7a8b6f38e8eb9f AUX slapd-initd2 622 SHA256 abd3ab5c58b18845f6946bbf93c987d833c8a94b88841c587ce453faf738cefa SHA512 36faef3b274fbb8f958893a6375e8ba99949705f73ed06d0022b09e7e4531ff3fdc1f87b026a787fafab05a9d227b3381d769c79d54662542c5bc15f1fec3afa WHIRLPOOL dba6e25b5e7ceb0f72c5a46f39d6271e0e76410296584dee96e46c5c18793a995183154fa98dd76f4f926c76a8dc988c87dbe1912e9d8048bd7cf1bbffc1103c AUX slurpd-initd 494 SHA256 b23e010f701620ec34c39cd215891c7c0afc773341392a1e762e84166d9863ff SHA512 d47c8ea473f3d9495583449d455581766b7bd3b913a314d720c514cfeae6b4e01973f1f2aa060f5cc5f2335fe57c2f4e78a56d02ba7859fc113cf69f6c233359 WHIRLPOOL 60bd05139e6af4710d265e71efe4aacaec468ae4289e8524870f157c2a36f427ef480cefed0f94c53414a2e31864127a6f5bf9ce3ebe0a217ff5e6aeaea020ef @@ -53,5 +53,5 @@ EBUILD openldap-2.4.31.ebuild 22250 SHA256 bda244f8d80ab1088d95d71340268e3a74d80 EBUILD openldap-2.4.32.ebuild 22313 SHA256 9340c09949f1a3ebf55fdad245842f0545d0dce6b083a467b01cb3983e12bb8f SHA512 98b47b576f67baa122da7cd433fe0e79118855ac05978b8d454c8a6ab7790e41c045fab679829ddd12596c337122b88cb4d3f10fe87f7ededaab41d07f0bd597 WHIRLPOOL 18ce448d4cd2e44760e22663e75894859bba7b5c80217a81f87a150327024b41944d5c62358a844ef7efdc568983ad43b00983fbc714152548ddbefc45474487 EBUILD openldap-2.4.33-r1.ebuild 22124 SHA256 27387cca9a09708da63ec122a4d0f29ac6acdf26381d6d04aad8b318177f0773 SHA512 5102f1238092df0e46fd1e31350774ff664e25bddd9620c1bd6cf3bfdb9f329c48b985d2b6b73eeffd3ffa14458720d5023a940a27466c00657afc7e5fc44eba WHIRLPOOL aa4ca5e60b90036f1322a59b6743d980a3de55fddf76fe5e8c394d591dcb8d70b2d4b5632a65459b6059cf4e4402149c3a9509aa06fae716e91fcbd9b851b643 EBUILD openldap-2.4.33.ebuild 22313 SHA256 a5f575ea4aa5dae4920c949a4b10075fc19b49c5c853179aed2a630a3e1d139d SHA512 adad4157db1c4635ba83044d2ec7cc40a1a23c5e4f488afde5037877f149ddc03b16f547abd98989292efcb29160b61b40e5557f165227c7baefcb8482d4539c WHIRLPOOL 8835bf8ee092cd1653b1457952f11040788a2939243897539685b6001da97b09c1de987dd00f8084cab337f53557d4af43a30c92ec75337b4536d7964a49f500 -MISC ChangeLog 75165 SHA256 30ecc50dee5ee2fb1038788a139e896548365e59d8075a394078449e29a09b71 SHA512 c6d3c6afcc3acd1ad23a205d1625b49cbe35bea75875112bfcf0bb0901eeec9b7d333e565e9b1b2fcc856805d6bea1084f157310ed3b0170f03e6026a6c2806a WHIRLPOOL e953d752283dc9f12d2e12ca77db99d3e813d4f2dbbfc45d84b54028d795a1e067053ce5dc902df66310689c7de49dcca3622c124d3e151d71f19bcca849047d +MISC ChangeLog 75282 SHA256 717908218ac7a4e3021b30cfc8dc3fafdff079543869bc0dbf51513c5917cdca SHA512 0423de2a83abc2043a366adf73b5245189621138c91e8f0bf8dd32393dea7ebf28704ade86a24ffcb28c8262cba2efecae63484f76677e1b64bd8a5e53d47f55 WHIRLPOOL 49c4606f00393607cc5ea5d32b6f0137a6642294c1e07af2a25cc990956dea3079aff72a56d34df45fe1c5aaca97647f55489198b4702fabec41237d39e2b15b MISC metadata.xml 664 SHA256 70c2b3ca29517c6cafffef5802fcd6a513517d320a118bf2205b0033ffa384ea SHA512 55e576a18ae7c71f3fa413b252a40945059d9f9308f4036739124bd241cc6c409816124c7e4fd30df965963d93907bce03ee117489fdb3443e62bf00dac9da25 WHIRLPOOL ce3c30df03e9026415bd72d5f3c132bb3273a597a6ca8e8928957baae1b4bc6d80ab8f7f0698d72cd8d5773a957ee2a929d3c2bdd4f5a6cd6ba88f9b9e0aa4c7 diff --git a/net-nds/openldap/files/slapd-initd b/net-nds/openldap/files/slapd-initd index 723bfcf74831..cc2e8b7e8a1b 100644 --- a/net-nds/openldap/files/slapd-initd +++ b/net-nds/openldap/files/slapd-initd @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2013 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.5 2013/01/14 02:30:20 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/files/slapd-initd,v 1.6 2013/01/15 03:53:28 patrick Exp $ depend() { need net.lo @@ -10,7 +10,7 @@ depend() { start() { checkpath -q -d /var/run/openldap/ -o ldap:ldap - if ! checkconfig -Q ; then + if ! checkconfig ; then eerror "There is a problem with your slapd.conf!" return 1 fi @@ -24,3 +24,7 @@ stop() { start-stop-daemon --stop --signal 2 --quiet --pidfile /var/run/openldap/slapd.pid eend $? } + +checkconfig() { + /usr/sbin/slaptest -u "$@" ${OPTS_CONF} +} |