Rewrote init script. Fixed deprecated s-s-d options. Let reload function use s-s-d as well (bug #392929)

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

3 files changed, 47 insertions, 35 deletions

diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index c4f990d2b93d..0b7284a9a831 100644
--- a/net-analyzer/nagios-core/ChangeLog
+++ b/net-analyzer/nagios-core/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nagios-core
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.181 2011/08/27 17:38:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.182 2011/12/30 15:34:02 polynomial-c Exp $
+
+  30 Dec 2011; Lars Wendler <polynomial-c@gentoo.org> files/nagios3:
+  non-maintainer commit: Massively rewrote init script with help from idl0r.
+  Fixed deprecated s-s-d options. Let reload function use s-s-d as well. Thanks
+  to Michael Kensington for reporting this in bug #392929 and providing a
+  patch.
 
   27 Aug 2011; Raúl Porcel <armin76@gentoo.org> nagios-core-3.3.1.ebuild:
   alpha/sparc stable wrt #371302
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 938eab511e25..9259ee8423a9 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,23 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 99_nagios3.conf 377 RMD160 79f66fc0ae78fb856bd38ba479dbc8af4c2cf989 SHA1 cc2b21a6dec8c15641100284c66d95c2996da687 SHA256 0bfa88db78ab036d177c68da20a8fd2f567ba8c9f54c14cfb8e1fc121641051b
 AUX conf.d 409 RMD160 8b08c01284fc590a2291164589da42515d1a0586 SHA1 dd7bf46facd6a3069794ad9623cddd854198520e SHA256 a5122b19248c375b7b7c80bb5568fcaf334de316c611a85795960c2b9f6a6d5a
 AUX lighttpd_nagios3-r1.conf 482 RMD160 ec8c04a951f9cab2f9561fd224c4771fcb328158 SHA1 2e6a0d8d1290db425435f2613e48efa92d201455 SHA256 0cbe138afb954ee434dd3ea3146fc0677533085c2f2f8fa7faebe0bb3a64e172
 AUX nagios 1459 RMD160 838d61d75ea5ed0cbbe47a283d517d0dd1c77246 SHA1 fe765bad1bff9c58099076dfeb976079986bd55e SHA256 3281e938efd5bb6967334bf99dd99ee726f1320c6048c5f335c94bda2992cc8d
 AUX nagios-3.3.1-htmlmakefile.patch 683 RMD160 f331469c6059be05cd19f804396c2555f909cc2a SHA1 39c9ca86582244d2449d58b8c6b71e6015b2f4be SHA256 e17cba4707ad0864a9a78e4550d45b5aeaa2229d8336af980802f92d61616e67
-AUX nagios3 1441 RMD160 b0b9361c9e4515904ebf1b41ac0be557f59e7a96 SHA1 5351b5d19c0ba51555fc3d7436290006a3acc59d SHA256 e92406af772d1dfc352a476af5cc6c57483f3796d663f1f63c52b44738284644
+AUX nagios3 1326 RMD160 285a9951c628c3eb5f1744f58563f10cd26be3c7 SHA1 9a62352fb0e1d5f4ea5f9df37d15329ef97c794b SHA256 87af370130bc27f03c34a2f18d6483962ca30236c982f200dc2b3bf535704c8f
 AUX statuswml-bug275288.patch 1401 RMD160 6bb19daa7bf792aac16fc20e77a7b51d5a9f4b4e SHA1 4ecace0ae0bf9e533cd9effd5d442c0b052e5e4f SHA256 8cf1db6ab5b172280ae31e0966c4e9e65af1b944346ee4936273cdb0c3f35bbf
 DIST nagios-3.2.3.tar.gz 3249447 RMD160 3c09034069416c5f4dd5071e34516b1154c276b2 SHA1 fcb2c016c1b803bac71442d0ee8375b737906421 SHA256 7ec850a4d1d8d8ee36b06419ac912695e29962641c757cf21301b1befcb23434
 DIST nagios-3.3.1.tar.gz 1714630 RMD160 38d427f9d137ba75b84f3bfe2a98b72a768f6158 SHA1 7b2523de0dacb51b5162dd53fc4c909397800125 SHA256 c4e39cd31a8a9ee814df848fd933b8611465f749b48432672aef4ae5849d9652
 EBUILD nagios-core-3.2.3.ebuild 6066 RMD160 637ba0da5efaca274bda88e8f49280cce92fc1d4 SHA1 1cf2d08d4897765cdcf1b8467726176092f7aaf1 SHA256 bbe106d2364238c4b6f8e6180217388ff04e77cb788414548870f7e0816578ed
 EBUILD nagios-core-3.3.1.ebuild 6208 RMD160 cb4f6b8de4089cc12f27e19b007e637604944ba6 SHA1 a3d0887329290abbcb4109c16d23122f4d64d820 SHA256 fe466a7aacb797f10b30cd62772a1f7eabbe8f3c7c7e36de2352a9e31fd25c85
-MISC ChangeLog 29900 RMD160 6fa7a6531cdfaa58bfd5bb23c0d17a29f96ff0f9 SHA1 15654b814dc7dc045c757916d0898480edb4caa1 SHA256 0c29cc06f4141b205be693088364151b7c095ce917ac8d161a5df73c8b8956ba
+MISC ChangeLog 30215 RMD160 ede4c10fa9b47483d3cc797e44238e738c3f3cef SHA1 084cce527ea44c080e46e9b22809c277ccf572ca SHA256 9ebcef006b06a84dc8a20660324675053f7c8b2f84c8afac0508507be04bb517
 MISC metadata.xml 1103 RMD160 126745b1627d4be7d8a3868e3670cb332df3d838 SHA1 3f5215646412a2aefde093d14561dd540d7abf01 SHA256 f2b241a3f4277286838954546eca184d08973197ce00e2f6a6ae2698f1eade81
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5ZK4QACgkQuQc30/atMkD4iACeJOi2OM/PQHkvNRBU3K0nHyvg
-YdsAoIADqpr56CcArJorgVDERerFOnvD
-=ll8q
+iQIcBAEBCgAGBQJO/dnvAAoJEPiazRVxLXTFt9EQALY/hT8Ml+2nWYJh3+GoLsLw
+FQbo7/08YvysbW25SrFGQ8Db1ONcGiUlHul4GTBgh6Js1JZPEkMTqPjQ2VNN447E
+8BmkRtqINypFP3g66gY1bXRxnlHiCEn7pk91Tn8Sx11JbEtHZN/dITiP/ke47CcE
+AVkUfAMQyzYRBywL/1MFhUzNgKU+iB2/sGXtJx7rD1Cofm6FhABBcJ8IlXdvp4Fq
+Nx8Yq4HFsh6/XZv6lba4DPy7oDlsj0Y1Vf6deFVCDAInu7ML/iUyrdSnJ6PLG3jk
+pPOngGodFqTCtMEHX1m9KpxJ3vk7Ln6/fJSjWQ4ni81M8jx2bno+xJAqUq1hKeFG
+f/clSkT9XpZxhXgh+REHoMilOiDj/R55y9JxjpEQJqZH58gMXyq7hx+2yAqqMfoT
+2w/g1ivVEi7Hytoc7ZWYUW0S5cpjoxI10sNBryWtGN2hi8wMTDHb0W0/ZjE4by5s
+vvG+zHlMhXdEVyw9UddyknWdrCYvzxsUaxwUGBE7pOKW0ocr6UcbUh4H2BVZcWI2
+0k5ti8e2kon+chlnH01vf36zkZ2kxWcYzs5jPygmyXNG6io5qR/kkko9RrESGbzD
+cMecijO7Uvg9fmXcI2wJ1rHPEeQDOik4jqz9b1sO9Dbrrk5M6o3RUANKJ/OD3biY
+vYIAhgnmuH570zYYqJOQ
+=oKhN
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nagios-core/files/nagios3 b/net-analyzer/nagios-core/files/nagios3
index 83b9332b47df..955cb87a65bd 100644
--- a/net-analyzer/nagios-core/files/nagios3
+++ b/net-analyzer/nagios-core/files/nagios3
@@ -1,9 +1,18 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/files/nagios3,v 1.1 2008/04/27 18:41:25 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/files/nagios3,v 1.2 2011/12/30 15:34:02 polynomial-c Exp $
 
-opts="${opts} reload checkconfig"
+extra_commands="checkconfig"
+extra_started_commands="reload"
+
+nagios_config="/etc/nagios/nagios.cfg"
+nagios_cmdfile="/var/nagios/rw/nagios.cmd"
+
+command="/usr/sbin/nagios"
+command_args="-d ${nagios_config}"
+pidfile="/var/nagios/nagios.lock"
+start_stop_daemon_args="-e HOME=/var/nagios/home"
 
 depend() {
 	need net
@@ -15,43 +24,30 @@ reload()
 {
 	checkconfig || return 1
 	ebegin "Reloading configuration"
-	killall -HUP nagios &>/dev/null
+	start-stop-daemon --signal HUP --pidfile ${pidfile}
 	eend $?
 }
 
 checkconfig() {
+	ebegin "Verifiyng config files"
+
 	# Silent Check
-	/usr/sbin/nagios -v /etc/nagios/nagios.cfg &>/dev/null && return 0
+	/usr/sbin/nagios -v ${nagios_config} &>/dev/null && return 0
 
 	# Now we know there's problem - run again and display errors
-	/usr/sbin/nagios -v /etc/nagios/nagios.cfg
+	/usr/sbin/nagios -v ${nagios_config}
 	eend $? "Configuration Error. Please fix your configfile"
 }
 
-start() {
+start_pre() {
 	checkconfig || return 1
-	ebegin "Starting nagios"
+
 	touch /var/nagios/nagios.log /var/nagios/status.sav
 	chown nagios:nagios /var/nagios/nagios.log /var/nagios/status.sav
-	rm -f /var/nagios/rw/nagios.cmd
-	start-stop-daemon --quiet --start --startas /usr/sbin/nagios \
-		-e HOME="/var/nagios/home" --pidfile /var/nagios/nagios.lock \
-		-- -d /etc/nagios/nagios.cfg
-	eend $?
+	rm -f ${nagios_cmdfile}
 }
 
-stop() {
-	ebegin "Stopping nagios"
-	start-stop-daemon --quiet --stop --pidfile /var/nagios/nagios.lock
-	rm -f /var/nagios/status.log /var/nagios/nagios.tmp /var/nagios/nagios.lock /var/nagios/rw/nagios.cmd
-	eend $?
+stop_post() {
+	rm -f /var/nagios/status.log /var/nagios/nagios.tmp ${pidfile} \
+		${nagios_cmdfile}
 }
-
-svc_restart() {
-	checkconfig || return 1
-	ebegin "Restarting nagios"
-	svc_stop
-	svc_start
-	eend $?
-}
-