cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Major update of nagios to version 4.0.1

Browse Source 
See http://nagios.sourceforge.net/docs/nagioscore/4/en/whatsnew.html

with feedback and ok sthen@
This commit is contained in:
rpe 2013-11-07 10:31:38 +00:00
parent a24e606dac
commit 9cd44f2e45
14 changed files with 78 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
net/nagios/nagios/Makefile
View File

@ -1,16 +1,13 @@
# $OpenBSD: Makefile,v 1.62 2013/08/14 11:29:26 sthen Exp $
# $OpenBSD: Makefile,v 1.63 2013/11/07 10:31:38 rpe Exp $
COMMENT-main= host and service monitor
COMMENT-web= cgis and webpages for nagios
V= 3.5.0
V= 4.0.1
DISTNAME= nagios-$V
PKGNAME-main= nagios-$V
PKGNAME-web= nagios-web-$V
WRKDIST= ${WRKDIR}/nagios
CATEGORIES= net
REVISION-main= 1
REVISION-web= 0
HOMEPAGE= http://www.nagios.org/
@ -29,6 +26,8 @@ RUN_DEPENDS-main= net/nagios/plugins
LOCALSTATEDIR= ${BASELOCALSTATEDIR}/nagios
USE_GMAKE= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS+=--datadir=${PREFIX-web}/nagios \
--libexecdir=${PREFIX}/libexec/nagios \
@ -65,14 +64,16 @@ PREFIX-web= ${VARBASE}/www
.if ${FLAVOR:Mchroot}
WANTLIB-web=
LIB_DEPENDS-web=
RUN_DEPENDS-web= nagios-${V}-chroot:net/nagios/nagios,chroot
RUN_DEPENDS-web= nagios-${V}-chroot:net/nagios/nagios,chroot \
lang/php/${MODPHP_VERSION},-gd
.else
WANTLIB-web= ${WANTLIB} fontconfig freetype gd jpeg png z
LIB_DEPENDS-web= graphics/gd
RUN_DEPENDS-web= nagios-${V}-!chroot:net/nagios/nagios
RUN_DEPENDS-web= nagios-${V}-!chroot:net/nagios/nagios \
lang/php/${MODPHP_VERSION},-gd
.endif
WANTLIB-main= ${WANTLIB} ltdl>=4 pthread
WANTLIB-main= ${WANTLIB} ltdl>=4
NO_TEST= Yes

4
net/nagios/nagios/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (nagios-3.5.0.tar.gz) = RpOBspVDkmichdPbcz6NpL1DuAaz1mHRp/vVLazAhNs=
SIZE (nagios-3.5.0.tar.gz) = 1789376
SHA256 (nagios-4.0.1.tar.gz) = brZxh+8/96adzQKnFydBuM0TOUOYgatRfehrcjfW9zU=
SIZE (nagios-4.0.1.tar.gz) = 1695367

8
net/nagios/nagios/patches/patch-base_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-base_Makefile_in,v 1.5 2011/09/05 14:56:46 sthen Exp $
--- base/Makefile.in.orig Sat Oct 23 11:00:59 2010
+++ base/Makefile.in Tue Jul 26 13:58:39 2011
@@ -204,9 +204,8 @@ install-unstripped:
$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
install-basic:

8
net/nagios/nagios/patches/patch-cgi_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-cgi_Makefile_in,v 1.5 2011/09/05 14:56:46 sthen Exp $
--- cgi/Makefile.in.orig Sat Oct 23 11:00:59 2010
+++ cgi/Makefile.in Tue Jul 26 13:58:39 2011
@@ -201,9 +201,9 @@ install-unstripped:
$OpenBSD: patch-cgi_Makefile_in,v 1.6 2013/11/07 10:31:38 rpe Exp $
--- cgi/Makefile.in.orig Wed Oct 16 01:36:42 2013
+++ cgi/Makefile.in Fri Nov 1 17:45:15 2013
@@ -182,9 +182,9 @@ install-unstripped:
$(MAKE) install-basic
install-basic:

