Fix init script failure #545792

Package-Manager: portage-2.2.20/cvs/Linux x86_64

4 files changed, 77 insertions, 5 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index 7520a02d561b..230a20c585d6 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-nds/openldap
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.500 2015/05/16 06:37:06 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.501 2015/07/13 07:40:28 patrick Exp $
+
+*openldap-2.4.40-r4 (13 Jul 2015)
+
+  13 Jul 2015; Patrick Lauer <patrick@gentoo.org> +files/slapd-initd-2.4.40-r2,
+  +openldap-2.4.40-r4.ebuild, -openldap-2.4.40-r3.ebuild:
+  Fix init script failure #545792
 
   16 May 2015; Robin H. Johnson <robbat2@gentoo.org> -openldap-2.4.35-r1.ebuild:
   Bug #488322 cleanup.
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index be004833d006..b00bfce1deaa 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -26,6 +26,7 @@ AUX slapd-initd 1277 SHA256 b0769a9790a6da8adfedcffc53b6d0d21756c299d94894ea635c
 AUX slapd-initd-2.4.28-r1 981 SHA256 1fc515a6816b8a750db513df0b3b9bf8dd8bd4c4e9051205521acadfdebeae0f SHA512 e57f1e26d3635cb9328aa021c7033abca5a02959eeb2ff9534c4cae6f89b1e4e4992590dd3ae9fcc5529fa6ab109973624d06bcfe3aac126214cfca08e8aed0e WHIRLPOOL bddd056cbf759ef5e9f510165eb786ed3153b1ed7f53191325ffff999adfc4360139da79873e2190d7988345559e62692dd5327f24fad1c28c7a8b6f38e8eb9f
 AUX slapd-initd-2.4.40 1510 SHA256 05ab6f1d7ffe731249ead7bdcaa3e1980bc0e89b9070890794bcda9512bf63b7 SHA512 6705aa3540af915025f1c192c24529a60fe95afb875dc91b712748d70e78c6bdb2e94ea8063bbf9dd1aa7dd98f402f07f9894c92fc3638c887e61e8a3e2bf23c WHIRLPOOL e9b559d8d50e5db5fb5f599c60db983db5ccbca444a5d8c7b47d6aa46291d6b431e41ad40fa4d8f72a878b452d365f6ef1fa13809e7f09044f000769ffa4e6f9
 AUX slapd-initd-2.4.40-r1 1844 SHA256 d579fe08a243aa35fc73dc877e96839046a6da6a347f9b110029ae8c75fbc174 SHA512 bd431809a795a55b8c93dc24455747e0d979f937a11017ef5fe2c5572dad56bfafb68e01f5f5bf384b97a0a9134d177d14dbddd3b4286e5e336f40fd6eff33cf WHIRLPOOL 795d53cfde7872de2f2822eb47bd0839cebd67ae5325cd4288e222810164ab8486e9a9ca16e47382283eb30cb8452f3c254995f60d78543c5924c47724769671
+AUX slapd-initd-2.4.40-r2 1845 SHA256 8ed175825c3ec7e2644be632a0e5cf9b55f15111ee01fc3ff58902be3edf9c62 SHA512 9a6f1a00bb09cb6e1655551d6bfa252223a0879dd984fb60d2405a39937d4fbd1e0ae57d45a03246fd94e8a489148ff131fb7a99fe33afeb49b4418f27f34c08 WHIRLPOOL 5a6ca097c700260eb7388a19b455240329f460ae3115ae2272559dc7f4740a5ddd7feff6eae190c1b745ad9cbbdc7b06ccede8b8d22177da0a694210c73c9fb3
 AUX slapd-initd2 622 SHA256 abd3ab5c58b18845f6946bbf93c987d833c8a94b88841c587ce453faf738cefa SHA512 36faef3b274fbb8f958893a6375e8ba99949705f73ed06d0022b09e7e4531ff3fdc1f87b026a787fafab05a9d227b3381d769c79d54662542c5bc15f1fec3afa WHIRLPOOL dba6e25b5e7ceb0f72c5a46f39d6271e0e76410296584dee96e46c5c18793a995183154fa98dd76f4f926c76a8dc988c87dbe1912e9d8048bd7cf1bbffc1103c
 AUX slapd.service 284 SHA256 106563991611b44717cf93c10473edef39b4f0b4b391e29b9d5bdd3059c7a64a SHA512 450c93b320101e1c28681cad6694c24332fbe424ac98283b621a2f6e1eb01e9e2dbd80a4142e6e8d01d95c55018b44e847d4f4c55f11d7e0e0a11ae1827daa82 WHIRLPOOL d1ff7b8c672d9b38116cc8984567179a743b140211ae99bebd00729d8dc3cfcd4ed7c0833a18b071c9fa20eeb2cce4e053e7b6805474fc3ca8442167254c1e35
 AUX slapd.service.conf 443 SHA256 462adb8f6fc1a9f742c792b4392346d30949eed523453dd19b64afc9dc448145 SHA512 be9cf4bf19111bd77c0ce481428e6f3cc183a6939775ed1a2d7606a5162da34178cb139d666288f6a35b8413bd4dc5f8f1bd60b39f3cca8f749557674b93910b WHIRLPOOL 8697c1c1c82c5c3fbb5d3fffc43e56f1a05a8bf23443270f2a051fde7d6ca0d1c5102611ac62d244b2c190c6bd1fb675cc46a5978a715d2df4e72f13c58db3c8
