| @@ -1,63650 +0,0 @@
-diff -uNr nagios-plugins-1.4.11/aclocal.m4 nagios-plugins-1.4.12/aclocal.m4
---- nagios-plugins-1.4.11/aclocal.m4 2007-12-13 23:42:25.000000000 +0100
-+++ nagios-plugins-1.4.12/aclocal.m4 2008-05-28 00:04:55.000000000 +0200
-@@ -7258,9 +7258,9 @@
- ]) # _AM_PROG_TAR
-
- m4_include([m4/np_mysqlclient.m4])
--m4_include([gl/m4/absolute-header.m4])
- m4_include([gl/m4/alloca.m4])
- m4_include([gl/m4/arpa_inet_h.m4])
-+m4_include([gl/m4/base64.m4])
- m4_include([gl/m4/c-strtod.m4])
- m4_include([gl/m4/cloexec.m4])
- m4_include([gl/m4/codeset.m4])
-@@ -7272,6 +7272,8 @@
- m4_include([gl/m4/exitfail.m4])
- m4_include([gl/m4/extensions.m4])
- m4_include([gl/m4/fcntl-safer.m4])
-+m4_include([gl/m4/float_h.m4])
-+m4_include([gl/m4/floorf.m4])
- m4_include([gl/m4/fstypename.m4])
- m4_include([gl/m4/fsusage.m4])
- m4_include([gl/m4/getaddrinfo.m4])
-@@ -7279,25 +7281,25 @@
- m4_include([gl/m4/getloadavg.m4])
- m4_include([gl/m4/getopt.m4])
- m4_include([gl/m4/gettext.m4])
-+m4_include([gl/m4/glibc21.m4])
- m4_include([gl/m4/gnulib-common.m4])
- m4_include([gl/m4/gnulib-comp.m4])
- m4_include([gl/m4/iconv.m4])
-+m4_include([gl/m4/include_next.m4])
- m4_include([gl/m4/inet_ntop.m4])
- m4_include([gl/m4/inline.m4])
-+m4_include([gl/m4/intlmacosx.m4])
- m4_include([gl/m4/intmax_t.m4])
- m4_include([gl/m4/inttypes_h.m4])
- m4_include([gl/m4/lib-ld.m4])
- m4_include([gl/m4/lib-link.m4])
- m4_include([gl/m4/lib-prefix.m4])
--m4_include([gl/m4/lock.m4])
--m4_include([gl/m4/longdouble.m4])
-+m4_include([gl/m4/localcharset.m4])
- m4_include([gl/m4/longlong.m4])
- m4_include([gl/m4/ls-mntd-fs.m4])
--m4_include([gl/m4/mbchar.m4])
--m4_include([gl/m4/mbiter.m4])
--m4_include([gl/m4/mbrtowc.m4])
--m4_include([gl/m4/memchr.m4])
--m4_include([gl/m4/minmax.m4])
-+m4_include([gl/m4/malloc.m4])
-+m4_include([gl/m4/math_h.m4])
-+m4_include([gl/m4/mbstate_t.m4])
- m4_include([gl/m4/mountlist.m4])
- m4_include([gl/m4/netinet_in_h.m4])
- m4_include([gl/m4/nls.m4])
-@@ -7315,12 +7317,14 @@
- m4_include([gl/m4/stdbool.m4])
- m4_include([gl/m4/stdint.m4])
- m4_include([gl/m4/stdint_h.m4])
--m4_include([gl/m4/strcase.m4])
-+m4_include([gl/m4/stdio_h.m4])
-+m4_include([gl/m4/stdlib_h.m4])
- m4_include([gl/m4/strdup.m4])
-+m4_include([gl/m4/strerror.m4])
-+m4_include([gl/m4/string_h.m4])
- m4_include([gl/m4/strndup.m4])
- m4_include([gl/m4/strnlen.m4])
- m4_include([gl/m4/sys_socket_h.m4])
--m4_include([gl/m4/ulonglong.m4])
- m4_include([gl/m4/unistd-safer.m4])
- m4_include([gl/m4/unistd_h.m4])
- m4_include([gl/m4/vasnprintf.m4])
-@@ -7329,7 +7333,6 @@
- m4_include([gl/m4/wchar.m4])
- m4_include([gl/m4/wchar_t.m4])
- m4_include([gl/m4/wctype.m4])
--m4_include([gl/m4/wcwidth.m4])
- m4_include([gl/m4/wint_t.m4])
- m4_include([gl/m4/xalloc.m4])
- m4_include([gl/m4/xsize.m4])
-diff -uNr nagios-plugins-1.4.11/BUGS nagios-plugins-1.4.12/BUGS
---- nagios-plugins-1.4.11/BUGS 2007-12-13 23:39:36.000000000 +0100
-+++ nagios-plugins-1.4.12/BUGS 2008-05-28 00:01:05.000000000 +0200
-@@ -4,13 +4,19 @@
-
- For the 1.4.11 release:
-
--1724055 - check_dns: does not sort address data
-+1939578 - check_jabber: Always returns WARNING with Openfire server
-+1939529 - check_tcp: Expiring SSL certs produce confusing messages
-+1928399 - check_porcs METRIC_CPU should ignore kernel processes on FreeBSD
-+1922579 - check_ldap: ldap_init implicitly converted
-+1904965 - check_apt: SECURITY_RE is not correct
-+1894850 - check_ping: incorrectly parses ping6 output
-+1868822 - check_http link fails with openssl installed
-+1867716 - check_snmp invalid performance data
-+1864404 - check_smtp/check_http miscalculate timezones in cert expiry
- 1681516 - output too verbose for various checks
- 1670261 - check_snmp might require snmpget with LD_LIBRARY_PATH
- 1569488 - check_ifoperstatus.pl: -n option does't work (help required!)
- 1523748 - check_disk should error if warn range is subset of critical
--1498923 - check_ldap build error on Solaris 9
--1480574 - check_disk missing -lm on Solaris
- 1478287 - check_dns fails with CNAMEs
- 1469468 - signal handler in popen.c is broken
- 1381604 - Perlsec breaks any perl plugin with perl 5.8.x
-diff -uNr nagios-plugins-1.4.11/build-aux/config.rpath nagios-plugins-1.4.12/build-aux/config.rpath
---- nagios-plugins-1.4.11/build-aux/config.rpath 2007-01-29 11:06:46.000000000 +0100
-+++ nagios-plugins-1.4.12/build-aux/config.rpath 2008-02-12 12:07:18.000000000 +0100
-@@ -2,7 +2,7 @@
- # Output a system dependent set of variables, describing how to set the
- # run time search path of shared libraries in an executable.
- #
--# Copyright 1996-2006 Free Software Foundation, Inc.
-+# Copyright 1996-2008 Free Software Foundation, Inc.
- # Taken from GNU libtool, 2001
- # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
- #
-@@ -64,7 +64,7 @@
- ;;
- esac
- ;;
-- mingw* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2*)
- ;;
- hpux9* | hpux10* | hpux11*)
- wl='-Wl,'
-@@ -74,7 +74,7 @@
- ;;
- newsos6)
- ;;
-- linux*)
-+ linux* | k*bsd*-gnu)
- case $cc_basename in
- icc* | ecc*)
- wl='-Wl,'
-@@ -100,7 +100,7 @@
- osf3* | osf4* | osf5*)
- wl='-Wl,'
- ;;
-- sco3.2v5*)
-+ rdos*)
- ;;
- solaris*)
- wl='-Wl,'
-@@ -108,11 +108,14 @@
- sunos4*)
- wl='-Qoption ld '
- ;;
-- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+ sysv4 | sysv4.2uw2* | sysv4.3*)
- wl='-Wl,'
- ;;
- sysv4*MP*)
- ;;
-+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-+ wl='-Wl,'
-+ ;;
- unicos*)
- wl='-Wl,'
- ;;
-@@ -155,7 +158,7 @@
- # option of GNU ld is called -rpath, not --rpath.
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- case "$host_os" in
-- aix3* | aix4* | aix5*)
-+ aix[3-9]*)
- # On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
- ld_shlibs=no
-@@ -189,11 +192,11 @@
- ld_shlibs=no
- fi
- ;;
-- interix3*)
-+ interix[3-9]*)
- hardcode_direct=no
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- ;;
-- linux*)
-+ gnu* | linux* | k*bsd*-gnu)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- :
- else
-@@ -251,7 +254,7 @@
- hardcode_direct=unsupported
- fi
- ;;
-- aix4* | aix5*)
-+ aix[4-9]*)
- if test "$host_cpu" = ia64; then
- # On IA64, the linker does run time linking by default, so we don't
- # have to do anything special.
-@@ -261,7 +264,7 @@
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
-- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
|
| @@ -1,289 +0,0 @@
-68,87d67
-< int strIndexOf(char *string1, char *string2);
-< char *strSubstring(char *string1, char *string2, int StartingPos, int EndPos);
-< char *GetThreadsPerfdata(char *stringtoparse);
-< char *GetQuestionsPerfdata(char *stringtoparse);
-< char *GetSQPerfdata(char *stringtoparse);
-< char *GetOpensPerfdata(char *stringtoparse);
-< char *GetFTPerfdata(char *stringtoparse);
-< char *GetOTPerfdata(char *stringtoparse);
-< char *GetQPSAPerfdata(char *stringtoparse);
-<
-< struct mysql_statistics
-< {
-< char *ThreadsPerfdata;
-< char *QuestionsPerfdata;
-< char *SQPerfdata;
-< char *OpensPerfdata;
-< char *FTPerfdata;
-< char *OTPerfdata;
-< char *QPSAPerfdata;
-< };
-102,105d81
-<
-< /* variables needed to parse */
-< char *StringToParse;
-< struct mysql_statistics Stats;
-138,154d113
-< /* parse the server stats */
-< strcpy(StringToParse, result);
-<
-< Stats.ThreadsPerfdata = GetThreadsPerfdata(StringToParse);
-< strcpy(StringToParse, result);
-< Stats.QuestionsPerfdata = GetQuestionsPerfdata(StringToParse);
-< strcpy(StringToParse, result);
-< Stats.SQPerfdata = GetSQPerfdata(StringToParse);
-< strcpy(StringToParse, result);
-< Stats.OpensPerfdata = GetOpensPerfdata(StringToParse);
-< strcpy(StringToParse, result);
-< Stats.FTPerfdata = GetFTPerfdata(StringToParse);
-< strcpy(StringToParse, result);
-< Stats.OTPerfdata = GetOTPerfdata(StringToParse);
-< strcpy(StringToParse, result);
-< Stats.QPSAPerfdata = GetQPSAPerfdata(StringToParse);
-<
-270c229
-< printf ("%s %s | %s %s %s %s %s %s %s\n", result, slaveresult, Stats.ThreadsPerfdata, Stats.SQPerfdata, Stats.OpensPerfdata, Stats.FTPerfdata, Stats.OTPerfdata, Stats.QPSAPerfdata);
----
-> printf ("%s %s\n", result, slaveresult);
-272c231
-< printf ("%s | %s %s %s %s %s %s %s\n", result, Stats.ThreadsPerfdata, Stats.QuestionsPerfdata, Stats.SQPerfdata, Stats.OpensPerfdata, Stats.FTPerfdata, Stats.OTPerfdata, Stats.QPSAPerfdata);
----
-> printf ("%s\n", result);
-278,512d236
-< char
-< *GetQPSAPerfdata(char *stringtoparse)
-< {
-< int Start = 0;
-< int End = 0;
-< char *qpsa;
-< char *output;
-< Start = strIndexOf("Queries per second avg\0", stringtoparse);
-< End = strlen(stringtoparse);
-<
-< qpsa = strSubstring(qpsa, stringtoparse, Start, End);
-< qpsa = strSubstring(qpsa, qpsa, strIndexOf(" \0", qpsa) + 1, strlen(qpsa));
-< qpsa = strSubstring(qpsa, qpsa, strIndexOf(" \0", qpsa) + 1, strlen(qpsa));
-< qpsa = strSubstring(qpsa, qpsa, strIndexOf(" \0", qpsa) + 1, strlen(qpsa));
-< qpsa = strSubstring(qpsa, qpsa, strIndexOf(" \0", qpsa) + 1, strlen(qpsa));
-< printf("%s", qpsa);
-< asprintf(&output, "%s", fperfdata("queries_per_second_avg", atof(qpsa), "",
-< FALSE, 0,
-< FALSE, 0,
-< TRUE, 0,
-< FALSE, 0));
-<
-< return output;
-< }
-<
-< char
-< *GetOTPerfdata(char *stringtoparse)
-< {
-< int Start = 0;
-< int End = 0;
-< char *ot;
-< char *output;
-< Start = strIndexOf("Open tables\0", stringtoparse);
-< End = strIndexOf("Queries per second avg\0", stringtoparse);
-<
-< ot = strSubstring(ot, stringtoparse, Start, End - 2);
-< ot = strSubstring(ot, ot, strIndexOf(" \0", ot) + 1, strlen(ot));
-< ot = strSubstring(ot, ot, strIndexOf(" \0", ot) + 1, strlen(ot));
-< asprintf(&output, "%s", perfdata("open_tables", atoi(ot), "",
-< FALSE, 0,
-< FALSE, 0,
-< TRUE, 0,
-< FALSE, 0));
-<
-< return output;
-< }
-<
-< char
-< *GetFTPerfdata(char *stringtoparse)
-< {
-< int Start = 0;
-< int End = 0;
-< char *ft;
-< char *output;
-< Start = strIndexOf("Flush tables\0", stringtoparse);
-< End = strIndexOf("Open tables\0", stringtoparse);
-<
-< ft = strSubstring(ft, stringtoparse, Start, End - 2);
-< ft = strSubstring(ft, ft, strIndexOf(" \0", ft) + 1, strlen(ft));
-< ft = strSubstring(ft, ft, strIndexOf(" \0", ft) + 1, strlen(ft));
-< asprintf(&output, "%s", perfdata("flush_tables", atoi(ft), "",
-< FALSE, 0,
-< FALSE, 0,
-< TRUE, 0,
-< FALSE, 0));
-<
-< return output;
-< }
-<
-< char
-< *GetOpensPerfdata(char *stringtoparse)
-< {
-< int Start = 0;
-< int End = 0;
-< char *opens;
-< char *output;
-< Start = strIndexOf("Opens\0", stringtoparse);
-< End = strIndexOf("Flush tables\0", stringtoparse);
-<
-< opens = strSubstring(opens, stringtoparse, Start, End - 2);
-< opens = strSubstring(opens, opens, strIndexOf(" \0", opens) + 1, strlen(opens));
-< asprintf(&output, "%s", perfdata("opens", atoi(opens), "",
-< FALSE, 0,
-< FALSE, 0,
-< TRUE, 0,
-< FALSE, 0));
-<
-< return output;
-< }
-<
-< char
-< *GetSQPerfdata(char *stringtoparse)
-< {
-< int Start = 0;
-< int End = 0;
-< char *slowqueries;
-< char *output;
-< Start = strIndexOf("Slow queries\0", stringtoparse);
-< End = strIndexOf("Opens\0", stringtoparse);
-<
-< slowqueries = strSubstring(slowqueries, stringtoparse, Start, End - 2);
-< slowqueries = strSubstring(slowqueries, slowqueries, strIndexOf(" \0", slowqueries) + 1, strlen(slowqueries));
-< slowqueries = strSubstring(slowqueries, slowqueries, strIndexOf(" \0", slowqueries) + 1, strlen(slowqueries));
-< asprintf(&output, "%s", perfdata("slow_queries", atoi(slowqueries), "",
-< FALSE, 0,
-< FALSE, 0,
-< TRUE, 0,
-< FALSE, 0));
-<
-< return output;
-< }
-<
-< char
-< *GetQuestionsPerfdata(char *stringtoparse)
-< {
-< int Start = 0;
-< int End = 0;
-< char *questions;
-< char *output;
-< Start = strIndexOf("Questions\0", stringtoparse);
-< End = strIndexOf("Slow queries\0", stringtoparse);
-<
-< questions = strSubstring(questions, stringtoparse, Start, End - 2);
-< questions = strSubstring(questions, questions, strIndexOf(" \0", questions) + 1, strlen(questions));
-< asprintf(&output, "%s", perfdata("questions", atoi(questions), "",
-< FALSE, 0,
-< FALSE, 0,
-< TRUE, 0,
-< FALSE, 0));
-<
-< return output;
-< }
-<
-< char
-< *GetThreadsPerfdata(char *stringtoparse)
-< {
-< int Start = 0;
-< int End = 0;
-< char *threads;
-< char *output;
-<
-< Start = strIndexOf("Threads\0", stringtoparse);
-< End = strIndexOf("Questions\0", stringtoparse);
-<
-< threads = strSubstring(threads, stringtoparse, Start, End - 2);
-< threads = strSubstring(threads, threads, strIndexOf(" \0", threads) + 1, strlen(threads));
|
