Index: branches/2019Q1/net-mgmt/icinga2/Makefile =================================================================== --- branches/2019Q1/net-mgmt/icinga2/Makefile (revision 496455) +++ branches/2019Q1/net-mgmt/icinga2/Makefile (revision 496456) @@ -1,106 +1,106 @@ # $FreeBSD$ PORTNAME= icinga2 DISTVERSIONPREFIX= v -DISTVERSION= 2.10.3 +DISTVERSION= 2.10.4 CATEGORIES= net-mgmt MAINTAINER= lme@FreeBSD.org COMMENT= Monitoring and management system for hosts, services and networks LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libyajl.so:devel/yajl RUN_DEPENDS= ${LOCALBASE}/bin/bash:shells/bash USES= alias bison cmake:insource compiler:c++0x libedit ssl USE_GITHUB= yes GH_ACCOUNT= icinga USE_LDCONFIG= yes USE_RC_SUBR= ${PORTNAME} OPTIONS_DEFINE= DOCS EXAMPLES OPTIONS_GROUP= BACKEND OPTIONS_GROUP_BACKEND= MYSQL PGSQL OPTIONS_RADIO= PLUGINS OPTIONS_RADIO_PLUGINS= MONPLUGINS NAGPLUGINS OPTIONS_DEFAULT= MYSQL PGSQL MONPLUGINS MONPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/monitoring-plugins NAGPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios-plugins MYSQL_CMAKE_ON= -DICINGA2_WITH_MYSQL:BOOL=true PGSQL_CMAKE_ON= -DICINGA2_WITH_PGSQL:BOOL=true ICINGA2USER?= icinga ICINGA2GROUP?= icinga USERS= ${ICINGA2USER} GROUPS= ${ICINGA2GROUP} LOCALSTATEDIR?= /var ICINGA2LOGDIR?= /var/log/${PORTNAME} CMAKE_ARGS+= -DICINGA2_USER=${ICINGA2USER} \ -DICINGA2_GROUP=${ICINGA2GROUP} \ -DICINGA2_COMMAND_USER=${ICINGA2USER} \ -DICINGA2_COMMAND_GROUP=${ICINGA2USER} \ -DICINGA2_PLUGINDIR=${LOCALBASE}/libexec/nagios \ -DICINGA2_RUNDIR=/var/run \ -DCMAKE_INSTALL_SYSCONFDIR=${PREFIX}/etc \ -DCMAKE_INSTALL_LOCALSTATEDIR=${LOCALSTATEDIR} \ -DCMAKE_INSTALL_MANDIR=${MANPREFIX}/man \ -DCMAKE_EXE_LINKER_FLAGS=${PREFIX}/lib/icinga2 \ -DCMAKE_MODULE_LINKER_FLAGS=${PREFIX}/lib/icinga2 \ -DCMAKE_SHARED_LINKER_FLAGS=${PREFIX}/lib/icinga2 \ -DCMAKE_STATIC_LINKER_FLAGS=${PREFIX}/lib/icinga2 SUB_LIST= ICINGA2LOGDIR=${ICINGA2LOGDIR} \ ICINGA2USER=${ICINGA2USER} \ ICINGA2GROUP=${ICINGA2GROUP} \ WWWGRP=${WWWGRP} PLIST_SUB= ICINGA2USER=${ICINGA2USER} \ ICINGA2GROUP=${ICINGA2GROUP} \ WWWGRP=${WWWGRP} SUB_FILES= pkg-message ${PORTNAME}-newsyslog.conf # Config files with references to "Linux" LINUX_CONFIG= groups.conf services.conf hosts.conf MYSQL_USES= mysql PGSQL_USES= pgsql OPTIONS_SUB= yes .include .if ! ${PORT_OPTIONS:MMYSQL} && ! ${PORT_OPTIONS:MPGSQL} PLIST_SUB+= DBBACKEND="@comment " .else PLIST_SUB+= DBBACKEND="" .endif post-patch: .for f in ${LINUX_CONFIG} ${REINPLACE_CMD} 's,[Ll]inux,FreeBSD,g' ${WRKSRC}/etc/icinga2/conf.d/${f} .endfor pre-install: ${FIND} ${WRKSRC}/etc -type f -name "*.conf" -exec ${MV} {} {}.sample \; ${FIND} ${WRKSRC}/etc/icinga2/scripts -type f -name "*.sh" \ -exec ${MV} {} {}.sample \; post-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/newsyslog/ ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-newsyslog.conf ${STAGEDIR}${EXAMPLESDIR}/newsyslog/${PORTNAME}.conf ${MKDIR} ${STAGEDIR}${PREFIX}/share/vim/vimfiles (cd ${WRKSRC}/tools/syntax/vim && ${COPYTREE_SHARE} . \ ${STAGEDIR}${PREFIX}/share/vim/vimfiles) .include Index: branches/2019Q1/net-mgmt/icinga2/distinfo =================================================================== --- branches/2019Q1/net-mgmt/icinga2/distinfo (revision 496455) +++ branches/2019Q1/net-mgmt/icinga2/distinfo (revision 496456) @@ -1,3 +1,3 @@ -TIMESTAMP = 1551186744 -SHA256 (icinga-icinga2-v2.10.3_GH0.tar.gz) = 81d250ca7e609097dc78cb7fea646bdede5ecb4fd435b37d21f8ba3335fb7fd4 -SIZE (icinga-icinga2-v2.10.3_GH0.tar.gz) = 4421984 +TIMESTAMP = 1553165053 +SHA256 (icinga-icinga2-v2.10.4_GH0.tar.gz) = 3e43358044e0fff21cac49aa8a887889ba5ad1cf8360cd8e01f4f47943e713b1 +SIZE (icinga-icinga2-v2.10.4_GH0.tar.gz) = 5129248 Index: branches/2019Q1/net-mgmt/icinga2/pkg-plist =================================================================== --- branches/2019Q1/net-mgmt/icinga2/pkg-plist (revision 496455) +++ branches/2019Q1/net-mgmt/icinga2/pkg-plist (revision 496456) @@ -1,189 +1,189 @@ etc/bash_completion.d/icinga2 @sample %%ETCDIR%%/conf.d/app.conf.sample @sample %%ETCDIR%%/conf.d/commands.conf.sample @sample %%ETCDIR%%/conf.d/downtimes.conf.sample @sample %%ETCDIR%%/conf.d/groups.conf.sample @sample %%ETCDIR%%/conf.d/hosts.conf.sample @sample %%ETCDIR%%/conf.d/notifications.conf.sample @sample %%ETCDIR%%/conf.d/services.conf.sample @sample %%ETCDIR%%/conf.d/templates.conf.sample @sample %%ETCDIR%%/conf.d/timeperiods.conf.sample @sample %%ETCDIR%%/conf.d/users.conf.sample @sample %%ETCDIR%%/constants.conf.sample @sample %%ETCDIR%%/features-available/api.conf.sample @sample %%ETCDIR%%/features-available/checker.conf.sample @sample %%ETCDIR%%/features-available/command.conf.sample @sample %%ETCDIR%%/features-available/compatlog.conf.sample @sample %%ETCDIR%%/features-available/debuglog.conf.sample @sample %%ETCDIR%%/features-available/elasticsearch.conf.sample @sample %%ETCDIR%%/features-available/gelf.conf.sample @sample %%ETCDIR%%/features-available/graphite.conf.sample %%MYSQL%%@sample(%%ICINGA2USER%%,%%ICINGA2GROUP%%,0640) %%ETCDIR%%/features-available/ido-mysql.conf.sample %%PGSQL%%@sample(%%ICINGA2USER%%,%%ICINGA2GROUP%%,0640) %%ETCDIR%%/features-available/ido-pgsql.conf.sample @sample %%ETCDIR%%/features-available/influxdb.conf.sample @sample %%ETCDIR%%/features-available/livestatus.conf.sample @sample %%ETCDIR%%/features-available/mainlog.conf.sample @sample %%ETCDIR%%/features-available/notification.conf.sample @sample %%ETCDIR%%/features-available/opentsdb.conf.sample @sample %%ETCDIR%%/features-available/perfdata.conf.sample @sample %%ETCDIR%%/features-available/statusdata.conf.sample @sample %%ETCDIR%%/features-available/syslog.conf.sample %%ETCDIR%%/features-enabled/checker.conf %%ETCDIR%%/features-enabled/mainlog.conf %%ETCDIR%%/features-enabled/notification.conf @sample %%ETCDIR%%/icinga2.conf.sample @sample %%ETCDIR%%/scripts/mail-host-notification.sh.sample @sample %%ETCDIR%%/scripts/mail-service-notification.sh.sample @sample %%ETCDIR%%/zones.conf.sample %%ETCDIR%%/zones.d/README %%MYSQL%%lib/icinga2/libmysql_shim.so -%%MYSQL%%lib/icinga2/libmysql_shim.so.2.10.3 +%%MYSQL%%lib/icinga2/libmysql_shim.so.2.10.4 %%PGSQL%%lib/icinga2/libpgsql_shim.so -%%PGSQL%%lib/icinga2/libpgsql_shim.so.2.10.3 +%%PGSQL%%lib/icinga2/libpgsql_shim.so.2.10.4 lib/icinga2/sbin/icinga2 libexec/nagios/check_nscp_api man/man8/icinga2.8.gz sbin/icinga2 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.md %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README.md %%PORTDOCS%%%%DOCSDIR%%/markdown/01-about.md %%PORTDOCS%%%%DOCSDIR%%/markdown/02-getting-started.md %%PORTDOCS%%%%DOCSDIR%%/markdown/03-monitoring-basics.md %%PORTDOCS%%%%DOCSDIR%%/markdown/04-configuring-icinga-2.md %%PORTDOCS%%%%DOCSDIR%%/markdown/05-service-monitoring.md %%PORTDOCS%%%%DOCSDIR%%/markdown/06-distributed-monitoring.md %%PORTDOCS%%%%DOCSDIR%%/markdown/07-agent-based-monitoring.md %%PORTDOCS%%%%DOCSDIR%%/markdown/08-advanced-topics.md %%PORTDOCS%%%%DOCSDIR%%/markdown/09-object-types.md %%PORTDOCS%%%%DOCSDIR%%/markdown/10-icinga-template-library.md %%PORTDOCS%%%%DOCSDIR%%/markdown/11-cli-commands.md %%PORTDOCS%%%%DOCSDIR%%/markdown/12-icinga2-api.md %%PORTDOCS%%%%DOCSDIR%%/markdown/13-addons.md %%PORTDOCS%%%%DOCSDIR%%/markdown/14-features.md %%PORTDOCS%%%%DOCSDIR%%/markdown/15-troubleshooting.md %%PORTDOCS%%%%DOCSDIR%%/markdown/16-upgrading-icinga-2.md %%PORTDOCS%%%%DOCSDIR%%/markdown/17-language-reference.md %%PORTDOCS%%%%DOCSDIR%%/markdown/18-library-reference.md %%PORTDOCS%%%%DOCSDIR%%/markdown/19-technical-concepts.md %%PORTDOCS%%%%DOCSDIR%%/markdown/20-script-debugger.md %%PORTDOCS%%%%DOCSDIR%%/markdown/21-development.md %%PORTDOCS%%%%DOCSDIR%%/markdown/22-selinux.md %%PORTDOCS%%%%DOCSDIR%%/markdown/23-migrating-from-icinga-1x.md %%PORTDOCS%%%%DOCSDIR%%/markdown/24-appendix.md %%PORTDOCS%%%%DOCSDIR%%/markdown/images/addons/dashing_icinga2.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/addons/icingaweb2_businessprocess.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/addons/icingaweb2_grafana.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/addons/icingaweb2_graphite.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/addons/icingaweb2_maps.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/advanced-topics/flapping-state-graph.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/advanced-topics/icinga2_external_checks_freshness_icingaweb2.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/advanced-topics/icingaweb2_downtime_handled.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_endpoints.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_roles.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_scenarios_ha_master_clients.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_scenarios_master_clients.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_scenarios_master_satellite_client.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_top_down_command_endpoint.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_top_down_config_sync.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_windows_client_disk_icingaweb2.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_windows_nscp.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_windows_nscp_api_drivesize_icingaweb2.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_windows_nscp_counter_icingaweb2.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_zones.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_cmd_admin_net_start_stop.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_running_service.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_installer_01.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_installer_02.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_installer_03.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_installer_04.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_installer_05.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_01.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_02.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_02_global_zone.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_03.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_04.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_01.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_02.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_03.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_04.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_05.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_06.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_07.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_06_finish_no_ticket.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_06_finish_with_ticket.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_examine_config.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/getting-started/mariadb-centos7.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/getting-started/nano-syntax.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/getting-started/postgr-import-ido.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/getting-started/vim-syntax.png %%PORTEXAMPLES%%%%EXAMPLESDIR%%/newsyslog/icinga2.conf %%MYSQL%%%%DATADIR%%-ido-mysql/schema/mysql.sql %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.0.2.sql %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.1.0.sql %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.2.0.sql %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.3.0.sql %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.4.0.sql %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.5.0.sql %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.6.0.sql %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.8.0.sql %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.8.1.sql %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/pgsql.sql %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.0.2.sql %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.1.0.sql %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.2.0.sql %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.3.0.sql %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.4.0.sql %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.5.0.sql %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.6.0.sql %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.8.0.sql %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.8.1.sql %%DATADIR%%/include/command-icinga.conf %%DATADIR%%/include/command-nscp-local.conf %%DATADIR%%/include/command-plugins-manubulon.conf %%DATADIR%%/include/command-plugins-windows.conf %%DATADIR%%/include/command-plugins.conf %%DATADIR%%/include/hangman %%DATADIR%%/include/itl %%DATADIR%%/include/manubulon %%DATADIR%%/include/nscp %%DATADIR%%/include/plugins %%DATADIR%%/include/plugins-contrib %%DATADIR%%/include/plugins-contrib.d/big-data.conf %%DATADIR%%/include/plugins-contrib.d/databases.conf %%DATADIR%%/include/plugins-contrib.d/hardware.conf %%DATADIR%%/include/plugins-contrib.d/icingacli.conf %%DATADIR%%/include/plugins-contrib.d/ipmi.conf %%DATADIR%%/include/plugins-contrib.d/logmanagement.conf %%DATADIR%%/include/plugins-contrib.d/metrics.conf %%DATADIR%%/include/plugins-contrib.d/network-components.conf %%DATADIR%%/include/plugins-contrib.d/network-services.conf %%DATADIR%%/include/plugins-contrib.d/operating-system.conf %%DATADIR%%/include/plugins-contrib.d/raid-controller.conf %%DATADIR%%/include/plugins-contrib.d/smart-attributes.conf %%DATADIR%%/include/plugins-contrib.d/storage.conf %%DATADIR%%/include/plugins-contrib.d/virtualization.conf %%DATADIR%%/include/plugins-contrib.d/vmware.conf %%DATADIR%%/include/plugins-contrib.d/web.conf %%DATADIR%%/include/windows-plugins share/vim/vimfiles/ftdetect/icinga2.vim share/vim/vimfiles/syntax/icinga2.vim @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/cache/icinga2 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/api/log @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/api/zones @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/api @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/certificate-requests @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/certs @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2 @dir /var/lib @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/log/icinga2/compat/archives @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/log/icinga2/compat @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/log/icinga2/crash @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/log/icinga2 @dir(%%ICINGA2USER%%,%%WWWGRP%%,2750) /var/run/icinga2/cmd @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/run/icinga2 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/spool/icinga2/perfdata @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/spool/icinga2/tmp @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/spool/icinga2 Index: branches/2019Q1 =================================================================== --- branches/2019Q1 (revision 496455) +++ branches/2019Q1 (revision 496456) Property changes on: branches/2019Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r496444