[Pkg-nagios-devel] nagios/patches 9999_nsca_pathfix.dpatch,NONE,1.1 00list,1.2,1.3 999_cvs_1x_bugfixes.dpatch,1.3,1.4 999_fix_html_pathes.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-serv23987/patches
Modified Files:
00list 999_cvs_1x_bugfixes.dpatch 999_fix_html_pathes.dpatch
Added Files:
9999_nsca_pathfix.dpatch
Log Message:
- corrected path to printf in code and documentation. thanks to
peter hicks <peter.hicks@poggs.co.uk> (Closes: #282591).
- corrected nsca related paths in code and documentation. thanks
again to peter (Closes: #282791).
this includes modifications to to already existing patches (fixing a
broken patch with another patch seems just Wrong), as well as a new
patch fixing a little more stuff for the second bug.
also updated changelog and removed a closed bug from BUGS.Debian.
gah, diffing patches makes my head hurt...
--- NEW FILE: 9999_nsca_pathfix.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 9999_nsca_pathfix: fix for #282591
##
## All lines beginning with `## DP:' are a description of the patch.
## 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"
-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
Index: 00list
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/patches/00list,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- 00list 11 Nov 2004 00:01:50 -0000 1.2
+++ 00list 25 Nov 2004 17:01:03 -0000 1.3
@@ -7,3 +7,4 @@
07_fix_default_config.dpatch
999_cvs_1x_bugfixes.dpatch
999_fix_html_pathes.dpatch
+9999_nsca_pathfix.dpatch
Index: 999_cvs_1x_bugfixes.dpatch
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/patches/999_cvs_1x_bugfixes.dpatch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- 999_cvs_1x_bugfixes.dpatch 11 Nov 2004 00:01:50 -0000 1.3
+++ 999_cvs_1x_bugfixes.dpatch 25 Nov 2004 17:01:03 -0000 1.4
@@ -946,7 +946,7 @@
-# Under Linux, the -e option to /bin/echo enables the
-# interpretation of tab and newline characters.
-echocmd="/bin/echo -e"
-+printfcmd="/bin/printf"
++printfcmd="/usr/bin/printf"
NscaBin="/usr/local/nagios/libexec/send_nsca"
NscaCfg="/usr/local/nagios/etc/send_nsca.cfg"
@@ -1036,18 +1036,6 @@
+ perl_free(my_perl);
exit(exitstatus);
}
-diff -urNad nagios-1.2/html/docs/distributed.html /home/joerg/tmp/dpep.VuUghd/nagios-1.2/html/docs/distributed.html
---- nagios-1.2/html/docs/distributed.html 2002-09-23 05:08:06.000000000 +0200
-+++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/html/docs/distributed.html 2004-10-31 19:16:26.699764649 +0100
-@@ -171,7 +171,7 @@
- # in turn transmits the data to the nsca daemon on the central
- # monitoring server
-
-- /bin/echo -e "$1\t$2\t$return_code\t$4\n" | /usr/local/nagios/bin/send_nsca <i>central_server</i> -c /usr/local/nagios/etc/send_nsca.cfg
-+ /bin/printf "%s\t%s\t%s\t%s\n" "$1" "$2" "$return_code" "$4" | /usr/local/nagios/bin/send_nsca <i>central_server</i> -c /usr/local/nagios/etc/send_nsca.cfg
- </pre>
- </p>
-
diff -urNad nagios-1.2/html/docs/notifications.html /home/joerg/tmp/dpep.VuUghd/nagios-1.2/html/docs/notifications.html
--- nagios-1.2/html/docs/notifications.html 2002-08-12 03:46:38.000000000 +0200
+++ /home/joerg/tmp/dpep.VuUghd/nagios-1.2/html/docs/notifications.html 2004-10-31 19:16:26.700764708 +0100
Index: 999_fix_html_pathes.dpatch
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/patches/999_fix_html_pathes.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- 999_fix_html_pathes.dpatch 11 Nov 2004 00:01:50 -0000 1.1
+++ 999_fix_html_pathes.dpatch 25 Nov 2004 17:01:03 -0000 1.2
@@ -418,8 +418,8 @@
# in turn transmits the data to the nsca daemon on the central
# monitoring server
-- /bin/printf "%s\t%s\t%s\t%s\n" "$1" "$2" "$return_code" "$4" | /usr/local/nagios/bin/send_nsca <i>central_server</i> -c /usr/local/nagios/etc/send_nsca.cfg
-+ /bin/printf "%s\t%s\t%s\t%s\n" "$1" "$2" "$return_code" "$4" | /usr/sbin/send_nsca <i>central_server</i> -c /etc/nagios/send_nsca.cfg
+- /bin/echo -e "$1\t$2\t$return_code\t$4\n" | /usr/local/nagios/bin/send_nsca <i>central_server</i> -c /usr/local/nagios/etc/send_nsca.cfg
++ /usr/bin/printf "%s\t%s\t%s\t%s\n" "$1" "$2" "$return_code" "$4" | /usr/sbin/send_nsca <i>central_server</i> -c /etc/send_nsca.cfg
</pre>
</p>
@@ -642,7 +642,7 @@
# $4 = output
-/bin/echo -e "$1\t$2\t$3\t$4\n" | /usr/local/nagios/bin/send_nsca monitor -c /usr/local/nagios/etc/send_nsca.cfg
-+/bin/echo -e "$1\t$2\t$3\t$4\n" | /usr/sbin/send_nsca monitor -c /etc/nagios/send_nsca.cfg
++/bin/echo -e "$1\t$2\t$3\t$4\n" | /usr/sbin/send_nsca monitor -c /etc/send_nsca.cfg
</pre>
</font>
</p>
@@ -703,7 +703,7 @@
# $4 = output
-/bin/echo -e "$1\t$2\t$3\t$4\n" | /usr/local/nagios/bin/send_nsca monitor -c /usr/local/nagios/etc/send_nsca.cfg
-+/bin/echo -e "$1\t$2\t$3\t$4\n" | /usr/sbin/send_nsca monitor -c /etc/nagios/send_nsca.cfg
++/bin/echo -e "$1\t$2\t$3\t$4\n" | /usr/sbin/send_nsca monitor -c /etc/send_nsca.cfg
</pre>
</font>
</p>
@@ -739,7 +739,7 @@
# $4 = output
-/bin/echo -e "$1\t$2\t$3\t$4\n" | /usr/local/nagios/bin/send_nsca monitor -c /usr/local/nagios/etc/send_nsca.cfg
-+/bin/echo -e "$1\t$2\t$3\t$4\n" | /usr/sbin/send_nsca monitor -c /etc/nagios/send_nsca.cfg
++/bin/echo -e "$1\t$2\t$3\t$4\n" | /usr/sbin/send_nsca monitor -c /etc/send_nsca.cfg
</pre>
</font>
</p>