28
net/nagios/nagios/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.14 2013/06/01 14:18:40 ajacoutot Exp $
--- configure.orig Fri Mar 15 12:14:02 2013
+++ configure Mon May 6 00:05:06 2013
@@ -572,7 +572,7 @@ do
$OpenBSD: patch-configure,v 1.15 2013/11/07 10:31:38 rpe Exp $
--- configure.orig Wed Oct 16 01:36:42 2013
+++ configure Fri Nov 1 17:47:13 2013
@@ -1077,7 +1077,7 @@ do
ac_prev=sysconfdir ;;
-sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
| --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.14 2013/06/01 14:18:40 ajacoutot Exp $
-target | --target | --targe | --targ | --tar | --ta | --t)
ac_prev=target_alias ;;
@@ -5666,7 +5666,7 @@ cat >>confdefs.h <<_ACEOF
@@ -4633,7 +4633,7 @@ cat >>confdefs.h <<_ACEOF
#define DEFAULT_NAGIOS_GROUP "$nagios_grp"
_ACEOF
@ -19,25 +19,25 @@ $OpenBSD: patch-configure,v 1.14 2013/06/01 14:18:40 ajacoutot Exp $
@@ -6047,7 +6047,7 @@ echo $ECHO_N "checking for gdImagePng in -lgd (order 1
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4890,7 +4890,7 @@ $as_echo_n "checking for gdImagePng in -lgd (order 1).
$as_echo_n "(cached) " >&6
else
ac_save_LIBS="$LIBS"
- LIBS="-lgd -lttf -lpng -ljpeg -lz -lm $LIBS"
+ LIBS="-lgd -lfontconfig -lfreetype -lpng -ljpeg -lz -lm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -6106,7 +6106,7 @@ fi
echo "${ECHO_T}yes" >&6
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any gcc2 internal prototype to avoid an error. */
@@ -4921,7 +4921,7 @@ fi
$as_echo "yes" >&6; }
GDLIBFOUND=yep
- GDLIBS="-lgd -lttf -lpng -ljpeg -lz -lm"
+ GDLIBS="-lgd -lfontconfig -lfreetype -lpng -ljpeg -lz -lm"
else
echo "$as_me:$LINENO: result: no" >&5
@@ -7119,9 +7119,9 @@ echo $ECHO_N "checking for linker flags for loadable m
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -5432,9 +5432,9 @@ $as_echo_n "checking for linker flags for loadable mod
MOD_LDFLAGS="-shared"
MOD_CFLAGS="-fPIC"
;;

10
net/nagios/nagios/patches/patch-include_config_h_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-include_config_h_in,v 1.7 2011/09/05 14:56:46 sthen Exp $
--- include/config.h.in.orig Sat Oct 23 10:56:29 2010
+++ include/config.h.in Tue Jul 26 13:58:39 2011
@@ -135,11 +135,6 @@
$OpenBSD: patch-include_config_h_in,v 1.8 2013/11/07 10:31:38 rpe Exp $
--- include/config.h.in.orig Wed Oct 16 01:36:42 2013
+++ include/config.h.in Fri Nov 1 17:45:15 2013
@@ -128,11 +128,6 @@
#endif
#endif
@ -13,7 +13,7 @@ $OpenBSD: patch-include_config_h_in,v 1.7 2011/09/05 14:56:46 sthen Exp $
#undef HAVE_LIMITS_H
#ifdef HAVE_LIMITS_H
#include <limits.h>
@@ -218,6 +213,11 @@
@@ -211,6 +206,11 @@
#undef HAVE_SYS_TIMEB_H
#if HAVE_SYS_TIMEB_H
#include <sys/timeb.h>

