[Pkg-nagios-changes] [pkg-nagios] r1599 - nagios3/trunk/debian/patches

Fri Nov 28 20:54:19 UTC 2008

Author: formorer
Date: 2008-11-28 20:54:18 +0000 (Fri, 28 Nov 2008)
New Revision: 1599

Modified:
   nagios3/trunk/debian/patches/70_fix_eventhandler_paths.dpatch
Log:
refresh 70_fix_eventhandler_paths


Modified: nagios3/trunk/debian/patches/70_fix_eventhandler_paths.dpatch
===================================================================

--- nagios3/trunk/debian/patches/70_fix_eventhandler_paths.dpatch	2008-11-28 20:44:38 UTC (rev 1598)
+++ nagios3/trunk/debian/patches/70_fix_eventhandler_paths.dpatch	2008-11-28 20:54:18 UTC (rev 1599)
@@ -5,39 +5,33 @@
 ## DP: Fixes paths for all contributed eventhandlers
 
 @DPATCH@
-diff -urNad nagios3-3.0.3~/contrib/eventhandlers/disable_active_service_checks nagios3-3.0.3/contrib/eventhandlers/disable_active_service_checks
---- nagios3-3.0.3~/contrib/eventhandlers/disable_active_service_checks	2008-05-19 20:01:59.000000000 +0200
-+++ nagios3-3.0.3/contrib/eventhandlers/disable_active_service_checks	2008-08-05 09:56:27.000000000 +0200
-@@ -14,9 +14,9 @@
- #    the check_external_commands option in the main
- #    configuration file.
+diff -urNad nagios3-3.0.5~/contrib/eventhandlers/disable_active_service_checks nagios3-3.0.5/contrib/eventhandlers/disable_active_service_checks
+--- nagios3-3.0.5~/contrib/eventhandlers/disable_active_service_checks	2008-10-15 18:12:09.000000000 +0200
++++ nagios3-3.0.5/contrib/eventhandlers/disable_active_service_checks	2008-11-28 21:48:00.000000000 +0100
+@@ -16,7 +16,7 @@
  
--printfcmd="/bin/printf"
-+printfcmd="/usr/bin/printf"
+ printfcmd="/usr/bin/printf"
  
 -CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
 +CommandFile="/var/lib/nagios3/rw/nagios.cmd"
  
  # get the current date/time in seconds since UNIX epoch
  datetime=`date +%s`
-diff -urNad nagios3-3.0.3~/contrib/eventhandlers/disable_notifications nagios3-3.0.3/contrib/eventhandlers/disable_notifications
---- nagios3-3.0.3~/contrib/eventhandlers/disable_notifications	2008-01-24 13:34:57.000000000 +0100
-+++ nagios3-3.0.3/contrib/eventhandlers/disable_notifications	2008-08-05 09:56:27.000000000 +0200
-@@ -12,9 +12,9 @@
- #    the check_external_commands option in the main
- #    configuration file.
+diff -urNad nagios3-3.0.5~/contrib/eventhandlers/disable_notifications nagios3-3.0.5/contrib/eventhandlers/disable_notifications
+--- nagios3-3.0.5~/contrib/eventhandlers/disable_notifications	2008-10-15 18:12:09.000000000 +0200
++++ nagios3-3.0.5/contrib/eventhandlers/disable_notifications	2008-11-28 21:48:35.000000000 +0100
+@@ -14,7 +14,7 @@
  
--printfcmd="/bin/printf"
-+printfcmd="/usr/bin/printf"
+ printfcmd="/usr/bin/printf"
  
 -CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
 +CommandFile="/var/lib/nagios3/rw/nagios.cmd"
  
  # get the current date/time in seconds since UNIX epoch
  datetime=`date +%s`
-diff -urNad nagios3-3.0.3~/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler nagios3-3.0.3/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler
---- nagios3-3.0.3~/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler	2002-02-26 05:03:37.000000000 +0100
-+++ nagios3-3.0.3/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler	2008-08-05 09:57:54.000000000 +0200
+diff -urNad nagios3-3.0.5~/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler nagios3-3.0.5/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler
+--- nagios3-3.0.5~/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler	2002-02-26 05:03:37.000000000 +0100
++++ nagios3-3.0.5/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler	2008-11-28 21:47:11.000000000 +0100
 @@ -21,7 +21,7 @@
  #
  
@@ -47,56 +41,47 @@
  
  # Convert the state string to the corresponding return code
  return_code=-1
-diff -urNad nagios3-3.0.3~/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca nagios3-3.0.3/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca
---- nagios3-3.0.3~/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca	2008-04-14 17:55:06.000000000 +0200
-+++ nagios3-3.0.3/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca	2008-08-05 09:58:47.000000000 +0200
-@@ -26,10 +26,10 @@
- # IP address of the central server that has the nsca
- # daemon running.
+diff -urNad nagios3-3.0.5~/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca nagios3-3.0.5/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca
+--- nagios3-3.0.5~/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca	2008-10-15 18:12:09.000000000 +0200
++++ nagios3-3.0.5/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca	2008-11-28 21:50:14.000000000 +0100
+@@ -28,8 +28,8 @@
  
--printfcmd="/bin/printf"
-+printfcmd="/usr/bin/printf"
+ printfcmd="/usr/bin/printf"
  
 -NscaBin="/usr/local/nagios/libexec/send_nsca" 
 -NscaCfg="/usr/local/nagios/etc/send_nsca.cfg"
