[Pkg-nagios-changes] [pkg-monitoring-plugins] 02/04: Imported Upstream version 2.1.2
Jan Wagner
waja at moszumanska.debian.org
Fri Oct 16 13:20:01 UTC 2015
This is an automated email from the git hooks/post-receive script.
waja pushed a commit to annotated tag upstream/2.1.2
in repository pkg-monitoring-plugins.
commit 55c71a6fd3a903da1ae8a4573abb28699f34849d
Author: Jan Wagner <waja at cyconet.org>
Date: Fri Oct 16 14:43:39 2015 +0200
Imported Upstream version 2.1.2
---
ChangeLog | 28 ++++++++++++++++++++++++++++
NEWS | 3 ++-
NP-VERSION-GEN | 2 +-
THANKS | 3 +++
configure | 20 ++++++++++----------
configure.ac | 2 +-
pkg/solaris/pkginfo | 4 ++--
plugins-root/pst3.c | 4 +++-
po/de.gmo | Bin 7632 -> 7632 bytes
po/de.po | 2 +-
po/fr.gmo | Bin 91520 -> 91520 bytes
po/fr.po | 2 +-
po/monitoring-plugins.pot | 2 +-
release | 2 +-
14 files changed, 54 insertions(+), 20 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ebda558..cfa0dc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+2015-10-16 Holger Weiss <holger at 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 at cyconet.org>
+
+ * NEWS: Updating NEWS
+
+2015-07-28 abrist <abrist at 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 at cyconet.org>
* NEWS: Updating NEWS file
diff --git a/NEWS b/NEWS
index f52c5b7..35b97d5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
This file documents the major additions and syntax changes between releases.
-2.1.2 ...
+2.1.2 16th October 2015
FIXES
Fix incorrect performance data thresholds emitted by check_ups
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_real's server response processing
Fix backslash escaping in check_tcp's --help output
+ Fix check_procs's unclosed filehandle in pst3 on Solaris
2.1 15th October 2014
ENHANCEMENTS
diff --git a/NP-VERSION-GEN b/NP-VERSION-GEN
index 12efad7..dd82bf1 100755
--- a/NP-VERSION-GEN
+++ b/NP-VERSION-GEN
@@ -6,7 +6,7 @@
SRC_ROOT=`dirname $0`
NPVF=NP-VERSION-FILE
-DEF_VER=2.1.1.git
+DEF_VER=2.1.2.git
LF='
'
diff --git a/THANKS b/THANKS
index 2b312f7..391dc8e 100644
--- a/THANKS
+++ b/THANKS
@@ -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
raising bug reports, creating patches or contributing new plugins.
+Jérémie Courrèges-Anglas
Diego Elio Pettenò
fabiodds
dag rob?le
@@ -269,6 +270,7 @@ Sascha Runschke
Dietmar Ruzicka
Ralph Rye
Alen Salamun
+Louis Sautier
Sven Schaffranneck
Christoph Schell
Thomas Schimpke
@@ -288,6 +290,7 @@ Sean Shore
Pall Sigurdsson
Antony Simmonds
John Sivak
+Oliver Skibbe
Nik Soggia
Robin Sonefors
Erwan Ben Souiden
diff --git a/configure b/configure
index f241c87..fd8ef3c 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# 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.
@@ -587,8 +587,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='monitoring-plugins'
PACKAGE_TARNAME='monitoring-plugins'
-PACKAGE_VERSION='2.1.1'
-PACKAGE_STRING='monitoring-plugins 2.1.1'
+PACKAGE_VERSION='2.1.2'
+PACKAGE_STRING='monitoring-plugins 2.1.2'
PACKAGE_BUGREPORT=''
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.
# This message is too long to be a string in the A/UX 3.1 sh.
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]...
@@ -2471,7 +2471,7 @@ fi
if test -n "$ac_init_help"; then
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
cat <<\_ACEOF
@@ -2637,7 +2637,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-monitoring-plugins configure 2.1.1
+monitoring-plugins configure 2.1.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -3342,7 +3342,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
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
$ $0 $@
@@ -4213,7 +4213,7 @@ fi
# Define the identity of the package.
PACKAGE='monitoring-plugins'
- VERSION='2.1.1'
+ VERSION='2.1.2'
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
# values after options handling.
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
CONFIG_FILES = $CONFIG_FILES
@@ -41003,7 +41003,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
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,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 8514f98..89c15ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
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_FILES([gl/Makefile])
AC_CONFIG_AUX_DIR(build-aux)
diff --git a/pkg/solaris/pkginfo b/pkg/solaris/pkginfo
index e34039e..fec49f0 100644
--- a/pkg/solaris/pkginfo
+++ b/pkg/solaris/pkginfo
@@ -2,11 +2,11 @@ PKG="NGOSplugin"
NAME="monitoring-plugins"
DESC="Network Monitoring Plugins for Nagios and compatible"
ARCH="unknown"
-VERSION="2.1.1,REV=2015.10.12.12.29"
+VERSION="2.1.2,REV=2015.10.16.11.39"
CATEGORY="application"
VENDOR="Monitoring Plugins Development Team"
EMAIL="devel at monitoring-plugins.org"
-PSTAMP="nag20151012122940"
+PSTAMP="nag20151016113911"
BASEDIR="/"
CLASSES="none"
diff --git a/plugins-root/pst3.c b/plugins-root/pst3.c
index ee9d108..c3589f0 100644
--- a/plugins-root/pst3.c
+++ b/plugins-root/pst3.c
@@ -139,8 +139,10 @@ try_again:
if((ps_fd = open(ps_name, O_RDONLY)) == -1)
continue;
- if((as_fd = open(as_name, O_RDONLY)) == -1)
+ if((as_fd = open(as_name, O_RDONLY)) == -1) {
+ close(ps_fd);
continue;
+ }
if(read(ps_fd, &psinfo, sizeof(psinfo)) != sizeof(psinfo)) {
int err = errno;
diff --git a/po/de.gmo b/po/de.gmo
index 405c4ad..c80850b 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index 350f7fa..a83a5b0 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: nagiosplug\n"
"Report-Msgid-Bugs-To: devel at 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"
"Last-Translator: <>\n"
"Language-Team: English <en at li.org>\n"
diff --git a/po/fr.gmo b/po/fr.gmo
index 8f4a1b2..a1dbcc9 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index 5860238..d6b1b21 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: devel at 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"
"Last-Translator: Thomas Guyot-Sionnest <dermoth at aei.ca>\n"
"Language-Team: Nagios Plugin Development Mailing List <nagiosplug-"
diff --git a/po/monitoring-plugins.pot b/po/monitoring-plugins.pot
index f1c4262..147a8d2 100644
--- a/po/monitoring-plugins.pot
+++ b/po/monitoring-plugins.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: devel at 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"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
diff --git a/release b/release
index b303db6..eca07e4 100644
--- a/release
+++ b/release
@@ -1 +1 @@
-v2.1.1-15-gf729
+2.1.2
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-monitoring-plugins.git
More information about the Pkg-nagios-changes
mailing list