Update icinga2 to 2.12.0

[Edgar Fuß <ef%math.uni-bonn.de@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Edgar Fuß <ef%math.uni-bonn.de@localhost>
Pushed By:	ef
Date:		Thu Sep 10 17:55:44 2020 +0200
Changeset:	9ac8918a5966cad8eb0a0f454d553a70993fba70

Modified Files:
	icinga2/Makefile
	icinga2/PLIST
	icinga2/distinfo
	icinga2/options.mk
	icinga2/patches/patch-third-party_cmake_FindMySQL.cmake

Log Message:
Update icinga2 to 2.12.0

Update Icinga2 (icinga2) to 2.12.0.
Doesn't depend on YAJL (devel/yajl) any more.
New option icingadb.
PLIST changes, patch adapted.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9ac8918a5966cad8eb0a0f454d553a70993fba70

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 icinga2/Makefile                                   |  5 +--
 icinga2/PLIST                                      | 52 ++++++++++++++--------
 icinga2/distinfo                                   | 10 ++---
 icinga2/options.mk                                 |  9 ++++
 .../patch-third-party_cmake_FindMySQL.cmake        | 25 +++++++----
 5 files changed, 67 insertions(+), 34 deletions(-)

diffs:
diff --git a/icinga2/Makefile b/icinga2/Makefile
index 61c876e998..ae32f45468 100644
--- a/icinga2/Makefile
+++ b/icinga2/Makefile
@@ -1,8 +1,8 @@
 # $NetBSD: Makefile $
 
 GITHUB_TAG=	v${PKGVERSION_NOREV}
-DISTNAME=	icinga2-2.9.1
-PKGREVISION=	1
+DISTNAME=	icinga2-2.12.0
+PKGREVISION=	#empty
 CATEGORIES=	net sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=icinga/}
 
@@ -161,6 +161,5 @@ LDFLAGS+=	${COMPILER_RPATH_FLAG}${PREFIX}/lib/icinga2
 
 .include "../../devel/libexecinfo/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
-.include "../../devel/yajl/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/icinga2/PLIST b/icinga2/PLIST
index 42facc1904..0a70a838a1 100644
--- a/icinga2/PLIST
+++ b/icinga2/PLIST
@@ -1,8 +1,8 @@
 @comment $NetBSD$
 ${PLIST.mysql}lib/icinga2/libmysql_shim.so
-${PLIST.mysql}lib/icinga2/libmysql_shim.so.2.9.1
+${PLIST.mysql}lib/icinga2/libmysql_shim.so.2.12.0
 ${PLIST.pgsql}lib/icinga2/libpgsql_shim.so
-${PLIST.pgsql}lib/icinga2/libpgsql_shim.so.2.9.1
+${PLIST.pgsql}lib/icinga2/libpgsql_shim.so.2.12.0
 lib/icinga2/sbin/icinga2
 libexec/nagios/check_nscp_api
 man/man8/icinga2.8
@@ -13,9 +13,9 @@ share/doc/icinga2/COPYING
 share/doc/icinga2/NEWS
 share/doc/icinga2/README.md
 share/doc/icinga2/markdown/01-about.md
-share/doc/icinga2/markdown/02-getting-started.md
+share/doc/icinga2/markdown/02-installation.md
 share/doc/icinga2/markdown/03-monitoring-basics.md
-share/doc/icinga2/markdown/04-configuring-icinga-2.md
+share/doc/icinga2/markdown/04-configuration.md
 share/doc/icinga2/markdown/05-service-monitoring.md
 share/doc/icinga2/markdown/06-distributed-monitoring.md
 share/doc/icinga2/markdown/07-agent-based-monitoring.md
@@ -36,22 +36,36 @@ share/doc/icinga2/markdown/21-development.md
 share/doc/icinga2/markdown/22-selinux.md
 share/doc/icinga2/markdown/23-migrating-from-icinga-1x.md
 share/doc/icinga2/markdown/24-appendix.md
