diff --git a/net/icinga/core/Makefile b/net/icinga/core/Makefile index fa97d8c87cf..8599fabc933 100644 --- a/net/icinga/core/Makefile +++ b/net/icinga/core/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.50 2013/07/12 16:07:08 sthen Exp $ +# $OpenBSD: Makefile,v 1.51 2013/10/25 16:16:23 sthen Exp $ -V = 1.9.3 +V = 1.10.0 COMMENT-main = network monitoring system (improved fork of Nagios) COMMENT-cgi = cgi scripts for Icinga (classic Nagios-style UI) @@ -29,6 +29,7 @@ RUN_DEPENDS-ido = ${BASE_PKGPATH},-main \ libdbi-drivers-mysql-*|libdbi-drivers-pgsql-*:databases/libdbi-drivers,-main MODULES = lang/php +USE_GMAKE = Yes # the cgi binaries are linked -static to simplify use in chroot, # but listed as dependency anyway to help pkg_add -u find updates. diff --git a/net/icinga/core/distinfo b/net/icinga/core/distinfo index 7ba76677224..7a009213372 100644 --- a/net/icinga/core/distinfo +++ b/net/icinga/core/distinfo @@ -1,2 +1,2 @@ -SHA256 (icinga-1.9.3.tar.gz) = Lf7xQiXotnEUXUgWmZv1eELTebLl4Y0q9pzwxbkzdts= -SIZE (icinga-1.9.3.tar.gz) = 17082275 +SHA256 (icinga-1.10.0.tar.gz) = IEtnmL/NQDWkj9iID+twUEbJdsgcs1wkpifn6+psBKM= +SIZE (icinga-1.10.0.tar.gz) = 15294322 diff --git a/net/icinga/core/patches/patch-Changelog b/net/icinga/core/patches/patch-Changelog index cd467482dfb..8fbd361af8c 100644 --- a/net/icinga/core/patches/patch-Changelog +++ b/net/icinga/core/patches/patch-Changelog @@ -1,7 +1,7 @@ -$OpenBSD: patch-Changelog,v 1.8 2013/07/12 16:07:08 sthen Exp $ ---- Changelog.orig Sun Jul 7 16:50:50 2013 -+++ Changelog Fri Jul 12 17:04:37 2013 -@@ -7,9 +7,7 @@ Thanks to all contributers, testers and developers. Pl +$OpenBSD: patch-Changelog,v 1.9 2013/10/25 16:16:23 sthen Exp $ +--- Changelog.orig Tue Oct 22 10:40:32 2013 ++++ Changelog Fri Oct 25 00:29:23 2013 +@@ -7,11 +7,9 @@ Thanks to all contributers, testers and developers. Pl UPGRADE NOTES * for idoutils database upgrades, check the following for upgrade sql scripts @@ -13,3 +13,5 @@ $OpenBSD: patch-Changelog,v 1.8 2013/07/12 16:07:08 sthen Exp $ -* package locations may differ! + - ${TRUEPREFIX}/share/examples/icinga/updates/ + 1.10.0 - 24/10/2013 + diff --git a/net/icinga/core/patches/patch-cgi_Makefile_in b/net/icinga/core/patches/patch-cgi_Makefile_in index f067e5bfddd..470bdca5dfd 100644 --- a/net/icinga/core/patches/patch-cgi_Makefile_in +++ b/net/icinga/core/patches/patch-cgi_Makefile_in @@ -1,10 +1,10 @@ -$OpenBSD: patch-cgi_Makefile_in,v 1.6 2013/03/02 12:42:33 sthen Exp $ +$OpenBSD: patch-cgi_Makefile_in,v 1.7 2013/10/25 16:16:23 sthen Exp $ Allows for simpler use in a chroot jail ---- cgi/Makefile.in.orig Sun Jan 13 22:18:37 2013 -+++ cgi/Makefile.in Tue Feb 5 14:45:48 2013 -@@ -40,7 +40,7 @@ CFLAGS=@CFLAGS@ @DEFS@ -DNSCGI +--- cgi/Makefile.in.orig Tue Oct 22 10:40:32 2013 ++++ cgi/Makefile.in Fri Oct 25 00:29:23 2013 +@@ -51,7 +51,7 @@ endif #CFLAGS_DEBUG=-ggdb3 -g3 #CFLAGS+=$(CFLAGS_WARN) $(CFLAGS_DEBUG) diff --git a/net/icinga/core/patches/patch-configure b/net/icinga/core/patches/patch-configure index f7a67fac887..94f4342d765 100644 --- a/net/icinga/core/patches/patch-configure +++ b/net/icinga/core/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.9 2013/05/07 15:34:47 sthen Exp $ ---- configure.orig Fri Apr 19 11:15:19 2013 -+++ configure Sat Apr 20 16:37:01 2013 -@@ -5224,7 +5224,7 @@ cat >>confdefs.h <<_ACEOF +$OpenBSD: patch-configure,v 1.10 2013/10/25 16:16:23 sthen Exp $ +--- configure.orig Tue Oct 22 10:40:32 2013 ++++ configure Fri Oct 25 00:29:23 2013 +@@ -5240,7 +5240,7 @@ cat >>confdefs.h <<_ACEOF #define DEFAULT_NAGIOS_GROUP "$icinga_grp" _ACEOF @@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.9 2013/05/07 15:34:47 sthen Exp $ -@@ -5245,7 +5245,7 @@ fi +@@ -5261,7 +5261,7 @@ fi @@ -19,7 +19,7 @@ $OpenBSD: patch-configure,v 1.9 2013/05/07 15:34:47 sthen Exp $ -@@ -5846,7 +5846,7 @@ $as_echo_n "checking for gdImagePng in -lgd (order 1). +@@ -5912,7 +5912,7 @@ $as_echo_n "checking for gdImagePng in -lgd (order 1). $as_echo_n "(cached) " >&6 else ac_save_LIBS="$LIBS" @@ -28,7 +28,7 @@ $OpenBSD: patch-configure,v 1.9 2013/05/07 15:34:47 sthen Exp $ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ -@@ -5877,7 +5877,7 @@ fi +@@ -5943,7 +5943,7 @@ fi $as_echo "yes" >&6; } GDLIBFOUND=yep @@ -37,7 +37,7 @@ $OpenBSD: patch-configure,v 1.9 2013/05/07 15:34:47 sthen Exp $ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -@@ -7122,7 +7122,7 @@ $as_echo_n "checking for SSL libraries... " >&6; } +@@ -7210,7 +7210,7 @@ $as_echo_n "checking for SSL libraries... " >&6; } found_ssl=no for dir in $ssl_lib_dir $ssl_dir /usr/lib/*-linux-gnu /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" diff --git a/net/icinga/core/patches/patch-sample-config_icinga_cfg_in b/net/icinga/core/patches/patch-sample-config_icinga_cfg_in index 366f0045125..adf5054edee 100644 --- a/net/icinga/core/patches/patch-sample-config_icinga_cfg_in +++ b/net/icinga/core/patches/patch-sample-config_icinga_cfg_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-sample-config_icinga_cfg_in,v 1.9 2013/05/07 15:34:47 sthen Exp $ ---- sample-config/icinga.cfg.in.orig Fri Apr 19 11:15:19 2013 -+++ sample-config/icinga.cfg.in Sat Apr 20 16:37:01 2013 -@@ -1304,7 +1304,7 @@ enable_embedded_perl=0 +$OpenBSD: patch-sample-config_icinga_cfg_in,v 1.10 2013/10/25 16:16:23 sthen Exp $ +--- sample-config/icinga.cfg.in.orig Tue Oct 22 10:40:32 2013 ++++ sample-config/icinga.cfg.in Fri Oct 25 00:29:23 2013 +@@ -1307,7 +1307,7 @@ enable_embedded_perl=0 # the HTML documentation on the embedded Perl interpreter for more # information on how this option works. @@ -10,7 +10,7 @@ $OpenBSD: patch-sample-config_icinga_cfg_in,v 1.9 2013/05/07 15:34:47 sthen Exp -@@ -1403,8 +1403,8 @@ use_true_regexp_matching=0 +@@ -1406,8 +1406,8 @@ use_true_regexp_matching=0 # using the $ADMINEMAIL$ and $ADMINPAGER$ macros in your notification # commands. diff --git a/net/icinga/core/pkg/PLIST-cgi b/net/icinga/core/pkg/PLIST-cgi index 51cb6a70964..911be827e02 100644 --- a/net/icinga/core/pkg/PLIST-cgi +++ b/net/icinga/core/pkg/PLIST-cgi @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-cgi,v 1.10 2013/05/07 15:34:47 sthen Exp $ +@comment $OpenBSD: PLIST-cgi,v 1.11 2013/10/25 16:16:23 sthen Exp $ cgi-bin/icinga/ @bin cgi-bin/icinga/avail.cgi @bin cgi-bin/icinga/cmd.cgi @@ -43,6 +43,7 @@ icinga-cgi/docs/de/ch09.html icinga-cgi/docs/de/ch10.html icinga-cgi/docs/de/ch11.html icinga-cgi/docs/de/ch12.html +icinga-cgi/docs/de/ch13.html icinga-cgi/docs/de/checkscheduling.html icinga-cgi/docs/de/clusters.html icinga-cgi/docs/de/components.html @@ -123,6 +124,20 @@ icinga-cgi/docs/de/quickstart.html icinga-cgi/docs/de/recurring_downtimes.html icinga-cgi/docs/de/redundancy.html icinga-cgi/docs/de/reporting.html +icinga-cgi/docs/de/sample-cgi.html +icinga-cgi/docs/de/sample-commands.html +icinga-cgi/docs/de/sample-config.html +icinga-cgi/docs/de/sample-contacts.html +icinga-cgi/docs/de/sample-httpd.html +icinga-cgi/docs/de/sample-icinga.html +icinga-cgi/docs/de/sample-localhost.html +icinga-cgi/docs/de/sample-notifications.html +icinga-cgi/docs/de/sample-printer.html +icinga-cgi/docs/de/sample-resource.html +icinga-cgi/docs/de/sample-switch.html +icinga-cgi/docs/de/sample-templates.html +icinga-cgi/docs/de/sample-timeperiods.html +icinga-cgi/docs/de/sample-windows.html icinga-cgi/docs/de/security.html icinga-cgi/docs/de/servicechecks.html icinga-cgi/docs/de/stalking.html @@ -163,6 +178,7 @@ icinga-cgi/docs/en/ch09.html icinga-cgi/docs/en/ch10.html icinga-cgi/docs/en/ch11.html icinga-cgi/docs/en/ch12.html +icinga-cgi/docs/en/ch13.html icinga-cgi/docs/en/checkscheduling.html icinga-cgi/docs/en/clusters.html icinga-cgi/docs/en/config.html @@ -243,6 +259,20 @@ icinga-cgi/docs/en/quickstart.html icinga-cgi/docs/en/recurring_downtimes.html icinga-cgi/docs/en/redundancy.html icinga-cgi/docs/en/reporting.html +icinga-cgi/docs/en/sample-cgi.html +icinga-cgi/docs/en/sample-commands.html +icinga-cgi/docs/en/sample-config.html +icinga-cgi/docs/en/sample-contacts.html +icinga-cgi/docs/en/sample-httpd.html +icinga-cgi/docs/en/sample-icinga.html +icinga-cgi/docs/en/sample-localhost.html +icinga-cgi/docs/en/sample-notifications.html +icinga-cgi/docs/en/sample-printer.html +icinga-cgi/docs/en/sample-resource.html +icinga-cgi/docs/en/sample-switch.html +icinga-cgi/docs/en/sample-templates.html +icinga-cgi/docs/en/sample-timeperiods.html +icinga-cgi/docs/en/sample-windows.html icinga-cgi/docs/en/security.html icinga-cgi/docs/en/servicechecks.html icinga-cgi/docs/en/stalking.html @@ -382,110 +412,56 @@ icinga-cgi/docs/images/icinga-reporting-datasource-ido_1.8.png icinga-cgi/docs/images/icinga-reporting-overview_1.8.png icinga-cgi/docs/images/icinga-reporting_1.6.png icinga-cgi/docs/images/icinga-web-admin_groups1.png -icinga-cgi/docs/images/icinga-web-admin_groups1_1.6.png -icinga-cgi/docs/images/icinga-web-admin_groups1_1.9.png icinga-cgi/docs/images/icinga-web-admin_groups2.png -icinga-cgi/docs/images/icinga-web-admin_groups2_1.6.png icinga-cgi/docs/images/icinga-web-admin_logs1.png icinga-cgi/docs/images/icinga-web-admin_principals.png icinga-cgi/docs/images/icinga-web-admin_tasks.png icinga-cgi/docs/images/icinga-web-admin_users1.png -icinga-cgi/docs/images/icinga-web-admin_users1_1.6.png -icinga-cgi/docs/images/icinga-web-admin_users1_1.9.png icinga-cgi/docs/images/icinga-web-admin_users2.png -icinga-cgi/docs/images/icinga-web-admin_users2_1.6.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_hst_1.6.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-commands_svc_1.6.png -icinga-cgi/docs/images/icinga-web-cronks-settings_1.9.png +icinga-cgi/docs/images/icinga-web-cronks-settings.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-cronks1_1.6.png -icinga-cgi/docs/images/icinga-web-cronks1_1.7.png -icinga-cgi/docs/images/icinga-web-cronks1_1.9.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-cronks2_1.6.png -icinga-cgi/docs/images/icinga-web-cronks2_1.7.png -icinga-cgi/docs/images/icinga-web-cronks2_1.9.png icinga-cgi/docs/images/icinga-web-cronks2a.png -icinga-cgi/docs/images/icinga-web-cronks2a_1.6.png -icinga-cgi/docs/images/icinga-web-cronks2a_1.7.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-cronks3_1.6.png -icinga-cgi/docs/images/icinga-web-cronks3_1.7.png -icinga-cgi/docs/images/icinga-web-cronks3_1.9.png -icinga-cgi/docs/images/icinga-web-cronks4_1.9.png +icinga-cgi/docs/images/icinga-web-cronks4.png +icinga-cgi/docs/images/icinga-web-cronks5.png +icinga-cgi/docs/images/icinga-web-cronks6.png +icinga-cgi/docs/images/icinga-web-exp_1.png +icinga-cgi/docs/images/icinga-web-exp_2.png +icinga-cgi/docs/images/icinga-web-exp_3.png +icinga-cgi/docs/images/icinga-web-exp_4.png +icinga-cgi/docs/images/icinga-web-exp_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-filter1_1.6.png -icinga-cgi/docs/images/icinga-web-filter1_1.9.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-filter2_1.9.png icinga-cgi/docs/images/icinga-web-filter3.png -icinga-cgi/docs/images/icinga-web-filter3_1.9.png -icinga-cgi/docs/images/icinga-web-filter4_1.9.png -icinga-cgi/docs/images/icinga-web-filter5_1.9.png -icinga-cgi/docs/images/icinga-web-filter6_1.9.png +icinga-cgi/docs/images/icinga-web-filter4.png +icinga-cgi/docs/images/icinga-web-filter5.png +icinga-cgi/docs/images/icinga-web-filter6.png icinga-cgi/docs/images/icinga-web-host-obj.png icinga-cgi/docs/images/icinga-web-host-obj1.png -icinga-cgi/docs/images/icinga-web-host_1.5.png -icinga-cgi/docs/images/icinga-web-host_1.6.png -icinga-cgi/docs/images/icinga-web-host_1.8.png -icinga-cgi/docs/images/icinga-web-hostgroup_1.5.png -icinga-cgi/docs/images/icinga-web-hostgroup_1.6.png -icinga-cgi/docs/images/icinga-web-hostgroup_1.8.png +icinga-cgi/docs/images/icinga-web-host.png +icinga-cgi/docs/images/icinga-web-hostgroup.png +icinga-cgi/docs/images/icinga-web-instance-down.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-log_1.6.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-mainscreen1_1.6.png -icinga-cgi/docs/images/icinga-web-mainscreen_1.8.png +icinga-cgi/docs/images/icinga-web-mainscreen.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-overview_1.6.png -icinga-cgi/docs/images/icinga-web-overview_1.7.png -icinga-cgi/docs/images/icinga-web-overview_1.8.png -icinga-cgi/docs/images/icinga-web-overview_1.9.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-search1_1.6.png -icinga-cgi/docs/images/icinga-web-search1_1.7.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-srv_1.6.png -icinga-cgi/docs/images/icinga-web-srv_1.8.png +icinga-cgi/docs/images/icinga-web-srv.png icinga-cgi/docs/images/icinga-web-srv_obj.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-statuscronk_1.6.png icinga-cgi/docs/images/icinga-web-tackle1.png icinga-cgi/docs/images/icinga-web-tackle2.png icinga-cgi/docs/images/icinga-web-tackle3.png icinga-cgi/docs/images/icinga-web-tackle4.png icinga-cgi/docs/images/icinga-web-topmenu1.png -icinga-cgi/docs/images/icinga-web-topmenu1_1.6.png -icinga-cgi/docs/images/icinga-web-topmenu1_1.7.png icinga-cgi/docs/images/icinga-web-topmenu2.png -icinga-cgi/docs/images/icinga-web-topmenu2_1.3.png -icinga-cgi/docs/images/icinga-web-topmenuadmin1_1.9.png +icinga-cgi/docs/images/icinga-web-topmenuadmin1.png icinga-cgi/docs/images/icinga-web-user-prefs-logout.png icinga-cgi/docs/images/idoutils.png icinga-cgi/docs/images/important.gif @@ -622,6 +598,7 @@ icinga-cgi/images/logrotate.png icinga-cgi/images/menu_bar.gif icinga-cgi/images/menu_blank.gif icinga-cgi/images/menu_body.gif +icinga-cgi/images/menu_cat_gray.png icinga-cgi/images/menu_less.gif icinga-cgi/images/menu_li1.gif icinga-cgi/images/menu_li2.gif @@ -682,23 +659,33 @@ icinga-cgi/jquery-ui/themes/base/images/ui-icons_888888_256x240.png icinga-cgi/jquery-ui/themes/base/images/ui-icons_cd0a0a_256x240.png icinga-cgi/jquery-ui/themes/base/jquery.ui.all.css icinga-cgi/jquery-ui/themes/base/jquery.ui.base.css +icinga-cgi/jquery-ui/themes/base/jquery.ui.button.css icinga-cgi/jquery-ui/themes/base/jquery.ui.core.css icinga-cgi/jquery-ui/themes/base/jquery.ui.datepicker.css icinga-cgi/jquery-ui/themes/base/jquery.ui.slider.css icinga-cgi/jquery-ui/themes/base/jquery.ui.theme.css icinga-cgi/jquery-ui/ui/ +icinga-cgi/jquery-ui/ui/jquery.ui.autocomplete.js +icinga-cgi/jquery-ui/ui/jquery.ui.button.js icinga-cgi/jquery-ui/ui/jquery.ui.core.js icinga-cgi/jquery-ui/ui/jquery.ui.datepicker.js +icinga-cgi/jquery-ui/ui/jquery.ui.effect-blind.js +icinga-cgi/jquery-ui/ui/jquery.ui.effect.js +icinga-cgi/jquery-ui/ui/jquery.ui.menu.js icinga-cgi/jquery-ui/ui/jquery.ui.mouse.js +icinga-cgi/jquery-ui/ui/jquery.ui.position.js icinga-cgi/jquery-ui/ui/jquery.ui.slider.js icinga-cgi/jquery-ui/ui/jquery.ui.widget.js icinga-cgi/js/ +icinga-cgi/js/autocomplete.js icinga-cgi/js/checkbox_functions.js +icinga-cgi/js/common_functions.js icinga-cgi/js/jquery-1.8.0.min.js icinga-cgi/js/jquery.dd.js icinga-cgi/js/menu.js icinga-cgi/js/page_refresh.js icinga-cgi/js/skinnytip.js +icinga-cgi/js/status_filter_functions.js icinga-cgi/log/ icinga-cgi/log/.htaccess icinga-cgi/log/index.htm @@ -718,7 +705,6 @@ icinga-cgi/stylesheets/extinfo.css icinga-cgi/stylesheets/histogram.css icinga-cgi/stylesheets/history.css icinga-cgi/stylesheets/menu.css -icinga-cgi/stylesheets/ministatus.css icinga-cgi/stylesheets/notifications.css icinga-cgi/stylesheets/outages.css icinga-cgi/stylesheets/showlog.css diff --git a/net/icinga/core/pkg/PLIST-ido b/net/icinga/core/pkg/PLIST-ido index 002139b023c..08ac44685ee 100644 --- a/net/icinga/core/pkg/PLIST-ido +++ b/net/icinga/core/pkg/PLIST-ido @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-ido,v 1.11 2013/05/07 15:34:47 sthen Exp $ +@comment $OpenBSD: PLIST-ido,v 1.12 2013/10/25 16:16:23 sthen Exp $ @bin bin/ido2db @bin bin/log2ido lib/idomod.so @@ -14,6 +14,7 @@ share/examples/icinga/db/mysql/upgrade/mysql-upgrade-1.0.2.sql share/examples/icinga/db/mysql/upgrade/mysql-upgrade-1.0.3.sql 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.10.0.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 @@ -33,6 +34,7 @@ share/examples/icinga/db/oracle/upgrade/ share/examples/icinga/db/oracle/upgrade/oracle-upgrade-1.0.1.sql share/examples/icinga/db/oracle/upgrade/oracle-upgrade-1.0.2-fix-object-relations.sql share/examples/icinga/db/oracle/upgrade/oracle-upgrade-1.0.3.sql +share/examples/icinga/db/oracle/upgrade/oracle-upgrade-1.10.0.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 @@ -50,6 +52,7 @@ share/examples/icinga/db/pgsql/pgsql.sql share/examples/icinga/db/pgsql/upgrade/ 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.10.0.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 @@ -89,8 +92,6 @@ share/examples/icinga/db/queries/service_status.sql share/examples/icinga/db/queries/servicegroup_membership.sql share/examples/icinga/db/queries/services.sql share/examples/icinga/db/queries/state_history.sql -share/examples/icinga/db/queries/timed_event_queue.sql -share/examples/icinga/db/queries/timed_events.sql share/examples/icinga/db/scripts/ share/examples/icinga/db/scripts/create_mysqldb.sh share/examples/icinga/db/scripts/create_oracledb.sh diff --git a/net/icinga/core/pkg/PLIST-main b/net/icinga/core/pkg/PLIST-main index 2841be54e5a..4e108c9fef2 100644 --- a/net/icinga/core/pkg/PLIST-main +++ b/net/icinga/core/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.13 2013/05/07 15:34:47 sthen Exp $ +@comment $OpenBSD: PLIST-main,v 1.14 2013/10/25 16:16:23 sthen Exp $ @newgroup _icinga:667 @newuser _icinga:667:_icinga:daemon:Icinga user:/var/icinga:/sbin/nologin @comment done this way (rather than SYSCONFDIR/*) for safety... @@ -55,8 +55,13 @@ share/examples/icinga/resource.cfg share/examples/icinga/updates/ share/examples/icinga/updates/cgi.cfg_added_1.7_to_1.8.cfg share/examples/icinga/updates/cgi.cfg_added_1.8_to_1.9.cfg +share/examples/icinga/updates/cgi.cfg_added_1.9_to_1.10.cfg share/examples/icinga/updates/cgi.cfg_removed_1.7_to_1.8.cfg share/examples/icinga/updates/icinga.cfg_added_1.7_to_1.8.cfg +share/examples/icinga/updates/icinga.cfg_added_1.9_to_1.10.cfg +share/examples/icinga/updates/ido2db.cfg_added_1.9_to_1.10.cfg +share/examples/icinga/updates/ido2db.cfg_removed_1.9_to_1.10.cfg +share/examples/icinga/updates/idomod.cfg_added_1.9_to_1.10.cfg @mode 755 @owner _icinga @group _icinga diff --git a/net/icinga/core/pkg/README-main b/net/icinga/core/pkg/README-main index bf97f2c7216..0fb9ad5617a 100644 --- a/net/icinga/core/pkg/README-main +++ b/net/icinga/core/pkg/README-main @@ -1,4 +1,4 @@ -$OpenBSD: README-main,v 1.13 2013/05/07 15:34:47 sthen Exp $ +$OpenBSD: README-main,v 1.14 2013/10/25 16:16:23 sthen Exp $ +----------------------------------------------------------------------- | Running ${FULLPKGNAME} on OpenBSD @@ -47,7 +47,8 @@ ${TRUEPREFIX}/bin/idomod.o to ${TRUEPREFIX}/lib/idomod.so in 1.7.0. If upgrading from an earlier version of icinga-web (the PHP API-based web interface), you will need to apply updates to the icinga_web database -schema from /var/www/icinga-web/etc/schema/updates. +schema from /var/www/icinga-web/etc/schema/updates. You should also clear +the cache by running "/var/www/icinga-web/bin/clearcache.sh". Chroot Considerations diff --git a/net/icinga/web/Makefile b/net/icinga/web/Makefile index 77407c5be84..4d4cd5643a6 100644 --- a/net/icinga/web/Makefile +++ b/net/icinga/web/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.23 2013/10/18 11:52:18 sthen Exp $ +# $OpenBSD: Makefile,v 1.24 2013/10/25 16:16:23 sthen Exp $ COMMENT = web UI for icinga -DISTNAME = icinga-web-1.9.2 +DISTNAME = icinga-web-1.10.0 MODULES= lang/php @@ -13,7 +13,7 @@ RUN_DEPENDS = ${COMMON_DEPENDS} \ lang/php/${MODPHP_VERSION},-xsl \ php-pdo_mysql-${MODPHP_VSPEC}|php-pdo_pgsql-${MODPHP_VSPEC}:lang/php/${MODPHP_VERSION},-pdo_mysql \ net/icinga/core \ - net/icinga/core,-ido + net/icinga/core,-ido>=1.10 # Optional php extensions: ldap soap xmlrpc memcache BUILD_DEPENDS= ${COMMON_DEPENDS} diff --git a/net/icinga/web/distinfo b/net/icinga/web/distinfo index 91247b5ff09..0e7effd848e 100644 --- a/net/icinga/web/distinfo +++ b/net/icinga/web/distinfo @@ -1,2 +1,2 @@ -SHA256 (icinga-web-1.9.2.tar.gz) = k4ESi+EX9Ul5VtPMCxCMMhaOKhG7HAUC6cKbG94oY28= -SIZE (icinga-web-1.9.2.tar.gz) = 14642606 +SHA256 (icinga-web-1.10.0.tar.gz) = /htDRIvLap6PVl8HkSLlEoNTnra+IU5wAcZWU2hrf1Y= +SIZE (icinga-web-1.10.0.tar.gz) = 14245635 diff --git a/net/icinga/web/patches/patch-Makefile_in b/net/icinga/web/patches/patch-Makefile_in index 28200e9397e..9abcc71e671 100644 --- a/net/icinga/web/patches/patch-Makefile_in +++ b/net/icinga/web/patches/patch-Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile_in,v 1.5 2013/05/07 15:34:47 sthen Exp $ ---- Makefile.in.orig Mon Apr 29 18:54:16 2013 -+++ Makefile.in Fri May 3 13:31:02 2013 -@@ -288,7 +288,7 @@ db-purge-userprefs: +$OpenBSD: patch-Makefile_in,v 1.6 2013/10/25 16:16:23 sthen Exp $ +--- Makefile.in.orig Tue Oct 22 12:45:52 2013 ++++ Makefile.in Fri Oct 25 01:22:45 2013 +@@ -294,7 +294,7 @@ db-purge-userprefs: $(PHING_CALL) db-purge-userprefs make-create-files: diff --git a/net/icinga/web/pkg/PLIST b/net/icinga/web/pkg/PLIST index 0aee6148731..bf807638e72 100644 --- a/net/icinga/web/pkg/PLIST +++ b/net/icinga/web/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.14 2013/09/12 22:31:28 sthen Exp $ +@comment $OpenBSD: PLIST,v 1.15 2013/10/25 16:16:23 sthen Exp $ @conflict icinga-api-* @pkgpath net/icinga/core,-api app/ @@ -672,6 +672,7 @@ app/modules/AppKit/lib/js/utils/AppKitServertime.js app/modules/AppKit/lib/js/utils/Ext.ux.AutoComboBox.js app/modules/AppKit/lib/js/utils/HttpStateProvider.js app/modules/AppKit/lib/js/utils/LogoutMachine.js +app/modules/AppKit/lib/js/utils/PieChart.js app/modules/AppKit/lib/js/ux/ app/modules/AppKit/lib/js/ux/DDTabPanel.js app/modules/AppKit/lib/js/ux/EllipsisColumn.js @@ -752,6 +753,7 @@ app/modules/AppKit/models/RoleAdminModel.class.php app/modules/AppKit/models/SquishFileContainerModel.class.php app/modules/AppKit/models/Tasks/ app/modules/AppKit/models/Tasks/ClearCacheModel.class.php +app/modules/AppKit/models/Tasks/ClearUserDataModel.class.php app/modules/AppKit/models/UserAdminModel.class.php app/modules/AppKit/templates/ app/modules/AppKit/templates/Admin/ @@ -964,6 +966,9 @@ app/modules/Cronks/data/xml/extensions/ app/modules/Cronks/data/xml/extensions/.keep app/modules/Cronks/data/xml/grid/ app/modules/Cronks/data/xml/grid/example-host-template.xml +app/modules/Cronks/data/xml/grid/icinga-all-host-problems.xml +app/modules/Cronks/data/xml/grid/icinga-all-problems-template.xml +app/modules/Cronks/data/xml/grid/icinga-all-service-problems.xml app/modules/Cronks/data/xml/grid/icinga-downtime-history-template.xml app/modules/Cronks/data/xml/grid/icinga-downtime-template.xml app/modules/Cronks/data/xml/grid/icinga-host-history-template.xml @@ -1504,6 +1509,7 @@ bin/testdeps.php bin/write_copy.py doc/ doc/AUTHORS +doc/CHANGELOG-1.10 doc/CHANGELOG-1.6 doc/CHANGELOG-1.7 doc/CHANGELOG-1.8 @@ -1514,6 +1520,7 @@ doc/INSTALL doc/LICENSE doc/LICENSE_INLINE.txt doc/README.RHEL +doc/README.SUSE doc/RELEASEDATE doc/THANKS doc/TODO @@ -1556,6 +1563,8 @@ etc/conf.d/translation.xml.dist @sample etc/conf.d/translation.xml etc/conf.d/userpreferences.xml.dist @sample etc/conf.d/userpreferences.xml +etc/conf.d/views.xml.dist +@sample etc/conf.d/views.xml etc/icinga-web.conf @sample /var/www/conf/modules.sample/icinga-web.conf etc/lib/ @@ -1594,6 +1603,7 @@ etc/schema/updates/mysql/mysql_v1-8-0_to_v-1-8-1.sql etc/schema/updates/mysql/mysql_v1-8-1_to_v1-8-3.sql etc/schema/updates/mysql/mysql_v1-8-3_to_v1-9.sql etc/schema/updates/mysql/mysql_v1-9-0_to_1-9-1.sql +etc/schema/updates/mysql/mysql_v1-9-1_to_1-10-0.sql etc/schema/updates/oracle/ etc/schema/updates/oracle/oracle_v1-0-3_to_v1-2.sql etc/schema/updates/oracle/oracle_v1-2_to_1-3.sql @@ -1608,6 +1618,7 @@ etc/schema/updates/oracle/oracle_v1-7-2_to_v1-8-0.sql etc/schema/updates/oracle/oracle_v1-8-0_to_v1-8-3.sql etc/schema/updates/oracle/oracle_v1-8-3_to_v1-9.sql etc/schema/updates/oracle/oracle_v1-9-0_to_v1-9-1.sql +etc/schema/updates/oracle/oracle_v1-9-1_to_v1-10-0.sql etc/schema/updates/pgsql/ etc/schema/updates/pgsql/pgsql_v1-0-3_to_v1-2.sql etc/schema/updates/pgsql/pgsql_v1-2_to_v1-3.sql @@ -1623,6 +1634,7 @@ etc/schema/updates/pgsql/pgsql_v1-8-0_to_v-1-8-1.sql etc/schema/updates/pgsql/pgsql_v1-8-1_to_v1-8-3.sql etc/schema/updates/pgsql/pgsql_v1-8-3_to_v1-9.sql etc/schema/updates/pgsql/pgsql_v1-9-0_to_v1-9-1.sql +etc/schema/updates/pgsql/pgsql_v1-9-1_to_v1-10-0.sql lib/ lib/agavi/ lib/agavi/src/ @@ -3422,7 +3434,6 @@ lib/ext3/examples/ux/ux-all.js lib/ext3/ext-all-debug.js lib/ext3/ext-all.js lib/ext3/resources/ -lib/ext3/resources/charts.swf lib/ext3/resources/css/ lib/ext3/resources/css/README.txt lib/ext3/resources/css/debug.css @@ -4440,6 +4451,10 @@ lib/phpseclib/PHP/Compat/Function/ lib/phpseclib/PHP/Compat/Function/array_fill.php lib/phpseclib/PHP/Compat/Function/bcpowmod.php lib/phpseclib/PHP/Compat/Function/str_split.php +lib/raphael/ +lib/raphael/g.pie-min.js +lib/raphael/g.raphael-min.js +lib/raphael/raphael-min.js lib/resources/ @mode 775 @group www