Imported Upstream version 1.4.16+git20130926

BUGS

@@ -1,32 +0,0 @@
-This file lists the major bugs from the Nagios Plugins page on Sourceforge
-at http://sourceforge.net/tracker/?group_id=29880&atid=397597. These are not
-necessarily verified as errors.
-
-For the 1.4.16 release:
-
-3535511 - check_snmp memory corruption with many OIDs/labels/units
-3434735 - check_http failing with proxy server
-3028955 - check_users always reports 1 user connected in French
-3003419 - check_snmp converts negative values to positive
-2991170 - check_nt segfaults on unexpected server response
-2826570 - check_http does not work with some HTTPS servers
-2823005 - check_swap returns OK if no swap activated
-2786808 - check_http asks for HTTP/1.1, but doesn't understand chunked
-2555782 - check_imap fails with SSL3
-2550254 - check_ldap with starttls requires hostname to match cert name
-2315953 - check_ping: timeouts when reverse name resolution times out
-2075933 - check_disk segfault on freebsd 7 if using -p option
-1984255 - check_swap not built on Solaris 10 and HP-UX 11.11, 11.23
-1984240 - check_tcp Segmentation fault on HP-UX 11.23
-1939578 - check_jabber: Always returns WARNING with Openfire server
-1939529 - check_tcp: Expiring SSL certs produce confusing messages
-1928399 - check_procs METRIC_CPU should ignore kernel processes on FreeBSD
-1904965 - check_apt: SECURITY_RE is not correct
-1681516 - output too verbose for various checks
-1523748 - check_disk should error if warn range is subset of critical
-1469468 - signal handler in popen.c is broken
-1381604 - Perlsec breaks any perl plugin with perl 5.8.x
-1373801 - check_ping timeout on Mandrake 10.1
-1370031 - check_disk_smb requires DNS agree with NetBIOS names
-1225470 - check_swap perf data incorrect
-1090549 - check_dhcp ignores DHCP replies

Makefile.am

@@ -3,7 +3,7 @@
 SUBDIRS = gl tap lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@
 
 EXTRA_DIST = config.rpath \
-	ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CODING FAQ LEGAL NEWS \
+	ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS CODING FAQ LEGAL NEWS \
 	NP-VERSION-GEN REQUIREMENTS SUPPORT THANKS \
 	NPTest.pm pkg nagios-plugins.spec \
 	config_test/Makefile config_test/run_tests config_test/child_test.c \

Makefile.in

@@ -1418,7 +1418,7 @@ top_srcdir = @top_srcdir@
 with_trusted_path = @with_trusted_path@
 SUBDIRS = gl tap lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@
 EXTRA_DIST = config.rpath \
-	ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CODING FAQ LEGAL NEWS \
+	ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS CODING FAQ LEGAL NEWS \
 	NP-VERSION-GEN REQUIREMENTS SUPPORT THANKS \
 	NPTest.pm pkg nagios-plugins.spec \
 	config_test/Makefile config_test/run_tests config_test/child_test.c \

README

@@ -1,110 +1,90 @@
-Nagios Plugins README
+Nagios Plugins
----------------------
+==============
 
 * For instructions on installing these plugins for use with Nagios,
-  see below. In addition, generic instructions for the GNU toolchain
+  see below.  In addition, generic instructions for the GNU toolchain can be
-  can be found in the INSTALL file.
+  found in the `INSTALL` file.
 
-* For major changes between releases, read the NEWS file.
+* For major changes between releases, read the `NEWS` file.
 
-* For information on detailed changes that have been made or plugins 
+* For information on detailed changes that have been made or plugins
-  that have been added, read the Changelog file.
+  that have been added, read the `ChangeLog` file.
 
 * Some plugins require that you have additional programs and/or
-  libraries installed on your system before they can be used.  Plugins
+  libraries installed on your system before they can be used.  Plugins that
-  that are dependent on other programs/libraries that are missing are
+  are dependent on other programs/libraries that are missing are usually not
-  usually not compiled. Read the REQUIREMENTS file for more information.
+  compiled.  Read the `REQUIREMENTS` file for more information.
 
-* For a list of outstanding bugs for this release, see the BUGS file.
+* Individual plugins are self-documenting.  All plugins that comply with
-
-* Individual plugins are self documenting.  All plugins that comply with
   the basic guidelines for development will provide detailed help when
-  invoked with the '-h' or '--help' options.
+  invoked with the `-h` or `--help` options.
-
-* The file command.cfg contains example configurations for many of the
-  plugins
-
-* The win32 subdir contains plugins specific to the Win32 platform. 
-  These are scripts or binaries.
 
 You can check for the latest plugins at:
-  http://sourceforge.net/projects/nagiosplug/
 
