Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package grub2 and its derived signed packages.
As promised in the -12 ublock request, we now have a lot more
translations updated for the changed template questions for os-prober.
Also, I've included 1 RC bug fix which fixes up an RC bug which stops
machines booting:
* When *also* installing to the removable media path, include the
relevant mokmanager binary. Closes: #1034409
And a small fix for generating boot menu options on systems
dual-booting with Arch and derivatives:
* Allow initrd to contain spaces. Closes: #838177, #820838.
unblock grub2/2.06-13
unblock grub-efi-amd64-signed/1+2.06+13
unblock grub-efi-arm64-signed/1+2.06+13
unblock grub-efi-ia32-signed/1+2.06+13
debdiff attached, filtering out noise from *.po updates.
diff -Nru grub2-2.06/debian/changelog grub2-2.06/debian/changelog
--- grub2-2.06/debian/changelog 2023-04-21 13:30:26.000000000 +0100
+++ grub2-2.06/debian/changelog 2023-04-23 20:55:54.000000000 +0100
@@ -1,3 +1,35 @@
+grub2 (2.06-13) unstable; urgency=medium
+
+ [ Steve McIntyre ]
+ * When *also* installing to the removable media path, include the
+ relevant mokmanager binary. Closes: #1034409
+
+ [ General Chaos ]
+ * Allow initrd to contain spaces. Closes: #838177, #820838.
+
+ [ Translators ]
+ * Update lots of translations of debconf templates, thanks to the
+ following:
+ + Welsh (Dafydd Tomos)
+ + German (Helge Kreutzmann). Closes: #1034850
+ + Croatian (Tomislav Krznar)
+ + Greek (Emmanuel Galatoulas)
+ + Esperanto (Felipe Castro)
+ + French (Baptiste Jammet). Closes: #1035761
+ + Italian (Luca Monducci). Closes: #1034825
+ + Kazakh (Baurzhan Muftakhidinov)
+ + Korean (Changwoo Ryu). Closes: #1034868
+ + Latvian (Rudolfs Mazurs)
+ + Dutch (Frans Spiesschaert). Closes: #1035399
+ + Norwegian Bokmål (Petter Reinholdtsen, Sverre Vaabenoe)
+ + Brazilian Portuguese (Adriano Rafael Gomes). Closes: #1035905
+ + Romanian (Remus-Gabriel Chelu)
+ + Russian (Yuri Kozlov). Closes: #1035294
+ + Turkish (Atila KOÇ). Closes: #1035846
+ + Swedish (Luna Jernberg)
+
+ -- Steve McIntyre <93...@debian.org> Sun, 23 Apr 2023 20:55:54 +0100
+
grub2 (2.06-12) unstable; urgency=medium
* Fix up arm64 SB patch to fix build failure on 32-bit arm systems
diff -Nru grub2-2.06/debian/patches/grub-install-removable-shim.patch
grub2-2.06/debian/patches/grub-install-removable-shim.patch
--- grub2-2.06/debian/patches/grub-install-removable-shim.patch 2023-02-09
01:32:18.000000000 +0000
+++ grub2-2.06/debian/patches/grub-install-removable-shim.patch 2023-04-23
20:55:54.000000000 +0100
@@ -107,7 +107,7 @@
fb_src = grub_util_path_concat (2, "/usr/lib/shim/",
fb_signed);
-@@ -2154,30 +2152,81 @@ main (int argc, char *argv[])
+@@ -2154,30 +2152,82 @@ main (int argc, char *argv[])
if (!removable)
grub_install_copy_file (fb_src,
fb_dst, 0);
@@ -129,6 +129,7 @@
+ also_install_removable (shim_signed, base_efidir,
removable_file, 1);
+
+ also_install_removable (efi_signed, base_efidir,
chained_base, 1);
++ also_install_removable (mok_src, base_efidir, mok_file, 0);
+
+ /* If we're updating the NVRAM, add fallback too - it
+ will re-update the NVRAM later if things break */
diff -Nru
grub2-2.06/debian/patches/os-prober-Allow-initrd-to-contain-spaces.patch
grub2-2.06/debian/patches/os-prober-Allow-initrd-to-contain-spaces.patch
--- grub2-2.06/debian/patches/os-prober-Allow-initrd-to-contain-spaces.patch
1970-01-01 01:00:00.000000000 +0100
+++ grub2-2.06/debian/patches/os-prober-Allow-initrd-to-contain-spaces.patch
2023-04-23 20:55:54.000000000 +0100
@@ -0,0 +1,50 @@
+From 1f982e2a7c35e14d5a92c76db998afafd1bd9e87 Mon Sep 17 00:00:00 2001
+From: General Chaos <debianb...@toeai.com>
+Date: Tue, 12 Apr 2016 22:28:52 +0000
+Subject: [PATCH] os-prober: Allow initrd to contain spaces
+
+linux-boot-prober produces structured output with newline-terminated rows
+representing kernels, each with colon-delimited columns. We translate
+this into a sequence of space-separated words representing kernels,
+each containing colon-delimited fields where spaces are represented by
+carets.
+
+When we parse each of those words into colon-delimited fields, if the
+field could conceivably contain spaces then we need to translate
+carets back into spaces. We did this for label and parameters, but not
+for the initrd.
+
+In particular, when CPU microcode is installed on Arch Linux or its
+derivatives, they write CPU microcode into one initrd archive and the
+rest of early user-space into another, instead of concatenating the
+archives into a single file like Debian derivatives do. To boot Arch
+successfully from the grub menu, we need to add all of their initrds
+to the grub menu entry (detecting this situation requires an os-prober
+patch, for which see <https://bugs.debian.org/820838>).
+
+[Commit message added by Simon McVittie <s...@collabora.com>]
+
+Bug: https://savannah.gnu.org/bugs/index.php?47681
+Bug-Debian: https://bugs.debian.org/838177
+Forwarded: https://savannah.gnu.org/bugs/index.php?47681
+Closes: #838177
+---
+ util/grub.d/30_os-prober.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
+index da5f28876..d0609d9a4 100644
+--- a/util/grub.d/30_os-prober.in
++++ b/util/grub.d/30_os-prober.in
+@@ -243,7 +243,7 @@ EOF
+ LBOOT="`echo ${LINUX} | cut -d ':' -f 2`"
+ LLABEL="`echo ${LINUX} | cut -d ':' -f 3 | tr '^' ' '`"
+ LKERNEL="`echo ${LINUX} | cut -d ':' -f 4`"
+- LINITRD="`echo ${LINUX} | cut -d ':' -f 5`"
++ LINITRD="`echo ${LINUX} | cut -d ':' -f 5 | tr '^' ' '`"
+ LPARAMS="`echo ${LINUX} | cut -d ':' -f 6- | tr '^' ' '`"
+
+ if [ -z "${LLABEL}" ] ; then
+--
+2.32.0
+
diff -Nru grub2-2.06/debian/patches/series grub2-2.06/debian/patches/series
--- grub2-2.06/debian/patches/series 2023-04-20 21:02:05.000000000 +0100
+++ grub2-2.06/debian/patches/series 2023-04-23 20:55:54.000000000 +0100
@@ -120,3 +120,4 @@
osdep-devmapper-getroot-set-up-cheated-luks2-cryptodisk-mount-from-dm-parameters.patch
arm64-handover-to-kernel-if-sb-enabled.patch
grub_os-prober.patch
+os-prober-Allow-initrd-to-contain-spaces.patch
