Bug#1043378: bookworm-pu: package icingaweb2/2.11.4-2+deb12u1

2023-08-11 Thread Jonathan Wiltshire
Control: tag -1 confirmed

On Wed, Aug 09, 2023 at 07:57:07PM +0200, Bas Couwenberg wrote:
> [ Reason ]
> The php8.2.patch in icingaweb2 (2.11.4-2) does not cover all the code paths.
> 
> The web setup, icingacli, and MySQL/MariaDB support are some examples users 
> ran into.
> 
> Especially the many Deprecated notices in the web setup cause significant 
> hindrance.

Please go ahead.

Thanks,

-- 
Jonathan Wiltshire  j...@debian.org
Debian Developer http://people.debian.org/~jmw

4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC  74C3 5394 479D D352 4C51
ed25519/0x196418AAEB74C8A1: CA619D65A72A7BADFC96D280196418AAEB74C8A1



Bug#1043378: bookworm-pu: package icingaweb2/2.11.4-2+deb12u1

2023-08-09 Thread Bas Couwenberg
Package: release.debian.org
Severity: normal
Tags: bookworm
User: release.debian@packages.debian.org
Usertags: pu
X-Debbugs-Cc: icingaw...@packages.debian.org
Control: affects -1 + src:icingaweb2

[ Reason ]
The php8.2.patch in icingaweb2 (2.11.4-2) does not cover all the code paths.

The web setup, icingacli, and MySQL/MariaDB support are some examples users ran 
into.

Especially the many Deprecated notices in the web setup cause significant 
hindrance.

[ Impact ]
Deprecated notices that hinder usability.

[ Tests ]
The patch was manually tested with icingacli.

[ Risks ]
Suppressing the Deprecated notices in the error_reporting() calls should be 
very low risk in a stable release where PHP 8.3 won't be introduced in the 
future like unstable.

[ Checklist ]
  [x] *all* changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in (old)stable
  [x] the issue is verified as fixed in unstable

[ Changes ]
The branch needs to be updated to keep git-buildpackage and debcheckout working.

The patch is required to suppress the remaining Deprecated notices that were 
not fixed by php8.2.patch.

[ Other info ]
N/A

Kind Regards,

Bas
diff -Nru icingaweb2-2.11.4/debian/changelog icingaweb2-2.11.4/debian/changelog
--- icingaweb2-2.11.4/debian/changelog  2023-01-28 07:18:34.0 +0100
+++ icingaweb2-2.11.4/debian/changelog  2023-08-09 19:45:18.0 +0200
@@ -1,3 +1,12 @@
+icingaweb2 (2.11.4-2+deb12u1) bookworm; urgency=medium
+
+  * Team upload.
+  * Update branch in gbp.conf & Vcs-Git URL.
+  * Add patch to suppress Deprecated notices.
+(closes: #1037925)
+
+ -- Bas Couwenberg   Wed, 09 Aug 2023 19:45:18 +0200
+
 icingaweb2 (2.11.4-2) unstable; urgency=medium
 
   * Team upload.
diff -Nru icingaweb2-2.11.4/debian/control icingaweb2-2.11.4/debian/control
--- icingaweb2-2.11.4/debian/control2023-01-18 17:28:15.0 +0100
+++ icingaweb2-2.11.4/debian/control2023-08-09 19:45:18.0 +0200
@@ -8,7 +8,7 @@
php-cli
 Standards-Version: 4.6.2
 Vcs-Browser: https://salsa.debian.org/nagios-team/icingaweb2
-Vcs-Git: https://salsa.debian.org/nagios-team/icingaweb2.git
+Vcs-Git: https://salsa.debian.org/nagios-team/icingaweb2.git -b bookworm
 Homepage: https://icinga.com
 Rules-Requires-Root: no
 
diff -Nru icingaweb2-2.11.4/debian/gbp.conf icingaweb2-2.11.4/debian/gbp.conf
--- icingaweb2-2.11.4/debian/gbp.conf   2022-07-01 20:21:56.0 +0200
+++ icingaweb2-2.11.4/debian/gbp.conf   2023-08-09 19:45:18.0 +0200
@@ -6,7 +6,7 @@
 
 # The default name for the Debian branch is "master".
 # Change it if the name is different (for instance, "debian/unstable").
-debian-branch = master
+debian-branch = bookworm
 
 # git-import-orig uses the following names for the upstream tags.
 # Change the value if you are not using git-import-orig
diff -Nru icingaweb2-2.11.4/debian/patches/error_reporting.patch 
icingaweb2-2.11.4/debian/patches/error_reporting.patch
--- icingaweb2-2.11.4/debian/patches/error_reporting.patch  1970-01-01 
01:00:00.0 +0100
+++ icingaweb2-2.11.4/debian/patches/error_reporting.patch  2023-08-09 
19:45:18.0 +0200
@@ -0,0 +1,27 @@
+Description: Suppress Deprecated notices, upstream doesn't support PHP 8.2 yet.
+Author: Bas Couwenberg 
+Bug: https://github.com/Icinga/icingaweb2/issues/4918
+Bug-Debian: https://bugs.debian.org/1037925
+
+--- a/library/Icinga/Application/ApplicationBootstrap.php
 b/library/Icinga/Application/ApplicationBootstrap.php
+@@ -591,7 +591,7 @@ abstract class ApplicationBootstrap
+  */
+ protected function setupErrorHandling()
+ {
+-error_reporting(E_ALL | E_STRICT);
++error_reporting(E_ALL & ~E_DEPRECATED | E_STRICT);
+ ini_set('display_startup_errors', 1);
+ ini_set('display_errors', 1);
+ set_error_handler(function ($errno, $errstr, $errfile, $errline) {
+--- a/library/Icinga/Application/webrouter.php
 b/library/Icinga/Application/webrouter.php
+@@ -8,7 +8,7 @@ use Icinga\Web\Controller\StaticControll
+ use Icinga\Web\JavaScript;
+ use Icinga\Web\StyleSheet;
+ 
+-error_reporting(E_ALL | E_STRICT);
++error_reporting(E_ALL & ~E_DEPRECATED | E_STRICT);
+ 
+ if (isset($_SERVER['REQUEST_URI'])) {
+ $ruri = $_SERVER['REQUEST_URI'];
diff -Nru icingaweb2-2.11.4/debian/patches/series 
icingaweb2-2.11.4/debian/patches/series
--- icingaweb2-2.11.4/debian/patches/series 2022-12-05 09:30:57.0 
+0100
+++ icingaweb2-2.11.4/debian/patches/series 2023-08-09 19:45:18.0 
+0200
@@ -1 +1,2 @@
 php8.2.patch
+error_reporting.patch