diff --git a/debian/changelog b/debian/changelog index 1e1986d..db5a7f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ nagios-plugins (1.4.11-1) UNRELEASED; urgency=low 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 Fri, 07 Dec 2007 01:01:17 +0100 diff --git a/debian/patches/00list b/debian/patches/00list index a2d644e..fe7c658 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -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 diff --git a/debian/patches/30_fix_check_ntp_options.dpatch b/debian/patches/30_fix_check_ntp_options.dpatch new file mode 100644 index 0000000..9d96543 --- /dev/null +++ b/debian/patches/30_fix_check_ntp_options.dpatch @@ -0,0 +1,29 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 30_fix_check_ntp_options.dpatch by Jan Wagner +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix options for check_ntp_time and check_ntp_peer + +@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 [-w ] [-c ] [-W ] [-C ]\n", progname); +- printf(" [-j ] [-k ] [-v verbose]\n"); ++ printf(" %s -H [-w ] [-c ] [-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"));