Merge branch 'master' into mate-1.16mate-1.16

4 files changed, 34 insertions, 18 deletions

diff --git a/net-mgmt/icinga2/Makefile b/net-mgmt/icinga2/Makefile
index 12078f2efdb1..7dc8d3c83905 100644
--- a/net-mgmt/icinga2/Makefile
+++ b/net-mgmt/icinga2/Makefile
@@ -2,20 +2,20 @@
 
 PORTNAME=	icinga2
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.5.4
-PORTREVISION=	1
+DISTVERSION=	2.6.1
 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
 
-BROKEN_powerpc64=	Does not build
+BROKEN_powerpc64=	does not build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	icinga
@@ -88,19 +88,10 @@ PLIST_SUB+=	DBBACKEND="@comment "
 PLIST_SUB+=	DBBACKEND=""
 .endif
 
-.if ${OSVERSION} < 1000033
-BUILD_DEPENDS+=	flex>=2.5.31:textproc/flex
-CMAKE_ARGS+=	-DFLEX_EXECUTABLE:STRING=${LOCALBASE}/bin/flex
-CXXFLAGS+=	-I${LOCALBASE}/include/flex
-.endif
-
 post-patch:
 .for f in ${LINUX_CONFIG}
 	${REINPLACE_CMD} 's,[Ll]inux,FreeBSD,g' ${WRKSRC}/etc/icinga2/conf.d/${f}
 .endfor
-.if ${OSVERSION} < 1000000
-	${REINPLACE_CMD} 's|,--no-export-dynamic||' ${WRKSRC}/CMakeLists.txt
-.endif
 
 pre-install:
 	${FIND} ${WRKSRC}/etc -type f -name "*.conf" -exec ${MV} {} {}.sample \;
diff --git a/net-mgmt/icinga2/distinfo b/net-mgmt/icinga2/distinfo
index 193feddcda5a..a0cfe337757f 100644
--- a/net-mgmt/icinga2/distinfo
+++ b/net-mgmt/icinga2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1473347191
-SHA256 (icinga-icinga2-v2.5.4_GH0.tar.gz) = f22ca17cd9951598ab6a1bc27c1ef82b9f1bb49795f69066ccd4d499faa240fc
-SIZE (icinga-icinga2-v2.5.4_GH0.tar.gz) = 2493864
+TIMESTAMP = 1485975107
+SHA256 (icinga-icinga2-v2.6.1_GH0.tar.gz) = 783d35c7fcd1b8fa7914633dc376dfad864ccd648b773bb5ef61bb2a1e86b425
+SIZE (icinga-icinga2-v2.6.1_GH0.tar.gz) = 2357267
diff --git a/net-mgmt/icinga2/files/icinga2.in b/net-mgmt/icinga2/files/icinga2.in
index 542f9abf112b..a74aaa3cb276 100644
--- a/net-mgmt/icinga2/files/icinga2.in
+++ b/net-mgmt/icinga2/files/icinga2.in
@@ -19,6 +19,11 @@
 
 . /etc/rc.subr
 
+# XXX temporary workaround for a bug in Icinga 2. See
+# https://dev.icinga.org/issues/13567
+
+trap "" SIGPIPE
+
 # Add /usr/local/bin to path, so that the notification scripts 
 # can work (#!/usr/bin/env bash)
 export PATH=$PATH:%%LOCALBASE%%/bin
diff --git a/net-mgmt/icinga2/pkg-plist b/net-mgmt/icinga2/pkg-plist
index d4f378b90b4a..332ee5836a02 100644
--- a/net-mgmt/icinga2/pkg-plist
+++ b/net-mgmt/icinga2/pkg-plist
@@ -1,5 +1,4 @@
 etc/bash_completion.d/icinga2
-%%EXAMPLESDIR%%/newsyslog/icinga2
 @sample %%ETCDIR%%/conf.d/app.conf.sample
 @sample %%ETCDIR%%/conf.d/commands.conf.sample
 @sample %%ETCDIR%%/conf.d/downtimes.conf.sample
@@ -39,24 +38,41 @@ etc/bash_completion.d/icinga2
 @sample %%ETCDIR%%/scripts/mail-service-notification.sh.sample
 @sample %%ETCDIR%%/zones.conf.sample
 %%ETCDIR%%/zones.d/README
-lib/icinga2/sbin/icinga2
 lib/icinga2/libbase.so
+lib/icinga2/libbase.so.2.6.1
 lib/icinga2/libchecker.so
+lib/icinga2/libchecker.so.2.6.1
 lib/icinga2/libcli.so
+lib/icinga2/libcli.so.2.6.1
 lib/icinga2/libcompat.so
+lib/icinga2/libcompat.so.2.6.1
 lib/icinga2/libconfig.so
+lib/icinga2/libconfig.so.2.6.1
 %%DBBACKEND%%lib/icinga2/libdb_ido.so
+%%DBBACKEND%%lib/icinga2/libdb_ido.so.2.6.1
 %%MYSQL%%lib/icinga2/libdb_ido_mysql.so
+%%MYSQL%%lib/icinga2/libdb_ido_mysql.so.2.6.1
 %%PGSQL%%lib/icinga2/libdb_ido_pgsql.so
+%%PGSQL%%lib/icinga2/libdb_ido_pgsql.so.2.6.1
 lib/icinga2/libexecvpe.so
+lib/icinga2/libexecvpe.so.2.6.1
 lib/icinga2/libicinga.so
+lib/icinga2/libicinga.so.2.6.1
 lib/icinga2/liblivestatus.so
+lib/icinga2/liblivestatus.so.2.6.1
 lib/icinga2/libmethods.so
+lib/icinga2/libmethods.so.2.6.1
 lib/icinga2/libmmatch.so
+lib/icinga2/libmmatch.so.2.6.1
 lib/icinga2/libnotification.so
+lib/icinga2/libnotification.so.2.6.1
 lib/icinga2/libperfdata.so
+lib/icinga2/libperfdata.so.2.6.1
 lib/icinga2/libremote.so
+lib/icinga2/libremote.so.2.6.1
 lib/icinga2/libsocketpair.so
+lib/icinga2/libsocketpair.so.2.6.1
+lib/icinga2/sbin/icinga2
 man/man8/icinga2.8.gz
 sbin/icinga2
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
@@ -88,6 +104,7 @@ sbin/icinga2
 %%PORTDOCS%%%%DOCSDIR%%/markdown/7-agent-based-monitoring.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/8-advanced-topics.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/9-object-types.md
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/newsyslog/icinga2
 %%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
@@ -95,6 +112,7 @@ sbin/icinga2
 %%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
 %%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
@@ -102,12 +120,12 @@ sbin/icinga2
 %%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
 %%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/command.conf
 %%DATADIR%%/include/hangman
 %%DATADIR%%/include/itl
 %%DATADIR%%/include/manubulon
@@ -118,10 +136,12 @@ sbin/icinga2
 %%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/storage.conf
 %%DATADIR%%/include/plugins-contrib.d/virtualization.conf
 %%DATADIR%%/include/plugins-contrib.d/vmware.conf
 %%DATADIR%%/include/plugins-contrib.d/web.conf