1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-20 20:09:11 +00:00

- Update to 1.11.7

- Fix libdbi dependency [1]
- Use @sample keyword
- Remove @dirrmtry from plist
- Adjust pkg-message

Noticed by:	Peter Ross
This commit is contained in:
Lars Engels 2014-09-24 20:08:16 +00:00
parent b7a3d7b8ec
commit fa7e2e9c78
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=369202
6 changed files with 58 additions and 98 deletions

View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= icinga
PORTVERSION= 1.11.5
PORTREVISION= 2
PORTVERSION= 1.11.7
CATEGORIES= net-mgmt
MASTER_SITES= https://github.com/Icinga/${PORTNAME}-core/releases/download/v${PORTVERSION}/
@ -87,7 +86,7 @@ NAGPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MIDOUTILS}
LIB_DEPENDS+= libdbi.so:${PORTSDIR}/databases/libdbi-drivers
LIB_DEPENDS+= libdbi.so:${PORTSDIR}/databases/libdbi
CONFIGURE_ARGS+= --enable-idoutils \
--enable-ssl \
--with-dbi-lib=${LOCALBASE}/lib \

View File

@ -1,2 +1,2 @@
SHA256 (icinga-1.11.5.tar.gz) = 3183a2b368baf07f8dbd0f2333a751fef98ba3f58b3e85b59cafce5652d72380
SIZE (icinga-1.11.5.tar.gz) = 18658380
SHA256 (icinga-1.11.7.tar.gz) = b6526dd44d42c70e50ebfb58608f1fec8ba6d805fda4fde57f1078c248e25045
SIZE (icinga-1.11.7.tar.gz) = 18657763

View File

@ -179,8 +179,8 @@
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgiauth.cfg $(DESTDIR)$(CFGDIR)/cgiauth.cfg
+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg-sample
+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgiauth.cfg $(DESTDIR)$(CFGDIR)/cgiauth.cfg-sample
+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg.sample
+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgiauth.cfg $(DESTDIR)$(CFGDIR)/cgiauth.cfg.sample
install-config: install-cgiconf
@ -199,17 +199,17 @@
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/windows.cfg $(DESTDIR)$(CFGDIR)/objects/windows.cfg
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/printer.cfg $(DESTDIR)$(CFGDIR)/objects/printer.cfg
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/switch.cfg $(DESTDIR)$(CFGDIR)/objects/switch.cfg
+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/icinga.cfg $(DESTDIR)$(CFGDIR)/icinga.cfg-sample
+ $(INSTALL) -b -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg-sample
+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg-sample
+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg-sample
+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg-sample
+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/notifications.cfg $(DESTDIR)$(CFGDIR)/objects/notifications.cfg-sample
+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/objects/timeperiods.cfg-sample
+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/objects/localhost.cfg-sample
+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/windows.cfg $(DESTDIR)$(CFGDIR)/objects/windows.cfg-sample
+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/printer.cfg $(DESTDIR)$(CFGDIR)/objects/printer.cfg-sample
+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/switch.cfg $(DESTDIR)$(CFGDIR)/objects/switch.cfg-sample
+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/icinga.cfg $(DESTDIR)$(CFGDIR)/icinga.cfg.sample
+ $(INSTALL) -b -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg.sample
+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg.sample
+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg.sample
+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg.sample
+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/notifications.cfg $(DESTDIR)$(CFGDIR)/objects/notifications.cfg.sample
+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/objects/timeperiods.cfg.sample
+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/objects/localhost.cfg.sample
+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/windows.cfg $(DESTDIR)$(CFGDIR)/objects/windows.cfg.sample
+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/printer.cfg $(DESTDIR)$(CFGDIR)/objects/printer.cfg.sample
+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/switch.cfg $(DESTDIR)$(CFGDIR)/objects/switch.cfg.sample
@echo ""
@echo "*** Config files installed ***"
@ -218,7 +218,7 @@
install-webconf:
$(MKDIR) -p -m 775 $(DESTDIR)$(HTTPD_CONF)
- $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/httpd.conf $(DESTDIR)$(HTTPDCONFFILE)
+ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/httpd.conf $(DESTDIR)$(HTTPDCONFFILE)-sample
+ $(INSTALL) -b -m 644 $(INSTALL_OPTS) sample-config/httpd.conf $(DESTDIR)$(HTTPDCONFFILE).sample
@if [ x$(APACHE24_DEBIAN) = xyes ]; then \
echo " Debian Apache 2.4 detected. " ;\
echo " Run 'a2enconf icinga' and 'service apache2 reload'" ;\
@ -227,7 +227,7 @@
$(MKDIR) -p -m 775 $(DESTDIR)$(HTTPD_CONF)
- $(INSTALL) -b -m 644 $(INSTALL_OPTS) icinga.htpasswd $(DESTDIR)$(HTTPAUTHFILE)
+ $(INSTALL) -b -m 644 $(INSTALL_OPTS) icinga.htpasswd $(DESTDIR)$(HTTPAUTHFILE)-sample
+ $(INSTALL) -b -m 644 $(INSTALL_OPTS) icinga.htpasswd $(DESTDIR)$(HTTPAUTHFILE).sample
@echo ""
@echo "*** Icinga http auth file installed ***"

