update to icinga 1.5.1

This commit is contained in:
sthen 2011-09-22 15:25:28 +00:00
parent 68a5e76a98
commit 4f746599a8
11 changed files with 80 additions and 75 deletions

View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile.inc,v 1.7 2011/07/19 11:13:26 sthen Exp $
# $OpenBSD: Makefile.inc,v 1.8 2011/09/22 15:25:28 sthen Exp $
V ?= 1.4.2
V ?= 1.5.1
CATEGORIES+= net net/icinga

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.15 2011/09/16 11:13:38 espie Exp $
# $OpenBSD: Makefile,v 1.16 2011/09/22 15:25:28 sthen Exp $
COMMENT-main = network monitoring system (improved fork of Nagios)
COMMENT-cgi = cgi scripts for Icinga (classic Nagios-style UI)
@ -11,11 +11,6 @@ PKGNAME-cgi = icinga-cgi-$V
PKGNAME-ido = icinga-idoutils-$V
PKGNAME-api = icinga-api-$V
REVISION-main = 3
REVISION-cgi = 1
REVISION-api = 2
REVISION-ido = 2
MULTI_PACKAGES = -main -cgi -api -ido
PREFIX-cgi = /var/www
PREFIX-api = /var/www
@ -61,6 +56,8 @@ CONFIGURE_ARGS += \
--with-icinga-group=_icinga \
--with-icinga-user=_icinga \
--with-lockfile=/var/run/icinga/icinga.pid \
--with-log-dir=/var/log/icinga \
--with-p1-file-dir=${PREFIX}/bin \
--enable-embedded-perl \
--enable-idoutils \
--enable-ssl

View File

