Imported Upstream version 2.1.2

This commit is contained in:
Jan Wagner 2015-10-16 14:43:39 +02:00
parent 494a834dcf
commit 55c71a6fd3
14 changed files with 54 additions and 20 deletions

View file

@ -1,3 +1,31 @@
2015-10-16 Holger Weiss <holger@zedat.fu-berlin.de>
* NEWS, NP-VERSION-GEN, configure.ac: Prepare for the 2.1.2 release
* THANKS.in: Add new authors
Update the THANKS.in file with the new Git commit authors.
2015-10-13 Jan Wagner <waja@cyconet.org>
* NEWS: Updating NEWS
2015-07-28 abrist <abrist@nagios.com>
* plugins-root/pst3.c: Fix for unclosed filehandle in pst3 on Solaris
On Solaris, check_procs uses pst3 instead of /bin/ps (see
http://monitoring-plugins.org/doc/faq/ps-on-solaris.html for background). There's
a small bug in pst3 which causes it to NOT report some processes that are at
the end of the process table, at least on very busy systems (we noticed this
on a CoolThreads T5240 with load averages up to 90).
The bug is that a filehandle is not properly closed.
Thanks to jwinkle01 for finding and patching the bug.
(Closes #1203)
2015-10-12 Jan Wagner <waja@cyconet.org> 2015-10-12 Jan Wagner <waja@cyconet.org>
* NEWS: Updating NEWS file * NEWS: Updating NEWS file

3
NEWS
View file

@ -1,6 +1,6 @@
This file documents the major additions and syntax changes between releases. This file documents the major additions and syntax changes between releases.
2.1.2 ... 2.1.2 16th October 2015
FIXES FIXES
Fix incorrect performance data thresholds emitted by check_ups Fix incorrect performance data thresholds emitted by check_ups
Fix check_dhcp's option parsing to not crash with certain arguments Fix check_dhcp's option parsing to not crash with certain arguments
@ -13,6 +13,7 @@ This file documents the major additions and syntax changes between releases.
Fix check_apt's handling of invalid regular expressions Fix check_apt's handling of invalid regular expressions
Fix check_real's server response processing Fix check_real's server response processing
Fix backslash escaping in check_tcp's --help output Fix backslash escaping in check_tcp's --help output
Fix check_procs's unclosed filehandle in pst3 on Solaris
2.1 15th October 2014 2.1 15th October 2014
ENHANCEMENTS ENHANCEMENTS

View file

@ -6,7 +6,7 @@
SRC_ROOT=`dirname $0` SRC_ROOT=`dirname $0`
NPVF=NP-VERSION-FILE NPVF=NP-VERSION-FILE
DEF_VER=2.1.1.git DEF_VER=2.1.2.git
LF=' LF='
' '

3
THANKS
View file

@ -2,6 +2,7 @@ This software is brought to you by the Monitoring Plugins Development Team. Howe
there have been many contributors to this project. Everyone below has helped in there have been many contributors to this project. Everyone below has helped in
raising bug reports, creating patches or contributing new plugins. raising bug reports, creating patches or contributing new plugins.
Jérémie Courrèges-Anglas
Diego Elio Pettenò Diego Elio Pettenò
fabiodds fabiodds
dag rob?le dag rob?le
@ -269,6 +270,7 @@ Sascha Runschke
Dietmar Ruzicka Dietmar Ruzicka
Ralph Rye Ralph Rye
Alen Salamun Alen Salamun
Louis Sautier
Sven Schaffranneck Sven Schaffranneck
Christoph Schell Christoph Schell
Thomas Schimpke Thomas Schimpke
@ -288,6 +290,7 @@ Sean Shore
Pall Sigurdsson Pall Sigurdsson
Antony Simmonds Antony Simmonds
John Sivak John Sivak
Oliver Skibbe
Nik Soggia Nik Soggia
Robin Sonefors Robin Sonefors
Erwan Ben Souiden Erwan Ben Souiden

20
configure vendored
View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for monitoring-plugins 2.1.1. # Generated by GNU Autoconf 2.69 for monitoring-plugins 2.1.2.
# #
# #
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@ -587,8 +587,8 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='monitoring-plugins' PACKAGE_NAME='monitoring-plugins'
PACKAGE_TARNAME='monitoring-plugins' PACKAGE_TARNAME='monitoring-plugins'
PACKAGE_VERSION='2.1.1' PACKAGE_VERSION='2.1.2'
PACKAGE_STRING='monitoring-plugins 2.1.1' PACKAGE_STRING='monitoring-plugins 2.1.2'
PACKAGE_BUGREPORT='' PACKAGE_BUGREPORT=''
PACKAGE_URL='' PACKAGE_URL=''
@ -2400,7 +2400,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures monitoring-plugins 2.1.1 to adapt to many kinds of systems. \`configure' configures monitoring-plugins 2.1.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -2471,7 +2471,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of monitoring-plugins 2.1.1:";; short | recursive ) echo "Configuration of monitoring-plugins 2.1.2:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@ -2637,7 +2637,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
monitoring-plugins configure 2.1.1 monitoring-plugins configure 2.1.2
generated by GNU Autoconf 2.69 generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc. Copyright (C) 2012 Free Software Foundation, Inc.
@ -3342,7 +3342,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by monitoring-plugins $as_me 2.1.1, which was It was created by monitoring-plugins $as_me 2.1.2, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@ $ $0 $@
@ -4213,7 +4213,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='monitoring-plugins' PACKAGE='monitoring-plugins'
VERSION='2.1.1' VERSION='2.1.2'
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
@ -40937,7 +40937,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by monitoring-plugins $as_me 2.1.1, which was This file was extended by monitoring-plugins $as_me 2.1.2, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@ -41003,7 +41003,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\ ac_cs_version="\\
monitoring-plugins config.status 2.1.1 monitoring-plugins config.status 2.1.2
configured by $0, generated by GNU Autoconf 2.69, configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"

View file

@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59) AC_PREREQ(2.59)
AC_INIT(monitoring-plugins,2.1.1) AC_INIT(monitoring-plugins,2.1.2)
AC_CONFIG_SRCDIR(NPTest.pm) AC_CONFIG_SRCDIR(NPTest.pm)
AC_CONFIG_FILES([gl/Makefile]) AC_CONFIG_FILES([gl/Makefile])
AC_CONFIG_AUX_DIR(build-aux) AC_CONFIG_AUX_DIR(build-aux)

View file

@ -2,11 +2,11 @@ PKG="NGOSplugin"
NAME="monitoring-plugins" NAME="monitoring-plugins"
DESC="Network Monitoring Plugins for Nagios and compatible" DESC="Network Monitoring Plugins for Nagios and compatible"
ARCH="unknown" ARCH="unknown"
VERSION="2.1.1,REV=2015.10.12.12.29" VERSION="2.1.2,REV=2015.10.16.11.39"
CATEGORY="application" CATEGORY="application"
VENDOR="Monitoring Plugins Development Team" VENDOR="Monitoring Plugins Development Team"
EMAIL="devel@monitoring-plugins.org" EMAIL="devel@monitoring-plugins.org"
PSTAMP="nag20151012122940" PSTAMP="nag20151016113911"
BASEDIR="/" BASEDIR="/"
CLASSES="none" CLASSES="none"

View file

@ -139,8 +139,10 @@ try_again:
if((ps_fd = open(ps_name, O_RDONLY)) == -1) if((ps_fd = open(ps_name, O_RDONLY)) == -1)
continue; continue;
if((as_fd = open(as_name, O_RDONLY)) == -1) if((as_fd = open(as_name, O_RDONLY)) == -1) {
close(ps_fd);
continue; continue;
}
if(read(ps_fd, &psinfo, sizeof(psinfo)) != sizeof(psinfo)) { if(read(ps_fd, &psinfo, sizeof(psinfo)) != sizeof(psinfo)) {
int err = errno; int err = errno;

BIN
po/de.gmo

Binary file not shown.

View file

@ -9,7 +9,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: nagiosplug\n" "Project-Id-Version: nagiosplug\n"
"Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n" "Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n"
"POT-Creation-Date: 2015-10-12 12:30+0200\n" "POT-Creation-Date: 2015-10-16 11:40+0200\n"
"PO-Revision-Date: 2004-12-23 17:46+0100\n" "PO-Revision-Date: 2004-12-23 17:46+0100\n"
"Last-Translator: <>\n" "Last-Translator: <>\n"
"Language-Team: English <en@li.org>\n" "Language-Team: English <en@li.org>\n"

BIN
po/fr.gmo

Binary file not shown.

View file

@ -10,7 +10,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: fr\n" "Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n" "Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n"
"POT-Creation-Date: 2015-10-12 12:30+0200\n" "POT-Creation-Date: 2015-10-16 11:40+0200\n"
"PO-Revision-Date: 2010-04-21 23:38-0400\n" "PO-Revision-Date: 2010-04-21 23:38-0400\n"
"Last-Translator: Thomas Guyot-Sionnest <dermoth@aei.ca>\n" "Last-Translator: Thomas Guyot-Sionnest <dermoth@aei.ca>\n"
"Language-Team: Nagios Plugin Development Mailing List <nagiosplug-" "Language-Team: Nagios Plugin Development Mailing List <nagiosplug-"

View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n" "Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n"
"POT-Creation-Date: 2015-10-12 12:30+0200\n" "POT-Creation-Date: 2015-10-16 11:40+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"

View file

@ -1 +1 @@
v2.1.1-15-gf729 2.1.2