Update upstream source from tag 'upstream/2.3.5'

Update to upstream version '2.3.5'
with Debian dir d7999c706a
This commit is contained in:
Jan Wagner 2023-10-18 09:45:11 +00:00
commit 4028296763
10 changed files with 47 additions and 34 deletions

4
NEWS
View file

@ -1,5 +1,9 @@
This file documents the major additions and syntax changes between releases. This file documents the major additions and syntax changes between releases.
2.3.5 18th Oct 2023
FIXES
* Include maxfd.h in lib Makefile
2.3.4 18th Oct 2023 2.3.4 18th Oct 2023
ENHANCEMENTS ENHANCEMENTS
* check_curl: added --cookie-jar and doing proper cleanup of libcurl * check_curl: added --cookie-jar and doing proper cleanup of libcurl

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.3.4 DEF_VER=2.3.5
LF=' LF='
' '

34
THANKS
View file

@ -2,19 +2,19 @@ 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.
Thoralf Rickert-Wendt
Matthias Hähnel
Randy O'Meara
dag rob?le
Marc Sánchez
Arkadiusz Miśkiewicz Arkadiusz Miśkiewicz
Aksel Sjögren dag rob?le
fabiodds Matthias Döhler
Marc Sánchez
Wolfgang Karall-Ahlborn
Thoralf Rickert-Wendt
Diego Elio Pettenò Diego Elio Pettenò
Nicolai Søborg Nicolai Søborg
Elan Ruusamäe Elan Ruusamäe
Matthias Döhler Matthias Hähnel
Wolfgang Karall-Ahlborn fabiodds
Aksel Sjögren
Randy O'Meara
Oskar Ahner Oskar Ahner
Lance Albertson Lance Albertson
David Alden David Alden
@ -89,9 +89,9 @@ Lee Clemens
Ben Clewett Ben Clewett
Jean-Claude Computing Jean-Claude Computing
Lionel Cons Lionel Cons
Ollie Cook
Garry Cook Garry Cook
Charlie Cook Charlie Cook
Ollie Cook
Luca Corti Luca Corti
Greg Cox Greg Cox
Jason Crawford Jason Crawford
@ -130,13 +130,13 @@ Reuben Farrelly
Mark Favas Mark Favas
Duncan Ferguson Duncan Ferguson
Juan Carlos Fernandez Juan Carlos Fernandez
Paulo Fessel
Paulo Afonso Graner Fessel Paulo Afonso Graner Fessel
Paulo Fessel
James Fidell James Fidell
Tobias Fiebig Tobias Fiebig
Roman Fiedler Roman Fiedler
Bernhard Fischer
Johan Fischer Johan Fischer
Bernhard Fischer
Matthias Flacke Matthias Flacke
Martin Foster Martin Foster
Felix Frank Felix Frank
@ -149,8 +149,8 @@ Tim Gates
Sven Geggus Sven Geggus
Jonas Genannt Jonas Genannt
Robby Giffin Robby Giffin
Florian Gleixner
Flo Gleixner Flo Gleixner
Florian Gleixner
Evgeni Golov Evgeni Golov
Joseph Gooch Joseph Gooch
Aravind Gottipati Aravind Gottipati
@ -166,8 +166,8 @@ Sebastien Guay
Linda Guo Linda Guo
Jon Hallett Jon Hallett
Steve Hanselman Steve Hanselman
Jacob Hansen
Ask Bjoern Hansen Ask Bjoern Hansen
Jacob Hansen
Sebastian Harl Sebastian Harl
Michael Haro Michael Haro
Olli Hauer Olli Hauer
@ -247,8 +247,8 @@ Gerardo Malazdrewicz
Ricardo Maraschini Ricardo Maraschini
Michael Markstaller Michael Markstaller
John Marquart John Marquart
Ernst-Dieter Martin
Jason Martin Jason Martin
Ernst-Dieter Martin
Christopher Maser Christopher Maser
Mathieu Masseboeuf Mathieu Masseboeuf
Alexander Matey Alexander Matey
@ -339,8 +339,8 @@ Sven Schaffranneck
Christoph Schell Christoph Schell
Thomas Schimpke Thomas Schimpke
Benjamin Schmid Benjamin Schmid
Sebastian Schmidt
Christian Schmidt Christian Schmidt
Sebastian Schmidt
Henning Schmiedehausen Henning Schmiedehausen
Christian Schneemann Christian Schneemann
Cove Schneider Cove Schneider
@ -416,8 +416,8 @@ Shawn Wills
Rob Windsor Rob Windsor
Mario Witte Mario Witte
Alexander Wittig Alexander Wittig
Brian De Wolf
Tobias Wolf Tobias Wolf
Brian De Wolf
Eric Wunderlin Eric Wunderlin
Patric Wust Patric Wust
Jamie Zawinski Jamie Zawinski

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.3.4. # Generated by GNU Autoconf 2.69 for monitoring-plugins 2.3.5.
# #
# #
# 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.3.4' PACKAGE_VERSION='2.3.5'
PACKAGE_STRING='monitoring-plugins 2.3.4' PACKAGE_STRING='monitoring-plugins 2.3.5'
PACKAGE_BUGREPORT='' PACKAGE_BUGREPORT=''
PACKAGE_URL='' PACKAGE_URL=''
@ -2860,7 +2860,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.3.4 to adapt to many kinds of systems. \`configure' configures monitoring-plugins 2.3.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -2932,7 +2932,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.3.4:";; short | recursive ) echo "Configuration of monitoring-plugins 2.3.5:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@ -3127,7 +3127,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.3.4 monitoring-plugins configure 2.3.5
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.
@ -3837,7 +3837,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.3.4, which was It was created by monitoring-plugins $as_me 2.3.5, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@ $ $0 $@
@ -4771,7 +4771,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='monitoring-plugins' PACKAGE='monitoring-plugins'
VERSION='2.3.4' VERSION='2.3.5'
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
@ -52333,7 +52333,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.3.4, which was This file was extended by monitoring-plugins $as_me 2.3.5, 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
@ -52399,7 +52399,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.3.4 monitoring-plugins config.status 2.3.5
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.64) AC_PREREQ(2.64)
AC_INIT(monitoring-plugins,2.3.4) AC_INIT(monitoring-plugins,2.3.5)
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

@ -8,7 +8,7 @@ AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\" \
-I$(srcdir) -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins -I$(srcdir) -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins
libmonitoringplug_a_SOURCES = utils_base.c utils_disk.c utils_tcp.c utils_cmd.c maxfd.c libmonitoringplug_a_SOURCES = utils_base.c utils_disk.c utils_tcp.c utils_cmd.c maxfd.c
EXTRA_DIST = utils_base.h utils_disk.h utils_tcp.h utils_cmd.h parse_ini.h extra_opts.h EXTRA_DIST = utils_base.h utils_disk.h utils_tcp.h utils_cmd.h parse_ini.h extra_opts.h maxfd.h
if USE_PARSE_INI if USE_PARSE_INI
libmonitoringplug_a_SOURCES += parse_ini.c extra_opts.c libmonitoringplug_a_SOURCES += parse_ini.c extra_opts.c

View file

@ -1786,7 +1786,7 @@ AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\" \
libmonitoringplug_a_SOURCES = utils_base.c utils_disk.c utils_tcp.c \ libmonitoringplug_a_SOURCES = utils_base.c utils_disk.c utils_tcp.c \
utils_cmd.c maxfd.c $(am__append_1) utils_cmd.c maxfd.c $(am__append_1)
EXTRA_DIST = utils_base.h utils_disk.h utils_tcp.h utils_cmd.h parse_ini.h extra_opts.h EXTRA_DIST = utils_base.h utils_disk.h utils_tcp.h utils_cmd.h parse_ini.h extra_opts.h maxfd.h
all: all-recursive all: all-recursive
.SUFFIXES: .SUFFIXES:

9
lib/maxfd.h Normal file
View file

@ -0,0 +1,9 @@
#ifndef _MAXFD_
#define _MAXFD_
#define DEFAULT_MAXFD 256 /* fallback value if no max open files value is set */
#define MAXFD_LIMIT 8192 /* upper limit of open files */
long mp_open_max (void);
#endif // _MAXFD_

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.3.4,REV=2023.10.17.15.43" VERSION="2.3.5,REV=2023.10.18.09.15"
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="nag20231017154323" PSTAMP="nag20231018091518"
BASEDIR="/" BASEDIR="/"
CLASSES="none" CLASSES="none"

View file

@ -1 +1 @@
2.3.4 2.3.5