built only, I don't use this. anyone want to test before it goes in?
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/nagios/nagios/Makefile,v
retrieving revision 1.86
diff -u -p -r1.86 Makefile
--- Makefile 26 Sep 2019 21:59:30 -0000 1.86
+++ Makefile 20 Feb 2021 18:41:11 -0000
@@ -5,22 +5,20 @@ ONLY_FOR_ARCHS= ${LP64_ARCHS} # time_t f
COMMENT-main= host and service monitor
COMMENT-web= cgis and webpages for nagios
-V= 4.3.1
+V= 4.4.6
DISTNAME= nagios-$V
PKGNAME-main= nagios-$V
PKGNAME-web= nagios-web-$V
CATEGORIES= net
-REVISION-main= 1
-REVISION-web= 2
-HOMEPAGE= http://www.nagios.org/
+HOMEPAGE= https://www.nagios.org/
# GPLv2 only
PERMIT_PACKAGE= Yes
MULTI_PACKAGES= -main -web
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nagios/}
+MASTER_SITES= https://assets.nagios.com/downloads/nagioscore/releases/
MODULES= lang/php
@@ -36,7 +34,7 @@ USE_GMAKE= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS+=--datadir=${PREFIX-web}/nagios \
--libexecdir=${PREFIX}/libexec/nagios \
- --sbindir=${PREFIX-web}/cgi-bin/nagios \
+ --with-cgibindir=${PREFIX-web}/cgi-bin/nagios \
--with-cgiurl=/cgi-bin/nagios \
--with-checkresult-dir=/var/spool/nagios \
--with-command-group=www \
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/nagios/nagios/distinfo,v
retrieving revision 1.31
diff -u -p -r1.31 distinfo
--- distinfo 17 Apr 2017 17:29:13 -0000 1.31
+++ distinfo 20 Feb 2021 18:41:11 -0000
@@ -1,2 +1,2 @@
-SHA256 (nagios-4.3.1.tar.gz) = 38L18UbrUIsqKNKK98M47562BDJ+/cUBQmQgJvfnn4I=
-SIZE (nagios-4.3.1.tar.gz) = 11095797
+SHA256 (nagios-4.4.6.tar.gz) = qw1aUsrwHm9NzYQlLE6131ok+Qu3+VHwOHXu9U9asPQ=
+SIZE (nagios-4.4.6.tar.gz) = 11333414
Index: patches/patch-base_Makefile_in
===================================================================
RCS file: /cvs/ports/net/nagios/nagios/patches/patch-base_Makefile_in,v
retrieving revision 1.6
diff -u -p -r1.6 patch-base_Makefile_in
--- patches/patch-base_Makefile_in 7 Nov 2013 10:31:38 -0000 1.6
+++ patches/patch-base_Makefile_in 20 Feb 2021 18:41:11 -0000
@@ -1,15 +1,17 @@
$OpenBSD: patch-base_Makefile_in,v 1.6 2013/11/07 10:31:38 rpe Exp $
---- base/Makefile.in.orig Wed Oct 16 01:36:42 2013
-+++ base/Makefile.in Fri Nov 1 17:45:15 2013
-@@ -180,9 +180,8 @@ install-unstripped:
- $(MAKE) install-basic
+
+Index: base/Makefile.in
+--- base/Makefile.in.orig
++++ base/Makefile.in
+@@ -173,9 +173,8 @@ devclean: distclean
+ 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) @nagios_name@ $(DESTDIR)$(prefix)/sbin
+ $(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)
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/net/nagios/nagios/patches/patch-configure,v
retrieving revision 1.17
diff -u -p -r1.17 patch-configure
--- patches/patch-configure 17 Apr 2017 17:29:13 -0000 1.17
+++ patches/patch-configure 20 Feb 2021 18:41:11 -0000
@@ -1,7 +1,9 @@
$OpenBSD: patch-configure,v 1.17 2017/04/17 17:29:13 rpe Exp $
---- configure.orig Fri Apr 14 13:17:17 2017
-+++ configure Fri Apr 14 13:20:45 2017
-@@ -1085,7 +1085,7 @@ do
+
+Index: configure
+--- configure.orig
++++ configure
+@@ -1137,7 +1137,7 @@ do
ac_prev=sysconfdir ;;
-sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=*
\
| --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
@@ -10,7 +12,7 @@ $OpenBSD: patch-configure,v 1.17 2017/04
-target | --target | --targe | --targ | --tar | --ta | --t)
ac_prev=target_alias ;;
-@@ -4775,7 +4775,7 @@ cat >>confdefs.h <<_ACEOF
+@@ -6240,7 +6240,7 @@ cat >>confdefs.h <<_ACEOF
#define DEFAULT_NAGIOS_GROUP "$nagios_grp"
_ACEOF
@@ -19,7 +21,7 @@ $OpenBSD: patch-configure,v 1.17 2017/04
-@@ -5169,7 +5169,7 @@ $as_echo_n "checking for gdImagePng in -lgd (order 1).
+@@ -6671,7 +6671,7 @@ $as_echo_n "checking for gdImagePng in -lgd (order 1).
$as_echo_n "(cached) " >&6
else
ac_save_LIBS="$LIBS"
@@ -28,16 +30,18 @@ $OpenBSD: patch-configure,v 1.17 2017/04
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any gcc2 internal prototype to avoid an error. */
-@@ -5200,7 +5200,7 @@ fi
+@@ -6702,8 +6702,9 @@ fi
$as_echo "yes" >&6; }
- GDLIBFOUND=yep
+ GDLIBFOUND=yes
- GDLIBS="-lgd -lttf -lpng -ljpeg -lz -lm"
-+ GDLIBS="-lgd -lfontconfig -lfreetype -lpng -ljpeg -lz
-lm"
++ GDLIBS="-lgd -lfontconfig -lfreetype -lpng -ljpeg -lz
-lm"
++
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-@@ -5718,7 +5718,7 @@ $as_echo_n "checking for linker flags for loadable mod
+ $as_echo "no" >&6; }
+@@ -7223,7 +7224,7 @@ $as_echo_n "checking for linker flags for loadable mod
;;
*bsd*)
MOD_LDFLAGS="-shared"
Index: patches/patch-include_config_h_in
===================================================================
RCS file: /cvs/ports/net/nagios/nagios/patches/patch-include_config_h_in,v
retrieving revision 1.9
diff -u -p -r1.9 patch-include_config_h_in
--- patches/patch-include_config_h_in 17 Apr 2017 17:29:13 -0000 1.9
+++ patches/patch-include_config_h_in 20 Feb 2021 18:41:11 -0000
@@ -1,7 +1,9 @@
$OpenBSD: patch-include_config_h_in,v 1.9 2017/04/17 17:29:13 rpe Exp $
---- include/config.h.in.orig Thu Feb 23 21:00:40 2017
-+++ include/config.h.in Fri Apr 14 13:28:45 2017
-@@ -129,11 +129,6 @@
+
+Index: include/config.h.in
+--- include/config.h.in.orig
++++ include/config.h.in
+@@ -135,11 +135,6 @@
#endif
#endif
@@ -13,7 +15,7 @@ $OpenBSD: patch-include_config_h_in,v 1.
#undef HAVE_LIMITS_H
#ifdef HAVE_LIMITS_H
#include <limits.h>
-@@ -221,6 +216,11 @@
+@@ -227,6 +222,11 @@
#undef HAVE_SYS_TIMEB_H
#if HAVE_SYS_TIMEB_H
#include <sys/timeb.h>
Index: patches/patch-sample-config_nagios_cfg_in
===================================================================
RCS file:
/cvs/ports/net/nagios/nagios/patches/patch-sample-config_nagios_cfg_in,v
retrieving revision 1.6
diff -u -p -r1.6 patch-sample-config_nagios_cfg_in
--- patches/patch-sample-config_nagios_cfg_in 17 Apr 2017 17:29:13 -0000
1.6
+++ patches/patch-sample-config_nagios_cfg_in 20 Feb 2021 18:41:11 -0000
@@ -1,8 +1,10 @@
$OpenBSD: patch-sample-config_nagios_cfg_in,v 1.6 2017/04/17 17:29:13 rpe Exp $
---- sample-config/nagios.cfg.in.orig Thu Feb 23 21:00:40 2017
-+++ sample-config/nagios.cfg.in Fri Apr 14 13:28:45 2017
+
+Index: sample-config/nagios.cfg.in
+--- sample-config/nagios.cfg.in.orig
++++ sample-config/nagios.cfg.in
@@ -15,7 +15,7 @@
- # for historical purposes. This should be the first option specified
+ # for historical purposes. This should be the first option specified
# in the config file!!!
-log_file=@localstatedir@/nagios.log
@@ -10,8 +12,8 @@ $OpenBSD: patch-sample-config_nagios_cfg
-@@ -242,7 +242,7 @@ log_rotation_method=d
- # This is the directory where archived (rotated) log files should be
+@@ -243,7 +243,7 @@ log_rotation_method=d
+ # This is the directory where archived (rotated) log files should be
# placed (assuming you've chosen to do log rotation).
-log_archive_path=@localstatedir@/archives
@@ -19,8 +21,8 @@ $OpenBSD: patch-sample-config_nagios_cfg
-@@ -707,7 +707,7 @@ interval_length=60
- # by Nagios Enterprises from the update check is processed in accordance
+@@ -709,7 +709,7 @@ interval_length=60
+ # by Nagios Enterprises from the update check is processed in accordance
# with our privacy policy - see https://api.nagios.org for details.
-check_for_updates=1
Index: patches/patch-sample-config_template-object_localhost_cfg_in
===================================================================
RCS file:
/cvs/ports/net/nagios/nagios/patches/patch-sample-config_template-object_localhost_cfg_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-sample-config_template-object_localhost_cfg_in
--- patches/patch-sample-config_template-object_localhost_cfg_in 7 Nov
2013 10:31:38 -0000 1.2
+++ patches/patch-sample-config_template-object_localhost_cfg_in 20 Feb
2021 18:41:11 -0000
@@ -1,39 +1,42 @@
$OpenBSD: patch-sample-config_template-object_localhost_cfg_in,v 1.2
2013/11/07 10:31:38 rpe Exp $
---- sample-config/template-object/localhost.cfg.in.orig Wed Oct 16
01:36:42 2013
-+++ sample-config/template-object/localhost.cfg.in Fri Nov 1 17:45:15 2013
+
+Index: sample-config/template-object/localhost.cfg.in
+--- sample-config/template-object/localhost.cfg.in.orig
++++ sample-config/template-object/localhost.cfg.in
@@ -4,7 +4,7 @@
#
- # NOTE: This config file is intended to serve as an *extremely* simple
+ # NOTE: This config file is intended to serve as an *extremely* simple
# example of how you can create configuration entries to monitor
-# the local (Linux) machine.
+# the local (OpenBSD) machine.
#
###############################################################################
-@@ -22,9 +22,9 @@
- # Define a host for the local machine
+@@ -20,9 +20,9 @@
- define host{
-- use linux-server ; Name of host
template to use
-+ use openbsd-server ; Name of host
template to use
- ; This host definition
will inherit all variables that are defined
-- ; in (or inherited by)
the linux-server host template definition.
-+ ; in (or inherited by)
the openbsd-server host template definition.
- host_name localhost
- alias localhost
- address 127.0.0.1
-@@ -40,11 +40,11 @@ define host{
-
###############################################################################
+ define host {
+
+- use linux-server ; Name of host template
to use
++ use openbsd-server ; Name of host template
to use
+ ; This host definition
will inherit all variables that are defined
+- ; in (or inherited by)
the linux-server host template definition.
++ ; in (or inherited by)
the openbsd-server host template definition.
+ host_name localhost
+ alias localhost
+ address 127.0.0.1
+@@ -36,12 +36,12 @@ define host {
+ #
###############################################################################
-# Define an optional hostgroup for Linux machines
+# Define an optional hostgroup for OpenBSD machines
- define hostgroup{
-- hostgroup_name linux-servers ; The name of the hostgroup
-- alias Linux Servers ; Long name of the group
-+ hostgroup_name openbsd-servers ; The name of the hostgroup
-+ alias OpenBSD Servers ; Long name of the group
- members localhost ; Comma separated list of hosts that
belong to this group
- }
+ define hostgroup {
+
+- hostgroup_name linux-servers ; The name of the
hostgroup
+- alias Linux Servers ; Long name of the group
++ hostgroup_name openbsd-servers ; The name of the
hostgroup
++ alias OpenBSD Servers ; Long name of the group
+ members localhost ; Comma separated list of
hosts that belong to this group
+ }
Index: patches/patch-sample-config_template-object_templates_cfg_in
===================================================================
RCS file:
/cvs/ports/net/nagios/nagios/patches/patch-sample-config_template-object_templates_cfg_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-sample-config_template-object_templates_cfg_in
--- patches/patch-sample-config_template-object_templates_cfg_in 7 Nov
2013 10:31:38 -0000 1.2
+++ patches/patch-sample-config_template-object_templates_cfg_in 20 Feb
2021 18:41:11 -0000
@@ -1,27 +1,20 @@
$OpenBSD: patch-sample-config_template-object_templates_cfg_in,v 1.2
2013/11/07 10:31:38 rpe Exp $
---- sample-config/template-object/templates.cfg.in.orig Wed Oct 16
01:36:42 2013
-+++ sample-config/template-object/templates.cfg.in Fri Nov 1 17:45:15 2013
-@@ -61,17 +61,17 @@ define host{
- }
+
+Index: sample-config/template-object/templates.cfg.in
+--- sample-config/template-object/templates.cfg.in.orig
++++ sample-config/template-object/templates.cfg.in
+@@ -61,12 +61,12 @@ define host {
--# Linux host definition template - This is NOT a real host, just a template!
-+# OpenBSD host definition template - This is NOT a real host, just a template!
- define host{
-- name linux-server ; The name of this host
template
-+ name openbsd-server ; The name of this host
template
- use generic-host ; This template
inherits other values from the generic-host template
-- check_period 24x7 ; By default, Linux
hosts are checked round the clock
-+ check_period 24x7 ; By default, OpenBSD
hosts are checked round the clock
- check_interval 5 ; Actively check the
host every 5 minutes
- retry_interval 1 ; Schedule host check
retries at 1 minute intervals
-- max_check_attempts 10 ; Check each Linux host
10 times (max)
-- check_command check-host-alive ; Default command to
check Linux hosts
-- notification_period workhours ; Linux admins hate to
be woken up, so we only notify during the day
-+ max_check_attempts 10 ; Check each OpenBSD
host 10 times (max)
-+ check_command check-host-alive ; Default command to
check OpenBSD hosts
-+ notification_period workhours ; OpenBSD admins hate
to be woken up, so we only notify during the day
- ; Note that the
notification_period variable is being overridden from
- ; the value that is
inherited from the generic-host template!
- notification_interval 120 ; Resend notifications
every 2 hours
+-# Linux host definition template
++# OpenBSD host definition template
+ # This is NOT a real host, just a template!
+
+ define host {
+
+- name linux-server ; The name of
this host template
++ name openbsd-server ; The name of
this host template
+ use generic-host ; This template
inherits other values from the generic-host template
+ check_period 24x7 ; By default,
Linux hosts are checked round the clock
+ check_interval 5 ; Actively check
the host every 5 minutes
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/nagios/nagios/pkg/PLIST-main,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST-main
--- pkg/PLIST-main 4 Sep 2018 12:46:18 -0000 1.12
+++ pkg/PLIST-main 20 Feb 2021 18:41:11 -0000
@@ -4,8 +4,9 @@
@newuser _nagios:550:_nagios:daemon:Nagios user:/var/www/nagios:/sbin/nologin
@extraunexec rm -rf ${CHROOT}${SYSCONFDIR}/nagios/*
@extraunexec rm -f ${CHROOT}/var/log/nagios/archives/*
+@rcscript ${RCDIR}/nagios
+@bin bin/nagios
@bin bin/nagiostats
-@bin sbin/nagios
share/doc/pkg-readmes/${PKGSTEM}
share/examples/nagios/
@sample ${CHROOT}${SYSCONFDIR}/nagios/
@@ -53,4 +54,3 @@ share/examples/nagios/resource.cfg
@extra ${CHROOT}/var/nagios/retention.dat
@extra ${CHROOT}/var/nagios/status.dat
@extra ${CHROOT}/var/nagios/rw/nagios.cmd
-@rcscript ${RCDIR}/nagios
Index: pkg/PLIST-web
===================================================================
RCS file: /cvs/ports/net/nagios/nagios/pkg/PLIST-web,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST-web
--- pkg/PLIST-web 17 Apr 2017 17:29:13 -0000 1.11
+++ pkg/PLIST-web 20 Feb 2021 18:41:11 -0000
@@ -19,20 +19,20 @@ cgi-bin/nagios/
@bin cgi-bin/nagios/summary.cgi
@bin cgi-bin/nagios/tac.cgi
@bin cgi-bin/nagios/trends.cgi
-conf/modules.sample/nagios.conf.dist
@sample /var/www/conf/modules.sample/
+conf/modules.sample/nagios.conf.dist
@sample /var/www/conf/modules.sample/nagios.conf
nagios/angularjs/
nagios/angularjs/angular-1.3.9/
nagios/angularjs/angular-1.3.9/angular.min.js
nagios/angularjs/angular-1.3.9/angular.min.js.map
-nagios/angularjs/ui-bootstrap-tpls-0.12.0.min.js
-nagios/angularjs/ui-utils-0.2.1/
-nagios/angularjs/ui-utils-0.2.1/ui-utils.js
-nagios/bootstrap-3.3.0/
-nagios/bootstrap-3.3.0/css/
-nagios/bootstrap-3.3.0/css/bootstrap-theme.min.css
-nagios/bootstrap-3.3.0/css/bootstrap.min.css
+nagios/angularjs/ui-bootstrap-tpls-0.14.3.min.js
+nagios/angularjs/ui-utils-0.2.3/
+nagios/angularjs/ui-utils-0.2.3/ui-utils.js
+nagios/bootstrap-3.3.7/
+nagios/bootstrap-3.3.7/css/
+nagios/bootstrap-3.3.7/css/bootstrap-theme.min.css
+nagios/bootstrap-3.3.7/css/bootstrap.min.css
nagios/config.inc.php
nagios/contexthelp/
nagios/contexthelp/A1.html
@@ -377,7 +377,7 @@ nagios/js/histogram-events.js
nagios/js/histogram-form.js
nagios/js/histogram-graph.js
nagios/js/histogram.js
-nagios/js/jquery-1.7.1.min.js
+nagios/js/jquery-1.12.4.min.js
nagios/js/jsonquery.js
nagios/js/map-directive.js
nagios/js/map-form.js
Index: pkg/nagios.rc
===================================================================
RCS file: /cvs/ports/net/nagios/nagios/pkg/nagios.rc,v
retrieving revision 1.3
diff -u -p -r1.3 nagios.rc
--- pkg/nagios.rc 11 Jan 2018 19:27:06 -0000 1.3
+++ pkg/nagios.rc 20 Feb 2021 18:41:11 -0000
@@ -2,7 +2,7 @@
#
# $OpenBSD: nagios.rc,v 1.3 2018/01/11 19:27:06 rpe Exp $
-daemon="${TRUEPREFIX}/sbin/nagios -d"
+daemon="${TRUEPREFIX}/bin/nagios -d"
daemon_flags="${SYSCONFDIR}/nagios/nagios.cfg"
. /etc/rc.d/rc.subr
