[Pkg-nagios-changes] [pkg-nagios] r1312 - in nagios-plugins/trunk/debian: . patches

[Jan Wagner]

Author: waja-guest
Date: 2008-01-25 23:14:24 +0000 (Fri, 25 Jan 2008)
New Revision: 1312

Added:
   nagios-plugins/trunk/debian/patches/30_fix_check_ntp_options.dpatch
Modified:
   nagios-plugins/trunk/debian/changelog
   nagios-plugins/trunk/debian/patches/00list
Log:
fix some options help for check_ntp_peer and check_ntp_time

Modified: nagios-plugins/trunk/debian/changelog
===================================================================
--- nagios-plugins/trunk/debian/changelog	2008-01-25 22:37:40 UTC (rev 1311)
+++ nagios-plugins/trunk/debian/changelog	2008-01-25 23:14:24 UTC (rev 1312)
@@ -10,6 +10,8 @@
     together with libpq-dev (closes: #462509).
   * add 29_check_ntp_fixsefault_deprecate.dpatch to fix segfaults for
     check_ntp and check_ntp_time
+  * add 30_fix_check_ntp_options.dpatch to fix options help for check_ntp_peer
+    and check_ntp_time
 
  -- Sean Finney <seanius at debian.org>  Fri, 07 Dec 2007 01:01:17 +0100
 

Modified: nagios-plugins/trunk/debian/patches/00list
===================================================================
--- nagios-plugins/trunk/debian/patches/00list	2008-01-25 22:37:40 UTC (rev 1311)
+++ nagios-plugins/trunk/debian/patches/00list	2008-01-25 23:14:24 UTC (rev 1312)
@@ -7,4 +7,5 @@
 27_check_radius_segfault.dpatch
 28_check_pgsql_include_for_8.3.dpatch
 29_check_ntp_fixsefault_deprecate.dpatch
+30_fix_check_ntp_options.dpatch
 50_misc_typos.dpatch

Added: nagios-plugins/trunk/debian/patches/30_fix_check_ntp_options.dpatch
===================================================================
--- nagios-plugins/trunk/debian/patches/30_fix_check_ntp_options.dpatch	                        (rev 0)
+++ nagios-plugins/trunk/debian/patches/30_fix_check_ntp_options.dpatch	2008-01-25 23:14:24 UTC (rev 1312)
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30_fix_check_ntp_options.dpatch by Jan Wagner <waja at cyconet.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix options for check_ntp_time and check_ntp_peer
+
+ at DPATCH@
+--- nagios-plugins-1.4.11/plugins/check_ntp_time.c.orig	2008-01-26 00:03:57.486086968 +0100
++++ nagios-plugins-1.4.11/plugins/check_ntp_time.c	2008-01-26 00:04:26.652580066 +0100
+@@ -631,7 +631,6 @@
+ print_usage(void)
+ {
+ 	printf (_("Usage:"));
+-	printf(" %s -H <host> [-w <warn>] [-c <crit>] [-W <warn>] [-C <crit>]\n", progname);
+-	printf("       [-j <warn>] [-k <crit>] [-v verbose]\n");
++	printf(" %s -H <host> [-w <warn>] [-c <crit>] [-v verbose]\n", progname);
+ }
+ 
+--- nagios-plugins-1.4.11/plugins/check_ntp_peer.c.orig	2008-01-26 00:08:50.393996604 +0100
++++ nagios-plugins-1.4.11/plugins/check_ntp_peer.c	2008-01-26 00:09:36.762190836 +0100
+@@ -642,7 +642,7 @@
+ 	printf ("    %s\n", _("Offset to result in critical status (seconds)"));
+ 	printf (" %s\n", "-W, --warning=THRESHOLD");
+ 	printf ("    %s\n", _("Warning threshold for stratum"));
+-	printf (" %s\n", "-W, --critical=THRESHOLD");
++	printf (" %s\n", "-C, --critical=THRESHOLD");
+ 	printf ("    %s\n", _("Critical threshold for stratum"));
+ 	printf (" %s\n", "-j, --warning=THRESHOLD");
+ 	printf ("    %s\n", _("Warning threshold for jitter"));