[Pkg-nagios-devel] nagios/patches 9999_nsca_pathfix.dpatch,1.1,1.2

seanius@haydn.debian.org seanius@haydn.debian.org


Update of /cvsroot/pkg-nagios/nagios/patches
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv7301/patches

Modified Files:
	9999_nsca_pathfix.dpatch 
Log Message:
fix for Bug#284472


Index: 9999_nsca_pathfix.dpatch
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/patches/9999_nsca_pathfix.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- 9999_nsca_pathfix.dpatch	25 Nov 2004 17:01:03 -0000	1.1
+++ 9999_nsca_pathfix.dpatch	6 Dec 2004 23:38:57 -0000	1.2
@@ -5,17 +5,29 @@
 ## DP: 9999_nsca_pathfix: fix for #282591
 
 @DPATCH@
-diff -urNad nagios-1.2/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca.old nagios-1.2/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca
---- nagios-1.2/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca.old    2004-11-25 01:31:20.000000000 -0500
-+++ nagios-1.2/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca        2004-11-25 01:31:56.000000000 -0500
-@@ -30,8 +30,8 @@
- # interpretation of tab and newline characters. 
- echocmd="/bin/echo -e"
+diff -urNad nagios-1.3/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler /home/seanius/tmp/dpep.VqnkWQ/nagios-1.3/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler
+--- nagios-1.3/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler	2002-02-25 23:03:37.000000000 -0500
++++ /home/seanius/tmp/dpep.VqnkWQ/nagios-1.3/contrib/eventhandlers/distributed-monitoring/obsessive_svc_handler	2004-12-06 18:20:20.000000000 -0500
+@@ -21,7 +21,7 @@
+ #
+ 
+ # Location of the submit_check_result_via_nsca script
+-SubmitCmd="/usr/local/nagios/libexec/eventhandlers/submit_check_result_via_nsca"
++SubmitCmd="/usr/lib/nagios/plugins/eventhandlers/distributed-monitoring/submit_check_result_via_nsca"
+ 
+ # Convert the state string to the corresponding return code
+ return_code=-1
+diff -urNad nagios-1.3/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca /home/seanius/tmp/dpep.VqnkWQ/nagios-1.3/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca
+--- nagios-1.3/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca	2004-12-06 18:17:43.000000000 -0500
++++ /home/seanius/tmp/dpep.VqnkWQ/nagios-1.3/contrib/eventhandlers/distributed-monitoring/submit_check_result_via_nsca	2004-12-06 18:17:43.000000000 -0500
+@@ -28,8 +28,8 @@
+ 
+ printfcmd="/usr/bin/printf"
  
 -NscaBin="/usr/local/nagios/libexec/send_nsca" 
 -NscaCfg="/usr/local/nagios/etc/send_nsca.cfg"
 +NscaBin="/usr/sbin/send_nsca" 
 +NscaCfg="/etc/send_nsca.cfg"
  NagiosHost="nagioshost"
-  
- # create the command line to add to the command file
+ 
+ # Fire the data off to the NSCA daemon using the send_nsca script