Hi ports,
Hi Stuart,

New versions of Icinga Web 2, Icinga DB Web and the icinga-php-library
were released the other day. A diff follows updating these three
packages all located under net/icinga.

Next to the version bump, the patches for Icinga Web 2 were altered:
1. Revert "icingaweb2: backport 67ff0546c0dfb9 from upstream, to avoid
   spewing" since it is now contained in 2.12.5.
2. Fix "icingacli module" by patching in the module path outside the
   chroot if it is available.

Best,
Alvar



diff --git icinga-php-library/Makefile icinga-php-library/Makefile
index 92273a2d426..c8c81a9128e 100644
--- icinga-php-library/Makefile
+++ icinga-php-library/Makefile
@@ -1,7 +1,7 @@
 COMMENT=	Icinga PHP Library
 
 GH_PROJECT=	icinga-php-library
-GH_TAGNAME=	v0.16.1
+GH_TAGNAME=	v0.17.0
 
 MODULE_DEST=	${PREFIX}/icinga-php/ipl
 
diff --git icinga-php-library/distinfo icinga-php-library/distinfo
index 3b5a4d4a115..e558e892d1b 100644
--- icinga-php-library/distinfo
+++ icinga-php-library/distinfo
@@ -1,2 +1,2 @@
-SHA256 (icinga-php-library-0.16.1.tar.gz) = jaMuI5u83LJr1i4AAp60zC1kKSEDVIVu2mHXqK17ff8=
-SIZE (icinga-php-library-0.16.1.tar.gz) = 3366667
+SHA256 (icinga-php-library-0.17.0.tar.gz) = qMerLdZzKo6nsXGPLb2DOj82JZtFJwqHUFPE3lC7Cag=
+SIZE (icinga-php-library-0.17.0.tar.gz) = 3367478
diff --git icingadb-web/Makefile icingadb-web/Makefile
index d7528ca2a38..c31f4699d25 100644
--- icingadb-web/Makefile
+++ icingadb-web/Makefile
@@ -2,7 +2,7 @@ COMMENT=	web-based UI for Icinga DB
 
 GH_PROJECT=	icingadb-web
 MODULE_NAME=	icingadb-web
-MODULE_VERSION=	v1.2.0
+MODULE_VERSION=	v1.2.2
 MODULE_DEST=	${PREFIX}/icinga-web2/modules/icingadb
 
 HOMEPAGE=	https://icinga.com/docs/icinga-db-web/
diff --git icingadb-web/distinfo icingadb-web/distinfo
index 7b9ae2af29a..bfc005a7744 100644
--- icingadb-web/distinfo
+++ icingadb-web/distinfo
@@ -1,2 +1,2 @@
-SHA256 (icingadb-web-1.2.0.tar.gz) = Ro5iIny2bCcyYuacbHZrENUQa3rBvPtAFNAkOGKRN7o=
-SIZE (icingadb-web-1.2.0.tar.gz) = 2073822
+SHA256 (icingadb-web-1.2.2.tar.gz) = UTe7aDKNaqe6qEO8n49vuiGvqVfUVK7rk/l/iUK2+nQ=
+SIZE (icingadb-web-1.2.2.tar.gz) = 2075341
diff --git icingadb-web/pkg/PLIST icingadb-web/pkg/PLIST
index 1cddb8cf19c..912e12500fc 100644
--- icingadb-web/pkg/PLIST
+++ icingadb-web/pkg/PLIST
@@ -494,6 +494,8 @@ icinga-web2/modules/icingadb/test/php/library/Icingadb/Model/
 icinga-web2/modules/icingadb/test/php/library/Icingadb/Model/Behavior/
 icinga-web2/modules/icingadb/test/php/library/Icingadb/Model/Behavior/FlattenedObjectVarsTest.php
 icinga-web2/modules/icingadb/test/php/library/Icingadb/Model/CustomvarFlatTest.php
+icinga-web2/modules/icingadb/test/php/library/Icingadb/ProvidedHook/
+icinga-web2/modules/icingadb/test/php/library/Icingadb/ProvidedHook/IcingaHealthTest.php
 icinga-web2/modules/icingadb/test/php/library/Icingadb/Util/
 icinga-web2/modules/icingadb/test/php/library/Icingadb/Util/PerfdataSetTest.php
 icinga-web2/modules/icingadb/test/php/library/Icingadb/Util/PerfdataTest.php
diff --git web2/Makefile web2/Makefile
index b9cc0ad83ec..16787348d83 100644
--- web2/Makefile
+++ web2/Makefile
@@ -2,8 +2,7 @@ COMMENT =	next-generation web UI for icinga
 
 GH_ACCOUNT =	Icinga
 GH_PROJECT =	icingaweb2