+share/doc/icinga2/markdown/images/addons/dashing_icinga2.png
+share/doc/icinga2/markdown/images/addons/icinga_certificate_monitoring.png
+share/doc/icinga2/markdown/images/addons/icinga_reporting.png
+share/doc/icinga2/markdown/images/addons/icingaweb2_businessprocess.png
+share/doc/icinga2/markdown/images/addons/icingaweb2_grafana.png
+share/doc/icinga2/markdown/images/addons/icingaweb2_graphite.png
+share/doc/icinga2/markdown/images/addons/icingaweb2_maps.png
 share/doc/icinga2/markdown/images/advanced-topics/flapping-state-graph.png
 share/doc/icinga2/markdown/images/advanced-topics/icinga2_external_checks_freshness_icingaweb2.png
 share/doc/icinga2/markdown/images/advanced-topics/icingaweb2_downtime_handled.png
-share/doc/icinga2/markdown/images/distributed-monitoring/icinga2_distributed_endpoints.png
-share/doc/icinga2/markdown/images/distributed-monitoring/icinga2_distributed_roles.png
-share/doc/icinga2/markdown/images/distributed-monitoring/icinga2_distributed_scenarios_ha_master_clients.png
-share/doc/icinga2/markdown/images/distributed-monitoring/icinga2_distributed_scenarios_master_clients.png
-share/doc/icinga2/markdown/images/distributed-monitoring/icinga2_distributed_scenarios_master_satellite_client.png
-share/doc/icinga2/markdown/images/distributed-monitoring/icinga2_distributed_top_down_command_endpoint.png
-share/doc/icinga2/markdown/images/distributed-monitoring/icinga2_distributed_top_down_config_sync.png
+share/doc/icinga2/markdown/images/api/icinga2_api_powershell_ise.png
+share/doc/icinga2/markdown/images/configuration/icinga_web_local_server.png
+share/doc/icinga2/markdown/images/development/windows_boost_build_dev_cmd.png
+share/doc/icinga2/markdown/images/development/windows_builds_gitlab_pipeline.png
+share/doc/icinga2/markdown/images/development/windows_powershell_posh_git.png
+share/doc/icinga2/markdown/images/development/windows_visual_studio_installer_01.png
+share/doc/icinga2/markdown/images/development/windows_visual_studio_installer_02.png
+share/doc/icinga2/markdown/images/development/windows_visual_studio_installer_03.png
+share/doc/icinga2/markdown/images/development/windows_visual_studio_tabs_c++.png
+share/doc/icinga2/markdown/images/distributed-monitoring/icinga2_distributed_monitoring_agent_checks_command_endpoint.png
+share/doc/icinga2/markdown/images/distributed-monitoring/icinga2_distributed_monitoring_endpoints.png
+share/doc/icinga2/markdown/images/distributed-monitoring/icinga2_distributed_monitoring_roles.png
+share/doc/icinga2/markdown/images/distributed-monitoring/icinga2_distributed_monitoring_satellite_config_sync.png
+share/doc/icinga2/markdown/images/distributed-monitoring/icinga2_distributed_monitoring_scenario_ha_masters_with_agents.png
+share/doc/icinga2/markdown/images/distributed-monitoring/icinga2_distributed_monitoring_scenarios_master_satellites_agents.png
+share/doc/icinga2/markdown/images/distributed-monitoring/icinga2_distributed_monitoring_scenarios_master_with_agents.png
+share/doc/icinga2/markdown/images/distributed-monitoring/icinga2_distributed_monitoring_zones.png
 share/doc/icinga2/markdown/images/distributed-monitoring/icinga2_distributed_windows_client_disk_icingaweb2.png
-share/doc/icinga2/markdown/images/distributed-monitoring/icinga2_distributed_windows_nscp.png
 share/doc/icinga2/markdown/images/distributed-monitoring/icinga2_distributed_windows_nscp_api_drivesize_icingaweb2.png
 share/doc/icinga2/markdown/images/distributed-monitoring/icinga2_distributed_windows_nscp_counter_icingaweb2.png
-share/doc/icinga2/markdown/images/distributed-monitoring/icinga2_distributed_zones.png
-share/doc/icinga2/markdown/images/distributed-monitoring/icinga2_windows_cmd_admin_net_start_stop.png
 share/doc/icinga2/markdown/images/distributed-monitoring/icinga2_windows_running_service.png
 share/doc/icinga2/markdown/images/distributed-monitoring/icinga2_windows_setup_installer_01.png
 share/doc/icinga2/markdown/images/distributed-monitoring/icinga2_windows_setup_installer_02.png
