pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Update nagios-plugins to 2.3.3
details: https://anonhg.NetBSD.org/pkgsrc/rev/69934327df7e
branches: trunk
changeset: 391378:69934327df7e
user: sekiya <sekiya%pkgsrc.org@localhost>
date: Mon Jan 09 00:28:41 2023 +0000
description:
Update nagios-plugins to 2.3.3
diffstat:
doc/CHANGES-2023 | 3 +-
net/nagios-plugins/Makefile | 11 +-
net/nagios-plugins/Makefile.common | 4 +-
net/nagios-plugins/PLIST | 3 +-
net/nagios-plugins/distinfo | 34 +-
net/nagios-plugins/patches/patch-ad | 28 ---
net/nagios-plugins/patches/patch-af | 24 --
net/nagios-plugins/patches/patch-ah | 14 -
net/nagios-plugins/patches/patch-an | 15 -
net/nagios-plugins/patches/patch-configure | 30 +-
net/nagios-plugins/patches/patch-gl_gettext.h | 12 +-
net/nagios-plugins/patches/patch-lib_Makefile.in | 15 +
net/nagios-plugins/patches/patch-plugins-root_Makefile.in | 15 +-
net/nagios-plugins/patches/patch-plugins-scripts_Makefile.in | 31 +++
net/nagios-plugins/patches/patch-plugins-scripts_check__breeze.pl | 15 -
net/nagios-plugins/patches/patch-plugins-scripts_check__wave.pl | 84 ---------
net/nagios-plugins/patches/patch-plugins-scripts_check_breeze.pl | 15 +
net/nagios-plugins/patches/patch-plugins-scripts_check_ntp.pl | 14 +
net/nagios-plugins/patches/patch-plugins-scripts_check_wave.pl | 88 ++++++++++
net/nagios-plugins/patches/patch-plugins_Makefile.in | 24 ++
net/nagios-plugins/patches/patch-plugins__check_swap.c | 17 -
net/nagios-plugins/patches/patch-plugins_check__ide__smart.c | 22 --
net/nagios-plugins/patches/patch-plugins_check__radius.c | 15 -
net/nagios-plugins/patches/patch-plugins_check_ide_smart.c | 22 ++
net/nagios-plugins/patches/patch-plugins_check_nagios.c | 10 +-
net/nagios-plugins/patches/patch-plugins_check_radius.c | 15 +
net/nagios-plugins/patches/patch-plugins_check_swap.c | 17 +
27 files changed, 303 insertions(+), 294 deletions(-)
diffs (truncated from 879 to 300 lines):
diff -r c7b8914a75c5 -r 69934327df7e doc/CHANGES-2023
--- a/doc/CHANGES-2023 Mon Jan 09 00:14:06 2023 +0000
+++ b/doc/CHANGES-2023 Mon Jan 09 00:28:41 2023 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2023,v 1.178 2023/01/08 23:35:11 sekiya Exp $
+$NetBSD: CHANGES-2023,v 1.179 2023/01/09 00:28:41 sekiya Exp $
Changes to the packages collection and infrastructure in 2023:
@@ -210,3 +210,4 @@
Updated net/nsd to 4.6.1 [ryoon 2023-01-08]
Updated net/knot to 3.2.4 [ryoon 2023-01-08]
Updated net/nagios-base to 4.4.9 [sekiya 2023-01-09]
+ Updated net/nagios-plugins to 2.3.3 [sekiya 2023-01-09]
diff -r c7b8914a75c5 -r 69934327df7e net/nagios-plugins/Makefile
--- a/net/nagios-plugins/Makefile Mon Jan 09 00:14:06 2023 +0000
+++ b/net/nagios-plugins/Makefile Mon Jan 09 00:28:41 2023 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.55 2022/06/28 11:35:03 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2023/01/09 00:28:41 sekiya Exp $
#
-PKGREVISION= 8
+#PKGREVISION= 1
CATEGORIES= net sysutils
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
@@ -42,10 +42,11 @@
# required to enable large file support on Solaris
.if ${OPSYS} == "SunOS"
-CPPFLAGS_LFS!= getconf LFS_CFLAGS
-MAKE_ENV+= CPPFLAGS_LFS=${CPPFLAGS_LFS:Q}
+CPPFLAGS_LFS_CMD= getconf LFS_CFLAGS
+CPPFLAGS_LFS= ${CPPFLAGS_LFS_CMD:sh}
+MAKE_ENV+= CPPFLAGS_LFS=${CPPFLAGS_LFS:Q}
.endif
-LIBS.SunOS+= -lm
+LIBS.SunOS+= -lm
#DEPENDS+= nagios-base-*:../../net/nagios-base
diff -r c7b8914a75c5 -r 69934327df7e net/nagios-plugins/Makefile.common
--- a/net/nagios-plugins/Makefile.common Mon Jan 09 00:14:06 2023 +0000
+++ b/net/nagios-plugins/Makefile.common Mon Jan 09 00:28:41 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2017/11/08 03:20:48 taca Exp $
+# $NetBSD: Makefile.common,v 1.16 2023/01/09 00:28:41 sekiya Exp $
#
# used by net/nagios-plugin-ldap/Makefile
# used by net/nagios-plugin-mysql/Makefile
@@ -7,7 +7,7 @@
# used by net/nagios-plugin-snmp/Makefile
# used by net/nagios-plugins/Makefile
-PLUGINSVERSION= 2.2.1
+PLUGINSVERSION= 2.3.3
DISTNAME= nagios-plugins-${PLUGINSVERSION}
MASTER_SITES?= http://nagios-plugins.org/download/
diff -r c7b8914a75c5 -r 69934327df7e net/nagios-plugins/PLIST
--- a/net/nagios-plugins/PLIST Mon Jan 09 00:14:06 2023 +0000
+++ b/net/nagios-plugins/PLIST Mon Jan 09 00:28:41 2023 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2017/07/04 19:45:18 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.12 2023/01/09 00:28:41 sekiya Exp $
libexec/nagios/check_by_ssh
libexec/nagios/check_clamd
libexec/nagios/check_dhcp
@@ -46,6 +46,7 @@
libexec/nagios/check_ups
libexec/nagios/check_users
libexec/nagios/negate
+libexec/nagios/remove_perfdata
libexec/nagios/urlize
libexec/nagios/utils.pm
libexec/nagios/utils.sh
diff -r c7b8914a75c5 -r 69934327df7e net/nagios-plugins/distinfo
--- a/net/nagios-plugins/distinfo Mon Jan 09 00:14:06 2023 +0000
+++ b/net/nagios-plugins/distinfo Mon Jan 09 00:28:41 2023 +0000
@@ -1,18 +1,18 @@
-$NetBSD: distinfo,v 1.27 2022/04/02 10:35:35 nia Exp $
+$NetBSD: distinfo,v 1.28 2023/01/09 00:28:41 sekiya Exp $
-BLAKE2s (nagios-plugins-2.2.1.tar.gz) = 976274874f96d7614ac6359b7feb9692874e947677d88a6d2daa6e569bb61ce5
-SHA512 (nagios-plugins-2.2.1.tar.gz) = 6ffe313a56a305b382f62abc0f0958d7078f9050e1340f30721d6e6f71944b57b1650e90e6835c35dd7c9f3f4b4cee9f235b8382b0811db30b3729daaafc9bc3
-Size (nagios-plugins-2.2.1.tar.gz) = 2728818 bytes
-SHA1 (patch-ad) = cad52f9d8c5a6b53a1b512238df1590c0fa2177d
-SHA1 (patch-af) = 12ea1194eee95ea15ecc6d7daedd10eb9541ee6e
-SHA1 (patch-ah) = 99b5eb4896262f5aa1de60e9f42c395a59794a6b
-SHA1 (patch-an) = a6adf179db754f98b2da118a8c1101edda026fbc
-SHA1 (patch-configure) = 8a805fd88735b7b1c9cb96a974a1e6216ff23d2e
-SHA1 (patch-gl_gettext.h) = 37d14b4472f678bd84c13183e0fb263cd17f6ac5
-SHA1 (patch-plugins-root_Makefile.in) = 46e8968df375ca35d453e36c277d4052f125897b
-SHA1 (patch-plugins-scripts_check__breeze.pl) = 57ffda78989fd0d0c0fa26c74b7f53bd083dab4f
-SHA1 (patch-plugins-scripts_check__wave.pl) = 535b008877cad780afa2ed3429ffb84e7da3ec28
-SHA1 (patch-plugins__check_swap.c) = b822de3488ecace977a739ebcfc56229763cd945
-SHA1 (patch-plugins_check__ide__smart.c) = 34ea76bf79da83fa84b6f0ff7f425462d0aac69e
-SHA1 (patch-plugins_check__radius.c) = 3f86bac4f7aa52931bad46d9ee4a421c2ee744f3
-SHA1 (patch-plugins_check_nagios.c) = a58d12f461a4501a8066101e091307456faf32cf
+BLAKE2s (nagios-plugins-2.3.3.tar.gz) = 4eee57a0cae28eab4a115d1f518506a7c33ab0ab66e505088a7af2a65308bb22
+SHA512 (nagios-plugins-2.3.3.tar.gz) = 2128601b1098eb82f4e7d720b96a5f92d6ad75dc181a94b25c38172767de8b72f9fece3eddb74933b1cd520928ae9416a7dc665e2f059bfe362dd74041d28cd7
+Size (nagios-plugins-2.3.3.tar.gz) = 2782610 bytes
+SHA1 (patch-configure) = b37e7b7cd1fd1582a36a0906a5a1e532fd231d50
+SHA1 (patch-gl_gettext.h) = c6e4917c30a1c4cceb46d1236fe9d2ff24359586
+SHA1 (patch-lib_Makefile.in) = a91faf1b6ee112152ee85b0233466d799dfe30da
+SHA1 (patch-plugins-root_Makefile.in) = 11a249107265a26b453bba9e3ea951595d3a01fc
+SHA1 (patch-plugins-scripts_Makefile.in) = 442a0be4d4a7b5370a9a25bc5c52f0bd467bdb8c
+SHA1 (patch-plugins-scripts_check_breeze.pl) = 80c7f889a0cf3c1f5da4f5b6564f993c25e421b6
+SHA1 (patch-plugins-scripts_check_ntp.pl) = 8101604b3227fc9977d992c1e73885b8e3dab86a
+SHA1 (patch-plugins-scripts_check_wave.pl) = af42b740b64906fb4c882827165054a84bbddb76
+SHA1 (patch-plugins_Makefile.in) = 3509f2972feabe4806e4529c320eb5a119b5df77
+SHA1 (patch-plugins_check_ide_smart.c) = 6601814ad4ac91f11dbeb18613254df55e14edbd
+SHA1 (patch-plugins_check_nagios.c) = 922d4494c77c1764ee30f004e96ce8734ab6954f
+SHA1 (patch-plugins_check_radius.c) = 909c78e18a969c0d0c8431151c0b6069afaaf2ae
+SHA1 (patch-plugins_check_swap.c) = ecef90186c97256051ae1e238f95d9861c87e31b
diff -r c7b8914a75c5 -r 69934327df7e net/nagios-plugins/patches/patch-ad
--- a/net/nagios-plugins/patches/patch-ad Mon Jan 09 00:14:06 2023 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-$NetBSD: patch-ad,v 1.7 2017/07/04 19:45:18 jperkin Exp $
-
-Exclude plugins that would require extra dependancies.
-Some can be found in specific nagios plugin packages.
-
---- plugins-scripts/Makefile.in.orig 2017-04-19 16:03:25.000000000 +0000
-+++ plugins-scripts/Makefile.in
-@@ -1300,15 +1300,11 @@ top_srcdir = @top_srcdir@
- with_trusted_path = @with_trusted_path@
- @RELEASE_PRESENT_TRUE@NP_VERSION = @NP_RELEASE@
- SUFFIXES = .pl .sh
--libexec_SCRIPTS = check_breeze check_disk_smb check_flexlm check_ircd \
-- check_log check_oracle check_rpc check_sensors check_wave \
-- check_ifstatus check_ifoperstatus check_mailq check_file_age \
-- utils.sh utils.pm
--
--EXTRA_DIST = check_breeze.pl check_disk_smb.pl check_flexlm.pl check_ircd.pl \
-- check_log.sh check_ntp.pl check_oracle.sh check_rpc.pl check_sensors.sh \
-- check_ifstatus.pl check_ifoperstatus.pl check_wave.pl check_mailq.pl check_file_age.pl \
-- utils.sh.in utils.pm.in t
-+libexec_SCRIPTS = check_ircd check_log check_ntp check_rpc \
-+ check_mailq check_file_age utils.sh utils.pm
-+
-+EXTRA_DIST = check_ircd.pl check_log.sh check_ntp.pl check_rpc.pl \
-+ check_mailq.pl check_file_age.pl utils.sh.in utils.pm.in t
-
- EDIT = sed \
- -e 's|[@]NP_VERSION[@]|$(NP_VERSION)|g' \
diff -r c7b8914a75c5 -r 69934327df7e net/nagios-plugins/patches/patch-af
--- a/net/nagios-plugins/patches/patch-af Mon Jan 09 00:14:06 2023 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$NetBSD: patch-af,v 1.7 2017/07/04 19:45:18 jperkin Exp $
-
-Exclude specific plugins.
-
---- plugins/Makefile.in.orig 2014-06-26 16:17:33.000000000 +0000
-+++ plugins/Makefile.in
-@@ -33,7 +33,7 @@ PRE_UNINSTALL = :
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--libexec_PROGRAMS = check_apt$(EXEEXT) check_cluster$(EXEEXT) \
-+libexec_PROGRAMS = \
- check_disk$(EXEEXT) check_dummy$(EXEEXT) check_http$(EXEEXT) \
- check_load$(EXEEXT) check_mrtg$(EXEEXT) \
- check_mrtgtraf$(EXEEXT) check_ntp$(EXEEXT) \
-@@ -2193,7 +2193,7 @@ $(check_tcp_programs): check_tcp
- install-exec-hook:
- cd $(DESTDIR)$(libexecdir) && \
- for i in $(check_tcp_programs) ; do rm -f $$i; ln -s check_tcp $$i ; done ;\
-- if [ -x check_ldap ] ; then rm -f check_ldaps ; ln -s check_ldap check_ldaps ; fi
-+# if [ -x check_ldap ] ; then rm -f check_ldaps ; ln -s check_ldap check_ldaps ; fi
-
- clean-local:
- rm -f $(check_tcp_programs)
diff -r c7b8914a75c5 -r 69934327df7e net/nagios-plugins/patches/patch-ah
--- a/net/nagios-plugins/patches/patch-ah Mon Jan 09 00:14:06 2023 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-ah,v 1.5 2017/07/04 19:45:18 jperkin Exp $
-
-Unknown patch, please document.
-
---- plugins-scripts/check_ntp.pl.orig 2014-03-04 21:41:57.000000000 +0000
-+++ plugins-scripts/check_ntp.pl
-@@ -311,6 +311,7 @@ if ($have_ntpq) {
- } else {
- $jitter_error = $ERRORS{'OK'};
- }
-+ last;
- } else {
- print "No match!\n" if $verbose;
- $jitter = '(not parsed)';
diff -r c7b8914a75c5 -r 69934327df7e net/nagios-plugins/patches/patch-an
--- a/net/nagios-plugins/patches/patch-an Mon Jan 09 00:14:06 2023 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-an,v 1.6 2017/07/04 19:45:18 jperkin Exp $
-
-Pull in CPPFLAGS_LFS.
-
---- lib/Makefile.in.orig 2014-06-26 16:17:32.000000000 +0000
-+++ lib/Makefile.in
-@@ -153,7 +153,7 @@ depcomp = $(SHELL) $(top_srcdir)/build-a
- am__depfiles_maybe = depfiles
- am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CPPFLAGS_LFS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff -r c7b8914a75c5 -r 69934327df7e net/nagios-plugins/patches/patch-configure
--- a/net/nagios-plugins/patches/patch-configure Mon Jan 09 00:14:06 2023 +0000
+++ b/net/nagios-plugins/patches/patch-configure Mon Jan 09 00:28:41 2023 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure,v 1.4 2017/11/08 03:20:48 taca Exp $
+$NetBSD: patch-configure,v 1.5 2023/01/09 00:28:41 sekiya Exp $
Disable all the plugins which are installed by the nagios-plugin-* packages.
---- configure.orig 2017-04-19 16:03:27.000000000 +0000
-+++ configure
-@@ -17422,7 +17422,7 @@ _ACEOF
+--- configure.orig 2020-03-12 01:58:02.000000000 +0900
++++ configure 2023-01-09 08:50:57.067773726 +0900
+@@ -17494,7 +17494,7 @@
fi
@@ -13,7 +13,7 @@
EXTRAS="$EXTRAS check_radius\$(EXEEXT)"
RADIUSLIBS="-lradiusclient"
-@@ -18947,6 +18947,9 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -19019,6 +19019,9 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#ifdef HAVE_UNISTD_H
@@ -23,7 +23,7 @@
#include <unistd.h>
#endif
#include <netinet/in.h>
-@@ -21721,7 +21724,7 @@ elif test "$ac_cv_uname_s" = "SunOS"; th
+@@ -21793,7 +21796,7 @@
ac_cv_ps_cols=9
{ $as_echo "$as_me:$LINENO: result: using nagios-plugins internal ps command (pst3) for solaris" >&5
$as_echo "using nagios-plugins internal ps command (pst3) for solaris" >&6; }
@@ -32,7 +32,7 @@
pst3_use_64bit=1
{ $as_echo "$as_me:$LINENO: using 64bit pst3" >&5
$as_echo "$as_me: using 64bit pst3" >&6;}
-@@ -22748,7 +22751,7 @@ fi
+@@ -22856,7 +22859,7 @@
then
{ $as_echo "$as_me:$LINENO: checking for nslookup syntax" >&5
$as_echo_n "checking for nslookup syntax... " >&6; }
@@ -41,7 +41,7 @@
then
ac_cv_nslookup_command="$PATH_TO_NSLOOKUP"
{ $as_echo "$as_me:$LINENO: result: $ac_cv_nslookup_command" >&5
-@@ -23137,7 +23140,7 @@ fi
+@@ -23245,7 +23248,7 @@
# Check whether --with-snmpget_command was given.
@@ -50,7 +50,7 @@
withval=$with_snmpget_command; PATH_TO_SNMPGET=$withval
fi
-@@ -23148,7 +23151,7 @@ cat >>confdefs.h <<_ACEOF
+@@ -23256,7 +23259,7 @@
#define PATH_TO_SNMPGET "$PATH_TO_SNMPGET"
_ACEOF
@@ -59,7 +59,7 @@
else
{ $as_echo "$as_me:$LINENO: WARNING: Get snmpget from http://net-snmp.sourceforge.net to make check_hpjd and check_snmp plugins" >&5
$as_echo "$as_me: WARNING: Get snmpget from http://net-snmp.sourceforge.net to make check_hpjd and check_snmp plugins" >&2;}
-@@ -23209,7 +23212,7 @@ _ACEOF
+@@ -23317,7 +23320,7 @@
fi
@@ -68,7 +68,7 @@
then
{ $as_echo "$as_me:$LINENO: checking for Net::SNMP perl module" >&5
$as_echo_n "checking for Net::SNMP perl module... " >&6; }
-@@ -23361,7 +23364,7 @@ IFS=$as_save_IFS
+@@ -23480,7 +23483,7 @@
esac
fi
PATH_TO_FPING=$ac_cv_path_PATH_TO_FPING
@@ -77,7 +77,7 @@
{ $as_echo "$as_me:$LINENO: result: $PATH_TO_FPING" >&5
$as_echo "$PATH_TO_FPING" >&6; }
else
-@@ -23401,7 +23404,7 @@ IFS=$as_save_IFS
+@@ -23520,7 +23523,7 @@
Home |
Main Index |
Thread Index |
Old Index