-GH_TAGNAME =	v2.12.4
-REVISION =	0
+GH_TAGNAME =	v2.12.5
 PKGNAME =	icinga-web2-${GH_TAGNAME:S/v//}
 
 MODULES=	lang/php
diff --git web2/distinfo web2/distinfo
index b386aebb5ff..bc337183ed2 100644
--- web2/distinfo
+++ web2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (icingaweb2-2.12.4.tar.gz) = iFlb6JELGzvhlO9JY2qbllSoe6xuAUOdJ+6C73pKzzk=
-SIZE (icingaweb2-2.12.4.tar.gz) = 6362942
+SHA256 (icingaweb2-2.12.5.tar.gz) = h1bKujKHqqqbC/OY3n9YGnwNJVh8ZbbigEzyKBnVQXE=
+SIZE (icingaweb2-2.12.5.tar.gz) = 6365042
diff --git web2/patches/patch-library_Icinga_Application_ApplicationBootstrap_php web2/patches/patch-library_Icinga_Application_ApplicationBootstrap_php
index 95b7c538d30..a8a9dced440 100644
--- web2/patches/patch-library_Icinga_Application_ApplicationBootstrap_php
+++ web2/patches/patch-library_Icinga_Application_ApplicationBootstrap_php
@@ -1,12 +1,4 @@
-hunks 1,2: Use /var/www/etc/icingaweb2.
-hunks 3,4:
-
-From 67ff0546c0dfb9f620f3f685cf2248017e501e76 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Alexander=20Aleksandrovi=C4=8D=20Klimov?=
- <alexander.klimov@icinga.com>
-Date: Mon, 5 May 2025 17:58:28 +0200
-Subject: [PATCH] Disable deprecation warnings unless ICINGAWEB_ENVIRONMENT is
- set to "dev" (#5359)
+Use /var/www/etc/icingaweb2.
 
 Index: library/Icinga/Application/ApplicationBootstrap.php
 --- library/Icinga/Application/ApplicationBootstrap.php.orig
@@ -33,20 +25,13 @@ Index: library/Icinga/Application/ApplicationBootstrap.php
              }
          }
  
-@@ -568,7 +568,7 @@ abstract class ApplicationBootstrap
-      */
-     protected function setupErrorHandling()
-     {
--        error_reporting(E_ALL | E_STRICT);
-+        error_reporting(getenv('ICINGAWEB_ENVIRONMENT') === 'dev' ? E_ALL : E_ALL & ~E_DEPRECATED & ~E_USER_DEPRECATED);
-         ini_set('display_startup_errors', 1);
-         ini_set('display_errors', 1);
-         set_error_handler(function ($errno, $errstr, $errfile, $errline) {
-@@ -579,7 +579,6 @@ abstract class ApplicationBootstrap
-             switch ($errno) {
-                 case E_NOTICE:
-                 case E_WARNING:
--                case E_STRICT:
-                 case E_RECOVERABLE_ERROR:
-                     throw new ErrorException($errstr, 0, $errno, $errfile, $errline);
-             }
+@@ -427,6 +427,9 @@ abstract class ApplicationBootstrap
+         $paths = [];
+ 
+         $configured = getenv('ICINGAWEB_MODULES_DIR');
++        if (! $configured && is_dir($this->baseDir . '/modules')) {
++            $configured = $this->baseDir . '/modules';
++        }
+         if (! $configured) {
+             $configured = $this->config->get('global', 'module_path', $this->baseDir . '/modules');
+         }
diff --git web2/patches/patch-library_Icinga_Application_webrouter_php web2/patches/patch-library_Icinga_Application_webrouter_php
deleted file mode 100644
index b58421e4275..00000000000
--- web2/patches/patch-library_Icinga_Application_webrouter_php
+++ /dev/null
@@ -1,19 +0,0 @@
-From 67ff0546c0dfb9f620f3f685cf2248017e501e76 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Alexander=20Aleksandrovi=C4=8D=20Klimov?=
- <alexander.klimov@icinga.com>
-Date: Mon, 5 May 2025 17:58:28 +0200
-Subject: [PATCH] Disable deprecation warnings unless ICINGAWEB_ENVIRONMENT is
- set to "dev" (#5359)
-
-Index: library/Icinga/Application/webrouter.php
---- library/Icinga/Application/webrouter.php.orig
-+++ library/Icinga/Application/webrouter.php
-@@ -8,7 +8,7 @@ use Icinga\Web\Controller\StaticController;
- use Icinga\Web\JavaScript;
- use Icinga\Web\StyleSheet;
- 
--error_reporting(E_ALL | E_STRICT);
-+error_reporting(E_ALL & ~E_DEPRECATED & ~E_USER_DEPRECATED);
- 
- if (isset($_SERVER['REQUEST_URI'])) {
-     $ruri = $_SERVER['REQUEST_URI'];