@@ -73,10 +87,10 @@ share/doc/icinga2/markdown/images/distributed-monitoring/icinga2_windows_setup_w
 share/doc/icinga2/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_06_finish_no_ticket.png
 share/doc/icinga2/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_06_finish_with_ticket.png
 share/doc/icinga2/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_examine_config.png
-share/doc/icinga2/markdown/images/getting-started/mariadb-centos7.png
-share/doc/icinga2/markdown/images/getting-started/nano-syntax.png
-share/doc/icinga2/markdown/images/getting-started/postgr-import-ido.png
-share/doc/icinga2/markdown/images/getting-started/vim-syntax.png
+share/doc/icinga2/markdown/images/installation/mariadb-centos7.png
+share/doc/icinga2/markdown/images/installation/nano-syntax.png
+share/doc/icinga2/markdown/images/installation/postgr-import-ido.png
+share/doc/icinga2/markdown/images/installation/vim-syntax.png
 share/examples/icinga2/conf.d/app.conf
 share/examples/icinga2/conf.d/commands.conf
 share/examples/icinga2/conf.d/downtimes.conf
@@ -96,6 +110,7 @@ share/examples/icinga2/features-available/debuglog.conf
 ${PLIST.perfdata}share/examples/icinga2/features-available/elasticsearch.conf
 ${PLIST.perfdata}share/examples/icinga2/features-available/gelf.conf
 ${PLIST.perfdata}share/examples/icinga2/features-available/graphite.conf
+${PLIST.icingadb}share/examples/icinga2/features-available/icingadb.conf
 ${PLIST.mysql}share/examples/icinga2/features-available/ido-mysql.conf
 ${PLIST.pgsql}share/examples/icinga2/features-available/ido-pgsql.conf
 ${PLIST.perfdata}share/examples/icinga2/features-available/influxdb.conf
@@ -142,6 +157,7 @@ share/icinga2/include/manubulon
 share/icinga2/include/nscp
 share/icinga2/include/plugins
 share/icinga2/include/plugins-contrib
+share/icinga2/include/plugins-contrib.d/big-data.conf
 share/icinga2/include/plugins-contrib.d/databases.conf
 share/icinga2/include/plugins-contrib.d/hardware.conf
 share/icinga2/include/plugins-contrib.d/icingacli.conf
diff --git a/icinga2/distinfo b/icinga2/distinfo
index d5b4d99621..0f0b924058 100644
--- a/icinga2/distinfo
+++ b/icinga2/distinfo
@@ -1,7 +1,7 @@
 $NetBSD$
 
-SHA1 (icinga2-2.9.1.tar.gz) = f7220fbc26df422848be83e45377f4039abc9552
-RMD160 (icinga2-2.9.1.tar.gz) = 606f600d265f06cccf5fc9af18db240b64535002
-SHA512 (icinga2-2.9.1.tar.gz) = 1d69a24f85249386e30ff1625cf522ba58e5f2ab641dbe950bf1764324a6c7516d1532942954e842002566823b0f30383747d5ec8b7bd36705aa5f0ccfa29533
-Size (icinga2-2.9.1.tar.gz) = 2193190 bytes
-SHA1 (patch-third-party_cmake_FindMySQL.cmake) = c0e6794ee6d7be2b7f2604fd01ce0a89db65414f
+SHA1 (icinga2-2.12.0.tar.gz) = 3d5740559a49b83aadcc645efb9db8a619be88fe
+RMD160 (icinga2-2.12.0.tar.gz) = 9b3ffa1b4176187dff3d5166ad44dd839ddb32ae
+SHA512 (icinga2-2.12.0.tar.gz) = 2a0ead159cfd71ebb662b909d8c4a64bdf13235b14d37b67057034da4fbf8764167b175e20f635989a98faafabb5da4f71321a4f8592172bed5cbb3ee557b276
+Size (icinga2-2.12.0.tar.gz) = 7530104 bytes
+SHA1 (patch-third-party_cmake_FindMySQL.cmake) = a33567c30db47c4fab379f1b7c358174dd85fdd3
diff --git a/icinga2/options.mk b/icinga2/options.mk
index 901231bcda..7d43b6242a 100644
--- a/icinga2/options.mk
+++ b/icinga2/options.mk
@@ -3,6 +3,7 @@
 PKG_OPTIONS_VAR=	PKG_OPTIONS.icinga2
 PKG_SUPPORTED_OPTIONS=	debug
 PKG_SUPPORTED_OPTIONS+=	mysql pgsql
