Icinga's release is due on 7 May, tests welcome :)
Index: core/Makefile
===================================================================
RCS file: /cvs/ports/net/icinga/core/Makefile,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile
--- core/Makefile 29 Mar 2013 16:39:34 -0000 1.44
+++ core/Makefile 3 May 2013 12:45:45 -0000
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.44 2013/03/29 16:39:34 rpe Exp $
-V = 1.8.4
+V = 1.9.0beta
COMMENT-main = network monitoring system (improved fork of Nagios)
COMMENT-cgi = cgi scripts for Icinga (classic Nagios-style UI)
@@ -8,9 +8,7 @@ COMMENT-ido = store Icinga configuratio
DISTNAME = icinga-$V
PKGNAME-main = icinga-$V
-REVISION-main = 1
PKGNAME-cgi = icinga-cgi-$V
-REVISION-cgi = 0
PKGNAME-ido = icinga-idoutils-$V
WANTLIB = c crypto m pthread ssl
@@ -67,8 +65,7 @@ CFLAGS += -fPIC \
-I${LOCALBASE}/include \
-L${X11BASE}/lib -L${LOCALBASE}/lib
-INSTALL_TARGET = install-unstripped install-idoutils \
- install-config install-webconf
+INSTALL_TARGET = install-unstripped install-idoutils install-config
# perl tests work; C tests require --enable-libtap in configure and
# fixing up WRKSRC/tap/configure
@@ -86,10 +83,11 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/sample-config/updates/* \
${WRKSRC}/module/idoutils/config/updates/* \
${PREFIX}/share/examples/icinga/updates/
+ ${INSTALL_DATA_DIR} ${WRKINST}${PREFIX-cgi}/conf/modules.sample
+ ${INSTALL_DATA} ${WRKBUILD}/sample-config/httpd.conf \
+ ${WRKINST}${PREFIX-cgi}/conf/modules.sample/icinga-cgi.conf.dist
cd ${WRKINST}${PREFIX-cgi}; \
- mv conf/modules.sample/icinga.conf \
- conf/modules.sample/icinga-cgi.conf.dist; \
- chown -R ${SHAREOWN}:${SHAREGRP} icinga-cgi conf
+ chown -R ${SHAREOWN}:${SHAREGRP} icinga-cgi conf
cd ${WRKSRC}/module/idoutils; \
pax -rw db ${PREFIX}/share/examples/icinga/
Index: core/distinfo
===================================================================
RCS file: /cvs/ports/net/icinga/core/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- core/distinfo 14 Jan 2013 02:39:15 -0000 1.16
+++ core/distinfo 3 May 2013 12:45:45 -0000
@@ -1,2 +1,2 @@
-SHA256 (icinga-1.8.4.tar.gz) = 4ey8bIO7iy1NKZNBgrEB8wXI1FhzsM7+RS3ZE+5bbeE=
-SIZE (icinga-1.8.4.tar.gz) = 7459130
+SHA256 (icinga-1.9.0beta.tar.gz) = /mr7duXXQuuPERcKuLLjgmI0Z6uavT9ZnOBKAcnj0c8=
+SIZE (icinga-1.9.0beta.tar.gz) = 17077904
Index: core/patches/patch-Changelog
===================================================================
RCS file: /cvs/ports/net/icinga/core/patches/patch-Changelog,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Changelog
--- core/patches/patch-Changelog 14 Jan 2013 02:39:15 -0000 1.4
+++ core/patches/patch-Changelog 3 May 2013 12:45:45 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-Changelog,v 1.4 2013/01/14 02:39:15 sthen Exp $
---- Changelog.orig Sun Jan 13 22:18:37 2013
-+++ Changelog Mon Jan 14 02:17:52 2013
+--- Changelog.orig Tue Apr 30 10:20:08 2013
++++ Changelog Fri May 3 13:29:50 2013
@@ -7,10 +7,9 @@ Thanks to all contributers, testers and developers. Pl
UPGRADE NOTES
@@ -12,5 +12,5 @@ $OpenBSD: patch-Changelog,v 1.4 2013/01/
- - idoutils: module/idoutils/config/updates
+ - ${TRUEPREFIX}/share/examples/icinga/updates/
- 1.8.4 - 13/01/2013
+ 1.9.0 - 07/05/2013
Index: core/patches/patch-configure
===================================================================
RCS file: /cvs/ports/net/icinga/core/patches/patch-configure,v
retrieving revision 1.8
diff -u -p -r1.8 patch-configure
--- core/patches/patch-configure 29 Nov 2012 22:34:16 -0000 1.8
+++ core/patches/patch-configure 3 May 2013 12:45:45 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.8 2012/11/29 22:34:16 sthen Exp $
---- configure.orig Wed Nov 28 15:14:51 2012
-+++ configure Thu Nov 29 22:24:42 2012
-@@ -5189,7 +5189,7 @@ cat >>confdefs.h <<_ACEOF
+--- 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
#define DEFAULT_NAGIOS_GROUP "$icinga_grp"
_ACEOF
@@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.8 2012/11/
-@@ -5210,7 +5210,7 @@ fi
+@@ -5245,7 +5245,7 @@ fi
@@ -19,7 +19,7 @@ $OpenBSD: patch-configure,v 1.8 2012/11/
-@@ -5797,7 +5797,7 @@ $as_echo_n "checking for gdImagePng in -lgd (order 1).
+@@ -5846,7 +5846,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.8 2012/11/
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any gcc2 internal prototype to avoid an error. */
-@@ -5828,7 +5828,7 @@ fi
+@@ -5877,7 +5877,7 @@ fi
$as_echo "yes" >&6; }
GDLIBFOUND=yep
@@ -37,7 +37,7 @@ $OpenBSD: patch-configure,v 1.8 2012/11/
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-@@ -7057,7 +7057,7 @@ $as_echo_n "checking for SSL libraries... " >&6; }
+@@ -7122,7 +7122,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"
Index: core/patches/patch-sample-config_icinga_cfg_in
===================================================================
RCS file: /cvs/ports/net/icinga/core/patches/patch-sample-config_icinga_cfg_in,v
retrieving revision 1.8
diff -u -p -r1.8 patch-sample-config_icinga_cfg_in
--- core/patches/patch-sample-config_icinga_cfg_in 29 Nov 2012 22:34:16
-0000 1.8
+++ core/patches/patch-sample-config_icinga_cfg_in 3 May 2013 12:45:45
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-sample-config_icinga_cfg_in,v 1.8 2012/11/29 22:34:16 sthen
Exp $
---- sample-config/icinga.cfg.in.orig Wed Nov 28 15:14:51 2012
-+++ sample-config/icinga.cfg.in Thu Nov 29 22:24:43 2012
-@@ -1297,7 +1297,7 @@ enable_embedded_perl=0
+--- 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
# 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
-@@ -1396,8 +1396,8 @@ use_true_regexp_matching=0
+@@ -1403,8 +1403,8 @@ use_true_regexp_matching=0
# using the $ADMINEMAIL$ and $ADMINPAGER$ macros in your notification
# commands.
Index: core/pkg/PLIST-cgi
===================================================================
RCS file: /cvs/ports/net/icinga/core/pkg/PLIST-cgi,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST-cgi
--- core/pkg/PLIST-cgi 18 Oct 2012 20:04:58 -0000 1.9
+++ core/pkg/PLIST-cgi 3 May 2013 12:45:45 -0000
@@ -123,8 +123,6 @@ 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/reporting_1.6.html
-icinga-cgi/docs/de/reporting_1.8.html
icinga-cgi/docs/de/security.html
icinga-cgi/docs/de/servicechecks.html
icinga-cgi/docs/de/stalking.html
@@ -245,8 +243,6 @@ 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/reporting_1.6.html
-icinga-cgi/docs/en/reporting_1.8.html
icinga-cgi/docs/en/security.html
icinga-cgi/docs/en/servicechecks.html
icinga-cgi/docs/en/stalking.html
@@ -263,6 +259,55 @@ icinga-cgi/docs/en/volatileservices.html
icinga-cgi/docs/en/whatsnew.html
icinga-cgi/docs/images/
icinga-cgi/docs/images/Architecture_1.5_800px.png
+icinga-cgi/docs/images/IcingaWeb_BusinessProcess-150x150.png
+icinga-cgi/docs/images/IcingaWeb_BusinessProcess.png
+icinga-cgi/docs/images/IcingaWeb_Commands-150x150.png
+icinga-cgi/docs/images/IcingaWeb_Commands.png
+icinga-cgi/docs/images/IcingaWeb_CronkBuilder-150x150.png
+icinga-cgi/docs/images/IcingaWeb_CronkBuilder.png
+icinga-cgi/docs/images/IcingaWeb_Cronk_Configuration-150x150.png
+icinga-cgi/docs/images/IcingaWeb_Cronk_Configuration.png
+icinga-cgi/docs/images/IcingaWeb_Cronk_HostFiltered-150x150.png
+icinga-cgi/docs/images/IcingaWeb_Downtimes-150x150.png
+icinga-cgi/docs/images/IcingaWeb_Downtimes.png
+icinga-cgi/docs/images/IcingaWeb_HostStatus_Events-150x150.png
+icinga-cgi/docs/images/IcingaWeb_HostStatus_Events.png
+icinga-cgi/docs/images/IcingaWeb_Host_filtered-150x150.png
+icinga-cgi/docs/images/IcingaWeb_Host_filtered.png
+icinga-cgi/docs/images/IcingaWeb_LogViewer-150x150.png
+icinga-cgi/docs/images/IcingaWeb_LogViewer.png
+icinga-cgi/docs/images/IcingaWeb_OpenProblems-150x150.png
+icinga-cgi/docs/images/IcingaWeb_OpenProblems.png
+icinga-cgi/docs/images/IcingaWeb_Portal2-150x150.png
+icinga-cgi/docs/images/IcingaWeb_Portal2.png
+icinga-cgi/docs/images/IcingaWeb_Reporting-150x150.png
+icinga-cgi/docs/images/IcingaWeb_Reporting.png
+icinga-cgi/docs/images/IcingaWeb_Search-150x150.png
+icinga-cgi/docs/images/IcingaWeb_Search.png
+icinga-cgi/docs/images/IcingaWeb_StatusMap-150x150.png
+icinga-cgi/docs/images/IcingaWeb_StatusMap.png
+icinga-cgi/docs/images/IcingaWeb_TacticalOverview-150x150.png
+icinga-cgi/docs/images/IcingaWeb_TacticalOverview.png
+icinga-cgi/docs/images/IcingaWeb_UserAdmin-150x150.png
+icinga-cgi/docs/images/IcingaWeb_UserAdmin.png
+icinga-cgi/docs/images/Icinga_Classic_CGIConfig-150x150.png
+icinga-cgi/docs/images/Icinga_Classic_CGIConfig.png
+icinga-cgi/docs/images/Icinga_Classic_Commands-150x150.png
+icinga-cgi/docs/images/Icinga_Classic_Commands.png
+icinga-cgi/docs/images/Icinga_Classic_DatePicker-150x150.png
+icinga-cgi/docs/images/Icinga_Classic_DatePicker.png
+icinga-cgi/docs/images/Icinga_Classic_Downtimes-150x150.png
+icinga-cgi/docs/images/Icinga_Classic_Downtimes.png
+icinga-cgi/docs/images/Icinga_Classic_HostGroup-150x150.png
+icinga-cgi/docs/images/Icinga_Classic_HostGroup.png
+icinga-cgi/docs/images/Icinga_Classic_PaginationLogs-150x150.png
+icinga-cgi/docs/images/Icinga_Classic_PaginationLogs.png
+icinga-cgi/docs/images/Icinga_Classic_ServiceStatus-150x150.png
+icinga-cgi/docs/images/Icinga_Classic_ServiceStatus.png
+icinga-cgi/docs/images/Icinga_Classic_TacticalOverview-150x150.png
+icinga-cgi/docs/images/Icinga_Classic_TacticalOverview.png
+icinga-cgi/docs/images/Icinga_Classic_Trending-150x150.png
+icinga-cgi/docs/images/Icinga_Classic_Trending.png
icinga-cgi/docs/images/MyServiceStatus.png
icinga-cgi/docs/images/activechecks.png
icinga-cgi/docs/images/cachedcheckgraphs.png
@@ -338,6 +383,7 @@ icinga-cgi/docs/images/icinga-reporting-
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
@@ -345,6 +391,7 @@ icinga-cgi/docs/images/icinga-web-admin_
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
@@ -355,16 +402,19 @@ icinga-cgi/docs/images/icinga-web-comman
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-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
@@ -373,12 +423,20 @@ icinga-cgi/docs/images/icinga-web-cronks
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-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-host-obj.png
icinga-cgi/docs/images/icinga-web-host-obj1.png
icinga-cgi/docs/images/icinga-web-host_1.5.png
@@ -404,6 +462,7 @@ icinga-cgi/docs/images/icinga-web-overvi
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
@@ -426,6 +485,8 @@ icinga-cgi/docs/images/icinga-web-topmen
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-user-prefs-logout.png
icinga-cgi/docs/images/idoutils.png
icinga-cgi/docs/images/important.gif
icinga-cgi/docs/images/important.png
@@ -600,34 +661,37 @@ icinga-cgi/images/zoom1.gif
icinga-cgi/images/zoom2.gif
icinga-cgi/index.html
icinga-cgi/jquery-ui/
-icinga-cgi/jquery-ui/jquery.ui.core.min.js
-icinga-cgi/jquery-ui/jquery.ui.datepicker.min.js
-icinga-cgi/jquery-ui/jquery.ui.mouse.min.js
-icinga-cgi/jquery-ui/jquery.ui.slider.min.js
-icinga-cgi/jquery-ui/jquery.ui.timepicker-addon.min.js
-icinga-cgi/jquery-ui/jquery.ui.widget.min.js
-icinga-cgi/jquery-ui/theme/
-icinga-cgi/jquery-ui/theme/images/
-icinga-cgi/jquery-ui/theme/images/ui-bg_flat_0_aaaaaa_40x100.png
-icinga-cgi/jquery-ui/theme/images/ui-bg_flat_75_ffffff_40x100.png
-icinga-cgi/jquery-ui/theme/images/ui-bg_glass_55_fbf9ee_1x400.png
-icinga-cgi/jquery-ui/theme/images/ui-bg_glass_65_ffffff_1x400.png
-icinga-cgi/jquery-ui/theme/images/ui-bg_glass_75_dadada_1x400.png
-icinga-cgi/jquery-ui/theme/images/ui-bg_glass_75_e6e6e6_1x400.png
-icinga-cgi/jquery-ui/theme/images/ui-bg_glass_95_fef1ec_1x400.png
-icinga-cgi/jquery-ui/theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png
-icinga-cgi/jquery-ui/theme/images/ui-icons_222222_256x240.png
-icinga-cgi/jquery-ui/theme/images/ui-icons_2e83ff_256x240.png
-icinga-cgi/jquery-ui/theme/images/ui-icons_454545_256x240.png
-icinga-cgi/jquery-ui/theme/images/ui-icons_888888_256x240.png
-icinga-cgi/jquery-ui/theme/images/ui-icons_cd0a0a_256x240.png
-icinga-cgi/jquery-ui/theme/jquery.ui.all.css
-icinga-cgi/jquery-ui/theme/jquery.ui.base.css
-icinga-cgi/jquery-ui/theme/jquery.ui.core.css
-icinga-cgi/jquery-ui/theme/jquery.ui.datepicker.css
-icinga-cgi/jquery-ui/theme/jquery.ui.slider.css
-icinga-cgi/jquery-ui/theme/jquery.ui.theme.css
-icinga-cgi/jquery-ui/theme/jquery.ui.timepicker-addon.css
+icinga-cgi/jquery-ui-addon/
+icinga-cgi/jquery-ui-addon/jquery.ui.timepicker-addon.css
+icinga-cgi/jquery-ui-addon/jquery.ui.timepicker-addon.min.js
+icinga-cgi/jquery-ui/themes/
+icinga-cgi/jquery-ui/themes/base/
+icinga-cgi/jquery-ui/themes/base/images/
+icinga-cgi/jquery-ui/themes/base/images/ui-bg_flat_0_aaaaaa_40x100.png
+icinga-cgi/jquery-ui/themes/base/images/ui-bg_flat_75_ffffff_40x100.png
+icinga-cgi/jquery-ui/themes/base/images/ui-bg_glass_55_fbf9ee_1x400.png
+icinga-cgi/jquery-ui/themes/base/images/ui-bg_glass_65_ffffff_1x400.png
+icinga-cgi/jquery-ui/themes/base/images/ui-bg_glass_75_dadada_1x400.png
+icinga-cgi/jquery-ui/themes/base/images/ui-bg_glass_75_e6e6e6_1x400.png
+icinga-cgi/jquery-ui/themes/base/images/ui-bg_glass_95_fef1ec_1x400.png
+icinga-cgi/jquery-ui/themes/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+icinga-cgi/jquery-ui/themes/base/images/ui-icons_222222_256x240.png
+icinga-cgi/jquery-ui/themes/base/images/ui-icons_2e83ff_256x240.png
+icinga-cgi/jquery-ui/themes/base/images/ui-icons_454545_256x240.png
+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.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.core.js
+icinga-cgi/jquery-ui/ui/jquery.ui.datepicker.js
+icinga-cgi/jquery-ui/ui/jquery.ui.mouse.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/checkbox_functions.js
icinga-cgi/js/jquery-1.8.0.min.js
Index: core/pkg/PLIST-ido
===================================================================
RCS file: /cvs/ports/net/icinga/core/pkg/PLIST-ido,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST-ido
--- core/pkg/PLIST-ido 18 Oct 2012 20:04:58 -0000 1.10
+++ core/pkg/PLIST-ido 3 May 2013 12:45:45 -0000
@@ -20,6 +20,7 @@ share/examples/icinga/db/mysql/upgrade/m
share/examples/icinga/db/mysql/upgrade/mysql-upgrade-1.6.0.sql
share/examples/icinga/db/mysql/upgrade/mysql-upgrade-1.7.0.sql
share/examples/icinga/db/mysql/upgrade/mysql-upgrade-1.8.0.sql
+share/examples/icinga/db/mysql/upgrade/mysql-upgrade-1.9.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
@@ -38,6 +39,7 @@ share/examples/icinga/db/oracle/upgrade/
share/examples/icinga/db/oracle/upgrade/oracle-upgrade-1.6.0.sql
share/examples/icinga/db/oracle/upgrade/oracle-upgrade-1.7.0.sql
share/examples/icinga/db/oracle/upgrade/oracle-upgrade-1.8.0.sql
+share/examples/icinga/db/oracle/upgrade/oracle-upgrade-1.9.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
@@ -54,6 +56,7 @@ share/examples/icinga/db/pgsql/upgrade/p
share/examples/icinga/db/pgsql/upgrade/pgsql-upgrade-1.6.0.sql
share/examples/icinga/db/pgsql/upgrade/pgsql-upgrade-1.7.0.sql
share/examples/icinga/db/pgsql/upgrade/pgsql-upgrade-1.8.0.sql
+share/examples/icinga/db/pgsql/upgrade/pgsql-upgrade-1.9.0.sql
share/examples/icinga/db/queries/
share/examples/icinga/db/queries/comment_history.sql
share/examples/icinga/db/queries/comments.sql
@@ -105,4 +108,5 @@ share/examples/icinga/idomod.cfg-sample
share/examples/icinga/modules/idoutils.cfg-sample
@sample ${SYSCONFDIR}/modules/idoutils.cfg
share/examples/icinga/updates/ido2db.cfg_added_1.7_to_1.8.cfg
+share/examples/icinga/updates/ido2db.cfg_added_1.8_to_1.9.cfg
@rcscript ${RCDIR}/ido2db
Index: core/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/icinga/core/pkg/PLIST-main,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST-main
--- core/pkg/PLIST-main 6 Mar 2013 18:34:58 -0000 1.12
+++ core/pkg/PLIST-main 3 May 2013 12:45:45 -0000
@@ -54,6 +54,7 @@ share/examples/icinga/resource.cfg
@sample ${SYSCONFDIR}/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_removed_1.7_to_1.8.cfg
share/examples/icinga/updates/icinga.cfg_added_1.7_to_1.8.cfg
@mode 755
Index: web/Makefile
===================================================================
RCS file: /cvs/ports/net/icinga/web/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- web/Makefile 28 Mar 2013 12:43:14 -0000 1.17
+++ web/Makefile 3 May 2013 12:45:45 -0000
@@ -1,7 +1,8 @@
# $OpenBSD: Makefile,v 1.17 2013/03/28 12:43:14 sthen Exp $
COMMENT = web UI for icinga
-DISTNAME = icinga-web-1.8.3
+DISTNAME = icinga-web-1.9.0-beta
+PKGNAME = icinga-web-1.9.0beta
MODULES= lang/php
Index: web/distinfo
===================================================================
RCS file: /cvs/ports/net/icinga/web/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- web/distinfo 28 Mar 2013 12:43:14 -0000 1.12
+++ web/distinfo 3 May 2013 12:45:45 -0000
@@ -1,2 +1,2 @@
-SHA256 (icinga-web-1.8.3.tar.gz) = JK7taV5FXly7eTFTg6oq0XiZ+j0hwUqhfNs1pIobGxs=
-SIZE (icinga-web-1.8.3.tar.gz) = 14614191
+SHA256 (icinga-web-1.9.0-beta.tar.gz) =
4fo8gq/CWujNKV/ioLAhp5vF7A3x2eGMMdH7kJYiVwA=
+SIZE (icinga-web-1.9.0-beta.tar.gz) = 14640206
Index: web/patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/net/icinga/web/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makefile_in
--- web/patches/patch-Makefile_in 18 Oct 2012 20:04:58 -0000 1.4
+++ web/patches/patch-Makefile_in 3 May 2013 12:45:45 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.4 2012/10/18 20:04:58 sthen Exp $
---- Makefile.in.orig Thu Oct 18 10:43:14 2012
-+++ Makefile.in Thu Oct 18 13:34:42 2012
-@@ -287,7 +287,7 @@ db-purge-userprefs:
+--- 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:
$(PHING_CALL) db-purge-userprefs
make-create-files:
Index: web/patches/patch-configure
===================================================================
RCS file: /cvs/ports/net/icinga/web/patches/patch-configure,v
retrieving revision 1.4
diff -u -p -r1.4 patch-configure
--- web/patches/patch-configure 18 Oct 2012 20:04:58 -0000 1.4
+++ web/patches/patch-configure 3 May 2013 12:45:45 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.4 2012/10/18 20:04:58 sthen Exp $
---- configure.orig Thu Oct 18 13:53:51 2012
-+++ configure Thu Oct 18 13:53:32 2012
-@@ -2214,6 +2214,7 @@ fi
+--- configure.orig Mon Apr 29 18:54:16 2013
++++ configure Fri May 3 13:31:02 2013
+@@ -2232,6 +2232,7 @@ fi
# Checks for library functions.
@@ -9,7 +9,7 @@ $OpenBSD: patch-configure,v 1.4 2012/10/
for x in sockets xsl xml json;do
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if php has $x module"
>&5
$as_echo_n "checking if php has $x module... " >&6; }
-@@ -2224,6 +2225,7 @@ else
+@@ -2242,6 +2243,7 @@ else
as_fn_error $? "not found" "$LINENO" 5
fi
done
Index: web/patches/patch-etc_apache2_icinga-web_conf_in
===================================================================
RCS file:
/cvs/ports/net/icinga/web/patches/patch-etc_apache2_icinga-web_conf_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-etc_apache2_icinga-web_conf_in
--- web/patches/patch-etc_apache2_icinga-web_conf_in 17 May 2012 11:06:33
-0000 1.3
+++ web/patches/patch-etc_apache2_icinga-web_conf_in 3 May 2013 12:45:45
-0000
@@ -1,18 +1,18 @@
$OpenBSD: patch-etc_apache2_icinga-web_conf_in,v 1.3 2012/05/17 11:06:33 sthen
Exp $
---- etc/apache2/icinga-web.conf.in.orig Tue Dec 20 07:22:32 2011
-+++ etc/apache2/icinga-web.conf.in Wed Feb 8 16:17:25 2012
-@@ -1,10 +1,13 @@
+--- etc/apache2/icinga-web.conf.in.orig Mon Apr 29 18:54:16 2013
++++ etc/apache2/icinga-web.conf.in Fri May 3 13:38:52 2013
+@@ -10,9 +10,13 @@
+ # Markus Frosch <[email protected]>
+ ###
+
+<IfModule !mod_rewrite.c>
-+LoadModule rewrite_module /usr/lib/apache/modules/mod_rewrite.so
++LoadModule rewrite_module /usr/lib/apache/modules/mod_rewrite.so
+</IfModule>
- #
- # icinga-web apache configuration
- # - Enable all options .htaccess
- # - Add extjs library to alias
- #
- AliasMatch
@web_path@/modules/([A-Za-z0-9]*)/resources/styles/([A-Za-z0-9]*\.css)$
@prefix@/app/modules/$1/pub/styles/$2
--AliasMatch
@web_path@/modules/([A-Za-z0-9]*)/resources/images/([A-Za-z_\-0-9]*\.(png|gif|jpg))$
@prefix@/app/modules/$1/pub/images/$2
-+AliasMatch
@web_path@/modules/([A-Za-z0-9]*)/resources/images/([-_A-Za-z0-9]*\.(png|gif|jpg))$
@prefix@/app/modules/$1/pub/images/$2
-
++
+ # Matching for module stylesheet and images
+ AliasMatch
"^@web_path@/modules/([A-Za-z0-9]+)/resources/styles/([A-Za-z0-9]+\.css)$"
"@prefix@/app/modules/$1/pub/styles/$2"
+-AliasMatch
"^@web_path@/modules/([A-Za-z0-9]+)/resources/images/([A-Za-z_\-0-9]+\.(?:png|gif|jpg))$"
"@prefix@/app/modules/$1/pub/images/$2"
++AliasMatch
"^@web_path@/modules/([A-Za-z0-9]+)/resources/images/([-_A-Za-z0-9]+\.(?:png|gif|jpg))$"
"@prefix@/app/modules/$1/pub/images/$2"
- Alias @web_path@/js/ext3 @prefix@/lib/ext3
+ # Matching for Icinga Web and the ext3 framework
+ Alias @web_path@/js/ext3/ @prefix@/lib/ext3/
Index: web/pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/icinga/web/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST
--- web/pkg/PLIST 28 Mar 2013 12:43:14 -0000 1.12
+++ web/pkg/PLIST 3 May 2013 12:45:45 -0000
@@ -120,8 +120,6 @@ app/modules/Api/actions/ApiSearchAction.
app/modules/Api/actions/IcingaInstanceControllerAction.class.php
app/modules/Api/actions/RelationProviderAction.class.php
app/modules/Api/actions/SLAProviderAction.class.php
-app/modules/Api/actions/Test/
-app/modules/Api/actions/Test/RequestTestAction.class.php
app/modules/Api/config/
app/modules/Api/config/access.xml
app/modules/Api/config/action_filters.xml
@@ -147,6 +145,7 @@ app/modules/Api/config/views/host.xml
app/modules/Api/config/views/hostgroups.xml
app/modules/Api/config/views/misc.xml
app/modules/Api/config/views/notifications.xml
+app/modules/Api/config/views/overview.xml
app/modules/Api/config/views/service.xml
app/modules/Api/config/views/servicegroups.xml
app/modules/Api/lib/
@@ -176,6 +175,7 @@ app/modules/Api/lib/database/IcingaDoctr
app/modules/Api/lib/database/IcingaDoctrineTable.class.php
app/modules/Api/lib/database/IcingaDoctrine_Query.class.php
app/modules/Api/lib/database/filter/
+app/modules/Api/lib/database/filter/IcingaDQLViewFilter.class.php
app/modules/Api/lib/database/filter/IcingaDoctrineFilterMap.class.php
app/modules/Api/lib/database/filter/IcingaDoctrineQueryFilterChain.class.php
app/modules/Api/lib/database/filter/IcingaIDoctrineQueryFilter.interface.php
@@ -370,6 +370,7 @@ app/modules/Api/lib/datastore/AbstractDa
app/modules/Api/lib/datastore/DataStoreFilterModifier.class.php
app/modules/Api/lib/datastore/IcingaApiDataStoreModel.class.php
app/modules/Api/lib/datastore/IcingaStoreTargetModifierModel.class.php
+app/modules/Api/lib/datastore/StoreFilterField.class.php
app/modules/Api/lib/datastore/filter/
app/modules/Api/lib/datastore/filter/ApiStoreFilter.class.php
app/modules/Api/lib/datastore/filter/ApiStoreFilterGroup.class.php
@@ -428,8 +429,6 @@ app/modules/Api/models/Console/ConsoleCo
app/modules/Api/models/Console/ConsoleInterfaceModel.class.php
app/modules/Api/models/DBALMetaManagerModel.class.php
app/modules/Api/models/DeprecatedApiContainerModel.class.php
-app/modules/Api/models/Filter/
-app/modules/Api/models/Filter/UserObjectIdModel.class.php
app/modules/Api/models/IcingaControlTaskModel.class.php
app/modules/Api/models/LegacyApiContainerModel.class.php
app/modules/Api/models/Relation/
@@ -442,7 +441,6 @@ app/modules/Api/models/SLA/SLAFilterMode
app/modules/Api/models/SLA/SLAQueryBuilderModel.class.php
app/modules/Api/models/Store/
app/modules/Api/models/Store/DataStoreResultModel.class.php
-app/modules/Api/models/Store/HostStoreModel.class.php
app/modules/Api/models/Store/LegacyLayer/
app/modules/Api/models/Store/LegacyLayer/IcingaApiModel.class.php
app/modules/Api/models/Store/LegacyLayer/LegacyApiResultModel.class.php
@@ -456,8 +454,7 @@ app/modules/Api/models/Views/
app/modules/Api/models/Views/ApiDQLViewModel.class.php
app/modules/Api/models/Views/Extender/
app/modules/Api/models/Views/Extender/CustomVariableExtenderModel.class.php
-app/modules/Api/models/Views/Extender/NotificationCustomVariableExtenderModel.class.php
-app/modules/Api/models/Views/Extender/UserObjectIdExtenderModel.class.php
+app/modules/Api/models/Views/Extender/MultiLikeExtenderModel.class.php
app/modules/Api/models/Views/Merger/
app/modules/Api/models/Views/Merger/ForeignKeyMergerModel.class.php
app/modules/Api/templates/
@@ -471,8 +468,6 @@ app/modules/Api/validate/ApiSearch.xml
app/modules/Api/validate/IcingaInstanceController.xml
app/modules/Api/validate/RelationProvider.xml
app/modules/Api/validate/SLAProvider.xml
-app/modules/Api/validate/Test/
-app/modules/Api/validate/Test/RequestTest.xml
app/modules/Api/validate/test.php
app/modules/Api/views/
app/modules/Api/views/ApiCommandErrorView.class.php
@@ -486,8 +481,6 @@ app/modules/Api/views/GenericErrorView.c
app/modules/Api/views/IcingaInstanceControllerSuccessView.class.php
app/modules/Api/views/RelationProviderSuccessView.class.php
app/modules/Api/views/SLAProviderSuccessView.class.php
-app/modules/Api/views/Test/
-app/modules/Api/views/Test/RequestTestSuccessView.class.php
app/modules/AppKit/
app/modules/AppKit/actions/
app/modules/AppKit/actions/Admin/
@@ -648,6 +641,9 @@ app/modules/AppKit/lib/js/admin/componen
app/modules/AppKit/lib/js/admin/components/RoleListingGrid.js
app/modules/AppKit/lib/js/admin/components/UserListingGrid.js
app/modules/AppKit/lib/js/admin/components/UserSelectionGrid.js
+app/modules/AppKit/lib/js/compatibility/
+app/modules/AppKit/lib/js/compatibility/Object.js
+app/modules/AppKit/lib/js/compatibility/README
app/modules/AppKit/lib/js/form/
app/modules/AppKit/lib/js/form/action/
app/modules/AppKit/lib/js/form/action/JSONSubmit.js
@@ -738,8 +734,6 @@ app/modules/AppKit/models/Auth/Provider/
app/modules/AppKit/models/Auth/Provider/HTTPBasicAuthenticationModel.class.php
app/modules/AppKit/models/Auth/Provider/LDAPModel.class.php
app/modules/AppKit/models/BulkLoaderModel.class.php
-app/modules/AppKit/models/Credential/
-app/modules/AppKit/models/Credential/AggregatorModel.class.php
app/modules/AppKit/models/Ext/
app/modules/AppKit/models/Ext/ApplicationStateModel.class.php
app/modules/AppKit/models/HeaderDataModel.class.php
@@ -1113,6 +1107,14 @@ app/modules/Cronks/lib/js/Icinga/Cronks/
app/modules/Cronks/lib/js/Icinga/Cronks/util/CategoryPermissionWindow.js
app/modules/Cronks/lib/js/Icinga/Cronks/util/CronkPermissionWindow.js
app/modules/Cronks/lib/js/Icinga/Cronks/util/CronkUrlWindow.js
+app/modules/Cronks/lib/js/Icinga/Cronks/util/FilterEditor.js
+app/modules/Cronks/lib/js/Icinga/Cronks/util/FilterEditorWindow.js
+app/modules/Cronks/lib/js/Icinga/Cronks/util/FilterState.js
+app/modules/Cronks/lib/js/Icinga/Cronks/util/FilterTypes/
+app/modules/Cronks/lib/js/Icinga/Cronks/util/FilterTypes/Api.js
+app/modules/Cronks/lib/js/Icinga/Cronks/util/FilterTypes/Base.js
+app/modules/Cronks/lib/js/Icinga/Cronks/util/FilterTypes/FieldProvider.js
+app/modules/Cronks/lib/js/Icinga/Cronks/util/FilterTypes/Status.js
app/modules/Cronks/lib/js/rmd160.js
app/modules/Cronks/lib/js/search/
app/modules/Cronks/lib/js/search/SearchHandler.js
@@ -1504,6 +1506,7 @@ doc/AUTHORS
doc/CHANGELOG-1.6
doc/CHANGELOG-1.7
doc/CHANGELOG-1.8
+doc/CHANGELOG-1.9
doc/CHANGELOG-1.x
doc/GPL
doc/INSTALL
@@ -1550,9 +1553,15 @@ etc/conf.d/sla.xml.dist
@sample etc/conf.d/sla.xml
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/icinga-web.conf
@sample /var/www/conf/modules.sample/icinga-web.conf
etc/lib/
+etc/lib/CronkDropLayoutTask.php
+etc/lib/CronkStruct.php
+etc/lib/CronkUpgradeAbstract.php
+etc/lib/CronkUpgradeFilterTask.php
etc/lib/agaviClearCache.php
etc/lib/agaviConsoleTask.php
etc/lib/agaviDBExtractorTask.php
@@ -1582,6 +1591,7 @@ etc/schema/updates/mysql/mysql_v1-7-1_to
etc/schema/updates/mysql/mysql_v1-7-2_to_v1-8-0.sql
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/oracle/
etc/schema/updates/oracle/oracle_v1-0-3_to_v1-2.sql
etc/schema/updates/oracle/oracle_v1-2_to_1-3.sql
@@ -1594,6 +1604,7 @@ etc/schema/updates/oracle/oracle_v1-7-0_
etc/schema/updates/oracle/oracle_v1-7-1_to_v1-7-2.sql
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/pgsql/
etc/schema/updates/pgsql/pgsql_v1-0-3_to_v1-2.sql
etc/schema/updates/pgsql/pgsql_v1-2_to_v1-3.sql
@@ -1607,6 +1618,7 @@ etc/schema/updates/pgsql/pgsql_v1-7-1_to
etc/schema/updates/pgsql/pgsql_v1-7-2_to_v1-8-0.sql
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
lib/
lib/agavi/
lib/agavi/src/
@@ -4869,6 +4881,7 @@ pub/images/ext3-ux/tab-scroller-menu.gif
pub/images/icinga/
pub/images/icinga/bug_big.png
pub/images/icinga/bugreport.png
+pub/images/icinga/docs.png
pub/images/icinga/favicon.ico
pub/images/icinga/icinga-logo-big.png
pub/images/icinga/icinga-logo-small.png
@@ -7936,8 +7949,6 @@ pub/images/icons/zone.png
pub/images/icons/zones-stack.png
pub/images/icons/zones.png
pub/index.php
-pub/soap/
-pub/soap/.htaccess
pub/styles/
pub/styles/exception.css
pub/styles/icinga-cronk-icons.css
