Received: by mail.netbsd.org (Postfix, from userid 605) id 7B2DA84D41; Sun, 8 Jan 2023 23:34:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A8DF684D15 for ; Sun, 8 Jan 2023 23:34:03 +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 uoPkG676iIdC for ; Sun, 8 Jan 2023 23:33:59 +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 7B32784CEE for ; Sun, 8 Jan 2023 23:33:59 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 74459FA90; Sun, 8 Jan 2023 23:33:59 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1673220839155390" MIME-Version: 1.0 Date: Sun, 8 Jan 2023 23:33:59 +0000 From: "Christopher KOBAYASHI" Subject: CVS commit: pkgsrc/net/nagios-base To: pkgsrc-changes@NetBSD.org Reply-To: sekiya@netbsd.org X-Mailer: log_accum Message-Id: <20230108233359.74459FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1673220839155390 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: sekiya Date: Sun Jan 8 23:33:59 UTC 2023 Modified Files: pkgsrc/net/nagios-base: Makefile Makefile.common PLIST distinfo pkgsrc/net/nagios-base/patches: patch-Makefile.in patch-base_Makefile.in patch-base_checks.c patch-base_events.c patch-base_logging.c patch-base_nerd.c patch-cgi_Makefile.in patch-cgi_avail.c patch-cgi_cmd.c patch-cgi_getcgi.c patch-cgi_histogram.c patch-cgi_trends.c patch-common_downtime.c patch-configure patch-html_Makefile.in patch-include_locations.h.in patch-lib_runcmd.c patch-lib_test-squeue.c patch-lib_worker.c patch-sample-config_nagios.cfg.in Added Files: pkgsrc/net/nagios-base/patches: patch-startup_default-init.in Removed Files: pkgsrc/net/nagios-base/patches: patch-base_utils.c patch-common_Makefile.in patch-daemon-init.in Log Message: Update to 4.4.9 To generate a diff of this commit: cvs rdiff -u -r1.86 -r1.87 pkgsrc/net/nagios-base/Makefile cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/nagios-base/Makefile.common cvs rdiff -u -r1.19 -r1.20 pkgsrc/net/nagios-base/PLIST cvs rdiff -u -r1.34 -r1.35 pkgsrc/net/nagios-base/distinfo cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/nagios-base/patches/patch-Makefile.in \ pkgsrc/net/nagios-base/patches/patch-lib_worker.c cvs rdiff -u -r1.2 -r1.3 \ pkgsrc/net/nagios-base/patches/patch-base_Makefile.in \ pkgsrc/net/nagios-base/patches/patch-base_checks.c \ pkgsrc/net/nagios-base/patches/patch-base_events.c \ pkgsrc/net/nagios-base/patches/patch-base_nerd.c \ pkgsrc/net/nagios-base/patches/patch-cgi_Makefile.in \ pkgsrc/net/nagios-base/patches/patch-cgi_getcgi.c \ pkgsrc/net/nagios-base/patches/patch-common_downtime.c \ pkgsrc/net/nagios-base/patches/patch-configure \ pkgsrc/net/nagios-base/patches/patch-include_locations.h.in \ pkgsrc/net/nagios-base/patches/patch-lib_test-squeue.c \ pkgsrc/net/nagios-base/patches/patch-sample-config_nagios.cfg.in cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/nagios-base/patches/patch-base_logging.c \ pkgsrc/net/nagios-base/patches/patch-cgi_histogram.c cvs rdiff -u -r1.1 -r0 pkgsrc/net/nagios-base/patches/patch-base_utils.c \ pkgsrc/net/nagios-base/patches/patch-daemon-init.in cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/nagios-base/patches/patch-cgi_avail.c \ pkgsrc/net/nagios-base/patches/patch-cgi_trends.c \ pkgsrc/net/nagios-base/patches/patch-html_Makefile.in cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/nagios-base/patches/patch-cgi_cmd.c cvs rdiff -u -r1.2 -r0 \ pkgsrc/net/nagios-base/patches/patch-common_Makefile.in cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/nagios-base/patches/patch-lib_runcmd.c cvs rdiff -u -r0 -r1.1 \ pkgsrc/net/nagios-base/patches/patch-startup_default-init.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1673220839155390 Content-Disposition: inline Content-Length: 56207 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/nagios-base/Makefile diff -u pkgsrc/net/nagios-base/Makefile:1.86 pkgsrc/net/nagios-base/Makefile:1.87 --- pkgsrc/net/nagios-base/Makefile:1.86 Tue Jan 3 17:38:02 2023 +++ pkgsrc/net/nagios-base/Makefile Sun Jan 8 23:33:58 2023 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.86 2023/01/03 17:38:02 wiz Exp $ +# $NetBSD: Makefile,v 1.87 2023/01/08 23:33:58 sekiya Exp $ # -DISTNAME= nagios-4.3.2 +DISTNAME= nagios-4.4.9 PKGNAME= ${DISTNAME:S/-/-base-/} -PKGREVISION= 13 +#PKGREVISION= 1 CATEGORIES= net sysutils DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nagios/} @@ -25,18 +25,19 @@ USE_GCC_RUNTIME= yes CONFIGURE_ARGS+= --with-gd-lib=${PREFIX}/lib CONFIGURE_ARGS+= --with-gd-inc=${PREFIX}/include -CONFIGURE_ARGS+= --enable-embedded-perl -CONFIGURE_ARGS+= --with-perlcache CONFIGURE_ARGS+= --with-nagios-user=${NAGIOS_USER} CONFIGURE_ARGS+= --with-nagios-group=${NAGIOS_GROUP} CONFIGURE_ARGS+= --with-command-user=${NAGIOS_USER} CONFIGURE_ARGS+= --with-command-group=${NAGIOSCMD_GROUP} -CONFIGURE_ARGS+= --with-init-dir=${PREFIX}/share/examples/rc.d +CONFIGURE_ARGS+= --with-initdir=${PREFIX}/share/examples/rc.d CONFIGURE_ARGS+= --with-lockfile=/var/run/nagios/nagios.lock +CONFIGURE_ARGS+= --with-httpd-conf=${PREFIX}/etc/httpd/conf.d USE_TOOLS+= mail:run perl unzip +.if !empty(TOOLS_PLATFORM.mail) CONFIGURE_ARGS+= --with-mail=${TOOLS_PLATFORM.mail:Q} +.endif RCD_SCRIPTS+= nagios SMF_NAME= nagios Index: pkgsrc/net/nagios-base/Makefile.common diff -u pkgsrc/net/nagios-base/Makefile.common:1.13 pkgsrc/net/nagios-base/Makefile.common:1.14 --- pkgsrc/net/nagios-base/Makefile.common:1.13 Mon Jun 1 05:54:16 2020 +++ pkgsrc/net/nagios-base/Makefile.common Sun Jan 8 23:33:58 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.13 2020/06/01 05:54:16 rillig Exp $ +# $NetBSD: Makefile.common,v 1.14 2023/01/08 23:33:58 sekiya Exp $ # # used by net/nagios-base/Makefile # used by net/nagios-nsca/Makefile @@ -17,6 +17,7 @@ PKG_SYSCONFSUBDIR= nagios PERL5_REQD= 5.6 +CONFIGURE_ARGS+= --with-cgibindir=${PREFIX}/libexec/nagios/cgi-bin CONFIGURE_ARGS+= --libexecdir=${PREFIX}/libexec/nagios .if ${PKGPATH} != "net/nagios-nsca" CONFIGURE_ARGS+= --datadir=${PREFIX}/share/nagios Index: pkgsrc/net/nagios-base/PLIST diff -u pkgsrc/net/nagios-base/PLIST:1.19 pkgsrc/net/nagios-base/PLIST:1.20 --- pkgsrc/net/nagios-base/PLIST:1.19 Wed May 24 07:42:39 2017 +++ pkgsrc/net/nagios-base/PLIST Sun Jan 8 23:33:58 2023 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.19 2017/05/24 07:42:39 manu Exp $ +@comment $NetBSD: PLIST,v 1.20 2023/01/08 23:33:58 sekiya Exp $ bin/nagios bin/nagiostats libexec/nagios/cgi-bin/archivejson.cgi @@ -34,10 +34,10 @@ share/examples/nagios/objects/windows.cf share/examples/nagios/resource.cfg-sample share/nagios/angularjs/angular-1.3.9/angular.min.js share/nagios/angularjs/angular-1.3.9/angular.min.js.map -share/nagios/angularjs/ui-bootstrap-tpls-0.12.0.min.js -share/nagios/angularjs/ui-utils-0.2.1/ui-utils.js -share/nagios/bootstrap-3.3.0/css/bootstrap-theme.min.css -share/nagios/bootstrap-3.3.0/css/bootstrap.min.css +share/nagios/angularjs/ui-bootstrap-tpls-0.14.3.min.js +share/nagios/angularjs/ui-utils-0.2.3/ui-utils.js +share/nagios/bootstrap-3.3.7/css/bootstrap-theme.min.css +share/nagios/bootstrap-3.3.7/css/bootstrap.min.css share/nagios/config.inc.php share/nagios/contexthelp/A1.html share/nagios/contexthelp/A2.html @@ -378,7 +378,7 @@ share/nagios/js/histogram-events.js share/nagios/js/histogram-form.js share/nagios/js/histogram-graph.js share/nagios/js/histogram.js -share/nagios/js/jquery-1.7.1.min.js +share/nagios/js/jquery-1.12.4.min.js share/nagios/js/jsonquery.js share/nagios/js/map-directive.js share/nagios/js/map-form.js Index: pkgsrc/net/nagios-base/distinfo diff -u pkgsrc/net/nagios-base/distinfo:1.34 pkgsrc/net/nagios-base/distinfo:1.35 --- pkgsrc/net/nagios-base/distinfo:1.34 Tue Oct 26 11:06:02 2021 +++ pkgsrc/net/nagios-base/distinfo Sun Jan 8 23:33:58 2023 @@ -1,31 +1,29 @@ -$NetBSD: distinfo,v 1.34 2021/10/26 11:06:02 nia Exp $ +$NetBSD: distinfo,v 1.35 2023/01/08 23:33:58 sekiya Exp $ -BLAKE2s (nagios-4.3.2.tar.gz) = 2b996e68902ba89582a686fe47c25cb400c06b2ace7e5208c36d2060248f134f -SHA512 (nagios-4.3.2.tar.gz) = 679e76f7a232b9b0dbbc2697f51b58d09ae3d3833e0e6922bb39d90768c81f2eb09b9ab36b7fdaeca893cebd93fc1edc1232f245498d4420980ba4659df60a31 -Size (nagios-4.3.2.tar.gz) = 11096863 bytes +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-netbsd40-icons.tar.gz) = f2b36e2dd9753ea56a0e531b047800166e84910f11ca4134daf498c7f36b5a82 SHA512 (nagios-netbsd40-icons.tar.gz) = 27cd564ef6dbe076b43dc2207f8f4f49bfb575f216e90d03a157208e57e23930c1e5915353406f09bd762ad11e6306625544292bd919f8524a2239aac758afb1 Size (nagios-netbsd40-icons.tar.gz) = 5659 bytes -SHA1 (patch-Makefile.in) = 0bf706869847ad100a809f47c2415eb30e9db098 -SHA1 (patch-base_Makefile.in) = 2b0162bb4d395b1d529f5fc1fdf9eab3ddaeb161 -SHA1 (patch-base_checks.c) = 9c5fb7a8f085eed2fb31ad623eeed22596c6c168 -SHA1 (patch-base_events.c) = 6b659c6980c69ab1947d7a829c87482f53ed817e -SHA1 (patch-base_logging.c) = e0efd9dc51dd9f726ada11c6e7745e1cd9755bc9 -SHA1 (patch-base_nerd.c) = 4105d3a56999077688e42c9c771e76461fe00785 -SHA1 (patch-base_utils.c) = aaf6396ec4f8454a3f4a8e92a4881c32ff331dc0 -SHA1 (patch-cgi_Makefile.in) = 25c22914986c0b781f5dd665a7a53778e1031a63 -SHA1 (patch-cgi_avail.c) = 44b4b0f9eaf43dd35ea6c048b6fc1dbb295c7aeb -SHA1 (patch-cgi_cmd.c) = edbf60422c4f36f045e97b27494bc7307c60143e -SHA1 (patch-cgi_getcgi.c) = 3af474de4f4281f18a306f7d618ff532d0a9ca9e -SHA1 (patch-cgi_histogram.c) = 4b9f583ec4579d5c5399ad1b7102511c0282b8bc -SHA1 (patch-cgi_trends.c) = 89188c74665522cc317ab1098746a0245f572dc8 -SHA1 (patch-common_Makefile.in) = 7fa093a6109dfa03f9b97e4312d3a09e3235f00f -SHA1 (patch-common_downtime.c) = 000f1e33ab1ca1c433c3fd0de3d5bf750df6f57f -SHA1 (patch-configure) = f57db3a43c1abc1aa0d6fe007308089c620624a4 -SHA1 (patch-daemon-init.in) = 1e50bb84fde9780d5b13edb4e232c0e3a90ac3f4 -SHA1 (patch-html_Makefile.in) = e35b082215189c4fa552b56fc8f8a3ec8664e95b -SHA1 (patch-include_locations.h.in) = 0ee376f6737b24f0d4ea8b37781aca70147c5e70 -SHA1 (patch-lib_runcmd.c) = fb34fe5cdc39aca973c1a6e125b125867e6ed262 -SHA1 (patch-lib_test-squeue.c) = 1bc197da815a069f0f37525f1acbf5fb4110d399 -SHA1 (patch-lib_worker.c) = af2b8034016f0c4736a672b5cb285a2960b9f2e6 -SHA1 (patch-sample-config_nagios.cfg.in) = 4ad00840ad66d2e01b19c6db76c810fc3fb80795 +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_logging.c) = 0427dfc6f38c7c04f30d8ce99c35ef6f66fbd6b5 +SHA1 (patch-base_nerd.c) = c000dfbda459083a551955250588ec36fb1e6715 +SHA1 (patch-cgi_Makefile.in) = 3b79d2b8f9c52aee6b6fd76409607cac83893d7d +SHA1 (patch-cgi_avail.c) = 1689eb09fb3213c61a9490a33ddac2d09e32e8ce +SHA1 (patch-cgi_cmd.c) = 7f6305e76e4c0a1c73628253f3740ac2e122f56a +SHA1 (patch-cgi_getcgi.c) = c02c91ce905531178829b507b2241e29ed5e3b5a +SHA1 (patch-cgi_histogram.c) = dbf49782012e382cbc25f19c7d9c96488d86a7d2 +SHA1 (patch-cgi_trends.c) = a95d3e5d03fdf785f83cd03d0c71887fe6c81018 +SHA1 (patch-common_downtime.c) = 0b9d81eca4ba241f845f2d0cb7cad2ec48650d38 +SHA1 (patch-configure) = 9ce5df1b0fc6c3782ffe6e9016425c2136406aab +SHA1 (patch-html_Makefile.in) = f5087d3f46bb34dc4a5b463c75492ee557671fb8 +SHA1 (patch-include_locations.h.in) = 78e143375843edc4d1eb46170245c1795ff72d78 +SHA1 (patch-lib_runcmd.c) = ba546b7186218d58d2daef539055c8102b807fe3 +SHA1 (patch-lib_test-squeue.c) = 22ad45d64734ff2a5943780d3741fb2cc24998e0 +SHA1 (patch-lib_worker.c) = 88e5e416265f0d972e1d9cd5e4f23e646ccbdcbd +SHA1 (patch-sample-config_nagios.cfg.in) = 0d5415dc42092d0a024fcb5e8b2d415903cbc5a4 +SHA1 (patch-startup_default-init.in) = 4c88148c11c6175e988559c024192ed125e8c283 Index: pkgsrc/net/nagios-base/patches/patch-Makefile.in diff -u pkgsrc/net/nagios-base/patches/patch-Makefile.in:1.3 pkgsrc/net/nagios-base/patches/patch-Makefile.in:1.4 --- pkgsrc/net/nagios-base/patches/patch-Makefile.in:1.3 Wed May 24 07:42:39 2017 +++ pkgsrc/net/nagios-base/patches/patch-Makefile.in Sun Jan 8 23:33:59 2023 @@ -1,35 +1,27 @@ -$NetBSD: patch-Makefile.in,v 1.3 2017/05/24 07:42:39 manu Exp $ +$NetBSD: patch-Makefile.in,v 1.4 2023/01/08 23:33:59 sekiya Exp $ Adjustments to build procedure. ---- Makefile.in.orig 2017-05-09 19:03:31.000000000 +0200 -+++ Makefile.in 2017-05-22 04:04:17.000000000 +0200 -@@ -24,11 +24,11 @@ - prefix=@prefix@ +--- Makefile.in.orig 2022-11-17 05:52:51.000000000 +0900 ++++ Makefile.in 2023-01-09 07:31:28.044621790 +0900 +@@ -25,7 +25,7 @@ exec_prefix=@exec_prefix@ LOGDIR=@localstatedir@ CHECKRESULTDIR=@CHECKRESULTDIR@ -CFGDIR=@sysconfdir@ +SAMPDIR=@prefix@/share/examples/nagios BINDIR=@bindir@ --CGIDIR=@sbindir@ -+CGIDIR=@libexecdir@ + CGIDIR=@cgibindir@ LIBEXECDIR=@libexecdir@ - LIBDIR=@libdir@ - INCLUDEDIR=@includedir@/nagios - HTMLDIR=@datadir@ -@@ -36,9 +36,8 @@ - LN_S=@LN_S@ +@@ -37,7 +37,6 @@ INSTALL=@INSTALL@ INSTALL_OPTS=@INSTALL_OPTS@ COMMAND_OPTS=@COMMAND_OPTS@ -HTTPD_CONF=@HTTPD_CONF@ LN_HTTPD_SITES_ENABLED=@LN_HTTPD_SITES_ENABLED@ - INIT_DIR=@init_dir@ + INIT_DIR=@initdir@ INIT_OPTS=@INIT_OPTS@ - CGICFGDIR=$(CGIDIR) -@@ -72,77 +71,8 @@ - all: +@@ -88,85 +87,6 @@ cd $(SRC_BASE) && $(MAKE) cd $(SRC_CGI) && $(MAKE) cd $(SRC_HTM) && $(MAKE) @@ -42,8 +34,11 @@ Adjustments to build procedure. - @echo "*** Compile finished ***" - @echo "" - @echo "If the main program and CGIs compiled without any errors, you" -- @echo "can continue with installing Nagios as follows (type 'make'" -- @echo "without any arguments for a list of all possible options):" +- @echo "can continue with testing or installing Nagios as follows (type" +- @echo "'make' without any arguments for a list of all possible options):" +- @echo "" +- @echo " make test" +- @echo " - This runs the test suite" - @echo "" - @echo " make install" - @echo " - This installs the main program, CGIs, and HTML files" @@ -51,6 +46,13 @@ Adjustments to build procedure. - @echo " make install-init" - @echo " - This installs the init script in $(DESTDIR)$(INIT_DIR)" - @echo "" +- @echo " make install-daemoninit" +- @echo " - This will initialize the init script" +- @echo " in $(DESTDIR)$(INIT_DIR)" +- @echo "" +- @echo " make install-groups-users" +- @echo " - This adds the users and groups if they do not exist" +- @echo "" - @echo " make install-commandmode" - @echo " - This installs and configures permissions on the" - @echo " directory for holding the external command file" @@ -105,9 +107,7 @@ Adjustments to build procedure. $(SRC_LIB)/libnagios.a: cd $(SRC_LIB) && $(MAKE) - -@@ -246,13 +176,8 @@ - $(MAKE) install-exfoliation +@@ -287,11 +207,6 @@ $(MAKE) install-basic install-basic: @@ -119,10 +119,8 @@ Adjustments to build procedure. @echo "" @echo "*** Main program, CGIs and HTML files installed ***" +@@ -311,19 +226,19 @@ @echo "" -@@ -271,22 +196,22 @@ - @echo "" - install-config: - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR) @@ -138,7 +136,6 @@ Adjustments to build procedure. - $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/windows.cfg $(DESTDIR)$(CFGDIR)/objects/windows.cfg - $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/printer.cfg $(DESTDIR)$(CFGDIR)/objects/printer.cfg - $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/switch.cfg $(DESTDIR)$(CFGDIR)/objects/switch.cfg -- + [ -d $(DESTDIR)$(SAMPDIR) ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(SAMPDIR) + [ -d $(DESTDIR)$(SAMPDIR)/objects ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(SAMPDIR)/objects + ${BSD_INSTALL_DATA} -m 644 sample-config/nagios.cfg $(DESTDIR)$(SAMPDIR)/nagios.cfg-sample @@ -152,13 +149,10 @@ Adjustments to build procedure. + ${BSD_INSTALL_DATA} -m 644 sample-config/template-object/windows.cfg $(DESTDIR)$(SAMPDIR)/objects/windows.cfg-sample + ${BSD_INSTALL_DATA} -m 644 sample-config/template-object/printer.cfg $(DESTDIR)$(SAMPDIR)/objects/printer.cfg-sample + ${BSD_INSTALL_DATA} -m 644 sample-config/template-object/switch.cfg $(DESTDIR)$(SAMPDIR)/objects/switch.cfg-sample -+ + @echo "" @echo "*** Config files installed ***" - @echo "" - @echo "Remember, these are *SAMPLE* config files. You'll need to read" -@@ -305,15 +230,15 @@ - @echo "" +@@ -348,13 +263,13 @@ install-exfoliation: @cd contrib/exfoliation; \ @@ -176,9 +170,7 @@ Adjustments to build procedure. done; \ cd ../.. - @echo "" -@@ -349,9 +274,12 @@ - @echo "" +@@ -413,7 +328,10 @@ install-commandmode: @@ -190,4 +182,3 @@ Adjustments to build procedure. chmod g+s $(DESTDIR)$(LOGDIR)/rw @echo "" - @echo "*** External command directory configured ***" Index: pkgsrc/net/nagios-base/patches/patch-lib_worker.c diff -u pkgsrc/net/nagios-base/patches/patch-lib_worker.c:1.3 pkgsrc/net/nagios-base/patches/patch-lib_worker.c:1.4 --- pkgsrc/net/nagios-base/patches/patch-lib_worker.c:1.3 Wed May 24 07:42:39 2017 +++ pkgsrc/net/nagios-base/patches/patch-lib_worker.c Sun Jan 8 23:33:59 2023 @@ -1,11 +1,10 @@ -$NetBSD: patch-lib_worker.c,v 1.3 2017/05/24 07:42:39 manu Exp $ +$NetBSD: patch-lib_worker.c,v 1.4 2023/01/08 23:33:59 sekiya Exp $ -64bit time_t workaround +64-bit time_t workaround ---- lib/worker.c.orig 2017-05-22 09:36:34.000000000 +0200 -+++ lib/worker.c 2017-05-22 09:35:40.000000000 +0200 -@@ -303,16 +303,16 @@ - } +--- lib/worker.c.orig 2022-11-17 05:52:51.000000000 +0900 ++++ lib/worker.c 2023-01-09 07:17:21.535874106 +0900 +@@ -304,8 +304,8 @@ kvvec_addkv_wlen(&resp, kv->key, kv->key_len, kv->value, kv->value_len); } kvvec_addkv(&resp, "wait_status", mkstr("%d", cp->ret)); @@ -15,13 +14,4 @@ $NetBSD: patch-lib_worker.c,v 1.3 2017/0 + kvvec_add_tv(&resp, "stop", (unsigned long)cp->ei->stop); kvvec_addkv(&resp, "runtime", mkstr("%f", cp->ei->runtime)); if (!reason) { - /* child exited nicely (or with a signal, so check wait_status) */ - kvvec_addkv(&resp, "exited_ok", "1"); -- kvvec_add_tv(&resp, "ru_utime", ru->ru_utime); -- kvvec_add_tv(&resp, "ru_stime", ru->ru_stime); -+ kvvec_add_tv(&resp, "ru_utime", (unsigned long)ru->ru_utime); -+ kvvec_add_tv(&resp, "ru_stime", (unsigned long)ru->ru_stime); - kvvec_add_long(&resp, "ru_minflt", ru->ru_minflt); - kvvec_add_long(&resp, "ru_majflt", ru->ru_majflt); - kvvec_add_long(&resp, "ru_inblock", ru->ru_inblock); - kvvec_add_long(&resp, "ru_oublock", ru->ru_oublock); + /* child exited nicely */ Index: pkgsrc/net/nagios-base/patches/patch-base_Makefile.in diff -u pkgsrc/net/nagios-base/patches/patch-base_Makefile.in:1.2 pkgsrc/net/nagios-base/patches/patch-base_Makefile.in:1.3 --- pkgsrc/net/nagios-base/patches/patch-base_Makefile.in:1.2 Fri Apr 3 17:06:08 2015 +++ pkgsrc/net/nagios-base/patches/patch-base_Makefile.in Sun Jan 8 23:33:59 2023 @@ -1,28 +1,26 @@ -$NetBSD: patch-base_Makefile.in,v 1.2 2015/04/03 17:06:08 rodent Exp $ +$NetBSD: patch-base_Makefile.in,v 1.3 2023/01/08 23:33:59 sekiya Exp $ Adjustments to build procedure. ---- base/Makefile.in.orig 2014-08-12 15:00:01.000000000 +0000 -+++ base/Makefile.in -@@ -36,7 +36,7 @@ exec_prefix=@exec_prefix@ - LOGDIR=@localstatedir@ - CFGDIR=@sysconfdir@ - BINDIR=@bindir@ --CGIDIR=@sbindir@ -+CGIDIR=@libexecdir@ - HTMLDIR=@datarootdir@ - INSTALL=@INSTALL@ - INSTALL_OPTS=@INSTALL_OPTS@ -@@ -180,9 +180,9 @@ install-unstripped: - $(MAKE) install-basic +--- base/Makefile.in.orig 2022-11-17 05:52:51.000000000 +0900 ++++ base/Makefile.in 2023-01-09 06:58:52.616772187 +0900 +@@ -173,13 +173,13 @@ + rm -f wpres-phash.h - install-basic: + install: - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) -- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR) -- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR) +- $(INSTALL) -s -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR) +- $(INSTALL) -s -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR) + ${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(BINDIR) + ${BSD_INSTALL_PROGRAM} @nagios_name@ $(DESTDIR)$(BINDIR) + ${BSD_INSTALL_PROGRAM} @nagiostats_name@ $(DESTDIR)$(BINDIR) - strip-post-install: - $(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@ + install-unstripped: +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) +- $(INSTALL) -m 774 $(INSTALL_OPTS) nagios $(DESTDIR)$(BINDIR) +- $(INSTALL) -m 774 $(INSTALL_OPTS) nagiostats $(DESTDIR)$(BINDIR) ++ ${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(BINDIR) ++ ${BSD_INSTALL_PROGRAM} nagios $(DESTDIR)$(BINDIR) ++ ${BSD_INSTALL_PROGRAM} nagiostats $(DESTDIR)$(BINDIR) + + .PHONY: libnagios Index: pkgsrc/net/nagios-base/patches/patch-base_checks.c diff -u pkgsrc/net/nagios-base/patches/patch-base_checks.c:1.2 pkgsrc/net/nagios-base/patches/patch-base_checks.c:1.3 --- pkgsrc/net/nagios-base/patches/patch-base_checks.c:1.2 Tue Feb 9 10:12:53 2016 +++ pkgsrc/net/nagios-base/patches/patch-base_checks.c Sun Jan 8 23:33:59 2023 @@ -1,11 +1,11 @@ -$NetBSD: patch-base_checks.c,v 1.2 2016/02/09 10:12:53 bouyer Exp $ +$NetBSD: patch-base_checks.c,v 1.3 2023/01/08 23:33:59 sekiya Exp $ -64bit time_t workaround +64-bit time_t workaround ---- base/checks.c.orig 2016-02-07 21:52:43.000000000 +0100 -+++ base/checks.c 2016-02-07 21:54:09.000000000 +0100 -@@ -1320,12 +1320,12 @@ - if(expected_time < current_time) { +--- base/checks.c.orig 2022-11-17 05:52:51.000000000 +0900 ++++ base/checks.c 2023-01-09 06:59:06.794518822 +0900 +@@ -2027,12 +2027,12 @@ + if (expected_time < current_time) { /* log a warning */ - logit(NSLOG_RUNTIME_WARNING, TRUE, "Warning: The check of service '%s' on host '%s' looks like it was orphaned (results never came back; last_check=%lu; next_check=%lu). I'm scheduling an immediate check of the service...\n", temp_service->description, temp_service->host_name, temp_service->last_check, temp_service->next_check); @@ -19,4 +19,4 @@ $NetBSD: patch-base_checks.c,v 1.2 2016/ + (unsigned long)temp_service->last_check, ctime(&temp_service->last_check)); /* decrement the number of running service checks */ - if(currently_running_service_checks > 0) + if (currently_running_service_checks > 0) { Index: pkgsrc/net/nagios-base/patches/patch-base_events.c diff -u pkgsrc/net/nagios-base/patches/patch-base_events.c:1.2 pkgsrc/net/nagios-base/patches/patch-base_events.c:1.3 --- pkgsrc/net/nagios-base/patches/patch-base_events.c:1.2 Tue Feb 9 10:12:53 2016 +++ pkgsrc/net/nagios-base/patches/patch-base_events.c Sun Jan 8 23:33:59 2023 @@ -1,9 +1,9 @@ -$NetBSD: patch-base_events.c,v 1.2 2016/02/09 10:12:53 bouyer Exp $ +$NetBSD: patch-base_events.c,v 1.3 2023/01/08 23:33:59 sekiya Exp $ -64bit time_t workaround +64-bit time_t workaround ---- base/events.c.orig 2016-02-07 21:54:30.000000000 +0100 -+++ base/events.c 2016-02-07 21:55:49.000000000 +0100 +--- 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 @@ if(check_delay > check_window(temp_service)) { log_debug_info(DEBUGL_EVENTS, 0, @@ -11,9 +11,9 @@ $NetBSD: patch-base_events.c,v 1.2 2016/ - check_delay - check_window(temp_service)); + (unsigned long)(check_delay - check_window(temp_service))); fixed_services++; - check_delay = ranged_urand(0, check_window(temp_service)); + check_delay = check_window(temp_service); log_debug_info(DEBUGL_EVENTS, 0, " New check offset: %d\n", -@@ -507,7 +507,7 @@ +@@ -506,7 +506,7 @@ 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", Index: pkgsrc/net/nagios-base/patches/patch-base_nerd.c diff -u pkgsrc/net/nagios-base/patches/patch-base_nerd.c:1.2 pkgsrc/net/nagios-base/patches/patch-base_nerd.c:1.3 --- pkgsrc/net/nagios-base/patches/patch-base_nerd.c:1.2 Tue Feb 9 10:12:53 2016 +++ pkgsrc/net/nagios-base/patches/patch-base_nerd.c Sun Jan 8 23:33:59 2023 @@ -1,10 +1,10 @@ -$NetBSD: patch-base_nerd.c,v 1.2 2016/02/09 10:12:53 bouyer Exp $ +$NetBSD: patch-base_nerd.c,v 1.3 2023/01/08 23:33:59 sekiya Exp $ -64bit time_t workaround +64-bit time_t workaround ---- base/nerd.c.orig 2016-02-07 21:13:59.000000000 +0100 -+++ base/nerd.c 2016-02-07 21:14:15.000000000 +0100 -@@ -337,7 +337,7 @@ +--- base/nerd.c.orig 2022-11-17 05:52:51.000000000 +0900 ++++ base/nerd.c 2023-01-09 06:59:24.364895991 +0900 +@@ -359,7 +359,7 @@ } else return 0; Index: pkgsrc/net/nagios-base/patches/patch-cgi_Makefile.in diff -u pkgsrc/net/nagios-base/patches/patch-cgi_Makefile.in:1.2 pkgsrc/net/nagios-base/patches/patch-cgi_Makefile.in:1.3 --- pkgsrc/net/nagios-base/patches/patch-cgi_Makefile.in:1.2 Fri Apr 3 17:06:08 2015 +++ pkgsrc/net/nagios-base/patches/patch-cgi_Makefile.in Sun Jan 8 23:33:59 2023 @@ -1,22 +1,13 @@ -$NetBSD: patch-cgi_Makefile.in,v 1.2 2015/04/03 17:06:08 rodent Exp $ +$NetBSD: patch-cgi_Makefile.in,v 1.3 2023/01/08 23:33:59 sekiya Exp $ Adjustments to build procedure. ---- cgi/Makefile.in.orig 2014-08-12 15:00:01.000000000 +0000 -+++ cgi/Makefile.in -@@ -15,7 +15,7 @@ exec_prefix=@exec_prefix@ - LOGDIR=@localstatedir@ - CFGDIR=@sysconfdir@ - BINDIR=@bindir@ --CGIDIR=@sbindir@ -+CGIDIR=@libexecdir@/cgi-bin - HTMLDIR=@datarootdir@ - INSTALL=@INSTALL@ - INSTALL_OPTS=@INSTALL_OPTS@ -@@ -201,9 +201,9 @@ install-unstripped: +--- cgi/Makefile.in.orig 2022-11-17 05:52:51.000000000 +0900 ++++ cgi/Makefile.in 2023-01-09 08:03:12.827656534 +0900 +@@ -197,15 +197,15 @@ $(MAKE) install-basic - install-basic: + install-unstripped: - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR) + [ -d $(DESTDIR)$(CGIDIR) ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(CGIDIR) for file in *.cgi; do \ @@ -24,4 +15,12 @@ Adjustments to build procedure. + $(BSD_INSTALL_SCRIPT) $$file $(DESTDIR)$(CGIDIR); \ done - strip-post-install: + install-basic: +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR) ++ [ -d $(DESTDIR)$(CGIDIR) ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(CGIDIR) + for file in *.cgi; do \ +- $(INSTALL) -s -m 775 $(INSTALL_OPTS) $$file $(DESTDIR)$(CGIDIR); \ ++ $(BSD_INSTALL_SCRIPT) $$file $(DESTDIR)$(CGIDIR); \ + done + + .PHONY: libnagios Index: pkgsrc/net/nagios-base/patches/patch-cgi_getcgi.c diff -u pkgsrc/net/nagios-base/patches/patch-cgi_getcgi.c:1.2 pkgsrc/net/nagios-base/patches/patch-cgi_getcgi.c:1.3 --- pkgsrc/net/nagios-base/patches/patch-cgi_getcgi.c:1.2 Fri Apr 3 17:06:08 2015 +++ pkgsrc/net/nagios-base/patches/patch-cgi_getcgi.c Sun Jan 8 23:33:59 2023 @@ -1,9 +1,9 @@ -$NetBSD: patch-cgi_getcgi.c,v 1.2 2015/04/03 17:06:08 rodent Exp $ +$NetBSD: patch-cgi_getcgi.c,v 1.3 2023/01/08 23:33:59 sekiya Exp $ Also include limits.h. ---- cgi/getcgi.c.orig 2014-08-12 15:00:01.000000000 +0000 -+++ cgi/getcgi.c +--- cgi/getcgi.c.orig 2022-11-17 05:52:51.000000000 +0900 ++++ cgi/getcgi.c 2023-01-09 07:06:34.265972874 +0900 @@ -9,6 +9,7 @@ #include "../include/getcgi.h" #include Index: pkgsrc/net/nagios-base/patches/patch-common_downtime.c diff -u pkgsrc/net/nagios-base/patches/patch-common_downtime.c:1.2 pkgsrc/net/nagios-base/patches/patch-common_downtime.c:1.3 --- pkgsrc/net/nagios-base/patches/patch-common_downtime.c:1.2 Tue Feb 9 10:12:53 2016 +++ pkgsrc/net/nagios-base/patches/patch-common_downtime.c Sun Jan 8 23:33:59 2023 @@ -1,9 +1,9 @@ -$NetBSD: patch-common_downtime.c,v 1.2 2016/02/09 10:12:53 bouyer Exp $ +$NetBSD: patch-common_downtime.c,v 1.3 2023/01/08 23:33:59 sekiya Exp $ -64bit time_t workaround +64-bit time_t workaround ---- common/downtime.c.orig 2016-02-07 22:06:39.000000000 +0100 -+++ common/downtime.c 2016-02-07 22:07:03.000000000 +0100 +--- common/downtime.c.orig 2022-11-17 05:52:51.000000000 +0900 ++++ common/downtime.c 2023-01-09 07:07:40.075545398 +0900 @@ -240,7 +240,7 @@ /* don't add old or invalid downtimes */ if(start_time >= end_time || end_time <= time(NULL)) { Index: pkgsrc/net/nagios-base/patches/patch-configure diff -u pkgsrc/net/nagios-base/patches/patch-configure:1.2 pkgsrc/net/nagios-base/patches/patch-configure:1.3 --- pkgsrc/net/nagios-base/patches/patch-configure:1.2 Fri Apr 3 17:06:08 2015 +++ pkgsrc/net/nagios-base/patches/patch-configure Sun Jan 8 23:33:59 2023 @@ -1,13 +1,13 @@ -$NetBSD: patch-configure,v 1.2 2015/04/03 17:06:08 rodent Exp $ +$NetBSD: patch-configure,v 1.3 2023/01/08 23:33:59 sekiya Exp $ Adjustments to build procedure. ---- configure.orig 2014-08-12 15:00:01.000000000 +0000 -+++ configure -@@ -6129,7 +6129,7 @@ else +--- configure.orig 2022-11-17 05:52:51.000000000 +0900 ++++ configure 2023-01-09 07:08:10.614438502 +0900 +@@ -6890,7 +6890,7 @@ fi - if test x$CHECKRESULTDIR = xno; then + if test "x$CHECKRESULTDIR" = "xno"; then - CHECKRESULTDIR="$localstatedir/spool/checkresults" + CHECKRESULTDIR="$localstatedir/checkresults" fi Index: pkgsrc/net/nagios-base/patches/patch-include_locations.h.in diff -u pkgsrc/net/nagios-base/patches/patch-include_locations.h.in:1.2 pkgsrc/net/nagios-base/patches/patch-include_locations.h.in:1.3 --- pkgsrc/net/nagios-base/patches/patch-include_locations.h.in:1.2 Fri Apr 3 17:06:08 2015 +++ pkgsrc/net/nagios-base/patches/patch-include_locations.h.in Sun Jan 8 23:33:59 2023 @@ -1,9 +1,9 @@ -$NetBSD: patch-include_locations.h.in,v 1.2 2015/04/03 17:06:08 rodent Exp $ +$NetBSD: patch-include_locations.h.in,v 1.3 2023/01/08 23:33:59 sekiya Exp $ Adjustments to build procedure. ---- include/locations.h.in.orig 2014-08-12 15:00:01.000000000 +0000 -+++ include/locations.h.in +--- include/locations.h.in.orig 2022-11-17 05:52:51.000000000 +0900 ++++ include/locations.h.in 2023-01-09 07:15:48.265056358 +0900 @@ -19,7 +19,7 @@ #define DEFAULT_TEMP_FILE "@localstatedir@/tempfile" Index: pkgsrc/net/nagios-base/patches/patch-lib_test-squeue.c diff -u pkgsrc/net/nagios-base/patches/patch-lib_test-squeue.c:1.2 pkgsrc/net/nagios-base/patches/patch-lib_test-squeue.c:1.3 --- pkgsrc/net/nagios-base/patches/patch-lib_test-squeue.c:1.2 Tue Feb 9 10:12:53 2016 +++ pkgsrc/net/nagios-base/patches/patch-lib_test-squeue.c Sun Jan 8 23:33:59 2023 @@ -1,9 +1,9 @@ -$NetBSD: patch-lib_test-squeue.c,v 1.2 2016/02/09 10:12:53 bouyer Exp $ +$NetBSD: patch-lib_test-squeue.c,v 1.3 2023/01/08 23:33:59 sekiya Exp $ -64bit time_t workaround +64-bit time_t workaround ---- lib/test-squeue.c.orig 2016-02-07 21:16:30.000000000 +0100 -+++ lib/test-squeue.c 2016-02-07 21:17:02.000000000 +0100 +--- lib/test-squeue.c.orig 2022-11-17 05:52:51.000000000 +0900 ++++ lib/test-squeue.c 2023-01-09 07:15:59.004620782 +0900 @@ -50,7 +50,7 @@ walks++; Index: pkgsrc/net/nagios-base/patches/patch-sample-config_nagios.cfg.in diff -u pkgsrc/net/nagios-base/patches/patch-sample-config_nagios.cfg.in:1.2 pkgsrc/net/nagios-base/patches/patch-sample-config_nagios.cfg.in:1.3 --- pkgsrc/net/nagios-base/patches/patch-sample-config_nagios.cfg.in:1.2 Fri Apr 3 17:06:08 2015 +++ pkgsrc/net/nagios-base/patches/patch-sample-config_nagios.cfg.in Sun Jan 8 23:33:59 2023 @@ -1,10 +1,10 @@ -$NetBSD: patch-sample-config_nagios.cfg.in,v 1.2 2015/04/03 17:06:08 rodent Exp $ +$NetBSD: patch-sample-config_nagios.cfg.in,v 1.3 2023/01/08 23:33:59 sekiya Exp $ Fix placement of temporary file. ---- sample-config/nagios.cfg.in.orig 2014-08-12 15:00:01.000000000 +0000 -+++ sample-config/nagios.cfg.in -@@ -176,7 +176,7 @@ lock_file=@lockfile@ +--- sample-config/nagios.cfg.in.orig 2022-11-17 05:52:51.000000000 +0900 ++++ sample-config/nagios.cfg.in 2023-01-09 07:17:28.141769657 +0900 +@@ -176,7 +176,7 @@ # is created, used, and deleted throughout the time that Nagios is # running. Index: pkgsrc/net/nagios-base/patches/patch-base_logging.c diff -u pkgsrc/net/nagios-base/patches/patch-base_logging.c:1.4 pkgsrc/net/nagios-base/patches/patch-base_logging.c:1.5 --- pkgsrc/net/nagios-base/patches/patch-base_logging.c:1.4 Wed May 24 07:42:39 2017 +++ pkgsrc/net/nagios-base/patches/patch-base_logging.c Sun Jan 8 23:33:59 2023 @@ -1,11 +1,10 @@ $NetBSD$ -64bit time_t workaround +64-bit time_t workaround ---- base/logging.c.orig 2017-05-09 19:03:31.000000000 +0200 -+++ base/logging.c 2017-05-21 21:06:50.000000000 +0200 -@@ -532,9 +532,9 @@ - return ERROR; +--- base/logging.c.orig 2022-11-17 05:52:51.000000000 +0900 ++++ base/logging.c 2023-01-09 06:59:17.162183952 +0900 +@@ -533,7 +533,7 @@ /* write the timestamp */ gettimeofday(¤t_time, NULL); @@ -14,4 +13,3 @@ $NetBSD$ /* write the data */ va_start(ap, fmt); - vfprintf(debug_file_fp, fmt, ap); Index: pkgsrc/net/nagios-base/patches/patch-cgi_histogram.c diff -u pkgsrc/net/nagios-base/patches/patch-cgi_histogram.c:1.4 pkgsrc/net/nagios-base/patches/patch-cgi_histogram.c:1.5 --- pkgsrc/net/nagios-base/patches/patch-cgi_histogram.c:1.4 Tue Feb 9 10:12:53 2016 +++ pkgsrc/net/nagios-base/patches/patch-cgi_histogram.c Sun Jan 8 23:33:59 2023 @@ -1,9 +1,9 @@ -$NetBSD: patch-cgi_histogram.c,v 1.4 2016/02/09 10:12:53 bouyer Exp $ +$NetBSD: patch-cgi_histogram.c,v 1.5 2023/01/08 23:33:59 sekiya Exp $ -64bit time_t workaround +64-bit time_t workaround ---- cgi/histogram.c.orig 2016-02-07 22:21:30.000000000 +0100 -+++ cgi/histogram.c 2016-02-07 22:22:24.000000000 +0100 +--- cgi/histogram.c.orig 2022-11-17 05:52:51.000000000 +0900 ++++ cgi/histogram.c 2023-01-09 07:06:38.575800883 +0900 @@ -338,9 +338,9 @@ if(display_type == DISPLAY_HOST_HISTOGRAM) { Index: pkgsrc/net/nagios-base/patches/patch-cgi_avail.c diff -u pkgsrc/net/nagios-base/patches/patch-cgi_avail.c:1.5 pkgsrc/net/nagios-base/patches/patch-cgi_avail.c:1.6 --- pkgsrc/net/nagios-base/patches/patch-cgi_avail.c:1.5 Wed May 24 07:42:39 2017 +++ pkgsrc/net/nagios-base/patches/patch-cgi_avail.c Sun Jan 8 23:33:59 2023 @@ -1,11 +1,10 @@ -$NetBSD: patch-cgi_avail.c,v 1.5 2017/05/24 07:42:39 manu Exp $ +$NetBSD: patch-cgi_avail.c,v 1.6 2023/01/08 23:33:59 sekiya Exp $ -64bit time_t workaround +64-bit time_t workaround ---- cgi/avail.c.orig 2017-05-09 19:03:31.000000000 +0200 -+++ cgi/avail.c 2017-05-22 06:11:42.000000000 +0200 -@@ -366,12 +366,12 @@ - if(display_type == DISPLAY_HOST_AVAIL && show_all_hosts == FALSE) { +--- cgi/avail.c.orig 2022-11-17 05:52:51.000000000 +0900 ++++ cgi/avail.c 2023-01-09 07:01:49.208846376 +0900 +@@ -377,10 +377,10 @@ host_report_url("all", "View Availability Report For All Hosts"); printf("
\n"); #ifdef USE_TRENDS @@ -18,9 +17,7 @@ $NetBSD: patch-cgi_avail.c,v 1.5 2017/05 #endif printf("View Status Detail For This Host
\n", STATUS_CGI, url_encode(host_name)); printf("View Alert History For This Host
\n", HISTORY_CGI, url_encode(host_name)); - printf("View Notifications For This Host
\n", NOTIFICATIONS_CGI, url_encode(host_name)); -@@ -382,13 +382,13 @@ - service_report_url("null", "all", "View Availability Report For All Services"); +@@ -393,11 +393,11 @@ printf("
\n"); #ifdef USE_TRENDS printf("View Alert History For This Service
\n", url_encode(svc_description)); - printf("\n"); - printf("", t1, t2, (include_soft_states == TRUE) ? "yes" : "no", (assume_state_retention == TRUE) ? "yes" : "no", (assume_initial_states == TRUE) ? "yes" : "no", (assume_states_during_notrunning == TRUE) ? "yes" : "no", initial_assumed_host_state, backtrack_archives); -+ printf("&t1=%lu&t2=%lu&includesoftstates=%s&assumestateretention=%s&assumeinitialstates=%s&assumestatesduringnotrunning=%s&initialassumedhoststate=%d&backtrack=%d'>", (unsigned long)t1, (unsigned long)t2, (include_soft_states == TRUE) ? "yes" : "no", (assume_state_retention == TRUE) ? "yes" : "no", (assume_initial_states == TRUE) ? "yes" : "no", (assume_states_during_notrunning == TRUE) ? "yes" : "no", initial_assumed_host_state, backtrack_archives); - #ifdef LEGACY_GRAPHICAL_CGIS - printf("Host State Trends", t1, t2, (include_soft_states == TRUE) ? "yes" : "no", (assume_state_retention == TRUE) ? "yes" : "no", (assume_initial_states == TRUE) ? "yes" : "no", (assume_states_during_notrunning == TRUE) ? "yes" : "no", initial_assumed_host_state, backtrack_archives); -+ printf("&t1=%lu&t2=%lu&includesoftstates=%s&assumestateretention=%s&assumeinitialstates=%s&assumestatesduringnotrunning=%s&initialassumedhoststate=%d&backtrack=%d' border=1 alt='Host State Trends' title='Host State Trends' width='500' height='20'>", (unsigned long)t1, (unsigned long)t2, (include_soft_states == TRUE) ? "yes" : "no", (assume_state_retention == TRUE) ? "yes" : "no", (assume_initial_states == TRUE) ? "yes" : "no", (assume_states_during_notrunning == TRUE) ? "yes" : "no", initial_assumed_host_state, backtrack_archives); - printf("
\n"); - printf("

\n"); - #endif - printf("
\n"); -@@ -4447,15 +4447,15 @@ - printf("
Service State Breakdowns:
\n"); - #ifdef USE_TRENDS - printf("

\n"); - printf("", url_encode(svc_description), t1, t2, (include_soft_states == TRUE) ? "yes" : "no", (assume_state_retention == TRUE) ? "yes" : "no", (assume_initial_states == TRUE) ? "yes" : "no", (assume_states_during_notrunning == TRUE) ? "yes" : "no", initial_assumed_service_state, backtrack_archives); -+ printf("&service=%s&t1=%lu&t2=%lu&includesoftstates=%s&assumestateretention=%s&assumeinitialstates=%s&assumestatesduringnotrunning=%s&initialassumedservicestate=%d&backtrack=%d'>", url_encode(svc_description), (unsigned long)t1, (unsigned long)t2, (include_soft_states == TRUE) ? "yes" : "no", (assume_state_retention == TRUE) ? "yes" : "no", (assume_initial_states == TRUE) ? "yes" : "no", (assume_states_during_notrunning == TRUE) ? "yes" : "no", initial_assumed_service_state, backtrack_archives); - #ifdef LEGACY_GRAPHICAL_CGIS - printf("Service State Trends", url_encode(svc_description), t1, t2, (include_soft_states == TRUE) ? "yes" : "no", (assume_state_retention == TRUE) ? "yes" : "no", (assume_initial_states == TRUE) ? "yes" : "no", (assume_states_during_notrunning == TRUE) ? "yes" : "no", initial_assumed_service_state, backtrack_archives); -+ printf("&service=%s&t1=%lu&t2=%lu&includesoftstates=%s&assumestateretention=%s&assumeinitialstates=%s&assumestatesduringnotrunning=%s&initialassumedservicestate=%d&backtrack=%d' border=1 alt='Service State Trends' title='Service State Trends' width='500' height='20'>", url_encode(svc_description), (unsigned long)t1, (unsigned long)t2, (include_soft_states == TRUE) ? "yes" : "no", (assume_state_retention == TRUE) ? "yes" : "no", (assume_initial_states == TRUE) ? "yes" : "no", (assume_states_during_notrunning == TRUE) ? "yes" : "no", initial_assumed_service_state, backtrack_archives); - printf("
\n"); - printf("

\n"); - #endif - -@@ -4692,9 +4692,9 @@ - void host_report_url(const char *hn, const char *label) { +@@ -5254,7 +5254,7 @@ printf("\n"); +--- cgi/trends.c.orig 2022-11-17 05:52:51.000000000 +0900 ++++ cgi/trends.c 2023-01-09 07:06:43.682160687 +0900 +@@ -448,9 +448,9 @@ printf("\n"); if(display_type == DISPLAY_HOST_TRENDS) { @@ -17,7 +16,7 @@ $NetBSD: patch-cgi_trends.c,v 1.5 2017/0 #endif printf("View Status Detail For This Host
\n", STATUS_CGI, url_encode(host_name)); printf("View Alert History For This Host
\n", HISTORY_CGI, url_encode(host_name)); - printf("View Notifications For This Host
\n", NOTIFICATIONS_CGI, url_encode(host_name)); +@@ -458,14 +458,14 @@ } else { #ifdef LEGACY_GRAPHICAL_CGIS @@ -36,4 +35,3 @@ $NetBSD: patch-cgi_trends.c,v 1.5 2017/0 printf("View Alert History For This Service
\n", url_encode(svc_description)); printf("View Notifications For This Service
\n", url_encode(svc_description)); Index: pkgsrc/net/nagios-base/patches/patch-html_Makefile.in diff -u pkgsrc/net/nagios-base/patches/patch-html_Makefile.in:1.5 pkgsrc/net/nagios-base/patches/patch-html_Makefile.in:1.6 --- pkgsrc/net/nagios-base/patches/patch-html_Makefile.in:1.5 Wed May 24 07:42:39 2017 +++ pkgsrc/net/nagios-base/patches/patch-html_Makefile.in Sun Jan 8 23:33:59 2023 @@ -1,22 +1,10 @@ -$NetBSD: patch-html_Makefile.in,v 1.5 2017/05/24 07:42:39 manu Exp $ +$NetBSD: patch-html_Makefile.in,v 1.6 2023/01/08 23:33:59 sekiya Exp $ Adjustments to build procedure. ---- html/Makefile.in.orig 2017-05-09 19:03:31.000000000 +0200 -+++ html/Makefile.in 2017-05-22 09:20:24.000000000 +0200 -@@ -6,9 +6,9 @@ - exec_prefix=@exec_prefix@ - LOGDIR=@localstatedir@ - CFGDIR=@sysconfdir@ - BINDIR=@bindir@ --CGIDIR=@sbindir@ -+CGIDIR=@libexecdir@ - HTMLDIR=@datadir@ - datarootdir=@datarootdir@ - INSTALL=@INSTALL@ - INSTALL_OPTS=@INSTALL_OPTS@ -@@ -43,92 +43,92 @@ - +--- html/Makefile.in.orig 2022-11-17 05:52:51.000000000 +0900 ++++ html/Makefile.in 2023-01-09 07:15:39.443389605 +0900 +@@ -44,28 +44,28 @@ devclean: distclean install: @@ -45,16 +33,16 @@ Adjustments to build procedure. # Directories for new CGI pages - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/angularjs - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/angularjs/angular-1.3.9 -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/angularjs/ui-utils-0.2.1 -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.0 -- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.0/css +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/angularjs/ui-utils-0.2.3 +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.7 +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.7/css - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/d3 - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/spin + $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/angularjs + $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/angularjs/angular-1.3.9 -+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/angularjs/ui-utils-0.2.1 -+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.0 -+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.0/css ++ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/angularjs/ui-utils-0.2.3 ++ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.7 ++ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.7/css + $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/d3 + $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/spin # End of directories for new CGI pages @@ -65,7 +53,7 @@ Adjustments to build procedure. # Remove old files rm -f $(DESTDIR)$(HTMLDIR)/index.html rm -f $(DESTDIR)$(HTMLDIR)/main.html - rm -f $(DESTDIR)$(HTMLDIR)/side.html +@@ -73,61 +73,61 @@ rm -f $(DESTDIR)$(HTMLDIR)/map.html rm -f $(DESTDIR)$(HTMLDIR)/rss-* rm -rf $(DESTDIR)$(HTMLDIR)/include/rss @@ -149,21 +137,20 @@ Adjustments to build procedure. # Support files for new graphical CGIs - $(INSTALL) -m 664 $(INSTALL_OPTS) angularjs/angular-1.3.9/angular.min.js $(DESTDIR)$(HTMLDIR)/angularjs/angular-1.3.9 - $(INSTALL) -m 664 $(INSTALL_OPTS) angularjs/angular-1.3.9/angular.min.js.map $(DESTDIR)$(HTMLDIR)/angularjs/angular-1.3.9 -- $(INSTALL) -m 664 $(INSTALL_OPTS) angularjs/ui-bootstrap-tpls-0.12.0.min.js $(DESTDIR)$(HTMLDIR)/angularjs -- $(INSTALL) -m 664 $(INSTALL_OPTS) angularjs/ui-utils-0.2.1/ui-utils.js $(DESTDIR)$(HTMLDIR)/angularjs/ui-utils-0.2.1 -- $(INSTALL) -m 664 $(INSTALL_OPTS) bootstrap-3.3.0/css/bootstrap.min.css $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.0/css -- $(INSTALL) -m 664 $(INSTALL_OPTS) bootstrap-3.3.0/css/bootstrap-theme.min.css $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.0/css +- $(INSTALL) -m 664 $(INSTALL_OPTS) angularjs/ui-bootstrap-tpls-0.14.3.min.js $(DESTDIR)$(HTMLDIR)/angularjs +- $(INSTALL) -m 664 $(INSTALL_OPTS) angularjs/ui-utils-0.2.3/ui-utils.js $(DESTDIR)$(HTMLDIR)/angularjs/ui-utils-0.2.3 +- $(INSTALL) -m 664 $(INSTALL_OPTS) bootstrap-3.3.7/css/bootstrap.min.css $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.7/css +- $(INSTALL) -m 664 $(INSTALL_OPTS) bootstrap-3.3.7/css/bootstrap-theme.min.css $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.7/css - $(INSTALL) -m 664 $(INSTALL_OPTS) d3/d3.min.js $(DESTDIR)$(HTMLDIR)/d3 - $(INSTALL) -m 664 $(INSTALL_OPTS) spin/spin.min.js $(DESTDIR)$(HTMLDIR)/spin + $(BSD_INSTALL_DATA) angularjs/angular-1.3.9/angular.min.js $(DESTDIR)$(HTMLDIR)/angularjs/angular-1.3.9 + $(BSD_INSTALL_DATA) angularjs/angular-1.3.9/angular.min.js.map $(DESTDIR)$(HTMLDIR)/angularjs/angular-1.3.9 -+ $(BSD_INSTALL_DATA) angularjs/ui-bootstrap-tpls-0.12.0.min.js $(DESTDIR)$(HTMLDIR)/angularjs -+ $(BSD_INSTALL_DATA) angularjs/ui-utils-0.2.1/ui-utils.js $(DESTDIR)$(HTMLDIR)/angularjs/ui-utils-0.2.1 -+ $(BSD_INSTALL_DATA) bootstrap-3.3.0/css/bootstrap.min.css $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.0/css -+ $(BSD_INSTALL_DATA) bootstrap-3.3.0/css/bootstrap-theme.min.css $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.0/css ++ $(BSD_INSTALL_DATA) angularjs/ui-bootstrap-tpls-0.14.3.min.js $(DESTDIR)$(HTMLDIR)/angularjs ++ $(BSD_INSTALL_DATA) angularjs/ui-utils-0.2.3/ui-utils.js $(DESTDIR)$(HTMLDIR)/angularjs/ui-utils-0.2.3 ++ $(BSD_INSTALL_DATA) bootstrap-3.3.7/css/bootstrap.min.css $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.7/css ++ $(BSD_INSTALL_DATA) bootstrap-3.3.7/css/bootstrap-theme.min.css $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.7/css + $(BSD_INSTALL_DATA) d3/d3.min.js $(DESTDIR)$(HTMLDIR)/d3 + $(BSD_INSTALL_DATA) spin/spin.min.js $(DESTDIR)$(HTMLDIR)/spin # End of support files for new graphical CGIs install-unstripped: - $(MAKE) install Index: pkgsrc/net/nagios-base/patches/patch-cgi_cmd.c diff -u pkgsrc/net/nagios-base/patches/patch-cgi_cmd.c:1.6 pkgsrc/net/nagios-base/patches/patch-cgi_cmd.c:1.7 --- pkgsrc/net/nagios-base/patches/patch-cgi_cmd.c:1.6 Wed May 24 07:42:39 2017 +++ pkgsrc/net/nagios-base/patches/patch-cgi_cmd.c Sun Jan 8 23:33:59 2023 @@ -1,11 +1,11 @@ -$NetBSD: patch-cgi_cmd.c,v 1.6 2017/05/24 07:42:39 manu Exp $ +$NetBSD: patch-cgi_cmd.c,v 1.7 2023/01/08 23:33:59 sekiya Exp $ Fix build in SunOS. -64bit time_t workaround. +64-bit time_t workaround. ---- cgi/cmd.c.orig 2014-08-12 17:00:01.000000000 +0200 -+++ cgi/cmd.c 2016-02-07 22:41:29.000000000 +0100 -@@ -1906,7 +1906,7 @@ +--- cgi/cmd.c.orig 2022-11-17 05:52:51.000000000 +0900 ++++ cgi/cmd.c 2023-01-09 07:06:23.042829273 +0900 +@@ -1937,7 +1937,7 @@ if(!command_name || (strlen(command_name) > 6 && !memcmp("CHANGE", command_name, 6))) return ERROR; @@ -14,7 +14,7 @@ Fix build in SunOS. if(len < 0 || len >= sizeof(cmd)) return ERROR; -@@ -2032,25 +2032,25 @@ +@@ -2072,25 +2072,25 @@ break; case CMD_DELAY_HOST_NOTIFICATION: @@ -44,7 +44,7 @@ Fix build in SunOS. break; case CMD_ENABLE_HOST_SVC_CHECKS: -@@ -2065,7 +2065,7 @@ +@@ -2105,7 +2105,7 @@ case CMD_SCHEDULE_HOST_SVC_CHECKS: if(force_check == TRUE) cmd = CMD_SCHEDULE_FORCED_HOST_SVC_CHECKS; @@ -53,26 +53,26 @@ Fix build in SunOS. break; case CMD_ENABLE_HOST_NOTIFICATIONS: -@@ -2106,15 +2106,15 @@ +@@ -2146,15 +2146,15 @@ else if(child_options == 2) cmd = CMD_SCHEDULE_AND_PROPAGATE_HOST_DOWNTIME; -- result = cmd_submitf(cmd, "%s;%lu;%lu;%d;%lu;%lu;%s;%s", host_name, start_time, end_time, fixed, triggered_by, duration, comment_author, comment_data); -+ result = cmd_submitf(cmd, "%s;%lu;%lu;%d;%lu;%lu;%s;%s", host_name, (unsigned long)start_time, (unsigned long)end_time, fixed, triggered_by, duration, comment_author, comment_data); +- result = cmd_submitf(cmd, "%s;%lu;%lu;%d;%lu;%lu", host_name, start_time, end_time, fixed, triggered_by, duration); ++ result = cmd_submitf(cmd, "%s;%lu;%lu;%d;%lu;%lu", host_name, (unsigned long)start_time, (unsigned long)end_time, fixed, triggered_by, duration); break; case CMD_SCHEDULE_HOST_SVC_DOWNTIME: -- result = cmd_submitf(cmd, "%s;%lu;%lu;%d;%lu;%lu;%s;%s", host_name, start_time, end_time, fixed, triggered_by, duration, comment_author, comment_data); -+ result = cmd_submitf(cmd, "%s;%lu;%lu;%d;%lu;%lu;%s;%s", host_name, (unsigned long)start_time, (unsigned long)end_time, fixed, triggered_by, duration, comment_author, comment_data); +- result = cmd_submitf(cmd, "%s;%lu;%lu;%d;%lu;%lu", host_name, start_time, end_time, fixed, triggered_by, duration); ++ result = cmd_submitf(cmd, "%s;%lu;%lu;%d;%lu;%lu", host_name, (unsigned long)start_time, (unsigned long)end_time, fixed, triggered_by, duration); break; case CMD_SCHEDULE_SVC_DOWNTIME: -- result = cmd_submitf(cmd, "%s;%s;%lu;%lu;%d;%lu;%lu;%s;%s", host_name, service_desc, start_time, end_time, fixed, triggered_by, duration, comment_author, comment_data); -+ result = cmd_submitf(cmd, "%s;%s;%lu;%lu;%d;%lu;%lu;%s;%s", host_name, service_desc, (unsigned long)start_time, (unsigned long)end_time, fixed, triggered_by, duration, comment_author, comment_data); +- result = cmd_submitf(cmd, "%s;%s;%lu;%lu;%d;%lu;%lu", host_name, service_desc, start_time, end_time, fixed, triggered_by, duration); ++ result = cmd_submitf(cmd, "%s;%s;%lu;%lu;%d;%lu;%lu", host_name, service_desc, (unsigned long)start_time, (unsigned long)end_time, fixed, triggered_by, duration); break; case CMD_DEL_HOST_DOWNTIME: -@@ -2125,7 +2125,7 @@ +@@ -2165,7 +2165,7 @@ case CMD_SCHEDULE_HOST_CHECK: if(force_check == TRUE) cmd = CMD_SCHEDULE_FORCED_HOST_CHECK; @@ -81,37 +81,34 @@ Fix build in SunOS. break; case CMD_SEND_CUSTOM_HOST_NOTIFICATION: -@@ -2163,13 +2163,13 @@ +@@ -2203,11 +2203,11 @@ break; case CMD_SCHEDULE_HOSTGROUP_HOST_DOWNTIME: -- result = cmd_submitf(cmd, "%s;%lu;%lu;%d;0;%lu;%s;%s", hostgroup_name, start_time, end_time, fixed, duration, comment_author, comment_data); -+ result = cmd_submitf(cmd, "%s;%lu;%lu;%d;0;%lu;%s;%s", hostgroup_name, (unsigned long)start_time, (unsigned long)end_time, fixed, duration, comment_author, comment_data); +- result = cmd_submitf(cmd, "%s;%lu;%lu;%d;0;%lu", hostgroup_name, start_time, end_time, fixed, duration); ++ result = cmd_submitf(cmd, "%s;%lu;%lu;%d;0;%lu", hostgroup_name, (unsigned long)start_time, (unsigned long)end_time, fixed, duration); break; case CMD_SCHEDULE_HOSTGROUP_SVC_DOWNTIME: -- result = cmd_submitf(cmd, "%s;%lu;%lu;%d;0;%lu;%s;%s", hostgroup_name, start_time, end_time, fixed, duration, comment_author, comment_data); -+ result = cmd_submitf(cmd, "%s;%lu;%lu;%d;0;%lu;%s;%s", hostgroup_name, (unsigned long)start_time, (unsigned long)end_time, fixed, duration, comment_author, comment_data); +- result = cmd_submitf(cmd, "%s;%lu;%lu;%d;0;%lu", hostgroup_name, start_time, end_time, fixed, duration); ++ result = cmd_submitf(cmd, "%s;%lu;%lu;%d;0;%lu", hostgroup_name, (unsigned long)start_time, (unsigned long)end_time, fixed, duration); if(affect_host_and_services == TRUE) -- result |= cmd_submitf(CMD_SCHEDULE_HOSTGROUP_HOST_DOWNTIME, "%s;%lu;%lu;%d;0;%lu;%s;%s", hostgroup_name, start_time, end_time, fixed, duration, comment_author, comment_data); -+ result |= cmd_submitf(CMD_SCHEDULE_HOSTGROUP_HOST_DOWNTIME, "%s;%lu;%lu;%d;0;%lu;%s;%s", hostgroup_name, (unsigned long)start_time, (unsigned long)end_time, fixed, duration, comment_author, comment_data); + result |= cmd_submitf(CMD_SCHEDULE_HOSTGROUP_HOST_DOWNTIME, "%s;%lu;%lu;%d;0;%lu", hostgroup_name, start_time, end_time, fixed, duration); break; - - -@@ -2199,13 +2199,13 @@ +@@ -2239,13 +2239,13 @@ break; case CMD_SCHEDULE_SERVICEGROUP_HOST_DOWNTIME: -- result = cmd_submitf(cmd, "%s;%lu;%lu;%d;0;%lu;%s;%s", servicegroup_name, start_time, end_time, fixed, duration, comment_author, comment_data); -+ result = cmd_submitf(cmd, "%s;%lu;%lu;%d;0;%lu;%s;%s", servicegroup_name, (unsigned long)start_time, (unsigned long)end_time, fixed, duration, comment_author, comment_data); +- result = cmd_submitf(cmd, "%s;%lu;%lu;%d;0;%lu", servicegroup_name, start_time, end_time, fixed, duration); ++ result = cmd_submitf(cmd, "%s;%lu;%lu;%d;0;%lu", servicegroup_name, (unsigned long)start_time, (unsigned long)end_time, fixed, duration); break; case CMD_SCHEDULE_SERVICEGROUP_SVC_DOWNTIME: -- result = cmd_submitf(cmd, "%s;%lu;%lu;%d;0;%lu;%s;%s", servicegroup_name, start_time, end_time, fixed, duration, comment_author, comment_data); -+ result = cmd_submitf(cmd, "%s;%lu;%lu;%d;0;%lu;%s;%s", servicegroup_name, (unsigned long)start_time, (unsigned long)end_time, fixed, duration, comment_author, comment_data); +- result = cmd_submitf(cmd, "%s;%lu;%lu;%d;0;%lu", servicegroup_name, start_time, end_time, fixed, duration); ++ result = cmd_submitf(cmd, "%s;%lu;%lu;%d;0;%lu", servicegroup_name, (unsigned long)start_time, (unsigned long)end_time, fixed, duration); if(affect_host_and_services == TRUE) -- result |= cmd_submitf(CMD_SCHEDULE_SERVICEGROUP_HOST_DOWNTIME, "%s;%lu;%lu;%d;0;%lu;%s;%s", servicegroup_name, start_time, end_time, fixed, duration, comment_author, comment_data); -+ result |= cmd_submitf(CMD_SCHEDULE_SERVICEGROUP_HOST_DOWNTIME, "%s;%lu;%lu;%d;0;%lu;%s;%s", servicegroup_name, (unsigned long)start_time, (unsigned long)end_time, fixed, duration, comment_author, comment_data); +- result |= cmd_submitf(CMD_SCHEDULE_SERVICEGROUP_HOST_DOWNTIME, "%s;%lu;%lu;%d;0;%lu", servicegroup_name, start_time, end_time, fixed, duration); ++ result |= cmd_submitf(CMD_SCHEDULE_SERVICEGROUP_HOST_DOWNTIME, "%s;%lu;%lu;%d;0;%lu", servicegroup_name, (unsigned long)start_time, (unsigned long)end_time, fixed, duration); break; default: Index: pkgsrc/net/nagios-base/patches/patch-lib_runcmd.c diff -u pkgsrc/net/nagios-base/patches/patch-lib_runcmd.c:1.1 pkgsrc/net/nagios-base/patches/patch-lib_runcmd.c:1.2 --- pkgsrc/net/nagios-base/patches/patch-lib_runcmd.c:1.1 Fri Apr 3 17:06:08 2015 +++ pkgsrc/net/nagios-base/patches/patch-lib_runcmd.c Sun Jan 8 23:33:59 2023 @@ -1,11 +1,11 @@ -$NetBSD: patch-lib_runcmd.c,v 1.1 2015/04/03 17:06:08 rodent Exp $ +$NetBSD: patch-lib_runcmd.c,v 1.2 2023/01/08 23:33:59 sekiya Exp $ Include config.h generated during configure. setenv(3) was tested there. No need to check for it here. Can't assign a value to a constant. Ensure we don't do that. ---- lib/runcmd.c.orig 2014-08-12 15:00:01.000000000 +0000 -+++ lib/runcmd.c +--- lib/runcmd.c.orig 2022-11-17 05:52:51.000000000 +0900 ++++ lib/runcmd.c 2023-01-09 07:15:54.323753241 +0900 @@ -15,6 +15,7 @@ #define NAGIOSPLUG_API_C 1 @@ -26,7 +26,7 @@ Can't assign a value to a constant. Ensu /* * This variable must be global, since there's no way the caller * can forcibly slay a dead or ungainly running program otherwise. -@@ -304,13 +300,13 @@ int runcmd_cmd2strv(const char *str, int +@@ -304,13 +300,13 @@ * through this API and thus achieve async-safeness throughout the API. */ void runcmd_init(void) { Added files: Index: pkgsrc/net/nagios-base/patches/patch-startup_default-init.in diff -u /dev/null pkgsrc/net/nagios-base/patches/patch-startup_default-init.in:1.1 --- /dev/null Sun Jan 8 23:33:59 2023 +++ pkgsrc/net/nagios-base/patches/patch-startup_default-init.in Sun Jan 8 23:33:59 2023 @@ -0,0 +1,15 @@ +$NetBSD: patch-startup_default-init.in,v 1.1 2023/01/08 23:33:59 sekiya Exp $ + +Fix portability failure. + +--- startup/default-init.in.orig 2022-11-16 20:52:51.000000000 +0000 ++++ startup/default-init.in +@@ -61,7 +61,7 @@ fi + USE_RAMDISK=${USE_RAMDISK:-0} + if test "$USE_RAMDISK" -ne 0 && test "$RAMDISK_SIZE"X != "X"; then + ramdisk=`mount |grep "${RAMDISK_DIR} type tmpfs"` +- if [ "$ramdisk"X == "X" ]; then ++ if [ "$ramdisk"X = "X" ]; then + if [ ! -d ${RAMDISK_DIR} ]; then + mkdir -p -m 0755 ${RAMDISK_DIR} + if [ -d ${RAMDISK_DIR} ]; then --_----------=_1673220839155390--