aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJochen Neumeister <joneum@FreeBSD.org>2023-08-11 12:24:31 +0000
committerJochen Neumeister <joneum@FreeBSD.org>2023-08-11 12:25:55 +0000
commit34f87e912b083650d13592c2ef250d2549bde126 (patch)
treeddbe9cb1abc586dfb16318e30bdb7f5c8693c4b4
parent90c6ae5ae8bf264a481d08c63e7df87b4a621aba (diff)
net-mgmt/icinga2: Update to 2.14.0
-rw-r--r--net-mgmt/icinga2/Makefile2
-rw-r--r--net-mgmt/icinga2/distinfo8
-rw-r--r--net-mgmt/icinga2/files/patch-CMakeLists.txt28
-rw-r--r--net-mgmt/icinga2/files/patch-etc_CMakeLists.txt11
-rw-r--r--net-mgmt/icinga2/files/patch-lib_compat_CMakeLists.txt12
-rw-r--r--net-mgmt/icinga2/pkg-plist12
6 files changed, 30 insertions, 43 deletions
diff --git a/net-mgmt/icinga2/Makefile b/net-mgmt/icinga2/Makefile
index 10e3c4e94866..716aa8a3af62 100644
--- a/net-mgmt/icinga2/Makefile
+++ b/net-mgmt/icinga2/Makefile
@@ -1,6 +1,6 @@
PORTNAME= icinga2
DISTVERSIONPREFIX= v
-DISTVERSION= 2.13.7
+DISTVERSION= 2.14.0
PORTREVISION= 0
CATEGORIES= net-mgmt
diff --git a/net-mgmt/icinga2/distinfo b/net-mgmt/icinga2/distinfo
index 9dcc54419f0f..6b1d96bc4997 100644
--- a/net-mgmt/icinga2/distinfo
+++ b/net-mgmt/icinga2/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1685558338
-SHA256 (icinga-icinga2-v2.13.7_GH0.tar.gz) = 8a37b7731b30127c01de8ac4cd2372b2b3a06a3972d896fd206454f6e5b136b4
-SIZE (icinga-icinga2-v2.13.7_GH0.tar.gz) = 9667526
-SHA256 (dd51997c73c6b4b328e3ad006eb8c86678001780.patch) = 95a729bda8c368e15c89ceb98d45cfcd8048d28cb8659eeb79adc07724a4dcf5
-SIZE (dd51997c73c6b4b328e3ad006eb8c86678001780.patch) = 3876
+TIMESTAMP = 1691660351
+SHA256 (icinga-icinga2-v2.14.0_GH0.tar.gz) = e97ff8560148fd9dc1c57e3901840a0f8515b9ce53922dbaec7799c220d9f44f
+SIZE (icinga-icinga2-v2.14.0_GH0.tar.gz) = 9389972
diff --git a/net-mgmt/icinga2/files/patch-CMakeLists.txt b/net-mgmt/icinga2/files/patch-CMakeLists.txt
index 6767dc100751..290a7cc4caff 100644
--- a/net-mgmt/icinga2/files/patch-CMakeLists.txt
+++ b/net-mgmt/icinga2/files/patch-CMakeLists.txt
@@ -1,26 +1,26 @@
---- CMakeLists.txt.orig 2020-08-03 13:43:47 UTC
-+++ CMakeLists.txt
-@@ -13,8 +13,8 @@ if(NOT CMAKE_BUILD_TYPE)
- FORCE)
+--- CMakeLists.txt.orig 2023-08-11 08:54:43.660987000 +0200
++++ CMakeLists.txt 2023-08-11 09:20:13.573939000 +0200
+@@ -29,8 +29,8 @@ endif()
+ set(ICINGA2_MASTER ON)
endif()
--option(ICINGA2_WITH_MYSQL "Build the MySQL IDO module" ON)
--option(ICINGA2_WITH_PGSQL "Build the PostgreSQL IDO module" ON)
-+option(ICINGA2_WITH_MYSQL "Build the MySQL IDO module" OFF)
-+option(ICINGA2_WITH_PGSQL "Build the PostgreSQL IDO module" OFF)
+-option(ICINGA2_WITH_MYSQL "Build the MySQL IDO module" ${ICINGA2_MASTER})
+-option(ICINGA2_WITH_PGSQL "Build the PostgreSQL IDO module" ${ICINGA2_MASTER})
++option(ICINGA2_WITH_MYSQL "Build the MySQL IDO module" ON)
++option(ICINGA2_WITH_PGSQL "Build the PostgreSQL IDO module" ON)
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)
-@@ -260,6 +260,12 @@ if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
+ option(ICINGA2_WITH_COMPAT "Build the compat module" ${ICINGA2_MASTER})
+ option(ICINGA2_WITH_LIVESTATUS "Build the Livestatus module" ${ICINGA2_MASTER})
+@@ -269,6 +269,12 @@ if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -pthread")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -pthread")
endif()
+endif()
+
+if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD.*")
-+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lexecinfo")
-+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -lexecinfo")
-+ set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} -lexecinfo")
++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lexecinfo")
++ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -lexecinfo")
++ set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} -lexecinfo")
endif()
include(CheckCXXCompilerFlag)
diff --git a/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt b/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt
index 81f020449f75..dcdbf7b020b3 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 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")
+--- etc/CMakeLists.txt.orig 2023-08-11 09:37:32.071724000 +0200
++++ etc/CMakeLists.txt 2023-08-11 11:30:51.251785000 +0200
+@@ -9,44 +9,44 @@ if(NOT WIN32)
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)
+ if(HAVE_SYSTEMD)
+ install_if_not_exists(icinga2/features-available/journald.conf ${ICINGA2_CONFIGDIR}/features-available)
+ endif()
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)
@@ -62,7 +65,7 @@
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)
+@@ -59,7 +59,7 @@ else()
install(FILES bash_completion.d/icinga2 DESTINATION ${BASHCOMPLETION_DIR})
else()
diff --git a/net-mgmt/icinga2/files/patch-lib_compat_CMakeLists.txt b/net-mgmt/icinga2/files/patch-lib_compat_CMakeLists.txt
index 817acc9238ce..23cfaf20112e 100644
--- a/net-mgmt/icinga2/files/patch-lib_compat_CMakeLists.txt
+++ b/net-mgmt/icinga2/files/patch-lib_compat_CMakeLists.txt
@@ -1,6 +1,6 @@
---- lib/compat/CMakeLists.txt.orig 2020-08-03 13:43:47 UTC
-+++ lib/compat/CMakeLists.txt
-@@ -26,17 +26,17 @@ set_target_properties (
+--- lib/compat/CMakeLists.txt.orig 2023-08-11 11:35:43.136114000 +0200
++++ lib/compat/CMakeLists.txt 2023-08-11 11:40:02.639410000 +0200
+@@ -22,12 +22,12 @@ install_if_not_exists(
)
install_if_not_exists(
@@ -15,9 +15,3 @@
${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
- ${ICINGA2_CONFIGDIR}/features-available
- )
-
diff --git a/net-mgmt/icinga2/pkg-plist b/net-mgmt/icinga2/pkg-plist
index 1974df68b719..9c8c370984d3 100644
--- a/net-mgmt/icinga2/pkg-plist
+++ b/net-mgmt/icinga2/pkg-plist
@@ -28,7 +28,6 @@ etc/bash_completion.d/icinga2
@sample %%ETCDIR%%/features-available/notification.conf.sample
@sample %%ETCDIR%%/features-available/opentsdb.conf.sample
@sample %%ETCDIR%%/features-available/perfdata.conf.sample
-@sample %%ETCDIR%%/features-available/statusdata.conf.sample
@sample %%ETCDIR%%/features-available/syslog.conf.sample
%%ETCDIR%%/features-enabled/checker.conf
%%ETCDIR%%/features-enabled/mainlog.conf
@@ -39,9 +38,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.13.7
+%%MYSQL%%lib/icinga2/libmysql_shim.so.2.14.0
%%PGSQL%%lib/icinga2/libpgsql_shim.so
-%%PGSQL%%lib/icinga2/libpgsql_shim.so.2.13.7
+%%PGSQL%%lib/icinga2/libpgsql_shim.so.2.14.0
lib/icinga2/sbin/icinga2
libexec/nagios/check_nscp_api
man/man8/icinga2.8.gz
@@ -118,13 +117,6 @@ sbin/icinga2
%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_02_global_zone.png
%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_03.png
%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_04.png
-%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_01.png
-%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_02.png
-%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_03.png
-%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_04.png
-%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_05.png
-%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_06.png
-%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_07.png
%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_06_finish_no_ticket.png
%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_06_finish_with_ticket.png
%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_examine_config.png