@ -1,5 +1,5 @@
MD5 (icinga-1.4.2.tar.gz) = RJf7k+j9eE6mizZ0jKeShQ==
RMD160 (icinga-1.4.2.tar.gz) = uyFW0o+SAOdtM7nv6GncmX+K6Ck=
SHA1 (icinga-1.4.2.tar.gz) = DMdxWEFKvanRlSGdP4Hd/45Anic=
SHA256 (icinga-1.4.2.tar.gz) = UGAiSTKVvalaolFL/cMZYGPtk2ZVvGAGj2FUNQS0KqY=
SIZE (icinga-1.4.2.tar.gz) = 15379151
MD5 (icinga-1.5.1.tar.gz) = /Aef3aQ/whn5tYDCRrZ/VQ==
RMD160 (icinga-1.5.1.tar.gz) = ly0eTdSf3d8ylwhovRaWTH482H0=
SHA1 (icinga-1.5.1.tar.gz) = Yb1HU16fSeY+DuHvK7VtYuaJNBg=
SHA256 (icinga-1.5.1.tar.gz) = sswjq4uW6UCc4+ftSg4aq+p/m06dUh9e0jqZ6hyew3s=
SIZE (icinga-1.5.1.tar.gz) = 16518659

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-cgi_Makefile_in,v 1.1.1.1 2011/03/28 14:06:08 sthen Exp $
$OpenBSD: patch-cgi_Makefile_in,v 1.2 2011/09/22 15:25:28 sthen Exp $
Allows for simpler use in a chroot jail
--- cgi/Makefile.in.orig Sat Mar 19 11:50:20 2011
+++ cgi/Makefile.in Sat Mar 19 11:50:29 2011
@@ -34,7 +34,7 @@ CFLAGS=@CFLAGS@ @DEFS@ -DNSCGI
--- cgi/Makefile.in.orig Wed Aug 24 14:57:57 2011
+++ cgi/Makefile.in Wed Aug 24 22:23:40 2011
@@ -36,7 +36,7 @@ CFLAGS=@CFLAGS@ @DEFS@ -DNSCGI
#CFLAGS_DEBUG=-ggdb3 -g3
#CFLAGS+=$(CFLAGS_WARN) $(CFLAGS_DEBUG)

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.2 2011/05/11 13:57:41 sthen Exp $
--- configure.orig Wed May 11 08:43:54 2011
+++ configure Wed May 11 10:40:30 2011
@@ -4797,20 +4797,20 @@ fi
$OpenBSD: patch-configure,v 1.3 2011/09/22 15:25:28 sthen Exp $
--- configure.orig Wed Aug 24 14:57:57 2011
+++ configure Wed Aug 24 22:23:40 2011
@@ -4821,20 +4821,20 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cma_pthread_create" >&5
$as_echo "$ac_cv_lib_cma_pthread_create" >&6; }
if test "x$ac_cv_lib_cma_pthread_create" = xyes; then :
@ -26,7 +26,7 @@ $OpenBSD: patch-configure,v 1.2 2011/05/11 13:57:41 sthen Exp $
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -4841,7 +4841,7 @@ fi
@@ -4865,7 +4865,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
@ -35,7 +35,7 @@ $OpenBSD: patch-configure,v 1.2 2011/05/11 13:57:41 sthen Exp $
fi
if test $ac_cv_lib_pthread_pthread_create = yes; then
@@ -5132,7 +5132,7 @@ cat >>confdefs.h <<_ACEOF
@@ -5156,7 +5156,7 @@ cat >>confdefs.h <<_ACEOF
#define DEFAULT_NAGIOS_GROUP "$icinga_grp"
_ACEOF
@ -44,7 +44,7 @@ $OpenBSD: patch-configure,v 1.2 2011/05/11 13:57:41 sthen Exp $
@@ -5153,7 +5153,7 @@ fi
@@ -5177,7 +5177,7 @@ fi
@ -52,8 +52,8 @@ $OpenBSD: patch-configure,v 1.2 2011/05/11 13:57:41 sthen Exp $
+COMMAND_OPTS=""
MAIL_PROG=no
@@ -5502,7 +5502,7 @@ $as_echo_n "checking for gdImagePng in -lgd (order 1).
@@ -5646,7 +5646,7 @@ $as_echo_n "checking for gdImagePng in -lgd (order 1).
$as_echo_n "(cached) " >&6
else
ac_save_LIBS="$LIBS"
@ -62,7 +62,7 @@ $OpenBSD: patch-configure,v 1.2 2011/05/11 13:57:41 sthen Exp $
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any gcc2 internal prototype to avoid an error. */
@@ -5533,7 +5533,7 @@ fi
@@ -5677,7 +5677,7 @@ fi
$as_echo "yes" >&6; }
GDLIBFOUND=yep
@ -71,7 +71,7 @@ $OpenBSD: patch-configure,v 1.2 2011/05/11 13:57:41 sthen Exp $
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -6789,7 +6789,7 @@ $as_echo_n "checking for SSL libraries... " >&6; }
@@ -6941,7 +6941,7 @@ $as_echo_n "checking for SSL libraries... " >&6; }
found_ssl=no
for dir in $ssl_lib_dir $ssl_dir /usr/lib64 /usr/lib /usr/local/lib /usr/lib/ssl /usr/ssl/lib /usr/openssl/lib /usr/pkg/lib /usr/freeware/lib/openssl; do
ssllibdir="$dir"

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-module_icinga-api_Makefile_in,v 1.1.1.1 2011/03/28 14:06:08 sthen Exp $
$OpenBSD: patch-module_icinga-api_Makefile_in,v 1.2 2011/09/22 15:25:28 sthen Exp $
Otherwise it tries to install the API owned by _icinga:_icinga,
possibly before the user was created by pkg_add.
--- module/icinga-api/Makefile.in.orig Thu Mar 24 12:59:25 2011
+++ module/icinga-api/Makefile.in Thu Mar 24 13:00:46 2011
@@ -10,7 +10,7 @@ BINDIR=@bindir@
--- module/icinga-api/Makefile.in.orig Fri Jul 15 20:04:42 2011
+++ module/icinga-api/Makefile.in Wed Aug 24 22:23:40 2011
@@ -12,7 +12,7 @@ BINDIR=@bindir@
CGIDIR=@sbindir@
HTMLDIR=@datarootdir@
INSTALL=@INSTALL@

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-sample-config_cgi_cfg_in,v 1.2 2011/05/11 13:57:41 sthen Exp $
--- sample-config/cgi.cfg.in.orig Wed May 11 08:43:54 2011
+++ sample-config/cgi.cfg.in Wed May 11 10:38:33 2011
@@ -345,7 +345,10 @@ default_statuswrl_layout=4
$OpenBSD: patch-sample-config_cgi_cfg_in,v 1.3 2011/09/22 15:25:28 sthen Exp $
--- sample-config/cgi.cfg.in.orig Wed Aug 24 14:57:57 2011
+++ sample-config/cgi.cfg.in Wed Aug 24 22:23:40 2011
@@ -382,7 +382,10 @@ default_statuswrl_layout=4
# OS and distribution, so you may have to tweak this to
# work on your system.

