Add --wait option to s-s-d to measure success or failure better.

Package-Manager: portage-2.2.0_alpha30/cvs/Linux i686

4 files changed, 20 insertions, 11 deletions

diff --git a/app-admin/sshguard/ChangeLog b/app-admin/sshguard/ChangeLog
index b27f4ce87055..6599e0bfed0b 100644
--- a/app-admin/sshguard/ChangeLog
+++ b/app-admin/sshguard/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/sshguard
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sshguard/ChangeLog,v 1.12 2011/04/23 14:44:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sshguard/ChangeLog,v 1.13 2011/04/23 16:59:59 jer Exp $
+
+  23 Apr 2011; Jeroen Roovers <jer@gentoo.org> files/sshguard.confd,
+  files/sshguard.initd:
+  Add --wait option to s-s-d to measure success or failure better.
 
 *sshguard-1.5 (23 Apr 2011)
 
diff --git a/app-admin/sshguard/Manifest b/app-admin/sshguard/Manifest
index 0b347a8ddc89..e1efa7a5ef45 100644
--- a/app-admin/sshguard/Manifest
+++ b/app-admin/sshguard/Manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX sshguard.confd 526 RMD160 c5980fe381ed2404ccef3fd73190d7296b061e35 SHA1 da9bc5f77b832f45936e9a3d13cd3e7f58d601b1 SHA256 30503564fd902a1b5e04e05c0b2304775e3f52d24e220cce60aaf49deef82fb4
-AUX sshguard.initd 671 RMD160 4501b800b4090afb96c376c174f38f79645cbe2b SHA1 5da98a64a13356cd680229f3e304910bbfb761a2 SHA256 cf87825f5dffbfdfcc23a677bf3da9da0aaa5cc675304ba40f6b225f41ff290f
+AUX sshguard.confd 745 RMD160 7eb778fe7797379ebde5fdb501461e6945f9f9e7 SHA1 7f0906752a27b8f88acbe6d5b15ded6be7feecb6 SHA256 0db6bedcabe9c262d60186a6de7e62c6e425f782d39c49e8a5a9cc52f35f6a8e
+AUX sshguard.initd 743 RMD160 a6e56a4a4ed3d8d7c52a3269e0606043fa23e55e SHA1 8d2b0c66c8d89b02f8c35d86fd8c748eed7285e1 SHA256 e5e067a1ffe205e023d26f5edfa311ee77a3c97ad06df883a4f3db39d58197ba
 DIST sshguard-1.0.tar.bz2 118988 RMD160 436516e14a72845e7eb5325d6f55496eec9d1762 SHA1 968275288a1aec06737e70cde61fe99063081adc SHA256 33a9fe9d2360e9a5c357e269353d4157270171ff975bcf649f5f99b1aa8dcc08
 DIST sshguard-1.1.tar.bz2 233308 RMD160 e6e7d6e54b32d67583b0f4140ef8905ef5f5567f SHA1 912c151232bc6b23ce400ef92270c9a7f87a60d1 SHA256 c1b2fcd7c402725958e62808829c82bb4445dcf6a9b27ee07e2ab8a3417bb96f
 DIST sshguard-1.3.tar.bz2 140745 RMD160 792431d6d1c7437734bccca4ec6e1ae1b9c4891c SHA1 4c073086406901bbd55ab669b295a3f12f67994e SHA256 1ff0ea3349c67fdab8f8046eeae6a96046a752ae7458c2259cb31b78c2de08ac
@@ -13,12 +13,12 @@ EBUILD sshguard-1.1.ebuild 1072 RMD160 09c5507cfcec6779cb447c19eea8e695287d389b
 EBUILD sshguard-1.3.ebuild 1075 RMD160 5bef10b93187deeab4748585490fb76879c30a89 SHA1 1741b1ab664372e6ac85c4fecd91ac759c2e5632 SHA256 d248e8208fb6fa3f00fef4cc4bf694d530dc1e537c09c98fd334b933c5761254
 EBUILD sshguard-1.4.ebuild 1070 RMD160 9cd23da73bfde2a54eceb2cac742990840a576ea SHA1 3473f36fcefb20f603eb37f582d7ef84d33e5a48 SHA256 5395c7e2808403dd90862c4fbd532457378cc01356b4590a5a1a088c45cb02ff
 EBUILD sshguard-1.5.ebuild 1339 RMD160 b1a19e5573467058d10b68937e2d87c08ff563dc SHA1 c5ff4316a5bc9474c959c859d4a40504795bf46a SHA256 8c5575a69ade4cc842e7173283db3f6305ef9bfde0b93eb6d7292951302b3f3f