8
net/nagios/nagios/patches/patch-include_locations_h_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-include_locations_h_in,v 1.3 2008/03/18 20:25:11 sturm Exp $
--- include/locations.h.in.orig Sat Sep 1 09:14:45 2007
+++ include/locations.h.in Sat Sep 1 09:16:32 2007
@@ -22,8 +22,8 @@
$OpenBSD: patch-include_locations_h_in,v 1.4 2013/11/07 10:31:38 rpe Exp $
--- include/locations.h.in.orig Wed Oct 16 01:36:42 2013
+++ include/locations.h.in Fri Nov 1 17:45:15 2013
@@ -21,8 +21,8 @@
#define DEFAULT_TEMP_PATH "/tmp"
#define DEFAULT_CHECK_RESULT_PATH "@localstatedir@/spool/checkresults"
#define DEFAULT_STATUS_FILE "@localstatedir@/status.dat"

8
net/nagios/nagios/patches/patch-sample-config_cgi_cfg_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sample-config_cgi_cfg_in,v 1.5 2009/09/12 12:35:20 sturm Exp $
--- sample-config/cgi.cfg.in.orig Wed Jun 17 17:13:52 2009
+++ sample-config/cgi.cfg.in Thu Sep 10 07:13:52 2009
@@ -264,7 +264,7 @@ default_statuswrl_layout=4
$OpenBSD: patch-sample-config_cgi_cfg_in,v 1.6 2013/11/07 10:31:38 rpe Exp $
--- sample-config/cgi.cfg.in.orig Wed Oct 16 01:36:42 2013
+++ sample-config/cgi.cfg.in Fri Nov 1 17:45:15 2013
@@ -263,7 +263,7 @@ default_statuswrl_layout=4
# OS and distribution, so you may have to tweak this to
# work on your system.

10
net/nagios/nagios/patches/patch-sample-config_httpd_conf_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sample-config_httpd_conf_in,v 1.2 2006/01/15 13:37:44 sturm Exp $
--- sample-config/httpd.conf.in.orig Sun Jan 15 14:08:18 2006
+++ sample-config/httpd.conf.in Sun Jan 15 14:11:15 2006
@@ -11,16 +11,15 @@ ScriptAlias @cgiurl@ "@sbindir@"
$OpenBSD: patch-sample-config_httpd_conf_in,v 1.3 2013/11/07 10:31:38 rpe Exp $
--- sample-config/httpd.conf.in.orig Wed Oct 16 01:36:42 2013
+++ sample-config/httpd.conf.in Fri Nov 1 17:45:15 2013
@@ -10,16 +10,15 @@ ScriptAlias @cgiurl@ "@sbindir@"
<Directory "@sbindir@">
# SSLRequireSSL
Options ExecCGI
@ -24,7 +24,7 @@ $OpenBSD: patch-sample-config_httpd_conf_in,v 1.2 2006/01/15 13:37:44 sturm Exp
</Directory>
Alias @htmurl@ "@datadir@"
@@ -29,14 +28,14 @@ Alias @htmurl@ "@datadir@"
@@ -28,14 +27,14 @@ Alias @htmurl@ "@datadir@"
# SSLRequireSSL
Options None
AllowOverride None

12
net/nagios/nagios/patches/patch-sample-config_nagios_cfg_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sample-config_nagios_cfg_in,v 1.4 2013/01/14 12:14:21 sthen Exp $
--- sample-config/nagios.cfg.in.orig Mon Nov 12 18:33:37 2012
+++ sample-config/nagios.cfg.in Mon Jan 14 12:12:34 2013
@@ -16,7 +16,7 @@
$OpenBSD: patch-sample-config_nagios_cfg_in,v 1.5 2013/11/07 10:31:38 rpe Exp $
--- sample-config/nagios.cfg.in.orig Wed Oct 16 01:36:42 2013
+++ sample-config/nagios.cfg.in Fri Nov 1 17:45:15 2013
@@ -15,7 +15,7 @@
# for historical purposes. This should be the first option specified
# in the config file!!!
@ -10,7 +10,7 @@ $OpenBSD: patch-sample-config_nagios_cfg_in,v 1.4 2013/01/14 12:14:21 sthen Exp
@@ -264,7 +264,7 @@ log_rotation_method=d
@@ -242,7 +242,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).
@ -19,7 +19,7 @@ $OpenBSD: patch-sample-config_nagios_cfg_in,v 1.4 2013/01/14 12:14:21 sthen Exp
@@ -728,7 +728,7 @@ interval_length=60
@@ -707,7 +707,7 @@ interval_length=60
# by Nagios Enterprises from the update check is processed in accordance
# with our privacy policy - see http://api.nagios.org for details.

