CVS commit: pkgsrc/net/nagios-base

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Mar 17 11:51:34 UTC 2023

Modified Files:
        pkgsrc/net/nagios-base: Makefile distinfo options.mk
        pkgsrc/net/nagios-base/patches: patch-base_events.c

Log Message:
nagios-base: Update to 4.4.10.

Primarily came here to fix builds on systems where SSL is not in base, as the
configure script aborts if it can't find SSL, however we might as well update
to the latest version while here.  SSL support is now properly optional.

4.4.10 - 2023-01-17
-------------------
FIXES
* Fix memory leak in nagiostats.c when using -c, -s, -d, or -D multiple times (#888)
* Improve service scheduling at startup (#887)
* Improve compilation/reduce warnings when using Clang 16 (#889)
* Improve compilation on other, stricter C99 compilers (#890)


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 pkgsrc/net/nagios-base/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/net/nagios-base/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/nagios-base/options.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/nagios-base/patches/patch-base_events.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/nagios-base/Makefile
diff -u pkgsrc/net/nagios-base/Makefile:1.89 pkgsrc/net/nagios-base/Makefile:1.90
--- pkgsrc/net/nagios-base/Makefile:1.89        Sun Jan 29 21:17:29 2023
+++ pkgsrc/net/nagios-base/Makefile     Fri Mar 17 11:51:34 2023
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.89 2023/01/29 21:17:29 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.90 2023/03/17 11:51:34 jperkin Exp $
 
-DISTNAME=              nagios-4.4.9
+DISTNAME=              nagios-4.4.10
 PKGNAME=               ${DISTNAME:S/-/-base-/}
-PKGREVISION=           2
 CATEGORIES=            net sysutils
 DISTFILES=             ${DISTNAME}${EXTRACT_SUFX}
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=nagios/}

Index: pkgsrc/net/nagios-base/distinfo
diff -u pkgsrc/net/nagios-base/distinfo:1.36 pkgsrc/net/nagios-base/distinfo:1.37
--- pkgsrc/net/nagios-base/distinfo:1.36        Mon Jan  9 04:29:12 2023
+++ pkgsrc/net/nagios-base/distinfo     Fri Mar 17 11:51:34 2023
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.36 2023/01/09 04:29:12 sekiya Exp $
+$NetBSD: distinfo,v 1.37 2023/03/17 11:51:34 jperkin Exp $
 
-BLAKE2s (nagios-4.4.9.tar.gz) = 738b4b0f1aea7558d8197a11d0b6d03c7491bb5cdc9d9e52f6d0cb0a00bd534e
-SHA512 (nagios-4.4.9.tar.gz) = 59279cd35f329394481e4b3d3f5c3e2418125adeef98f0a8551c2ccf62720459e54c18f8a914be72fb5c2300ab7a69e115f262bfe3aedcf7226380621b32cd8c
-Size (nagios-4.4.9.tar.gz) = 11339450 bytes
+BLAKE2s (nagios-4.4.10.tar.gz) = e73fd421ed9974cf0500630b0c9af15a4507722c221a375bf2f1d281cbc6c84e
+SHA512 (nagios-4.4.10.tar.gz) = fc8d8203d53c4ec87a831cec0564c9bdb553a43675b974616ce6444340b2170b82091259d495b458ab57b0cce0ab23ab30df09b05d71107ff264462c0ebb37fc
+Size (nagios-4.4.10.tar.gz) = 11339491 bytes
 BLAKE2s (nagios-netbsd40-icons.tar.gz) = f2b36e2dd9753ea56a0e531b047800166e84910f11ca4134daf498c7f36b5a82
 SHA512 (nagios-netbsd40-icons.tar.gz) = 27cd564ef6dbe076b43dc2207f8f4f49bfb575f216e90d03a157208e57e23930c1e5915353406f09bd762ad11e6306625544292bd919f8524a2239aac758afb1
 Size (nagios-netbsd40-icons.tar.gz) = 5659 bytes
 SHA1 (patch-Makefile.in) = 12f06a27510f8a082d0c3780e3f5fe0f9cd74c1c
 SHA1 (patch-base_Makefile.in) = 77d69a521983a0dedb7cfdc84ef6b92b9a14c3b4
 SHA1 (patch-base_checks.c) = cbc58f44597d5971ee5a8d061b38d8a81bf8cc7e
-SHA1 (patch-base_events.c) = c67a781cee688a527fb2d5cc39e6481b8cf6caf2
+SHA1 (patch-base_events.c) = c52d07cfc1a6a5579bb13b55ef7f124297d37471
 SHA1 (patch-base_logging.c) = 9cafe98c56c80e47b15ed8593fabc614eea8bcc9
 SHA1 (patch-base_nerd.c) = c000dfbda459083a551955250588ec36fb1e6715
 SHA1 (patch-cgi_Makefile.in) = 3b79d2b8f9c52aee6b6fd76409607cac83893d7d

Index: pkgsrc/net/nagios-base/options.mk
diff -u pkgsrc/net/nagios-base/options.mk:1.2 pkgsrc/net/nagios-base/options.mk:1.3
--- pkgsrc/net/nagios-base/options.mk:1.2       Mon Jul 21 00:35:42 2008
+++ pkgsrc/net/nagios-base/options.mk   Fri Mar 17 11:51:34 2023
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2008/07/21 00:35:42 tonnerre Exp $
+# $NetBSD: options.mk,v 1.3 2023/03/17 11:51:34 jperkin Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.nagios-base
-PKG_SUPPORTED_OPTIONS= mysql pgsql
+PKG_SUPPORTED_OPTIONS= mysql pgsql ssl
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mmysql)
@@ -17,3 +18,10 @@ CONFIGURE_ARGS+=     --with-pgsql-lib=${PREF
                        --with-pgsql-xdata
 .include "../../mk/pgsql.buildlink3.mk"
 .endif
+
+.if ${PKG_OPTIONS:Mssl}
+CONFIGURE_ARGS+=       --with-ssl=${BUILDLINK_PREFIX.openssl}
+.include "../../security/openssl/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-ssl
+.endif

Index: pkgsrc/net/nagios-base/patches/patch-base_events.c
diff -u pkgsrc/net/nagios-base/patches/patch-base_events.c:1.3 pkgsrc/net/nagios-base/patches/patch-base_events.c:1.4
--- pkgsrc/net/nagios-base/patches/patch-base_events.c:1.3      Sun Jan  8 23:33:59 2023
+++ pkgsrc/net/nagios-base/patches/patch-base_events.c  Fri Mar 17 11:51:34 2023
@@ -1,19 +1,19 @@
-$NetBSD: patch-base_events.c,v 1.3 2023/01/08 23:33:59 sekiya Exp $
+$NetBSD: patch-base_events.c,v 1.4 2023/03/17 11:51:34 jperkin Exp $
 
 64-bit time_t workaround
 
---- base/events.c.orig 2022-11-17 05:52:51.000000000 +0900
-+++ base/events.c      2023-01-09 06:59:11.773902761 +0900
-@@ -354,7 +354,7 @@
+--- base/events.c.orig 2023-01-17 19:26:16.000000000 +0000
++++ base/events.c
+@@ -354,7 +354,7 @@ void init_timing_loop(void) {
                        if(check_delay > check_window(temp_service)) {
                                log_debug_info(DEBUGL_EVENTS, 0,
                                                "  Fixing check time %lu secs too far away\n",
 -                                              check_delay - check_window(temp_service));
 +                                              (unsigned long)(check_delay - check_window(temp_service)));
                                fixed_services++;
-                               check_delay = check_window(temp_service);
+                               check_delay = ranged_urand(0, check_window(temp_service));
                                log_debug_info(DEBUGL_EVENTS, 0, "  New check offset: %d\n",
-@@ -506,7 +506,7 @@
+@@ -506,7 +506,7 @@ void init_timing_loop(void) {
                check_delay = mult_factor * scheduling_info.host_inter_check_delay;
                if(check_delay > check_window(temp_host)) {
                        log_debug_info(DEBUGL_EVENTS, 1, "Fixing check time (off by %lu)\n",