diff --git a/debian/changelog b/debian/changelog index 3939956..21d1c57 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ nagios-plugins (1.4.13+git200906171200-2) UNRELEASED; urgency=low used, thanks to Keith (Closes: #542700) * Updating standards version to 3.8.3 - Add README.source + * droped unused patches from debian/patches -- Jan Wagner Thu, 06 Aug 2009 00:11:51 +0200 diff --git a/debian/patches/02_utilspm.dpatch b/debian/patches/02_utilspm.dpatch deleted file mode 100644 index 72a9ce2..0000000 --- a/debian/patches/02_utilspm.dpatch +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -e -## 02_utilspm.dpatch by Guido Trotter -## -## DP: Correct utils.pm script to begin with #!/usr/bin/perl - -if [ $# -lt 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi - -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch}" - -case "$1" in - -patch) patch $patch_opts -p1 < $0;; - -unpatch) patch $patch_opts -p1 -R < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 - -@DPATCH@ -diff -urNad /home/ultrotter/docs/projects/deb/nagios/nagios-plugins-1.3.1/plugins-scripts/utils.pm.in nagios-plugins-1.3.1/plugins-scripts/utils.pm.in ---- /home/ultrotter/docs/projects/deb/nagios/nagios-plugins-1.3.1/plugins-scripts/utils.pm.in 2003-02-03 21:29:55.000000000 +0100 -+++ nagios-plugins-1.3.1/plugins-scripts/utils.pm.in 2004-02-01 10:42:54.000000000 +0100 -@@ -1,3 +1,4 @@ -+#!/usr/bin/perl - # Utility drawer for Nagios plugins. - # $Id$ - # diff --git a/debian/patches/39_check_dig_options.dpatch b/debian/patches/39_check_dig_options.dpatch deleted file mode 100755 index 89c71c7..0000000 --- a/debian/patches/39_check_dig_options.dpatch +++ /dev/null @@ -1,43 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 39_check_dig_options.dpatch by Jan Wagner -## patch provided by Matthias Eble -## -## DP: Add testcases for check_dig check_dig's -l option is mandatory - -@DPATCH@ -diff -urNad nagios-plugins-1.4.12~/plugins/check_dig.c nagios-plugins-1.4.12/plugins/check_dig.c ---- nagios-plugins-1.4.12~/plugins/check_dig.c 2008-05-07 12:02:42.000000000 +0200 -+++ nagios-plugins-1.4.12/plugins/check_dig.c 2008-06-09 22:31:59.000000000 +0200 -@@ -143,8 +143,10 @@ - } - } - -- if (result == STATE_UNKNOWN) -+ if (result == STATE_UNKNOWN) { - msg = (char *)_("No ANSWER SECTION found"); -+ result = STATE_CRITICAL; -+ } - - /* If we get anything on STDERR, at least set warning */ - if(chld_err.buflen > 0) { -@@ -295,7 +297,10 @@ - int - validate_arguments (void) - { -- return OK; -+ if (query_address != NULL) -+ return OK; -+ else -+ return ERROR; - } - - -@@ -357,7 +362,7 @@ - print_usage (void) - { - printf (_("Usage:")); -- printf ("%s -H -l [-p ]\n", progname); -+ printf ("%s -l [-H ] [-p ]\n", progname); - printf (" [-T ] [-w ] [-c ]\n"); - printf (" [-t ] [-a ] [-v]\n"); - } diff --git a/debian/patches/40_check_http_status_line.dpatch b/debian/patches/40_check_http_status_line.dpatch deleted file mode 100644 index 8b4d01b..0000000 --- a/debian/patches/40_check_http_status_line.dpatch +++ /dev/null @@ -1,26 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 40_check_http_status_line.dpatch by Jan Wagner -## patch provided by Josip Rodin -## -## DP: adds status_line to check_http output - -@DPATCH@ -diff -urNad nagios-plugins-1.4.12~/plugins/check_http.c nagios-plugins-1.4.12/plugins/check_http.c ---- nagios-plugins-1.4.12~/plugins/check_http.c 2008-08-23 15:34:17.000000000 +0200 -+++ nagios-plugins-1.4.12/plugins/check_http.c 2008-08-23 15:36:20.000000000 +0200 -@@ -879,11 +879,12 @@ - if (!strstr (status_line, server_expect)) { - if (server_port == HTTP_PORT) - asprintf (&msg, -- _("Invalid HTTP response received from host\n")); -+ _("Invalid HTTP response received from host: %s\n"), -+ status_line); - else - asprintf (&msg, -- _("Invalid HTTP response received from host on port %d\n"), -- server_port); -+ _("Invalid HTTP response received from host on port %d: %s\n"), -+ server_port, status_line); - die (STATE_CRITICAL, "HTTP CRITICAL - %s", msg); - } - diff --git a/debian/patches/41_check_http_fix_http_header.dpatch b/debian/patches/41_check_http_fix_http_header.dpatch deleted file mode 100755 index 971976a..0000000 --- a/debian/patches/41_check_http_fix_http_header.dpatch +++ /dev/null @@ -1,33 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 41_check_http_fix_http_header.dpatch by Jan Wagner , taken -## from upstream svn -## -## DP: Re-structure the HTTP 1.1 headers to prevent 301s on servers with virtual hosts - -@DPATCH@ -diff -urNad nagios-plugins-1.4.12~/plugins/check_http.c nagios-plugins-1.4.12/plugins/check_http.c ---- nagios-plugins-1.4.12~/plugins/check_http.c 2008-08-23 15:41:49.000000000 +0200 -+++ nagios-plugins-1.4.12/plugins/check_http.c 2008-08-23 15:50:14.000000000 +0200 -@@ -749,15 +749,17 @@ - } - #endif /* HAVE_SSL */ - -- asprintf (&buf, "%s %s HTTP/1.0\r\n%s\r\n", http_method, server_url, user_agent); -+ /* If a hostname is provided, use HTTP/1.1 and send the hostname before the -+ * Useragent. This fixes an issue with getting 301 responses from servers -+ * with virtual hosts */ -+ if (host_name) -+ asprintf (&buf, "%s %s HTTP/1.1\r\nHost: %s:%d\r\n%s\r\n", http_method, server_url, host_name, server_port, user_agent); -+ else -+ asprintf (&buf, "%s %s HTTP/1.0\r\n%s\r\n", http_method, server_url, user_agent); - - /* tell HTTP/1.1 servers not to keep the connection alive */ - asprintf (&buf, "%sConnection: close\r\n", buf); - -- /* optionally send the host header info */ -- if (host_name) -- asprintf (&buf, "%sHost: %s:%d\r\n", buf, host_name, server_port); -- - /* optionally send any other header tag */ - if (http_opt_headers_count) { - for (i = 0; i < http_opt_headers_count ; i++) { diff --git a/debian/patches/42_check_ups_logoutfix.dpatch b/debian/patches/42_check_ups_logoutfix.dpatch deleted file mode 100644 index f106ca4..0000000 --- a/debian/patches/42_check_ups_logoutfix.dpatch +++ /dev/null @@ -1,34 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 42_check_ups_logoutfix.dpatch by Olivier 'Babar' Raginel -## -## DP: Fixing Lougout - -@DPATCH@ -diff -urNad nagios-plugins-1.4.12~/plugins/check_ups.c nagios-plugins-1.4.12/plugins/check_ups.c ---- nagios-plugins-1.4.12~/plugins/check_ups.c 2008-05-07 12:02:42.000000000 +0200 -+++ nagios-plugins-1.4.12/plugins/check_ups.c 2009-01-30 22:31:37.000000000 +0100 -@@ -398,12 +398,15 @@ - char temp_buffer[MAX_INPUT_BUFFER]; - char send_buffer[MAX_INPUT_BUFFER]; - char *ptr; -+ char *logout = "OK Goodbye\n"; -+ int logout_len = strlen(logout); - int len; - - *buf=0; - - /* create the command string to send to the UPS daemon */ -- sprintf (send_buffer, "GET VAR %s %s\n", ups_name, varname); -+ /* Add LOGOUT to avoid read failure logs */ -+ sprintf (send_buffer, "GET VAR %s %s\nLOGOUT\n", ups_name, varname); - - /* send the command to the daemon and get a response back */ - if (process_tcp_request -@@ -415,6 +418,7 @@ - - ptr = temp_buffer; - len = strlen(ptr); -+ if (len > logout_len && strcmp (ptr + len - logout_len, logout) == 0) len -= logout_len; - if (len > 0 && ptr[len-1] == '\n') ptr[len-1]=0; - if (strcmp (ptr, "ERR UNKNOWN-UPS") == 0) { - printf (_("CRITICAL - no such ups '%s' on that host\n"), ups_name); diff --git a/debian/patches/43_check_ntp_segfaults.dpatch b/debian/patches/43_check_ntp_segfaults.dpatch deleted file mode 100644 index 750f342..0000000 --- a/debian/patches/43_check_ntp_segfaults.dpatch +++ /dev/null @@ -1,32 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 43_check_ntp_segfaults.dpatch by Thierry Carrez -## -## DP: Fixes check_ntp and check_ntp_peer segfaults (LP: #291265) -## Patch originally from Thomas Guyot, extracted from upstream SVN at: -## http://nagiosplug.svn.sourceforge.net/viewvc/nagiosplug?view=rev&revision=2086 - -@DPATCH@ -diff -urNad nagios-plugins-1.4.12~/plugins/check_ntp.c nagios-plugins-1.4.12/plugins/check_ntp.c ---- nagios-plugins-1.4.12~/plugins/check_ntp.c 2008-05-07 10:02:42.000000000 +0000 -+++ nagios-plugins-1.4.12/plugins/check_ntp.c 2008-11-19 16:38:06.000000000 +0000 -@@ -198,7 +198,7 @@ - /* NTP control message header is 12 bytes, plus any data in the data - * field, plus null padding to the nearest 32-bit boundary per rfc. - */ --#define SIZEOF_NTPCM(m) (12+ntohs(m.count)+((m.count)?4-(ntohs(m.count)%4):0)) -+#define SIZEOF_NTPCM(m) (12+ntohs(m.count)+((ntohs(m.count)%4)?4-(ntohs(m.count)%4):0)) - - /* finally, a little helper or two for debugging: */ - #define DBG(x) do{if(verbose>1){ x; }}while(0); -diff -urNad nagios-plugins-1.4.12~/plugins/check_ntp_peer.c nagios-plugins-1.4.12/plugins/check_ntp_peer.c ---- nagios-plugins-1.4.12~/plugins/check_ntp_peer.c 2008-05-07 10:02:42.000000000 +0000 -+++ nagios-plugins-1.4.12/plugins/check_ntp_peer.c 2008-11-19 16:38:06.000000000 +0000 -@@ -130,7 +130,7 @@ - /* NTP control message header is 12 bytes, plus any data in the data - * field, plus null padding to the nearest 32-bit boundary per rfc. - */ --#define SIZEOF_NTPCM(m) (12+ntohs(m.count)+((m.count)?4-(ntohs(m.count)%4):0)) -+#define SIZEOF_NTPCM(m) (12+ntohs(m.count)+((ntohs(m.count)%4)?4-(ntohs(m.count)%4):0)) - - /* finally, a little helper or two for debugging: */ - #define DBG(x) do{if(verbose>1){ x; }}while(0); diff --git a/debian/patches/50_misc_typos.dpatch b/debian/patches/50_misc_typos.dpatch deleted file mode 100644 index e6960c0..0000000 --- a/debian/patches/50_misc_typos.dpatch +++ /dev/null @@ -1,220 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 50_misc_typos.dpatch by modified for 1.4.10 by -## Jan Wagner -## -## DP: This patch fixes various typos and grammatical errors in plugins/*.c. -## DP: It is based on Malcolm Parsons' patch posted at https://launchpad.net/bugs/64595 - -@DPATCH@ -diff -urNad nagios-plugins-1.4.12~/plugins/check_dns.c nagios-plugins-1.4.12/plugins/check_dns.c ---- nagios-plugins-1.4.12~/plugins/check_dns.c 2008-05-13 11:14:45.000000000 +0200 -+++ nagios-plugins-1.4.12/plugins/check_dns.c 2008-06-03 11:08:17.000000000 +0200 -@@ -255,7 +255,7 @@ - printf (_("DNS CRITICAL - %s\n"), - !strcmp (msg, "") ? _(" Probably a non-existent host/domain") : msg); - else -- printf (_("DNS UNKNOW - %s\n"), -+ printf (_("DNS UNKNOWN - %s\n"), - !strcmp (msg, "") ? _(" Probably a non-existent host/domain") : msg); - - return result; -diff -urNad nagios-plugins-1.4.12~/plugins/check_http.c nagios-plugins-1.4.12/plugins/check_http.c ---- nagios-plugins-1.4.12~/plugins/check_http.c 2008-05-07 12:02:42.000000000 +0200 -+++ nagios-plugins-1.4.12/plugins/check_http.c 2008-06-03 11:08:17.000000000 +0200 -@@ -1054,7 +1054,7 @@ - - url = malloc (strcspn (pos, "\r\n")); - if (url == NULL) -- die (STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate url\n")); -+ die (STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate URL\n")); - - while (pos) { - sscanf (pos, "%1[Ll]%*1[Oo]%*1[Cc]%*1[Aa]%*1[Tt]%*1[Ii]%*1[Oo]%*1[Nn]:%n", xx, &i); -@@ -1085,7 +1085,7 @@ - - url = realloc (url, strcspn (pos, "\r\n") + 1); - if (url == NULL) -- die (STATE_UNKNOWN, _("HTTP UNKNOWN - could not allocate url\n")); -+ die (STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate URL\n")); - - /* URI_HTTP, URI_HOST, URI_PORT, URI_PATH */ - if (sscanf (pos, HD1, type, addr, &i, url) == 4) -@@ -1253,7 +1253,7 @@ - printf (" %s\n", _("Connect via SSL. Port defaults to 443")); - printf (" %s\n", "-C, --certificate=INTEGER"); - printf (" %s\n", _("Minimum number of days a certificate has to be valid. Port defaults to 443")); -- printf (" %s\n", _("(when this option is used the url is not checked.)\n")); -+ printf (" %s\n", _("(when this option is used the URL is not checked.)\n")); - #endif - - printf (" %s\n", "-e, --expect=STRING"); -diff -urNad nagios-plugins-1.4.12~/plugins/check_ldap.c nagios-plugins-1.4.12/plugins/check_ldap.c ---- nagios-plugins-1.4.12~/plugins/check_ldap.c 2008-06-03 11:08:16.000000000 +0200 -+++ nagios-plugins-1.4.12/plugins/check_ldap.c 2008-06-03 11:08:17.000000000 +0200 -@@ -196,7 +196,7 @@ - LDAP_SUCCESS) { - if (verbose) - ldap_perror(ld, "ldap_bind"); -- printf (_("Could not bind to the ldap-server\n")); -+ printf (_("Could not bind to the LDAP server\n")); - return STATE_CRITICAL; - } - -diff -urNad nagios-plugins-1.4.12~/plugins/check_mysql.c nagios-plugins-1.4.12/plugins/check_mysql.c ---- nagios-plugins-1.4.12~/plugins/check_mysql.c 2008-05-07 12:02:42.000000000 +0200 -+++ nagios-plugins-1.4.12/plugins/check_mysql.c 2008-06-03 11:08:17.000000000 +0200 -@@ -381,7 +381,7 @@ - - printf (_(COPYRIGHT), copyright, email); - -- printf ("%s\n", _("This program tests connections to a mysql server")); -+ printf ("%s\n", _("This program tests connections to a MySQL server")); - - printf ("\n\n"); - -diff -urNad nagios-plugins-1.4.12~/plugins/check_procs.c nagios-plugins-1.4.12/plugins/check_procs.c ---- nagios-plugins-1.4.12~/plugins/check_procs.c 2008-06-03 11:08:16.000000000 +0200 -+++ nagios-plugins-1.4.12/plugins/check_procs.c 2008-06-03 11:14:09.000000000 +0200 -@@ -730,7 +730,7 @@ - printf (" %s\n", _("PROCS - number of processes (default)")); - printf (" %s\n", _("VSZ - virtual memory size")); - printf (" %s\n", _("RSS - resident set memory size")); -- printf (" %s\n", _("CPU - percentage cpu")); -+ printf (" %s\n", _("CPU - percentage CPU")); - /* only linux etime is support currently */ - #if defined( __linux__ ) - printf (" %s\n", _("ELAPSED - time elapsed in seconds")); -@@ -749,11 +749,11 @@ - printf (" %s\n", "-p, --ppid=PPID"); - printf (" %s\n", _("Only scan for children of the parent process ID indicated.")); - printf (" %s\n", "-z, --vsz=VSZ"); -- printf (" %s\n", _("Only scan for processes with vsz higher than indicated.")); -+ printf (" %s\n", _("Only scan for processes with VSZ higher than indicated.")); - printf (" %s\n", "-r, --rss=RSS"); -- printf (" %s\n", _("Only scan for processes with rss higher than indicated.")); -+ printf (" %s\n", _("Only scan for processes with RSS higher than indicated.")); - printf (" %s\n", "-P, --pcpu=PCPU"); -- printf (" %s\n", _("Only scan for processes with pcpu higher than indicated.")); -+ printf (" %s\n", _("Only scan for processes with PCPU higher than indicated.")); - printf (" %s\n", "-u, --user=USER"); - printf (" %s\n", _("Only scan for processes with user name or ID indicated.")); - printf (" %s\n", "-a, --argument-array=STRING"); -@@ -789,9 +789,9 @@ - printf (" %s\n", _("Warning alert if > 10 processes with command arguments containing")); - printf (" %s\n\n", _("'/usr/local/bin/perl' and owned by root")); - printf (" %s\n", "check_procs -w 50000 -c 100000 --metric=VSZ"); -- printf (" %s\n\n", _("Alert if vsz of any processes over 50K or 100K")); -+ printf (" %s\n\n", _("Alert if VSZ of any processes over 50K or 100K")); - printf (" %s\n", "check_procs -w 10 -c 20 --metric=CPU"); -- printf (" %s\n", _("Alert if cpu of any processes over 10%% or 20%%")); -+ printf (" %s\n", _("Alert if CPU of any processes over 10%% or 20%%")); - - printf (_(UT_SUPPORT)); - } -diff -urNad nagios-plugins-1.4.12~/plugins/check_radius.c nagios-plugins-1.4.12/plugins/check_radius.c ---- nagios-plugins-1.4.12~/plugins/check_radius.c 2008-06-03 11:08:16.000000000 +0200 -+++ nagios-plugins-1.4.12/plugins/check_radius.c 2008-06-03 11:16:39.000000000 +0200 -@@ -325,7 +325,7 @@ - printf ("Copyright (c) 1999 Robert August Vincent II\n"); - printf (COPYRIGHT, copyright, email); - -- printf("%s\n", _("Tests to see if a radius server is accepting connections.")); -+ printf("%s\n", _("Tests to see if a RADIUS server is accepting connections.")); - - printf ("\n\n"); - -@@ -352,7 +352,7 @@ - printf (_(UT_TIMEOUT), timeout_interval); - - printf ("\n"); -- printf ("%s\n", _("This plugin tests a radius server to see if it is accepting connections.")); -+ printf ("%s\n", _("This plugin tests a RADIUS server to see if it is accepting connections.")); - printf ("%s\n", _("The server to test must be specified in the invocation, as well as a user")); - printf ("%s\n", _("name and password. A configuration file may also be present. The format of")); - printf ("%s\n", _("the configuration file is described in the radiusclient library sources.")); -diff -urNad nagios-plugins-1.4.12~/plugins/check_snmp.c nagios-plugins-1.4.12/plugins/check_snmp.c ---- nagios-plugins-1.4.12~/plugins/check_snmp.c 2008-05-07 12:02:42.000000000 +0200 -+++ nagios-plugins-1.4.12/plugins/check_snmp.c 2008-06-03 11:08:17.000000000 +0200 -@@ -928,7 +928,7 @@ - - printf (COPYRIGHT, copyright, email); - -- printf ("%s\n", _("Check status of remote machines and obtain sustem information via SNMP")); -+ printf ("%s\n", _("Check status of remote machines and obtain system information via SNMP")); - - printf ("\n\n"); - -@@ -964,8 +964,8 @@ - printf (" %s\n", "-o, --oid=OID(s)"); - printf (" %s\n", _("Object identifier(s) or SNMP variables whose value you wish to query")); - printf (" %s\n", "-m, --miblist=STRING"); -- printf (" %s\n", _("List of MIBS to be loaded (default = none if using numeric oids or 'ALL'")); -- printf (" %s\n", _("for symbolic oids.)")); -+ printf (" %s\n", _("List of MIBS to be loaded (default = none if using numeric OIDs or 'ALL'")); -+ printf (" %s\n", _("for symbolic OIDs.)")); - printf (" %s\n", "-d, --delimiter=STRING"); - printf (_(" Delimiter to use when parsing returned data. Default is \"%s\""), DEFAULT_DELIMITER); - printf (" %s\n", _("Any data on the right hand side of the delimiter is considered")); -diff -urNad nagios-plugins-1.4.12~/plugins/check_tcp.c nagios-plugins-1.4.12/plugins/check_tcp.c ---- nagios-plugins-1.4.12~/plugins/check_tcp.c 2008-05-07 12:02:42.000000000 +0200 -+++ nagios-plugins-1.4.12/plugins/check_tcp.c 2008-06-03 11:08:17.000000000 +0200 -@@ -623,7 +623,7 @@ - printf (" %s\n", "-q, --quit=STRING"); - printf (" %s\n", _("String to send server to initiate a clean close of the connection")); - printf (" %s\n", "-r, --refuse=ok|warn|crit"); -- printf (" %s\n", _("Accept tcp refusals with states ok, warn, crit (default: crit)")); -+ printf (" %s\n", _("Accept TCP refusals with states ok, warn, crit (default: crit)")); - printf (" %s\n", "-M, --mismatch=ok|warn|crit"); - printf (" %s\n", _("Accept expected string mismatches with states ok, warn, crit (default: warn)")); - printf (" %s\n", "-j, --jail"); -diff -urNad nagios-plugins-1.4.12~/plugins/check_ups.c nagios-plugins-1.4.12/plugins/check_ups.c ---- nagios-plugins-1.4.12~/plugins/check_ups.c 2008-05-07 12:02:42.000000000 +0200 -+++ nagios-plugins-1.4.12/plugins/check_ups.c 2008-06-03 11:19:51.000000000 +0200 -@@ -417,7 +417,7 @@ - len = strlen(ptr); - if (len > 0 && ptr[len-1] == '\n') ptr[len-1]=0; - if (strcmp (ptr, "ERR UNKNOWN-UPS") == 0) { -- printf (_("CRITICAL - no such ups '%s' on that host\n"), ups_name); -+ printf (_("CRITICAL - no such UPS '%s' on that host\n"), ups_name); - return ERROR; - } - -@@ -584,7 +584,7 @@ - validate_arguments (void) - { - if (! ups_name) { -- printf ("%s\n", _("Error : no ups indicated")); -+ printf ("%s\n", _("Error : no UPS indicated")); - return ERROR; - } - return OK; -@@ -635,7 +635,7 @@ - printf ("%s\n", _("This plugin attempts to determine the status of a UPS (Uninterruptible Power")); - printf ("%s\n", _("Supply) on a local or remote host. If the UPS is online or calibrating, the")); - printf ("%s\n", _("plugin will return an OK state. If the battery is on it will return a WARNING")); -- printf ("%s\n", _("state.If the UPS is off or has a low battery the plugin will return a CRITICAL")); -+ printf ("%s\n", _("state. If the UPS is off or has a low battery the plugin will return a CRITICAL")); - printf ("%s\n", _("state.")); - - printf ("\n"); -@@ -645,7 +645,7 @@ - printf (" %s\n", _("of that variable. If the remote host has multiple UPS that are being monitored")); - printf (" %s\n", _("you will have to use the --ups option to specify which UPS to check.")); - printf ("\n"); -- printf (" %s\n", _("This plugin requires that the UPSD daemon distributed with Russel Kroll's")); -+ printf (" %s\n", _("This plugin requires that the UPSD daemon distributed with Russell Kroll's")); - printf (" %s\n", _("Smart UPS Tools be installed on the remote host. If you do not have the")); - printf (" %s\n", _("package installed on your system, you can download it from")); - printf (" %s\n", _("http://www.networkupstools.org")); -diff -urNad nagios-plugins-1.4.12~/plugins-scripts/check_mailq.pl nagios-plugins-1.4.12/plugins-scripts/check_mailq.pl ---- nagios-plugins-1.4.12~/plugins-scripts/check_mailq.pl 2006-07-05 15:45:57.000000000 +0200 -+++ nagios-plugins-1.4.12/plugins-scripts/check_mailq.pl 2008-06-03 11:08:17.000000000 +0200 -@@ -588,7 +588,7 @@ - print " Checks the number of messages in the mail queue (supports multiple sendmail queues, qmail)\n"; - print " Feedback/patches to support non-sendmail mailqueue welcome\n\n"; - print "-w (--warning) = Min. number of messages in queue to generate warning\n"; -- print "-c (--critical) = Min. number of messages in queu to generate critical alert ( w < c )\n"; -+ print "-c (--critical) = Min. number of messages in queue to generate critical alert ( w < c )\n"; - print "-W (--Warning) = Min. number of messages for same domain in queue to generate warning\n"; - print "-C (--Critical) = Min. number of messages for same domain in queue to generate critical alert ( W < C )\n"; - print "-t (--timeout) = Plugin timeout in seconds (default = $utils::TIMEOUT)\n";