12
net/nagios/nagios/patches/patch-sample-config_template-object_localhost_cfg_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sample-config_template-object_localhost_cfg_in,v 1.1 2008/03/18 20:25:11 sturm Exp $
--- sample-config/template-object/localhost.cfg.in.orig Sat Sep 1 10:20:47 2007
+++ sample-config/template-object/localhost.cfg.in Sat Sep 1 10:21:21 2007
@@ -5,7 +5,7 @@
$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
@@ -4,7 +4,7 @@
#
# NOTE: This config file is intended to serve as an *extremely* simple
# example of how you can create configuration entries to monitor
@ -10,7 +10,7 @@ $OpenBSD: patch-sample-config_template-object_localhost_cfg_in,v 1.1 2008/03/18
#
###############################################################################
@@ -23,9 +23,9 @@
@@ -22,9 +22,9 @@
# Define a host for the local machine
define host{
@ -22,7 +22,7 @@ $OpenBSD: patch-sample-config_template-object_localhost_cfg_in,v 1.1 2008/03/18
host_name localhost
alias localhost
address 127.0.0.1
@@ -41,11 +41,11 @@ define host{
@@ -40,11 +40,11 @@ define host{
###############################################################################
###############################################################################

8
net/nagios/nagios/patches/patch-sample-config_template-object_templates_cfg_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sample-config_template-object_templates_cfg_in,v 1.1 2008/03/18 20:25:11 sturm Exp $
--- sample-config/template-object/templates.cfg.in.orig Sat Sep 1 10:21:28 2007
+++ sample-config/template-object/templates.cfg.in Sat Sep 1 10:22:01 2007
@@ -63,17 +63,17 @@ define host{
$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{
}

18
net/nagios/nagios/pkg/DESCR-main
View File

@ -1,11 +1,11 @@
Nagios is a host and service monitor designed to inform you of network
problems before your clients, end-users or managers do. The monitoring
daemon runs intermittent checks on hosts and services you specify using
external "plugins" which return status information to Nagios. When problems
are encountered, the daemon can send notifications out to administrative
contacts in a variety of different ways (email, instant message, SMS, etc.).
Current status information, historical logs, and reports can all be accessed
via a web browser.
Nagios is a host and service monitor designed to inform you of
network problems before your clients, end-users or managers do.
The monitoring daemon runs intermittent checks on hosts and services
you specify using external "plugins" which return status information
to Nagios. When problems are encountered, the daemon can send
notifications out to administrative contacts in a variety of different
ways (email, instant message, SMS, etc.). Current status information,
historical logs, and reports can all be accessed via a web browser.
FLAVORS:
chroot install Nagios in a way suited for chroot'ed httpd
chroot install Nagios in a way suited for chroot'ed httpd

4
net/nagios/nagios/pkg/README-main
View File

@ -1,4 +1,4 @@
$OpenBSD: README-main,v 1.1 2013/05/05 22:13:48 rpe Exp $
$OpenBSD: README-main,v 1.2 2013/11/07 10:31:38 rpe Exp $
+-----------------------------------------------------------------------
| Running ${FULLPKGNAME} on OpenBSD
@ -8,7 +8,7 @@ Getting Started
===============
The main documentation for Nagios is provided online at
http://nagios.sourceforge.net/docs/nagioscore/3/en/.
http://nagios.sourceforge.net/docs/nagioscore/4/en/.
The included sample configuration carries out some simple checks
on the local machine; these should work as-is.