-MISC ChangeLog 1869 RMD160 207e3b4b86033e0ffb6e391cc367b4be54c9b07c SHA1 246159b2f607a24784865dadf9711f67b21eed5d SHA256 550230995abf962cab88aadf1825f11f2d11d611deb635000441457754840395
+MISC ChangeLog 2030 RMD160 95876ba1a0854d4934abf9daa2b66e16a27d35ea SHA1 29c09ca23d05f7c0662bc7101094a7cc93fbd09c SHA256 cd74b2ee18ccd5510045a0692b5adfee7fe1a6b26ed5c01421613a978e35b420
 MISC metadata.xml 260 RMD160 51c67b148d7da0cb8dc4b0fba9d8d23fa441daa0 SHA1 75b3b65d68d937c2ce2053638478a2cd35650bd7 SHA256 e99c431a125115a8fe9a5906741216d32c2f18ce3f9137cb7f90100f20e9a73a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2y5nsACgkQVWmRsqeSphPpUgCeJSvhnz7jFl5RYjAOn51rNGy9
-PXYAoICBEYe+5pWAeG5DcmY/B7wI5Rb6
-=cyEi
+iEYEARECAAYFAk2zBZQACgkQVWmRsqeSphMZhACdFFL8cjc+gtI/P8WCnFG/+qWF
+EQoAn1GP1EnsueG7+o8MPKLlxfkeSLbR
+=8N+f
 -----END PGP SIGNATURE-----
diff --git a/app-admin/sshguard/files/sshguard.confd b/app-admin/sshguard/files/sshguard.confd
index 6acf6482f029..089367ea2e6b 100644
--- a/app-admin/sshguard/files/sshguard.confd
+++ b/app-admin/sshguard/files/sshguard.confd
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sshguard/files/sshguard.confd,v 1.2 2011/04/23 14:47:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sshguard/files/sshguard.confd,v 1.3 2011/04/23 16:59:59 jer Exp $
 
 # Config file for /etc/init.d/sshguard
 #   See SSHGUARD(8) for details.
@@ -16,3 +16,7 @@ SSHGUARD_OPTS="${SSHGUARD_OPTS} -l /var/log/auth.log"
 #   -w <addr/host/block/file>
 #SSHGUARD_OPTS="${SSHGUARD_OPTS} -w 192.168.0.0/24"
 
+# Define how long in milliseconds start-stop-daemon waits to check that
+# sshguard is still running before calling success or failure.
+# Values lower than the default of 999 are probably not useful.
+SSHGUARD_WAIT="999"
diff --git a/app-admin/sshguard/files/sshguard.initd b/app-admin/sshguard/files/sshguard.initd
index 1fa2e233b9e1..09711cd28c92 100644
--- a/app-admin/sshguard/files/sshguard.initd
+++ b/app-admin/sshguard/files/sshguard.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sshguard/files/sshguard.initd,v 1.1 2011/04/23 14:44:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sshguard/files/sshguard.initd,v 1.2 2011/04/23 16:59:59 jer Exp $
 
 : ${SSHGUARD_PIDFILE:='/var/run/sshguard.pid'}
 
@@ -18,8 +18,9 @@ start() {
 	done
 
 	ebegin "Starting sshguard"
-	start-stop-daemon --start --background --quiet --exec /usr/sbin/sshguard -- \
-		-i ${SSHGUARD_PIDFILE} ${LOGS}
+	[[ -z ${SSHGUARD_WAIT} ]] && SSHGUARD_WAIT=999
+	start-stop-daemon --start --wait ${SSHGUARD_WAIT} --background --quiet \
+		--exec /usr/sbin/sshguard -- -i ${SSHGUARD_PIDFILE} ${LOGS}
 	eend $?
 }