-+NscaBin="/usr/sbin/send_nsca"
++NscaBin="/usr/sbin/send_nsca" 
 +NscaCfg="/etc/send_nsca.cfg"
  NagiosHost="nagioshost"
  
  # Fire the data off to the NSCA daemon using the send_nsca script 
-diff -urNad nagios3-3.0.3~/contrib/eventhandlers/enable_active_service_checks nagios3-3.0.3/contrib/eventhandlers/enable_active_service_checks
---- nagios3-3.0.3~/contrib/eventhandlers/enable_active_service_checks	2008-05-19 20:01:59.000000000 +0200
-+++ nagios3-3.0.3/contrib/eventhandlers/enable_active_service_checks	2008-08-05 09:56:27.000000000 +0200
-@@ -14,9 +14,9 @@
- #    the check_external_commands option in the main
- #    configuration file.
+diff -urNad nagios3-3.0.5~/contrib/eventhandlers/enable_active_service_checks nagios3-3.0.5/contrib/eventhandlers/enable_active_service_checks
+--- nagios3-3.0.5~/contrib/eventhandlers/enable_active_service_checks	2008-10-15 18:12:09.000000000 +0200
++++ nagios3-3.0.5/contrib/eventhandlers/enable_active_service_checks	2008-11-28 21:48:52.000000000 +0100
+@@ -16,7 +16,7 @@
  
--printfcmd="/bin/printf"
-+printfcmd="/usr/bin/printf"
+ printfcmd="/usr/bin/printf"
  
 -CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
 +CommandFile="/var/lib/nagios3/rw/nagios.cmd"
  
  # get the current date/time in seconds since UNIX epoch
  datetime=`date +%s`
-diff -urNad nagios3-3.0.3~/contrib/eventhandlers/enable_notifications nagios3-3.0.3/contrib/eventhandlers/enable_notifications
---- nagios3-3.0.3~/contrib/eventhandlers/enable_notifications	2008-01-24 13:34:57.000000000 +0100
-+++ nagios3-3.0.3/contrib/eventhandlers/enable_notifications	2008-08-05 09:56:27.000000000 +0200
-@@ -12,9 +12,9 @@
- #    the check_external_commands option in the main
- #    configuration file.
+diff -urNad nagios3-3.0.5~/contrib/eventhandlers/enable_notifications nagios3-3.0.5/contrib/eventhandlers/enable_notifications
+--- nagios3-3.0.5~/contrib/eventhandlers/enable_notifications	2008-10-15 18:12:09.000000000 +0200
++++ nagios3-3.0.5/contrib/eventhandlers/enable_notifications	2008-11-28 21:49:40.000000000 +0100
+@@ -14,7 +14,7 @@
  
--printfcmd="/bin/printf"
-+printfcmd="/usr/bin/printf"
+ printfcmd="/usr/bin/printf"
  
 -CommandFile="/usr/local/nagios/var/rw/nagios.cmd"
 +CommandFile="/var/lib/nagios3/rw/nagios.cmd"
  
  # get the current date/time in seconds since UNIX epoch
  datetime=`date +%s`
-diff -urNad nagios3-3.0.3~/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event nagios3-3.0.3/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event
---- nagios3-3.0.3~/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event	2004-02-20 05:37:01.000000000 +0100
-+++ nagios3-3.0.3/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event	2008-08-05 09:59:37.000000000 +0200
+diff -urNad nagios3-3.0.5~/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event nagios3-3.0.5/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event
+--- nagios3-3.0.5~/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event	2004-02-20 05:37:01.000000000 +0100
++++ nagios3-3.0.5/contrib/eventhandlers/redundancy-scenario1/handle-master-host-event	2008-11-28 21:47:11.000000000 +0100
 @@ -10,10 +10,10 @@
  
  # Location of the echo and mail commands
@@ -110,9 +95,9 @@
  
  
  # Only take action on hard host states...
-diff -urNad nagios3-3.0.3~/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event nagios3-3.0.3/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event
---- nagios3-3.0.3~/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event	2006-05-30 18:38:01.000000000 +0200
-+++ nagios3-3.0.3/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event	2008-08-05 09:59:59.000000000 +0200
+diff -urNad nagios3-3.0.5~/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event nagios3-3.0.5/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event
+--- nagios3-3.0.5~/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event	2006-05-30 18:38:01.000000000 +0200
++++ nagios3-3.0.5/contrib/eventhandlers/redundancy-scenario1/handle-master-proc-event	2008-11-28 21:47:11.000000000 +0100
 @@ -10,10 +10,10 @@
  
  # Location of the echo and mail commands
@@ -126,9 +111,9 @@
  
  
  # Only take action on hard service states...
-diff -urNad nagios3-3.0.3~/contrib/eventhandlers/submit_check_result nagios3-3.0.3/contrib/eventhandlers/submit_check_result
---- nagios3-3.0.3~/contrib/eventhandlers/submit_check_result	2002-02-26 05:03:37.000000000 +0100
-+++ nagios3-3.0.3/contrib/eventhandlers/submit_check_result	2008-08-05 09:56:27.000000000 +0200
+diff -urNad nagios3-3.0.5~/contrib/eventhandlers/submit_check_result nagios3-3.0.5/contrib/eventhandlers/submit_check_result
+--- nagios3-3.0.5~/contrib/eventhandlers/submit_check_result	2002-02-26 05:03:37.000000000 +0100
++++ nagios3-3.0.5/contrib/eventhandlers/submit_check_result	2008-11-28 21:47:11.000000000 +0100
 @@ -24,7 +24,7 @@
   
  echocmd="/bin/echo"


