CVS commit: pkgsrc/net/icinga2

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat Sep 27 07:00:56 UTC 2025

Modified Files:
        pkgsrc/net/icinga2: Makefile distinfo
Added Files:
        pkgsrc/net/icinga2/patches: patch-CMakeLists.txt
Removed Files:
        pkgsrc/net/icinga2/patches: patch-lib_base_io-engine.hpp
            patch-lib_base_tcpsocket.hpp patch-lib_icingadb_redisconnection.cpp
            patch-lib_icingadb_redisconnection.hpp
            patch-lib_remote_apilistener.cpp
            patch-lib_remote_jsonrpcconnection.cpp
            patch-test_base-io-engine.cpp

Log Message:
icinga2: updated to 2.15.0

Icinga 2 v2.15.0

This Icinga 2 release is focused on adding Icinga 2 dependencies support to
Icinga DB, but also includes a number of bugfixes, enhancements and code
quality improvements. Below is a summary of the most important changes, for the
complete list of issues and PRs, please see the milestone on GitHub.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/net/icinga2/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/icinga2/distinfo
cvs rdiff -u -r0 -r1.4 pkgsrc/net/icinga2/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/net/icinga2/patches/patch-lib_base_io-engine.hpp \
    pkgsrc/net/icinga2/patches/patch-lib_base_tcpsocket.hpp \
    pkgsrc/net/icinga2/patches/patch-lib_icingadb_redisconnection.cpp \
    pkgsrc/net/icinga2/patches/patch-lib_icingadb_redisconnection.hpp \
    pkgsrc/net/icinga2/patches/patch-lib_remote_apilistener.cpp \
    pkgsrc/net/icinga2/patches/patch-lib_remote_jsonrpcconnection.cpp \
    pkgsrc/net/icinga2/patches/patch-test_base-io-engine.cpp

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

Modified files:

Index: pkgsrc/net/icinga2/Makefile
diff -u pkgsrc/net/icinga2/Makefile:1.18 pkgsrc/net/icinga2/Makefile:1.19
--- pkgsrc/net/icinga2/Makefile:1.18    Wed Aug 20 11:35:07 2025
+++ pkgsrc/net/icinga2/Makefile Sat Sep 27 07:00:56 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2025/08/20 11:35:07 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2025/09/27 07:00:56 adam Exp $
 
-DISTNAME=      icinga2-2.14.5
+DISTNAME=      icinga2-2.15.0
 CATEGORIES=    net sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=icinga/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -140,11 +140,6 @@ CMAKE_CONFIGURE_ARGS+=     -DCMAKE_INSTALL_L
 CMAKE_CONFIGURE_ARGS+= -DICINGA2_WITH_TESTS=OFF
 CMAKE_CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
 
-# Avoid a name clash with Boost header on case-insensitive file systems.
-# Remove outdated GNUInstallDirs.cmake.
-post-extract:
-       ${RM} ${WRKSRC}/third-party/cmake/GNUInstallDirs.cmake
-
 # The configuration files are installed in etc/icinga2.  You can't tell CMAKE
 # to put them elsewhere because the program and the config files contain
 # references to the config dir.  So move them to share/examples after
@@ -164,9 +159,9 @@ CHECK_FILES_SKIP+=  ${PREFIX}/share/examp
 
 LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/icinga2
 
+.include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/cmake/build.mk"
-.include "../../mk/atomic64.mk"
 .include "../../devel/libexecinfo/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
-.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/icinga2/distinfo
diff -u pkgsrc/net/icinga2/distinfo:1.7 pkgsrc/net/icinga2/distinfo:1.8
--- pkgsrc/net/icinga2/distinfo:1.7     Wed Feb 19 18:02:21 2025
+++ pkgsrc/net/icinga2/distinfo Sat Sep 27 07:00:56 2025
@@ -1,13 +1,7 @@
-$NetBSD: distinfo,v 1.7 2025/02/19 18:02:21 wiz Exp $
+$NetBSD: distinfo,v 1.8 2025/09/27 07:00:56 adam Exp $
 
-BLAKE2s (icinga2-2.14.5.tar.gz) = 3033f7b9a01d0d26a3fa91060f35de6129dac99036cc0068a82e5a95e37ecff2
-SHA512 (icinga2-2.14.5.tar.gz) = 841076e4207aa4c57d46ebff54e17b082490720b3aa194374448f2e1d06e9edb6823e59791bef769f38a14f463f216391666ecb21ccd5b6ca6f96f5b67030d2d
-Size (icinga2-2.14.5.tar.gz) = 9413390 bytes
-SHA1 (patch-lib_base_io-engine.hpp) = 45ee3b8c122915a36f4f3a5c9620c95d2875faf0
-SHA1 (patch-lib_base_tcpsocket.hpp) = 628642610723a7bae86e934f6439ca9bbe283fd9
-SHA1 (patch-lib_icingadb_redisconnection.cpp) = f6f32fb458682bdf70d9b44024eb8d40ef2b71b1
-SHA1 (patch-lib_icingadb_redisconnection.hpp) = e3d8873abc45209e4a3f1c6ee1daee47c8086f83
-SHA1 (patch-lib_remote_apilistener.cpp) = 2e486ed25ed8ee7097f021dc39c5d0997971ebae
-SHA1 (patch-lib_remote_jsonrpcconnection.cpp) = 99510ae14dd85a2a4152d5241c7bc37df397336d
-SHA1 (patch-test_base-io-engine.cpp) = 74876759c74b07aa0206b4c472ef242bf230098f
+BLAKE2s (icinga2-2.15.0.tar.gz) = 76730e9afb3494370b740414830b543814b67cfe49ac3266a3b7fd76c0f6ed35
+SHA512 (icinga2-2.15.0.tar.gz) = 247372464f48e87175ca86862f69c82ed204f133b7f012ec78ff63eefc105e1614b5434b9dd3f654479132a0b387e12c7b92efbfb22383ba83304dcc25beb281
+Size (icinga2-2.15.0.tar.gz) = 9446841 bytes
+SHA1 (patch-CMakeLists.txt) = e56b93f517ae77601028d882acbce8ede07a4257
 SHA1 (patch-third-party_cmake_FindMySQL.cmake) = a33567c30db47c4fab379f1b7c358174dd85fdd3

Added files:

Index: pkgsrc/net/icinga2/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/net/icinga2/patches/patch-CMakeLists.txt:1.4
--- /dev/null   Sat Sep 27 07:00:56 2025
+++ pkgsrc/net/icinga2/patches/patch-CMakeLists.txt     Sat Sep 27 07:00:56 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-CMakeLists.txt,v 1.4 2025/09/27 07:00:56 adam Exp $
+
+Do not look for boost_system library.
+
+--- CMakeLists.txt.orig        2025-09-25 07:29:04.993972901 +0000
++++ CMakeLists.txt
+@@ -172,7 +172,7 @@ else()
+   set(LOGROTATE_CREATE "\n\tcreate 644 ${ICINGA2_USER} ${ICINGA2_GROUP}")
+ endif()
+ 
+-find_package(Boost ${BOOST_MIN_VERSION} COMPONENTS coroutine context date_time filesystem iostreams thread system program_options regex REQUIRED)
++find_package(Boost ${BOOST_MIN_VERSION} COMPONENTS coroutine context date_time filesystem iostreams thread program_options regex REQUIRED)
+ 
+ # Boost.Coroutine2 (the successor of Boost.Coroutine)
+ # (1) doesn't even exist in old Boost versions and