-Send mail to nagiosplug-help@lists.sourceforge.net for assistance.  Please
+* <https://sourceforge.net/projects/nagiosplug/>
-include the OS type and version that you are using.  Also, run the plugin with
-the '-vvv' option and provide the resulting version information.  Of course, 
-there may be additional diagnostic information required as well.  Use good
-judgment.
 
-Send mail to nagiosplug-devel@lists.sourceforge.net for developer discussions.
+Send an email to <nagiosplug-help@lists.sourceforge.net> for assistance.
+Please include the OS type and version that you are using.  Also, run the
+plugin with the `-vvv` option and provide the resulting version information.
+Of course, there may be additional diagnostic information required as well.
+Use good judgment.
 
-For patch submissions and bug reports, please use the appropriate resources at
+Send an email to <nagiosplug-devel@lists.sourceforge.net> for developer
-http://sourceforge.net/projects/nagiosplug/ (navigate to the bug tool and/or
+discussions.
-patch tool from the summary page).  Patches should be relative to the current
+
-CVS head (development), or to the head of the current stable branch. Also, 
+For patch submissions and bug reports, please use the appropriate resources
-please include version information for your OS and the plugin(s) your are 
+at <https://github.com/nagios-plugins/nagios-plugins>.
-patching/reporting.
 
 
+Installation Instructions
+-------------------------
+
+1.  If you are using the Git tree, you will need m4, gettext, automake, and
+    autoconf.  To start out, run:
+
+    	./tools/setup
+
+    For more detail, see the developer guidelines at
+    <http://nagiosplug.sourceforge.net/developer-guidelines.html>.
+
+2.  Run the configure script to initialize variables and create a Makefile,
+    etc.
+
+    	./configure --prefix=BASEDIRECTORY --with-cgiurl=SOMEURL
+
+    Replace `BASEDIRECTORY` with the path of the directory under which Nagios
+    is installed (default is `/usr/local/nagios`), and replace `SOMEURL` with
+    the path used to access the Nagios CGIs with a web browser (default is
+    `/nagios/cgi-bin`).
+
+3.  Compile the plugins with the following command:
+
+    	make
+
+4.  Install the compiled plugins and plugin scripts with the following
+    command:
+
+    	make install
+
+    The installation procedure will attempt to place the plugins in a
+    `libexec/` subdirectory in the base directory you specified with the
+    `--prefix` argument to the configure script.
+
+5.  There are some plugins that require setuid.  If you run make install as
+    a non-root user, they will not be installed.  To install, switch to root
+    and run:
+
+    	make install-root
+
+That's it!  If you have any problems or questions, feel free to send an
+email to <nagiosplug-help@lists.sourceforge.net>.
 
 
-Nagios Plugins Quick-and-Dirty Installation Instructions
+License Stuff
---------------------------------------------------------
-
-0) If you are using the CVS tree, you will need m4, gettext, automake, and autoconf. 
-   To start out, run ./tools/setup
-
-   For more detail, see the developer guidelines at 
-   http://nagiosplug.sourceforge.net/developer-guidelines.html.
-
-
-1) Run the configure script to initialize variables and create a Makefile, etc.
-
-	./configure --prefix=BASEDIRECTORY --with-cgiurl=SOMEURL
-
-   a) Replace BASEDIRECTORY with the path of the directory under which Nagios
-      is installed (default is '/usr/local/nagios')
-   b) Replace CGIURL with the path used to access the Nagios CGIs with
-      a web browser (default is '/nagios/cgi-bin')
-
-
-2) Compile the plugins with the following command:
-
-	make
-
-
-3) Install the compiled plugins and plugin scripts with the following command:
-
-	make install
-
-   The installation procedure will attempt to place the plugins in a 
-   'libexec/' subdirectory in the base directory you specified with
-   the --prefix argument to the configure script.
-
-4) There are some plugins that require setuid. If you run make install as 
-   a non root user, they will not be installed. To install, switch to root and 
-   run:
-
-	make install-root
-
-5) Verify that your host configuration file (hosts.cfg) for Nagios contains
-   the correct paths to the new plugins.
-
-
-
-That's it! If you have any problems or questions, feel free send mail
-to nagiosplug-help@lists.sourceforge.net
-
-
-
-LICENSE STUFF
 -------------
 
-This software is released under the GNU Public License with the additional
+This software is released under the GNU General Public License, Version 3,
-exemption that compiling, linking and/or using OpenSSL is allowed.
+with the additional exemption that compiling, linking and/or using OpenSSL
+is allowed.
 
-See the COPYING file for the complete GPL text. 
+See the `COPYING` file for the complete GPLv3 text.
-
-
---
-Nagios Plugins Team

THANKS

@@ -2,16 +2,16 @@ This software is brought to you by the Nagios Plugins Development Team. However,
 there have been many contributors to this project. Everyone below has helped in 
 raising bug reports, creating patches or contributing new plugins.
 