@@ -41,7 +42,7 @@ EBUILD openldap-2.3.43-r4.ebuild 18322 SHA256 32459f254d843acdff9a25fc0892b8fbaf
 EBUILD openldap-2.4.38-r2.ebuild 24008 SHA256 69069ef4ec0cc311c3513b1487daa53deee6687a4e5679b165da02404af9aa6f SHA512 b762789712f266887672f6c36ef1b95654d0681855958c76a1200d564d625dfd76161d5dd8f5b7b1992d1c2729b70e23398530d672af463282715ba0166eb6ce WHIRLPOOL b94656976e6f30a451512dc3904c33bd39f0647b903f5a926e1e1a14b059cc5a26123491bd28cb064145c8fa68c78cebe292facbfe114e81e64f30249b628ecc
 EBUILD openldap-2.4.39.ebuild 24012 SHA256 7097370f065bd4e6001be5b1e91aabca01702a2fb8a4178c41cf2664766cb7c9 SHA512 cf0d1fa9ec9bcd17891b657c81a79d116c2d05a1a6681771e70ee1242dfbb078a52ea65d2797b9460d28e1e9e381d9f7e6555bffbb05f10ac7e0110bb9e9bb31 WHIRLPOOL e935d519625bb5aaf73b6cfdbb88814680a01100e6ad850f2a01af6e79e0bdfc02e6fe4ce125e897eeabb2760042d36b250cecdbf0f11abe563b4ae61bb57fd4
 EBUILD openldap-2.4.40-r2.ebuild 26227 SHA256 2fac256a6c93c5098ddf67f18bd9a8cb71a706d0fb8fe7e78aa0dda257550628 SHA512 b2d6f3320749ebd91c8a62834d87dac4f7840d6aae8d3ed698108fc2e7a42f9d83043ef8bc8892031e96208377d763a4010321ce0469a36d76e4338a43f0107d WHIRLPOOL 333ab08c7a2a0345d221156bdf7bfd9ea88bad942b0d66ed21652ac0dbfd628904ec62f5a2f7bd1dcc83f6dee0563d8b69a79db4890966b654cfc74eb9ad704e
-EBUILD openldap-2.4.40-r3.ebuild 26233 SHA256 85868ef21a22a604537f419f8044966d9f30299c58e11411d81152342a791801 SHA512 4420594ab4483046a997e30f1b7cefc1a3ec38dec0183f941af83a6f255b2d55a015e89c90fbc3a4bf46e113d2a94fe34a35db9de6be57d690ab9c0e1256468a WHIRLPOOL 0e5c7fcce630bb4bd5dfc0e774a53de5cdebe4d34fd541f05707786ef3e932aaab9d584f93ba3815cf77ac83c56187a8e8440dfb42b5636ce7c692c4f0a3e5ad
+EBUILD openldap-2.4.40-r4.ebuild 26236 SHA256 794ed5109f03834042df27dd730d8ac3ae4e55456b5c60988d5b04dfc0e3d09a SHA512 10f93301588d9ee1c9e7650e1711ca167cbd01ec5585e729ca9b08379254948c4238d5befd15813a91436ad7370f1b066bf6e5418ad03861982a168291983e49 WHIRLPOOL 2ef1144514f0de7059bdd7ce4f96c3c93156953131c43a2f3a2637cc90fe147893a525de34cbd05b0641204e51dad034414d2a2eb5c40407d172e7e32c90fa64
 EBUILD openldap-2.4.40.ebuild 26665 SHA256 de9e846d0c1576dceb0fb8fb26123a4ba7078786a425d2af76ea4b9efedae7f2 SHA512 e52158c029504321199c5dc495c2f88d00d298fc19eda768cb3895d5d1f5e5afdfb8e21cfe55e322ca646c4d5125b8340ae03b7ff7147effe7e4d38a82f29d67 WHIRLPOOL 9a060d2ea77c2ca4587d481b47938a57e30c2027d831ee615f3e1fddc324f59d0b1dfc38b7bba762f8417ddf728f6a79397c4ad74c8d1d4e15feca63dab39232
