net-mgmt/icinga2: Update to 2.13.1

Changelog:	https://github.com/Icinga/icinga2/blob/master/CHANGELOG.md
Sponsored by:	Netzkommune GmbH

5 files changed, 33 insertions, 12 deletions

diff --git a/net-mgmt/icinga2/Makefile b/net-mgmt/icinga2/Makefile
index e1e384e56b4a..99a5adfab8c9 100644
--- a/net-mgmt/icinga2/Makefile
+++ b/net-mgmt/icinga2/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	icinga2
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.12.3
+DISTVERSION=	2.13.1
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	joneum@FreeBSD.org
diff --git a/net-mgmt/icinga2/distinfo b/net-mgmt/icinga2/distinfo
index f83193b25de7..331e3f208b36 100644
--- a/net-mgmt/icinga2/distinfo
+++ b/net-mgmt/icinga2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1609147617
-SHA256 (icinga-icinga2-v2.12.3_GH0.tar.gz) = 56387d5e047df04fd91fdb8db3124eb09325c7377fbcaa11ef063147db816dfb
-SIZE (icinga-icinga2-v2.12.3_GH0.tar.gz) = 7534454
+TIMESTAMP = 1630749720
+SHA256 (icinga-icinga2-v2.13.1_GH0.tar.gz) = 06f751e3481c0958f6000d11a4e24d42393cb7722af22b740f68a491bdffd41a
+SIZE (icinga-icinga2-v2.13.1_GH0.tar.gz) = 7585070
diff --git a/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt b/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt
index 47ad09aa939f..81f020449f75 100644
--- a/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt
+++ b/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt
@@ -1,6 +1,6 @@
---- etc/CMakeLists.txt.orig	2018-10-11 12:01:05 UTC
-+++ etc/CMakeLists.txt
-@@ -24,39 +24,39 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux"
+--- etc/CMakeLists.txt.orig	2021-09-04 12:11:45.752360000 +0200
++++ etc/CMakeLists.txt	2021-09-04 12:25:10.298643000 +0200
+@@ -9,41 +9,41 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
  endif()
  
  if(NOT WIN32)
@@ -51,6 +51,9 @@
  if(NOT WIN32)
 -  install_if_not_exists(icinga2/features-available/syslog.conf ${ICINGA2_CONFIGDIR}/features-available)
 +  install_if_not_exists(icinga2/features-available/syslog.conf.sample ${ICINGA2_CONFIGDIR}/features-available)
+ else()
+-  install_if_not_exists(icinga2/features-available/windowseventlog.conf ${ICINGA2_CONFIGDIR}/features-available)
++  install_if_not_exists(icinga2/features-available/windowseventlog.conf.sample ${ICINGA2_CONFIGDIR}/features-available)
  endif()
 -install_if_not_exists(icinga2/scripts/mail-host-notification.sh ${ICINGA2_CONFIGDIR}/scripts)
 -install_if_not_exists(icinga2/scripts/mail-service-notification.sh ${ICINGA2_CONFIGDIR}/scripts)
@@ -59,3 +62,12 @@
  install_if_not_exists(icinga2/zones.d/README ${ICINGA2_CONFIGDIR}/zones.d)
  
  if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+@@ -56,7 +56,7 @@ if(NOT WIN32)
+ 
+   install(FILES bash_completion.d/icinga2 DESTINATION ${BASHCOMPLETION_DIR})
+ else()
+-  install_if_not_exists(icinga2/features-enabled/windowseventlog.conf ${ICINGA2_CONFIGDIR}/features-enabled)
++  install_if_not_exists(icinga2/features-enabled/windowseventlog.conf.sample ${ICINGA2_CONFIGDIR}/features-enabled)
+ endif()
+ 
+ if(${CMAKE_SYSTEM_NAME} MATCHES "(Linux|Solaris|SunOS)")
diff --git a/net-mgmt/icinga2/files/patch-lib_perfdata_CMakeLists.txt b/net-mgmt/icinga2/files/patch-lib_perfdata_CMakeLists.txt
index 90ad02309c7a..4706703cce19 100644
--- a/net-mgmt/icinga2/files/patch-lib_perfdata_CMakeLists.txt
+++ b/net-mgmt/icinga2/files/patch-lib_perfdata_CMakeLists.txt
@@ -1,6 +1,6 @@
---- lib/perfdata/CMakeLists.txt.orig	2020-08-03 13:43:47 UTC
-+++ lib/perfdata/CMakeLists.txt
-@@ -30,32 +30,32 @@ set_target_properties (
+--- lib/perfdata/CMakeLists.txt.orig	2021-09-09 09:49:26.077173000 +0200
++++ lib/perfdata/CMakeLists.txt	2021-09-09 09:51:19.916439000 +0200
+@@ -34,37 +34,37 @@ set_target_properties (
  )
  
  install_if_not_exists(
@@ -22,6 +22,12 @@
  )
  
  install_if_not_exists(
+-  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/influxdb2.conf
++  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/influxdb2.conf.sample
+   ${ICINGA2_CONFIGDIR}/features-available
+ )
+ 
+ install_if_not_exists(
 -  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/elasticsearch.conf
 +  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/elasticsearch.conf.sample
    ${ICINGA2_CONFIGDIR}/features-available
diff --git a/net-mgmt/icinga2/pkg-plist b/net-mgmt/icinga2/pkg-plist
index 8ae1560305ad..f8d15bbab497 100644
--- a/net-mgmt/icinga2/pkg-plist
+++ b/net-mgmt/icinga2/pkg-plist
@@ -22,6 +22,7 @@ etc/bash_completion.d/icinga2
 %%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/influxdb2.conf.sample
 @sample %%ETCDIR%%/features-available/livestatus.conf.sample
 @sample %%ETCDIR%%/features-available/mainlog.conf.sample
 @sample %%ETCDIR%%/features-available/notification.conf.sample
@@ -38,9 +39,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.12.3
+%%MYSQL%%lib/icinga2/libmysql_shim.so.2.13.1
 %%PGSQL%%lib/icinga2/libpgsql_shim.so
-%%PGSQL%%lib/icinga2/libpgsql_shim.so.2.12.3
+%%PGSQL%%lib/icinga2/libpgsql_shim.so.2.13.1
 lib/icinga2/sbin/icinga2
 libexec/nagios/check_nscp_api
 man/man8/icinga2.8.gz
@@ -134,6 +135,7 @@ sbin/icinga2
 %%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.11.0.sql
+%%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.13.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
@@ -175,6 +177,7 @@ sbin/icinga2
 %%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/systemd.conf
 %%DATADIR%%/include/plugins-contrib.d/virtualization.conf
 %%DATADIR%%/include/plugins-contrib.d/vmware.conf
 %%DATADIR%%/include/plugins-contrib.d/web.conf