-fabiodds
-Diego Elio Pettenò
 Randy O'Meara
 dag rob?le
+Diego Elio Pettenò
+fabiodds
 Oskar Ahner
 Lance Albertson
 David Alden
 Paul Allen
-Rodger Allen
 Patrick Allen
+Rodger Allen
 Felipe Gustavo de Almeida
 Michael Almond
 Michael Anthon
@@ -56,8 +56,8 @@ Stephane Chazelas
 Eric Chen
 Alwyn Cherrington
 Ben Clewett
-Ollie Cook
 Garry Cook
+Ollie Cook
 Charlie Cook
 Jason Crawford
 David Croft
@@ -87,8 +87,8 @@ Paul Farrall
 Reuben Farrelly
 Mark Favas
 Duncan Ferguson
-Paulo Fessel
 Paulo Afonso Graner Fessel
+Paulo Fessel
 James Fidell
 Roman Fiedler
 Bernhard Fischer

perlmods/Makefile

@@ -944,9 +944,9 @@ MKDIR_P = /bin/mkdir -p
 MSGFMT = /usr/bin/msgfmt
 MSGFMT_015 = /usr/bin/msgfmt
 MSGMERGE = /usr/bin/msgmerge
-MYSQLCFLAGS = -I/usr/include/mysql -DBIG_JOINS=1  -fno-strict-aliasing  -g
+MYSQLCFLAGS = -I/usr/include/mysql -DBIG_JOINS=1  -fno-strict-aliasing -DTAOCRYPT_DISABLE_X86ASM  -g -DNDEBUG
 MYSQLINCLUDE = -I/usr/include/mysql
-MYSQLLIBS = -L/usr/lib/i386-linux-gnu -lmysqlclient -lpthread -lz -lm -lrt -ldl
+MYSQLLIBS = -L/usr/lib/i386-linux-gnu -lmysqlclient -lpthread -lz -lm -ldl
 NETINET_IN_H = 
 NEXT_ARPA_INET_H = <arpa/inet.h>
 NEXT_AS_FIRST_DIRECTIVE_ARPA_INET_H = <arpa/inet.h>
@@ -1227,8 +1227,8 @@ REPLACE_WCTOB = 0
 REPLACE_WCTOMB = 0
 REPLACE_WCWIDTH = 0
 REPLACE_WRITE = 0
-REV_DATESTAMP = 2013.09.20.11.34
+REV_DATESTAMP = 2013.09.27.16.38
-REV_TIMESTAMP = 20130920113412
+REV_TIMESTAMP = 20130927163814
 SCRIPT_TEST = t/check_disk_smb.t t/check_file_age.t t/check_ifoperstatus.t t/check_ifstatus.t t/check_rpc.t t/utils.t
 SED = /bin/sed
 SERVENT_LIB = 

pkg/solaris/pkginfo

@@ -2,11 +2,11 @@ PKG="NGOSplugin"
 NAME="nagios-plugins"
 DESC="Nagios network monitoring plugins"
 ARCH="unknown"
-VERSION="1.4.16,REV=2013.09.20.11.34"
+VERSION="1.4.16,REV=2013.09.27.16.38"
 CATEGORY="application"
 VENDOR="Nagios Plugin Development Team"
 EMAIL="nagiosplug-devel@lists.sourceforge.net"
-PSTAMP="nag20130920113412"
+PSTAMP="nag20130927163814"
 BASEDIR="/"
 CLASSES="none"
 

plugins/check_http.c

@@ -881,7 +881,7 @@ check_http (void)
     gettimeofday (&tv_temp, NULL);
     result = np_net_ssl_init_with_hostname_version_and_cert(sd, (use_sni ? host_name : NULL), ssl_version, client_cert, client_privkey);
     if (result != STATE_OK)
-      return result;
+      die (STATE_CRITICAL, NULL);
     microsec_ssl = deltime (tv_temp);
     elapsed_time_ssl = (double)microsec_ssl / 1.0e6;
     if (check_cert == TRUE) {

po/de.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nagiosplug\n"
 "Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-09-20 11:35+0200\n"
+"POT-Creation-Date: 2013-09-27 16:41+0200\n"
 "PO-Revision-Date: 2004-12-23 17:46+0100\n"
 "Last-Translator:  <>\n"
 "Language-Team: English <en@li.org>\n"

po/fr.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-09-20 11:35+0200\n"
+"POT-Creation-Date: 2013-09-27 16:41+0200\n"
 "PO-Revision-Date: 2010-04-21 23:38-0400\n"
 "Last-Translator: Thomas Guyot-Sionnest <dermoth@aei.ca>\n"
 "Language-Team: Nagios Plugin Development Mailing List <nagiosplug-"

po/nagios-plugins.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-09-20 11:35+0200\n"
+"POT-Creation-Date: 2013-09-27 16:41+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"