-MISC ChangeLog 87613 SHA256 9db762796cd2391e11ff374e5a469fdc1430f747710133fb7726116e48aa5424 SHA512 0c326610a88452e66bef6350951d0ae950d56700d1722ddf7a7703e0d664a1b2e072a285d66f4b81aa6a0103d1b045db2f761f945a89b9f5250bdecf329ee213 WHIRLPOOL 21b202014c7dc977c7e827f16b2e4619c7fdac621289aa86ec62d0c4a0a2ac091514b15fecead4d4b2ee79b43419e007d516b7ca41afa6c65c168acc0a694a34
+MISC ChangeLog 87821 SHA256 29dc9d2d86f5c0de89ee44162332ee4390220ea9e546895100bd413bc60a0a30 SHA512 7c98e1dfe9ea30d7a31a7187cd913e6997bd8f8d5d74747c85f989a61b702272ce120588874257f2653343c2134c94dc405710f82957169a6f7bac01854d3611 WHIRLPOOL 2b657cb4f1f302e90eea233e401c6ca379b605c697443b36280153eb7419695ed2040ada6505b2c38c86832bda3efa74a4bfeda267d644639148ca6954cd10e9
 MISC metadata.xml 664 SHA256 70c2b3ca29517c6cafffef5802fcd6a513517d320a118bf2205b0033ffa384ea SHA512 55e576a18ae7c71f3fa413b252a40945059d9f9308f4036739124bd241cc6c409816124c7e4fd30df965963d93907bce03ee117489fdb3443e62bf00dac9da25 WHIRLPOOL ce3c30df03e9026415bd72d5f3c132bb3273a597a6ca8e8928957baae1b4bc6d80ab8f7f0698d72cd8d5773a957ee2a929d3c2bdd4f5a6cd6ba88f9b9e0aa4c7
diff --git a/net-nds/openldap/files/slapd-initd-2.4.40-r2 b/net-nds/openldap/files/slapd-initd-2.4.40-r2
new file mode 100644
index 000000000000..34421d322fc3
--- /dev/null
+++ b/net-nds/openldap/files/slapd-initd-2.4.40-r2
@@ -0,0 +1,65 @@
+#!/sbin/runscript
+# Copyright 1999-2015 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.40-r2,v 1.1 2015/07/13 07:40:28 patrick Exp $
+
+extra_commands="checkconfig"
+
+[ -z "$INSTANCE" ] && INSTANCE="openldap${SVCNAME#slapd}"
+PIDDIR=/run/openldap
+PIDFILE=$PIDDIR/$SVCNAME.pid
+
+depend() {
+	need net
+	before dbus hald avahi-daemon
+	provide ldap
+}
+
+start() {
+	checkpath -q -d ${PIDDIR} -o ldap:ldap 
+	if ! checkconfig -Q ; then
+		eerror "There is a problem with your slapd.conf!"
+		return 1
+	fi
+	ebegin "Starting ldap-server"
+	[ -n "$KRB5_KTNAME" ] && export KRB5_KTNAME
+	eval start-stop-daemon --start --pidfile ${PIDFILE} --exec /usr/lib/openldap/slapd -- -u ldap -g ldap "${OPTS}"
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ldap-server"
+	start-stop-daemon --stop --signal 2 --quiet --pidfile ${PIDFILE}
+	eend $?
+}
+
+checkconfig() {
+	# checks requested by bug #502948
+	# Step 1: extract the last valid config file or config dir
+	set -- $OPTS
+	while [ -n "$*" ]; do
+		opt=$1 ; shift
+		if [ "$opt" = "-f" -o "$opt" = "-F" ] ; then
+			CONF=$1
+			shift
+		fi
+	done
+	set --
+	# Fallback
+	CONF=${CONF-/etc/openldap/slapd.conf}
+	[ -d $CONF ] && CONF=${CONF}/*
+	DBDIRS=`eval awk '"/^(directory|olcDbDirectory:)/{print \\$2}"' $CONF`
+	for d in $DBDIRS; do
+		if [ ! -d $d ]; then
+			eerror "Directory $d in config does not exist!"
+			return 1
+		fi
+		/usr/bin/find $d ! -name DB_CONFIG ! -user ldap -o ! -group ldap |grep -sq .
+		if [ $? -ne 0 ]; then
+			ewarn "You have files in $d not owned by the ldap user, you must ensure they are accessible to the slapd instance!"
+		fi
+		[ ! -e $d/DB_CONFIG ] && ewarn "$d/DB_CONFIG does not exist, slapd performance may be sub-optimal" 
+	done
+	# now test the config fully
+	/usr/sbin/slaptest -u "$@" ${OPTS_CONF}
+}
diff --git a/net-nds/openldap/openldap-2.4.40-r3.ebuild b/net-nds/openldap/openldap-2.4.40-r4.ebuild
index 4e2b5f233fd4..ee48e6a28481 100644
--- a/net-nds/openldap/openldap-2.4.40-r3.ebuild
+++ b/net-nds/openldap/openldap-2.4.40-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.40-r3.ebuild,v 1.2 2015/03/03 09:39:25 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.40-r4.ebuild,v 1.1 2015/07/13 07:40:28 patrick Exp $
 
 EAPI="5"
 
@@ -676,7 +676,7 @@ multilib_src_install() {
 
 		# install our own init scripts and systemd unit files
 		einfo "Install init scripts"
-		newinitd "${FILESDIR}"/slapd-initd-2.4.40-r1 slapd
+		newinitd "${FILESDIR}"/slapd-initd-2.4.40-r2 slapd
 		newconfd "${FILESDIR}"/slapd-confd-2.4.28-r1 slapd
 		einfo "Install systemd service"
 		systemd_dounit "${FILESDIR}"/slapd.service