Bug#1020224: bullseye-pu: package grub2/2.06-3~deb11u2

[Steve McIntyre <steve@einval.com>]

Package: release.debian.org
Severity: normal
Tags: bullseye
User: release.debian.org@packages.debian.org
Usertags: pu

Hi!

It seems that we've broken booting Xen PVH hosts using grub-xen-host -
see #1017944. The previous bullseye update (2.06-3~deb11u1) also
pulled the same problem into bullseye. :-( The issue was caused by a
change in the behaviour of dh_strip, and we missed this in grub
packaging.

I've just uploaded a fix to unstable for that bug, and here is a
targeted fix for bullseye too. I've tested and it works. Please allow
this into bullseye-updates too.

Here's the trivial debdiff:

diff -Nru grub2-2.06/debian/changelog grub2-2.06/debian/changelog
--- grub2-2.06/debian/changelog	2022-08-01 20:26:34.000000000 +0100
+++ grub2-2.06/debian/changelog	2022-09-14 23:40:50.000000000 +0100
@@ -1,3 +1,11 @@
+grub2 (2.06-3~deb11u2) bullseye; urgency=high
+
+  [ Steve McIntyre ]
+  * Don't strip Xen binaries so they work again. Closes: #1017944.
+    Thanks to Valentin Kleibel for the patch.
+
+ -- Steve McIntyre <93sam@debian.org>  Wed, 14 Sep 2022 23:40:50 +0100
+
 grub2 (2.06-3~deb11u1) bullseye; urgency=medium
 
   [ Steve McIntyre ]
diff -Nru grub2-2.06/debian/rules grub2-2.06/debian/rules
--- grub2-2.06/debian/rules	2022-08-01 20:26:34.000000000 +0100
+++ grub2-2.06/debian/rules	2022-09-14 23:39:16.000000000 +0100
@@ -544,7 +544,7 @@
 	dh_bugfiles $(patsubst %,-N%,$(filter grub-efi-%-signed-template,$(BUILD_PACKAGES))) -A
 
 override_dh_strip:
-	dh_strip -X/usr/bin/grub-emu
+	dh_strip -X/usr/bin/grub-emu -X/usr/lib/grub-xen/grub-x86_64-xen.bin -X/usr/lib/grub-xen/grub-i386-xen_pvh.bin -X/usr/lib/grub-xen/grub-i386-xen.bin
 
 override_dh_shlibdeps:
 	dh_shlibdeps -X.module