View File

@ -1,9 +1,15 @@
--- module/idoutils/Makefile.in.orig 2014-03-13 11:46:50.000000000 +0100
+++ module/idoutils/Makefile.in 2014-03-13 21:48:34.176304857 +0100
@@ -60,5 +60,5 @@ install:
$(INSTALL) -b -m 664 $(INSTALL_OPTS) config/ido2db.cfg-sample $(DESTDIR)$(CFGDIR)
$(INSTALL) -b -m 664 $(INSTALL_OPTS) config/idomod.cfg-sample $(DESTDIR)$(CFGDIR)
$(INSTALL) -b -m 664 $(INSTALL_OPTS) config/idoutils.cfg-sample $(DESTDIR)$(CFGDIR)/modules
--- module/idoutils/Makefile.in.orig 2014-09-24 21:24:54.580929462 +0200
+++ module/idoutils/Makefile.in 2014-09-24 21:25:56.330324547 +0200
@@ -57,8 +57,8 @@
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/objects
$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/modules
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) config/ido2db.cfg-sample $(DESTDIR)$(CFGDIR)
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) config/idomod.cfg-sample $(DESTDIR)$(CFGDIR)
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) config/idoutils.cfg-sample $(DESTDIR)$(CFGDIR)/modules
- $(INSTALL) -b -m 664 $(INSTALL_OPTS) config/ido2db_check_proc.cfg $(DESTDIR)$(CFGDIR)/objects/ido2db_check_proc.cfg
+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) config/ido2db_check_proc.cfg $(DESTDIR)$(CFGDIR)/objects/ido2db_check_proc.cfg-sample
+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) config/ido2db.cfg-sample $(DESTDIR)$(CFGDIR)/ido2db.cfg.sample
+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) config/idomod.cfg-sample $(DESTDIR)$(CFGDIR)/idomod.cfg.sample
+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) config/idoutils.cfg-sample $(DESTDIR)$(CFGDIR)/modules/idoutils.cfg.sample
+ $(INSTALL) -b -m 664 $(INSTALL_OPTS) config/ido2db_check_proc.cfg $(DESTDIR)$(CFGDIR)/objects/ido2db_check_proc.cfg.sample

View File

@ -4,10 +4,8 @@
icinga_enable="YES"
Configuration templates are available in %%PREFIX%%/etc/icinga as
*.cfg-sample files. Copy them to *.cfg files where required and
edit to suit your needs. Documentation is available in HTML form
in %%PREFIX%%/%%ICINGAWWWDIR%%/docs/.
Documentation is available in HTML form in
%%PREFIX%%/%%ICINGAWWWDIR%%/docs/.
If you don't already have a web server running, you will need to
install and configure one to finish off your Icinga installation.

View File

