Received: by mail.netbsd.org (Postfix, from userid 605) id 6AF8F84D96; Mon, 9 Jan 2023 00:28:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9C79284D25 for ; Mon, 9 Jan 2023 00:28:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id eE3ht-TMsfRy for ; Mon, 9 Jan 2023 00:28:42 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 3CC1984CEA for ; Mon, 9 Jan 2023 00:28:42 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 36178FA90; Mon, 9 Jan 2023 00:28:42 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1673224122271280" MIME-Version: 1.0 Date: Mon, 9 Jan 2023 00:28:42 +0000 From: "Christopher KOBAYASHI" Subject: CVS commit: pkgsrc To: pkgsrc-changes@NetBSD.org Reply-To: sekiya@netbsd.org X-Mailer: log_accum Message-Id: <20230109002842.36178FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1673224122271280 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: sekiya Date: Mon Jan 9 00:28:42 UTC 2023 Modified Files: pkgsrc/doc: CHANGES-2023 pkgsrc/net/nagios-plugins: Makefile Makefile.common PLIST distinfo pkgsrc/net/nagios-plugins/patches: patch-configure patch-gl_gettext.h patch-plugins-root_Makefile.in patch-plugins_check_nagios.c Added Files: pkgsrc/net/nagios-plugins/patches: patch-lib_Makefile.in patch-plugins-scripts_Makefile.in patch-plugins-scripts_check_breeze.pl patch-plugins-scripts_check_ntp.pl patch-plugins-scripts_check_wave.pl patch-plugins_Makefile.in patch-plugins_check_ide_smart.c patch-plugins_check_radius.c patch-plugins_check_swap.c Removed Files: pkgsrc/net/nagios-plugins/patches: patch-ad patch-af patch-ah patch-an patch-plugins-scripts_check__breeze.pl patch-plugins-scripts_check__wave.pl patch-plugins__check_swap.c patch-plugins_check__ide__smart.c patch-plugins_check__radius.c Log Message: Update nagios-plugins to 2.3.3 To generate a diff of this commit: cvs rdiff -u -r1.178 -r1.179 pkgsrc/doc/CHANGES-2023 cvs rdiff -u -r1.55 -r1.56 pkgsrc/net/nagios-plugins/Makefile cvs rdiff -u -r1.15 -r1.16 pkgsrc/net/nagios-plugins/Makefile.common cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/nagios-plugins/PLIST cvs rdiff -u -r1.27 -r1.28 pkgsrc/net/nagios-plugins/distinfo cvs rdiff -u -r1.7 -r0 pkgsrc/net/nagios-plugins/patches/patch-ad \ pkgsrc/net/nagios-plugins/patches/patch-af cvs rdiff -u -r1.5 -r0 pkgsrc/net/nagios-plugins/patches/patch-ah cvs rdiff -u -r1.6 -r0 pkgsrc/net/nagios-plugins/patches/patch-an cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/nagios-plugins/patches/patch-configure cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/nagios-plugins/patches/patch-gl_gettext.h cvs rdiff -u -r0 -r1.1 \ pkgsrc/net/nagios-plugins/patches/patch-lib_Makefile.in \ pkgsrc/net/nagios-plugins/patches/patch-plugins-scripts_Makefile.in \ pkgsrc/net/nagios-plugins/patches/patch-plugins-scripts_check_breeze.pl \ pkgsrc/net/nagios-plugins/patches/patch-plugins-scripts_check_ntp.pl \ pkgsrc/net/nagios-plugins/patches/patch-plugins-scripts_check_wave.pl \ pkgsrc/net/nagios-plugins/patches/patch-plugins_Makefile.in \ pkgsrc/net/nagios-plugins/patches/patch-plugins_check_radius.c \ pkgsrc/net/nagios-plugins/patches/patch-plugins_check_swap.c cvs rdiff -u -r1.2 -r1.3 \ pkgsrc/net/nagios-plugins/patches/patch-plugins-root_Makefile.in \ pkgsrc/net/nagios-plugins/patches/patch-plugins_check_nagios.c cvs rdiff -u -r1.1 -r0 \ pkgsrc/net/nagios-plugins/patches/patch-plugins-scripts_check__breeze.pl \ pkgsrc/net/nagios-plugins/patches/patch-plugins-scripts_check__wave.pl \ pkgsrc/net/nagios-plugins/patches/patch-plugins_check__ide__smart.c \ pkgsrc/net/nagios-plugins/patches/patch-plugins_check__radius.c cvs rdiff -u -r1.3 -r0 \ pkgsrc/net/nagios-plugins/patches/patch-plugins__check_swap.c cvs rdiff -u -r0 -r1.3 \ pkgsrc/net/nagios-plugins/patches/patch-plugins_check_ide_smart.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1673224122271280 Content-Disposition: inline Content-Length: 26908 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/doc/CHANGES-2023 diff -u pkgsrc/doc/CHANGES-2023:1.178 pkgsrc/doc/CHANGES-2023:1.179 --- pkgsrc/doc/CHANGES-2023:1.178 Sun Jan 8 23:35:11 2023 +++ pkgsrc/doc/CHANGES-2023 Mon Jan 9 00:28:41 2023 @@ -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 @@ Changes to the packages collection and i 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] Index: pkgsrc/net/nagios-plugins/Makefile diff -u pkgsrc/net/nagios-plugins/Makefile:1.55 pkgsrc/net/nagios-plugins/Makefile:1.56 --- pkgsrc/net/nagios-plugins/Makefile:1.55 Tue Jun 28 11:35:03 2022 +++ pkgsrc/net/nagios-plugins/Makefile Mon Jan 9 00:28:41 2023 @@ -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 @@ -42,10 +42,11 @@ SPECIAL_PERMS+= ${PREFIX}/libexec/nagios # 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 Index: pkgsrc/net/nagios-plugins/Makefile.common diff -u pkgsrc/net/nagios-plugins/Makefile.common:1.15 pkgsrc/net/nagios-plugins/Makefile.common:1.16 --- pkgsrc/net/nagios-plugins/Makefile.common:1.15 Wed Nov 8 03:20:48 2017 +++ pkgsrc/net/nagios-plugins/Makefile.common Mon Jan 9 00:28:41 2023 @@ -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/ Index: pkgsrc/net/nagios-plugins/PLIST diff -u pkgsrc/net/nagios-plugins/PLIST:1.11 pkgsrc/net/nagios-plugins/PLIST:1.12 --- pkgsrc/net/nagios-plugins/PLIST:1.11 Tue Jul 4 19:45:18 2017 +++ pkgsrc/net/nagios-plugins/PLIST Mon Jan 9 00:28:41 2023 @@ -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_udp 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 Index: pkgsrc/net/nagios-plugins/distinfo diff -u pkgsrc/net/nagios-plugins/distinfo:1.27 pkgsrc/net/nagios-plugins/distinfo:1.28 --- pkgsrc/net/nagios-plugins/distinfo:1.27 Sat Apr 2 10:35:35 2022 +++ pkgsrc/net/nagios-plugins/distinfo Mon Jan 9 00:28:41 2023 @@ -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 Index: pkgsrc/net/nagios-plugins/patches/patch-configure diff -u pkgsrc/net/nagios-plugins/patches/patch-configure:1.4 pkgsrc/net/nagios-plugins/patches/patch-configure:1.5 --- pkgsrc/net/nagios-plugins/patches/patch-configure:1.4 Wed Nov 8 03:20:48 2017 +++ pkgsrc/net/nagios-plugins/patches/patch-configure Mon Jan 9 00:28:41 2023 @@ -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 @@ Disable all the plugins which are instal 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 @@ Disable all the plugins which are instal #include #endif #include -@@ -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 @@ Disable all the plugins which are instal 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 @@ Disable all the plugins which are instal 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 @@ Disable all the plugins which are instal 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 @@ Disable all the plugins which are instal 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 @@ Disable all the plugins which are instal 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 @@ Disable all the plugins which are instal { $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 @@ esac fi PATH_TO_FPING6=$ac_cv_path_PATH_TO_FPING6 @@ -86,7 +86,7 @@ Disable all the plugins which are instal { $as_echo "$as_me:$LINENO: result: $PATH_TO_FPING6" >&5 $as_echo "$PATH_TO_FPING6" >&6; } else -@@ -24034,6 +24037,10 @@ cat confdefs.h >>conftest.$ac_ext +@@ -24211,6 +24214,10 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -97,7 +97,7 @@ Disable all the plugins which are instal #ifdef HAVE_SYS_PARAM_H #include #endif -@@ -24096,6 +24103,10 @@ cat confdefs.h >>conftest.$ac_ext +@@ -24273,6 +24280,10 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -108,7 +108,7 @@ Disable all the plugins which are instal #include #include #include -@@ -24213,6 +24224,10 @@ cat confdefs.h >>conftest.$ac_ext +@@ -24350,6 +24361,10 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ Index: pkgsrc/net/nagios-plugins/patches/patch-gl_gettext.h diff -u pkgsrc/net/nagios-plugins/patches/patch-gl_gettext.h:1.1 pkgsrc/net/nagios-plugins/patches/patch-gl_gettext.h:1.2 --- pkgsrc/net/nagios-plugins/patches/patch-gl_gettext.h:1.1 Sat Sep 9 22:47:35 2017 +++ pkgsrc/net/nagios-plugins/patches/patch-gl_gettext.h Mon Jan 9 00:28:41 2023 @@ -1,11 +1,11 @@ -$NetBSD: patch-gl_gettext.h,v 1.1 2017/09/09 22:47:35 joerg Exp $ +$NetBSD: patch-gl_gettext.h,v 1.2 2023/01/09 00:28:41 sekiya Exp $ Avoid redefining pgettext_expr and friends on systems that have them already in libintl.h ---- gl/gettext.h.orig 2017-09-09 21:15:30.222205401 +0000 -+++ gl/gettext.h -@@ -180,7 +180,7 @@ npgettext_aux (const char *domain, +--- gl/gettext.h.orig 2019-12-05 06:53:08.000000000 +0900 ++++ gl/gettext.h 2023-01-09 08:51:04.874713509 +0900 +@@ -180,7 +180,7 @@ /* The same thing extended for non-constant arguments. Here MSGCTXT and MSGID can be arbitrary expressions. But for string literals these macros are less efficient than those above. */ @@ -14,10 +14,10 @@ already in libintl.h #include #if (((__GNUC__ >= 3 || __GNUG__ >= 2) && !defined __STRICT_ANSI__) \ -@@ -284,5 +284,6 @@ dcnpgettext_expr (const char *domain, +@@ -284,5 +284,6 @@ } return (n == 1 ? msgid : msgid_plural); } +#endif - #endif /* NAGIOS_GL_GETTEXT_H_INCLUDED */ + #endif /* _LIBGETTEXT_H */ Index: pkgsrc/net/nagios-plugins/patches/patch-plugins-root_Makefile.in diff -u pkgsrc/net/nagios-plugins/patches/patch-plugins-root_Makefile.in:1.2 pkgsrc/net/nagios-plugins/patches/patch-plugins-root_Makefile.in:1.3 --- pkgsrc/net/nagios-plugins/patches/patch-plugins-root_Makefile.in:1.2 Tue Jul 4 19:45:18 2017 +++ pkgsrc/net/nagios-plugins/patches/patch-plugins-root_Makefile.in Mon Jan 9 00:28:41 2023 @@ -1,10 +1,10 @@ -$NetBSD: patch-plugins-root_Makefile.in,v 1.2 2017/07/04 19:45:18 jperkin Exp $ +$NetBSD: patch-plugins-root_Makefile.in,v 1.3 2023/01/09 00:28:41 sekiya Exp $ user-destdir install fixes. ---- plugins-root/Makefile.in.orig 2016-02-08 13:26:51.000000000 +0100 -+++ plugins-root/Makefile.in 2016-02-08 13:27:43.000000000 +0100 -@@ -1312,10 +1312,6 @@ +--- plugins-root/Makefile.in.orig 2020-03-12 01:58:00.000000000 +0900 ++++ plugins-root/Makefile.in 2023-01-09 08:51:15.301292177 +0900 +@@ -1372,10 +1372,6 @@ p=$$f; \ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p"; \ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p; \ @@ -14,18 +14,17 @@ user-destdir install fixes. - chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p; \ done - -@@ -1748,12 +1744,7 @@ + INSTALL_NOSUID = \ +@@ -1819,12 +1815,7 @@ && chmod $(setuid_root_mode) $$TMPFILE > /dev/null 2>&1 \ && can_create_suid_root_executable=yes; \ rm -f $$TMPFILE; \ - if test $$can_create_suid_root_executable = yes; then \ -- $(INSTALL_SUID); \ + $(INSTALL_SUID); \ - else \ - echo "WARNING: insufficient access; not installing setuid plugins"; \ - echo "NOTE: to install setuid plugins, run 'make install-root' as root"; \ - fi -+ $(INSTALL_SUID); \ clean-local: rm -f NP-VERSION-FILE Index: pkgsrc/net/nagios-plugins/patches/patch-plugins_check_nagios.c diff -u pkgsrc/net/nagios-plugins/patches/patch-plugins_check_nagios.c:1.2 pkgsrc/net/nagios-plugins/patches/patch-plugins_check_nagios.c:1.3 --- pkgsrc/net/nagios-plugins/patches/patch-plugins_check_nagios.c:1.2 Sat Apr 2 10:35:35 2022 +++ pkgsrc/net/nagios-plugins/patches/patch-plugins_check_nagios.c Mon Jan 9 00:28:41 2023 @@ -1,10 +1,10 @@ -$NetBSD: patch-plugins_check_nagios.c,v 1.2 2022/04/02 10:35:35 nia Exp $ +$NetBSD: patch-plugins_check_nagios.c,v 1.3 2023/01/09 00:28:41 sekiya Exp $ Crash fix: initialize variable, check bounds on string copy. ---- plugins/check_nagios.c.orig 2017-01-19 16:01:31.000000000 +0000 -+++ plugins/check_nagios.c -@@ -72,7 +72,7 @@ main (int argc, char **argv) +--- plugins/check_nagios.c.orig 2019-12-05 06:53:08.000000000 +0900 ++++ plugins/check_nagios.c 2023-01-09 08:53:37.895632188 +0900 +@@ -73,7 +73,7 @@ #ifdef PS_USES_PROCETIME char procetime[MAX_INPUT_BUFFER]; #endif /* PS_USES_PROCETIME */ @@ -13,7 +13,7 @@ Crash fix: initialize variable, check bo char *procargs; int pos, cols; int expected_cols = PS_COLS - 1; -@@ -144,7 +144,8 @@ main (int argc, char **argv) +@@ -145,7 +145,8 @@ /* Some ps return full pathname for command. This removes path */ temp_string = strtok ((char *)procprog, "/"); while (temp_string) { Added files: Index: pkgsrc/net/nagios-plugins/patches/patch-lib_Makefile.in diff -u /dev/null pkgsrc/net/nagios-plugins/patches/patch-lib_Makefile.in:1.1 --- /dev/null Mon Jan 9 00:28:42 2023 +++ pkgsrc/net/nagios-plugins/patches/patch-lib_Makefile.in Mon Jan 9 00:28:41 2023 @@ -0,0 +1,15 @@ +$NetBSD: patch-lib_Makefile.in,v 1.1 2023/01/09 00:28:41 sekiya Exp $ + +Pull in CPPFLAGS_LFS. + +--- lib/Makefile.in.orig 2020-03-12 01:57:59.000000000 +0900 ++++ lib/Makefile.in 2023-01-09 08:50:52.418317845 +0900 +@@ -166,7 +166,7 @@ + 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) Index: pkgsrc/net/nagios-plugins/patches/patch-plugins-scripts_Makefile.in diff -u /dev/null pkgsrc/net/nagios-plugins/patches/patch-plugins-scripts_Makefile.in:1.1 --- /dev/null Mon Jan 9 00:28:42 2023 +++ pkgsrc/net/nagios-plugins/patches/patch-plugins-scripts_Makefile.in Mon Jan 9 00:28:41 2023 @@ -0,0 +1,31 @@ +$NetBSD: patch-plugins-scripts_Makefile.in,v 1.1 2023/01/09 00:28:41 sekiya Exp $ + +Exclude plugins that would require extra dependancies. +Some can be found in specific nagios plugin packages. + +--- plugins-scripts/Makefile.in.orig 2020-03-12 01:58:00.000000000 +0900 ++++ plugins-scripts/Makefile.in 2023-01-09 08:50:02.651881773 +0900 +@@ -1348,17 +1348,12 @@ + 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 \ +- check_ssl_validity \ +- 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 \ +- check_ssl_validity.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' \ Index: pkgsrc/net/nagios-plugins/patches/patch-plugins-scripts_check_breeze.pl diff -u /dev/null pkgsrc/net/nagios-plugins/patches/patch-plugins-scripts_check_breeze.pl:1.1 --- /dev/null Mon Jan 9 00:28:42 2023 +++ pkgsrc/net/nagios-plugins/patches/patch-plugins-scripts_check_breeze.pl Mon Jan 9 00:28:41 2023 @@ -0,0 +1,15 @@ +$NetBSD: patch-plugins-scripts_check_breeze.pl,v 1.1 2023/01/09 00:28:41 sekiya Exp $ + +Fix path to snmpget. + +--- plugins-scripts/check_breeze.pl.orig 2017-01-17 02:24:03.000000000 +0900 ++++ plugins-scripts/check_breeze.pl 2023-01-09 08:51:25.244526777 +0900 +@@ -49,7 +49,7 @@ + ($opt_C) || ($opt_C = "public") ; + + my $sig=0; +-$sig = `/usr/bin/snmpget $host $opt_C .1.3.6.1.4.1.710.3.2.3.1.3.0`; ++$sig = `$utils::PATH_TO_SNMPGET -c $opt_C $host .1.3.6.1.4.1.710.3.2.3.1.3.0`; + my @test=split(/ /,$sig); + $sig=$test[2]; + $sig=int($sig); Index: pkgsrc/net/nagios-plugins/patches/patch-plugins-scripts_check_ntp.pl diff -u /dev/null pkgsrc/net/nagios-plugins/patches/patch-plugins-scripts_check_ntp.pl:1.1 --- /dev/null Mon Jan 9 00:28:42 2023 +++ pkgsrc/net/nagios-plugins/patches/patch-plugins-scripts_check_ntp.pl Mon Jan 9 00:28:41 2023 @@ -0,0 +1,14 @@ +$NetBSD: patch-plugins-scripts_check_ntp.pl,v 1.1 2023/01/09 00:28:41 sekiya Exp $ + +Unknown patch, please document. + +--- plugins-scripts/check_ntp.pl.orig 2019-12-05 06:53:08.000000000 +0900 ++++ plugins-scripts/check_ntp.pl 2023-01-09 08:50:43.177526601 +0900 +@@ -312,6 +312,7 @@ + } else { + $jitter_error = $ERRORS{'OK'}; + } ++ last; + } else { + print "No match!\n" if $verbose; + $jitter = '(not parsed)'; Index: pkgsrc/net/nagios-plugins/patches/patch-plugins-scripts_check_wave.pl diff -u /dev/null pkgsrc/net/nagios-plugins/patches/patch-plugins-scripts_check_wave.pl:1.1 --- /dev/null Mon Jan 9 00:28:42 2023 +++ pkgsrc/net/nagios-plugins/patches/patch-plugins-scripts_check_wave.pl Mon Jan 9 00:28:41 2023 @@ -0,0 +1,88 @@ +$NetBSD: patch-plugins-scripts_check_wave.pl,v 1.1 2023/01/09 00:28:41 sekiya Exp $ + +Fix path to snmpget. + +--- plugins-scripts/check_wave.pl.orig 2019-12-05 06:53:08.000000000 +0900 ++++ plugins-scripts/check_wave.pl 2023-01-09 08:59:45.230098438 +0900 +@@ -9,7 +9,7 @@ + use utils qw($TIMEOUT %ERRORS &print_revision &support); + use vars qw($PROGNAME); + use Getopt::Long; +-use vars qw($opt_V $opt_h $verbose $opt_w $opt_c $opt_H); ++use vars qw($opt_V $opt_h $verbose $opt_w $opt_c $opt_H $opt_C); + my (@test, $low1, $med1, $high1, $snr, $low2, $med2, $high2); + my ($low, $med, $high, $lowavg, $medavg, $highavg, $tot, $ss); + +@@ -29,7 +29,8 @@ + "v" => \$verbose, "verbose" => \$verbose, + "w=s" => \$opt_w, "warning=s" => \$opt_w, + "c=s" => \$opt_c, "critical=s" => \$opt_c, +- "H=s" => \$opt_H, "hostname=s" => \$opt_H); ++ "H=s" => \$opt_H, "hostname=s" => \$opt_H, ++ "C=s" => \$opt_C, "community=s" => \$opt_C); + + if ($opt_V) { + print_revision($PROGNAME,'@NP_VERSION@'); #' +@@ -42,6 +43,7 @@ + } + + $opt_H = shift unless ($opt_H); ++$opt_C = "public" unless ($opt_C); + unless ($opt_H) { print_usage(); exit -1; } + my $host = $1 if ($opt_H =~ m/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+|[a-zA-Z][-a-zA-Z0]+(\.[a-zA-Z][-a-zA-Z0]+)*)$/); + unless ($host) { print_usage(); exit -1; } +@@ -52,7 +54,7 @@ + ($opt_w) || ($opt_w = shift) || ($opt_w = 60); + my $warning = $1 if ($opt_w =~ /([0-9]+)/); + +-$low1 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.8.1 2>/dev/null`; ++$low1 = `$utils::PATH_TO_SNMPGET -c $opt_C $host .1.3.6.1.4.1.74.2.21.1.2.1.8.1 2>/dev/null`; + unless ($low1) { + print "UNKNOWN - Could not find the 'snmpget' command Please install\n"; + print "the snmp commands (usually net-snmp) before using $PROGNAME\n"; +@@ -61,30 +63,30 @@ + @test = split(/ /,$low1); + $low1 = $test[2]; + +-$med1 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.9.1`; ++$med1 = `$utils::PATH_TO_SNMPGET -c $opt_C $host .1.3.6.1.4.1.74.2.21.1.2.1.9.1`; + @test = split(/ /,$med1); + $med1 = $test[2]; + +-$high1 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.10.1`; ++$high1 = `$utils::PATH_TO_SNMPGET -c $opt_C $host .1.3.6.1.4.1.74.2.21.1.2.1.10.1`; + @test = split(/ /,$high1); + $high1 = $test[2]; + + sleep(2); + +-$snr = `snmpget $host public .1.3.6.1.4.1.762.2.5.2.1.17.1`; ++$snr = `$utils::PATH_TO_SNMPGET -c $opt_C $host .1.3.6.1.4.1.762.2.5.2.1.17.1`; + @test = split(/ /,$snr); + $snr = $test[2]; + $snr = int($snr*25); + +-$low2 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.8.1`; ++$low2 = `$utils::PATH_TO_SNMPGET -c $opt_C $host .1.3.6.1.4.1.74.2.21.1.2.1.8.1`; + @test = split(/ /,$low2); + $low2 = $test[2]; + +-$med2 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.9.1`; ++$med2 = `$utils::PATH_TO_SNMPGET -c $opt_C $host .1.3.6.1.4.1.74.2.21.1.2.1.9.1`; + @test = split(/ /,$med2); + $med2 = $test[2]; + +-$high2 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.10.1`; ++$high2 = `$utils::PATH_TO_SNMPGET -c $opt_C $host .1.3.6.1.4.1.74.2.21.1.2.1.10.1`; + @test = split(/ /,$high2); + $high2 = $test[2]; + +@@ -115,7 +117,7 @@ + + + sub print_usage () { +- print "Usage: $PROGNAME -H [-w ] [-c ]\n"; ++ print "Usage: $PROGNAME -H [-C ] [-w ] [-c ]\n"; + } + + sub print_help () { Index: pkgsrc/net/nagios-plugins/patches/patch-plugins_Makefile.in diff -u /dev/null pkgsrc/net/nagios-plugins/patches/patch-plugins_Makefile.in:1.1 --- /dev/null Mon Jan 9 00:28:42 2023 +++ pkgsrc/net/nagios-plugins/patches/patch-plugins_Makefile.in Mon Jan 9 00:28:41 2023 @@ -0,0 +1,24 @@ +$NetBSD: patch-plugins_Makefile.in,v 1.1 2023/01/09 00:28:41 sekiya Exp $ + +Exclude specific plugins. + +--- plugins/Makefile.in.orig 2020-03-12 01:58:00.000000000 +0900 ++++ plugins/Makefile.in 2023-01-09 08:50:13.328391141 +0900 +@@ -33,7 +33,7 @@ + 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) \ +@@ -2253,7 +2253,7 @@ + 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) Index: pkgsrc/net/nagios-plugins/patches/patch-plugins_check_radius.c diff -u /dev/null pkgsrc/net/nagios-plugins/patches/patch-plugins_check_radius.c:1.1 --- /dev/null Mon Jan 9 00:28:42 2023 +++ pkgsrc/net/nagios-plugins/patches/patch-plugins_check_radius.c Mon Jan 9 00:28:41 2023 @@ -0,0 +1,15 @@ +$NetBSD: patch-plugins_check_radius.c,v 1.1 2023/01/09 00:28:41 sekiya Exp $ + +Support radius config. + +--- plugins/check_radius.c.orig 2019-12-05 06:53:08.000000000 +0900 ++++ plugins/check_radius.c 2023-01-09 08:53:32.981542458 +0900 +@@ -99,7 +99,7 @@ + char *nasipaddress = NULL; + char *castid = NULL; + char *expect = NULL; +-char *config_file = NULL; ++char *config_file = "@SYSCONFDIR@/radiusclient-ng/radiusclient.conf"; + unsigned short port = PW_AUTH_UDP_PORT; + int retries = 1; + int verbose = FALSE; Index: pkgsrc/net/nagios-plugins/patches/patch-plugins_check_swap.c diff -u /dev/null pkgsrc/net/nagios-plugins/patches/patch-plugins_check_swap.c:1.1 --- /dev/null Mon Jan 9 00:28:42 2023 +++ pkgsrc/net/nagios-plugins/patches/patch-plugins_check_swap.c Mon Jan 9 00:28:41 2023 @@ -0,0 +1,17 @@ +$NetBSD: patch-plugins_check_swap.c,v 1.1 2023/01/09 00:28:41 sekiya Exp $ + +Disable large file support when building 32bit on SunOS. + +--- plugins/check_swap.c.orig 2019-12-05 06:53:08.000000000 +0900 ++++ plugins/check_swap.c 2023-01-09 08:53:18.345470217 +0900 +@@ -35,6 +35,10 @@ + #include "popen.h" + #include "utils.h" + ++#if defined(__sun) && !defined(_LP64) && _FILE_OFFSET_BITS == 64 ++#undef _FILE_OFFSET_BITS ++#endif ++ + #ifdef HAVE_DECL_SWAPCTL + # ifdef HAVE_SYS_PARAM_H + # include Index: pkgsrc/net/nagios-plugins/patches/patch-plugins_check_ide_smart.c diff -u /dev/null pkgsrc/net/nagios-plugins/patches/patch-plugins_check_ide_smart.c:1.3 --- /dev/null Mon Jan 9 00:28:42 2023 +++ pkgsrc/net/nagios-plugins/patches/patch-plugins_check_ide_smart.c Mon Jan 9 00:28:41 2023 @@ -0,0 +1,22 @@ +$NetBSD: patch-plugins_check_ide_smart.c,v 1.3 2023/01/09 00:28:41 sekiya Exp $ + +__u8 and __u16 are not defined in videoio.h in NetBSD 9.99.x. + +--- plugins/check_ide_smart.c.orig 2019-12-05 06:53:08.000000000 +0900 ++++ plugins/check_ide_smart.c 2023-01-09 08:53:27.415335124 +0900 +@@ -56,11 +56,14 @@ + #include + #include + #include +-#include /* for __u8 and friends */ + #include + #include + #include + #include ++#include ++ ++#define __u8 uint8_t ++#define __u16 uint16_t + + #define SMART_ENABLE WDSM_ENABLE_OPS + #define SMART_DISABLE WDSM_DISABLE_OPS --_----------=_1673224122271280--