[Pkg-nagios-devel] Bug#1068574: bookworm-pu: package icinga2/2.13.6-2+deb12u1

[Bas Couwenberg]

Package: release.debian.org
Severity: normal
Tags: bookworm
X-Debbugs-Cc: icinga2 at packages.debian.org
Control: affects -1 + src:icinga2
User: release.debian.org at packages.debian.org
Usertags: pu

[ Reason ]
The ppc64el build of icinga2 segfauls on startup as reported in #1068473.

It needs to be built with -O1 instead of -O2 as discovered by Aurelien Jarno.

[ Impact ]
Package is mostly unusable.

[ Tests ]
None, the optimization flags is not covered by tests.

Aurelien Jarno confirmed that the changes fix the issue on ppc64el.

[ Risks ]
Low, the change is trivial and only affects ppc64el.

[ 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 in the Vcs-Git URL for debcheckout to do the right thing,
and in gbp.conf for git-buildpackage to work with a non-default branch.

Appending -O1 to CXXFLAGS is required to fix the segfault on ppc64el.

[ Other info ]
The package is used by DSA on Debian infrastructure.

Kind Regards,

Bas
-------------- next part --------------
diff -Nru icinga2-2.13.6/debian/changelog icinga2-2.13.6/debian/changelog
--- icinga2-2.13.6/debian/changelog	2023-01-22 17:36:37.000000000 +0100
+++ icinga2-2.13.6/debian/changelog	2024-04-06 14:02:31.000000000 +0200
@@ -1,3 +1,12 @@
+icinga2 (2.13.6-2+deb12u1) bookworm; urgency=medium
+
+  * Team upload.
+  * Update branch in gbp.conf & Vcs-Git URL.
+  * Fix segfault on startup on ppc64el.
+    (closes: #1068473)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sat, 06 Apr 2024 14:02:31 +0200
+
 icinga2 (2.13.6-2) unstable; urgency=medium
 
   * Team upload.
diff -Nru icinga2-2.13.6/debian/control icinga2-2.13.6/debian/control
--- icinga2-2.13.6/debian/control	2023-01-22 17:36:37.000000000 +0100
+++ icinga2-2.13.6/debian/control	2024-04-06 14:02:31.000000000 +0200
@@ -31,7 +31,7 @@
                tzdata
 Standards-Version: 4.6.2
 Vcs-Browser: https://salsa.debian.org/nagios-team/icinga2
-Vcs-Git: https://salsa.debian.org/nagios-team/icinga2.git
+Vcs-Git: https://salsa.debian.org/nagios-team/icinga2.git -b bookworm
 Homepage: https://icinga.com
 Rules-Requires-Root: no
 
diff -Nru icinga2-2.13.6/debian/gbp.conf icinga2-2.13.6/debian/gbp.conf
--- icinga2-2.13.6/debian/gbp.conf	2021-08-19 15:47:17.000000000 +0200
+++ icinga2-2.13.6/debian/gbp.conf	2024-04-06 14:02:31.000000000 +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 icinga2-2.13.6/debian/rules icinga2-2.13.6/debian/rules
--- icinga2-2.13.6/debian/rules	2022-07-12 18:49:25.000000000 +0200
+++ icinga2-2.13.6/debian/rules	2024-04-06 14:02:31.000000000 +0200
@@ -9,6 +9,11 @@
 
 export CTEST_OUTPUT_ON_FAILURE=1
 
+# Fix segfault on startup: #1068473
+ifneq (,$(filter $(DEB_HOST_ARCH), ppc64el))
+  export DEB_CXXFLAGS_MAINT_APPEND = -O1
+endif
+
 ifneq (,$(filter $(DEB_HOST_ARCH), armel mips mipsel powerpc))
   export DEB_LDFLAGS_MAINT_APPEND += -Wl,--no-as-needed -latomic -Wl,--as-needed
 endif