@ -2,23 +2,23 @@ bin/icinga
bin/icingastats
%%IDOUTILS%%bin/ido2db
%%IDOUTILS%%bin/log2ido
%%ETCDIR%%/cgi.cfg-sample
%%ETCDIR%%/cgiauth.cfg-sample
%%ETCDIR%%/icinga.cfg-sample
%%IDOUTILS%%%%ETCDIR%%/ido2db.cfg-sample
%%IDOUTILS%%%%ETCDIR%%/idomod.cfg-sample
%%IDOUTILS%%%%ETCDIR%%/modules/idoutils.cfg-sample
%%ETCDIR%%/objects/commands.cfg-sample
%%ETCDIR%%/objects/contacts.cfg-sample
%%IDOUTILS%%%%ETCDIR%%/objects/ido2db_check_proc.cfg-sample
%%ETCDIR%%/objects/localhost.cfg-sample
%%ETCDIR%%/objects/notifications.cfg-sample
%%ETCDIR%%/objects/printer.cfg-sample
%%ETCDIR%%/objects/switch.cfg-sample
%%ETCDIR%%/objects/templates.cfg-sample
%%ETCDIR%%/objects/timeperiods.cfg-sample
%%ETCDIR%%/objects/windows.cfg-sample
%%ETCDIR%%/resource.cfg-sample
@sample %%ETCDIR%%/cgi.cfg.sample
@sample %%ETCDIR%%/cgiauth.cfg.sample
@sample %%ETCDIR%%/icinga.cfg.sample
@sample %%IDOUTILS%%%%ETCDIR%%/ido2db.cfg.sample
@sample %%IDOUTILS%%%%ETCDIR%%/idomod.cfg.sample
@sample %%IDOUTILS%%%%ETCDIR%%/modules/idoutils.cfg.sample
@sample %%ETCDIR%%/objects/commands.cfg.sample
@sample %%ETCDIR%%/objects/contacts.cfg.sample
@sample %%IDOUTILS%%%%ETCDIR%%/objects/ido2db_check_proc.cfg.sample
@sample %%ETCDIR%%/objects/localhost.cfg.sample
@sample %%ETCDIR%%/objects/notifications.cfg.sample
@sample %%ETCDIR%%/objects/printer.cfg.sample
@sample %%ETCDIR%%/objects/switch.cfg.sample
@sample %%ETCDIR%%/objects/templates.cfg.sample
@sample %%ETCDIR%%/objects/timeperiods.cfg.sample
@sample %%ETCDIR%%/objects/windows.cfg.sample
@sample %%ETCDIR%%/resource.cfg.sample
%%IDOUTILS%%lib/idomod.so
libexec/icinga/eventhandlers/disable_active_service_checks
libexec/icinga/eventhandlers/disable_notifications
@ -29,7 +29,7 @@ libexec/icinga/eventhandlers/enable_notifications
libexec/icinga/eventhandlers/redundancy-scenario1/handle-master-host-event
libexec/icinga/eventhandlers/redundancy-scenario1/handle-master-proc-event
libexec/icinga/eventhandlers/submit_check_result
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/apache22/icinga.conf-sample
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/apache22/icinga.conf.sample
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/config/ido2db.cfg-sample
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/config/ido2db.cfg-sample.in
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/config/ido2db_check_proc.cfg
@ -62,6 +62,8 @@ libexec/icinga/eventhandlers/submit_check_result
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.8.0.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.9.0.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.11.3.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.11.6.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/mysql/upgrade/mysql-upgrade-1.11.7.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/create_icinga_objects_oracle.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/create_oracle_sys.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/icinga_defines.sql
@ -82,6 +84,8 @@ libexec/icinga/eventhandlers/submit_check_result
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.7.0.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.8.0.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.9.0.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.11.6.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle-upgrade-1.11.7.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle_alter_icinga13_numbers.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle_alter_icinga13_objects.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/oracle/upgrade/oracle_recreate_icinga13_functions.sql
@ -99,6 +103,8 @@ libexec/icinga/eventhandlers/submit_check_result
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.7.0.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.8.0.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.9.0.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.11.6.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade/pgsql-upgrade-1.11.7.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/comment_history.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/comments.sql
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/idoutils/db/queries/contact_notification_methods.sql
@ -2372,52 +2378,3 @@ libexec/icinga/eventhandlers/submit_check_result
%%ICINGAWWWDIR%%/stylesheets/tac.css
%%ICINGAWWWDIR%%/stylesheets/tacheader.css
%%ICINGAWWWDIR%%/stylesheets/trends.css
@dirrmtry %%ICINGAWWWDIR%%/stylesheets
@dirrmtry %%ICINGAWWWDIR%%/ssi
@dirrmtry %%ICINGAWWWDIR%%/media
@dirrmtry %%ICINGAWWWDIR%%/log
@dirrmtry %%ICINGAWWWDIR%%/js
@dirrmtry %%ICINGAWWWDIR%%/jquery-ui/ui
@dirrmtry %%ICINGAWWWDIR%%/jquery-ui/themes/base/images
@dirrmtry %%ICINGAWWWDIR%%/jquery-ui/themes/base
@dirrmtry %%ICINGAWWWDIR%%/jquery-ui/themes
@dirrmtry %%ICINGAWWWDIR%%/jquery-ui-addon
@dirrmtry %%ICINGAWWWDIR%%/jquery-ui
@dirrmtry %%ICINGAWWWDIR%%/images/logos/vendors
@dirrmtry %%ICINGAWWWDIR%%/images/logos/other
@dirrmtry %%ICINGAWWWDIR%%/images/logos/hardware
@dirrmtry %%ICINGAWWWDIR%%/images/logos/equipment
@dirrmtry %%ICINGAWWWDIR%%/images/logos
@dirrmtry %%ICINGAWWWDIR%%/images
@dirrmtry %%ICINGAWWWDIR%%/docs/stylesheets
@dirrmtry %%ICINGAWWWDIR%%/docs/js
@dirrmtry %%ICINGAWWWDIR%%/docs/images/flags
@dirrmtry %%ICINGAWWWDIR%%/docs/images
@dirrmtry %%ICINGAWWWDIR%%/docs/en
@dirrmtry %%ICINGAWWWDIR%%/docs/de
@dirrmtry %%ICINGAWWWDIR%%/docs
@dirrmtry %%ICINGAWWWDIR%%/cgi-bin
@dirrmtry %%ICINGAWWWDIR%%
%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/apache22
%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/idoutils/db/scripts
%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/idoutils/db/queries
%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/idoutils/db/pgsql/upgrade
%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/idoutils/db/pgsql/fix
%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/idoutils/db/pgsql
%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/idoutils/db/oracle/upgrade
%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/idoutils/db/oracle
%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/idoutils/db/mysql/upgrade
%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/idoutils/db/mysql
%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/idoutils/db
%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/idoutils/config/updates
%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/idoutils/config
%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/idoutils
%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
@dirrmtry libexec/icinga/eventhandlers/redundancy-scenario1
@dirrmtry libexec/icinga/eventhandlers/distributed-monitoring
@dirrmtry libexec/icinga/eventhandlers
@dirrmtry libexec/icinga
@dirrmtry %%ETCDIR%%/objects
@dirrmtry %%ETCDIR%%/modules
@dirrmtry %%ETCDIR%%/conf.d
@dirrmtry %%ETCDIR%%