pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/nagios-base Update to 4.4.9
details: https://anonhg.NetBSD.org/pkgsrc/rev/23176b0abb1a
branches: trunk
changeset: 391375:23176b0abb1a
user: sekiya <sekiya%pkgsrc.org@localhost>
date: Sun Jan 08 23:33:58 2023 +0000
description:
Update to 4.4.9
diffstat:
net/nagios-base/Makefile | 13 +-
net/nagios-base/Makefile.common | 3 +-
net/nagios-base/PLIST | 12 +-
net/nagios-base/distinfo | 52 ++++++------
net/nagios-base/patches/patch-Makefile.in | 59 ++++++--------
net/nagios-base/patches/patch-base_Makefile.in | 36 ++++----
net/nagios-base/patches/patch-base_checks.c | 14 +-
net/nagios-base/patches/patch-base_events.c | 12 +-
net/nagios-base/patches/patch-base_logging.c | 10 +-
net/nagios-base/patches/patch-base_nerd.c | 10 +-
net/nagios-base/patches/patch-base_utils.c | 62 ---------------
net/nagios-base/patches/patch-cgi_Makefile.in | 29 +++---
net/nagios-base/patches/patch-cgi_avail.c | 60 +------------
net/nagios-base/patches/patch-cgi_cmd.c | 59 ++++++-------
net/nagios-base/patches/patch-cgi_getcgi.c | 6 +-
net/nagios-base/patches/patch-cgi_histogram.c | 8 +-
net/nagios-base/patches/patch-cgi_trends.c | 14 +-
net/nagios-base/patches/patch-common_Makefile.in | 15 ---
net/nagios-base/patches/patch-common_downtime.c | 8 +-
net/nagios-base/patches/patch-configure | 10 +-
net/nagios-base/patches/patch-daemon-init.in | 15 ---
net/nagios-base/patches/patch-html_Makefile.in | 51 ++++-------
net/nagios-base/patches/patch-include_locations.h.in | 6 +-
net/nagios-base/patches/patch-lib_runcmd.c | 8 +-
net/nagios-base/patches/patch-lib_test-squeue.c | 8 +-
net/nagios-base/patches/patch-lib_worker.c | 22 +---
net/nagios-base/patches/patch-sample-config_nagios.cfg.in | 8 +-
net/nagios-base/patches/patch-startup_default-init.in | 15 +++
28 files changed, 231 insertions(+), 394 deletions(-)
diffs (truncated from 1132 to 300 lines):
diff -r e8d933b73fa0 -r 23176b0abb1a net/nagios-base/Makefile
--- a/net/nagios-base/Makefile Sun Jan 08 21:21:03 2023 +0000
+++ b/net/nagios-base/Makefile Sun Jan 08 23:33:58 2023 +0000
@@ -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 @@
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
diff -r e8d933b73fa0 -r 23176b0abb1a net/nagios-base/Makefile.common
--- a/net/nagios-base/Makefile.common Sun Jan 08 21:21:03 2023 +0000
+++ b/net/nagios-base/Makefile.common Sun Jan 08 23:33:58 2023 +0000
@@ -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 @@
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
diff -r e8d933b73fa0 -r 23176b0abb1a net/nagios-base/PLIST
--- a/net/nagios-base/PLIST Sun Jan 08 21:21:03 2023 +0000
+++ b/net/nagios-base/PLIST Sun Jan 08 23:33:58 2023 +0000
@@ -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/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-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
diff -r e8d933b73fa0 -r 23176b0abb1a net/nagios-base/distinfo
--- a/net/nagios-base/distinfo Sun Jan 08 21:21:03 2023 +0000
+++ b/net/nagios-base/distinfo Sun Jan 08 23:33:58 2023 +0000
@@ -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
diff -r e8d933b73fa0 -r 23176b0abb1a net/nagios-base/patches/patch-Makefile.in
--- a/net/nagios-base/patches/patch-Makefile.in Sun Jan 08 21:21:03 2023 +0000
+++ b/net/nagios-base/patches/patch-Makefile.in Sun Jan 08 23:33:58 2023 +0000
@@ -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 @@
- @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 @@
- @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 @@
$(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 @@
@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 @@
- $(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 @@
+ ${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 @@
done; \
cd ../..
- @echo ""
-@@ -349,9 +274,12 @@
- @echo ""
+@@ -413,7 +328,10 @@
install-commandmode:
@@ -190,4 +182,3 @@
chmod g+s $(DESTDIR)$(LOGDIR)/rw
@echo ""
- @echo "*** External command directory configured ***"
diff -r e8d933b73fa0 -r 23176b0abb1a net/nagios-base/patches/patch-base_Makefile.in
--- a/net/nagios-base/patches/patch-base_Makefile.in Sun Jan 08 21:21:03 2023 +0000
+++ b/net/nagios-base/patches/patch-base_Makefile.in Sun Jan 08 23:33:58 2023 +0000
@@ -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@
Home |
Main Index |
Thread Index |
Old Index