+PKG_SUPPORTED_OPTIONS+=	icingadb
 PKG_SUPPORTED_OPTIONS+=	icinga2-checker icinga2-compat
 PKG_SUPPORTED_OPTIONS+=	icinga2-livestatus icinga2-notification icinga2-perfdata
 PKG_SUGGESTED_OPTIONS=	icinga2-checker icinga2-compat
@@ -27,6 +28,14 @@ CMAKE_ARGS+=	-DICINGA2_WITH_PGSQL=ON
 CMAKE_ARGS+=	-DICINGA2_WITH_PGSQL=OFF
 .endif
 
+PLIST_VARS+=	icingadb
+.if !empty(PKG_OPTIONS:Micingadb)
+CMAKE_ARGS+=	-DICINGA2_WITH_ICINGADB=ON
+PLIST.icingadb=	yes
+.else
+CMAKE_ARGS+=	-DICINGA2_WITH_ICINGADB=OFF
+.endif
+
 .for option in checker compat livestatus notification perfdata
 PLIST_VARS+=		${option}
 .  if !empty(PKG_OPTIONS:Micinga2-${option})
diff --git a/icinga2/patches/patch-third-party_cmake_FindMySQL.cmake b/icinga2/patches/patch-third-party_cmake_FindMySQL.cmake
index 9e6130bb2c..17eb027d93 100644
--- a/icinga2/patches/patch-third-party_cmake_FindMySQL.cmake
+++ b/icinga2/patches/patch-third-party_cmake_FindMySQL.cmake
@@ -2,32 +2,41 @@ $NetBSD: patch-third-party_cmake_FindMySQL.cmake $
 
 Find buildlink mysql include dir
 
---- third-party/cmake/FindMySQL.cmake.orig	2018-07-24 12:48:12.000000000 +0200
-+++ third-party/cmake/FindMySQL.cmake	2018-08-28 16:28:14.000000000 +0200
-@@ -31,22 +31,10 @@
- FILE(GLOB _macports_include_dirs /opt/local/include/mysql*/mysql)
+--- third-party/cmake/FindMySQL.cmake.orig	2020-08-03 15:43:47.000000000 +0200
++++ third-party/cmake/FindMySQL.cmake	2020-09-02 14:47:44.451813388 +0200
+@@ -28,32 +28,12 @@
+ ##########################################################################
  
+ 
+-FILE(GLOB _macports_include_dirs /opt/local/include/mysql*/mysql)
+-
  #-------------- FIND MYSQL_INCLUDE_DIR ------------------
 -FIND_PATH(MYSQL_INCLUDE_DIR mysql.h
 -  $ENV{MYSQL_INCLUDE_DIR}
 -  $ENV{MYSQL_DIR}/include
 -  /usr/include/mysql
 -  /usr/local/include/mysql
+-  /usr/include/mariadb
+-  /usr/local/include/mariadb
 -  /opt/mysql/mysql/include
 -  /opt/mysql/mysql/include/mysql
 -  /opt/mysql/include
+-  /opt/mariadb/include/mysql
 -  /opt/local/include/mysql5
 -  /usr/local/mysql/include
 -  /usr/local/mysql/include/mysql
 -  ${_macports_include_dirs}
 -  $ENV{ProgramFiles}/MySQL/*/include
--  $ENV{SystemDrive}/MySQL/*/include)
--
--UNSET(_macports_include_dirs)
+-  $ENV{SystemDrive}/MySQL/*/include
+-  $ENV{ProgramFiles}/MariaDB*/include/mysql
+-  $ENV{SystemDrive}/MariaDB*/include/mysql
 +FIND_PATH(MYSQL_INCLUDE_DIR
 +  NAMES mysql.h
 +  PATH_SUFFIXES mysql
-+)
+ )
  
+-UNSET(_macports_include_dirs)
+-
  #----------------- FIND MYSQL_LIB_DIR -------------------
  IF (WIN32)
+   SET(MYSQL_CLIENT_LIBS libmysql)