View File

@ -1,25 +1,7 @@
$OpenBSD: patch-sample-config_icinga_cfg_in,v 1.3 2011/05/11 13:57:41 sthen Exp $
--- sample-config/icinga.cfg.in.orig Wed May 11 08:43:54 2011
+++ sample-config/icinga.cfg.in Wed May 11 10:38:33 2011
@@ -14,7 +14,7 @@
# for historical purposes. This should be the first option specified
# in the config file!!!
-log_file=@localstatedir@/icinga.log
+log_file=/var/log/icinga/icinga.log
@@ -267,7 +267,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
+log_archive_path=/var/log/icinga/archives
@@ -1233,7 +1233,7 @@ enable_embedded_perl=1
$OpenBSD: patch-sample-config_icinga_cfg_in,v 1.4 2011/09/22 15:25:28 sthen Exp $
--- sample-config/icinga.cfg.in.orig Wed Aug 24 14:57:57 2011
+++ sample-config/icinga.cfg.in Wed Aug 24 22:23:40 2011
@@ -1263,7 +1263,7 @@ enable_embedded_perl=0
# the HTML documentation on the embedded Perl interpreter for more
# information on how this option works.
@ -28,7 +10,7 @@ $OpenBSD: patch-sample-config_icinga_cfg_in,v 1.3 2011/05/11 13:57:41 sthen Exp
@@ -1306,8 +1306,8 @@ use_true_regexp_matching=0
@@ -1336,8 +1336,8 @@ use_true_regexp_matching=0
# using the $ADMINEMAIL$ and $ADMINPAGER$ macros in your notification
# commands.

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-cgi,v 1.5 2011/07/01 16:57:41 sthen Exp $
@comment $OpenBSD: PLIST-cgi,v 1.6 2011/09/22 15:25:28 sthen Exp $
cgi-bin/icinga/
@bin cgi-bin/icinga/avail.cgi
@bin cgi-bin/icinga/cmd.cgi
@ -92,6 +92,7 @@ icinga-cgi/docs/de/addons.html
icinga-cgi/docs/de/beginners.html
icinga-cgi/docs/de/cachedchecks.html
icinga-cgi/docs/de/cgiauth.html
icinga-cgi/docs/de/cgicmd.html
icinga-cgi/docs/de/cgiincludes.html
icinga-cgi/docs/de/cgiparams.html
icinga-cgi/docs/de/cgis.html
@ -172,6 +173,7 @@ icinga-cgi/docs/de/oncallrotation.html
icinga-cgi/docs/de/passivechecks.html
icinga-cgi/docs/de/passivestatetranslation.html
icinga-cgi/docs/de/perfdata.html
icinga-cgi/docs/de/perfgraphs.html
icinga-cgi/docs/de/pluginapi.html
icinga-cgi/docs/de/plugins.html
icinga-cgi/docs/de/quickstart-icinga-freebsd.html
@ -186,6 +188,7 @@ icinga-cgi/docs/de/servicechecks.html
icinga-cgi/docs/de/stalking.html
icinga-cgi/docs/de/startstop.html
icinga-cgi/docs/de/statetypes.html
icinga-cgi/docs/de/temp_data.html
icinga-cgi/docs/de/timeperiods.html
icinga-cgi/docs/de/tuning.html
icinga-cgi/docs/de/upgrading.html
@ -202,6 +205,7 @@ icinga-cgi/docs/en/addons.html
icinga-cgi/docs/en/beginners.html
icinga-cgi/docs/en/cachedchecks.html
icinga-cgi/docs/en/cgiauth.html
icinga-cgi/docs/en/cgicmd.html
icinga-cgi/docs/en/cgiincludes.html
icinga-cgi/docs/en/cgiparams.html
icinga-cgi/docs/en/cgis.html
@ -283,6 +287,7 @@ icinga-cgi/docs/en/oncallrotation.html
icinga-cgi/docs/en/passivechecks.html
icinga-cgi/docs/en/passivestatetranslation.html
icinga-cgi/docs/en/perfdata.html
icinga-cgi/docs/en/perfgraphs.html
icinga-cgi/docs/en/pluginapi.html
icinga-cgi/docs/en/plugins.html
icinga-cgi/docs/en/quickstart-icinga-freebsd.html
@ -297,6 +302,7 @@ icinga-cgi/docs/en/servicechecks.html
icinga-cgi/docs/en/stalking.html
icinga-cgi/docs/en/startstop.html
icinga-cgi/docs/en/statetypes.html
icinga-cgi/docs/en/temp_data.html
icinga-cgi/docs/en/timeperiods.html
icinga-cgi/docs/en/tuning.html
icinga-cgi/docs/en/upgrading.html
@ -384,32 +390,45 @@ icinga-cgi/docs/images/icinga-web-admin_users1.png
icinga-cgi/docs/images/icinga-web-admin_users2.png
icinga-cgi/docs/images/icinga-web-commands_hst.png
icinga-cgi/docs/images/icinga-web-commands_hst_1.3.png
icinga-cgi/docs/images/icinga-web-commands_hst_1.5.png
icinga-cgi/docs/images/icinga-web-commands_svc.png
icinga-cgi/docs/images/icinga-web-commands_svc_1.3.png
icinga-cgi/docs/images/icinga-web-commands_svc_1.5.png
icinga-cgi/docs/images/icinga-web-cronks1.png
icinga-cgi/docs/images/icinga-web-cronks1_1.3.png
icinga-cgi/docs/images/icinga-web-cronks1_1.5.png
icinga-cgi/docs/images/icinga-web-cronks2.png
icinga-cgi/docs/images/icinga-web-cronks2_1.3.png
icinga-cgi/docs/images/icinga-web-cronks2_1.5.png
icinga-cgi/docs/images/icinga-web-cronks2a.png
icinga-cgi/docs/images/icinga-web-cronks3.png
icinga-cgi/docs/images/icinga-web-cronks3_1.3.png
icinga-cgi/docs/images/icinga-web-cronks3_1.5.png
icinga-cgi/docs/images/icinga-web-filter1.png
icinga-cgi/docs/images/icinga-web-filter1_1.3.png
icinga-cgi/docs/images/icinga-web-filter2.png
icinga-cgi/docs/images/icinga-web-filter2_1.3.png
icinga-cgi/docs/images/icinga-web-filter3.png
icinga-cgi/docs/images/icinga-web-host_1.5.png
icinga-cgi/docs/images/icinga-web-hostgroup_1.5.png
icinga-cgi/docs/images/icinga-web-log.png
icinga-cgi/docs/images/icinga-web-log_1.3.png
icinga-cgi/docs/images/icinga-web-login.png
icinga-cgi/docs/images/icinga-web-main_bar.png
icinga-cgi/docs/images/icinga-web-mainscreen1.png
icinga-cgi/docs/images/icinga-web-mainscreen1_1.3.png
icinga-cgi/docs/images/icinga-web-mainscreen1_1.5.png
icinga-cgi/docs/images/icinga-web-open_problems.png
icinga-cgi/docs/images/icinga-web-overview.png
icinga-cgi/docs/images/icinga-web-overview_1.3.png
icinga-cgi/docs/images/icinga-web-overview_1.5.png
icinga-cgi/docs/images/icinga-web-search1.png
icinga-cgi/docs/images/icinga-web-search1_1.3.png
icinga-cgi/docs/images/icinga-web-settings.png
icinga-cgi/docs/images/icinga-web-settings_1.5.png
icinga-cgi/docs/images/icinga-web-srv_1.5.png
icinga-cgi/docs/images/icinga-web-statuscronk.png
icinga-cgi/docs/images/icinga-web-statuscronk_1.5.png
icinga-cgi/docs/images/icinga-web-topmenu1.png
icinga-cgi/docs/images/icinga-web-topmenu2.png
icinga-cgi/docs/images/icinga-web-topmenu2_1.3.png
@ -424,18 +443,6 @@ icinga-cgi/docs/images/logofullsize.png
icinga-cgi/docs/images/monitoring-printers.png
icinga-cgi/docs/images/monitoring-routers.png
icinga-cgi/docs/images/monitoring-windows.png
icinga-cgi/docs/images/mrtg-activehostchecks.png
icinga-cgi/docs/images/mrtg-activelychecked.png
icinga-cgi/docs/images/mrtg-activeservicechecks.png
icinga-cgi/docs/images/mrtg-cachedchecks.png
icinga-cgi/docs/images/mrtg-commandbuffers.png
icinga-cgi/docs/images/mrtg-externalcommands.png
icinga-cgi/docs/images/mrtg-hostperfstats.png
icinga-cgi/docs/images/mrtg-hoststatechange.png
icinga-cgi/docs/images/mrtg-passivechecks.png
icinga-cgi/docs/images/mrtg-passivelychecked.png
icinga-cgi/docs/images/mrtg-serviceperfstats.png
icinga-cgi/docs/images/mrtg-servicestatechange.png
icinga-cgi/docs/images/multiple-templates1.png
icinga-cgi/docs/images/multiple-templates2.png
icinga-cgi/docs/images/nagios.jpg
@ -457,6 +464,15 @@ icinga-cgi/docs/images/objects-services.png
icinga-cgi/docs/images/objects-timeperiods.png
icinga-cgi/docs/images/passivechecks.png
icinga-cgi/docs/images/passivehosttranslation.png
icinga-cgi/docs/images/perfdata_cached.png
icinga-cgi/docs/images/perfdata_cached2.png
icinga-cgi/docs/images/perfdata_cmdbuf.png
icinga-cgi/docs/images/perfdata_exec.png
icinga-cgi/docs/images/perfdata_extcmd.png
icinga-cgi/docs/images/perfdata_host.png
icinga-cgi/docs/images/perfdata_lat.png
icinga-cgi/docs/images/perfdata_state_chg.png
icinga-cgi/docs/images/perfdata_svc.png
icinga-cgi/docs/images/plugins.png
icinga-cgi/docs/images/predictive-dependency-checks.png
icinga-cgi/docs/images/printer.png
@ -511,6 +527,10 @@ icinga-cgi/images/down.gif
icinga-cgi/images/downtime.gif
icinga-cgi/images/empty.gif
icinga-cgi/images/enabled.gif
icinga-cgi/images/export_csv.png
icinga-cgi/images/export_json.png
icinga-cgi/images/export_link.png
icinga-cgi/images/export_xml.png
icinga-cgi/images/extinfo.gif
icinga-cgi/images/favicon.ico
icinga-cgi/images/flapping.gif
@ -591,7 +611,8 @@ icinga-cgi/js/checkbox_functions.js
icinga-cgi/js/controls.js
icinga-cgi/js/dragdrop.js
icinga-cgi/js/effects.js
icinga-cgi/js/jquery-1.4.2.min.js
icinga-cgi/js/htable.js
icinga-cgi/js/jquery-1.6.2.min.js
icinga-cgi/js/jquery.dd.js
icinga-cgi/js/menu.js
icinga-cgi/js/mootools.js

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-ido,v 1.5 2011/07/01 16:57:41 sthen Exp $
@comment $OpenBSD: PLIST-ido,v 1.6 2011/09/22 15:25:29 sthen Exp $
@bin bin/ido2db
@bin bin/idomod.o
@bin bin/log2ido
@ -16,6 +16,7 @@ share/examples/icinga/db/mysql/upgrade/mysql-upgrade-1.0.sql
share/examples/icinga/db/mysql/upgrade/mysql-upgrade-1.0rc.sql
share/examples/icinga/db/mysql/upgrade/mysql-upgrade-1.3.0.sql
share/examples/icinga/db/mysql/upgrade/mysql-upgrade-1.4.0.sql
share/examples/icinga/db/mysql/upgrade/mysql-upgrade-1.5.0.sql
share/examples/icinga/db/oracle/
share/examples/icinga/db/oracle/create_icinga_objects_oracle.sql
share/examples/icinga/db/oracle/create_oracle_sys.sql
@ -30,6 +31,7 @@ share/examples/icinga/db/oracle/upgrade/oracle-upgrade-1.0.2-fix-object-relation
share/examples/icinga/db/oracle/upgrade/oracle-upgrade-1.0.3.sql
share/examples/icinga/db/oracle/upgrade/oracle-upgrade-1.3.0.sql
share/examples/icinga/db/oracle/upgrade/oracle-upgrade-1.4.0.sql
share/examples/icinga/db/oracle/upgrade/oracle-upgrade-1.5.0.sql
share/examples/icinga/db/oracle/upgrade/oracle_alter_icinga13_numbers.sql
share/examples/icinga/db/oracle/upgrade/oracle_alter_icinga13_objects.sql
share/examples/icinga/db/oracle/upgrade/oracle_recreate_icinga13_functions.sql
@ -41,6 +43,7 @@ share/examples/icinga/db/pgsql/upgrade/pgsql-upgrade-1.0.1.sql
share/examples/icinga/db/pgsql/upgrade/pgsql-upgrade-1.0.3.sql
share/examples/icinga/db/pgsql/upgrade/pgsql-upgrade-1.3.0.sql
share/examples/icinga/db/pgsql/upgrade/pgsql-upgrade-1.4.0.sql
share/examples/icinga/db/pgsql/upgrade/pgsql-upgrade-1.5.0.sql
share/examples/icinga/db/queries/
share/examples/icinga/db/queries/comment_history.sql
share/examples/icinga/db/queries/comments.sql

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.4 2011/06/08 16:18:58 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.5 2011/09/22 15:25:29 sthen Exp $
@newgroup _icinga:667
@newuser _icinga:667:_icinga:daemon:Icinga user:/var/www/icinga:/sbin/nologin
@extraunexec rm -rf ${SYSCONFDIR}/icinga/*
@ -27,6 +27,8 @@ share/examples/icinga/objects/contacts.cfg
@sample ${SYSCONFDIR}/icinga/objects/contacts.cfg
share/examples/icinga/objects/localhost.cfg
@sample ${SYSCONFDIR}/icinga/objects/localhost.cfg
share/examples/icinga/objects/notifications.cfg
@sample ${SYSCONFDIR}/icinga/objects/notifications.cfg
share/examples/icinga/objects/printer.cfg
@sample ${SYSCONFDIR}/icinga/objects/printer.cfg
share/examples/icinga/objects/switch.cfg