svn commit: r533395 - head/net-mgmt/icinga2

[Lars Engels]

Author: lme
Date: Wed Apr 29 20:33:23 2020
New Revision: 533395
URL: https://svnweb.freebsd.org/changeset/ports/533395

Log:
  net-mgmt/icinga2:
  
  - Update to 2.11.3 which fixes a long standing bug in the Icinga API that led to crashes [1]
  - Fix directory permissions for 'icinga2 feature enable / disable'
  - Add new option UNITY to enable or disable the build with Unity. Unity
    makes building Icinga 2 faster but memory intensive. With Unity disabled it is
    possible to build Icinga 2 on memory restricted machines like a Raspberry Pi. [2]
  
  PR:		245985 [1], 245461 [2]
  Submitted by:	Armin Gruner <ag-freebsd at muc.de> [1], Alexander Wittig <alexander at wittig.name> [2]
  MFH:		2020Q2

Modified:
  head/net-mgmt/icinga2/Makefile
  head/net-mgmt/icinga2/distinfo
  head/net-mgmt/icinga2/pkg-plist

Modified: head/net-mgmt/icinga2/Makefile
==============================================================================
--- head/net-mgmt/icinga2/Makefile	Wed Apr 29 20:18:00 2020	(r533394)
+++ head/net-mgmt/icinga2/Makefile	Wed Apr 29 20:33:23 2020	(r533395)
@@ -2,8 +2,7 @@
 
 PORTNAME=	icinga2
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.11.2
-PORTREVISION=	1
+DISTVERSION=	2.11.3
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	lme at FreeBSD.org
@@ -23,19 +22,22 @@ USE_LDCONFIG=	yes
 
 USE_RC_SUBR=	${PORTNAME}
 
-OPTIONS_DEFINE=		DOCS EXAMPLES
+OPTIONS_DEFINE=		DOCS EXAMPLES UNITY
 OPTIONS_GROUP=		BACKEND
 OPTIONS_GROUP_BACKEND=	MYSQL PGSQL
 OPTIONS_RADIO=		PLUGINS
 OPTIONS_RADIO_PLUGINS=	MONPLUGINS NAGPLUGINS
 
-OPTIONS_DEFAULT=	MYSQL PGSQL MONPLUGINS
+OPTIONS_DEFAULT=	MYSQL PGSQL MONPLUGINS UNITY
 
+UNITY_DESC=		Use icinga unity build system (faster, memory intensive)
+
 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
+UNITY_CMAKE_OFF=	-DICINGA2_UNITY_BUILD=OFF
 
 ICINGA2USER?=	icinga
 ICINGA2GROUP?=	icinga

Modified: head/net-mgmt/icinga2/distinfo
==============================================================================
--- head/net-mgmt/icinga2/distinfo	Wed Apr 29 20:18:00 2020	(r533394)
+++ head/net-mgmt/icinga2/distinfo	Wed Apr 29 20:33:23 2020	(r533395)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1572425224
-SHA256 (icinga-icinga2-v2.11.2_GH0.tar.gz) = b9da300ce6914fe2d25652dc87f5c22aa036b33f4e3e24e1ffe1d746d192a812
-SIZE (icinga-icinga2-v2.11.2_GH0.tar.gz) = 7476465
+TIMESTAMP = 1588188729
+SHA256 (icinga-icinga2-v2.11.3_GH0.tar.gz) = 03c46c9af9cb8763ec02428f87a38ab3d7876f56cc10dc5eac5bda0c182f6a76
+SIZE (icinga-icinga2-v2.11.3_GH0.tar.gz) = 7475785

Modified: head/net-mgmt/icinga2/pkg-plist
==============================================================================
--- head/net-mgmt/icinga2/pkg-plist	Wed Apr 29 20:18:00 2020	(r533394)
+++ head/net-mgmt/icinga2/pkg-plist	Wed Apr 29 20:33:23 2020	(r533395)
@@ -37,9 +37,9 @@ etc/bash_completion.d/icinga2
 @sample %%ETCDIR%%/zones.conf.sample
 %%ETCDIR%%/zones.d/README
 %%MYSQL%%lib/icinga2/libmysql_shim.so
-%%MYSQL%%lib/icinga2/libmysql_shim.so.2.11.2
+%%MYSQL%%lib/icinga2/libmysql_shim.so.2.11.3
 %%PGSQL%%lib/icinga2/libpgsql_shim.so
-%%PGSQL%%lib/icinga2/libpgsql_shim.so.2.11.2
+%%PGSQL%%lib/icinga2/libpgsql_shim.so.2.11.3
 lib/icinga2/sbin/icinga2
 libexec/nagios/check_nscp_api
 man/man8/icinga2.8.gz
@@ -180,6 +180,7 @@ sbin/icinga2
 %%DATADIR%%/include/windows-plugins
 share/vim/vimfiles/ftdetect/icinga2.vim
 share/vim/vimfiles/syntax/icinga2.vim
+ at dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) %%ETCDIR%%/features-enabled
 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/cache/icinga2
 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/api/log
 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/api/zones