From bc126239bd7c64768fdaeff9e798f6320375ad79 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
Date: Tue, 30 Jun 2026 10:06:15 +0200
Subject: [PATCH] icinga2: 2.15.1 -> 2.16.2

Release notes (latest first):
- https://github.com/Icinga/icinga2/releases/tag/v2.16.2
- https://github.com/Icinga/icinga2/releases/tag/v2.16.1
- https://github.com/Icinga/icinga2/releases/tag/v2.16.0

GitHub security advisories (worse first):
- https://github.com/Icinga/icinga2/security/advisories/GHSA-vj39-ww8j-vvx5
- https://github.com/Icinga/icinga2/security/advisories/GHSA-jgqj-x5j9-vgcm
- https://github.com/Icinga/icinga2/security/advisories/GHSA-wh38-wg57-5w7g
---
 pkgs/by-name/ic/icinga2-agent/package.nix |  1 +
 pkgs/by-name/ic/icinga2/package.nix       | 27 ++++++++++++++++++-----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ic/icinga2-agent/package.nix b/pkgs/by-name/ic/icinga2-agent/package.nix
index 02e9371dae26..4e5551a90e18 100644
--- a/pkgs/by-name/ic/icinga2-agent/package.nix
+++ b/pkgs/by-name/ic/icinga2-agent/package.nix
@@ -5,4 +5,5 @@ icinga2.override {
   withNotification = false;
   withIcingadb = false;
   withPerfdata = false;
+  withOtel = false;
 }
diff --git a/pkgs/by-name/ic/icinga2/package.nix b/pkgs/by-name/ic/icinga2/package.nix
index 69aff4ef2cc5..c0230cffa753 100644
--- a/pkgs/by-name/ic/icinga2/package.nix
+++ b/pkgs/by-name/ic/icinga2/package.nix
@@ -7,13 +7,15 @@
   flex,
   bison,
   systemd,
-  boost186,
+  boost,
   libedit,
   openssl,
   patchelf,
   mariadb-connector-c,
   libpq,
+  protobuf,
   zlib,
+  ctestCheckHook,
   tzdata,
   # Databases
   withMysql ? true,
@@ -25,18 +27,19 @@
   withNotification ? true,
   withPerfdata ? true,
   withIcingadb ? true,
+  withOtel ? true,
   nameSuffix ? "",
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "icinga2${nameSuffix}";
-  version = "2.15.1";
+  version = "2.16.2";
 
   src = fetchFromGitHub {
     owner = "icinga";
     repo = "icinga2";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-w/eD07yzBm3x4G74OuGwkmpBzj63UoklmcKxVi5lx8E=";
+    hash = "sha256-+9NveqbvOsw9ipoWCk5HA0ykVZS8WxBTuOzdoSb8HH8=";
   };
 
   patches = [
@@ -68,6 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
       (mkFeatureFlag "NOTIFICATION" withNotification)
       (mkFeatureFlag "PERFDATA" withPerfdata)
       (mkFeatureFlag "ICINGADB" withIcingadb)
+      (mkFeatureFlag "OPENTELEMETRY" withOtel)
       # Misc.
       "-DICINGA2_USER=icinga2"
       "-DICINGA2_GROUP=icinga2"
@@ -81,11 +85,12 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    boost186
+    boost
     libedit
     openssl
     systemd
   ]
+  ++ lib.optional withOtel protobuf
   ++ lib.optional withPostgresql libpq;
 
   nativeBuildInputs = [
@@ -96,7 +101,17 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   doCheck = true;
-  nativeCheckInputs = [ tzdata ]; # legacytimeperiod/dst needs this
+
+  # https://github.com/Icinga/icinga2/issues/10722#issuecomment-4178294982
+  ctestFlags = [
+    "-LE"
+    "network"
+  ];
+
+  nativeCheckInputs = [
+    ctestCheckHook # ctestFlags needs this
+    tzdata # legacytimeperiod/dst needs this
+  ];
 
   postFixup = ''
     rm -r $out/etc/logrotate.d $out/etc/sysconfig $out/lib/icinga2/prepare-dirs
@@ -126,7 +141,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Open source monitoring system";
     homepage = "https://www.icinga.com";
-    license = lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [
       das_j