From 8818b1d73139f9ea20285bbb57cadf438d1b025a Mon Sep 17 00:00:00 2001 From: Steve McIntyre <93sam@debian.org> Date: Fri, 21 Apr 2023 00:51:13 +0000 Subject: [PATCH] Try again, argh printf types --- debian/changelog | 6 ++++++ ...-cheated-luks2-cryptodisk-mount-from-dm-parameters.patch | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b9050c177..e470dcfde 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +grub2 (2.06-11) unstable; urgency=medium + + * And try again... :-/ + + -- Steve McIntyre <93sam@debian.org> Fri, 21 Apr 2023 01:50:26 +0100 + grub2 (2.06-10) unstable; urgency=medium * Fix 32-bit build with the osdep/devmapper/getroot patches. diff --git a/debian/patches/osdep-devmapper-getroot-set-up-cheated-luks2-cryptodisk-mount-from-dm-parameters.patch b/debian/patches/osdep-devmapper-getroot-set-up-cheated-luks2-cryptodisk-mount-from-dm-parameters.patch index fd35f9a0e..a23d0f7dc 100644 --- a/debian/patches/osdep-devmapper-getroot-set-up-cheated-luks2-cryptodisk-mount-from-dm-parameters.patch +++ b/debian/patches/osdep-devmapper-getroot-set-up-cheated-luks2-cryptodisk-mount-from-dm-parameters.patch @@ -108,7 +108,7 @@ index 2bf4264..cc3f7da 100644 + params); + cipher = grub_strndup (c, seek_head - c); + if (cipher == NULL) -+ grub_util_error (_("could not strndup cipher of length `%u'"), seek_head - c); ++ grub_util_error (_("could not strndup cipher of length `%lu'"), (unsigned long)(seek_head - c)); + remaining -= seek_head - c + 1; + c = seek_head + 1; + @@ -119,7 +119,7 @@ index 2bf4264..cc3f7da 100644 + params); + cipher_mode = grub_strndup (c, seek_head - c); + if (cipher_mode == NULL) -+ grub_util_error (_("could not strndup cipher_mode of length `%u'"), seek_head - c); ++ grub_util_error (_("could not strndup cipher_mode of length `%lu'"), (unsigned long)(seek_head - c)); + + remaining -= seek_head - c + 1; + c = seek_head + 1;