svn commit: r482229 - in head/net-mgmt/icinga2: . files
Lars Engels
lme at FreeBSD.org
Tue Oct 16 14:08:42 UTC 2018
Author: lme
Date: Tue Oct 16 14:08:38 2018
New Revision: 482229
URL: https://svnweb.freebsd.org/changeset/ports/482229
Log:
net-mgmt/icinga2:
Update to 2.10.0
Modified:
head/net-mgmt/icinga2/Makefile
head/net-mgmt/icinga2/distinfo
head/net-mgmt/icinga2/files/patch-CMakeLists.txt
head/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt
head/net-mgmt/icinga2/files/patch-itl_command-plugins.conf
head/net-mgmt/icinga2/files/patch-lib_checker_CMakeLists.txt
head/net-mgmt/icinga2/files/patch-lib_compat_CMakeLists.txt
head/net-mgmt/icinga2/files/patch-lib_db__ido__mysql_CMakeLists.txt
head/net-mgmt/icinga2/files/patch-lib_db__ido__pgsql_CMakeLists.txt
head/net-mgmt/icinga2/files/patch-lib_livestatus_CMakeLists.txt
head/net-mgmt/icinga2/files/patch-lib_notification_CMakeLists.txt
head/net-mgmt/icinga2/files/patch-lib_perfdata_CMakeLists.txt
head/net-mgmt/icinga2/pkg-plist
Modified: head/net-mgmt/icinga2/Makefile
==============================================================================
--- head/net-mgmt/icinga2/Makefile Tue Oct 16 13:49:54 2018 (r482228)
+++ head/net-mgmt/icinga2/Makefile Tue Oct 16 14:08:38 2018 (r482229)
@@ -2,8 +2,7 @@
PORTNAME= icinga2
DISTVERSIONPREFIX= v
-DISTVERSION= 2.9.2
-PORTREVISION= 1
+DISTVERSION= 2.10.0
CATEGORIES= net-mgmt
MAINTAINER= lme at FreeBSD.org
Modified: head/net-mgmt/icinga2/distinfo
==============================================================================
--- head/net-mgmt/icinga2/distinfo Tue Oct 16 13:49:54 2018 (r482228)
+++ head/net-mgmt/icinga2/distinfo Tue Oct 16 14:08:38 2018 (r482229)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1538041940
-SHA256 (icinga-icinga2-v2.9.2_GH0.tar.gz) = 3d46e61bc45a369c757a9f91111b80fb2405099a32e04e7d259f8c3a72cfe762
-SIZE (icinga-icinga2-v2.9.2_GH0.tar.gz) = 2194226
+TIMESTAMP = 1539689899
+SHA256 (icinga-icinga2-v2.10.0_GH0.tar.gz) = 6f6c03979db7195d80f9aff153e6816adfb42bf60343186c6c0fb00e02796478
+SIZE (icinga-icinga2-v2.10.0_GH0.tar.gz) = 2227324
Modified: head/net-mgmt/icinga2/files/patch-CMakeLists.txt
==============================================================================
--- head/net-mgmt/icinga2/files/patch-CMakeLists.txt Tue Oct 16 13:49:54 2018 (r482228)
+++ head/net-mgmt/icinga2/files/patch-CMakeLists.txt Tue Oct 16 14:08:38 2018 (r482229)
@@ -1,4 +1,4 @@
---- CMakeLists.txt.orig 2018-07-17 12:27:32 UTC
+--- CMakeLists.txt.orig 2018-10-11 12:01:05 UTC
+++ CMakeLists.txt
@@ -28,8 +28,8 @@ if(NOT CMAKE_BUILD_TYPE)
FORCE)
@@ -11,7 +11,7 @@
option(ICINGA2_WITH_CHECKER "Build the checker module" ON)
option(ICINGA2_WITH_COMPAT "Build the compat module" ON)
option(ICINGA2_WITH_LIVESTATUS "Build the Livestatus module" ON)
-@@ -217,6 +217,12 @@ if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
+@@ -241,6 +241,12 @@ if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
endif()
endif()
Modified: head/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt
==============================================================================
--- head/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt Tue Oct 16 13:49:54 2018 (r482228)
+++ head/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt Tue Oct 16 14:08:38 2018 (r482229)
@@ -1,61 +1,61 @@
---- etc/CMakeLists.txt.orig 2018-03-22 10:26:19 UTC
+--- etc/CMakeLists.txt.orig 2018-10-11 12:01:05 UTC
+++ etc/CMakeLists.txt
@@ -24,39 +24,39 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux"
endif()
if(NOT WIN32)
-- install_if_not_exists(${CMAKE_CURRENT_BINARY_DIR}/icinga2/constants.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2)
-- install_if_not_exists(icinga2/icinga2.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2)
-+ install_if_not_exists(${CMAKE_CURRENT_BINARY_DIR}/icinga2/constants.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2)
-+ install_if_not_exists(icinga2/icinga2.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2)
+- install_if_not_exists(${CMAKE_CURRENT_BINARY_DIR}/icinga2/constants.conf ${ICINGA2_CONFIGDIR})
+- install_if_not_exists(icinga2/icinga2.conf ${ICINGA2_CONFIGDIR})
++ install_if_not_exists(${CMAKE_CURRENT_BINARY_DIR}/icinga2/constants.conf.sample ${ICINGA2_CONFIGDIR})
++ install_if_not_exists(icinga2/icinga2.conf.sample ${ICINGA2_CONFIGDIR})
else()
- install_if_not_exists(${CMAKE_CURRENT_SOURCE_DIR}/icinga2/win32/constants.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2)
- install_if_not_exists(icinga2/win32/icinga2.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2)
+ install_if_not_exists(${CMAKE_CURRENT_SOURCE_DIR}/icinga2/win32/constants.conf ${ICINGA2_CONFIGDIR})
+ install_if_not_exists(icinga2/win32/icinga2.conf ${ICINGA2_CONFIGDIR})
endif()
--install_if_not_exists(icinga2/zones.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2)
--install_if_not_exists(icinga2/conf.d/app.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
--install_if_not_exists(icinga2/conf.d/commands.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
--install_if_not_exists(icinga2/conf.d/downtimes.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
--install_if_not_exists(icinga2/conf.d/groups.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
-+install_if_not_exists(icinga2/zones.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2)
-+install_if_not_exists(icinga2/conf.d/app.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
-+install_if_not_exists(icinga2/conf.d/commands.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
-+install_if_not_exists(icinga2/conf.d/downtimes.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
-+install_if_not_exists(icinga2/conf.d/groups.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
+-install_if_not_exists(icinga2/zones.conf ${ICINGA2_CONFIGDIR})
+-install_if_not_exists(icinga2/conf.d/app.conf ${ICINGA2_CONFIGDIR}/conf.d)
+-install_if_not_exists(icinga2/conf.d/commands.conf ${ICINGA2_CONFIGDIR}/conf.d)
+-install_if_not_exists(icinga2/conf.d/downtimes.conf ${ICINGA2_CONFIGDIR}/conf.d)
+-install_if_not_exists(icinga2/conf.d/groups.conf ${ICINGA2_CONFIGDIR}/conf.d)
++install_if_not_exists(icinga2/zones.conf.sample ${ICINGA2_CONFIGDIR})
++install_if_not_exists(icinga2/conf.d/app.conf.sample ${ICINGA2_CONFIGDIR}/conf.d)
++install_if_not_exists(icinga2/conf.d/commands.conf.sample ${ICINGA2_CONFIGDIR}/conf.d)
++install_if_not_exists(icinga2/conf.d/downtimes.conf.sample ${ICINGA2_CONFIGDIR}/conf.d)
++install_if_not_exists(icinga2/conf.d/groups.conf.sample ${ICINGA2_CONFIGDIR}/conf.d)
if(NOT WIN32)
-- install_if_not_exists(icinga2/conf.d/hosts.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
-- install_if_not_exists(icinga2/conf.d/services.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
-+ install_if_not_exists(icinga2/conf.d/hosts.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
-+ install_if_not_exists(icinga2/conf.d/services.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
+- install_if_not_exists(icinga2/conf.d/hosts.conf ${ICINGA2_CONFIGDIR}/conf.d)
+- install_if_not_exists(icinga2/conf.d/services.conf ${ICINGA2_CONFIGDIR}/conf.d)
++ install_if_not_exists(icinga2/conf.d/hosts.conf.sample ${ICINGA2_CONFIGDIR}/conf.d)
++ install_if_not_exists(icinga2/conf.d/services.conf.sample ${ICINGA2_CONFIGDIR}/conf.d)
else()
- install_if_not_exists(icinga2/conf.d/win32/hosts.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
- install_if_not_exists(icinga2/conf.d/win32/services.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
+ install_if_not_exists(icinga2/conf.d/win32/hosts.conf ${ICINGA2_CONFIGDIR}/conf.d)
+ install_if_not_exists(icinga2/conf.d/win32/services.conf ${ICINGA2_CONFIGDIR}/conf.d)
endif()
--install_if_not_exists(icinga2/conf.d/notifications.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
--install_if_not_exists(icinga2/conf.d/templates.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
--install_if_not_exists(icinga2/conf.d/timeperiods.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
--install_if_not_exists(icinga2/conf.d/users.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
--install_if_not_exists(icinga2/features-available/api.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
--install_if_not_exists(icinga2/features-available/debuglog.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
--install_if_not_exists(icinga2/features-available/mainlog.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
-+install_if_not_exists(icinga2/conf.d/notifications.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
-+install_if_not_exists(icinga2/conf.d/templates.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
-+install_if_not_exists(icinga2/conf.d/timeperiods.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
-+install_if_not_exists(icinga2/conf.d/users.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
-+install_if_not_exists(icinga2/features-available/api.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
-+install_if_not_exists(icinga2/features-available/debuglog.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
-+install_if_not_exists(icinga2/features-available/mainlog.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
+-install_if_not_exists(icinga2/conf.d/notifications.conf ${ICINGA2_CONFIGDIR}/conf.d)
+-install_if_not_exists(icinga2/conf.d/templates.conf ${ICINGA2_CONFIGDIR}/conf.d)
+-install_if_not_exists(icinga2/conf.d/timeperiods.conf ${ICINGA2_CONFIGDIR}/conf.d)
+-install_if_not_exists(icinga2/conf.d/users.conf ${ICINGA2_CONFIGDIR}/conf.d)
+-install_if_not_exists(icinga2/features-available/api.conf ${ICINGA2_CONFIGDIR}/features-available)
+-install_if_not_exists(icinga2/features-available/debuglog.conf ${ICINGA2_CONFIGDIR}/features-available)
+-install_if_not_exists(icinga2/features-available/mainlog.conf ${ICINGA2_CONFIGDIR}/features-available)
++install_if_not_exists(icinga2/conf.d/notifications.conf.sample ${ICINGA2_CONFIGDIR}/conf.d)
++install_if_not_exists(icinga2/conf.d/templates.conf.sample ${ICINGA2_CONFIGDIR}/conf.d)
++install_if_not_exists(icinga2/conf.d/timeperiods.conf.sample ${ICINGA2_CONFIGDIR}/conf.d)
++install_if_not_exists(icinga2/conf.d/users.conf.sample ${ICINGA2_CONFIGDIR}/conf.d)
++install_if_not_exists(icinga2/features-available/api.conf.sample ${ICINGA2_CONFIGDIR}/features-available)
++install_if_not_exists(icinga2/features-available/debuglog.conf.sample ${ICINGA2_CONFIGDIR}/features-available)
++install_if_not_exists(icinga2/features-available/mainlog.conf.sample ${ICINGA2_CONFIGDIR}/features-available)
if(NOT WIN32)
-- install_if_not_exists(icinga2/features-available/syslog.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
-+ install_if_not_exists(icinga2/features-available/syslog.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
+- 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)
endif()
--install_if_not_exists(icinga2/scripts/mail-host-notification.sh ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/scripts)
--install_if_not_exists(icinga2/scripts/mail-service-notification.sh ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/scripts)
-+install_if_not_exists(icinga2/scripts/mail-host-notification.sh.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/scripts)
-+install_if_not_exists(icinga2/scripts/mail-service-notification.sh.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/scripts)
- install_if_not_exists(icinga2/zones.d/README ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/zones.d)
+-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)
++install_if_not_exists(icinga2/scripts/mail-host-notification.sh.sample ${ICINGA2_CONFIGDIR}/scripts)
++install_if_not_exists(icinga2/scripts/mail-service-notification.sh.sample ${ICINGA2_CONFIGDIR}/scripts)
+ install_if_not_exists(icinga2/zones.d/README ${ICINGA2_CONFIGDIR}/zones.d)
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
Modified: head/net-mgmt/icinga2/files/patch-itl_command-plugins.conf
==============================================================================
--- head/net-mgmt/icinga2/files/patch-itl_command-plugins.conf Tue Oct 16 13:49:54 2018 (r482228)
+++ head/net-mgmt/icinga2/files/patch-itl_command-plugins.conf Tue Oct 16 14:08:38 2018 (r482229)
@@ -1,6 +1,6 @@
---- itl/command-plugins.conf.orig 2018-07-17 12:27:32 UTC
+--- itl/command-plugins.conf.orig 2018-10-11 12:01:05 UTC
+++ itl/command-plugins.conf
-@@ -1627,6 +1627,10 @@ object CheckCommand "procs" {
+@@ -1628,6 +1628,10 @@ object CheckCommand "procs" {
set_if = "$procs_nokthreads$"
description = "Only scan for non kernel threads"
}
Modified: head/net-mgmt/icinga2/files/patch-lib_checker_CMakeLists.txt
==============================================================================
--- head/net-mgmt/icinga2/files/patch-lib_checker_CMakeLists.txt Tue Oct 16 13:49:54 2018 (r482228)
+++ head/net-mgmt/icinga2/files/patch-lib_checker_CMakeLists.txt Tue Oct 16 14:08:38 2018 (r482229)
@@ -1,4 +1,4 @@
---- lib/checker/CMakeLists.txt.orig 2018-07-17 12:27:32 UTC
+--- lib/checker/CMakeLists.txt.orig 2018-10-11 12:01:05 UTC
+++ lib/checker/CMakeLists.txt
@@ -35,7 +35,7 @@ set_target_properties (
)
@@ -6,6 +6,6 @@
install_if_not_exists(
- ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/checker.conf
+ ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/checker.conf.sample
- ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available
+ ${ICINGA2_CONFIGDIR}/features-available
)
Modified: head/net-mgmt/icinga2/files/patch-lib_compat_CMakeLists.txt
==============================================================================
--- head/net-mgmt/icinga2/files/patch-lib_compat_CMakeLists.txt Tue Oct 16 13:49:54 2018 (r482228)
+++ head/net-mgmt/icinga2/files/patch-lib_compat_CMakeLists.txt Tue Oct 16 14:08:38 2018 (r482229)
@@ -1,4 +1,4 @@
---- lib/compat/CMakeLists.txt.orig 2018-07-17 12:27:32 UTC
+--- lib/compat/CMakeLists.txt.orig 2018-10-11 12:01:05 UTC
+++ lib/compat/CMakeLists.txt
@@ -41,17 +41,17 @@ set_target_properties (
)
@@ -6,18 +6,18 @@
install_if_not_exists(
- ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/command.conf
+ ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/command.conf.sample
- ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available
+ ${ICINGA2_CONFIGDIR}/features-available
)
install_if_not_exists(
- ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/compatlog.conf
+ ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/compatlog.conf.sample
- ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available
+ ${ICINGA2_CONFIGDIR}/features-available
)
install_if_not_exists(
- ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/statusdata.conf
+ ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/statusdata.conf.sample
- ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available
+ ${ICINGA2_CONFIGDIR}/features-available
)
Modified: head/net-mgmt/icinga2/files/patch-lib_db__ido__mysql_CMakeLists.txt
==============================================================================
--- head/net-mgmt/icinga2/files/patch-lib_db__ido__mysql_CMakeLists.txt Tue Oct 16 13:49:54 2018 (r482228)
+++ head/net-mgmt/icinga2/files/patch-lib_db__ido__mysql_CMakeLists.txt Tue Oct 16 14:08:38 2018 (r482229)
@@ -1,4 +1,4 @@
---- lib/db_ido_mysql/CMakeLists.txt.orig 2018-07-17 12:27:32 UTC
+--- lib/db_ido_mysql/CMakeLists.txt.orig 2018-10-11 12:01:05 UTC
+++ lib/db_ido_mysql/CMakeLists.txt
@@ -37,7 +37,7 @@ set_target_properties (
)
@@ -6,6 +6,6 @@
install_if_not_exists(
- ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/ido-mysql.conf
+ ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/ido-mysql.conf.sample
- ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available
+ ${ICINGA2_CONFIGDIR}/features-available
)
Modified: head/net-mgmt/icinga2/files/patch-lib_db__ido__pgsql_CMakeLists.txt
==============================================================================
--- head/net-mgmt/icinga2/files/patch-lib_db__ido__pgsql_CMakeLists.txt Tue Oct 16 13:49:54 2018 (r482228)
+++ head/net-mgmt/icinga2/files/patch-lib_db__ido__pgsql_CMakeLists.txt Tue Oct 16 14:08:38 2018 (r482229)
@@ -1,4 +1,4 @@
---- lib/db_ido_pgsql/CMakeLists.txt.orig 2018-07-17 12:27:32 UTC
+--- lib/db_ido_pgsql/CMakeLists.txt.orig 2018-10-11 12:01:05 UTC
+++ lib/db_ido_pgsql/CMakeLists.txt
@@ -37,7 +37,7 @@ set_target_properties (
)
@@ -6,6 +6,6 @@
install_if_not_exists(
- ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/ido-pgsql.conf
+ ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/ido-pgsql.conf.sample
- ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available
+ ${ICINGA2_CONFIGDIR}/features-available
)
Modified: head/net-mgmt/icinga2/files/patch-lib_livestatus_CMakeLists.txt
==============================================================================
--- head/net-mgmt/icinga2/files/patch-lib_livestatus_CMakeLists.txt Tue Oct 16 13:49:54 2018 (r482228)
+++ head/net-mgmt/icinga2/files/patch-lib_livestatus_CMakeLists.txt Tue Oct 16 14:08:38 2018 (r482229)
@@ -1,4 +1,4 @@
---- lib/livestatus/CMakeLists.txt.orig 2018-07-17 12:27:32 UTC
+--- lib/livestatus/CMakeLists.txt.orig 2018-10-11 12:01:05 UTC
+++ lib/livestatus/CMakeLists.txt
@@ -71,7 +71,7 @@ set_target_properties (
)
@@ -6,6 +6,6 @@
install_if_not_exists(
- ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/livestatus.conf
+ ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/livestatus.conf.sample
- ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available
+ ${ICINGA2_CONFIGDIR}/features-available
)
Modified: head/net-mgmt/icinga2/files/patch-lib_notification_CMakeLists.txt
==============================================================================
--- head/net-mgmt/icinga2/files/patch-lib_notification_CMakeLists.txt Tue Oct 16 13:49:54 2018 (r482228)
+++ head/net-mgmt/icinga2/files/patch-lib_notification_CMakeLists.txt Tue Oct 16 14:08:38 2018 (r482229)
@@ -1,4 +1,4 @@
---- lib/notification/CMakeLists.txt.orig 2018-07-17 12:27:32 UTC
+--- lib/notification/CMakeLists.txt.orig 2018-10-11 12:01:05 UTC
+++ lib/notification/CMakeLists.txt
@@ -35,7 +35,7 @@ set_target_properties (
)
@@ -6,6 +6,6 @@
install_if_not_exists(
- ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/notification.conf
+ ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/notification.conf.sample
- ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available
+ ${ICINGA2_CONFIGDIR}/features-available
)
Modified: head/net-mgmt/icinga2/files/patch-lib_perfdata_CMakeLists.txt
==============================================================================
--- head/net-mgmt/icinga2/files/patch-lib_perfdata_CMakeLists.txt Tue Oct 16 13:49:54 2018 (r482228)
+++ head/net-mgmt/icinga2/files/patch-lib_perfdata_CMakeLists.txt Tue Oct 16 14:08:38 2018 (r482229)
@@ -1,4 +1,4 @@
---- lib/perfdata/CMakeLists.txt.orig 2018-07-17 12:27:32 UTC
+--- lib/perfdata/CMakeLists.txt.orig 2018-10-11 12:01:05 UTC
+++ lib/perfdata/CMakeLists.txt
@@ -45,32 +45,32 @@ set_target_properties (
)
@@ -6,36 +6,36 @@
install_if_not_exists(
- ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/gelf.conf
+ ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/gelf.conf.sample
- ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available
+ ${ICINGA2_CONFIGDIR}/features-available
)
install_if_not_exists(
- ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/graphite.conf
+ ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/graphite.conf.sample
- ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available
+ ${ICINGA2_CONFIGDIR}/features-available
)
install_if_not_exists(
- ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/influxdb.conf
+ ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/influxdb.conf.sample
- ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available
+ ${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
- ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available
+ ${ICINGA2_CONFIGDIR}/features-available
)
install_if_not_exists(
- ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/opentsdb.conf
+ ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/opentsdb.conf.sample
- ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available
+ ${ICINGA2_CONFIGDIR}/features-available
)
install_if_not_exists(
- ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/perfdata.conf
+ ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/perfdata.conf.sample
- ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available
+ ${ICINGA2_CONFIGDIR}/features-available
)
Modified: head/net-mgmt/icinga2/pkg-plist
==============================================================================
--- head/net-mgmt/icinga2/pkg-plist Tue Oct 16 13:49:54 2018 (r482228)
+++ head/net-mgmt/icinga2/pkg-plist Tue Oct 16 14:08:38 2018 (r482229)
@@ -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.9.2
+%%MYSQL%%lib/icinga2/libmysql_shim.so.2.10.0
%%PGSQL%%lib/icinga2/libpgsql_shim.so
-%%PGSQL%%lib/icinga2/libpgsql_shim.so.2.9.2
+%%PGSQL%%lib/icinga2/libpgsql_shim.so.2.10.0
lib/icinga2/sbin/icinga2
libexec/nagios/check_nscp_api
man/man8/icinga2.8.gz
@@ -146,6 +146,7 @@ sbin/icinga2
%%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
More information about the svn-ports-all
mailing list