Merge ~juliank/grub/+git/ubuntu:ubuntu into ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu

Proposed by Julian Andres Klode
Status: Merged
Merged at revision: 4fc33cbd71a9e74eec9054355247f4fadea6056f
Proposed branch: ~juliank/grub/+git/ubuntu:ubuntu
Merge into: ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu
Diff against target: 5378 lines (+841/-606)
117 files modified
debian/.git-dpm (+2/-2)
debian/changelog (+21/-0)
debian/patches/0074-uefi-firmware-rename-fwsetup-menuentry-to-UEFI-Firmw.patch (+2/-2)
debian/patches/0075-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch (+2/-2)
debian/patches/0076-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch (+3/-3)
debian/patches/0077-ubuntu-Update-the-linux-boot-protocol-version-check.patch (+2/-2)
debian/patches/0081-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch (+2/-2)
debian/patches/0082-safemath-Add-some-arithmetic-primitives-that-check-f.patch (+4/-4)
debian/patches/0083-calloc-Make-sure-we-always-have-an-overflow-checking.patch (+8/-8)
debian/patches/0084-calloc-Use-calloc-at-most-places.patch (+87/-87)
debian/patches/0085-malloc-Use-overflow-checking-primitives-where-we-do-.patch (+24/-24)
debian/patches/0086-iso9660-Don-t-leak-memory-on-realloc-failures.patch (+2/-2)
debian/patches/0087-font-Do-not-load-more-than-one-NAME-section.patch (+2/-2)
debian/patches/0088-gfxmenu-Fix-double-free-in-load_image.patch (+2/-2)
debian/patches/0089-lzma-Make-sure-we-don-t-dereference-past-array.patch (+2/-2)
debian/patches/0090-tftp-Do-not-use-priority-queue.patch (+2/-2)
debian/patches/0091-script-Remove-unused-fields-from-grub_script_functio.patch (+2/-2)
debian/patches/0092-script-Avoid-a-use-after-free-when-redefining-a-func.patch (+5/-5)
debian/patches/0093-hfsplus-fix-two-more-overflows.patch (+2/-2)
debian/patches/0094-lvm-fix-two-more-potential-data-dependent-alloc-over.patch (+2/-2)
debian/patches/0095-efi-fix-some-malformed-device-path-arithmetic-errors.patch (+5/-5)
debian/patches/0096-linuxefi-fail-kernel-validation-without-shim-protoco.patch (+5/-5)
debian/patches/0097-Fix-a-regression-caused-by-efi-fix-some-malformed-de.patch (+2/-2)
debian/patches/0098-efi-Fix-use-after-free-in-halt-reboot-path.patch (+10/-10)
debian/patches/0099-chainloader-Avoid-a-double-free-when-validation-fail.patch (+2/-2)
debian/patches/0100-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch (+5/-5)
debian/patches/0101-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch (+14/-14)
debian/patches/0102-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch (+2/-2)
debian/patches/0103-linux-loader-avoid-overflow-on-initrd-size-calculati.patch (+2/-2)
debian/patches/0104-linux-Fix-integer-overflows-in-initrd-size-handling.patch (+2/-2)
debian/patches/0105-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch (+2/-2)
debian/patches/at_keyboard-module-init.patch (+2/-2)
debian/patches/bash-completion-drop-have-checks.patch (+2/-2)
debian/patches/blacklist-1440x900x32.patch (+2/-2)
debian/patches/bootp-new-net_bootp6-command.patch (+4/-4)
debian/patches/bootp-process-dhcpack-http-boot.patch (+3/-3)
debian/patches/cherrypick-lsefisystab-define-smbios3.patch (+3/-3)
debian/patches/cherrypick-lsefisystab-show-dtb.patch (+2/-2)
debian/patches/cherrypick-smbios-module.patch (+8/-8)
debian/patches/core-in-fs.patch (+1/-1)
debian/patches/default-grub-d.patch (+3/-3)
debian/patches/disable-floppies.patch (+1/-1)
debian/patches/dpkg-version-comparison.patch (+1/-1)
debian/patches/efi-variable-storage-minimise-writes.patch (+9/-9)
debian/patches/efinet-set-dns-from-uefi-proto.patch (+3/-3)
debian/patches/efinet-set-network-from-uefi-devpath.patch (+3/-3)
debian/patches/efinet-uefi-ipv6-pxe-support.patch (+3/-3)
debian/patches/gettext-quiet.patch (+2/-2)
debian/patches/gfxpayload-dynamic.patch (+10/-10)
debian/patches/gfxpayload-keep-default.patch (+4/-4)
debian/patches/grub-install-pvxen-paths.patch (+2/-2)
debian/patches/grub-legacy-0-based-partitions.patch (+1/-1)
debian/patches/grub.cfg-400.patch (+1/-1)
debian/patches/ieee1275-clear-reset.patch (+2/-2)
debian/patches/ignore-grub_func_test-failures.patch (+2/-2)
debian/patches/insmod-xzio-and-lzopio-on-xen.patch (+4/-4)
debian/patches/install-efi-fallback.patch (+2/-2)
debian/patches/install-efi-ubuntu-flavours.patch (+2/-2)
debian/patches/install-locale-langpack.patch (+2/-2)
debian/patches/install-powerpc-machtypes.patch (+7/-7)
debian/patches/install-stage2-confusion.patch (+2/-2)
debian/patches/maybe-quiet.patch (+13/-13)
debian/patches/mkconfig-loopback.patch (+4/-4)
debian/patches/mkconfig-mid-upgrade.patch (+2/-2)
debian/patches/mkconfig-nonexistent-loopback.patch (+3/-3)
debian/patches/mkconfig-other-inits.patch (+3/-3)
debian/patches/mkconfig-recovery-title.patch (+12/-12)
debian/patches/mkconfig-signed-kernel.patch (+4/-4)
debian/patches/mkconfig-ubuntu-distributor.patch (+4/-4)
debian/patches/mkconfig-ubuntu-recovery.patch (+8/-8)
debian/patches/mkrescue-efi-modules.patch (+2/-2)
debian/patches/net-read-bracketed-ipv6-addr.patch (+5/-5)
debian/patches/no-devicetree-if-secure-boot.patch (+3/-3)
debian/patches/no-insmod-on-sb.patch (+4/-4)
debian/patches/olpc-prefix-hack.patch (+1/-1)
debian/patches/ppc64el-disable-vsx.patch (+2/-2)
debian/patches/probe-fusionio.patch (+3/-3)
debian/patches/quick-boot-lvm.patch (+2/-2)
debian/patches/quick-boot.patch (+10/-10)
debian/patches/restore-mkdevicemap.patch (+7/-7)
debian/patches/series (+32/-30)
debian/patches/skip-grub_cmd_set_date.patch (+2/-2)
debian/patches/sleep-shift.patch (+3/-3)
debian/patches/ubuntu-add-devicetree-command-support.patch (+4/-4)
debian/patches/ubuntu-add-initrd-less-boot-fallback.patch (+29/-16)
debian/patches/ubuntu-boot-from-multipath-dependent-symlink.patch (+2/-2)
debian/patches/ubuntu-dont-verify-loopback-images.patch (+37/-0)
debian/patches/ubuntu-efi-allow-loopmount-chainload.patch (+4/-4)
debian/patches/ubuntu-efi-console-set-text-mode-as-needed.patch (+2/-2)
debian/patches/ubuntu-fix-lzma-decompressor-objcopy.patch (+2/-2)
debian/patches/ubuntu-flavour-order.patch (+61/-0)
debian/patches/ubuntu-grub-install-extra-removable.patch (+2/-2)
debian/patches/ubuntu-install-signed.patch (+2/-2)
debian/patches/ubuntu-linuxefi.patch (+31/-31)
debian/patches/ubuntu-mkconfig-leave-breadcrumbs.patch (+2/-2)
debian/patches/ubuntu-recovery-dis_ucode_ldr.patch (+84/-0)
debian/patches/ubuntu-resilient-boot-boot-order.patch (+7/-7)
debian/patches/ubuntu-resilient-boot-ignore-alternative-esps.patch (+2/-2)
debian/patches/ubuntu-shorter-version-info.patch (+2/-2)
debian/patches/ubuntu-skip-disk-by-id-lvm-pvm-uuid-entries.patch (+2/-2)
debian/patches/ubuntu-speed-zsys-history.patch (+8/-8)
debian/patches/ubuntu-support-initrd-less-boot.patch (+5/-5)
debian/patches/ubuntu-temp-keep-auto-nvram.patch (+2/-2)
debian/patches/ubuntu-tpm-unknown-error-non-fatal.patch (+2/-2)
debian/patches/ubuntu-zfs-enhance-support.patch (+16/-13)
debian/patches/uefi-firmware-setup.patch (+3/-3)
debian/patches/uefi-secure-boot-cryptomount.patch (+2/-2)
debian/patches/vsnprintf-upper-case-hex.patch (+2/-2)
debian/patches/vt-handoff.patch (+7/-7)
debian/patches/wubi-no-windows.patch (+2/-2)
debian/patches/zpool-full-device-name.patch (+2/-2)
dev/null (+0/-27)
grub-core/disk/loopback.c (+2/-1)
util/grub-mkconfig.in (+2/-1)
util/grub-mkconfig_lib.in (+15/-0)
util/grub.d/10_linux.in (+22/-7)
util/grub.d/10_linux_zfs.in (+23/-14)
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team Pending
Review via email: mp+388791@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Julian Andres Klode (juliank) wrote :

I force resetted the ubuntu branch to focal, and this contains a rebase of the previous ubuntu changes on top of that branch.

Revision history for this message
Julian Andres Klode (juliank) wrote :

I checked diff ubuntu26..oldubuntu28 > a.diff, diff ubuntu26.2...HEAD > b.diff, then ran filterdiff to exclude debian/patches changes (as we are patches applied), and then ran icdiff a.diff b.diff to confirm there were no other unexpected changes

Revision history for this message
Julian Andres Klode (juliank) wrote :

I pushed the original branch as

debian/unreleased-2.04-1ubuntu29

So you can compare

$ git diff debian/2.04-1ubuntu26...debian/unreleased-2.04-1ubuntu29 | filterdiff -p1 -x 'debian/patches/*' > a.diff
$ git diff debian/2.04-1ubuntu26.2... | filterdiff -p1 -x 'debian/patches/*' > b.diff
$ icdiff a.diff b.diff | less -R

Which shows the only change missing is the gettext patch rename, which was in the security update.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/.git-dpm b/debian/.git-dpm
index 19c2663..ed27285 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
1# see git-dpm(1) from git-dpm package1# see git-dpm(1) from git-dpm package
2ec83738b990d5008c23fa820edbfd9580df95e512398371c71cd52b6c48fa1d888903bd8a85682ec0
3ec83738b990d5008c23fa820edbfd9580df95e513398371c71cd52b6c48fa1d888903bd8a85682ec0
4578bb115fbd47e1c464696f1f8d6183e5443975d4578bb115fbd47e1c464696f1f8d6183e5443975d
5578bb115fbd47e1c464696f1f8d6183e5443975d5578bb115fbd47e1c464696f1f8d6183e5443975d
6grub2_2.04.orig.tar.xz6grub2_2.04.orig.tar.xz
diff --git a/debian/changelog b/debian/changelog
index aec9c0a..636ebab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
1grub2 (2.04-1ubuntu27) UNRELEASED; urgency=medium
2
3 * debian/patches/ubuntu-flavour-order.patch:
4 - Add a (hidden) GRUB_FLAVOUR_ORDER setting that can mark certain kernel
5 flavours as preferred, and specify an order between those preferred
6 flavours (LP: #1882663)
7 * debian/patches/ubuntu-zfs-enhance-support.patch:
8 - Use version_find_latest for ordering kernels, so it also supports
9 the GRUB_FLAVOUR_ORDER setting.
10 * debian/patches/ubuntu-dont-verify-loopback-images.patch:
11 - disk/loopback: Don't verify loopback images (LP: #1878541),
12 Thanks to Chris Coulson for the patch
13 * debian/patches/ubuntu-recovery-dis_ucode_ldr.patch
14 - Pass dis_ucode_ldr to kernel for recovery mode (LP: #1831789)
15 * debian/patches/ubuntu-add-initrd-less-boot-fallback.patch:
16 - Merge changes from xnox to fix multiple initrds support (LP: #1878705)
17 * debian/patches/ubuntu-clear-invalid-initrd-spacing.patch:
18 - Remove, no longer needed thanks to xnox's patch
19
20 -- Julian Andres Klode <juliank@ubuntu.com> Thu, 06 Aug 2020 10:14:56 +0200
21
1grub2 (2.04-1ubuntu26.2) focal; urgency=medium22grub2 (2.04-1ubuntu26.2) focal; urgency=medium
223
3 * debian/postinst.in: Avoid calling grub-install on upgrade of the grub-pc24 * debian/postinst.in: Avoid calling grub-install on upgrade of the grub-pc
diff --git a/debian/patches/0075-uefi-firmware-rename-fwsetup-menuentry-to-UEFI-Firmw.patch b/debian/patches/0074-uefi-firmware-rename-fwsetup-menuentry-to-UEFI-Firmw.patch
4similarity index 90%25similarity index 90%
5rename from debian/patches/0075-uefi-firmware-rename-fwsetup-menuentry-to-UEFI-Firmw.patch26rename from debian/patches/0075-uefi-firmware-rename-fwsetup-menuentry-to-UEFI-Firmw.patch
6rename to debian/patches/0074-uefi-firmware-rename-fwsetup-menuentry-to-UEFI-Firmw.patch27rename to debian/patches/0074-uefi-firmware-rename-fwsetup-menuentry-to-UEFI-Firmw.patch
index 0bab37b..20dbfb4 100644
--- a/debian/patches/0075-uefi-firmware-rename-fwsetup-menuentry-to-UEFI-Firmw.patch
+++ b/debian/patches/0074-uefi-firmware-rename-fwsetup-menuentry-to-UEFI-Firmw.patch
@@ -1,4 +1,4 @@
1From 4d3c59dd378362f4e0e30aaaf77068bea97ebd24 Mon Sep 17 00:00:00 20011From 7bae32b384bf0129a980b77447e21abb4024f693 Mon Sep 17 00:00:00 2001
2From: Dimitri John Ledkov <xnox@ubuntu.com>2From: Dimitri John Ledkov <xnox@ubuntu.com>
3Date: Mon, 24 Feb 2020 20:29:53 +00003Date: Mon, 24 Feb 2020 20:29:53 +0000
4Subject: uefi-firmware: rename fwsetup menuentry to UEFI Firmware Settings4Subject: uefi-firmware: rename fwsetup menuentry to UEFI Firmware Settings
@@ -9,7 +9,7 @@ LP: #1864547
9 1 file changed, 2 insertions(+), 2 deletions(-)9 1 file changed, 2 insertions(+), 2 deletions(-)
1010
11diff --git a/util/grub.d/30_uefi-firmware.in b/util/grub.d/30_uefi-firmware.in11diff --git a/util/grub.d/30_uefi-firmware.in b/util/grub.d/30_uefi-firmware.in
12index 3c9f533d8..b072d219f 10064412index 3c9f533d8c..b072d219f6 100644
13--- a/util/grub.d/30_uefi-firmware.in13--- a/util/grub.d/30_uefi-firmware.in
14+++ b/util/grub.d/30_uefi-firmware.in14+++ b/util/grub.d/30_uefi-firmware.in
15@@ -32,9 +32,9 @@ OsIndications="$efi_vars_dir/OsIndicationsSupported-$EFI_GLOBAL_VARIABLE/data"15@@ -32,9 +32,9 @@ OsIndications="$efi_vars_dir/OsIndicationsSupported-$EFI_GLOBAL_VARIABLE/data"
diff --git a/debian/patches/0076-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch b/debian/patches/0075-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch
16similarity index 97%16similarity index 97%
17rename from debian/patches/0076-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch17rename from debian/patches/0076-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch
18rename to debian/patches/0075-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch18rename to debian/patches/0075-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch
index c1bbac6..3f8f67c 100644
--- a/debian/patches/0076-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch
+++ b/debian/patches/0075-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch
@@ -1,4 +1,4 @@
1From b7ae50d78035e0e73f5ea212fab7b728353c988b Mon Sep 17 00:00:00 20011From 484c805e1361fd010e0c3e2c44585f5f7e3899c1 Mon Sep 17 00:00:00 2001
2From: Julian Andres Klode <julian.klode@canonical.com>2From: Julian Andres Klode <julian.klode@canonical.com>
3Date: Tue, 3 Mar 2020 16:06:34 +01003Date: Tue, 3 Mar 2020 16:06:34 +0100
4Subject: smbios: Add a --linux argument to apply linux modalias-like filtering4Subject: smbios: Add a --linux argument to apply linux modalias-like filtering
@@ -16,7 +16,7 @@ Origin: upstream, https://git.savannah.gnu.org/cgit/grub.git/commit/?id=87049f97
16 1 file changed, 24 insertions(+)16 1 file changed, 24 insertions(+)
1717
18diff --git a/grub-core/commands/smbios.c b/grub-core/commands/smbios.c18diff --git a/grub-core/commands/smbios.c b/grub-core/commands/smbios.c
19index 7a6a391fc..1a9086ddd 10064419index 7a6a391fc1..1a9086ddd4 100644
20--- a/grub-core/commands/smbios.c20--- a/grub-core/commands/smbios.c
21+++ b/grub-core/commands/smbios.c21+++ b/grub-core/commands/smbios.c
22@@ -64,6 +64,21 @@ grub_smbios_get_eps3 (void)22@@ -64,6 +64,21 @@ grub_smbios_get_eps3 (void)
diff --git a/debian/patches/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch b/debian/patches/0076-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch
23similarity index 97%23similarity index 97%
24rename from debian/patches/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch24rename from debian/patches/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch
25rename to debian/patches/0076-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch25rename to debian/patches/0076-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch
index 13e098e..8460c3c 100644
--- a/debian/patches/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch
+++ b/debian/patches/0076-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch
@@ -1,4 +1,4 @@
1From 3004e78bbfe6acb5e38290b2e5c7fff277ea1628 Mon Sep 17 00:00:00 20011From 80b0e6a9375628f209b96173ce0a3af70060131c Mon Sep 17 00:00:00 2001
2From: Chris Coulson <chris.coulson@canonical.com>2From: Chris Coulson <chris.coulson@canonical.com>
3Date: Wed, 11 Mar 2020 16:46:00 +01003Date: Wed, 11 Mar 2020 16:46:00 +0100
4Subject: ubuntu: Make the linux command in EFI grub always try EFI handover4Subject: ubuntu: Make the linux command in EFI grub always try EFI handover
@@ -18,7 +18,7 @@ only if secure boot is disabled.
18 2 files changed, 35 insertions(+), 26 deletions(-)18 2 files changed, 35 insertions(+), 26 deletions(-)
1919
20diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c20diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
21index 6b6aef87f..fe3ca2c59 10064421index 6b6aef87f7..fe3ca2c596 100644
22--- a/grub-core/loader/i386/efi/linux.c22--- a/grub-core/loader/i386/efi/linux.c
23+++ b/grub-core/loader/i386/efi/linux.c23+++ b/grub-core/loader/i386/efi/linux.c
24@@ -27,6 +27,7 @@24@@ -27,6 +27,7 @@
@@ -51,7 +51,7 @@ index 6b6aef87f..fe3ca2c59 100644
51 51
52 params = grub_efi_allocate_pages_max (0x3fffffff,52 params = grub_efi_allocate_pages_max (0x3fffffff,
53diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c53diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
54index 4328bcbdb..991eb29db 10064454index 4328bcbdb0..991eb29db9 100644
55--- a/grub-core/loader/i386/linux.c55--- a/grub-core/loader/i386/linux.c
56+++ b/grub-core/loader/i386/linux.c56+++ b/grub-core/loader/i386/linux.c
57@@ -658,35 +658,40 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),57@@ -658,35 +658,40 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
diff --git a/debian/patches/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch b/debian/patches/0077-ubuntu-Update-the-linux-boot-protocol-version-check.patch
58similarity index 91%58similarity index 91%
59rename from debian/patches/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch59rename from debian/patches/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch
60rename to debian/patches/0077-ubuntu-Update-the-linux-boot-protocol-version-check.patch60rename to debian/patches/0077-ubuntu-Update-the-linux-boot-protocol-version-check.patch
index 07e93a4..dfd3ee8 100644
--- a/debian/patches/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch
+++ b/debian/patches/0077-ubuntu-Update-the-linux-boot-protocol-version-check.patch
@@ -1,4 +1,4 @@
1From 05c83490bed811e5dd5cde7c59bb56cc2db751d6 Mon Sep 17 00:00:00 20011From f59fbf2d6ae70d8872d8b680cfccb6e139410944 Mon Sep 17 00:00:00 2001
2From: Chris Coulson <chris.coulson@canonical.com>2From: Chris Coulson <chris.coulson@canonical.com>
3Date: Wed, 11 Mar 2020 16:46:41 +01003Date: Wed, 11 Mar 2020 16:46:41 +0100
4Subject: ubuntu: Update the linux boot protocol version check.4Subject: ubuntu: Update the linux boot protocol version check.
@@ -11,7 +11,7 @@ check accordingly.
11 1 file changed, 1 insertion(+), 1 deletion(-)11 1 file changed, 1 insertion(+), 1 deletion(-)
1212
13diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c13diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
14index fe3ca2c59..2929da7a2 10064414index fe3ca2c596..2929da7a29 100644
15--- a/grub-core/loader/i386/efi/linux.c15--- a/grub-core/loader/i386/efi/linux.c
16+++ b/grub-core/loader/i386/efi/linux.c16+++ b/grub-core/loader/i386/efi/linux.c
17@@ -245,7 +245,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),17@@ -245,7 +245,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
diff --git a/debian/patches/0082-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch b/debian/patches/0081-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch
18similarity index 96%18similarity index 96%
19rename from debian/patches/0082-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch19rename from debian/patches/0082-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch
20rename to debian/patches/0081-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch20rename to debian/patches/0081-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch
index 0c4122e..5ce30a2 100644
--- a/debian/patches/0082-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch
+++ b/debian/patches/0081-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch
@@ -1,4 +1,4 @@
1From 6d5cd112c65caf7c46518a79a27fe7930ec4714e Mon Sep 17 00:00:00 20011From e25ff4f02fae2c006408a8fa1283320cd81ff87d Mon Sep 17 00:00:00 2001
2From: Peter Jones <pjones@redhat.com>2From: Peter Jones <pjones@redhat.com>
3Date: Wed, 15 Apr 2020 15:45:02 -04003Date: Wed, 15 Apr 2020 15:45:02 -0400
4Subject: yylex: Make lexer fatal errors actually be fatal4Subject: yylex: Make lexer fatal errors actually be fatal
@@ -47,7 +47,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
47 1 file changed, 2 insertions(+), 2 deletions(-)47 1 file changed, 2 insertions(+), 2 deletions(-)
4848
49diff --git a/grub-core/script/yylex.l b/grub-core/script/yylex.l49diff --git a/grub-core/script/yylex.l b/grub-core/script/yylex.l
50index 7b44c37b7..b7203c823 10064450index 7b44c37b76..b7203c8230 100644
51--- a/grub-core/script/yylex.l51--- a/grub-core/script/yylex.l
52+++ b/grub-core/script/yylex.l52+++ b/grub-core/script/yylex.l
53@@ -37,11 +37,11 @@53@@ -37,11 +37,11 @@
diff --git a/debian/patches/0083-safemath-Add-some-arithmetic-primitives-that-check-f.patch b/debian/patches/0082-safemath-Add-some-arithmetic-primitives-that-check-f.patch
54similarity index 96%54similarity index 96%
55rename from debian/patches/0083-safemath-Add-some-arithmetic-primitives-that-check-f.patch55rename from debian/patches/0083-safemath-Add-some-arithmetic-primitives-that-check-f.patch
56rename to debian/patches/0082-safemath-Add-some-arithmetic-primitives-that-check-f.patch56rename to debian/patches/0082-safemath-Add-some-arithmetic-primitives-that-check-f.patch
index 0862632..b87a7fb 100644
--- a/debian/patches/0083-safemath-Add-some-arithmetic-primitives-that-check-f.patch
+++ b/debian/patches/0082-safemath-Add-some-arithmetic-primitives-that-check-f.patch
@@ -1,4 +1,4 @@
1From 79fe92c7e4ae4b6fd13a3db8f1a2ae7729e0e265 Mon Sep 17 00:00:00 20011From daa399d191529cbbe465cfe3ecf5e90cada76786 Mon Sep 17 00:00:00 2001
2From: Peter Jones <pjones@redhat.com>2From: Peter Jones <pjones@redhat.com>
3Date: Mon, 15 Jun 2020 10:58:42 -04003Date: Mon, 15 Jun 2020 10:58:42 -0400
4Subject: safemath: Add some arithmetic primitives that check for overflow4Subject: safemath: Add some arithmetic primitives that check for overflow
@@ -25,7 +25,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
25 create mode 100644 include/grub/safemath.h25 create mode 100644 include/grub/safemath.h
2626
27diff --git a/INSTALL b/INSTALL27diff --git a/INSTALL b/INSTALL
28index 342c158e9..991479b52 10064428index 342c158e91..991479b521 100644
29--- a/INSTALL29--- a/INSTALL
30+++ b/INSTALL30+++ b/INSTALL
31@@ -11,27 +11,9 @@ GRUB depends on some software packages installed into your system. If31@@ -11,27 +11,9 @@ GRUB depends on some software packages installed into your system. If
@@ -59,7 +59,7 @@ index 342c158e9..991479b52 100644
59 * GNU Bison 2.3 or later59 * GNU Bison 2.3 or later
60 * GNU gettext 0.17 or later60 * GNU gettext 0.17 or later
61diff --git a/include/grub/compiler.h b/include/grub/compiler.h61diff --git a/include/grub/compiler.h b/include/grub/compiler.h
62index c9e1d7a73..8f3be3ae7 10064462index c9e1d7a73d..8f3be3ae70 100644
63--- a/include/grub/compiler.h63--- a/include/grub/compiler.h
64+++ b/include/grub/compiler.h64+++ b/include/grub/compiler.h
65@@ -48,4 +48,12 @@65@@ -48,4 +48,12 @@
@@ -77,7 +77,7 @@ index c9e1d7a73..8f3be3ae7 100644
77 #endif /* ! GRUB_COMPILER_HEADER */77 #endif /* ! GRUB_COMPILER_HEADER */
78diff --git a/include/grub/safemath.h b/include/grub/safemath.h78diff --git a/include/grub/safemath.h b/include/grub/safemath.h
79new file mode 10064479new file mode 100644
80index 000000000..c17b89bba80index 0000000000..c17b89bba1
81--- /dev/null81--- /dev/null
82+++ b/include/grub/safemath.h82+++ b/include/grub/safemath.h
83@@ -0,0 +1,37 @@83@@ -0,0 +1,37 @@
diff --git a/debian/patches/0084-calloc-Make-sure-we-always-have-an-overflow-checking.patch b/debian/patches/0083-calloc-Make-sure-we-always-have-an-overflow-checking.patch
84similarity index 93%84similarity index 93%
85rename from debian/patches/0084-calloc-Make-sure-we-always-have-an-overflow-checking.patch85rename from debian/patches/0084-calloc-Make-sure-we-always-have-an-overflow-checking.patch
86rename to debian/patches/0083-calloc-Make-sure-we-always-have-an-overflow-checking.patch86rename to debian/patches/0083-calloc-Make-sure-we-always-have-an-overflow-checking.patch
index 581fe8d..6238eee 100644
--- a/debian/patches/0084-calloc-Make-sure-we-always-have-an-overflow-checking.patch
+++ b/debian/patches/0083-calloc-Make-sure-we-always-have-an-overflow-checking.patch
@@ -1,4 +1,4 @@
1From 9e7a74bc530afaad40667b397218615fde3e44ef Mon Sep 17 00:00:00 20011From 5cffb625b814199eff98b73c34a92879b17fd5ac Mon Sep 17 00:00:00 2001
2From: Peter Jones <pjones@redhat.com>2From: Peter Jones <pjones@redhat.com>
3Date: Mon, 15 Jun 2020 12:15:29 -04003Date: Mon, 15 Jun 2020 12:15:29 -0400
4Subject: calloc: Make sure we always have an overflow-checking calloc()4Subject: calloc: Make sure we always have an overflow-checking calloc()
@@ -22,7 +22,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
22 7 files changed, 85 insertions(+), 3 deletions(-)22 7 files changed, 85 insertions(+), 3 deletions(-)
2323
24diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c24diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
25index 65db79baa..dfd8a8ec4 10064425index 65db79baa1..dfd8a8ec48 100644
26--- a/grub-core/kern/emu/misc.c26--- a/grub-core/kern/emu/misc.c
27+++ b/grub-core/kern/emu/misc.c27+++ b/grub-core/kern/emu/misc.c
28@@ -85,6 +85,18 @@ grub_util_error (const char *fmt, ...)28@@ -85,6 +85,18 @@ grub_util_error (const char *fmt, ...)
@@ -45,7 +45,7 @@ index 65db79baa..dfd8a8ec4 100644
45 xmalloc (grub_size_t size)45 xmalloc (grub_size_t size)
46 {46 {
47diff --git a/grub-core/kern/emu/mm.c b/grub-core/kern/emu/mm.c47diff --git a/grub-core/kern/emu/mm.c b/grub-core/kern/emu/mm.c
48index f262e95e3..145b01d37 10064448index f262e95e38..145b01d371 100644
49--- a/grub-core/kern/emu/mm.c49--- a/grub-core/kern/emu/mm.c
50+++ b/grub-core/kern/emu/mm.c50+++ b/grub-core/kern/emu/mm.c
51@@ -25,6 +25,16 @@51@@ -25,6 +25,16 @@
@@ -66,7 +66,7 @@ index f262e95e3..145b01d37 100644
66 grub_malloc (grub_size_t size)66 grub_malloc (grub_size_t size)
67 {67 {
68diff --git a/grub-core/kern/mm.c b/grub-core/kern/mm.c68diff --git a/grub-core/kern/mm.c b/grub-core/kern/mm.c
69index ee88ff611..f2822a836 10064469index ee88ff6118..f2822a8364 100644
70--- a/grub-core/kern/mm.c70--- a/grub-core/kern/mm.c
71+++ b/grub-core/kern/mm.c71+++ b/grub-core/kern/mm.c
72@@ -67,8 +67,10 @@72@@ -67,8 +67,10 @@
@@ -133,7 +133,7 @@ index ee88ff611..f2822a836 100644
133 grub_debug_malloc (const char *file, int line, grub_size_t size)133 grub_debug_malloc (const char *file, int line, grub_size_t size)
134 {134 {
135diff --git a/grub-core/lib/libgcrypt_wrap/mem.c b/grub-core/lib/libgcrypt_wrap/mem.c135diff --git a/grub-core/lib/libgcrypt_wrap/mem.c b/grub-core/lib/libgcrypt_wrap/mem.c
136index beeb661a3..74c6eafe5 100644136index beeb661a3c..74c6eafe52 100644
137--- a/grub-core/lib/libgcrypt_wrap/mem.c137--- a/grub-core/lib/libgcrypt_wrap/mem.c
138+++ b/grub-core/lib/libgcrypt_wrap/mem.c138+++ b/grub-core/lib/libgcrypt_wrap/mem.c
139@@ -4,6 +4,7 @@139@@ -4,6 +4,7 @@
@@ -169,7 +169,7 @@ index beeb661a3..74c6eafe5 100644
169 grub_fatal ("gcry_xcalloc failed");169 grub_fatal ("gcry_xcalloc failed");
170 return ret;170 return ret;
171diff --git a/grub-core/lib/posix_wrap/stdlib.h b/grub-core/lib/posix_wrap/stdlib.h171diff --git a/grub-core/lib/posix_wrap/stdlib.h b/grub-core/lib/posix_wrap/stdlib.h
172index 3b46f47ff..7a8d385e9 100644172index 3b46f47ff5..7a8d385e97 100644
173--- a/grub-core/lib/posix_wrap/stdlib.h173--- a/grub-core/lib/posix_wrap/stdlib.h
174+++ b/grub-core/lib/posix_wrap/stdlib.h174+++ b/grub-core/lib/posix_wrap/stdlib.h
175@@ -21,6 +21,7 @@175@@ -21,6 +21,7 @@
@@ -195,7 +195,7 @@ index 3b46f47ff..7a8d385e9 100644
195 195
196 static inline void *196 static inline void *
197diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h197diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
198index ce464cfd0..ff9c48a64 100644198index ce464cfd00..ff9c48a649 100644
199--- a/include/grub/emu/misc.h199--- a/include/grub/emu/misc.h
200+++ b/include/grub/emu/misc.h200+++ b/include/grub/emu/misc.h
201@@ -47,6 +47,7 @@ grub_util_device_is_mapped (const char *dev);201@@ -47,6 +47,7 @@ grub_util_device_is_mapped (const char *dev);
@@ -207,7 +207,7 @@ index ce464cfd0..ff9c48a64 100644
207 void * EXPORT_FUNC(xrealloc) (void *ptr, grub_size_t size) WARN_UNUSED_RESULT;207 void * EXPORT_FUNC(xrealloc) (void *ptr, grub_size_t size) WARN_UNUSED_RESULT;
208 char * EXPORT_FUNC(xstrdup) (const char *str) WARN_UNUSED_RESULT;208 char * EXPORT_FUNC(xstrdup) (const char *str) WARN_UNUSED_RESULT;
209diff --git a/include/grub/mm.h b/include/grub/mm.h209diff --git a/include/grub/mm.h b/include/grub/mm.h
210index 28e2e53eb..9c38dd3ca 100644210index 28e2e53eb3..9c38dd3ca5 100644
211--- a/include/grub/mm.h211--- a/include/grub/mm.h
212+++ b/include/grub/mm.h212+++ b/include/grub/mm.h
213@@ -29,6 +29,7 @@213@@ -29,6 +29,7 @@
diff --git a/debian/patches/0085-calloc-Use-calloc-at-most-places.patch b/debian/patches/0084-calloc-Use-calloc-at-most-places.patch
214similarity index 92%214similarity index 92%
215rename from debian/patches/0085-calloc-Use-calloc-at-most-places.patch215rename from debian/patches/0085-calloc-Use-calloc-at-most-places.patch
216rename to debian/patches/0084-calloc-Use-calloc-at-most-places.patch216rename to debian/patches/0084-calloc-Use-calloc-at-most-places.patch
index f61aea6..ac5217f 100644
--- a/debian/patches/0085-calloc-Use-calloc-at-most-places.patch
+++ b/debian/patches/0084-calloc-Use-calloc-at-most-places.patch
@@ -1,4 +1,4 @@
1From 06f4fe53388df99fff7fd23620705901903de8a0 Mon Sep 17 00:00:00 20011From 855173c18eab34ad93f21f5c509fe0e91bfd1c44 Mon Sep 17 00:00:00 2001
2From: Peter Jones <pjones@redhat.com>2From: Peter Jones <pjones@redhat.com>
3Date: Mon, 15 Jun 2020 12:26:01 -04003Date: Mon, 15 Jun 2020 12:26:01 -0400
4Subject: calloc: Use calloc() at most places4Subject: calloc: Use calloc() at most places
@@ -111,7 +111,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
111 86 files changed, 176 insertions(+), 175 deletions(-)111 86 files changed, 176 insertions(+), 175 deletions(-)
112112
113diff --git a/grub-core/bus/usb/usbhub.c b/grub-core/bus/usb/usbhub.c113diff --git a/grub-core/bus/usb/usbhub.c b/grub-core/bus/usb/usbhub.c
114index 34a7ff1b5..a06cce302 100644114index 34a7ff1b5f..a06cce302d 100644
115--- a/grub-core/bus/usb/usbhub.c115--- a/grub-core/bus/usb/usbhub.c
116+++ b/grub-core/bus/usb/usbhub.c116+++ b/grub-core/bus/usb/usbhub.c
117@@ -149,8 +149,8 @@ grub_usb_add_hub (grub_usb_device_t dev)117@@ -149,8 +149,8 @@ grub_usb_add_hub (grub_usb_device_t dev)
@@ -137,7 +137,7 @@ index 34a7ff1b5..a06cce302 100644
137 {137 {
138 grub_free (hub->devices);138 grub_free (hub->devices);
139diff --git a/grub-core/commands/efi/lsefisystab.c b/grub-core/commands/efi/lsefisystab.c139diff --git a/grub-core/commands/efi/lsefisystab.c b/grub-core/commands/efi/lsefisystab.c
140index 902788250..d29188efa 100644140index 902788250e..d29188efaf 100644
141--- a/grub-core/commands/efi/lsefisystab.c141--- a/grub-core/commands/efi/lsefisystab.c
142+++ b/grub-core/commands/efi/lsefisystab.c142+++ b/grub-core/commands/efi/lsefisystab.c
143@@ -73,7 +73,8 @@ grub_cmd_lsefisystab (struct grub_command *cmd __attribute__ ((unused)),143@@ -73,7 +73,8 @@ grub_cmd_lsefisystab (struct grub_command *cmd __attribute__ ((unused)),
@@ -151,7 +151,7 @@ index 902788250..d29188efa 100644
151 return grub_errno;151 return grub_errno;
152 *grub_utf16_to_utf8 ((grub_uint8_t *) vendor, st->firmware_vendor,152 *grub_utf16_to_utf8 ((grub_uint8_t *) vendor, st->firmware_vendor,
153diff --git a/grub-core/commands/legacycfg.c b/grub-core/commands/legacycfg.c153diff --git a/grub-core/commands/legacycfg.c b/grub-core/commands/legacycfg.c
154index db7a8f002..5e3ec0d5e 100644154index db7a8f0027..5e3ec0d5e4 100644
155--- a/grub-core/commands/legacycfg.c155--- a/grub-core/commands/legacycfg.c
156+++ b/grub-core/commands/legacycfg.c156+++ b/grub-core/commands/legacycfg.c
157@@ -314,7 +314,7 @@ grub_cmd_legacy_kernel (struct grub_command *mycmd __attribute__ ((unused)),157@@ -314,7 +314,7 @@ grub_cmd_legacy_kernel (struct grub_command *mycmd __attribute__ ((unused)),
@@ -182,7 +182,7 @@ index db7a8f002..5e3ec0d5e 100644
182 return grub_errno;182 return grub_errno;
183 grub_memcpy (newargs + 1, args, argc * sizeof (newargs[0]));183 grub_memcpy (newargs + 1, args, argc * sizeof (newargs[0]));
184diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c184diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c
185index 2c5363da7..9164df744 100644185index 2c5363da7f..9164df744a 100644
186--- a/grub-core/commands/menuentry.c186--- a/grub-core/commands/menuentry.c
187+++ b/grub-core/commands/menuentry.c187+++ b/grub-core/commands/menuentry.c
188@@ -154,7 +154,7 @@ grub_normal_add_menu_entry (int argc, const char **args,188@@ -154,7 +154,7 @@ grub_normal_add_menu_entry (int argc, const char **args,
@@ -195,7 +195,7 @@ index 2c5363da7..9164df744 100644
195 goto fail;195 goto fail;
196 196
197diff --git a/grub-core/commands/nativedisk.c b/grub-core/commands/nativedisk.c197diff --git a/grub-core/commands/nativedisk.c b/grub-core/commands/nativedisk.c
198index 699447d11..7c8f97f6a 100644198index 699447d11e..7c8f97f6ad 100644
199--- a/grub-core/commands/nativedisk.c199--- a/grub-core/commands/nativedisk.c
200+++ b/grub-core/commands/nativedisk.c200+++ b/grub-core/commands/nativedisk.c
201@@ -195,7 +195,7 @@ grub_cmd_nativedisk (grub_command_t cmd __attribute__ ((unused)),201@@ -195,7 +195,7 @@ grub_cmd_nativedisk (grub_command_t cmd __attribute__ ((unused)),
@@ -208,7 +208,7 @@ index 699447d11..7c8f97f6a 100644
208 return grub_errno;208 return grub_errno;
209 209
210diff --git a/grub-core/commands/parttool.c b/grub-core/commands/parttool.c210diff --git a/grub-core/commands/parttool.c b/grub-core/commands/parttool.c
211index 22b46b187..051e31320 100644211index 22b46b1874..051e31320e 100644
212--- a/grub-core/commands/parttool.c212--- a/grub-core/commands/parttool.c
213+++ b/grub-core/commands/parttool.c213+++ b/grub-core/commands/parttool.c
214@@ -59,7 +59,13 @@ grub_parttool_register(const char *part_name,214@@ -59,7 +59,13 @@ grub_parttool_register(const char *part_name,
@@ -245,7 +245,7 @@ index 22b46b187..051e31320 100644
245 if (! parsed[j])245 if (! parsed[j])
246 {246 {
247diff --git a/grub-core/commands/regexp.c b/grub-core/commands/regexp.c247diff --git a/grub-core/commands/regexp.c b/grub-core/commands/regexp.c
248index f00b184c8..4019164f3 100644248index f00b184c81..4019164f36 100644
249--- a/grub-core/commands/regexp.c249--- a/grub-core/commands/regexp.c
250+++ b/grub-core/commands/regexp.c250+++ b/grub-core/commands/regexp.c
251@@ -116,7 +116,7 @@ grub_cmd_regexp (grub_extcmd_context_t ctxt, int argc, char **args)251@@ -116,7 +116,7 @@ grub_cmd_regexp (grub_extcmd_context_t ctxt, int argc, char **args)
@@ -258,7 +258,7 @@ index f00b184c8..4019164f3 100644
258 goto fail;258 goto fail;
259 259
260diff --git a/grub-core/commands/search_wrap.c b/grub-core/commands/search_wrap.c260diff --git a/grub-core/commands/search_wrap.c b/grub-core/commands/search_wrap.c
261index d7fd26b94..47fc8eb99 100644261index d7fd26b940..47fc8eb996 100644
262--- a/grub-core/commands/search_wrap.c262--- a/grub-core/commands/search_wrap.c
263+++ b/grub-core/commands/search_wrap.c263+++ b/grub-core/commands/search_wrap.c
264@@ -122,7 +122,7 @@ grub_cmd_search (grub_extcmd_context_t ctxt, int argc, char **args)264@@ -122,7 +122,7 @@ grub_cmd_search (grub_extcmd_context_t ctxt, int argc, char **args)
@@ -271,7 +271,7 @@ index d7fd26b94..47fc8eb99 100644
271 return grub_errno;271 return grub_errno;
272 j = 0;272 j = 0;
273diff --git a/grub-core/disk/diskfilter.c b/grub-core/disk/diskfilter.c273diff --git a/grub-core/disk/diskfilter.c b/grub-core/disk/diskfilter.c
274index c3b578acf..68ca9e0be 100644274index c3b578acf2..68ca9e0be9 100644
275--- a/grub-core/disk/diskfilter.c275--- a/grub-core/disk/diskfilter.c
276+++ b/grub-core/disk/diskfilter.c276+++ b/grub-core/disk/diskfilter.c
277@@ -1134,7 +1134,7 @@ grub_diskfilter_make_raid (grub_size_t uuidlen, char *uuid, int nmemb,277@@ -1134,7 +1134,7 @@ grub_diskfilter_make_raid (grub_size_t uuidlen, char *uuid, int nmemb,
@@ -293,7 +293,7 @@ index c3b578acf..68ca9e0be 100644
293 for (p = disk->partition; p; p = p->parent)293 for (p = disk->partition; p; p = p->parent)
294 pv->partmaps[s++] = xstrdup (p->partmap->name);294 pv->partmaps[s++] = xstrdup (p->partmap->name);
295diff --git a/grub-core/disk/ieee1275/ofdisk.c b/grub-core/disk/ieee1275/ofdisk.c295diff --git a/grub-core/disk/ieee1275/ofdisk.c b/grub-core/disk/ieee1275/ofdisk.c
296index f73257e66..03674cb47 100644296index f73257e66d..03674cb477 100644
297--- a/grub-core/disk/ieee1275/ofdisk.c297--- a/grub-core/disk/ieee1275/ofdisk.c
298+++ b/grub-core/disk/ieee1275/ofdisk.c298+++ b/grub-core/disk/ieee1275/ofdisk.c
299@@ -297,7 +297,7 @@ dev_iterate (const struct grub_ieee1275_devalias *alias)299@@ -297,7 +297,7 @@ dev_iterate (const struct grub_ieee1275_devalias *alias)
@@ -306,7 +306,7 @@ index f73257e66..03674cb47 100644
306 if (!table)306 if (!table)
307 {307 {
308diff --git a/grub-core/disk/ldm.c b/grub-core/disk/ldm.c308diff --git a/grub-core/disk/ldm.c b/grub-core/disk/ldm.c
309index 2a22d2d6c..e6323701a 100644309index 2a22d2d6c1..e6323701ab 100644
310--- a/grub-core/disk/ldm.c310--- a/grub-core/disk/ldm.c
311+++ b/grub-core/disk/ldm.c311+++ b/grub-core/disk/ldm.c
312@@ -323,8 +323,8 @@ make_vg (grub_disk_t disk,312@@ -323,8 +323,8 @@ make_vg (grub_disk_t disk,
@@ -352,7 +352,7 @@ index 2a22d2d6c..e6323701a 100644
352 return grub_errno;352 return grub_errno;
353 for (i = 0; i < *nsectors; i++)353 for (i = 0; i < *nsectors; i++)
354diff --git a/grub-core/disk/luks.c b/grub-core/disk/luks.c354diff --git a/grub-core/disk/luks.c b/grub-core/disk/luks.c
355index 86c50c612..18b3a8bb1 100644355index 86c50c6121..18b3a8bb1d 100644
356--- a/grub-core/disk/luks.c356--- a/grub-core/disk/luks.c
357+++ b/grub-core/disk/luks.c357+++ b/grub-core/disk/luks.c
358@@ -336,7 +336,7 @@ luks_recover_key (grub_disk_t source,358@@ -336,7 +336,7 @@ luks_recover_key (grub_disk_t source,
@@ -365,7 +365,7 @@ index 86c50c612..18b3a8bb1 100644
365 return grub_errno;365 return grub_errno;
366 366
367diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c367diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c
368index 7b265c780..d1df640b3 100644368index 7b265c780c..d1df640b31 100644
369--- a/grub-core/disk/lvm.c369--- a/grub-core/disk/lvm.c
370+++ b/grub-core/disk/lvm.c370+++ b/grub-core/disk/lvm.c
371@@ -173,7 +173,7 @@ grub_lvm_detect (grub_disk_t disk,371@@ -173,7 +173,7 @@ grub_lvm_detect (grub_disk_t disk,
@@ -398,7 +398,7 @@ index 7b265c780..d1df640b3 100644
398 398
399 p = grub_strstr (p, "stripes = [");399 p = grub_strstr (p, "stripes = [");
400diff --git a/grub-core/disk/xen/xendisk.c b/grub-core/disk/xen/xendisk.c400diff --git a/grub-core/disk/xen/xendisk.c b/grub-core/disk/xen/xendisk.c
401index 48476cbbf..d6612eebd 100644401index 48476cbbf9..d6612eebd7 100644
402--- a/grub-core/disk/xen/xendisk.c402--- a/grub-core/disk/xen/xendisk.c
403+++ b/grub-core/disk/xen/xendisk.c403+++ b/grub-core/disk/xen/xendisk.c
404@@ -426,7 +426,7 @@ grub_xendisk_init (void)404@@ -426,7 +426,7 @@ grub_xendisk_init (void)
@@ -411,7 +411,7 @@ index 48476cbbf..d6612eebd 100644
411 return;411 return;
412 if (grub_xenstore_dir ("device/vbd", fill, &ctr))412 if (grub_xenstore_dir ("device/vbd", fill, &ctr))
413diff --git a/grub-core/efiemu/loadcore.c b/grub-core/efiemu/loadcore.c413diff --git a/grub-core/efiemu/loadcore.c b/grub-core/efiemu/loadcore.c
414index 44085ef81..2b924623f 100644414index 44085ef818..2b924623f5 100644
415--- a/grub-core/efiemu/loadcore.c415--- a/grub-core/efiemu/loadcore.c
416+++ b/grub-core/efiemu/loadcore.c416+++ b/grub-core/efiemu/loadcore.c
417@@ -201,7 +201,7 @@ grub_efiemu_count_symbols (const Elf_Ehdr *e)417@@ -201,7 +201,7 @@ grub_efiemu_count_symbols (const Elf_Ehdr *e)
@@ -424,7 +424,7 @@ index 44085ef81..2b924623f 100644
424 /* Relocators */424 /* Relocators */
425 for (i = 0, s = (Elf_Shdr *) ((char *) e + e->e_shoff);425 for (i = 0, s = (Elf_Shdr *) ((char *) e + e->e_shoff);
426diff --git a/grub-core/efiemu/mm.c b/grub-core/efiemu/mm.c426diff --git a/grub-core/efiemu/mm.c b/grub-core/efiemu/mm.c
427index 52a032f7b..9b8e0d0ad 100644427index 52a032f7b2..9b8e0d0ad1 100644
428--- a/grub-core/efiemu/mm.c428--- a/grub-core/efiemu/mm.c
429+++ b/grub-core/efiemu/mm.c429+++ b/grub-core/efiemu/mm.c
430@@ -554,11 +554,11 @@ grub_efiemu_mmap_sort_and_uniq (void)430@@ -554,11 +554,11 @@ grub_efiemu_mmap_sort_and_uniq (void)
@@ -451,7 +451,7 @@ index 52a032f7b..9b8e0d0ad 100644
451 {451 {
452 grub_efiemu_unload ();452 grub_efiemu_unload ();
453diff --git a/grub-core/font/font.c b/grub-core/font/font.c453diff --git a/grub-core/font/font.c b/grub-core/font/font.c
454index 85a292557..8e118b315 100644454index 85a292557a..8e118b315c 100644
455--- a/grub-core/font/font.c455--- a/grub-core/font/font.c
456+++ b/grub-core/font/font.c456+++ b/grub-core/font/font.c
457@@ -293,8 +293,7 @@ load_font_index (grub_file_t file, grub_uint32_t sect_length, struct457@@ -293,8 +293,7 @@ load_font_index (grub_file_t file, grub_uint32_t sect_length, struct
@@ -465,7 +465,7 @@ index 85a292557..8e118b315 100644
465 return 1;465 return 1;
466 font->bmp_idx = grub_malloc (0x10000 * sizeof (grub_uint16_t));466 font->bmp_idx = grub_malloc (0x10000 * sizeof (grub_uint16_t));
467diff --git a/grub-core/fs/affs.c b/grub-core/fs/affs.c467diff --git a/grub-core/fs/affs.c b/grub-core/fs/affs.c
468index 6b6a2bc91..220b3712f 100644468index 6b6a2bc913..220b3712f2 100644
469--- a/grub-core/fs/affs.c469--- a/grub-core/fs/affs.c
470+++ b/grub-core/fs/affs.c470+++ b/grub-core/fs/affs.c
471@@ -301,7 +301,7 @@ grub_affs_read_symlink (grub_fshelp_node_t node)471@@ -301,7 +301,7 @@ grub_affs_read_symlink (grub_fshelp_node_t node)
@@ -496,7 +496,7 @@ index 6b6a2bc91..220b3712f 100644
496 *grub_latin1_to_utf8 ((grub_uint8_t *) *label, file.name, len) = '\0';496 *grub_latin1_to_utf8 ((grub_uint8_t *) *label, file.name, len) = '\0';
497 }497 }
498diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c498diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
499index 48bd3d04a..11272efc1 100644499index 48bd3d04a5..11272efc1a 100644
500--- a/grub-core/fs/btrfs.c500--- a/grub-core/fs/btrfs.c
501+++ b/grub-core/fs/btrfs.c501+++ b/grub-core/fs/btrfs.c
502@@ -413,7 +413,7 @@ lower_bound (struct grub_btrfs_data *data,502@@ -413,7 +413,7 @@ lower_bound (struct grub_btrfs_data *data,
@@ -527,7 +527,7 @@ index 48bd3d04a..11272efc1 100644
527 return grub_errno;527 return grub_errno;
528 for (i = 0; i < *nsectors; i++)528 for (i = 0; i < *nsectors; i++)
529diff --git a/grub-core/fs/hfs.c b/grub-core/fs/hfs.c529diff --git a/grub-core/fs/hfs.c b/grub-core/fs/hfs.c
530index ac0a40990..3fe842b4d 100644530index ac0a40990e..3fe842b4d8 100644
531--- a/grub-core/fs/hfs.c531--- a/grub-core/fs/hfs.c
532+++ b/grub-core/fs/hfs.c532+++ b/grub-core/fs/hfs.c
533@@ -1360,7 +1360,7 @@ grub_hfs_label (grub_device_t device, char **label)533@@ -1360,7 +1360,7 @@ grub_hfs_label (grub_device_t device, char **label)
@@ -540,7 +540,7 @@ index ac0a40990..3fe842b4d 100644
540 macroman_to_utf8 (*label, data->sblock.volname + 1,540 macroman_to_utf8 (*label, data->sblock.volname + 1,
541 len + 1, 0);541 len + 1, 0);
542diff --git a/grub-core/fs/hfsplus.c b/grub-core/fs/hfsplus.c542diff --git a/grub-core/fs/hfsplus.c b/grub-core/fs/hfsplus.c
543index 54786bb1c..dae43becc 100644543index 54786bb1c6..dae43becc9 100644
544--- a/grub-core/fs/hfsplus.c544--- a/grub-core/fs/hfsplus.c
545+++ b/grub-core/fs/hfsplus.c545+++ b/grub-core/fs/hfsplus.c
546@@ -720,7 +720,7 @@ list_nodes (void *record, void *hook_arg)546@@ -720,7 +720,7 @@ list_nodes (void *record, void *hook_arg)
@@ -571,7 +571,7 @@ index 54786bb1c..dae43becc 100644
571 {571 {
572 grub_free (label_name);572 grub_free (label_name);
573diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c573diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c
574index 49c0c632b..4f1b52a55 100644574index 49c0c632bf..4f1b52a552 100644
575--- a/grub-core/fs/iso9660.c575--- a/grub-core/fs/iso9660.c
576+++ b/grub-core/fs/iso9660.c576+++ b/grub-core/fs/iso9660.c
577@@ -331,7 +331,7 @@ grub_iso9660_convert_string (grub_uint8_t *us, int len)577@@ -331,7 +331,7 @@ grub_iso9660_convert_string (grub_uint8_t *us, int len)
@@ -584,7 +584,7 @@ index 49c0c632b..4f1b52a55 100644
584 return NULL;584 return NULL;
585 585
586diff --git a/grub-core/fs/ntfs.c b/grub-core/fs/ntfs.c586diff --git a/grub-core/fs/ntfs.c b/grub-core/fs/ntfs.c
587index fc4e1f678..2f34f76da 100644587index fc4e1f678d..2f34f76da8 100644
588--- a/grub-core/fs/ntfs.c588--- a/grub-core/fs/ntfs.c
589+++ b/grub-core/fs/ntfs.c589+++ b/grub-core/fs/ntfs.c
590@@ -556,8 +556,8 @@ get_utf8 (grub_uint8_t *in, grub_size_t len)590@@ -556,8 +556,8 @@ get_utf8 (grub_uint8_t *in, grub_size_t len)
@@ -599,7 +599,7 @@ index fc4e1f678..2f34f76da 100644
599 {599 {
600 grub_free (buf);600 grub_free (buf);
601diff --git a/grub-core/fs/sfs.c b/grub-core/fs/sfs.c601diff --git a/grub-core/fs/sfs.c b/grub-core/fs/sfs.c
602index 50c1fe72f..90f7fb379 100644602index 50c1fe72f4..90f7fb3791 100644
603--- a/grub-core/fs/sfs.c603--- a/grub-core/fs/sfs.c
604+++ b/grub-core/fs/sfs.c604+++ b/grub-core/fs/sfs.c
605@@ -266,7 +266,7 @@ grub_sfs_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock)605@@ -266,7 +266,7 @@ grub_sfs_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock)
@@ -612,7 +612,7 @@ index 50c1fe72f..90f7fb379 100644
612 {612 {
613 grub_errno = 0;613 grub_errno = 0;
614diff --git a/grub-core/fs/tar.c b/grub-core/fs/tar.c614diff --git a/grub-core/fs/tar.c b/grub-core/fs/tar.c
615index 7d63e0c99..c551ed6b5 100644615index 7d63e0c99c..c551ed6b52 100644
616--- a/grub-core/fs/tar.c616--- a/grub-core/fs/tar.c
617+++ b/grub-core/fs/tar.c617+++ b/grub-core/fs/tar.c
618@@ -120,7 +120,7 @@ grub_cpio_find_file (struct grub_archelp_data *data, char **name,618@@ -120,7 +120,7 @@ grub_cpio_find_file (struct grub_archelp_data *data, char **name,
@@ -625,7 +625,7 @@ index 7d63e0c99..c551ed6b5 100644
625 return grub_errno;625 return grub_errno;
626 grub_free (data->linkname);626 grub_free (data->linkname);
627diff --git a/grub-core/fs/udf.c b/grub-core/fs/udf.c627diff --git a/grub-core/fs/udf.c b/grub-core/fs/udf.c
628index dc8b6e2d1..a83761674 100644628index dc8b6e2d1c..a83761674a 100644
629--- a/grub-core/fs/udf.c629--- a/grub-core/fs/udf.c
630+++ b/grub-core/fs/udf.c630+++ b/grub-core/fs/udf.c
631@@ -873,7 +873,7 @@ read_string (const grub_uint8_t *raw, grub_size_t sz, char *outbuf)631@@ -873,7 +873,7 @@ read_string (const grub_uint8_t *raw, grub_size_t sz, char *outbuf)
@@ -647,7 +647,7 @@ index dc8b6e2d1..a83761674 100644
647 return NULL;647 return NULL;
648 for (i = 0; i < utf16len; i++)648 for (i = 0; i < utf16len; i++)
649diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c649diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c
650index 2f72e42bf..381dde556 100644650index 2f72e42bf8..381dde556d 100644
651--- a/grub-core/fs/zfs/zfs.c651--- a/grub-core/fs/zfs/zfs.c
652+++ b/grub-core/fs/zfs/zfs.c652+++ b/grub-core/fs/zfs/zfs.c
653@@ -3325,7 +3325,7 @@ dnode_get_fullpath (const char *fullpath, struct subvolume *subvol,653@@ -3325,7 +3325,7 @@ dnode_get_fullpath (const char *fullpath, struct subvolume *subvol,
@@ -669,7 +669,7 @@ index 2f72e42bf..381dde556 100644
669 return grub_errno;669 return grub_errno;
670 for (i = 0; i < *nsectors; i++)670 for (i = 0; i < *nsectors; i++)
671diff --git a/grub-core/gfxmenu/gui_string_util.c b/grub-core/gfxmenu/gui_string_util.c671diff --git a/grub-core/gfxmenu/gui_string_util.c b/grub-core/gfxmenu/gui_string_util.c
672index a9a415e31..ba1e1eab3 100644672index a9a415e312..ba1e1eab31 100644
673--- a/grub-core/gfxmenu/gui_string_util.c673--- a/grub-core/gfxmenu/gui_string_util.c
674+++ b/grub-core/gfxmenu/gui_string_util.c674+++ b/grub-core/gfxmenu/gui_string_util.c
675@@ -55,7 +55,7 @@ canonicalize_path (const char *path)675@@ -55,7 +55,7 @@ canonicalize_path (const char *path)
@@ -682,7 +682,7 @@ index a9a415e31..ba1e1eab3 100644
682 return 0;682 return 0;
683 683
684diff --git a/grub-core/gfxmenu/widget-box.c b/grub-core/gfxmenu/widget-box.c684diff --git a/grub-core/gfxmenu/widget-box.c b/grub-core/gfxmenu/widget-box.c
685index b60602889..470597ded 100644685index b606028891..470597ded2 100644
686--- a/grub-core/gfxmenu/widget-box.c686--- a/grub-core/gfxmenu/widget-box.c
687+++ b/grub-core/gfxmenu/widget-box.c687+++ b/grub-core/gfxmenu/widget-box.c
688@@ -303,10 +303,10 @@ grub_gfxmenu_create_box (const char *pixmaps_prefix,688@@ -303,10 +303,10 @@ grub_gfxmenu_create_box (const char *pixmaps_prefix,
@@ -699,7 +699,7 @@ index b60602889..470597ded 100644
699 /* Initialize all pixmap pointers to NULL so that proper destruction can699 /* Initialize all pixmap pointers to NULL so that proper destruction can
700 be performed if an error is encountered partway through construction. */700 be performed if an error is encountered partway through construction. */
701diff --git a/grub-core/io/gzio.c b/grub-core/io/gzio.c701diff --git a/grub-core/io/gzio.c b/grub-core/io/gzio.c
702index 6208a9763..43d98a7bd 100644702index 6208a97636..43d98a7bdf 100644
703--- a/grub-core/io/gzio.c703--- a/grub-core/io/gzio.c
704+++ b/grub-core/io/gzio.c704+++ b/grub-core/io/gzio.c
705@@ -554,7 +554,7 @@ huft_build (unsigned *b, /* code lengths in bits (all assumed <= BMAX) */705@@ -554,7 +554,7 @@ huft_build (unsigned *b, /* code lengths in bits (all assumed <= BMAX) */
@@ -712,7 +712,7 @@ index 6208a9763..43d98a7bd 100644
712 {712 {
713 if (h)713 if (h)
714diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c714diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
715index 6e1ceb905..dc31caa21 100644715index 6e1ceb9051..dc31caa213 100644
716--- a/grub-core/kern/efi/efi.c716--- a/grub-core/kern/efi/efi.c
717+++ b/grub-core/kern/efi/efi.c717+++ b/grub-core/kern/efi/efi.c
718@@ -202,7 +202,7 @@ grub_efi_set_variable(const char *var, const grub_efi_guid_t *guid,718@@ -202,7 +202,7 @@ grub_efi_set_variable(const char *var, const grub_efi_guid_t *guid,
@@ -743,7 +743,7 @@ index 6e1ceb905..dc31caa21 100644
743 {743 {
744 grub_free (name);744 grub_free (name);
745diff --git a/grub-core/kern/emu/hostdisk.c b/grub-core/kern/emu/hostdisk.c745diff --git a/grub-core/kern/emu/hostdisk.c b/grub-core/kern/emu/hostdisk.c
746index 8ac523953..f90b6c9ce 100644746index 8ac5239538..f90b6c9ce4 100644
747--- a/grub-core/kern/emu/hostdisk.c747--- a/grub-core/kern/emu/hostdisk.c
748+++ b/grub-core/kern/emu/hostdisk.c748+++ b/grub-core/kern/emu/hostdisk.c
749@@ -627,7 +627,7 @@ static char *749@@ -627,7 +627,7 @@ static char *
@@ -756,7 +756,7 @@ index 8ac523953..f90b6c9ce 100644
756 size_t i;756 size_t i;
757 int first = 1;757 int first = 1;
758diff --git a/grub-core/kern/fs.c b/grub-core/kern/fs.c758diff --git a/grub-core/kern/fs.c b/grub-core/kern/fs.c
759index 2b85f4950..f90be6566 100644759index 2b85f4950b..f90be6566b 100644
760--- a/grub-core/kern/fs.c760--- a/grub-core/kern/fs.c
761+++ b/grub-core/kern/fs.c761+++ b/grub-core/kern/fs.c
762@@ -151,7 +151,7 @@ grub_fs_blocklist_open (grub_file_t file, const char *name)762@@ -151,7 +151,7 @@ grub_fs_blocklist_open (grub_file_t file, const char *name)
@@ -769,7 +769,7 @@ index 2b85f4950..f90be6566 100644
769 return 0;769 return 0;
770 770
771diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c771diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
772index 18cad5803..83c068d61 100644772index 18cad5803b..83c068d61b 100644
773--- a/grub-core/kern/misc.c773--- a/grub-core/kern/misc.c
774+++ b/grub-core/kern/misc.c774+++ b/grub-core/kern/misc.c
775@@ -691,7 +691,7 @@ parse_printf_args (const char *fmt0, struct printf_args *args,775@@ -691,7 +691,7 @@ parse_printf_args (const char *fmt0, struct printf_args *args,
@@ -782,7 +782,7 @@ index 18cad5803..83c068d61 100644
782 {782 {
783 grub_errno = GRUB_ERR_NONE;783 grub_errno = GRUB_ERR_NONE;
784diff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c784diff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c
785index 78175aac2..619db3122 100644785index 78175aac2d..619db3122a 100644
786--- a/grub-core/kern/parser.c786--- a/grub-core/kern/parser.c
787+++ b/grub-core/kern/parser.c787+++ b/grub-core/kern/parser.c
788@@ -213,7 +213,7 @@ grub_parser_split_cmdline (const char *cmdline,788@@ -213,7 +213,7 @@ grub_parser_split_cmdline (const char *cmdline,
@@ -795,7 +795,7 @@ index 78175aac2..619db3122 100644
795 {795 {
796 grub_free (args);796 grub_free (args);
797diff --git a/grub-core/kern/uboot/uboot.c b/grub-core/kern/uboot/uboot.c797diff --git a/grub-core/kern/uboot/uboot.c b/grub-core/kern/uboot/uboot.c
798index be4816fe6..aac8f9ae1 100644798index be4816fe6f..aac8f9ae1f 100644
799--- a/grub-core/kern/uboot/uboot.c799--- a/grub-core/kern/uboot/uboot.c
800+++ b/grub-core/kern/uboot/uboot.c800+++ b/grub-core/kern/uboot/uboot.c
801@@ -133,7 +133,7 @@ grub_uboot_dev_enum (void)801@@ -133,7 +133,7 @@ grub_uboot_dev_enum (void)
@@ -808,7 +808,7 @@ index be4816fe6..aac8f9ae1 100644
808 return 0;808 return 0;
809 809
810diff --git a/grub-core/lib/libgcrypt/cipher/ac.c b/grub-core/lib/libgcrypt/cipher/ac.c810diff --git a/grub-core/lib/libgcrypt/cipher/ac.c b/grub-core/lib/libgcrypt/cipher/ac.c
811index f5e946a2d..63f6fcd11 100644811index f5e946a2d8..63f6fcd11e 100644
812--- a/grub-core/lib/libgcrypt/cipher/ac.c812--- a/grub-core/lib/libgcrypt/cipher/ac.c
813+++ b/grub-core/lib/libgcrypt/cipher/ac.c813+++ b/grub-core/lib/libgcrypt/cipher/ac.c
814@@ -185,7 +185,7 @@ ac_data_mpi_copy (gcry_ac_mpi_t *data_mpis, unsigned int data_mpis_n,814@@ -185,7 +185,7 @@ ac_data_mpi_copy (gcry_ac_mpi_t *data_mpis, unsigned int data_mpis_n,
@@ -848,7 +848,7 @@ index f5e946a2d..63f6fcd11 100644
848 {848 {
849 err = gcry_error_from_errno (errno);849 err = gcry_error_from_errno (errno);
850diff --git a/grub-core/lib/libgcrypt/cipher/primegen.c b/grub-core/lib/libgcrypt/cipher/primegen.c850diff --git a/grub-core/lib/libgcrypt/cipher/primegen.c b/grub-core/lib/libgcrypt/cipher/primegen.c
851index 2788e349f..b12e79b19 100644851index 2788e349fa..b12e79b192 100644
852--- a/grub-core/lib/libgcrypt/cipher/primegen.c852--- a/grub-core/lib/libgcrypt/cipher/primegen.c
853+++ b/grub-core/lib/libgcrypt/cipher/primegen.c853+++ b/grub-core/lib/libgcrypt/cipher/primegen.c
854@@ -383,7 +383,7 @@ prime_generate_internal (int need_q_factor,854@@ -383,7 +383,7 @@ prime_generate_internal (int need_q_factor,
@@ -870,7 +870,7 @@ index 2788e349f..b12e79b19 100644
870 val_2 = mpi_alloc_set_ui( 2 );870 val_2 = mpi_alloc_set_ui( 2 );
871 val_3 = mpi_alloc_set_ui( 3);871 val_3 = mpi_alloc_set_ui( 3);
872diff --git a/grub-core/lib/libgcrypt/cipher/pubkey.c b/grub-core/lib/libgcrypt/cipher/pubkey.c872diff --git a/grub-core/lib/libgcrypt/cipher/pubkey.c b/grub-core/lib/libgcrypt/cipher/pubkey.c
873index 910982141..ca087ad75 100644873index 910982141e..ca087ad75b 100644
874--- a/grub-core/lib/libgcrypt/cipher/pubkey.c874--- a/grub-core/lib/libgcrypt/cipher/pubkey.c
875+++ b/grub-core/lib/libgcrypt/cipher/pubkey.c875+++ b/grub-core/lib/libgcrypt/cipher/pubkey.c
876@@ -2941,7 +2941,7 @@ gcry_pk_encrypt (gcry_sexp_t *r_ciph, gcry_sexp_t s_data, gcry_sexp_t s_pkey)876@@ -2941,7 +2941,7 @@ gcry_pk_encrypt (gcry_sexp_t *r_ciph, gcry_sexp_t s_data, gcry_sexp_t s_pkey)
@@ -892,7 +892,7 @@ index 910982141..ca087ad75 100644
892 {892 {
893 rc = gpg_err_code_from_syserror ();893 rc = gpg_err_code_from_syserror ();
894diff --git a/grub-core/lib/priority_queue.c b/grub-core/lib/priority_queue.c894diff --git a/grub-core/lib/priority_queue.c b/grub-core/lib/priority_queue.c
895index 659be0b7f..7d5e7c05a 100644895index 659be0b7f4..7d5e7c05aa 100644
896--- a/grub-core/lib/priority_queue.c896--- a/grub-core/lib/priority_queue.c
897+++ b/grub-core/lib/priority_queue.c897+++ b/grub-core/lib/priority_queue.c
898@@ -92,7 +92,7 @@ grub_priority_queue_new (grub_size_t elsize,898@@ -92,7 +92,7 @@ grub_priority_queue_new (grub_size_t elsize,
@@ -905,7 +905,7 @@ index 659be0b7f..7d5e7c05a 100644
905 return 0;905 return 0;
906 ret = (struct grub_priority_queue *) grub_malloc (sizeof (*ret));906 ret = (struct grub_priority_queue *) grub_malloc (sizeof (*ret));
907diff --git a/grub-core/lib/reed_solomon.c b/grub-core/lib/reed_solomon.c907diff --git a/grub-core/lib/reed_solomon.c b/grub-core/lib/reed_solomon.c
908index ee9fa7b4f..467305b46 100644908index ee9fa7b4fe..467305b46a 100644
909--- a/grub-core/lib/reed_solomon.c909--- a/grub-core/lib/reed_solomon.c
910+++ b/grub-core/lib/reed_solomon.c910+++ b/grub-core/lib/reed_solomon.c
911@@ -20,6 +20,7 @@911@@ -20,6 +20,7 @@
@@ -931,7 +931,7 @@ index ee9fa7b4f..467305b46 100644
931 /* Multiply with X - a^r */931 /* Multiply with X - a^r */
932 for (j = 0; j < rs; j++)932 for (j = 0; j < rs; j++)
933diff --git a/grub-core/lib/relocator.c b/grub-core/lib/relocator.c933diff --git a/grub-core/lib/relocator.c b/grub-core/lib/relocator.c
934index ea3ebc719..5847aac36 100644934index ea3ebc719b..5847aac364 100644
935--- a/grub-core/lib/relocator.c935--- a/grub-core/lib/relocator.c
936+++ b/grub-core/lib/relocator.c936+++ b/grub-core/lib/relocator.c
937@@ -495,9 +495,9 @@ malloc_in_range (struct grub_relocator *rel,937@@ -495,9 +495,9 @@ malloc_in_range (struct grub_relocator *rel,
@@ -967,7 +967,7 @@ index ea3ebc719..5847aac36 100644
967 {967 {
968 grub_free (from);968 grub_free (from);
969diff --git a/grub-core/lib/zstd/fse_decompress.c b/grub-core/lib/zstd/fse_decompress.c969diff --git a/grub-core/lib/zstd/fse_decompress.c b/grub-core/lib/zstd/fse_decompress.c
970index 72bbead5b..2227b84bc 100644970index 72bbead5be..2227b84bc7 100644
971--- a/grub-core/lib/zstd/fse_decompress.c971--- a/grub-core/lib/zstd/fse_decompress.c
972+++ b/grub-core/lib/zstd/fse_decompress.c972+++ b/grub-core/lib/zstd/fse_decompress.c
973@@ -82,7 +82,7 @@973@@ -82,7 +82,7 @@
@@ -980,7 +980,7 @@ index 72bbead5b..2227b84bc 100644
980 980
981 void FSE_freeDTable (FSE_DTable* dt)981 void FSE_freeDTable (FSE_DTable* dt)
982diff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c982diff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c
983index 092e8e307..979d425df 100644983index 092e8e3077..979d425dfb 100644
984--- a/grub-core/loader/arm/linux.c984--- a/grub-core/loader/arm/linux.c
985+++ b/grub-core/loader/arm/linux.c985+++ b/grub-core/loader/arm/linux.c
986@@ -82,7 +82,7 @@ linux_prepare_atag (void *target_atag)986@@ -82,7 +82,7 @@ linux_prepare_atag (void *target_atag)
@@ -993,7 +993,7 @@ index 092e8e307..979d425df 100644
993 return grub_errno;993 return grub_errno;
994 994
995diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c995diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
996index 04e815c05..b9a2df34b 100644996index 04e815c052..b9a2df34b1 100644
997--- a/grub-core/loader/efi/chainloader.c997--- a/grub-core/loader/efi/chainloader.c
998+++ b/grub-core/loader/efi/chainloader.c998+++ b/grub-core/loader/efi/chainloader.c
999@@ -126,7 +126,7 @@ copy_file_path (grub_efi_file_path_device_path_t *fp,999@@ -126,7 +126,7 @@ copy_file_path (grub_efi_file_path_device_path_t *fp,
@@ -1006,7 +1006,7 @@ index 04e815c05..b9a2df34b 100644
1006 return;1006 return;
1007 1007
1008diff --git a/grub-core/loader/i386/bsdXX.c b/grub-core/loader/i386/bsdXX.c1008diff --git a/grub-core/loader/i386/bsdXX.c b/grub-core/loader/i386/bsdXX.c
1009index af6741d15..a8d8bf7da 1006441009index af6741d157..a8d8bf7dae 100644
1010--- a/grub-core/loader/i386/bsdXX.c1010--- a/grub-core/loader/i386/bsdXX.c
1011+++ b/grub-core/loader/i386/bsdXX.c1011+++ b/grub-core/loader/i386/bsdXX.c
1012@@ -48,7 +48,7 @@ read_headers (grub_file_t file, const char *filename, Elf_Ehdr *e, char **shdr)1012@@ -48,7 +48,7 @@ read_headers (grub_file_t file, const char *filename, Elf_Ehdr *e, char **shdr)
@@ -1019,7 +1019,7 @@ index af6741d15..a8d8bf7da 100644
1019 return grub_errno;1019 return grub_errno;
1020 1020
1021diff --git a/grub-core/loader/i386/xnu.c b/grub-core/loader/i386/xnu.c1021diff --git a/grub-core/loader/i386/xnu.c b/grub-core/loader/i386/xnu.c
1022index e64ed08f5..b7d176b5d 1006441022index e64ed08f58..b7d176b5d3 100644
1023--- a/grub-core/loader/i386/xnu.c1023--- a/grub-core/loader/i386/xnu.c
1024+++ b/grub-core/loader/i386/xnu.c1024+++ b/grub-core/loader/i386/xnu.c
1025@@ -295,7 +295,7 @@ grub_xnu_devprop_add_property_utf8 (struct grub_xnu_devprop_device_descriptor *d1025@@ -295,7 +295,7 @@ grub_xnu_devprop_add_property_utf8 (struct grub_xnu_devprop_device_descriptor *d
@@ -1041,7 +1041,7 @@ index e64ed08f5..b7d176b5d 100644
1041 return grub_errno;1041 return grub_errno;
1042 grub_memcpy (utf16, name, sizeof (grub_uint16_t) * namelen);1042 grub_memcpy (utf16, name, sizeof (grub_uint16_t) * namelen);
1043diff --git a/grub-core/loader/macho.c b/grub-core/loader/macho.c1043diff --git a/grub-core/loader/macho.c b/grub-core/loader/macho.c
1044index 085f9c689..05710c48e 1006441044index 085f9c6890..05710c48e0 100644
1045--- a/grub-core/loader/macho.c1045--- a/grub-core/loader/macho.c
1046+++ b/grub-core/loader/macho.c1046+++ b/grub-core/loader/macho.c
1047@@ -97,7 +97,7 @@ grub_macho_file (grub_file_t file, const char *filename, int is_64bit)1047@@ -97,7 +97,7 @@ grub_macho_file (grub_file_t file, const char *filename, int is_64bit)
@@ -1054,7 +1054,7 @@ index 085f9c689..05710c48e 100644
1054 goto fail;1054 goto fail;
1055 if (grub_file_read (macho->file, archs,1055 if (grub_file_read (macho->file, archs,
1056diff --git a/grub-core/loader/multiboot_elfxx.c b/grub-core/loader/multiboot_elfxx.c1056diff --git a/grub-core/loader/multiboot_elfxx.c b/grub-core/loader/multiboot_elfxx.c
1057index 70cd1db51..cc6853692 1006441057index 70cd1db513..cc6853692a 100644
1058--- a/grub-core/loader/multiboot_elfxx.c1058--- a/grub-core/loader/multiboot_elfxx.c
1059+++ b/grub-core/loader/multiboot_elfxx.c1059+++ b/grub-core/loader/multiboot_elfxx.c
1060@@ -217,7 +217,7 @@ CONCAT(grub_multiboot_load_elf, XX) (mbi_load_data_t *mld)1060@@ -217,7 +217,7 @@ CONCAT(grub_multiboot_load_elf, XX) (mbi_load_data_t *mld)
@@ -1067,7 +1067,7 @@ index 70cd1db51..cc6853692 100644
1067 return grub_errno;1067 return grub_errno;
1068 1068
1069diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c1069diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c
1070index e0f47e72b..2f0ebd0b8 1006441070index e0f47e72b0..2f0ebd0b8b 100644
1071--- a/grub-core/loader/xnu.c1071--- a/grub-core/loader/xnu.c
1072+++ b/grub-core/loader/xnu.c1072+++ b/grub-core/loader/xnu.c
1073@@ -801,7 +801,7 @@ grub_cmd_xnu_mkext (grub_command_t cmd __attribute__ ((unused)),1073@@ -801,7 +801,7 @@ grub_cmd_xnu_mkext (grub_command_t cmd __attribute__ ((unused)),
@@ -1080,7 +1080,7 @@ index e0f47e72b..2f0ebd0b8 100644
1080 {1080 {
1081 grub_file_close (file);1081 grub_file_close (file);
1082diff --git a/grub-core/mmap/mmap.c b/grub-core/mmap/mmap.c1082diff --git a/grub-core/mmap/mmap.c b/grub-core/mmap/mmap.c
1083index 6a31cbae3..57b4e9a72 1006441083index 6a31cbae32..57b4e9a72a 100644
1084--- a/grub-core/mmap/mmap.c1084--- a/grub-core/mmap/mmap.c
1085+++ b/grub-core/mmap/mmap.c1085+++ b/grub-core/mmap/mmap.c
1086@@ -143,9 +143,9 @@ grub_mmap_iterate (grub_memory_hook_t hook, void *hook_data)1086@@ -143,9 +143,9 @@ grub_mmap_iterate (grub_memory_hook_t hook, void *hook_data)
@@ -1096,7 +1096,7 @@ index 6a31cbae3..57b4e9a72 100644
1096 if (! ctx.scanline_events || !present)1096 if (! ctx.scanline_events || !present)
1097 {1097 {
1098diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c1098diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
1099index 558d97ba1..dd0ffcdae 1006441099index 558d97ba1e..dd0ffcdaea 100644
1100--- a/grub-core/net/bootp.c1100--- a/grub-core/net/bootp.c
1101+++ b/grub-core/net/bootp.c1101+++ b/grub-core/net/bootp.c
1102@@ -1559,7 +1559,7 @@ grub_cmd_bootp (struct grub_command *cmd __attribute__ ((unused)),1102@@ -1559,7 +1559,7 @@ grub_cmd_bootp (struct grub_command *cmd __attribute__ ((unused)),
@@ -1109,7 +1109,7 @@ index 558d97ba1..dd0ffcdae 100644
1109 return grub_errno;1109 return grub_errno;
1110 1110
1111diff --git a/grub-core/net/dns.c b/grub-core/net/dns.c1111diff --git a/grub-core/net/dns.c b/grub-core/net/dns.c
1112index 5d9afe093..e332d5eb4 1006441112index 5d9afe093c..e332d5eb4a 100644
1113--- a/grub-core/net/dns.c1113--- a/grub-core/net/dns.c
1114+++ b/grub-core/net/dns.c1114+++ b/grub-core/net/dns.c
1115@@ -285,8 +285,8 @@ recv_hook (grub_net_udp_socket_t sock __attribute__ ((unused)),1115@@ -285,8 +285,8 @@ recv_hook (grub_net_udp_socket_t sock __attribute__ ((unused)),
@@ -1144,7 +1144,7 @@ index 5d9afe093..e332d5eb4 100644
1144 return grub_errno;1144 return grub_errno;
1145 1145
1146diff --git a/grub-core/net/net.c b/grub-core/net/net.c1146diff --git a/grub-core/net/net.c b/grub-core/net/net.c
1147index b917a75d5..fed7bc57c 1006441147index b917a75d54..fed7bc57cb 100644
1148--- a/grub-core/net/net.c1148--- a/grub-core/net/net.c
1149+++ b/grub-core/net/net.c1149+++ b/grub-core/net/net.c
1150@@ -333,8 +333,8 @@ grub_cmd_ipv6_autoconf (struct grub_command *cmd __attribute__ ((unused)),1150@@ -333,8 +333,8 @@ grub_cmd_ipv6_autoconf (struct grub_command *cmd __attribute__ ((unused)),
@@ -1159,7 +1159,7 @@ index b917a75d5..fed7bc57c 100644
1159 {1159 {
1160 grub_free (ifaces);1160 grub_free (ifaces);
1161diff --git a/grub-core/normal/charset.c b/grub-core/normal/charset.c1161diff --git a/grub-core/normal/charset.c b/grub-core/normal/charset.c
1162index b0ab47d73..d57fb72fa 1006441162index b0ab47d73f..d57fb72faa 100644
1163--- a/grub-core/normal/charset.c1163--- a/grub-core/normal/charset.c
1164+++ b/grub-core/normal/charset.c1164+++ b/grub-core/normal/charset.c
1165@@ -203,7 +203,7 @@ grub_utf8_to_ucs4_alloc (const char *msg, grub_uint32_t **unicode_msg,1165@@ -203,7 +203,7 @@ grub_utf8_to_ucs4_alloc (const char *msg, grub_uint32_t **unicode_msg,
@@ -1201,7 +1201,7 @@ index b0ab47d73..d57fb72fa 100644
1201 return -1;1201 return -1;
1202 for (ptr = logical; ptr <= logical + logical_len; ptr++)1202 for (ptr = logical; ptr <= logical + logical_len; ptr++)
1203diff --git a/grub-core/normal/cmdline.c b/grub-core/normal/cmdline.c1203diff --git a/grub-core/normal/cmdline.c b/grub-core/normal/cmdline.c
1204index c037d5050..c57242e2e 1006441204index c037d5050e..c57242e2ea 100644
1205--- a/grub-core/normal/cmdline.c1205--- a/grub-core/normal/cmdline.c
1206+++ b/grub-core/normal/cmdline.c1206+++ b/grub-core/normal/cmdline.c
1207@@ -41,7 +41,7 @@ grub_err_t1207@@ -41,7 +41,7 @@ grub_err_t
@@ -1268,7 +1268,7 @@ index c037d5050..c57242e2e 100644
1268 {1268 {
1269 grub_print_error ();1269 grub_print_error ();
1270diff --git a/grub-core/normal/menu_entry.c b/grub-core/normal/menu_entry.c1270diff --git a/grub-core/normal/menu_entry.c b/grub-core/normal/menu_entry.c
1271index cdf3590a3..1993995be 1006441271index cdf3590a36..1993995be6 100644
1272--- a/grub-core/normal/menu_entry.c1272--- a/grub-core/normal/menu_entry.c
1273+++ b/grub-core/normal/menu_entry.c1273+++ b/grub-core/normal/menu_entry.c
1274@@ -95,8 +95,8 @@ init_line (struct screen *screen, struct line *linep)1274@@ -95,8 +95,8 @@ init_line (struct screen *screen, struct line *linep)
@@ -1328,7 +1328,7 @@ index cdf3590a3..1993995be 100644
1328 {1328 {
1329 grub_print_error ();1329 grub_print_error ();
1330diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c1330diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
1331index e22bb91f6..18240e76c 1006441331index e22bb91f6e..18240e76ce 100644
1332--- a/grub-core/normal/menu_text.c1332--- a/grub-core/normal/menu_text.c
1333+++ b/grub-core/normal/menu_text.c1333+++ b/grub-core/normal/menu_text.c
1334@@ -78,7 +78,7 @@ grub_print_message_indented_real (const char *msg, int margin_left,1334@@ -78,7 +78,7 @@ grub_print_message_indented_real (const char *msg, int margin_left,
@@ -1350,7 +1350,7 @@ index e22bb91f6..18240e76c 100644
1350 /* XXX How to show this error? */1350 /* XXX How to show this error? */
1351 return;1351 return;
1352diff --git a/grub-core/normal/term.c b/grub-core/normal/term.c1352diff --git a/grub-core/normal/term.c b/grub-core/normal/term.c
1353index a1e5c5a0d..cc8c173b6 1006441353index a1e5c5a0da..cc8c173b6e 100644
1354--- a/grub-core/normal/term.c1354--- a/grub-core/normal/term.c
1355+++ b/grub-core/normal/term.c1355+++ b/grub-core/normal/term.c
1356@@ -264,7 +264,7 @@ grub_term_save_pos (void)1356@@ -264,7 +264,7 @@ grub_term_save_pos (void)
@@ -1372,7 +1372,7 @@ index a1e5c5a0d..cc8c173b6 100644
1372 grub_error_pop ();1372 grub_error_pop ();
1373 1373
1374diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c1374diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
1375index 7adc0f30e..a5bd0752f 1006441375index 7adc0f30ee..a5bd0752fb 100644
1376--- a/grub-core/osdep/linux/getroot.c1376--- a/grub-core/osdep/linux/getroot.c
1377+++ b/grub-core/osdep/linux/getroot.c1377+++ b/grub-core/osdep/linux/getroot.c
1378@@ -168,7 +168,7 @@ grub_util_raid_getmembers (const char *name, int bootable)1378@@ -168,7 +168,7 @@ grub_util_raid_getmembers (const char *name, int bootable)
@@ -1403,7 +1403,7 @@ index 7adc0f30e..a5bd0752f 100644
1403 again:1403 again:
1404 fp = grub_util_fopen ("/proc/self/mountinfo", "r");1404 fp = grub_util_fopen ("/proc/self/mountinfo", "r");
1405diff --git a/grub-core/osdep/unix/config.c b/grub-core/osdep/unix/config.c1405diff --git a/grub-core/osdep/unix/config.c b/grub-core/osdep/unix/config.c
1406index 5478030fd..89dc70d93 1006441406index 5478030fde..89dc70d93c 100644
1407--- a/grub-core/osdep/unix/config.c1407--- a/grub-core/osdep/unix/config.c
1408+++ b/grub-core/osdep/unix/config.c1408+++ b/grub-core/osdep/unix/config.c
1409@@ -130,7 +130,7 @@ grub_util_load_config (struct grub_util_config *cfg)1409@@ -130,7 +130,7 @@ grub_util_load_config (struct grub_util_config *cfg)
@@ -1416,7 +1416,7 @@ index 5478030fd..89dc70d93 100644
1416 if (grub_util_is_regular (cfgfile))1416 if (grub_util_is_regular (cfgfile))
1417 sorted_cfgpaths[i++] = xstrdup (cfgfile);1417 sorted_cfgpaths[i++] = xstrdup (cfgfile);
1418diff --git a/grub-core/osdep/windows/getroot.c b/grub-core/osdep/windows/getroot.c1418diff --git a/grub-core/osdep/windows/getroot.c b/grub-core/osdep/windows/getroot.c
1419index 661d95461..eada663b2 1006441419index 661d954619..eada663b26 100644
1420--- a/grub-core/osdep/windows/getroot.c1420--- a/grub-core/osdep/windows/getroot.c
1421+++ b/grub-core/osdep/windows/getroot.c1421+++ b/grub-core/osdep/windows/getroot.c
1422@@ -59,7 +59,7 @@ grub_get_mount_point (const TCHAR *path)1422@@ -59,7 +59,7 @@ grub_get_mount_point (const TCHAR *path)
@@ -1429,7 +1429,7 @@ index 661d95461..eada663b2 100644
1429 /* When pointing to EFI system partition GetVolumePathName fails1429 /* When pointing to EFI system partition GetVolumePathName fails
1430 for ESP root and returns abberant information for everything1430 for ESP root and returns abberant information for everything
1431diff --git a/grub-core/osdep/windows/hostdisk.c b/grub-core/osdep/windows/hostdisk.c1431diff --git a/grub-core/osdep/windows/hostdisk.c b/grub-core/osdep/windows/hostdisk.c
1432index 355100789..0be327394 1006441432index 355100789a..0be3273949 100644
1433--- a/grub-core/osdep/windows/hostdisk.c1433--- a/grub-core/osdep/windows/hostdisk.c
1434+++ b/grub-core/osdep/windows/hostdisk.c1434+++ b/grub-core/osdep/windows/hostdisk.c
1435@@ -111,7 +111,7 @@ grub_util_get_windows_path_real (const char *path)1435@@ -111,7 +111,7 @@ grub_util_get_windows_path_real (const char *path)
@@ -1451,7 +1451,7 @@ index 355100789..0be327394 100644
1451 pattern[l] = '\\';1451 pattern[l] = '\\';
1452 pattern[l + 1] = '*';1452 pattern[l + 1] = '*';
1453diff --git a/grub-core/osdep/windows/init.c b/grub-core/osdep/windows/init.c1453diff --git a/grub-core/osdep/windows/init.c b/grub-core/osdep/windows/init.c
1454index e8ffd62c6..6297de632 1006441454index e8ffd62c6a..6297de6326 100644
1455--- a/grub-core/osdep/windows/init.c1455--- a/grub-core/osdep/windows/init.c
1456+++ b/grub-core/osdep/windows/init.c1456+++ b/grub-core/osdep/windows/init.c
1457@@ -161,7 +161,7 @@ grub_util_host_init (int *argc __attribute__ ((unused)),1457@@ -161,7 +161,7 @@ grub_util_host_init (int *argc __attribute__ ((unused)),
@@ -1464,7 +1464,7 @@ index e8ffd62c6..6297de632 100644
1464 for (i = 0; i < *argc; i++)1464 for (i = 0; i < *argc; i++)
1465 (*argv)[i] = grub_util_tchar_to_utf8 (targv[i]); 1465 (*argv)[i] = grub_util_tchar_to_utf8 (targv[i]);
1466diff --git a/grub-core/osdep/windows/platform.c b/grub-core/osdep/windows/platform.c1466diff --git a/grub-core/osdep/windows/platform.c b/grub-core/osdep/windows/platform.c
1467index a3f738fb9..b160949d8 1006441467index a3f738fb9b..b160949d8e 100644
1468--- a/grub-core/osdep/windows/platform.c1468--- a/grub-core/osdep/windows/platform.c
1469+++ b/grub-core/osdep/windows/platform.c1469+++ b/grub-core/osdep/windows/platform.c
1470@@ -231,8 +231,8 @@ grub_install_register_efi (grub_device_t efidir_grub_dev, const char *efidir,1470@@ -231,8 +231,8 @@ grub_install_register_efi (grub_device_t efidir_grub_dev, const char *efidir,
@@ -1479,7 +1479,7 @@ index a3f738fb9..b160949d8 100644
1479 (const grub_uint8_t *) efi_distributor,1479 (const grub_uint8_t *) efi_distributor,
1480 distrib8_len, 0);1480 distrib8_len, 0);
1481diff --git a/grub-core/osdep/windows/relpath.c b/grub-core/osdep/windows/relpath.c1481diff --git a/grub-core/osdep/windows/relpath.c b/grub-core/osdep/windows/relpath.c
1482index cb0861744..478e8ef14 1006441482index cb0861744a..478e8ef14d 100644
1483--- a/grub-core/osdep/windows/relpath.c1483--- a/grub-core/osdep/windows/relpath.c
1484+++ b/grub-core/osdep/windows/relpath.c1484+++ b/grub-core/osdep/windows/relpath.c
1485@@ -72,7 +72,7 @@ grub_make_system_path_relative_to_its_root (const char *path)1485@@ -72,7 +72,7 @@ grub_make_system_path_relative_to_its_root (const char *path)
@@ -1492,7 +1492,7 @@ index cb0861744..478e8ef14 100644
1492 && dirwindows[offset] != '/'1492 && dirwindows[offset] != '/'
1493 && dirwindows[offset])1493 && dirwindows[offset])
1494diff --git a/grub-core/partmap/gpt.c b/grub-core/partmap/gpt.c1494diff --git a/grub-core/partmap/gpt.c b/grub-core/partmap/gpt.c
1495index 103f6796f..72a2e37cd 1006441495index 103f6796f3..72a2e37cd4 100644
1496--- a/grub-core/partmap/gpt.c1496--- a/grub-core/partmap/gpt.c
1497+++ b/grub-core/partmap/gpt.c1497+++ b/grub-core/partmap/gpt.c
1498@@ -199,7 +199,7 @@ gpt_partition_map_embed (struct grub_disk *disk, unsigned int *nsectors,1498@@ -199,7 +199,7 @@ gpt_partition_map_embed (struct grub_disk *disk, unsigned int *nsectors,
@@ -1505,7 +1505,7 @@ index 103f6796f..72a2e37cd 100644
1505 return grub_errno;1505 return grub_errno;
1506 for (i = 0; i < *nsectors; i++)1506 for (i = 0; i < *nsectors; i++)
1507diff --git a/grub-core/partmap/msdos.c b/grub-core/partmap/msdos.c1507diff --git a/grub-core/partmap/msdos.c b/grub-core/partmap/msdos.c
1508index 7b8e45076..ee3f24982 1006441508index 7b8e450762..ee3f24982b 100644
1509--- a/grub-core/partmap/msdos.c1509--- a/grub-core/partmap/msdos.c
1510+++ b/grub-core/partmap/msdos.c1510+++ b/grub-core/partmap/msdos.c
1511@@ -337,7 +337,7 @@ pc_partition_map_embed (struct grub_disk *disk, unsigned int *nsectors,1511@@ -337,7 +337,7 @@ pc_partition_map_embed (struct grub_disk *disk, unsigned int *nsectors,
@@ -1518,7 +1518,7 @@ index 7b8e45076..ee3f24982 100644
1518 return grub_errno;1518 return grub_errno;
1519 for (i = 0; i < *nsectors; i++)1519 for (i = 0; i < *nsectors; i++)
1520diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c1520diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
1521index ee299fd0e..c8d6806fe 1006441521index ee299fd0ea..c8d6806fe0 100644
1522--- a/grub-core/script/execute.c1522--- a/grub-core/script/execute.c
1523+++ b/grub-core/script/execute.c1523+++ b/grub-core/script/execute.c
1524@@ -553,7 +553,7 @@ gettext_append (struct grub_script_argv *result, const char *orig_str)1524@@ -553,7 +553,7 @@ gettext_append (struct grub_script_argv *result, const char *orig_str)
@@ -1531,7 +1531,7 @@ index ee299fd0e..c8d6806fe 100644
1531 if (parse_string (orig_str, gettext_save_allow, &ctx, 0))1531 if (parse_string (orig_str, gettext_save_allow, &ctx, 0))
1532 goto fail;1532 goto fail;
1533diff --git a/grub-core/tests/fake_input.c b/grub-core/tests/fake_input.c1533diff --git a/grub-core/tests/fake_input.c b/grub-core/tests/fake_input.c
1534index 2d6085298..b5eb516be 1006441534index 2d60852989..b5eb516be2 100644
1535--- a/grub-core/tests/fake_input.c1535--- a/grub-core/tests/fake_input.c
1536+++ b/grub-core/tests/fake_input.c1536+++ b/grub-core/tests/fake_input.c
1537@@ -49,7 +49,7 @@ grub_terminal_input_fake_sequence (int *seq_in, int nseq_in)1537@@ -49,7 +49,7 @@ grub_terminal_input_fake_sequence (int *seq_in, int nseq_in)
@@ -1544,7 +1544,7 @@ index 2d6085298..b5eb516be 100644
1544 return;1544 return;
1545 1545
1546diff --git a/grub-core/tests/video_checksum.c b/grub-core/tests/video_checksum.c1546diff --git a/grub-core/tests/video_checksum.c b/grub-core/tests/video_checksum.c
1547index 74d5b65e5..44d081069 1006441547index 74d5b65e5c..44d0810698 100644
1548--- a/grub-core/tests/video_checksum.c1548--- a/grub-core/tests/video_checksum.c
1549+++ b/grub-core/tests/video_checksum.c1549+++ b/grub-core/tests/video_checksum.c
1550@@ -336,7 +336,7 @@ grub_video_capture_write_bmp (const char *fname,1550@@ -336,7 +336,7 @@ grub_video_capture_write_bmp (const char *fname,
@@ -1575,7 +1575,7 @@ index 74d5b65e5..44d081069 100644
1575 grub_uint16_t gmask = ((1 << mode_info->green_mask_size) - 1);1575 grub_uint16_t gmask = ((1 << mode_info->green_mask_size) - 1);
1576 grub_uint16_t bmask = ((1 << mode_info->blue_mask_size) - 1);1576 grub_uint16_t bmask = ((1 << mode_info->blue_mask_size) - 1);
1577diff --git a/grub-core/video/capture.c b/grub-core/video/capture.c1577diff --git a/grub-core/video/capture.c b/grub-core/video/capture.c
1578index 4f83c7441..4d3195e01 1006441578index 4f83c74411..4d3195e017 100644
1579--- a/grub-core/video/capture.c1579--- a/grub-core/video/capture.c
1580+++ b/grub-core/video/capture.c1580+++ b/grub-core/video/capture.c
1581@@ -89,7 +89,7 @@ grub_video_capture_start (const struct grub_video_mode_info *mode_info,1581@@ -89,7 +89,7 @@ grub_video_capture_start (const struct grub_video_mode_info *mode_info,
@@ -1588,7 +1588,7 @@ index 4f83c7441..4d3195e01 100644
1588 return grub_errno;1588 return grub_errno;
1589 1589
1590diff --git a/grub-core/video/emu/sdl.c b/grub-core/video/emu/sdl.c1590diff --git a/grub-core/video/emu/sdl.c b/grub-core/video/emu/sdl.c
1591index a2f639f66..0ebab6f57 1006441591index a2f639f66d..0ebab6f57d 100644
1592--- a/grub-core/video/emu/sdl.c1592--- a/grub-core/video/emu/sdl.c
1593+++ b/grub-core/video/emu/sdl.c1593+++ b/grub-core/video/emu/sdl.c
1594@@ -172,7 +172,7 @@ grub_video_sdl_set_palette (unsigned int start, unsigned int count,1594@@ -172,7 +172,7 @@ grub_video_sdl_set_palette (unsigned int start, unsigned int count,
@@ -1601,7 +1601,7 @@ index a2f639f66..0ebab6f57 100644
1601 {1601 {
1602 tmp[i].r = palette_data[i].r;1602 tmp[i].r = palette_data[i].r;
1603diff --git a/grub-core/video/i386/pc/vga.c b/grub-core/video/i386/pc/vga.c1603diff --git a/grub-core/video/i386/pc/vga.c b/grub-core/video/i386/pc/vga.c
1604index 01f47112d..b2f776c99 1006441604index 01f47112d3..b2f776c997 100644
1605--- a/grub-core/video/i386/pc/vga.c1605--- a/grub-core/video/i386/pc/vga.c
1606+++ b/grub-core/video/i386/pc/vga.c1606+++ b/grub-core/video/i386/pc/vga.c
1607@@ -127,7 +127,7 @@ grub_video_vga_setup (unsigned int width, unsigned int height,1607@@ -127,7 +127,7 @@ grub_video_vga_setup (unsigned int width, unsigned int height,
@@ -1614,7 +1614,7 @@ index 01f47112d..b2f776c99 100644
1614 framebuffer.back_page = 0;1614 framebuffer.back_page = 0;
1615 if (!framebuffer.temporary_buffer)1615 if (!framebuffer.temporary_buffer)
1616diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c1616diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c
1617index 777e71334..61bd64537 1006441617index 777e71334c..61bd645379 100644
1618--- a/grub-core/video/readers/png.c1618--- a/grub-core/video/readers/png.c
1619+++ b/grub-core/video/readers/png.c1619+++ b/grub-core/video/readers/png.c
1620@@ -309,7 +309,7 @@ grub_png_decode_image_header (struct grub_png_data *data)1620@@ -309,7 +309,7 @@ grub_png_decode_image_header (struct grub_png_data *data)
@@ -1627,7 +1627,7 @@ index 777e71334..61bd64537 100644
1627 return grub_errno;1627 return grub_errno;
1628 1628
1629diff --git a/include/grub/unicode.h b/include/grub/unicode.h1629diff --git a/include/grub/unicode.h b/include/grub/unicode.h
1630index a0403e91f..4de986a85 1006441630index a0403e91f9..4de986a857 100644
1631--- a/include/grub/unicode.h1631--- a/include/grub/unicode.h
1632+++ b/include/grub/unicode.h1632+++ b/include/grub/unicode.h
1633@@ -293,7 +293,7 @@ grub_unicode_glyph_dup (const struct grub_unicode_glyph *in)1633@@ -293,7 +293,7 @@ grub_unicode_glyph_dup (const struct grub_unicode_glyph *in)
@@ -1649,7 +1649,7 @@ index a0403e91f..4de986a85 100644
1649 return;1649 return;
1650 grub_memcpy (out->combining_ptr, in->combining_ptr,1650 grub_memcpy (out->combining_ptr, in->combining_ptr,
1651diff --git a/util/getroot.c b/util/getroot.c1651diff --git a/util/getroot.c b/util/getroot.c
1652index cdd41153c..6ae35ecaa 1006441652index cdd41153c5..6ae35ecaa6 100644
1653--- a/util/getroot.c1653--- a/util/getroot.c
1654+++ b/util/getroot.c1654+++ b/util/getroot.c
1655@@ -200,7 +200,7 @@ make_device_name (const char *drive)1655@@ -200,7 +200,7 @@ make_device_name (const char *drive)
@@ -1662,7 +1662,7 @@ index cdd41153c..6ae35ecaa 100644
1662 for (iptr = drive; *iptr; iptr++)1662 for (iptr = drive; *iptr; iptr++)
1663 {1663 {
1664diff --git a/util/grub-file.c b/util/grub-file.c1664diff --git a/util/grub-file.c b/util/grub-file.c
1665index 50c18b683..b2e7dd69f 1006441665index 50c18b6835..b2e7dd69f4 100644
1666--- a/util/grub-file.c1666--- a/util/grub-file.c
1667+++ b/util/grub-file.c1667+++ b/util/grub-file.c
1668@@ -54,7 +54,7 @@ main (int argc, char *argv[])1668@@ -54,7 +54,7 @@ main (int argc, char *argv[])
@@ -1675,7 +1675,7 @@ index 50c18b683..b2e7dd69f 100644
1675 if (argc == 2 && strcmp (argv[1], "--version") == 0)1675 if (argc == 2 && strcmp (argv[1], "--version") == 0)
1676 {1676 {
1677diff --git a/util/grub-fstest.c b/util/grub-fstest.c1677diff --git a/util/grub-fstest.c b/util/grub-fstest.c
1678index f14e02d97..57246af7c 1006441678index f14e02d972..57246af7c6 100644
1679--- a/util/grub-fstest.c1679--- a/util/grub-fstest.c
1680+++ b/util/grub-fstest.c1680+++ b/util/grub-fstest.c
1681@@ -650,7 +650,7 @@ argp_parser (int key, char *arg, struct argp_state *state)1681@@ -650,7 +650,7 @@ argp_parser (int key, char *arg, struct argp_state *state)
@@ -1697,7 +1697,7 @@ index f14e02d97..57246af7c 100644
1697 argp_parse (&argp, argc, argv, 0, 0, 0);1697 argp_parse (&argp, argc, argv, 0, 0, 0);
1698 1698
1699diff --git a/util/grub-install-common.c b/util/grub-install-common.c1699diff --git a/util/grub-install-common.c b/util/grub-install-common.c
1700index fdfe2c7ea..447504d3f 1006441700index fdfe2c7ead..447504d3f4 100644
1701--- a/util/grub-install-common.c1701--- a/util/grub-install-common.c
1702+++ b/util/grub-install-common.c1702+++ b/util/grub-install-common.c
1703@@ -286,7 +286,7 @@ handle_install_list (struct install_list *il, const char *val,1703@@ -286,7 +286,7 @@ handle_install_list (struct install_list *il, const char *val,
@@ -1710,7 +1710,7 @@ index fdfe2c7ea..447504d3f 100644
1710 for (ce = il->entries; ; ce++)1710 for (ce = il->entries; ; ce++)
1711 {1711 {
1712diff --git a/util/grub-install.c b/util/grub-install.c1712diff --git a/util/grub-install.c b/util/grub-install.c
1713index f408b1986..843dfc7c8 1006441713index f408b19860..843dfc7c80 100644
1714--- a/util/grub-install.c1714--- a/util/grub-install.c
1715+++ b/util/grub-install.c1715+++ b/util/grub-install.c
1716@@ -658,7 +658,7 @@ device_map_check_duplicates (const char *dev_map)1716@@ -658,7 +658,7 @@ device_map_check_duplicates (const char *dev_map)
@@ -1732,7 +1732,7 @@ index f408b1986..843dfc7c8 100644
1732 for (curdev = grub_devices, curdrive = grub_drives; *curdev; curdev++,1732 for (curdev = grub_devices, curdrive = grub_drives; *curdev; curdev++,
1733 curdrive++)1733 curdrive++)
1734diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c1734diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c
1735index bc087c2b5..d97d0e7be 1006441735index bc087c2b57..d97d0e7bef 100644
1736--- a/util/grub-mkimagexx.c1736--- a/util/grub-mkimagexx.c
1737+++ b/util/grub-mkimagexx.c1737+++ b/util/grub-mkimagexx.c
1738@@ -2294,10 +2294,8 @@ SUFFIX (grub_mkimage_load_image) (const char *kernel_path,1738@@ -2294,10 +2294,8 @@ SUFFIX (grub_mkimage_load_image) (const char *kernel_path,
@@ -1749,7 +1749,7 @@ index bc087c2b5..d97d0e7be 100644
1749 SUFFIX (locate_sections) (e, kernel_path, &smd, layout, image_target);1749 SUFFIX (locate_sections) (e, kernel_path, &smd, layout, image_target);
1750 1750
1751diff --git a/util/grub-mkrescue.c b/util/grub-mkrescue.c1751diff --git a/util/grub-mkrescue.c b/util/grub-mkrescue.c
1752index 45d6140d3..cb972f120 1006441752index 45d6140d3e..cb972f120b 100644
1753--- a/util/grub-mkrescue.c1753--- a/util/grub-mkrescue.c
1754+++ b/util/grub-mkrescue.c1754+++ b/util/grub-mkrescue.c
1755@@ -441,8 +441,8 @@ main (int argc, char *argv[])1755@@ -441,8 +441,8 @@ main (int argc, char *argv[])
@@ -1764,7 +1764,7 @@ index 45d6140d3..cb972f120 100644
1764 xorriso_tail_argc = 0;1764 xorriso_tail_argc = 0;
1765 /* Program name */1765 /* Program name */
1766diff --git a/util/grub-mkstandalone.c b/util/grub-mkstandalone.c1766diff --git a/util/grub-mkstandalone.c b/util/grub-mkstandalone.c
1767index 4907d44c0..edf309717 1006441767index 4907d44c0b..edf309717c 100644
1768--- a/util/grub-mkstandalone.c1768--- a/util/grub-mkstandalone.c
1769+++ b/util/grub-mkstandalone.c1769+++ b/util/grub-mkstandalone.c
1770@@ -296,7 +296,7 @@ main (int argc, char *argv[])1770@@ -296,7 +296,7 @@ main (int argc, char *argv[])
@@ -1777,7 +1777,7 @@ index 4907d44c0..edf309717 100644
1777 argp_parse (&argp, argc, argv, 0, 0, 0);1777 argp_parse (&argp, argc, argv, 0, 0, 0);
1778 1778
1779diff --git a/util/grub-pe2elf.c b/util/grub-pe2elf.c1779diff --git a/util/grub-pe2elf.c b/util/grub-pe2elf.c
1780index 0d4084a10..11331294f 1006441780index 0d4084a108..11331294f1 100644
1781--- a/util/grub-pe2elf.c1781--- a/util/grub-pe2elf.c
1782+++ b/util/grub-pe2elf.c1782+++ b/util/grub-pe2elf.c
1783@@ -100,9 +100,9 @@ write_section_data (FILE* fp, const char *name, char *image,1783@@ -100,9 +100,9 @@ write_section_data (FILE* fp, const char *name, char *image,
@@ -1817,7 +1817,7 @@ index 0d4084a10..11331294f 100644
1817 for (i = 0; i < (int) pe_chdr->num_symbols;1817 for (i = 0; i < (int) pe_chdr->num_symbols;
1818 i += pe_symtab->num_aux + 1, pe_symtab += pe_symtab->num_aux + 1)1818 i += pe_symtab->num_aux + 1, pe_symtab += pe_symtab->num_aux + 1)
1819diff --git a/util/grub-probe.c b/util/grub-probe.c1819diff --git a/util/grub-probe.c b/util/grub-probe.c
1820index 81d27eead..cbe6ed94c 1006441820index 81d27eead5..cbe6ed94ca 100644
1821--- a/util/grub-probe.c1821--- a/util/grub-probe.c
1822+++ b/util/grub-probe.c1822+++ b/util/grub-probe.c
1823@@ -361,8 +361,8 @@ probe (const char *path, char **device_names, char delim)1823@@ -361,8 +361,8 @@ probe (const char *path, char **device_names, char delim)
diff --git a/debian/patches/0086-malloc-Use-overflow-checking-primitives-where-we-do-.patch b/debian/patches/0085-malloc-Use-overflow-checking-primitives-where-we-do-.patch
1824similarity index 95%1824similarity index 95%
1825rename from debian/patches/0086-malloc-Use-overflow-checking-primitives-where-we-do-.patch1825rename from debian/patches/0086-malloc-Use-overflow-checking-primitives-where-we-do-.patch
1826rename to debian/patches/0085-malloc-Use-overflow-checking-primitives-where-we-do-.patch1826rename to debian/patches/0085-malloc-Use-overflow-checking-primitives-where-we-do-.patch
index 95d4c0c..e0bb952 100644
--- a/debian/patches/0086-malloc-Use-overflow-checking-primitives-where-we-do-.patch
+++ b/debian/patches/0085-malloc-Use-overflow-checking-primitives-where-we-do-.patch
@@ -1,4 +1,4 @@
1From 012c6974aaafae101681100dbe7abd5ef55d825d Mon Sep 17 00:00:00 20011From 83e59f56362e11618083f376cbf700861d6b8f2a Mon Sep 17 00:00:00 2001
2From: Peter Jones <pjones@redhat.com>2From: Peter Jones <pjones@redhat.com>
3Date: Mon, 15 Jun 2020 12:28:27 -04003Date: Mon, 15 Jun 2020 12:28:27 -0400
4Subject: malloc: Use overflow checking primitives where we do complex4Subject: malloc: Use overflow checking primitives where we do complex
@@ -55,7 +55,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
55 23 files changed, 382 insertions(+), 113 deletions(-)55 23 files changed, 382 insertions(+), 113 deletions(-)
5656
57diff --git a/grub-core/commands/legacycfg.c b/grub-core/commands/legacycfg.c57diff --git a/grub-core/commands/legacycfg.c b/grub-core/commands/legacycfg.c
58index 5e3ec0d5e..cc5971f4d 10064458index 5e3ec0d5e4..cc5971f4db 100644
59--- a/grub-core/commands/legacycfg.c59--- a/grub-core/commands/legacycfg.c
60+++ b/grub-core/commands/legacycfg.c60+++ b/grub-core/commands/legacycfg.c
61@@ -32,6 +32,7 @@61@@ -32,6 +32,7 @@
@@ -118,7 +118,7 @@ index 5e3ec0d5e..cc5971f4d 100644
118 grub_free (suffix);118 grub_free (suffix);
119 return grub_errno;119 return grub_errno;
120diff --git a/grub-core/commands/wildcard.c b/grub-core/commands/wildcard.c120diff --git a/grub-core/commands/wildcard.c b/grub-core/commands/wildcard.c
121index 4a106ca04..cc3290311 100644121index 4a106ca040..cc3290311f 100644
122--- a/grub-core/commands/wildcard.c122--- a/grub-core/commands/wildcard.c
123+++ b/grub-core/commands/wildcard.c123+++ b/grub-core/commands/wildcard.c
124@@ -23,6 +23,7 @@124@@ -23,6 +23,7 @@
@@ -220,7 +220,7 @@ index 4a106ca04..cc3290311 100644
220 return 1;220 return 1;
221 }221 }
222diff --git a/grub-core/disk/ldm.c b/grub-core/disk/ldm.c222diff --git a/grub-core/disk/ldm.c b/grub-core/disk/ldm.c
223index e6323701a..58f8a53e1 100644223index e6323701ab..58f8a53e1a 100644
224--- a/grub-core/disk/ldm.c224--- a/grub-core/disk/ldm.c
225+++ b/grub-core/disk/ldm.c225+++ b/grub-core/disk/ldm.c
226@@ -25,6 +25,7 @@226@@ -25,6 +25,7 @@
@@ -291,7 +291,7 @@ index e6323701a..58f8a53e1 100644
291 goto fail2;291 goto fail2;
292 comp->segments = t;292 comp->segments = t;
293diff --git a/grub-core/font/font.c b/grub-core/font/font.c293diff --git a/grub-core/font/font.c b/grub-core/font/font.c
294index 8e118b315..5edb477ac 100644294index 8e118b315c..5edb477ac2 100644
295--- a/grub-core/font/font.c295--- a/grub-core/font/font.c
296+++ b/grub-core/font/font.c296+++ b/grub-core/font/font.c
297@@ -30,6 +30,7 @@297@@ -30,6 +30,7 @@
@@ -318,7 +318,7 @@ index 8e118b315..5edb477ac 100644
318 return 0;318 return 0;
319 319
320diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c320diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
321index 11272efc1..2b65bd56a 100644321index 11272efc1a..2b65bd56a0 100644
322--- a/grub-core/fs/btrfs.c322--- a/grub-core/fs/btrfs.c
323+++ b/grub-core/fs/btrfs.c323+++ b/grub-core/fs/btrfs.c
324@@ -40,6 +40,7 @@324@@ -40,6 +40,7 @@
@@ -375,7 +375,7 @@ index 11272efc1..2b65bd56a 100644
375 }375 }
376 }376 }
377diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c377diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c
378index 9b389802a..ac33bcd68 100644378index 9b389802a3..ac33bcd68c 100644
379--- a/grub-core/fs/ext2.c379--- a/grub-core/fs/ext2.c
380+++ b/grub-core/fs/ext2.c380+++ b/grub-core/fs/ext2.c
381@@ -46,6 +46,7 @@381@@ -46,6 +46,7 @@
@@ -410,7 +410,7 @@ index 9b389802a..ac33bcd68 100644
410 return 0;410 return 0;
411 411
412diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c412diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c
413index 4f1b52a55..7ba5b300b 100644413index 4f1b52a552..7ba5b300bc 100644
414--- a/grub-core/fs/iso9660.c414--- a/grub-core/fs/iso9660.c
415+++ b/grub-core/fs/iso9660.c415+++ b/grub-core/fs/iso9660.c
416@@ -28,6 +28,7 @@416@@ -28,6 +28,7 @@
@@ -514,7 +514,7 @@ index 4f1b52a55..7ba5b300b 100644
514 grub_free (ctx.filename);514 grub_free (ctx.filename);
515 grub_free (node);515 grub_free (node);
516diff --git a/grub-core/fs/sfs.c b/grub-core/fs/sfs.c516diff --git a/grub-core/fs/sfs.c b/grub-core/fs/sfs.c
517index 90f7fb379..de2b107a4 100644517index 90f7fb3791..de2b107a4a 100644
518--- a/grub-core/fs/sfs.c518--- a/grub-core/fs/sfs.c
519+++ b/grub-core/fs/sfs.c519+++ b/grub-core/fs/sfs.c
520@@ -26,6 +26,7 @@520@@ -26,6 +26,7 @@
@@ -578,7 +578,7 @@ index 90f7fb379..de2b107a4 100644
578 *grub_latin1_to_utf8 ((grub_uint8_t *) *label,578 *grub_latin1_to_utf8 ((grub_uint8_t *) *label,
579 (const grub_uint8_t *) data->label,579 (const grub_uint8_t *) data->label,
580diff --git a/grub-core/fs/squash4.c b/grub-core/fs/squash4.c580diff --git a/grub-core/fs/squash4.c b/grub-core/fs/squash4.c
581index 95d5c1e1f..785123894 100644581index 95d5c1e1ff..785123894e 100644
582--- a/grub-core/fs/squash4.c582--- a/grub-core/fs/squash4.c
583+++ b/grub-core/fs/squash4.c583+++ b/grub-core/fs/squash4.c
584@@ -26,6 +26,7 @@584@@ -26,6 +26,7 @@
@@ -677,7 +677,7 @@ index 95d5c1e1f..785123894 100644
677 node->ino = ino;677 node->ino = ino;
678 node->stack[node->stsize].ino_chunk = grub_le_to_cpu32 (dh.ino_chunk);678 node->stack[node->stsize].ino_chunk = grub_le_to_cpu32 (dh.ino_chunk);
679diff --git a/grub-core/fs/udf.c b/grub-core/fs/udf.c679diff --git a/grub-core/fs/udf.c b/grub-core/fs/udf.c
680index a83761674..21ac7f446 100644680index a83761674a..21ac7f4460 100644
681--- a/grub-core/fs/udf.c681--- a/grub-core/fs/udf.c
682+++ b/grub-core/fs/udf.c682+++ b/grub-core/fs/udf.c
683@@ -28,6 +28,7 @@683@@ -28,6 +28,7 @@
@@ -786,7 +786,7 @@ index a83761674..21ac7f446 100644
786 grub_free (out);786 grub_free (out);
787 grub_error (GRUB_ERR_BAD_FS, "invalid symlink");787 grub_error (GRUB_ERR_BAD_FS, "invalid symlink");
788diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c788diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c
789index 96ffecbfc..ea6590290 100644789index 96ffecbfc9..ea6590290b 100644
790--- a/grub-core/fs/xfs.c790--- a/grub-core/fs/xfs.c
791+++ b/grub-core/fs/xfs.c791+++ b/grub-core/fs/xfs.c
792@@ -25,6 +25,7 @@792@@ -25,6 +25,7 @@
@@ -822,7 +822,7 @@ index 96ffecbfc..ea6590290 100644
822 if (! data)822 if (! data)
823 goto fail;823 goto fail;
824diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c824diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c
825index 381dde556..36d0373a6 100644825index 381dde556d..36d0373a6a 100644
826--- a/grub-core/fs/zfs/zfs.c826--- a/grub-core/fs/zfs/zfs.c
827+++ b/grub-core/fs/zfs/zfs.c827+++ b/grub-core/fs/zfs/zfs.c
828@@ -55,6 +55,7 @@828@@ -55,6 +55,7 @@
@@ -875,7 +875,7 @@ index 381dde556..36d0373a6 100644
875 return 0;875 return 0;
876 grub_memcpy (ret, nvlist, sizeof (grub_uint32_t));876 grub_memcpy (ret, nvlist, sizeof (grub_uint32_t));
877diff --git a/grub-core/fs/zfs/zfscrypt.c b/grub-core/fs/zfs/zfscrypt.c877diff --git a/grub-core/fs/zfs/zfscrypt.c b/grub-core/fs/zfs/zfscrypt.c
878index 1402e0bc2..de3b015f5 100644878index 1402e0bc29..de3b015f58 100644
879--- a/grub-core/fs/zfs/zfscrypt.c879--- a/grub-core/fs/zfs/zfscrypt.c
880+++ b/grub-core/fs/zfs/zfscrypt.c880+++ b/grub-core/fs/zfs/zfscrypt.c
881@@ -22,6 +22,7 @@881@@ -22,6 +22,7 @@
@@ -902,7 +902,7 @@ index 1402e0bc2..de3b015f5 100644
902 return grub_errno;902 return grub_errno;
903 key->is_passphrase = passphrase;903 key->is_passphrase = passphrase;
904diff --git a/grub-core/lib/arg.c b/grub-core/lib/arg.c904diff --git a/grub-core/lib/arg.c b/grub-core/lib/arg.c
905index fd7744a6f..3288609a5 100644905index fd7744a6ff..3288609a5e 100644
906--- a/grub-core/lib/arg.c906--- a/grub-core/lib/arg.c
907+++ b/grub-core/lib/arg.c907+++ b/grub-core/lib/arg.c
908@@ -23,6 +23,7 @@908@@ -23,6 +23,7 @@
@@ -954,7 +954,7 @@ index fd7744a6f..3288609a5 100644
954 return 0;954 return 0;
955 955
956diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c956diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
957index 5b9b92d6b..ef0d63afc 100644957index 5b9b92d6ba..ef0d63afc8 100644
958--- a/grub-core/loader/i386/bsd.c958--- a/grub-core/loader/i386/bsd.c
959+++ b/grub-core/loader/i386/bsd.c959+++ b/grub-core/loader/i386/bsd.c
960@@ -35,6 +35,7 @@960@@ -35,6 +35,7 @@
@@ -984,7 +984,7 @@ index 5b9b92d6b..ef0d63afc 100644
984 return grub_errno;984 return grub_errno;
985 985
986diff --git a/grub-core/net/dns.c b/grub-core/net/dns.c986diff --git a/grub-core/net/dns.c b/grub-core/net/dns.c
987index e332d5eb4..906ec7d67 100644987index e332d5eb4a..906ec7d678 100644
988--- a/grub-core/net/dns.c988--- a/grub-core/net/dns.c
989+++ b/grub-core/net/dns.c989+++ b/grub-core/net/dns.c
990@@ -22,6 +22,7 @@990@@ -22,6 +22,7 @@
@@ -1013,7 +1013,7 @@ index e332d5eb4..906ec7d67 100644
1013 return grub_errno;1013 return grub_errno;
1014 dns_servers_alloc = na;1014 dns_servers_alloc = na;
1015diff --git a/grub-core/normal/charset.c b/grub-core/normal/charset.c1015diff --git a/grub-core/normal/charset.c b/grub-core/normal/charset.c
1016index d57fb72fa..4dfcc3107 1006441016index d57fb72faa..4dfcc31078 100644
1017--- a/grub-core/normal/charset.c1017--- a/grub-core/normal/charset.c
1018+++ b/grub-core/normal/charset.c1018+++ b/grub-core/normal/charset.c
1019@@ -48,6 +48,7 @@1019@@ -48,6 +48,7 @@
@@ -1050,7 +1050,7 @@ index d57fb72fa..4dfcc3107 100644
1050 continue;1050 continue;
1051 }1051 }
1052diff --git a/grub-core/normal/cmdline.c b/grub-core/normal/cmdline.c1052diff --git a/grub-core/normal/cmdline.c b/grub-core/normal/cmdline.c
1053index c57242e2e..de03fe63b 1006441053index c57242e2ea..de03fe63b3 100644
1054--- a/grub-core/normal/cmdline.c1054--- a/grub-core/normal/cmdline.c
1055+++ b/grub-core/normal/cmdline.c1055+++ b/grub-core/normal/cmdline.c
1056@@ -28,6 +28,7 @@1056@@ -28,6 +28,7 @@
@@ -1086,7 +1086,7 @@ index c57242e2e..de03fe63b 100644
1086 grub_errno = GRUB_ERR_NONE;1086 grub_errno = GRUB_ERR_NONE;
1087 (*max_len) /= 2;1087 (*max_len) /= 2;
1088diff --git a/grub-core/normal/menu_entry.c b/grub-core/normal/menu_entry.c1088diff --git a/grub-core/normal/menu_entry.c b/grub-core/normal/menu_entry.c
1089index 1993995be..50eef918c 1006441089index 1993995be6..50eef918cf 100644
1090--- a/grub-core/normal/menu_entry.c1090--- a/grub-core/normal/menu_entry.c
1091+++ b/grub-core/normal/menu_entry.c1091+++ b/grub-core/normal/menu_entry.c
1092@@ -27,6 +27,7 @@1092@@ -27,6 +27,7 @@
@@ -1119,7 +1119,7 @@ index 1993995be..50eef918c 100644
1119 1119
1120 return 1;1120 return 1;
1121diff --git a/grub-core/script/argv.c b/grub-core/script/argv.c1121diff --git a/grub-core/script/argv.c b/grub-core/script/argv.c
1122index 217ec5d1e..5751fdd57 1006441122index 217ec5d1e1..5751fdd570 100644
1123--- a/grub-core/script/argv.c1123--- a/grub-core/script/argv.c
1124+++ b/grub-core/script/argv.c1124+++ b/grub-core/script/argv.c
1125@@ -20,6 +20,7 @@1125@@ -20,6 +20,7 @@
@@ -1170,7 +1170,7 @@ index 217ec5d1e..5751fdd57 100644
1170 return 1;1170 return 1;
1171 1171
1172diff --git a/grub-core/script/lexer.c b/grub-core/script/lexer.c1172diff --git a/grub-core/script/lexer.c b/grub-core/script/lexer.c
1173index c6bd3172f..5fb0cbd0b 1006441173index c6bd3172fa..5fb0cbd0bc 100644
1174--- a/grub-core/script/lexer.c1174--- a/grub-core/script/lexer.c
1175+++ b/grub-core/script/lexer.c1175+++ b/grub-core/script/lexer.c
1176@@ -24,6 +24,7 @@1176@@ -24,6 +24,7 @@
@@ -1231,7 +1231,7 @@ index c6bd3172f..5fb0cbd0b 100644
1231 }1231 }
1232 1232
1233diff --git a/grub-core/video/bitmap.c b/grub-core/video/bitmap.c1233diff --git a/grub-core/video/bitmap.c b/grub-core/video/bitmap.c
1234index b2e031566..6256e209a 1006441234index b2e0315665..6256e209a6 100644
1235--- a/grub-core/video/bitmap.c1235--- a/grub-core/video/bitmap.c
1236+++ b/grub-core/video/bitmap.c1236+++ b/grub-core/video/bitmap.c
1237@@ -23,6 +23,7 @@1237@@ -23,6 +23,7 @@
@@ -1286,7 +1286,7 @@ index b2e031566..6256e209a 100644
1286 1286
1287 /* Frees all resources allocated by bitmap. */1287 /* Frees all resources allocated by bitmap. */
1288diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c1288diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c
1289index 61bd64537..0157ff742 1006441289index 61bd645379..0157ff7420 100644
1290--- a/grub-core/video/readers/png.c1290--- a/grub-core/video/readers/png.c
1291+++ b/grub-core/video/readers/png.c1291+++ b/grub-core/video/readers/png.c
1292@@ -23,6 +23,7 @@1292@@ -23,6 +23,7 @@
diff --git a/debian/patches/0087-iso9660-Don-t-leak-memory-on-realloc-failures.patch b/debian/patches/0086-iso9660-Don-t-leak-memory-on-realloc-failures.patch
1293similarity index 96%1293similarity index 96%
1294rename from debian/patches/0087-iso9660-Don-t-leak-memory-on-realloc-failures.patch1294rename from debian/patches/0087-iso9660-Don-t-leak-memory-on-realloc-failures.patch
1295rename to debian/patches/0086-iso9660-Don-t-leak-memory-on-realloc-failures.patch1295rename to debian/patches/0086-iso9660-Don-t-leak-memory-on-realloc-failures.patch
index aa86b39..438d655 100644
--- a/debian/patches/0087-iso9660-Don-t-leak-memory-on-realloc-failures.patch
+++ b/debian/patches/0086-iso9660-Don-t-leak-memory-on-realloc-failures.patch
@@ -1,4 +1,4 @@
1From ae8703a3dd74ec31c8f37135fc32315f926812b2 Mon Sep 17 00:00:00 20011From 3daaf33550e0fc35de5a51de337e7d5e4bd1bbfd Mon Sep 17 00:00:00 2001
2From: Peter Jones <pjones@redhat.com>2From: Peter Jones <pjones@redhat.com>
3Date: Sat, 4 Jul 2020 12:25:09 -04003Date: Sat, 4 Jul 2020 12:25:09 -0400
4Subject: iso9660: Don't leak memory on realloc() failures4Subject: iso9660: Don't leak memory on realloc() failures
@@ -10,7 +10,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
10 1 file changed, 20 insertions(+), 4 deletions(-)10 1 file changed, 20 insertions(+), 4 deletions(-)
1111
12diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c12diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c
13index 7ba5b300b..5ec4433b8 10064413index 7ba5b300bc..5ec4433b8f 100644
14--- a/grub-core/fs/iso9660.c14--- a/grub-core/fs/iso9660.c
15+++ b/grub-core/fs/iso9660.c15+++ b/grub-core/fs/iso9660.c
16@@ -533,14 +533,20 @@ add_part (struct iterate_dir_ctx *ctx,16@@ -533,14 +533,20 @@ add_part (struct iterate_dir_ctx *ctx,
diff --git a/debian/patches/0088-font-Do-not-load-more-than-one-NAME-section.patch b/debian/patches/0087-font-Do-not-load-more-than-one-NAME-section.patch
17similarity index 93%17similarity index 93%
18rename from debian/patches/0088-font-Do-not-load-more-than-one-NAME-section.patch18rename from debian/patches/0088-font-Do-not-load-more-than-one-NAME-section.patch
19rename to debian/patches/0087-font-Do-not-load-more-than-one-NAME-section.patch19rename to debian/patches/0087-font-Do-not-load-more-than-one-NAME-section.patch
index bcabddc..2935ce4 100644
--- a/debian/patches/0088-font-Do-not-load-more-than-one-NAME-section.patch
+++ b/debian/patches/0087-font-Do-not-load-more-than-one-NAME-section.patch
@@ -1,4 +1,4 @@
1From aa83281cfdc2b7a508b8fa21018a3b31e6f0440d Mon Sep 17 00:00:00 20011From b762411ec388017c77379629298e90f93dec75d7 Mon Sep 17 00:00:00 2001
2From: Daniel Kiper <daniel.kiper@oracle.com>2From: Daniel Kiper <daniel.kiper@oracle.com>
3Date: Tue, 7 Jul 2020 15:36:26 +02003Date: Tue, 7 Jul 2020 15:36:26 +0200
4Subject: font: Do not load more than one NAME section4Subject: font: Do not load more than one NAME section
@@ -16,7 +16,7 @@ Reviewed-by: Jan Setje-Eilers <jan.setjeeilers@oracle.com>
16 1 file changed, 6 insertions(+)16 1 file changed, 6 insertions(+)
1717
18diff --git a/grub-core/font/font.c b/grub-core/font/font.c18diff --git a/grub-core/font/font.c b/grub-core/font/font.c
19index 5edb477ac..d09bb38d8 10064419index 5edb477ac2..d09bb38d89 100644
20--- a/grub-core/font/font.c20--- a/grub-core/font/font.c
21+++ b/grub-core/font/font.c21+++ b/grub-core/font/font.c
22@@ -532,6 +532,12 @@ grub_font_load (const char *filename)22@@ -532,6 +532,12 @@ grub_font_load (const char *filename)
diff --git a/debian/patches/0089-gfxmenu-Fix-double-free-in-load_image.patch b/debian/patches/0088-gfxmenu-Fix-double-free-in-load_image.patch
23similarity index 92%23similarity index 92%
24rename from debian/patches/0089-gfxmenu-Fix-double-free-in-load_image.patch24rename from debian/patches/0089-gfxmenu-Fix-double-free-in-load_image.patch
25rename to debian/patches/0088-gfxmenu-Fix-double-free-in-load_image.patch25rename to debian/patches/0088-gfxmenu-Fix-double-free-in-load_image.patch
index 3808787..dbf1ae4 100644
--- a/debian/patches/0089-gfxmenu-Fix-double-free-in-load_image.patch
+++ b/debian/patches/0088-gfxmenu-Fix-double-free-in-load_image.patch
@@ -1,4 +1,4 @@
1From 72c7f2afab0e9ea5d17b35ea4ff74221e1bcfbfc Mon Sep 17 00:00:00 20011From 58e72a15fa61adffe8015da0eb093d2e93380ee0 Mon Sep 17 00:00:00 2001
2From: Alexey Makhalov <amakhalov@vmware.com>2From: Alexey Makhalov <amakhalov@vmware.com>
3Date: Wed, 8 Jul 2020 20:41:56 +00003Date: Wed, 8 Jul 2020 20:41:56 +0000
4Subject: gfxmenu: Fix double free in load_image()4Subject: gfxmenu: Fix double free in load_image()
@@ -15,7 +15,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
15 1 file changed, 4 insertions(+), 1 deletion(-)15 1 file changed, 4 insertions(+), 1 deletion(-)
1616
17diff --git a/grub-core/gfxmenu/gui_image.c b/grub-core/gfxmenu/gui_image.c17diff --git a/grub-core/gfxmenu/gui_image.c b/grub-core/gfxmenu/gui_image.c
18index 29784ed2d..6b2e976f1 10064418index 29784ed2d9..6b2e976f16 100644
19--- a/grub-core/gfxmenu/gui_image.c19--- a/grub-core/gfxmenu/gui_image.c
20+++ b/grub-core/gfxmenu/gui_image.c20+++ b/grub-core/gfxmenu/gui_image.c
21@@ -195,7 +195,10 @@ load_image (grub_gui_image_t self, const char *path)21@@ -195,7 +195,10 @@ load_image (grub_gui_image_t self, const char *path)
diff --git a/debian/patches/0090-lzma-Make-sure-we-don-t-dereference-past-array.patch b/debian/patches/0089-lzma-Make-sure-we-don-t-dereference-past-array.patch
22similarity index 95%22similarity index 95%
23rename from debian/patches/0090-lzma-Make-sure-we-don-t-dereference-past-array.patch23rename from debian/patches/0090-lzma-Make-sure-we-don-t-dereference-past-array.patch
24rename to debian/patches/0089-lzma-Make-sure-we-don-t-dereference-past-array.patch24rename to debian/patches/0089-lzma-Make-sure-we-don-t-dereference-past-array.patch
index a6e52ab..eb283a5 100644
--- a/debian/patches/0090-lzma-Make-sure-we-don-t-dereference-past-array.patch
+++ b/debian/patches/0089-lzma-Make-sure-we-don-t-dereference-past-array.patch
@@ -1,4 +1,4 @@
1From c8aef3a92c63add6c4c4b65bbf17c2121d97a688 Mon Sep 17 00:00:00 20011From d6f176758a8d2ab9cd81646e7e2e825682a0fdfe Mon Sep 17 00:00:00 2001
2From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>2From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
3Date: Thu, 9 Jul 2020 03:05:23 +00003Date: Thu, 9 Jul 2020 03:05:23 +0000
4Subject: lzma: Make sure we don't dereference past array4Subject: lzma: Make sure we don't dereference past array
@@ -21,7 +21,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
21 1 file changed, 8 insertions(+), 2 deletions(-)21 1 file changed, 8 insertions(+), 2 deletions(-)
2222
23diff --git a/grub-core/lib/LzmaEnc.c b/grub-core/lib/LzmaEnc.c23diff --git a/grub-core/lib/LzmaEnc.c b/grub-core/lib/LzmaEnc.c
24index f2ec04a8c..753e56a95 10064424index f2ec04a8c2..753e56a95e 100644
25--- a/grub-core/lib/LzmaEnc.c25--- a/grub-core/lib/LzmaEnc.c
26+++ b/grub-core/lib/LzmaEnc.c26+++ b/grub-core/lib/LzmaEnc.c
27@@ -1877,13 +1877,19 @@ static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize27@@ -1877,13 +1877,19 @@ static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize
diff --git a/debian/patches/0091-tftp-Do-not-use-priority-queue.patch b/debian/patches/0090-tftp-Do-not-use-priority-queue.patch
28similarity index 98%28similarity index 98%
29rename from debian/patches/0091-tftp-Do-not-use-priority-queue.patch29rename from debian/patches/0091-tftp-Do-not-use-priority-queue.patch
30rename to debian/patches/0090-tftp-Do-not-use-priority-queue.patch30rename to debian/patches/0090-tftp-Do-not-use-priority-queue.patch
index f679810..df1a56c 100644
--- a/debian/patches/0091-tftp-Do-not-use-priority-queue.patch
+++ b/debian/patches/0090-tftp-Do-not-use-priority-queue.patch
@@ -1,4 +1,4 @@
1From 80e584d2d9a255c7626bac198fb7e335a63a1f51 Mon Sep 17 00:00:00 20011From c68bccd83bec72174cfbfb258e7329adb309879d Mon Sep 17 00:00:00 2001
2From: Alexey Makhalov <amakhalov@vmware.com>2From: Alexey Makhalov <amakhalov@vmware.com>
3Date: Thu, 9 Jul 2020 08:10:40 +00003Date: Thu, 9 Jul 2020 08:10:40 +0000
4Subject: tftp: Do not use priority queue4Subject: tftp: Do not use priority queue
@@ -34,7 +34,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
34 1 file changed, 53 insertions(+), 118 deletions(-)34 1 file changed, 53 insertions(+), 118 deletions(-)
3535
36diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c36diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
37index a0817a075..e6566fa17 10064437index a0817a075d..e6566fa176 100644
38--- a/grub-core/net/tftp.c38--- a/grub-core/net/tftp.c
39+++ b/grub-core/net/tftp.c39+++ b/grub-core/net/tftp.c
40@@ -25,7 +25,6 @@40@@ -25,7 +25,6 @@
diff --git a/debian/patches/0092-script-Remove-unused-fields-from-grub_script_functio.patch b/debian/patches/0091-script-Remove-unused-fields-from-grub_script_functio.patch
41similarity index 92%41similarity index 92%
42rename from debian/patches/0092-script-Remove-unused-fields-from-grub_script_functio.patch42rename from debian/patches/0092-script-Remove-unused-fields-from-grub_script_functio.patch
43rename to debian/patches/0091-script-Remove-unused-fields-from-grub_script_functio.patch43rename to debian/patches/0091-script-Remove-unused-fields-from-grub_script_functio.patch
index 290af26..4865443 100644
--- a/debian/patches/0092-script-Remove-unused-fields-from-grub_script_functio.patch
+++ b/debian/patches/0091-script-Remove-unused-fields-from-grub_script_functio.patch
@@ -1,4 +1,4 @@
1From d4235881fe9807432c0054149ca07caace83e7cb Mon Sep 17 00:00:00 20011From fd60c9a66288bf80f4da18e9832436bf2e6c1e65 Mon Sep 17 00:00:00 2001
2From: Chris Coulson <chris.coulson@canonical.com>2From: Chris Coulson <chris.coulson@canonical.com>
3Date: Fri, 10 Jul 2020 11:21:14 +01003Date: Fri, 10 Jul 2020 11:21:14 +0100
4Subject: script: Remove unused fields from grub_script_function struct4Subject: script: Remove unused fields from grub_script_function struct
@@ -10,7 +10,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
10 1 file changed, 5 deletions(-)10 1 file changed, 5 deletions(-)
1111
12diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h12diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
13index 360c2be1f..b382bcf09 10064413index 360c2be1f0..b382bcf09b 100644
14--- a/include/grub/script_sh.h14--- a/include/grub/script_sh.h
15+++ b/include/grub/script_sh.h15+++ b/include/grub/script_sh.h
16@@ -359,13 +359,8 @@ struct grub_script_function16@@ -359,13 +359,8 @@ struct grub_script_function
diff --git a/debian/patches/0093-script-Avoid-a-use-after-free-when-redefining-a-func.patch b/debian/patches/0092-script-Avoid-a-use-after-free-when-redefining-a-func.patch
17similarity index 94%17similarity index 94%
18rename from debian/patches/0093-script-Avoid-a-use-after-free-when-redefining-a-func.patch18rename from debian/patches/0093-script-Avoid-a-use-after-free-when-redefining-a-func.patch
19rename to debian/patches/0092-script-Avoid-a-use-after-free-when-redefining-a-func.patch19rename to debian/patches/0092-script-Avoid-a-use-after-free-when-redefining-a-func.patch
index ed02e21..08e4973 100644
--- a/debian/patches/0093-script-Avoid-a-use-after-free-when-redefining-a-func.patch
+++ b/debian/patches/0092-script-Avoid-a-use-after-free-when-redefining-a-func.patch
@@ -1,4 +1,4 @@
1From f7aff9effc6d11719db1cfeef7d3419d635c92f5 Mon Sep 17 00:00:00 20011From ce9f66f0a86e6cbfd866e431df87f205537380f5 Mon Sep 17 00:00:00 2001
2From: Chris Coulson <chris.coulson@canonical.com>2From: Chris Coulson <chris.coulson@canonical.com>
3Date: Fri, 10 Jul 2020 14:41:45 +01003Date: Fri, 10 Jul 2020 14:41:45 +0100
4Subject: script: Avoid a use-after-free when redefining a function during4Subject: script: Avoid a use-after-free when redefining a function during
@@ -27,7 +27,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
27 4 files changed, 19 insertions(+), 4 deletions(-)27 4 files changed, 19 insertions(+), 4 deletions(-)
2828
29diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c29diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
30index c8d6806fe..7e028e135 10064430index c8d6806fe0..7e028e1355 100644
31--- a/grub-core/script/execute.c31--- a/grub-core/script/execute.c
32+++ b/grub-core/script/execute.c32+++ b/grub-core/script/execute.c
33@@ -838,7 +838,9 @@ grub_script_function_call (grub_script_function_t func, int argc, char **args)33@@ -838,7 +838,9 @@ grub_script_function_call (grub_script_function_t func, int argc, char **args)
@@ -41,7 +41,7 @@ index c8d6806fe..7e028e135 100644
41 function_return = 0;41 function_return = 0;
42 active_loops = loops;42 active_loops = loops;
43diff --git a/grub-core/script/function.c b/grub-core/script/function.c43diff --git a/grub-core/script/function.c b/grub-core/script/function.c
44index d36655e51..3aad04bf9 10064444index d36655e510..3aad04bf9d 100644
45--- a/grub-core/script/function.c45--- a/grub-core/script/function.c
46+++ b/grub-core/script/function.c46+++ b/grub-core/script/function.c
47@@ -34,6 +34,7 @@ grub_script_function_create (struct grub_script_arg *functionname_arg,47@@ -34,6 +34,7 @@ grub_script_function_create (struct grub_script_arg *functionname_arg,
@@ -76,7 +76,7 @@ index d36655e51..3aad04bf9 100644
76 else76 else
77 {77 {
78diff --git a/grub-core/script/parser.y b/grub-core/script/parser.y78diff --git a/grub-core/script/parser.y b/grub-core/script/parser.y
79index 4f0ab8319..f80b86b6f 10064479index 4f0ab8319e..f80b86b6f1 100644
80--- a/grub-core/script/parser.y80--- a/grub-core/script/parser.y
81+++ b/grub-core/script/parser.y81+++ b/grub-core/script/parser.y
82@@ -289,7 +289,8 @@ function: "function" "name"82@@ -289,7 +289,8 @@ function: "function" "name"
@@ -90,7 +90,7 @@ index 4f0ab8319..f80b86b6f 100644
90 90
91 state->scripts = $<scripts>3;91 state->scripts = $<scripts>3;
92diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h92diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
93index b382bcf09..6c48e0751 10064493index b382bcf09b..6c48e07512 100644
94--- a/include/grub/script_sh.h94--- a/include/grub/script_sh.h
95+++ b/include/grub/script_sh.h95+++ b/include/grub/script_sh.h
96@@ -361,6 +361,8 @@ struct grub_script_function96@@ -361,6 +361,8 @@ struct grub_script_function
diff --git a/debian/patches/0094-hfsplus-fix-two-more-overflows.patch b/debian/patches/0093-hfsplus-fix-two-more-overflows.patch
97similarity index 95%97similarity index 95%
98rename from debian/patches/0094-hfsplus-fix-two-more-overflows.patch98rename from debian/patches/0094-hfsplus-fix-two-more-overflows.patch
99rename to debian/patches/0093-hfsplus-fix-two-more-overflows.patch99rename to debian/patches/0093-hfsplus-fix-two-more-overflows.patch
index 077e785..cb67208 100644
--- a/debian/patches/0094-hfsplus-fix-two-more-overflows.patch
+++ b/debian/patches/0093-hfsplus-fix-two-more-overflows.patch
@@ -1,4 +1,4 @@
1From f77bef9531eaf93f1f967fda2c7e9c0a16435fa8 Mon Sep 17 00:00:00 20011From 4be2c61fdd94238b4e529f018eddea12f6ba5361 Mon Sep 17 00:00:00 2001
2From: Peter Jones <pjones@redhat.com>2From: Peter Jones <pjones@redhat.com>
3Date: Sun, 19 Jul 2020 14:43:31 -04003Date: Sun, 19 Jul 2020 14:43:31 -0400
4Subject: hfsplus: fix two more overflows4Subject: hfsplus: fix two more overflows
@@ -15,7 +15,7 @@ Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
15 1 file changed, 8 insertions(+), 3 deletions(-)15 1 file changed, 8 insertions(+), 3 deletions(-)
1616
17diff --git a/grub-core/fs/hfsplus.c b/grub-core/fs/hfsplus.c17diff --git a/grub-core/fs/hfsplus.c b/grub-core/fs/hfsplus.c
18index dae43becc..9c4e4c88c 10064418index dae43becc9..9c4e4c88c9 100644
19--- a/grub-core/fs/hfsplus.c19--- a/grub-core/fs/hfsplus.c
20+++ b/grub-core/fs/hfsplus.c20+++ b/grub-core/fs/hfsplus.c
21@@ -31,6 +31,7 @@21@@ -31,6 +31,7 @@
diff --git a/debian/patches/0095-lvm-fix-two-more-potential-data-dependent-alloc-over.patch b/debian/patches/0094-lvm-fix-two-more-potential-data-dependent-alloc-over.patch
22similarity index 97%22similarity index 97%
23rename from debian/patches/0095-lvm-fix-two-more-potential-data-dependent-alloc-over.patch23rename from debian/patches/0095-lvm-fix-two-more-potential-data-dependent-alloc-over.patch
24rename to debian/patches/0094-lvm-fix-two-more-potential-data-dependent-alloc-over.patch24rename to debian/patches/0094-lvm-fix-two-more-potential-data-dependent-alloc-over.patch
index 5676080..36e67c6 100644
--- a/debian/patches/0095-lvm-fix-two-more-potential-data-dependent-alloc-over.patch
+++ b/debian/patches/0094-lvm-fix-two-more-potential-data-dependent-alloc-over.patch
@@ -1,4 +1,4 @@
1From 9fc5ac5172d7ceae3625258059d9e4b7c8baef76 Mon Sep 17 00:00:00 20011From 9082c7d5ed8d9ffb15a12d6bcb10a86ca9c8a860 Mon Sep 17 00:00:00 2001
2From: Peter Jones <pjones@redhat.com>2From: Peter Jones <pjones@redhat.com>
3Date: Sun, 19 Jul 2020 15:48:20 -04003Date: Sun, 19 Jul 2020 15:48:20 -0400
4Subject: lvm: fix two more potential data-dependent alloc overflows4Subject: lvm: fix two more potential data-dependent alloc overflows
@@ -15,7 +15,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
15 1 file changed, 31 insertions(+), 8 deletions(-)15 1 file changed, 31 insertions(+), 8 deletions(-)
1616
17diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c17diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c
18index d1df640b3..d154f7c01 10064418index d1df640b31..d154f7c01b 100644
19--- a/grub-core/disk/lvm.c19--- a/grub-core/disk/lvm.c
20+++ b/grub-core/disk/lvm.c20+++ b/grub-core/disk/lvm.c
21@@ -25,6 +25,7 @@21@@ -25,6 +25,7 @@
diff --git a/debian/patches/0096-efi-fix-some-malformed-device-path-arithmetic-errors.patch b/debian/patches/0095-efi-fix-some-malformed-device-path-arithmetic-errors.patch
22similarity index 97%22similarity index 97%
23rename from debian/patches/0096-efi-fix-some-malformed-device-path-arithmetic-errors.patch23rename from debian/patches/0096-efi-fix-some-malformed-device-path-arithmetic-errors.patch
24rename to debian/patches/0095-efi-fix-some-malformed-device-path-arithmetic-errors.patch24rename to debian/patches/0095-efi-fix-some-malformed-device-path-arithmetic-errors.patch
index bbcc5ba..7509a9d 100644
--- a/debian/patches/0096-efi-fix-some-malformed-device-path-arithmetic-errors.patch
+++ b/debian/patches/0095-efi-fix-some-malformed-device-path-arithmetic-errors.patch
@@ -1,4 +1,4 @@
1From 3be69af50aa08c128d570ddf4acd8767115bbb7e Mon Sep 17 00:00:00 20011From c9148b4f42091e840b2659504401dab230f7d817 Mon Sep 17 00:00:00 2001
2From: Peter Jones <pjones@redhat.com>2From: Peter Jones <pjones@redhat.com>
3Date: Sun, 19 Jul 2020 16:53:27 -04003Date: Sun, 19 Jul 2020 16:53:27 -0400
4Subject: efi: fix some malformed device path arithmetic errors.4Subject: efi: fix some malformed device path arithmetic errors.
@@ -24,7 +24,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
24 4 files changed, 88 insertions(+), 21 deletions(-)24 4 files changed, 88 insertions(+), 21 deletions(-)
2525
26diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c26diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
27index dc31caa21..b1a8b39b4 10064427index dc31caa213..b1a8b39b49 100644
28--- a/grub-core/kern/efi/efi.c28--- a/grub-core/kern/efi/efi.c
29+++ b/grub-core/kern/efi/efi.c29+++ b/grub-core/kern/efi/efi.c
30@@ -332,7 +332,7 @@ grub_efi_get_filename (grub_efi_device_path_t *dp0)30@@ -332,7 +332,7 @@ grub_efi_get_filename (grub_efi_device_path_t *dp0)
@@ -150,7 +150,7 @@ index dc31caa21..b1a8b39b4 100644
150 return 0;150 return 0;
151 }151 }
152diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c152diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
153index b9a2df34b..f8a34cd49 100644153index b9a2df34b1..f8a34cd491 100644
154--- a/grub-core/loader/efi/chainloader.c154--- a/grub-core/loader/efi/chainloader.c
155+++ b/grub-core/loader/efi/chainloader.c155+++ b/grub-core/loader/efi/chainloader.c
156@@ -126,6 +126,12 @@ copy_file_path (grub_efi_file_path_device_path_t *fp,156@@ -126,6 +126,12 @@ copy_file_path (grub_efi_file_path_device_path_t *fp,
@@ -188,7 +188,7 @@ index b9a2df34b..f8a34cd49 100644
188 break;188 break;
189 d = GRUB_EFI_NEXT_DEVICE_PATH (d);189 d = GRUB_EFI_NEXT_DEVICE_PATH (d);
190diff --git a/grub-core/loader/i386/xnu.c b/grub-core/loader/i386/xnu.c190diff --git a/grub-core/loader/i386/xnu.c b/grub-core/loader/i386/xnu.c
191index b7d176b5d..c50cb5410 100644191index b7d176b5d3..c50cb54109 100644
192--- a/grub-core/loader/i386/xnu.c192--- a/grub-core/loader/i386/xnu.c
193+++ b/grub-core/loader/i386/xnu.c193+++ b/grub-core/loader/i386/xnu.c
194@@ -516,14 +516,15 @@ grub_cmd_devprop_load (grub_command_t cmd __attribute__ ((unused)),194@@ -516,14 +516,15 @@ grub_cmd_devprop_load (grub_command_t cmd __attribute__ ((unused)),
@@ -212,7 +212,7 @@ index b7d176b5d..c50cb5410 100644
212 dev = grub_xnu_devprop_add_device (dpstart, (char *) buf212 dev = grub_xnu_devprop_add_device (dpstart, (char *) buf
213 - (char *) dpstart);213 - (char *) dpstart);
214diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h214diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
215index 9824fbcd0..08bff60b5 100644215index 9824fbcd0d..08bff60b51 100644
216--- a/include/grub/efi/api.h216--- a/include/grub/efi/api.h
217+++ b/include/grub/efi/api.h217+++ b/include/grub/efi/api.h
218@@ -640,6 +640,7 @@ typedef struct grub_efi_device_path grub_efi_device_path_protocol_t;218@@ -640,6 +640,7 @@ typedef struct grub_efi_device_path grub_efi_device_path_protocol_t;
diff --git a/debian/patches/0097-linuxefi-fail-kernel-validation-without-shim-protoco.patch b/debian/patches/0096-linuxefi-fail-kernel-validation-without-shim-protoco.patch
219similarity index 93%219similarity index 93%
220rename from debian/patches/0097-linuxefi-fail-kernel-validation-without-shim-protoco.patch220rename from debian/patches/0097-linuxefi-fail-kernel-validation-without-shim-protoco.patch
221rename to debian/patches/0096-linuxefi-fail-kernel-validation-without-shim-protoco.patch221rename to debian/patches/0096-linuxefi-fail-kernel-validation-without-shim-protoco.patch
index 6c7f6a8..0e0f9e5 100644
--- a/debian/patches/0097-linuxefi-fail-kernel-validation-without-shim-protoco.patch
+++ b/debian/patches/0096-linuxefi-fail-kernel-validation-without-shim-protoco.patch
@@ -1,4 +1,4 @@
1From 67508ab68e6a5be869e049a0e6474f4b717d3ab9 Mon Sep 17 00:00:00 20011From a37688a7dd2a14b66aa88005a9473f017aa84d17 Mon Sep 17 00:00:00 2001
2From: Dimitri John Ledkov <xnox@ubuntu.com>2From: Dimitri John Ledkov <xnox@ubuntu.com>
3Date: Wed, 22 Jul 2020 11:31:43 +01003Date: Wed, 22 Jul 2020 11:31:43 +0100
4Subject: linuxefi: fail kernel validation without shim protocol.4Subject: linuxefi: fail kernel validation without shim protocol.
@@ -20,7 +20,7 @@ Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>
20 4 files changed, 12 insertions(+), 5 deletions(-)20 4 files changed, 12 insertions(+), 5 deletions(-)
2121
22diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c22diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
23index 1a5296a60..3f5496fc5 10064423index 1a5296a60c..3f5496fc55 100644
24--- a/grub-core/loader/arm64/linux.c24--- a/grub-core/loader/arm64/linux.c
25+++ b/grub-core/loader/arm64/linux.c25+++ b/grub-core/loader/arm64/linux.c
26@@ -34,6 +34,7 @@26@@ -34,6 +34,7 @@
@@ -52,7 +52,7 @@ index 1a5296a60..3f5496fc5 100644
52 52
53 cmdline_size = grub_loader_cmdline_size (argc, argv) + sizeof (LINUX_IMAGE);53 cmdline_size = grub_loader_cmdline_size (argc, argv) + sizeof (LINUX_IMAGE);
54diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c54diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
55index f8a34cd49..cf89cedf8 10064455index f8a34cd491..cf89cedf8d 100644
56--- a/grub-core/loader/efi/chainloader.c56--- a/grub-core/loader/efi/chainloader.c
57+++ b/grub-core/loader/efi/chainloader.c57+++ b/grub-core/loader/efi/chainloader.c
58@@ -1096,6 +1096,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),58@@ -1096,6 +1096,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
@@ -64,7 +64,7 @@ index f8a34cd49..cf89cedf8 100644
64 grub_file_close (file);64 grub_file_close (file);
65 grub_device_close (dev);65 grub_device_close (dev);
66diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c66diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
67index e372b26a1..f6d30bcf7 10064467index e372b26a1b..f6d30bcf7c 100644
68--- a/grub-core/loader/efi/linux.c68--- a/grub-core/loader/efi/linux.c
69+++ b/grub-core/loader/efi/linux.c69+++ b/grub-core/loader/efi/linux.c
70@@ -34,6 +34,7 @@ struct grub_efi_shim_lock70@@ -34,6 +34,7 @@ struct grub_efi_shim_lock
@@ -76,7 +76,7 @@ index e372b26a1..f6d30bcf7 100644
76 grub_linuxefi_secure_validate (void *data, grub_uint32_t size)76 grub_linuxefi_secure_validate (void *data, grub_uint32_t size)
77 {77 {
78diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c78diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
79index 2929da7a2..e357bf67c 10064479index 2929da7a29..e357bf67c6 100644
80--- a/grub-core/loader/i386/efi/linux.c80--- a/grub-core/loader/i386/efi/linux.c
81+++ b/grub-core/loader/i386/efi/linux.c81+++ b/grub-core/loader/i386/efi/linux.c
82@@ -199,7 +199,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),82@@ -199,7 +199,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
diff --git a/debian/patches/0098-Fix-a-regression-caused-by-efi-fix-some-malformed-de.patch b/debian/patches/0097-Fix-a-regression-caused-by-efi-fix-some-malformed-de.patch
83similarity index 97%83similarity index 97%
84rename from debian/patches/0098-Fix-a-regression-caused-by-efi-fix-some-malformed-de.patch84rename from debian/patches/0098-Fix-a-regression-caused-by-efi-fix-some-malformed-de.patch
85rename to debian/patches/0097-Fix-a-regression-caused-by-efi-fix-some-malformed-de.patch85rename to debian/patches/0097-Fix-a-regression-caused-by-efi-fix-some-malformed-de.patch
index d5617f8..fd7f502 100644
--- a/debian/patches/0098-Fix-a-regression-caused-by-efi-fix-some-malformed-de.patch
+++ b/debian/patches/0097-Fix-a-regression-caused-by-efi-fix-some-malformed-de.patch
@@ -1,4 +1,4 @@
1From 1ade4ce46b324418d9b3bcd447470b9a0fea6084 Mon Sep 17 00:00:00 20011From 77a41770dfb138bc68c43f86a6e9d05188a0da4f Mon Sep 17 00:00:00 2001
2From: Chris Coulson <chris.coulson@canonical.com>2From: Chris Coulson <chris.coulson@canonical.com>
3Date: Wed, 22 Jul 2020 17:06:04 +01003Date: Wed, 22 Jul 2020 17:06:04 +0100
4Subject: Fix a regression caused by "efi: fix some malformed device path4Subject: Fix a regression caused by "efi: fix some malformed device path
@@ -21,7 +21,7 @@ Remove the bogus check, and also propagate errors from copy_file_path.
21 1 file changed, 13 insertions(+), 12 deletions(-)21 1 file changed, 13 insertions(+), 12 deletions(-)
2222
23diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c23diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
24index cf89cedf8..d0c53077e 10064424index cf89cedf8d..d0c53077e8 100644
25--- a/grub-core/loader/efi/chainloader.c25--- a/grub-core/loader/efi/chainloader.c
26+++ b/grub-core/loader/efi/chainloader.c26+++ b/grub-core/loader/efi/chainloader.c
27@@ -116,7 +116,7 @@ grub_chainloader_boot (void)27@@ -116,7 +116,7 @@ grub_chainloader_boot (void)
diff --git a/debian/patches/0099-efi-Fix-use-after-free-in-halt-reboot-path.patch b/debian/patches/0098-efi-Fix-use-after-free-in-halt-reboot-path.patch
28similarity index 93%28similarity index 93%
29rename from debian/patches/0099-efi-Fix-use-after-free-in-halt-reboot-path.patch29rename from debian/patches/0099-efi-Fix-use-after-free-in-halt-reboot-path.patch
30rename to debian/patches/0098-efi-Fix-use-after-free-in-halt-reboot-path.patch30rename to debian/patches/0098-efi-Fix-use-after-free-in-halt-reboot-path.patch
index b083cda..7ea7d7d 100644
--- a/debian/patches/0099-efi-Fix-use-after-free-in-halt-reboot-path.patch
+++ b/debian/patches/0098-efi-Fix-use-after-free-in-halt-reboot-path.patch
@@ -1,4 +1,4 @@
1From 7b06a9d273646247ede44987f8b530a3a445b771 Mon Sep 17 00:00:00 20011From 1e7e07cfd5c1caa76479b10e85e6a703d64e0fea Mon Sep 17 00:00:00 2001
2From: Alexey Makhalov <amakhalov@vmware.com>2From: Alexey Makhalov <amakhalov@vmware.com>
3Date: Mon, 20 Jul 2020 23:03:05 +00003Date: Mon, 20 Jul 2020 23:03:05 +0000
4Subject: efi: Fix use-after-free in halt/reboot path4Subject: efi: Fix use-after-free in halt/reboot path
@@ -52,7 +52,7 @@ Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
52 9 files changed, 28 insertions(+), 7 deletions(-)52 9 files changed, 28 insertions(+), 7 deletions(-)
5353
54diff --git a/grub-core/kern/arm/efi/init.c b/grub-core/kern/arm/efi/init.c54diff --git a/grub-core/kern/arm/efi/init.c b/grub-core/kern/arm/efi/init.c
55index 06df60e2f..40c3b467f 10064455index 06df60e2f0..40c3b467fc 100644
56--- a/grub-core/kern/arm/efi/init.c56--- a/grub-core/kern/arm/efi/init.c
57+++ b/grub-core/kern/arm/efi/init.c57+++ b/grub-core/kern/arm/efi/init.c
58@@ -71,4 +71,7 @@ grub_machine_fini (int flags)58@@ -71,4 +71,7 @@ grub_machine_fini (int flags)
@@ -64,7 +64,7 @@ index 06df60e2f..40c3b467f 100644
64+ grub_efi_memory_fini ();64+ grub_efi_memory_fini ();
65 }65 }
66diff --git a/grub-core/kern/arm64/efi/init.c b/grub-core/kern/arm64/efi/init.c66diff --git a/grub-core/kern/arm64/efi/init.c b/grub-core/kern/arm64/efi/init.c
67index 6224999ec..5010caefd 10064467index 6224999ec9..5010caefd6 100644
68--- a/grub-core/kern/arm64/efi/init.c68--- a/grub-core/kern/arm64/efi/init.c
69+++ b/grub-core/kern/arm64/efi/init.c69+++ b/grub-core/kern/arm64/efi/init.c
70@@ -57,4 +57,7 @@ grub_machine_fini (int flags)70@@ -57,4 +57,7 @@ grub_machine_fini (int flags)
@@ -76,7 +76,7 @@ index 6224999ec..5010caefd 100644
76+ grub_efi_memory_fini ();76+ grub_efi_memory_fini ();
77 }77 }
78diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c78diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
79index b1a8b39b4..88bbd34ea 10064479index b1a8b39b49..88bbd34eac 100644
80--- a/grub-core/kern/efi/efi.c80--- a/grub-core/kern/efi/efi.c
81+++ b/grub-core/kern/efi/efi.c81+++ b/grub-core/kern/efi/efi.c
82@@ -157,7 +157,8 @@ grub_efi_get_loaded_image (grub_efi_handle_t image_handle)82@@ -157,7 +157,8 @@ grub_efi_get_loaded_image (grub_efi_handle_t image_handle)
@@ -90,7 +90,7 @@ index b1a8b39b4..88bbd34ea 100644
90 GRUB_EFI_RESET_COLD, GRUB_EFI_SUCCESS, 0, NULL);90 GRUB_EFI_RESET_COLD, GRUB_EFI_SUCCESS, 0, NULL);
91 for (;;) ;91 for (;;) ;
92diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c92diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c
93index 3dfdf2d22..2c31847bf 10064493index 3dfdf2d22b..2c31847bf6 100644
94--- a/grub-core/kern/efi/init.c94--- a/grub-core/kern/efi/init.c
95+++ b/grub-core/kern/efi/init.c95+++ b/grub-core/kern/efi/init.c
96@@ -80,5 +80,4 @@ grub_efi_fini (void)96@@ -80,5 +80,4 @@ grub_efi_fini (void)
@@ -100,7 +100,7 @@ index 3dfdf2d22..2c31847bf 100644
100- grub_efi_memory_fini ();100- grub_efi_memory_fini ();
101 }101 }
102diff --git a/grub-core/kern/i386/efi/init.c b/grub-core/kern/i386/efi/init.c102diff --git a/grub-core/kern/i386/efi/init.c b/grub-core/kern/i386/efi/init.c
103index da499aba0..deb2eacd8 100644103index da499aba04..deb2eacd8d 100644
104--- a/grub-core/kern/i386/efi/init.c104--- a/grub-core/kern/i386/efi/init.c
105+++ b/grub-core/kern/i386/efi/init.c105+++ b/grub-core/kern/i386/efi/init.c
106@@ -39,6 +39,11 @@ grub_machine_init (void)106@@ -39,6 +39,11 @@ grub_machine_init (void)
@@ -118,7 +118,7 @@ index da499aba0..deb2eacd8 100644
118+ grub_efi_memory_fini ();118+ grub_efi_memory_fini ();
119 }119 }
120diff --git a/grub-core/kern/ia64/efi/init.c b/grub-core/kern/ia64/efi/init.c120diff --git a/grub-core/kern/ia64/efi/init.c b/grub-core/kern/ia64/efi/init.c
121index b5ecbd091..f1965571b 100644121index b5ecbd0912..f1965571b1 100644
122--- a/grub-core/kern/ia64/efi/init.c122--- a/grub-core/kern/ia64/efi/init.c
123+++ b/grub-core/kern/ia64/efi/init.c123+++ b/grub-core/kern/ia64/efi/init.c
124@@ -70,6 +70,11 @@ grub_machine_init (void)124@@ -70,6 +70,11 @@ grub_machine_init (void)
@@ -136,7 +136,7 @@ index b5ecbd091..f1965571b 100644
136+ grub_efi_memory_fini ();136+ grub_efi_memory_fini ();
137 }137 }
138diff --git a/grub-core/kern/riscv/efi/init.c b/grub-core/kern/riscv/efi/init.c138diff --git a/grub-core/kern/riscv/efi/init.c b/grub-core/kern/riscv/efi/init.c
139index 7eb1969d0..38795fe67 100644139index 7eb1969d0b..38795fe674 100644
140--- a/grub-core/kern/riscv/efi/init.c140--- a/grub-core/kern/riscv/efi/init.c
141+++ b/grub-core/kern/riscv/efi/init.c141+++ b/grub-core/kern/riscv/efi/init.c
142@@ -73,4 +73,7 @@ grub_machine_fini (int flags)142@@ -73,4 +73,7 @@ grub_machine_fini (int flags)
@@ -148,7 +148,7 @@ index 7eb1969d0..38795fe67 100644
148+ grub_efi_memory_fini ();148+ grub_efi_memory_fini ();
149 }149 }
150diff --git a/grub-core/lib/efi/halt.c b/grub-core/lib/efi/halt.c150diff --git a/grub-core/lib/efi/halt.c b/grub-core/lib/efi/halt.c
151index 5859f0498..29d413641 100644151index 5859f0498a..29d4136416 100644
152--- a/grub-core/lib/efi/halt.c152--- a/grub-core/lib/efi/halt.c
153+++ b/grub-core/lib/efi/halt.c153+++ b/grub-core/lib/efi/halt.c
154@@ -28,7 +28,8 @@154@@ -28,7 +28,8 @@
@@ -162,7 +162,7 @@ index 5859f0498..29d413641 100644
162 !defined(__riscv)162 !defined(__riscv)
163 grub_acpi_halt ();163 grub_acpi_halt ();
164diff --git a/include/grub/loader.h b/include/grub/loader.h164diff --git a/include/grub/loader.h b/include/grub/loader.h
165index 7f82a499f..b20864282 100644165index 7f82a499fd..b208642821 100644
166--- a/include/grub/loader.h166--- a/include/grub/loader.h
167+++ b/include/grub/loader.h167+++ b/include/grub/loader.h
168@@ -33,6 +33,7 @@ enum168@@ -33,6 +33,7 @@ enum
diff --git a/debian/patches/0100-chainloader-Avoid-a-double-free-when-validation-fail.patch b/debian/patches/0099-chainloader-Avoid-a-double-free-when-validation-fail.patch
169similarity index 95%169similarity index 95%
170rename from debian/patches/0100-chainloader-Avoid-a-double-free-when-validation-fail.patch170rename from debian/patches/0100-chainloader-Avoid-a-double-free-when-validation-fail.patch
171rename to debian/patches/0099-chainloader-Avoid-a-double-free-when-validation-fail.patch171rename to debian/patches/0099-chainloader-Avoid-a-double-free-when-validation-fail.patch
index 70bd726..42d6ff3 100644
--- a/debian/patches/0100-chainloader-Avoid-a-double-free-when-validation-fail.patch
+++ b/debian/patches/0099-chainloader-Avoid-a-double-free-when-validation-fail.patch
@@ -1,4 +1,4 @@
1From 52538e3d0bf20717e89713c6cabc54e227659884 Mon Sep 17 00:00:00 20011From 06a88955852ba3c301f3a37c99faa813bd7262c8 Mon Sep 17 00:00:00 2001
2From: Chris Coulson <chris.coulson@canonical.com>2From: Chris Coulson <chris.coulson@canonical.com>
3Date: Thu, 23 Jul 2020 14:02:17 +01003Date: Thu, 23 Jul 2020 14:02:17 +0100
4Subject: chainloader: Avoid a double free when validation fails4Subject: chainloader: Avoid a double free when validation fails
@@ -8,7 +8,7 @@ Subject: chainloader: Avoid a double free when validation fails
8 1 file changed, 6 insertions(+), 3 deletions(-)8 1 file changed, 6 insertions(+), 3 deletions(-)
99
10diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c10diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
11index d0c53077e..144a6549d 10064411index d0c53077e8..144a6549df 100644
12--- a/grub-core/loader/efi/chainloader.c12--- a/grub-core/loader/efi/chainloader.c
13+++ b/grub-core/loader/efi/chainloader.c13+++ b/grub-core/loader/efi/chainloader.c
14@@ -1085,6 +1085,9 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),14@@ -1085,6 +1085,9 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
diff --git a/debian/patches/0101-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch b/debian/patches/0100-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch
15similarity index 96%15similarity index 96%
16rename from debian/patches/0101-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch16rename from debian/patches/0101-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch
17rename to debian/patches/0100-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch17rename to debian/patches/0100-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch
index 780dcf8..34464ab 100644
--- a/debian/patches/0101-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch
+++ b/debian/patches/0100-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch
@@ -1,4 +1,4 @@
1From e4356ccb73aa1d54d319999de4ce46e2e1f79b59 Mon Sep 17 00:00:00 20011From d1e511e940a1f2577f568e11076df02c7a221042 Mon Sep 17 00:00:00 2001
2From: Alexey Makhalov <amakhalov@vmware.com>2From: Alexey Makhalov <amakhalov@vmware.com>
3Date: Wed, 15 Jul 2020 06:42:37 +00003Date: Wed, 15 Jul 2020 06:42:37 +0000
4Subject: relocator: Protect grub_relocator_alloc_chunk_addr() input args4Subject: relocator: Protect grub_relocator_alloc_chunk_addr() input args
@@ -19,7 +19,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
19 4 files changed, 31 insertions(+), 10 deletions(-)19 4 files changed, 31 insertions(+), 10 deletions(-)
2020
21diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c21diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
22index 991eb29db..4e14eb188 10064422index 991eb29db9..4e14eb1887 100644
23--- a/grub-core/loader/i386/linux.c23--- a/grub-core/loader/i386/linux.c
24+++ b/grub-core/loader/i386/linux.c24+++ b/grub-core/loader/i386/linux.c
25@@ -36,6 +36,7 @@25@@ -36,6 +36,7 @@
@@ -47,7 +47,7 @@ index 991eb29db..4e14eb188 100644
47 return err;47 return err;
48 real_mode_mem = get_virtual_current_address (ch);48 real_mode_mem = get_virtual_current_address (ch);
49diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c49diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
50index 3866f048b..81ab3c0c1 10064450index 3866f048bb..81ab3c0c15 100644
51--- a/grub-core/loader/i386/pc/linux.c51--- a/grub-core/loader/i386/pc/linux.c
52+++ b/grub-core/loader/i386/pc/linux.c52+++ b/grub-core/loader/i386/pc/linux.c
53@@ -36,6 +36,7 @@53@@ -36,6 +36,7 @@
@@ -74,7 +74,7 @@ index 3866f048b..81ab3c0c1 100644
74 if (! grub_linux_is_bzimage74 if (! grub_linux_is_bzimage
75 && GRUB_LINUX_ZIMAGE_ADDR + grub_linux16_prot_size75 && GRUB_LINUX_ZIMAGE_ADDR + grub_linux16_prot_size
76diff --git a/grub-core/loader/i386/xen.c b/grub-core/loader/i386/xen.c76diff --git a/grub-core/loader/i386/xen.c b/grub-core/loader/i386/xen.c
77index 8f662c8ac..cd24874ca 10064477index 8f662c8ac8..cd24874ca3 100644
78--- a/grub-core/loader/i386/xen.c78--- a/grub-core/loader/i386/xen.c
79+++ b/grub-core/loader/i386/xen.c79+++ b/grub-core/loader/i386/xen.c
80@@ -41,6 +41,7 @@80@@ -41,6 +41,7 @@
@@ -111,7 +111,7 @@ index 8f662c8ac..cd24874ca 100644
111 goto fail;111 goto fail;
112 kern_chunk_src = get_virtual_current_address (ch);112 kern_chunk_src = get_virtual_current_address (ch);
113diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c113diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c
114index 2f0ebd0b8..3fd653993 100644114index 2f0ebd0b8b..3fd653993f 100644
115--- a/grub-core/loader/xnu.c115--- a/grub-core/loader/xnu.c
116+++ b/grub-core/loader/xnu.c116+++ b/grub-core/loader/xnu.c
117@@ -35,6 +35,7 @@117@@ -35,6 +35,7 @@
diff --git a/debian/patches/0102-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch b/debian/patches/0101-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch
118similarity index 92%118similarity index 92%
119rename from debian/patches/0102-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch119rename from debian/patches/0102-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch
120rename to debian/patches/0101-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch120rename to debian/patches/0101-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch
index 4cdc4fc..5f955e5 100644
--- a/debian/patches/0102-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch
+++ b/debian/patches/0101-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch
@@ -1,4 +1,4 @@
1From a55ad29707df6f2898852118272c455b43c82b98 Mon Sep 17 00:00:00 20011From 91276109ad6be0700b9fee507063f01df0692070 Mon Sep 17 00:00:00 2001
2From: Alexey Makhalov <amakhalov@vmware.com>2From: Alexey Makhalov <amakhalov@vmware.com>
3Date: Wed, 8 Jul 2020 01:44:38 +00003Date: Wed, 8 Jul 2020 01:44:38 +0000
4Subject: relocator: Protect grub_relocator_alloc_chunk_align() max_addr4Subject: relocator: Protect grub_relocator_alloc_chunk_align() max_addr
@@ -35,7 +35,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
35 13 files changed, 69 insertions(+), 58 deletions(-)35 13 files changed, 69 insertions(+), 58 deletions(-)
3636
37diff --git a/grub-core/lib/i386/relocator.c b/grub-core/lib/i386/relocator.c37diff --git a/grub-core/lib/i386/relocator.c b/grub-core/lib/i386/relocator.c
38index 71dd4f0ab..34cbe834f 10064438index 71dd4f0ab0..34cbe834fa 100644
39--- a/grub-core/lib/i386/relocator.c39--- a/grub-core/lib/i386/relocator.c
40+++ b/grub-core/lib/i386/relocator.c40+++ b/grub-core/lib/i386/relocator.c
41@@ -83,11 +83,10 @@ grub_relocator32_boot (struct grub_relocator *rel,41@@ -83,11 +83,10 @@ grub_relocator32_boot (struct grub_relocator *rel,
@@ -88,7 +88,7 @@ index 71dd4f0ab..34cbe834f 100644
88 return err;88 return err;
89 89
90diff --git a/grub-core/lib/mips/relocator.c b/grub-core/lib/mips/relocator.c90diff --git a/grub-core/lib/mips/relocator.c b/grub-core/lib/mips/relocator.c
91index 9d5f49cb9..743b213e6 10064491index 9d5f49cb93..743b213e69 100644
92--- a/grub-core/lib/mips/relocator.c92--- a/grub-core/lib/mips/relocator.c
93+++ b/grub-core/lib/mips/relocator.c93+++ b/grub-core/lib/mips/relocator.c
94@@ -120,10 +120,8 @@ grub_relocator32_boot (struct grub_relocator *rel,94@@ -120,10 +120,8 @@ grub_relocator32_boot (struct grub_relocator *rel,
@@ -105,7 +105,7 @@ index 9d5f49cb9..743b213e6 100644
105 if (err)105 if (err)
106 return err;106 return err;
107diff --git a/grub-core/lib/powerpc/relocator.c b/grub-core/lib/powerpc/relocator.c107diff --git a/grub-core/lib/powerpc/relocator.c b/grub-core/lib/powerpc/relocator.c
108index bdf2b111b..8ffb8b686 100644108index bdf2b111be..8ffb8b6868 100644
109--- a/grub-core/lib/powerpc/relocator.c109--- a/grub-core/lib/powerpc/relocator.c
110+++ b/grub-core/lib/powerpc/relocator.c110+++ b/grub-core/lib/powerpc/relocator.c
111@@ -115,10 +115,8 @@ grub_relocator32_boot (struct grub_relocator *rel,111@@ -115,10 +115,8 @@ grub_relocator32_boot (struct grub_relocator *rel,
@@ -122,7 +122,7 @@ index bdf2b111b..8ffb8b686 100644
122 if (err)122 if (err)
123 return err;123 return err;
124diff --git a/grub-core/lib/x86_64/efi/relocator.c b/grub-core/lib/x86_64/efi/relocator.c124diff --git a/grub-core/lib/x86_64/efi/relocator.c b/grub-core/lib/x86_64/efi/relocator.c
125index 3caef7a40..7d200a125 100644125index 3caef7a402..7d200a125e 100644
126--- a/grub-core/lib/x86_64/efi/relocator.c126--- a/grub-core/lib/x86_64/efi/relocator.c
127+++ b/grub-core/lib/x86_64/efi/relocator.c127+++ b/grub-core/lib/x86_64/efi/relocator.c
128@@ -50,10 +50,9 @@ grub_relocator64_efi_boot (struct grub_relocator *rel,128@@ -50,10 +50,9 @@ grub_relocator64_efi_boot (struct grub_relocator *rel,
@@ -140,7 +140,7 @@ index 3caef7a40..7d200a125 100644
140 return err;140 return err;
141 141
142diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c142diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
143index 4e14eb188..04bd78a1f 100644143index 4e14eb1887..04bd78a1fa 100644
144--- a/grub-core/loader/i386/linux.c144--- a/grub-core/loader/i386/linux.c
145+++ b/grub-core/loader/i386/linux.c145+++ b/grub-core/loader/i386/linux.c
146@@ -184,9 +184,8 @@ allocate_pages (grub_size_t prot_size, grub_size_t *align,146@@ -184,9 +184,8 @@ allocate_pages (grub_size_t prot_size, grub_size_t *align,
@@ -156,7 +156,7 @@ index 4e14eb188..04bd78a1f 100644
156 GRUB_RELOCATOR_PREFERENCE_LOW,156 GRUB_RELOCATOR_PREFERENCE_LOW,
157 1);157 1);
158diff --git a/grub-core/loader/i386/multiboot_mbi.c b/grub-core/loader/i386/multiboot_mbi.c158diff --git a/grub-core/loader/i386/multiboot_mbi.c b/grub-core/loader/i386/multiboot_mbi.c
159index ad3cc292f..a67d9d0a8 100644159index ad3cc292fd..a67d9d0a80 100644
160--- a/grub-core/loader/i386/multiboot_mbi.c160--- a/grub-core/loader/i386/multiboot_mbi.c
161+++ b/grub-core/loader/i386/multiboot_mbi.c161+++ b/grub-core/loader/i386/multiboot_mbi.c
162@@ -466,10 +466,9 @@ grub_multiboot_make_mbi (grub_uint32_t *target)162@@ -466,10 +466,9 @@ grub_multiboot_make_mbi (grub_uint32_t *target)
@@ -174,7 +174,7 @@ index ad3cc292f..a67d9d0a8 100644
174 return err;174 return err;
175 ptrorig = get_virtual_current_address (ch);175 ptrorig = get_virtual_current_address (ch);
176diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c176diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
177index 81ab3c0c1..6400a5b91 100644177index 81ab3c0c15..6400a5b91d 100644
178--- a/grub-core/loader/i386/pc/linux.c178--- a/grub-core/loader/i386/pc/linux.c
179+++ b/grub-core/loader/i386/pc/linux.c179+++ b/grub-core/loader/i386/pc/linux.c
180@@ -463,10 +463,8 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),180@@ -463,10 +463,8 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
@@ -191,7 +191,7 @@ index 81ab3c0c1..6400a5b91 100644
191 return err;191 return err;
192 initrd_chunk = get_virtual_current_address (ch);192 initrd_chunk = get_virtual_current_address (ch);
193diff --git a/grub-core/loader/mips/linux.c b/grub-core/loader/mips/linux.c193diff --git a/grub-core/loader/mips/linux.c b/grub-core/loader/mips/linux.c
194index 7b723bf18..e4ed95921 100644194index 7b723bf189..e4ed95921d 100644
195--- a/grub-core/loader/mips/linux.c195--- a/grub-core/loader/mips/linux.c
196+++ b/grub-core/loader/mips/linux.c196+++ b/grub-core/loader/mips/linux.c
197@@ -442,12 +442,9 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),197@@ -442,12 +442,9 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
@@ -211,7 +211,7 @@ index 7b723bf18..e4ed95921 100644
211 if (err)211 if (err)
212 goto fail;212 goto fail;
213diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c213diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c
214index 3e6ad166d..3e286908d 100644214index 3e6ad166dc..3e286908dd 100644
215--- a/grub-core/loader/multiboot.c215--- a/grub-core/loader/multiboot.c
216+++ b/grub-core/loader/multiboot.c216+++ b/grub-core/loader/multiboot.c
217@@ -404,7 +404,7 @@ grub_cmd_module (grub_command_t cmd __attribute__ ((unused)),217@@ -404,7 +404,7 @@ grub_cmd_module (grub_command_t cmd __attribute__ ((unused)),
@@ -224,7 +224,7 @@ index 3e6ad166d..3e286908d 100644
224 GRUB_RELOCATOR_PREFERENCE_NONE, 1);224 GRUB_RELOCATOR_PREFERENCE_NONE, 1);
225 if (err)225 if (err)
226diff --git a/grub-core/loader/multiboot_elfxx.c b/grub-core/loader/multiboot_elfxx.c226diff --git a/grub-core/loader/multiboot_elfxx.c b/grub-core/loader/multiboot_elfxx.c
227index cc6853692..f2318e0d1 100644227index cc6853692a..f2318e0d16 100644
228--- a/grub-core/loader/multiboot_elfxx.c228--- a/grub-core/loader/multiboot_elfxx.c
229+++ b/grub-core/loader/multiboot_elfxx.c229+++ b/grub-core/loader/multiboot_elfxx.c
230@@ -109,10 +109,10 @@ CONCAT(grub_multiboot_load_elf, XX) (mbi_load_data_t *mld)230@@ -109,10 +109,10 @@ CONCAT(grub_multiboot_load_elf, XX) (mbi_load_data_t *mld)
@@ -252,7 +252,7 @@ index cc6853692..f2318e0d1 100644
252 GRUB_RELOCATOR_PREFERENCE_NONE,252 GRUB_RELOCATOR_PREFERENCE_NONE,
253 mld->avoid_efi_boot_services);253 mld->avoid_efi_boot_services);
254diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c254diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c
255index 53da78615..3ec209283 100644255index 53da786151..3ec2092839 100644
256--- a/grub-core/loader/multiboot_mbi2.c256--- a/grub-core/loader/multiboot_mbi2.c
257+++ b/grub-core/loader/multiboot_mbi2.c257+++ b/grub-core/loader/multiboot_mbi2.c
258@@ -295,10 +295,10 @@ grub_multiboot2_load (grub_file_t file, const char *filename)258@@ -295,10 +295,10 @@ grub_multiboot2_load (grub_file_t file, const char *filename)
@@ -280,7 +280,7 @@ index 53da78615..3ec209283 100644
280 GRUB_RELOCATOR_PREFERENCE_NONE, 1);280 GRUB_RELOCATOR_PREFERENCE_NONE, 1);
281 if (err)281 if (err)
282diff --git a/grub-core/loader/xnu_resume.c b/grub-core/loader/xnu_resume.c282diff --git a/grub-core/loader/xnu_resume.c b/grub-core/loader/xnu_resume.c
283index 8089804d4..d648ef0cd 100644283index 8089804d48..d648ef0cd3 100644
284--- a/grub-core/loader/xnu_resume.c284--- a/grub-core/loader/xnu_resume.c
285+++ b/grub-core/loader/xnu_resume.c285+++ b/grub-core/loader/xnu_resume.c
286@@ -129,7 +129,7 @@ grub_xnu_resume (char *imagename)286@@ -129,7 +129,7 @@ grub_xnu_resume (char *imagename)
@@ -293,7 +293,7 @@ index 8089804d4..d648ef0cd 100644
293 GRUB_XNU_PAGESIZE,293 GRUB_XNU_PAGESIZE,
294 GRUB_RELOCATOR_PREFERENCE_NONE, 0);294 GRUB_RELOCATOR_PREFERENCE_NONE, 0);
295diff --git a/include/grub/relocator.h b/include/grub/relocator.h295diff --git a/include/grub/relocator.h b/include/grub/relocator.h
296index 24d8672d2..1b3bdd92a 100644296index 24d8672d22..1b3bdd92ac 100644
297--- a/include/grub/relocator.h297--- a/include/grub/relocator.h
298+++ b/include/grub/relocator.h298+++ b/include/grub/relocator.h
299@@ -49,6 +49,35 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel,299@@ -49,6 +49,35 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel,
diff --git a/debian/patches/0103-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch b/debian/patches/0102-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch
300similarity index 94%300similarity index 94%
301rename from debian/patches/0103-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch301rename from debian/patches/0103-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch
302rename to debian/patches/0102-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch302rename to debian/patches/0102-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch
index 7291719..a4d7edd 100644
--- a/debian/patches/0103-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch
+++ b/debian/patches/0102-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch
@@ -1,4 +1,4 @@
1From 04b3402c6b1acca2dbc6918e2a24185701a13391 Mon Sep 17 00:00:00 20011From f5102243ac5d0cc9a319b2f5c4cbc2c518d0d137 Mon Sep 17 00:00:00 2001
2From: Alexey Makhalov <amakhalov@vmware.com>2From: Alexey Makhalov <amakhalov@vmware.com>
3Date: Fri, 17 Jul 2020 05:17:26 +00003Date: Fri, 17 Jul 2020 05:17:26 +0000
4Subject: relocator: Fix grub_relocator_alloc_chunk_align() top memory4Subject: relocator: Fix grub_relocator_alloc_chunk_align() top memory
@@ -26,7 +26,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
26 1 file changed, 2 insertions(+), 2 deletions(-)26 1 file changed, 2 insertions(+), 2 deletions(-)
2727
28diff --git a/grub-core/lib/relocator.c b/grub-core/lib/relocator.c28diff --git a/grub-core/lib/relocator.c b/grub-core/lib/relocator.c
29index 5847aac36..f2c1944c2 10064429index 5847aac364..f2c1944c28 100644
30--- a/grub-core/lib/relocator.c30--- a/grub-core/lib/relocator.c
31+++ b/grub-core/lib/relocator.c31+++ b/grub-core/lib/relocator.c
32@@ -1386,8 +1386,8 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel,32@@ -1386,8 +1386,8 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel,
diff --git a/debian/patches/0104-linux-loader-avoid-overflow-on-initrd-size-calculati.patch b/debian/patches/0103-linux-loader-avoid-overflow-on-initrd-size-calculati.patch
33similarity index 90%33similarity index 90%
34rename from debian/patches/0104-linux-loader-avoid-overflow-on-initrd-size-calculati.patch34rename from debian/patches/0104-linux-loader-avoid-overflow-on-initrd-size-calculati.patch
35rename to debian/patches/0103-linux-loader-avoid-overflow-on-initrd-size-calculati.patch35rename to debian/patches/0103-linux-loader-avoid-overflow-on-initrd-size-calculati.patch
index c3f2378..0bf8d98 100644
--- a/debian/patches/0104-linux-loader-avoid-overflow-on-initrd-size-calculati.patch
+++ b/debian/patches/0103-linux-loader-avoid-overflow-on-initrd-size-calculati.patch
@@ -1,4 +1,4 @@
1From b47e1a6cb4d32f04bf3df4d3a8617408264c4de4 Mon Sep 17 00:00:00 20011From 3390bca8bde1f29b8d449f28d5a1fa4f08598af8 Mon Sep 17 00:00:00 2001
2From: Peter Jones <pjones@redhat.com>2From: Peter Jones <pjones@redhat.com>
3Date: Fri, 24 Jul 2020 13:57:27 -04003Date: Fri, 24 Jul 2020 13:57:27 -0400
4Subject: linux loader: avoid overflow on initrd size calculation4Subject: linux loader: avoid overflow on initrd size calculation
@@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
9 1 file changed, 2 insertions(+), 2 deletions(-)9 1 file changed, 2 insertions(+), 2 deletions(-)
1010
11diff --git a/grub-core/loader/linux.c b/grub-core/loader/linux.c11diff --git a/grub-core/loader/linux.c b/grub-core/loader/linux.c
12index 471b214d6..25624ebc1 10064412index 471b214d6c..25624ebc11 100644
13--- a/grub-core/loader/linux.c13--- a/grub-core/loader/linux.c
14+++ b/grub-core/loader/linux.c14+++ b/grub-core/loader/linux.c
15@@ -151,8 +151,8 @@ grub_initrd_init (int argc, char *argv[],15@@ -151,8 +151,8 @@ grub_initrd_init (int argc, char *argv[],
diff --git a/debian/patches/0105-linux-Fix-integer-overflows-in-initrd-size-handling.patch b/debian/patches/0104-linux-Fix-integer-overflows-in-initrd-size-handling.patch
16similarity index 99%16similarity index 99%
17rename from debian/patches/0105-linux-Fix-integer-overflows-in-initrd-size-handling.patch17rename from debian/patches/0105-linux-Fix-integer-overflows-in-initrd-size-handling.patch
18rename to debian/patches/0104-linux-Fix-integer-overflows-in-initrd-size-handling.patch18rename to debian/patches/0104-linux-Fix-integer-overflows-in-initrd-size-handling.patch
index b0ead6d..e7c41b2 100644
--- a/debian/patches/0105-linux-Fix-integer-overflows-in-initrd-size-handling.patch
+++ b/debian/patches/0104-linux-Fix-integer-overflows-in-initrd-size-handling.patch
@@ -1,4 +1,4 @@
1From 33b27a7c9ec994dd1a4f4391df9ac3a61807aa00 Mon Sep 17 00:00:00 20011From 5ae3595759c09e23b48fa2bb35abbe1f66c529bc Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org>2From: Colin Watson <cjwatson@debian.org>
3Date: Sat, 25 Jul 2020 12:15:37 +01003Date: Sat, 25 Jul 2020 12:15:37 +0100
4Subject: linux: Fix integer overflows in initrd size handling4Subject: linux: Fix integer overflows in initrd size handling
@@ -14,7 +14,7 @@ Reviewed-by: Jan Setje-Eilers <jan.setjeeilers@oracle.com>
14 1 file changed, 54 insertions(+), 20 deletions(-)14 1 file changed, 54 insertions(+), 20 deletions(-)
1515
16diff --git a/grub-core/loader/linux.c b/grub-core/loader/linux.c16diff --git a/grub-core/loader/linux.c b/grub-core/loader/linux.c
17index 25624ebc1..e9f819ee9 10064417index 25624ebc11..e9f819ee95 100644
18--- a/grub-core/loader/linux.c18--- a/grub-core/loader/linux.c
19+++ b/grub-core/loader/linux.c19+++ b/grub-core/loader/linux.c
20@@ -4,6 +4,7 @@20@@ -4,6 +4,7 @@
diff --git a/debian/patches/0106-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch b/debian/patches/0105-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
21similarity index 95%21similarity index 95%
22rename from debian/patches/0106-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch22rename from debian/patches/0106-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
23rename to debian/patches/0105-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch23rename to debian/patches/0105-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
index c19a4e3..c364981 100644
--- a/debian/patches/0106-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
+++ b/debian/patches/0105-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
@@ -1,4 +1,4 @@
1From ec83738b990d5008c23fa820edbfd9580df95e51 Mon Sep 17 00:00:00 20011From c15dfc896951a0d1fa03576a3354c59a873cb019 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org>2From: Colin Watson <cjwatson@debian.org>
3Date: Mon, 27 Jul 2020 14:22:12 +01003Date: Mon, 27 Jul 2020 14:22:12 +0100
4Subject: efilinux: Fix integer overflows in grub_cmd_initrd4Subject: efilinux: Fix integer overflows in grub_cmd_initrd
@@ -15,7 +15,7 @@ Signed-off-by: Colin Watson <cjwatson@debian.org>
15 1 file changed, 7 insertions(+), 2 deletions(-)15 1 file changed, 7 insertions(+), 2 deletions(-)
1616
17diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c17diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
18index e357bf67c..381459ce0 10064418index e357bf67c6..381459ce08 100644
19--- a/grub-core/loader/i386/efi/linux.c19--- a/grub-core/loader/i386/efi/linux.c
20+++ b/grub-core/loader/i386/efi/linux.c20+++ b/grub-core/loader/i386/efi/linux.c
21@@ -28,6 +28,7 @@21@@ -28,6 +28,7 @@
diff --git a/debian/patches/at_keyboard-module-init.patch b/debian/patches/at_keyboard-module-init.patch
index faafb46..fe36d6e 100644
--- a/debian/patches/at_keyboard-module-init.patch
+++ b/debian/patches/at_keyboard-module-init.patch
@@ -1,4 +1,4 @@
1From 2fa183df8ec4037976444a92810672b0fa3f75b4 Mon Sep 17 00:00:00 20011From 5365f46e0c28babd3ec09fa2c665b946ac9b3d0f Mon Sep 17 00:00:00 2001
2From: Jeroen Dekkers <jeroen@dekkers.ch>2From: Jeroen Dekkers <jeroen@dekkers.ch>
3Date: Sat, 12 Jan 2019 21:02:18 +01003Date: Sat, 12 Jan 2019 21:02:18 +0100
4Subject: at_keyboard: initialize keyboard in module init if keyboard is ready4Subject: at_keyboard: initialize keyboard in module init if keyboard is ready
@@ -16,7 +16,7 @@ Patch-Name: at_keyboard-module-init.patch
16 1 file changed, 9 insertions(+)16 1 file changed, 9 insertions(+)
1717
18diff --git a/grub-core/term/at_keyboard.c b/grub-core/term/at_keyboard.c18diff --git a/grub-core/term/at_keyboard.c b/grub-core/term/at_keyboard.c
19index f0a986eb1..d4395c201 10064419index f0a986eb17..d4395c2019 100644
20--- a/grub-core/term/at_keyboard.c20--- a/grub-core/term/at_keyboard.c
21+++ b/grub-core/term/at_keyboard.c21+++ b/grub-core/term/at_keyboard.c
22@@ -244,6 +244,14 @@ grub_at_keyboard_getkey (struct grub_term_input *term __attribute__ ((unused)))22@@ -244,6 +244,14 @@ grub_at_keyboard_getkey (struct grub_term_input *term __attribute__ ((unused)))
diff --git a/debian/patches/bash-completion-drop-have-checks.patch b/debian/patches/bash-completion-drop-have-checks.patch
index acb2021..806cf54 100644
--- a/debian/patches/bash-completion-drop-have-checks.patch
+++ b/debian/patches/bash-completion-drop-have-checks.patch
@@ -1,4 +1,4 @@
1From 1eee32e5a695ce788c97203f0fba724bf5dc3a19 Mon Sep 17 00:00:00 20011From c3bac3061438a6308dc0191e72e295957270c755 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org>2From: Colin Watson <cjwatson@debian.org>
3Date: Fri, 16 Nov 2018 16:37:02 +00003Date: Fri, 16 Nov 2018 16:37:02 +0000
4Subject: bash-completion: Drop "have" checks4Subject: bash-completion: Drop "have" checks
@@ -16,7 +16,7 @@ Patch-Name: bash-completion-drop-have-checks.patch
16 1 file changed, 13 insertions(+), 26 deletions(-)16 1 file changed, 13 insertions(+), 26 deletions(-)
1717
18diff --git a/util/bash-completion.d/grub-completion.bash.in b/util/bash-completion.d/grub-completion.bash.in18diff --git a/util/bash-completion.d/grub-completion.bash.in b/util/bash-completion.d/grub-completion.bash.in
19index 44bf135b9..d4235e7ef 10064419index 44bf135b9f..d4235e7ef8 100644
20--- a/util/bash-completion.d/grub-completion.bash.in20--- a/util/bash-completion.d/grub-completion.bash.in
21+++ b/util/bash-completion.d/grub-completion.bash.in21+++ b/util/bash-completion.d/grub-completion.bash.in
22@@ -166,13 +166,11 @@ _grub_set_entry () {22@@ -166,13 +166,11 @@ _grub_set_entry () {
diff --git a/debian/patches/blacklist-1440x900x32.patch b/debian/patches/blacklist-1440x900x32.patch
index 5043cf4..432726d 100644
--- a/debian/patches/blacklist-1440x900x32.patch
+++ b/debian/patches/blacklist-1440x900x32.patch
@@ -1,4 +1,4 @@
1From a7d121953a5158ccd4e8789a475cd43b83c2b779 Mon Sep 17 00:00:00 20011From a48eec06d4c5c5d1e808b52c1193044c09d638c2 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@ubuntu.com>2From: Colin Watson <cjwatson@ubuntu.com>
3Date: Mon, 13 Jan 2014 12:13:11 +00003Date: Mon, 13 Jan 2014 12:13:11 +0000
4Subject: Blacklist 1440x900x32 from VBE preferred mode handling4Subject: Blacklist 1440x900x32 from VBE preferred mode handling
@@ -13,7 +13,7 @@ Patch-Name: blacklist-1440x900x32.patch
13 1 file changed, 9 insertions(+)13 1 file changed, 9 insertions(+)
1414
15diff --git a/grub-core/video/i386/pc/vbe.c b/grub-core/video/i386/pc/vbe.c15diff --git a/grub-core/video/i386/pc/vbe.c b/grub-core/video/i386/pc/vbe.c
16index b7f911926..4b1bd7d5e 10064416index b7f911926d..4b1bd7d5ea 100644
17--- a/grub-core/video/i386/pc/vbe.c17--- a/grub-core/video/i386/pc/vbe.c
18+++ b/grub-core/video/i386/pc/vbe.c18+++ b/grub-core/video/i386/pc/vbe.c
19@@ -1054,6 +1054,15 @@ grub_video_vbe_setup (unsigned int width, unsigned int height,19@@ -1054,6 +1054,15 @@ grub_video_vbe_setup (unsigned int width, unsigned int height,
diff --git a/debian/patches/bootp-new-net_bootp6-command.patch b/debian/patches/bootp-new-net_bootp6-command.patch
index d53a2f2..67f690b 100644
--- a/debian/patches/bootp-new-net_bootp6-command.patch
+++ b/debian/patches/bootp-new-net_bootp6-command.patch
@@ -1,4 +1,4 @@
1From 8624974d81aaa8eabd6328c99ec5c7d204c80638 Mon Sep 17 00:00:00 20011From c5375c14deee6e8fd23a018d583495e5c4f95930 Mon Sep 17 00:00:00 2001
2From: Michael Chang <mchang@suse.com>2From: Michael Chang <mchang@suse.com>
3Date: Thu, 27 Oct 2016 17:41:04 -04003Date: Thu, 27 Oct 2016 17:41:04 -0400
4Subject: bootp: New net_bootp6 command4Subject: bootp: New net_bootp6 command
@@ -17,7 +17,7 @@ Patch-Name: bootp-new-net_bootp6-command.patch
17 3 files changed, 1018 insertions(+), 1 deletion(-)17 3 files changed, 1018 insertions(+), 1 deletion(-)
1818
19diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c19diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
20index 04cfbb045..21c1824ef 10064420index 04cfbb0450..21c1824efb 100644
21--- a/grub-core/net/bootp.c21--- a/grub-core/net/bootp.c
22+++ b/grub-core/net/bootp.c22+++ b/grub-core/net/bootp.c
23@@ -24,6 +24,98 @@23@@ -24,6 +24,98 @@
@@ -969,7 +969,7 @@ index 04cfbb045..21c1824ef 100644
969+ grub_unregister_command (cmd_bootp6);969+ grub_unregister_command (cmd_bootp6);
970 }970 }
971diff --git a/grub-core/net/ip.c b/grub-core/net/ip.c971diff --git a/grub-core/net/ip.c b/grub-core/net/ip.c
972index ea5edf8f1..01410798b 100644972index ea5edf8f1f..01410798b3 100644
973--- a/grub-core/net/ip.c973--- a/grub-core/net/ip.c
974+++ b/grub-core/net/ip.c974+++ b/grub-core/net/ip.c
975@@ -239,6 +239,45 @@ handle_dgram (struct grub_net_buff *nb,975@@ -239,6 +239,45 @@ handle_dgram (struct grub_net_buff *nb,
@@ -1019,7 +1019,7 @@ index ea5edf8f1..01410798b 100644
1019 {1019 {
1020 const struct grub_net_bootp_packet *bootp;1020 const struct grub_net_bootp_packet *bootp;
1021diff --git a/include/grub/net.h b/include/grub/net.h1021diff --git a/include/grub/net.h b/include/grub/net.h
1022index cc114286e..58cff96d2 1006441022index cc114286ea..58cff96d2a 100644
1023--- a/include/grub/net.h1023--- a/include/grub/net.h
1024+++ b/include/grub/net.h1024+++ b/include/grub/net.h
1025@@ -448,6 +448,66 @@ struct grub_net_bootp_packet1025@@ -448,6 +448,66 @@ struct grub_net_bootp_packet
diff --git a/debian/patches/bootp-process-dhcpack-http-boot.patch b/debian/patches/bootp-process-dhcpack-http-boot.patch
index 74e9508..aabd41a 100644
--- a/debian/patches/bootp-process-dhcpack-http-boot.patch
+++ b/debian/patches/bootp-process-dhcpack-http-boot.patch
@@ -1,4 +1,4 @@
1From 3de9845e404a99dc3122efbf7c2570482097c412 Mon Sep 17 00:00:00 20011From 6e1e440798cf53f89f0e5a177d781f0b3d4bc1ca Mon Sep 17 00:00:00 2001
2From: Michael Chang <mchang@suse.com>2From: Michael Chang <mchang@suse.com>
3Date: Thu, 27 Oct 2016 17:42:19 -04003Date: Thu, 27 Oct 2016 17:42:19 -0400
4Subject: bootp: Add processing DHCPACK packet from HTTP Boot4Subject: bootp: Add processing DHCPACK packet from HTTP Boot
@@ -24,7 +24,7 @@ Patch-Name: bootp-process-dhcpack-http-boot.patch
24 2 files changed, 60 insertions(+), 1 deletion(-)24 2 files changed, 60 insertions(+), 1 deletion(-)
2525
26diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c26diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
27index 21c1824ef..558d97ba1 10064427index 21c1824efb..558d97ba1e 100644
28--- a/grub-core/net/bootp.c28--- a/grub-core/net/bootp.c
29+++ b/grub-core/net/bootp.c29+++ b/grub-core/net/bootp.c
30@@ -154,7 +154,7 @@ struct grub_dhcp_request_options30@@ -154,7 +154,7 @@ struct grub_dhcp_request_options
@@ -109,7 +109,7 @@ index 21c1824ef..558d97ba1 100644
109 },109 },
110 GRUB_NET_BOOTP_END,110 GRUB_NET_BOOTP_END,
111diff --git a/include/grub/net.h b/include/grub/net.h111diff --git a/include/grub/net.h b/include/grub/net.h
112index 58cff96d2..b5f9e617e 100644112index 58cff96d2a..b5f9e617e5 100644
113--- a/include/grub/net.h113--- a/include/grub/net.h
114+++ b/include/grub/net.h114+++ b/include/grub/net.h
115@@ -523,6 +523,7 @@ enum115@@ -523,6 +523,7 @@ enum
diff --git a/debian/patches/cherrypick-lsefisystab-define-smbios3.patch b/debian/patches/cherrypick-lsefisystab-define-smbios3.patch
index 612fc32..48619ef 100644
--- a/debian/patches/cherrypick-lsefisystab-define-smbios3.patch
+++ b/debian/patches/cherrypick-lsefisystab-define-smbios3.patch
@@ -1,4 +1,4 @@
1From 0bc1e64554d9dfbcfaf5e384fcb772f861a548d8 Mon Sep 17 00:00:00 20011From 7a7aa7f7da952420277726d4e2279716d1738aa6 Mon Sep 17 00:00:00 2001
2From: David Michael <fedora.dm0@gmail.com>2From: David Michael <fedora.dm0@gmail.com>
3Date: Fri, 5 Jul 2019 08:47:02 -04003Date: Fri, 5 Jul 2019 08:47:02 -0400
4Subject: lsefisystab: Define SMBIOS3 entry point structures for EFI4Subject: lsefisystab: Define SMBIOS3 entry point structures for EFI
@@ -16,7 +16,7 @@ Patch-Name: cherrypick-lsefisystab-define-smbios3.patch
16 2 files changed, 6 insertions(+)16 2 files changed, 6 insertions(+)
1717
18diff --git a/grub-core/commands/efi/lsefisystab.c b/grub-core/commands/efi/lsefisystab.c18diff --git a/grub-core/commands/efi/lsefisystab.c b/grub-core/commands/efi/lsefisystab.c
19index df1030221..7c039c509 10064419index df10302218..7c039c5097 100644
20--- a/grub-core/commands/efi/lsefisystab.c20--- a/grub-core/commands/efi/lsefisystab.c
21+++ b/grub-core/commands/efi/lsefisystab.c21+++ b/grub-core/commands/efi/lsefisystab.c
22@@ -48,6 +48,7 @@ static const struct guid_mapping guid_mappings[] =22@@ -48,6 +48,7 @@ static const struct guid_mapping guid_mappings[] =
@@ -28,7 +28,7 @@ index df1030221..7c039c509 100644
28 { GRUB_EFI_TIANO_CUSTOM_DECOMPRESS_GUID, "TIANO CUSTOM DECOMPRESS"},28 { GRUB_EFI_TIANO_CUSTOM_DECOMPRESS_GUID, "TIANO CUSTOM DECOMPRESS"},
29 { GRUB_EFI_TSC_FREQUENCY_GUID, "TSC FREQUENCY"},29 { GRUB_EFI_TSC_FREQUENCY_GUID, "TSC FREQUENCY"},
30diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h30diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
31index 75befd10e..9824fbcd0 10064431index 75befd10e5..9824fbcd0d 100644
32--- a/include/grub/efi/api.h32--- a/include/grub/efi/api.h
33+++ b/include/grub/efi/api.h33+++ b/include/grub/efi/api.h
34@@ -314,6 +314,11 @@34@@ -314,6 +314,11 @@
diff --git a/debian/patches/cherrypick-lsefisystab-show-dtb.patch b/debian/patches/cherrypick-lsefisystab-show-dtb.patch
index 6516840..727628f 100644
--- a/debian/patches/cherrypick-lsefisystab-show-dtb.patch
+++ b/debian/patches/cherrypick-lsefisystab-show-dtb.patch
@@ -1,4 +1,4 @@
1From b5a07214b83812f0b8b42dc576021e98237498e6 Mon Sep 17 00:00:00 20011From b67cba441eece77123d08105d447128e09593194 Mon Sep 17 00:00:00 2001
2From: Heinrich Schuchardt <xypron.glpk@gmx.de>2From: Heinrich Schuchardt <xypron.glpk@gmx.de>
3Date: Sat, 6 Jul 2019 11:11:02 +02003Date: Sat, 6 Jul 2019 11:11:02 +0200
4Subject: lsefisystab: Add support for device tree table4Subject: lsefisystab: Add support for device tree table
@@ -27,7 +27,7 @@ Patch-Name: cherrypick-lsefisystab-show-dtb.patch
27 1 file changed, 1 insertion(+)27 1 file changed, 1 insertion(+)
2828
29diff --git a/grub-core/commands/efi/lsefisystab.c b/grub-core/commands/efi/lsefisystab.c29diff --git a/grub-core/commands/efi/lsefisystab.c b/grub-core/commands/efi/lsefisystab.c
30index 7c039c509..902788250 10064430index 7c039c5097..902788250e 100644
31--- a/grub-core/commands/efi/lsefisystab.c31--- a/grub-core/commands/efi/lsefisystab.c
32+++ b/grub-core/commands/efi/lsefisystab.c32+++ b/grub-core/commands/efi/lsefisystab.c
33@@ -40,6 +40,7 @@ static const struct guid_mapping guid_mappings[] =33@@ -40,6 +40,7 @@ static const struct guid_mapping guid_mappings[] =
diff --git a/debian/patches/cherrypick-smbios-module.patch b/debian/patches/cherrypick-smbios-module.patch
index 8bbe12b..a0a649e 100644
--- a/debian/patches/cherrypick-smbios-module.patch
+++ b/debian/patches/cherrypick-smbios-module.patch
@@ -1,4 +1,4 @@
1From 982cd5b597e964da666ebdab41c727823a50c776 Mon Sep 17 00:00:00 20011From 1eea32e0f58e90b1a7682f01b06c68f56349fb3d Mon Sep 17 00:00:00 2001
2From: David Michael <fedora.dm0@gmail.com>2From: David Michael <fedora.dm0@gmail.com>
3Date: Fri, 5 Jul 2019 08:47:09 -04003Date: Fri, 5 Jul 2019 08:47:09 -0400
4Subject: smbios: Add a module for retrieving SMBIOS information4Subject: smbios: Add a module for retrieving SMBIOS information
@@ -33,7 +33,7 @@ Patch-Name: cherrypick-smbios-module.patch
33 create mode 100644 include/grub/smbios.h33 create mode 100644 include/grub/smbios.h
3434
35diff --git a/docs/grub.texi b/docs/grub.texi35diff --git a/docs/grub.texi b/docs/grub.texi
36index 1baa0fa20..d573f32cb 10064436index 1baa0fa20f..d573f32cbb 100644
37--- a/docs/grub.texi37--- a/docs/grub.texi
38+++ b/docs/grub.texi38+++ b/docs/grub.texi
39@@ -3976,6 +3976,7 @@ you forget a command, you can run the command @command{help}39@@ -3976,6 +3976,7 @@ you forget a command, you can run the command @command{help}
@@ -126,7 +126,7 @@ index 1baa0fa20..d573f32cb 100644
126 @subsection source126 @subsection source
127 127
128diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def128diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
129index 33e75021d..9b20f3335 100644129index 33e75021da..9b20f33355 100644
130--- a/grub-core/Makefile.core.def130--- a/grub-core/Makefile.core.def
131+++ b/grub-core/Makefile.core.def131+++ b/grub-core/Makefile.core.def
132@@ -1106,6 +1106,21 @@ module = {132@@ -1106,6 +1106,21 @@ module = {
@@ -153,7 +153,7 @@ index 33e75021d..9b20f3335 100644
153 ieee1275 = commands/ieee1275/suspend.c;153 ieee1275 = commands/ieee1275/suspend.c;
154diff --git a/grub-core/commands/efi/smbios.c b/grub-core/commands/efi/smbios.c154diff --git a/grub-core/commands/efi/smbios.c b/grub-core/commands/efi/smbios.c
155new file mode 100644155new file mode 100644
156index 000000000..75202d5aa156index 0000000000..75202d5aad
157--- /dev/null157--- /dev/null
158+++ b/grub-core/commands/efi/smbios.c158+++ b/grub-core/commands/efi/smbios.c
159@@ -0,0 +1,61 @@159@@ -0,0 +1,61 @@
@@ -220,7 +220,7 @@ index 000000000..75202d5aa
220+}220+}
221diff --git a/grub-core/commands/i386/pc/smbios.c b/grub-core/commands/i386/pc/smbios.c221diff --git a/grub-core/commands/i386/pc/smbios.c b/grub-core/commands/i386/pc/smbios.c
222new file mode 100644222new file mode 100644
223index 000000000..069d66367223index 0000000000..069d663673
224--- /dev/null224--- /dev/null
225+++ b/grub-core/commands/i386/pc/smbios.c225+++ b/grub-core/commands/i386/pc/smbios.c
226@@ -0,0 +1,52 @@226@@ -0,0 +1,52 @@
@@ -278,7 +278,7 @@ index 000000000..069d66367
278+}278+}
279diff --git a/grub-core/commands/smbios.c b/grub-core/commands/smbios.c279diff --git a/grub-core/commands/smbios.c b/grub-core/commands/smbios.c
280new file mode 100644280new file mode 100644
281index 000000000..7a6a391fc281index 0000000000..7a6a391fc1
282--- /dev/null282--- /dev/null
283+++ b/grub-core/commands/smbios.c283+++ b/grub-core/commands/smbios.c
284@@ -0,0 +1,374 @@284@@ -0,0 +1,374 @@
@@ -657,7 +657,7 @@ index 000000000..7a6a391fc
657+ grub_unregister_extcmd (cmd);657+ grub_unregister_extcmd (cmd);
658+}658+}
659diff --git a/grub-core/efiemu/i386/pc/cfgtables.c b/grub-core/efiemu/i386/pc/cfgtables.c659diff --git a/grub-core/efiemu/i386/pc/cfgtables.c b/grub-core/efiemu/i386/pc/cfgtables.c
660index 492c07c46..e5fffb7d4 100644660index 492c07c468..e5fffb7d4a 100644
661--- a/grub-core/efiemu/i386/pc/cfgtables.c661--- a/grub-core/efiemu/i386/pc/cfgtables.c
662+++ b/grub-core/efiemu/i386/pc/cfgtables.c662+++ b/grub-core/efiemu/i386/pc/cfgtables.c
663@@ -22,11 +22,11 @@663@@ -22,11 +22,11 @@
@@ -696,7 +696,7 @@ index 492c07c46..e5fffb7d4 100644
696 }696 }
697diff --git a/include/grub/smbios.h b/include/grub/smbios.h697diff --git a/include/grub/smbios.h b/include/grub/smbios.h
698new file mode 100644698new file mode 100644
699index 000000000..15ec260b3699index 0000000000..15ec260b32
700--- /dev/null700--- /dev/null
701+++ b/include/grub/smbios.h701+++ b/include/grub/smbios.h
702@@ -0,0 +1,69 @@702@@ -0,0 +1,69 @@
diff --git a/debian/patches/core-in-fs.patch b/debian/patches/core-in-fs.patch
index 1ba3b4b..b8e13d3 100644
--- a/debian/patches/core-in-fs.patch
+++ b/debian/patches/core-in-fs.patch
@@ -11,7 +11,7 @@ Patch-Name: core-in-fs.patch
11 1 file changed, 8 insertions(+)11 1 file changed, 8 insertions(+)
1212
13diff --git a/util/setup.c b/util/setup.c13diff --git a/util/setup.c b/util/setup.c
14index 6f88f3cc4..fbdf2fcc5 10064414index 6f88f3cc43..fbdf2fcc59 100644
15--- a/util/setup.c15--- a/util/setup.c
16+++ b/util/setup.c16+++ b/util/setup.c
17@@ -58,6 +58,8 @@17@@ -58,6 +58,8 @@
diff --git a/debian/patches/default-grub-d.patch b/debian/patches/default-grub-d.patch
index dc61a66..cf024d6 100644
--- a/debian/patches/default-grub-d.patch
+++ b/debian/patches/default-grub-d.patch
@@ -1,4 +1,4 @@
1From e1e966557a634500e95e2ec691a0cb8fca144aae Mon Sep 17 00:00:00 20011From c3ad86f659b0a1af2033086101936f3a17e67a0a Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@ubuntu.com>2From: Colin Watson <cjwatson@ubuntu.com>
3Date: Mon, 13 Jan 2014 12:13:10 +00003Date: Mon, 13 Jan 2014 12:13:10 +0000
4Subject: Read /etc/default/grub.d/*.cfg after /etc/default/grub4Subject: Read /etc/default/grub.d/*.cfg after /etc/default/grub
@@ -14,7 +14,7 @@ Patch-Name: default-grub-d.patch
14 2 files changed, 98 insertions(+), 21 deletions(-)14 2 files changed, 98 insertions(+), 21 deletions(-)
1515
16diff --git a/grub-core/osdep/unix/config.c b/grub-core/osdep/unix/config.c16diff --git a/grub-core/osdep/unix/config.c b/grub-core/osdep/unix/config.c
17index 65effa9f3..5478030fd 10064417index 65effa9f3a..5478030fde 100644
18--- a/grub-core/osdep/unix/config.c18--- a/grub-core/osdep/unix/config.c
19+++ b/grub-core/osdep/unix/config.c19+++ b/grub-core/osdep/unix/config.c
20@@ -24,6 +24,8 @@20@@ -24,6 +24,8 @@
@@ -178,7 +178,7 @@ index 65effa9f3..5478030fd 100644
178+ free (cfgdir);178+ free (cfgdir);
179 }179 }
180diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in180diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
181index b506d63bf..d18bf972f 100644181index b506d63bf9..d18bf972f7 100644
182--- a/util/grub-mkconfig.in182--- a/util/grub-mkconfig.in
183+++ b/util/grub-mkconfig.in183+++ b/util/grub-mkconfig.in
184@@ -164,6 +164,11 @@ fi184@@ -164,6 +164,11 @@ fi
diff --git a/debian/patches/disable-floppies.patch b/debian/patches/disable-floppies.patch
index 7d4835e..981b9ec 100644
--- a/debian/patches/disable-floppies.patch
+++ b/debian/patches/disable-floppies.patch
@@ -13,7 +13,7 @@ Patch-Name: disable-floppies.patch
13 1 file changed, 12 insertions(+)13 1 file changed, 12 insertions(+)
1414
15diff --git a/grub-core/kern/emu/hostdisk.c b/grub-core/kern/emu/hostdisk.c15diff --git a/grub-core/kern/emu/hostdisk.c b/grub-core/kern/emu/hostdisk.c
16index e9ec680cd..8ac523953 10064416index e9ec680cdb..8ac5239538 100644
17--- a/grub-core/kern/emu/hostdisk.c17--- a/grub-core/kern/emu/hostdisk.c
18+++ b/grub-core/kern/emu/hostdisk.c18+++ b/grub-core/kern/emu/hostdisk.c
19@@ -532,6 +532,18 @@ read_device_map (const char *dev_map)19@@ -532,6 +532,18 @@ read_device_map (const char *dev_map)
diff --git a/debian/patches/dpkg-version-comparison.patch b/debian/patches/dpkg-version-comparison.patch
index 86e5c7e..929070f 100644
--- a/debian/patches/dpkg-version-comparison.patch
+++ b/debian/patches/dpkg-version-comparison.patch
@@ -12,7 +12,7 @@ Patch-Name: dpkg-version-comparison.patch
12 1 file changed, 4 insertions(+), 3 deletions(-)12 1 file changed, 4 insertions(+), 3 deletions(-)
1313
14diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in14diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
15index 0f801cab3..b6606c16e 10064415index 0f801cab3e..b6606c16e0 100644
16--- a/util/grub-mkconfig_lib.in16--- a/util/grub-mkconfig_lib.in
17+++ b/util/grub-mkconfig_lib.in17+++ b/util/grub-mkconfig_lib.in
18@@ -239,8 +239,9 @@ version_test_numeric ()18@@ -239,8 +239,9 @@ version_test_numeric ()
diff --git a/debian/patches/efi-variable-storage-minimise-writes.patch b/debian/patches/efi-variable-storage-minimise-writes.patch
index 5078aa3..44ac1ae 100644
--- a/debian/patches/efi-variable-storage-minimise-writes.patch
+++ b/debian/patches/efi-variable-storage-minimise-writes.patch
@@ -1,4 +1,4 @@
1From 20dd578ec8d17d92790121ce010de0e49eaf9cef Mon Sep 17 00:00:00 20011From b18e6318f49373c1018be8b6d34266a009f10ae8 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@ubuntu.com>2From: Colin Watson <cjwatson@ubuntu.com>
3Date: Mon, 11 Mar 2019 11:17:43 +00003Date: Mon, 11 Mar 2019 11:17:43 +0000
4Subject: Minimise writes to EFI variable storage4Subject: Minimise writes to EFI variable storage
@@ -60,7 +60,7 @@ Patch-Name: efi-variable-storage-minimise-writes.patch
60 create mode 100644 grub-core/osdep/unix/efivar.c60 create mode 100644 grub-core/osdep/unix/efivar.c
6161
62diff --git a/INSTALL b/INSTALL62diff --git a/INSTALL b/INSTALL
63index 8acb40902..342c158e9 10064463index 8acb409023..342c158e91 100644
64--- a/INSTALL64--- a/INSTALL
65+++ b/INSTALL65+++ b/INSTALL
66@@ -41,6 +41,11 @@ configuring the GRUB.66@@ -41,6 +41,11 @@ configuring the GRUB.
@@ -76,7 +76,7 @@ index 8acb40902..342c158e9 100644
76 76
77 * libdevmapper 1.02.34 or later (recommended)77 * libdevmapper 1.02.34 or later (recommended)
78diff --git a/Makefile.util.def b/Makefile.util.def78diff --git a/Makefile.util.def b/Makefile.util.def
79index ce133e694..504d1c058 10064479index ce133e694e..504d1c0581 100644
80--- a/Makefile.util.def80--- a/Makefile.util.def
81+++ b/Makefile.util.def81+++ b/Makefile.util.def
82@@ -565,6 +565,8 @@ program = {82@@ -565,6 +565,8 @@ program = {
@@ -180,7 +180,7 @@ index ce133e694..504d1c058 100644
180 180
181 script = {181 script = {
182diff --git a/configure.ac b/configure.ac182diff --git a/configure.ac b/configure.ac
183index e382c7480..883245553 100644183index e382c7480d..883245553d 100644
184--- a/configure.ac184--- a/configure.ac
185+++ b/configure.ac185+++ b/configure.ac
186@@ -443,6 +443,18 @@ AC_CHECK_HEADER([util.h], [186@@ -443,6 +443,18 @@ AC_CHECK_HEADER([util.h], [
@@ -204,7 +204,7 @@ index e382c7480..883245553 100644
204 CFLAGS="$HOST_CFLAGS -Wtrampolines -Werror"204 CFLAGS="$HOST_CFLAGS -Wtrampolines -Werror"
205diff --git a/grub-core/osdep/efivar.c b/grub-core/osdep/efivar.c205diff --git a/grub-core/osdep/efivar.c b/grub-core/osdep/efivar.c
206new file mode 100644206new file mode 100644
207index 000000000..d2750e252207index 0000000000..d2750e2524
208--- /dev/null208--- /dev/null
209+++ b/grub-core/osdep/efivar.c209+++ b/grub-core/osdep/efivar.c
210@@ -0,0 +1,3 @@210@@ -0,0 +1,3 @@
@@ -213,7 +213,7 @@ index 000000000..d2750e252
213+#endif213+#endif
214diff --git a/grub-core/osdep/unix/efivar.c b/grub-core/osdep/unix/efivar.c214diff --git a/grub-core/osdep/unix/efivar.c b/grub-core/osdep/unix/efivar.c
215new file mode 100644215new file mode 100644
216index 000000000..4a58328b4216index 0000000000..4a58328b42
217--- /dev/null217--- /dev/null
218+++ b/grub-core/osdep/unix/efivar.c218+++ b/grub-core/osdep/unix/efivar.c
219@@ -0,0 +1,508 @@219@@ -0,0 +1,508 @@
@@ -726,7 +726,7 @@ index 000000000..4a58328b4
726+726+
727+#endif /* HAVE_EFIVAR */727+#endif /* HAVE_EFIVAR */
728diff --git a/grub-core/osdep/unix/platform.c b/grub-core/osdep/unix/platform.c728diff --git a/grub-core/osdep/unix/platform.c b/grub-core/osdep/unix/platform.c
729index 9c439326a..b561174ea 100644729index 9c439326a0..b561174ea9 100644
730--- a/grub-core/osdep/unix/platform.c730--- a/grub-core/osdep/unix/platform.c
731+++ b/grub-core/osdep/unix/platform.c731+++ b/grub-core/osdep/unix/platform.c
732@@ -19,15 +19,12 @@732@@ -19,15 +19,12 @@
@@ -856,7 +856,7 @@ index 9c439326a..b561174ea 100644
856 856
857 void857 void
858diff --git a/include/grub/util/install.h b/include/grub/util/install.h858diff --git a/include/grub/util/install.h b/include/grub/util/install.h
859index 8aeb5c4f2..a521f1663 100644859index 8aeb5c4f20..a521f1663f 100644
860--- a/include/grub/util/install.h860--- a/include/grub/util/install.h
861+++ b/include/grub/util/install.h861+++ b/include/grub/util/install.h
862@@ -219,6 +219,11 @@ grub_install_get_default_x86_platform (void);862@@ -219,6 +219,11 @@ grub_install_get_default_x86_platform (void);
@@ -872,7 +872,7 @@ index 8aeb5c4f2..a521f1663 100644
872 grub_install_register_efi (grub_device_t efidir_grub_dev,872 grub_install_register_efi (grub_device_t efidir_grub_dev,
873 const char *efifile_path,873 const char *efifile_path,
874diff --git a/util/grub-install.c b/util/grub-install.c874diff --git a/util/grub-install.c b/util/grub-install.c
875index 4bad8de61..63462e4e0 100644875index 4bad8de612..63462e4e09 100644
876--- a/util/grub-install.c876--- a/util/grub-install.c
877+++ b/util/grub-install.c877+++ b/util/grub-install.c
878@@ -2084,7 +2084,7 @@ main (int argc, char *argv[])878@@ -2084,7 +2084,7 @@ main (int argc, char *argv[])
diff --git a/debian/patches/efinet-set-dns-from-uefi-proto.patch b/debian/patches/efinet-set-dns-from-uefi-proto.patch
index e500199..fdf062b 100644
--- a/debian/patches/efinet-set-dns-from-uefi-proto.patch
+++ b/debian/patches/efinet-set-dns-from-uefi-proto.patch
@@ -1,4 +1,4 @@
1From 6a014b8846142de23cb5254f653facc8f3456a8c Mon Sep 17 00:00:00 20011From 5e2600c379b6ef398a18081b65367f0674c935dc Mon Sep 17 00:00:00 2001
2From: Michael Chang <mchang@suse.com>2From: Michael Chang <mchang@suse.com>
3Date: Thu, 27 Oct 2016 17:43:21 -04003Date: Thu, 27 Oct 2016 17:43:21 -0400
4Subject: efinet: Setting DNS server from UEFI protocol4Subject: efinet: Setting DNS server from UEFI protocol
@@ -35,7 +35,7 @@ Patch-Name: efinet-set-dns-from-uefi-proto.patch
35 2 files changed, 239 insertions(+)35 2 files changed, 239 insertions(+)
3636
37diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c37diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
38index 2d3b00f0e..82a28fb6e 10064438index 2d3b00f0e1..82a28fb6e9 100644
39--- a/grub-core/net/drivers/efi/efinet.c39--- a/grub-core/net/drivers/efi/efinet.c
40+++ b/grub-core/net/drivers/efi/efinet.c40+++ b/grub-core/net/drivers/efi/efinet.c
41@@ -30,6 +30,8 @@ GRUB_MOD_LICENSE ("GPLv3+");41@@ -30,6 +30,8 @@ GRUB_MOD_LICENSE ("GPLv3+");
@@ -244,7 +244,7 @@ index 2d3b00f0e..82a28fb6e 100644
244 }244 }
245 245
246diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h246diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
247index 664cea37b..75befd10e 100644247index 664cea37b5..75befd10e5 100644
248--- a/include/grub/efi/api.h248--- a/include/grub/efi/api.h
249+++ b/include/grub/efi/api.h249+++ b/include/grub/efi/api.h
250@@ -334,6 +334,16 @@250@@ -334,6 +334,16 @@
diff --git a/debian/patches/efinet-set-network-from-uefi-devpath.patch b/debian/patches/efinet-set-network-from-uefi-devpath.patch
index bba19a4..d0d2240 100644
--- a/debian/patches/efinet-set-network-from-uefi-devpath.patch
+++ b/debian/patches/efinet-set-network-from-uefi-devpath.patch
@@ -1,4 +1,4 @@
1From 1bacee679cef6c6f56af81108288c6468d8f6295 Mon Sep 17 00:00:00 20011From 521dfb27bc786d0567c97b704381677f57c4cfe4 Mon Sep 17 00:00:00 2001
2From: Michael Chang <mchang@suse.com>2From: Michael Chang <mchang@suse.com>
3Date: Thu, 27 Oct 2016 17:43:05 -04003Date: Thu, 27 Oct 2016 17:43:05 -0400
4Subject: efinet: Setting network from UEFI device path4Subject: efinet: Setting network from UEFI device path
@@ -34,7 +34,7 @@ Patch-Name: efinet-set-network-from-uefi-devpath.patch
34 2 files changed, 270 insertions(+), 9 deletions(-)34 2 files changed, 270 insertions(+), 9 deletions(-)
3535
36diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c36diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
37index fc90415f2..2d3b00f0e 10064437index fc90415f29..2d3b00f0e1 100644
38--- a/grub-core/net/drivers/efi/efinet.c38--- a/grub-core/net/drivers/efi/efinet.c
39+++ b/grub-core/net/drivers/efi/efinet.c39+++ b/grub-core/net/drivers/efi/efinet.c
40@@ -23,6 +23,7 @@40@@ -23,6 +23,7 @@
@@ -358,7 +358,7 @@ index fc90415f2..2d3b00f0e 100644
358 }358 }
359 }359 }
360diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h360diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
361index ca6cdc159..664cea37b 100644361index ca6cdc1596..664cea37b5 100644
362--- a/include/grub/efi/api.h362--- a/include/grub/efi/api.h
363+++ b/include/grub/efi/api.h363+++ b/include/grub/efi/api.h
364@@ -825,6 +825,8 @@ struct grub_efi_ipv4_device_path364@@ -825,6 +825,8 @@ struct grub_efi_ipv4_device_path
diff --git a/debian/patches/efinet-uefi-ipv6-pxe-support.patch b/debian/patches/efinet-uefi-ipv6-pxe-support.patch
index 531e73d..d1f2c02 100644
--- a/debian/patches/efinet-uefi-ipv6-pxe-support.patch
+++ b/debian/patches/efinet-uefi-ipv6-pxe-support.patch
@@ -1,4 +1,4 @@
1From 9afb0c174814d7235fc18623725cd037a76ff541 Mon Sep 17 00:00:00 20011From efa94cf400cddc721b15210e46471c867cf727e1 Mon Sep 17 00:00:00 2001
2From: Michael Chang <mchang@suse.com>2From: Michael Chang <mchang@suse.com>
3Date: Thu, 27 Oct 2016 17:41:21 -04003Date: Thu, 27 Oct 2016 17:41:21 -0400
4Subject: efinet: UEFI IPv6 PXE support4Subject: efinet: UEFI IPv6 PXE support
@@ -17,7 +17,7 @@ Patch-Name: efinet-uefi-ipv6-pxe-support.patch
17 2 files changed, 73 insertions(+), 6 deletions(-)17 2 files changed, 73 insertions(+), 6 deletions(-)
1818
19diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c19diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
20index 5388f952b..fc90415f2 10064420index 5388f952ba..fc90415f29 100644
21--- a/grub-core/net/drivers/efi/efinet.c21--- a/grub-core/net/drivers/efi/efinet.c
22+++ b/grub-core/net/drivers/efi/efinet.c22+++ b/grub-core/net/drivers/efi/efinet.c
23@@ -378,11 +378,25 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,23@@ -378,11 +378,25 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
@@ -52,7 +52,7 @@ index 5388f952b..fc90415f2 100644
52 }52 }
53 }53 }
54diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h54diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
55index addcbfa8f..ca6cdc159 10064455index addcbfa8fb..ca6cdc1596 100644
56--- a/include/grub/efi/api.h56--- a/include/grub/efi/api.h
57+++ b/include/grub/efi/api.h57+++ b/include/grub/efi/api.h
58@@ -1452,14 +1452,67 @@ typedef struct grub_efi_simple_text_output_interface grub_efi_simple_text_output58@@ -1452,14 +1452,67 @@ typedef struct grub_efi_simple_text_output_interface grub_efi_simple_text_output
diff --git a/debian/patches/gettext-quiet.patch b/debian/patches/gettext-quiet.patch
index 11a7e6f..6e5d4c2 100644
--- a/debian/patches/gettext-quiet.patch
+++ b/debian/patches/gettext-quiet.patch
@@ -1,4 +1,4 @@
1From 259b7fa08b66717709735370d05fc9eb64682484 Mon Sep 17 00:00:00 20011From 02b91d62746f4bde8349bbd605b18fb354a85048 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@ubuntu.com>2From: Colin Watson <cjwatson@ubuntu.com>
3Date: Mon, 13 Jan 2014 12:13:02 +00003Date: Mon, 13 Jan 2014 12:13:02 +0000
4Subject: Silence error messages when translations are unavailable4Subject: Silence error messages when translations are unavailable
@@ -13,7 +13,7 @@ Patch-Name: gettext-quiet.patch
13 1 file changed, 5 insertions(+)13 1 file changed, 5 insertions(+)
1414
15diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c15diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c
16index 4d02e62c1..2a19389f2 10064416index 4d02e62c10..2a19389f2a 100644
17--- a/grub-core/gettext/gettext.c17--- a/grub-core/gettext/gettext.c
18+++ b/grub-core/gettext/gettext.c18+++ b/grub-core/gettext/gettext.c
19@@ -427,6 +427,11 @@ grub_gettext_init_ext (struct grub_gettext_context *ctx,19@@ -427,6 +427,11 @@ grub_gettext_init_ext (struct grub_gettext_context *ctx,
diff --git a/debian/patches/gfxpayload-dynamic.patch b/debian/patches/gfxpayload-dynamic.patch
index 8545c4d..efdaa14 100644
--- a/debian/patches/gfxpayload-dynamic.patch
+++ b/debian/patches/gfxpayload-dynamic.patch
@@ -1,4 +1,4 @@
1From 2e91d5ab9adfb6a86b82b89715d6d9a7b3b52005 Mon Sep 17 00:00:00 20011From 40e9945c86cb9ea3d2a23789e7cdbce9905387e1 Mon Sep 17 00:00:00 2001
2From: Evan Broder <evan@ebroder.net>2From: Evan Broder <evan@ebroder.net>
3Date: Mon, 13 Jan 2014 12:13:29 +00003Date: Mon, 13 Jan 2014 12:13:29 +0000
4Subject: Add configure option to enable gfxpayload=keep dynamically4Subject: Add configure option to enable gfxpayload=keep dynamically
@@ -23,7 +23,7 @@ Patch-Name: gfxpayload-dynamic.patch
23 create mode 100644 grub-core/commands/i386/pc/hwmatch.c23 create mode 100644 grub-core/commands/i386/pc/hwmatch.c
2424
25diff --git a/configure.ac b/configure.ac25diff --git a/configure.ac b/configure.ac
26index 7dda5bb32..dbc429ce0 10064426index 7dda5bb32b..dbc429ce0a 100644
27--- a/configure.ac27--- a/configure.ac
28+++ b/configure.ac28+++ b/configure.ac
29@@ -1879,6 +1879,17 @@ else29@@ -1879,6 +1879,17 @@ else
@@ -45,7 +45,7 @@ index 7dda5bb32..dbc429ce0 100644
45 45
46 AC_SUBST([FONT_SOURCE])46 AC_SUBST([FONT_SOURCE])
47diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def47diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
48index 474a63e68..aadb4cdff 10064448index 474a63e68c..aadb4cdff8 100644
49--- a/grub-core/Makefile.core.def49--- a/grub-core/Makefile.core.def
50+++ b/grub-core/Makefile.core.def50+++ b/grub-core/Makefile.core.def
51@@ -971,6 +971,14 @@ module = {51@@ -971,6 +971,14 @@ module = {
@@ -65,7 +65,7 @@ index 474a63e68..aadb4cdff 100644
65 common = commands/keystatus.c;65 common = commands/keystatus.c;
66diff --git a/grub-core/commands/i386/pc/hwmatch.c b/grub-core/commands/i386/pc/hwmatch.c66diff --git a/grub-core/commands/i386/pc/hwmatch.c b/grub-core/commands/i386/pc/hwmatch.c
67new file mode 10064467new file mode 100644
68index 000000000..6de07cecc68index 0000000000..6de07cecc8
69--- /dev/null69--- /dev/null
70+++ b/grub-core/commands/i386/pc/hwmatch.c70+++ b/grub-core/commands/i386/pc/hwmatch.c
71@@ -0,0 +1,146 @@71@@ -0,0 +1,146 @@
@@ -216,7 +216,7 @@ index 000000000..6de07cecc
216+ grub_unregister_command (cmd);216+ grub_unregister_command (cmd);
217+}217+}
218diff --git a/include/grub/file.h b/include/grub/file.h218diff --git a/include/grub/file.h b/include/grub/file.h
219index 31567483c..e3c4cae2b 100644219index 31567483cc..e3c4cae2b5 100644
220--- a/include/grub/file.h220--- a/include/grub/file.h
221+++ b/include/grub/file.h221+++ b/include/grub/file.h
222@@ -122,6 +122,7 @@ enum grub_file_type222@@ -122,6 +122,7 @@ enum grub_file_type
@@ -228,7 +228,7 @@ index 31567483c..e3c4cae2b 100644
228 GRUB_FILE_TYPE_LOADENV,228 GRUB_FILE_TYPE_LOADENV,
229 GRUB_FILE_TYPE_SAVEENV,229 GRUB_FILE_TYPE_SAVEENV,
230diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in230diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
231index 2be66c702..09393c28e 100644231index 2be66c7028..09393c28ee 100644
232--- a/util/grub.d/10_linux.in232--- a/util/grub.d/10_linux.in
233+++ b/util/grub.d/10_linux.in233+++ b/util/grub.d/10_linux.in
234@@ -23,6 +23,7 @@ datarootdir="@datarootdir@"234@@ -23,6 +23,7 @@ datarootdir="@datarootdir@"
@@ -290,7 +290,7 @@ index 2be66c702..09393c28e 100644
290 # yet, so it's empty. In a submenu it will be equal to '\t' (one tab).290 # yet, so it's empty. In a submenu it will be equal to '\t' (one tab).
291 submenu_indentation=""291 submenu_indentation=""
292diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in292diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in
293index 548e14856..fc99f16e7 100755293index ec4b49d9d7..8cd7d12851 100755
294--- a/util/grub.d/10_linux_zfs.in294--- a/util/grub.d/10_linux_zfs.in
295+++ b/util/grub.d/10_linux_zfs.in295+++ b/util/grub.d/10_linux_zfs.in
296@@ -22,6 +22,7 @@ datarootdir="@datarootdir@"296@@ -22,6 +22,7 @@ datarootdir="@datarootdir@"
@@ -301,7 +301,7 @@ index 548e14856..fc99f16e7 100755
301 301
302 . "${pkgdatadir}/grub-mkconfig_lib"302 . "${pkgdatadir}/grub-mkconfig_lib"
303 303
304@@ -713,6 +714,41 @@ generate_grub_menu_metadata() {304@@ -716,6 +717,41 @@ generate_grub_menu_metadata() {
305 done305 done
306 }306 }
307 307
@@ -343,7 +343,7 @@ index 548e14856..fc99f16e7 100755
343 # Cache for prepare_grub_to_access_device call343 # Cache for prepare_grub_to_access_device call
344 # $1: boot_device344 # $1: boot_device
345 # $2: submenu_level345 # $2: submenu_level
346@@ -773,9 +809,11 @@ zfs_linux_entry () {346@@ -776,9 +812,11 @@ zfs_linux_entry () {
347 if [ "${GRUB_GFXPAYLOAD_LINUX}" != "text" ]; then347 if [ "${GRUB_GFXPAYLOAD_LINUX}" != "text" ]; then
348 echo "${submenu_indentation} load_video"348 echo "${submenu_indentation} load_video"
349 fi349 fi
@@ -358,7 +358,7 @@ index 548e14856..fc99f16e7 100755
358 fi358 fi
359 359
360 echo "${submenu_indentation} insmod gzio"360 echo "${submenu_indentation} insmod gzio"
361@@ -838,6 +876,8 @@ generate_grub_menu() {361@@ -841,6 +879,8 @@ generate_grub_menu() {
362 GRUB_CMDLINE_LINUX_RECOVERY="${GRUB_CMDLINE_LINUX_RECOVERY} nomodeset"362 GRUB_CMDLINE_LINUX_RECOVERY="${GRUB_CMDLINE_LINUX_RECOVERY} nomodeset"
363 fi363 fi
364 364
diff --git a/debian/patches/gfxpayload-keep-default.patch b/debian/patches/gfxpayload-keep-default.patch
index 114ce62..8f48114 100644
--- a/debian/patches/gfxpayload-keep-default.patch
+++ b/debian/patches/gfxpayload-keep-default.patch
@@ -1,4 +1,4 @@
1From 6da735cfaac928da6dc1283a15a669b1ddd07979 Mon Sep 17 00:00:00 20011From 6b3668640698cff6e0f57bba665a594c11f02841 Mon Sep 17 00:00:00 2001
2From: Didier Roche <didrocks@ubuntu.com>2From: Didier Roche <didrocks@ubuntu.com>
3Date: Tue, 31 Mar 2020 15:09:45 +02003Date: Tue, 31 Mar 2020 15:09:45 +0200
4Subject: Disable gfxpayload=keep by default4Subject: Disable gfxpayload=keep by default
@@ -24,7 +24,7 @@ Patch-Name: gfxpayload-keep-default.patch
24 2 files changed, 8 deletions(-)24 2 files changed, 8 deletions(-)
2525
26diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in26diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
27index a75096609..f839b3b55 10064427index a75096609a..f839b3b55f 100644
28--- a/util/grub.d/10_linux.in28--- a/util/grub.d/10_linux.in
29+++ b/util/grub.d/10_linux.in29+++ b/util/grub.d/10_linux.in
30@@ -118,10 +118,6 @@ linux_entry ()30@@ -118,10 +118,6 @@ linux_entry ()
@@ -39,10 +39,10 @@ index a75096609..f839b3b55 100644
39 if [ "x$GRUB_GFXPAYLOAD_LINUX" != xtext ]; then39 if [ "x$GRUB_GFXPAYLOAD_LINUX" != xtext ]; then
40 echo " load_video" | sed "s/^/$submenu_indentation/"40 echo " load_video" | sed "s/^/$submenu_indentation/"
41diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in41diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in
42index f50e1231a..d27634738 10075542index 5ec65fa941..b24587f0a5 100755
43--- a/util/grub.d/10_linux_zfs.in43--- a/util/grub.d/10_linux_zfs.in
44+++ b/util/grub.d/10_linux_zfs.in44+++ b/util/grub.d/10_linux_zfs.in
45@@ -741,10 +741,6 @@ zfs_linux_entry () {45@@ -744,10 +744,6 @@ zfs_linux_entry () {
46 # FIXME: We need an interface to select vesafb in case efifb can't be used.46 # FIXME: We need an interface to select vesafb in case efifb can't be used.
47 if [ "${GRUB_GFXPAYLOAD_LINUX}" = "" ]; then47 if [ "${GRUB_GFXPAYLOAD_LINUX}" = "" ]; then
48 echo "${submenu_indentation} load_video"48 echo "${submenu_indentation} load_video"
diff --git a/debian/patches/grub-install-pvxen-paths.patch b/debian/patches/grub-install-pvxen-paths.patch
index a160a43..b1ca1c4 100644
--- a/debian/patches/grub-install-pvxen-paths.patch
+++ b/debian/patches/grub-install-pvxen-paths.patch
@@ -1,4 +1,4 @@
1From 4e813c89c93bba7da480824d617e87659295841b Mon Sep 17 00:00:00 20011From 66bbce074947abe680475dacfb1cde35b7c17ef3 Mon Sep 17 00:00:00 2001
2From: Ian Campbell <ijc@hellion.org.uk>2From: Ian Campbell <ijc@hellion.org.uk>
3Date: Sat, 6 Sep 2014 12:20:12 +01003Date: Sat, 6 Sep 2014 12:20:12 +0100
4Subject: grub-install: Install PV Xen binaries into the upstream specified4Subject: grub-install: Install PV Xen binaries into the upstream specified
@@ -28,7 +28,7 @@ v2: Respect bootdir, create /boot/xen as needed.
28 1 file changed, 22 insertions(+), 2 deletions(-)28 1 file changed, 22 insertions(+), 2 deletions(-)
2929
30diff --git a/util/grub-install.c b/util/grub-install.c30diff --git a/util/grub-install.c b/util/grub-install.c
31index 70d6700de..64c292383 10064431index 70d6700de8..64c292383f 100644
32--- a/util/grub-install.c32--- a/util/grub-install.c
33+++ b/util/grub-install.c33+++ b/util/grub-install.c
34@@ -2058,6 +2058,28 @@ main (int argc, char *argv[])34@@ -2058,6 +2058,28 @@ main (int argc, char *argv[])
diff --git a/debian/patches/grub-legacy-0-based-partitions.patch b/debian/patches/grub-legacy-0-based-partitions.patch
index 2039c3f..09439dc 100644
--- a/debian/patches/grub-legacy-0-based-partitions.patch
+++ b/debian/patches/grub-legacy-0-based-partitions.patch
@@ -13,7 +13,7 @@ Patch-Name: grub-legacy-0-based-partitions.patch
13 1 file changed, 14 insertions(+)13 1 file changed, 14 insertions(+)
1414
15diff --git a/util/getroot.c b/util/getroot.c15diff --git a/util/getroot.c b/util/getroot.c
16index 847406fba..cdd41153c 10064416index 847406fbab..cdd41153c5 100644
17--- a/util/getroot.c17--- a/util/getroot.c
18+++ b/util/getroot.c18+++ b/util/getroot.c
19@@ -245,6 +245,20 @@ find_partition (grub_disk_t dsk __attribute__ ((unused)),19@@ -245,6 +245,20 @@ find_partition (grub_disk_t dsk __attribute__ ((unused)),
diff --git a/debian/patches/grub.cfg-400.patch b/debian/patches/grub.cfg-400.patch
index 1fee91a..4731767 100644
--- a/debian/patches/grub.cfg-400.patch
+++ b/debian/patches/grub.cfg-400.patch
@@ -9,7 +9,7 @@ Patch-Name: grub.cfg-400.patch
9 1 file changed, 4 insertions(+)9 1 file changed, 4 insertions(+)
1010
11diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in11diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
12index 9f477ff05..45cd4cc54 10064412index 9f477ff054..45cd4cc541 100644
13--- a/util/grub-mkconfig.in13--- a/util/grub-mkconfig.in
14+++ b/util/grub-mkconfig.in14+++ b/util/grub-mkconfig.in
15@@ -276,6 +276,10 @@ for i in "${grub_mkconfig_dir}"/* ; do15@@ -276,6 +276,10 @@ for i in "${grub_mkconfig_dir}"/* ; do
diff --git a/debian/patches/ieee1275-clear-reset.patch b/debian/patches/ieee1275-clear-reset.patch
index 1d082e6..3d73e0c 100644
--- a/debian/patches/ieee1275-clear-reset.patch
+++ b/debian/patches/ieee1275-clear-reset.patch
@@ -1,4 +1,4 @@
1From 07e29f9e7e317d74d41fed30c6a8ade4f301652c Mon Sep 17 00:00:00 20011From 8bec2a413fc7fe8f2a48d37d8127322ebc96971d Mon Sep 17 00:00:00 2001
2From: Paulo Flabiano Smorigo <pfsmorigo@linux.vnet.ibm.com>2From: Paulo Flabiano Smorigo <pfsmorigo@linux.vnet.ibm.com>
3Date: Thu, 25 Sep 2014 18:41:29 -03003Date: Thu, 25 Sep 2014 18:41:29 -0300
4Subject: Include a text attribute reset in the clear command for ppc4Subject: Include a text attribute reset in the clear command for ppc
@@ -18,7 +18,7 @@ Patch-Name: ieee1275-clear-reset.patch
18 1 file changed, 1 insertion(+), 1 deletion(-)18 1 file changed, 1 insertion(+), 1 deletion(-)
1919
20diff --git a/grub-core/term/terminfo.c b/grub-core/term/terminfo.c20diff --git a/grub-core/term/terminfo.c b/grub-core/term/terminfo.c
21index d317efa36..63892ad42 10064421index d317efa368..63892ad427 100644
22--- a/grub-core/term/terminfo.c22--- a/grub-core/term/terminfo.c
23+++ b/grub-core/term/terminfo.c23+++ b/grub-core/term/terminfo.c
24@@ -151,7 +151,7 @@ grub_terminfo_set_current (struct grub_term_output *term,24@@ -151,7 +151,7 @@ grub_terminfo_set_current (struct grub_term_output *term,
diff --git a/debian/patches/ignore-grub_func_test-failures.patch b/debian/patches/ignore-grub_func_test-failures.patch
index cbbd3b2..76734f6 100644
--- a/debian/patches/ignore-grub_func_test-failures.patch
+++ b/debian/patches/ignore-grub_func_test-failures.patch
@@ -1,4 +1,4 @@
1From 11457a76c942775508953575e1b284f4c03ee192 Mon Sep 17 00:00:00 20011From a4eaed2b739501db9b1009cd778fc72e9670f9ce Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org>2From: Colin Watson <cjwatson@debian.org>
3Date: Mon, 13 Jan 2014 12:13:32 +00003Date: Mon, 13 Jan 2014 12:13:32 +0000
4Subject: Ignore functional test failures for now as they are broken4Subject: Ignore functional test failures for now as they are broken
@@ -14,7 +14,7 @@ Patch-Name: ignore-grub_func_test-failures.patch
14 1 file changed, 3 insertions(+), 1 deletion(-)14 1 file changed, 3 insertions(+), 1 deletion(-)
1515
16diff --git a/tests/grub_func_test.in b/tests/grub_func_test.in16diff --git a/tests/grub_func_test.in b/tests/grub_func_test.in
17index c67f9e422..728cd6e06 10064417index c67f9e4225..728cd6e066 100644
18--- a/tests/grub_func_test.in18--- a/tests/grub_func_test.in
19+++ b/tests/grub_func_test.in19+++ b/tests/grub_func_test.in
20@@ -16,6 +16,8 @@ out=`echo all_functional_test | @builddir@/grub-shell --timeout=3600 --files="/b20@@ -16,6 +16,8 @@ out=`echo all_functional_test | @builddir@/grub-shell --timeout=3600 --files="/b
diff --git a/debian/patches/insmod-xzio-and-lzopio-on-xen.patch b/debian/patches/insmod-xzio-and-lzopio-on-xen.patch
index b16f128..6570f74 100644
--- a/debian/patches/insmod-xzio-and-lzopio-on-xen.patch
+++ b/debian/patches/insmod-xzio-and-lzopio-on-xen.patch
@@ -1,4 +1,4 @@
1From 125b4317bafb66a6e9381041102c7d789c296ea4 Mon Sep 17 00:00:00 20011From c58c9d77ccd16511db098247b5cbba5abcaac99f Mon Sep 17 00:00:00 2001
2From: Ian Campbell <ijc@debian.org>2From: Ian Campbell <ijc@debian.org>
3Date: Sun, 30 Nov 2014 12:12:52 +00003Date: Sun, 30 Nov 2014 12:12:52 +0000
4Subject: Arrange to insmod xzio and lzopio when booting a kernel as a Xen4Subject: Arrange to insmod xzio and lzopio when booting a kernel as a Xen
@@ -21,7 +21,7 @@ Patch-Name: insmod-xzio-and-lzopio-on-xen.patch
21 2 files changed, 2 insertions(+)21 2 files changed, 2 insertions(+)
2222
23diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in23diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
24index 2c418c5ec..85b30084a 10064424index 2c418c5ec8..85b30084ad 100644
25--- a/util/grub.d/10_linux.in25--- a/util/grub.d/10_linux.in
26+++ b/util/grub.d/10_linux.in26+++ b/util/grub.d/10_linux.in
27@@ -166,6 +166,7 @@ linux_entry ()27@@ -166,6 +166,7 @@ linux_entry ()
@@ -33,10 +33,10 @@ index 2c418c5ec..85b30084a 100644
33 if [ x$dirname = x/ ]; then33 if [ x$dirname = x/ ]; then
34 if [ -z "${prepare_root_cache}" ]; then34 if [ -z "${prepare_root_cache}" ]; then
35diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in35diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in
36index b068f0e96..efdb8afae 10075536index 4477fa6061..4c48abef01 100755
37--- a/util/grub.d/10_linux_zfs.in37--- a/util/grub.d/10_linux_zfs.in
38+++ b/util/grub.d/10_linux_zfs.in38+++ b/util/grub.d/10_linux_zfs.in
39@@ -835,6 +835,7 @@ zfs_linux_entry () {39@@ -838,6 +838,7 @@ zfs_linux_entry () {
40 fi40 fi
41 41
42 echo "${submenu_indentation} insmod gzio"42 echo "${submenu_indentation} insmod gzio"
diff --git a/debian/patches/install-efi-fallback.patch b/debian/patches/install-efi-fallback.patch
index 6c0f0cf..5a36b4e 100644
--- a/debian/patches/install-efi-fallback.patch
+++ b/debian/patches/install-efi-fallback.patch
@@ -1,4 +1,4 @@
1From 342cbb4b33a6d47e7c1b645ace365203f31165e2 Mon Sep 17 00:00:00 20011From 8a5b764a450f0d67f940c2ffbe80eae053753c19 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@ubuntu.com>2From: Colin Watson <cjwatson@ubuntu.com>
3Date: Mon, 13 Jan 2014 12:13:05 +00003Date: Mon, 13 Jan 2014 12:13:05 +0000
4Subject: Fall back to non-EFI if booted using EFI but -efi is missing4Subject: Fall back to non-EFI if booted using EFI but -efi is missing
@@ -19,7 +19,7 @@ Patch-Name: install-efi-fallback.patch
19 1 file changed, 35 insertions(+), 5 deletions(-)19 1 file changed, 35 insertions(+), 5 deletions(-)
2020
21diff --git a/grub-core/osdep/linux/platform.c b/grub-core/osdep/linux/platform.c21diff --git a/grub-core/osdep/linux/platform.c b/grub-core/osdep/linux/platform.c
22index e28a79dab..2e7f72086 10064422index e28a79dab3..2e7f720869 100644
23--- a/grub-core/osdep/linux/platform.c23--- a/grub-core/osdep/linux/platform.c
24+++ b/grub-core/osdep/linux/platform.c24+++ b/grub-core/osdep/linux/platform.c
25@@ -19,10 +19,12 @@25@@ -19,10 +19,12 @@
diff --git a/debian/patches/install-efi-ubuntu-flavours.patch b/debian/patches/install-efi-ubuntu-flavours.patch
index 31a74c8..1a6023c 100644
--- a/debian/patches/install-efi-ubuntu-flavours.patch
+++ b/debian/patches/install-efi-ubuntu-flavours.patch
@@ -1,4 +1,4 @@
1From 6def03933e04c3f0d3bbcb37b96dc08d1ba67d74 Mon Sep 17 00:00:00 20011From 73faf5c430fe03ec081a838af0e96ad4c42ab26f Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@ubuntu.com>2From: Colin Watson <cjwatson@ubuntu.com>
3Date: Mon, 13 Jan 2014 12:13:27 +00003Date: Mon, 13 Jan 2014 12:13:27 +0000
4Subject: Cope with Kubuntu setting GRUB_DISTRIBUTOR4Subject: Cope with Kubuntu setting GRUB_DISTRIBUTOR
@@ -17,7 +17,7 @@ Patch-Name: install-efi-ubuntu-flavours.patch
17 1 file changed, 2 insertions(+)17 1 file changed, 2 insertions(+)
1818
19diff --git a/util/grub-install.c b/util/grub-install.c19diff --git a/util/grub-install.c b/util/grub-install.c
20index e1e40cf2b..f0d59c180 10064420index e1e40cf2b5..f0d59c1809 100644
21--- a/util/grub-install.c21--- a/util/grub-install.c
22+++ b/util/grub-install.c22+++ b/util/grub-install.c
23@@ -1115,6 +1115,8 @@ main (int argc, char *argv[])23@@ -1115,6 +1115,8 @@ main (int argc, char *argv[])
diff --git a/debian/patches/install-locale-langpack.patch b/debian/patches/install-locale-langpack.patch
index 4537170..531fb38 100644
--- a/debian/patches/install-locale-langpack.patch
+++ b/debian/patches/install-locale-langpack.patch
@@ -1,4 +1,4 @@
1From 4f4b15148b61872395936b083eae7b843ac7d373 Mon Sep 17 00:00:00 20011From 50921522fab0f4ce529b6c7acd6354b1b3cff2b1 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@ubuntu.com>2From: Colin Watson <cjwatson@ubuntu.com>
3Date: Mon, 13 Jan 2014 12:13:07 +00003Date: Mon, 13 Jan 2014 12:13:07 +0000
4Subject: Prefer translations from Ubuntu language packs if available4Subject: Prefer translations from Ubuntu language packs if available
@@ -13,7 +13,7 @@ Patch-Name: install-locale-langpack.patch
13 1 file changed, 30 insertions(+), 7 deletions(-)13 1 file changed, 30 insertions(+), 7 deletions(-)
1414
15diff --git a/util/grub-install-common.c b/util/grub-install-common.c15diff --git a/util/grub-install-common.c b/util/grub-install-common.c
16index ca0ac612a..fdfe2c7ea 10064416index ca0ac612ac..fdfe2c7ead 100644
17--- a/util/grub-install-common.c17--- a/util/grub-install-common.c
18+++ b/util/grub-install-common.c18+++ b/util/grub-install-common.c
19@@ -609,17 +609,25 @@ get_localedir (void)19@@ -609,17 +609,25 @@ get_localedir (void)
diff --git a/debian/patches/install-powerpc-machtypes.patch b/debian/patches/install-powerpc-machtypes.patch
index bbc8d71..0bd6bcc 100644
--- a/debian/patches/install-powerpc-machtypes.patch
+++ b/debian/patches/install-powerpc-machtypes.patch
@@ -1,4 +1,4 @@
1From 6468fe3eb25e597acd0c80e3f7b5930472328d89 Mon Sep 17 00:00:00 20011From 2b3e762ebb12ce0d5a562dd36d23bca5d78aa61c Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org>2From: Colin Watson <cjwatson@debian.org>
3Date: Tue, 28 Jan 2014 14:40:02 +00003Date: Tue, 28 Jan 2014 14:40:02 +0000
4Subject: Port yaboot logic for various powerpc machine types4Subject: Port yaboot logic for various powerpc machine types
@@ -25,7 +25,7 @@ Patch-Name: install-powerpc-machtypes.patch
25 6 files changed, 119 insertions(+), 6 deletions(-)25 6 files changed, 119 insertions(+), 6 deletions(-)
2626
27diff --git a/grub-core/osdep/basic/platform.c b/grub-core/osdep/basic/platform.c27diff --git a/grub-core/osdep/basic/platform.c b/grub-core/osdep/basic/platform.c
28index a7dafd85a..6c293ed2d 10064428index a7dafd85a9..6c293ed2d0 100644
29--- a/grub-core/osdep/basic/platform.c29--- a/grub-core/osdep/basic/platform.c
30+++ b/grub-core/osdep/basic/platform.c30+++ b/grub-core/osdep/basic/platform.c
31@@ -30,3 +30,8 @@ grub_install_get_default_x86_platform (void)31@@ -30,3 +30,8 @@ grub_install_get_default_x86_platform (void)
@@ -38,7 +38,7 @@ index a7dafd85a..6c293ed2d 100644
38+ return "generic";38+ return "generic";
39+}39+}
40diff --git a/grub-core/osdep/linux/platform.c b/grub-core/osdep/linux/platform.c40diff --git a/grub-core/osdep/linux/platform.c b/grub-core/osdep/linux/platform.c
41index 2e7f72086..5b37366d4 10064441index 2e7f720869..5b37366d4d 100644
42--- a/grub-core/osdep/linux/platform.c42--- a/grub-core/osdep/linux/platform.c
43+++ b/grub-core/osdep/linux/platform.c43+++ b/grub-core/osdep/linux/platform.c
44@@ -24,6 +24,7 @@44@@ -24,6 +24,7 @@
@@ -125,7 +125,7 @@ index 2e7f72086..5b37366d4 100644
125+ return machtype;125+ return machtype;
126+}126+}
127diff --git a/grub-core/osdep/unix/platform.c b/grub-core/osdep/unix/platform.c127diff --git a/grub-core/osdep/unix/platform.c b/grub-core/osdep/unix/platform.c
128index 55b8f4016..9c439326a 100644128index 55b8f40162..9c439326a0 100644
129--- a/grub-core/osdep/unix/platform.c129--- a/grub-core/osdep/unix/platform.c
130+++ b/grub-core/osdep/unix/platform.c130+++ b/grub-core/osdep/unix/platform.c
131@@ -218,13 +218,29 @@ grub_install_register_ieee1275 (int is_prep, const char *install_device,131@@ -218,13 +218,29 @@ grub_install_register_ieee1275 (int is_prep, const char *install_device,
@@ -165,7 +165,7 @@ index 55b8f4016..9c439326a 100644
165 165
166 free (boot_device);166 free (boot_device);
167diff --git a/grub-core/osdep/windows/platform.c b/grub-core/osdep/windows/platform.c167diff --git a/grub-core/osdep/windows/platform.c b/grub-core/osdep/windows/platform.c
168index 7eb53fe01..e19a3d9a8 100644168index 7eb53fe01b..e19a3d9a8a 100644
169--- a/grub-core/osdep/windows/platform.c169--- a/grub-core/osdep/windows/platform.c
170+++ b/grub-core/osdep/windows/platform.c170+++ b/grub-core/osdep/windows/platform.c
171@@ -128,6 +128,12 @@ grub_install_get_default_x86_platform (void)171@@ -128,6 +128,12 @@ grub_install_get_default_x86_platform (void)
@@ -182,7 +182,7 @@ index 7eb53fe01..e19a3d9a8 100644
182 get_efi_variable (const wchar_t *varname, ssize_t *len)182 get_efi_variable (const wchar_t *varname, ssize_t *len)
183 {183 {
184diff --git a/include/grub/util/install.h b/include/grub/util/install.h184diff --git a/include/grub/util/install.h b/include/grub/util/install.h
185index 2631b1074..8aeb5c4f2 100644185index 2631b10745..8aeb5c4f20 100644
186--- a/include/grub/util/install.h186--- a/include/grub/util/install.h
187+++ b/include/grub/util/install.h187+++ b/include/grub/util/install.h
188@@ -216,6 +216,9 @@ grub_install_get_default_arm_platform (void);188@@ -216,6 +216,9 @@ grub_install_get_default_arm_platform (void);
@@ -196,7 +196,7 @@ index 2631b1074..8aeb5c4f2 100644
196 grub_install_register_efi (grub_device_t efidir_grub_dev,196 grub_install_register_efi (grub_device_t efidir_grub_dev,
197 const char *efifile_path,197 const char *efifile_path,
198diff --git a/util/grub-install.c b/util/grub-install.c198diff --git a/util/grub-install.c b/util/grub-install.c
199index f0d59c180..70d6700de 100644199index f0d59c1809..70d6700de8 100644
200--- a/util/grub-install.c200--- a/util/grub-install.c
201+++ b/util/grub-install.c201+++ b/util/grub-install.c
202@@ -1177,7 +1177,18 @@ main (int argc, char *argv[])202@@ -1177,7 +1177,18 @@ main (int argc, char *argv[])
diff --git a/debian/patches/install-stage2-confusion.patch b/debian/patches/install-stage2-confusion.patch
index a803a68..fafe60f 100644
--- a/debian/patches/install-stage2-confusion.patch
+++ b/debian/patches/install-stage2-confusion.patch
@@ -1,4 +1,4 @@
1From d9969cb0267a40684bf7a60d70bfc3fc8a962a90 Mon Sep 17 00:00:00 20011From bd93043d187b87d8faa11135f3414d67da95a167 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org>2From: Colin Watson <cjwatson@debian.org>
3Date: Mon, 13 Jan 2014 12:12:58 +00003Date: Mon, 13 Jan 2014 12:12:58 +0000
4Subject: If GRUB Legacy is still around, tell packaging to ignore it4Subject: If GRUB Legacy is still around, tell packaging to ignore it
@@ -13,7 +13,7 @@ Patch-Name: install-stage2-confusion.patch
13 1 file changed, 14 insertions(+)13 1 file changed, 14 insertions(+)
1414
15diff --git a/util/grub-install.c b/util/grub-install.c15diff --git a/util/grub-install.c b/util/grub-install.c
16index 8a55ad4b8..3b4606eef 10064416index 8a55ad4b8d..3b4606eef1 100644
17--- a/util/grub-install.c17--- a/util/grub-install.c
18+++ b/util/grub-install.c18+++ b/util/grub-install.c
19@@ -42,6 +42,7 @@19@@ -42,6 +42,7 @@
diff --git a/debian/patches/maybe-quiet.patch b/debian/patches/maybe-quiet.patch
index 64e8d68..da80c4b 100644
--- a/debian/patches/maybe-quiet.patch
+++ b/debian/patches/maybe-quiet.patch
@@ -1,4 +1,4 @@
1From f93cd4fda2916af2b70228878f97cb7bbdeb234d Mon Sep 17 00:00:00 20011From 139c9faecee68370e4b46d50ca51d0524029212c Mon Sep 17 00:00:00 2001
2From: Didier Roche <didrocks@ubuntu.com>2From: Didier Roche <didrocks@ubuntu.com>
3Date: Tue, 31 Mar 2020 15:20:15 +02003Date: Tue, 31 Mar 2020 15:20:15 +0200
4Subject: Add configure option to reduce visual clutter at boot time4Subject: Add configure option to reduce visual clutter at boot time
@@ -47,7 +47,7 @@ Patch-Name: maybe-quiet.patch
47 10 files changed, 118 insertions(+), 8 deletions(-)47 10 files changed, 118 insertions(+), 8 deletions(-)
4848
49diff --git a/config.h.in b/config.h.in49diff --git a/config.h.in b/config.h.in
50index 9e8f9911b..d2c4ce8e5 10064450index 9e8f9911b1..d2c4ce8e51 100644
51--- a/config.h.in51--- a/config.h.in
52+++ b/config.h.in52+++ b/config.h.in
53@@ -12,6 +12,8 @@53@@ -12,6 +12,8 @@
@@ -60,7 +60,7 @@ index 9e8f9911b..d2c4ce8e5 100644
60 /* We don't need those. */60 /* We don't need those. */
61 #define MINILZO_CFG_SKIP_LZO_PTR 161 #define MINILZO_CFG_SKIP_LZO_PTR 1
62diff --git a/configure.ac b/configure.ac62diff --git a/configure.ac b/configure.ac
63index 1e5abc67d..ea00ccd69 10064463index 1e5abc67d9..ea00ccd691 100644
64--- a/configure.ac64--- a/configure.ac
65+++ b/configure.ac65+++ b/configure.ac
66@@ -1857,6 +1857,17 @@ else66@@ -1857,6 +1857,17 @@ else
@@ -93,7 +93,7 @@ index 1e5abc67d..ea00ccd69 100644
93 echo "*******************************************************"93 echo "*******************************************************"
94 ]94 ]
95diff --git a/grub-core/boot/i386/pc/boot.S b/grub-core/boot/i386/pc/boot.S95diff --git a/grub-core/boot/i386/pc/boot.S b/grub-core/boot/i386/pc/boot.S
96index 2bd0b2d28..b0c0f2225 10064496index 2bd0b2d286..b0c0f2225e 100644
97--- a/grub-core/boot/i386/pc/boot.S97--- a/grub-core/boot/i386/pc/boot.S
98+++ b/grub-core/boot/i386/pc/boot.S98+++ b/grub-core/boot/i386/pc/boot.S
99@@ -19,6 +19,9 @@99@@ -19,6 +19,9 @@
@@ -125,7 +125,7 @@ index 2bd0b2d28..b0c0f2225 100644
125 movw $disk_address_packet, %si125 movw $disk_address_packet, %si
126 126
127diff --git a/grub-core/boot/i386/pc/diskboot.S b/grub-core/boot/i386/pc/diskboot.S127diff --git a/grub-core/boot/i386/pc/diskboot.S b/grub-core/boot/i386/pc/diskboot.S
128index c1addc0df..9b6d7a7ed 100644128index c1addc0df2..9b6d7a7edc 100644
129--- a/grub-core/boot/i386/pc/diskboot.S129--- a/grub-core/boot/i386/pc/diskboot.S
130+++ b/grub-core/boot/i386/pc/diskboot.S130+++ b/grub-core/boot/i386/pc/diskboot.S
131@@ -18,6 +18,9 @@131@@ -18,6 +18,9 @@
@@ -205,7 +205,7 @@ index c1addc0df..9b6d7a7ed 100644
205 205
206 notification_step: .asciz "."206 notification_step: .asciz "."
207diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c207diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
208index 9cad0c448..714b63d67 100644208index 9cad0c4485..714b63d674 100644
209--- a/grub-core/kern/main.c209--- a/grub-core/kern/main.c
210+++ b/grub-core/kern/main.c210+++ b/grub-core/kern/main.c
211@@ -264,15 +264,25 @@ reclaim_module_space (void)211@@ -264,15 +264,25 @@ reclaim_module_space (void)
@@ -248,7 +248,7 @@ index 9cad0c448..714b63d67 100644
248 grub_rescue_run ();248 grub_rescue_run ();
249 }249 }
250diff --git a/grub-core/kern/rescue_reader.c b/grub-core/kern/rescue_reader.c250diff --git a/grub-core/kern/rescue_reader.c b/grub-core/kern/rescue_reader.c
251index dcd7d4439..a93524eab 100644251index dcd7d44397..a93524eabb 100644
252--- a/grub-core/kern/rescue_reader.c252--- a/grub-core/kern/rescue_reader.c
253+++ b/grub-core/kern/rescue_reader.c253+++ b/grub-core/kern/rescue_reader.c
254@@ -78,7 +78,9 @@ grub_rescue_read_line (char **line, int cont,254@@ -78,7 +78,9 @@ grub_rescue_read_line (char **line, int cont,
@@ -262,7 +262,7 @@ index dcd7d4439..a93524eab 100644
262 while (1)262 while (1)
263 {263 {
264diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c264diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
265index 1b03dfd57..0aa389fa1 100644265index 1b03dfd57b..0aa389fa16 100644
266--- a/grub-core/normal/main.c266--- a/grub-core/normal/main.c
267+++ b/grub-core/normal/main.c267+++ b/grub-core/normal/main.c
268@@ -389,6 +389,15 @@ static grub_err_t268@@ -389,6 +389,15 @@ static grub_err_t
@@ -292,7 +292,7 @@ index 1b03dfd57..0aa389fa1 100644
292 while (1)292 while (1)
293 {293 {
294diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c294diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
295index 3611ee9ea..ebf5a0f10 100644295index 3611ee9ea7..ebf5a0f109 100644
296--- a/grub-core/normal/menu.c296--- a/grub-core/normal/menu.c
297+++ b/grub-core/normal/menu.c297+++ b/grub-core/normal/menu.c
298@@ -827,12 +827,18 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)298@@ -827,12 +827,18 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
@@ -339,7 +339,7 @@ index 3611ee9ea..ebf5a0f10 100644
339 if (auto_boot)339 if (auto_boot)
340 grub_menu_execute_with_fallback (menu, e, autobooted,340 grub_menu_execute_with_fallback (menu, e, autobooted,
341diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in341diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
342index cb1cc200e..479a8bf4e 100644342index cb1cc200e4..479a8bf4e5 100644
343--- a/util/grub.d/10_linux.in343--- a/util/grub.d/10_linux.in
344+++ b/util/grub.d/10_linux.in344+++ b/util/grub.d/10_linux.in
345@@ -21,6 +21,7 @@ prefix="@prefix@"345@@ -21,6 +21,7 @@ prefix="@prefix@"
@@ -386,7 +386,7 @@ index cb1cc200e..479a8bf4e 100644
386 EOF386 EOF
387 fi387 fi
388diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in388diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in
389index c1dfe8ae8..1a656b2dd 100755389index bd4f1a2123..3a0e6d1035 100755
390--- a/util/grub.d/10_linux_zfs.in390--- a/util/grub.d/10_linux_zfs.in
391+++ b/util/grub.d/10_linux_zfs.in391+++ b/util/grub.d/10_linux_zfs.in
392@@ -20,6 +20,7 @@ set -e392@@ -20,6 +20,7 @@ set -e
@@ -397,7 +397,7 @@ index c1dfe8ae8..1a656b2dd 100755
397 397
398 . "${pkgdatadir}/grub-mkconfig_lib"398 . "${pkgdatadir}/grub-mkconfig_lib"
399 399
400@@ -776,7 +777,9 @@ zfs_linux_entry () {400@@ -779,7 +780,9 @@ zfs_linux_entry () {
401 401
402 echo "$(prepare_grub_to_access_device_cached "${boot_device}" "${submenu_level}")"402 echo "$(prepare_grub_to_access_device_cached "${boot_device}" "${submenu_level}")"
403 403
@@ -408,7 +408,7 @@ index c1dfe8ae8..1a656b2dd 100755
408 408
409 linux_default_args="${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"409 linux_default_args="${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
410 if [ ${type} = "recovery" ]; then410 if [ ${type} = "recovery" ]; then
411@@ -785,7 +788,9 @@ zfs_linux_entry () {411@@ -788,7 +791,9 @@ zfs_linux_entry () {
412 412
413 echo "${submenu_indentation} linux ${kernel} root=ZFS=${dataset} ro ${linux_default_args} ${kernel_additional_args}"413 echo "${submenu_indentation} linux ${kernel} root=ZFS=${dataset} ro ${linux_default_args} ${kernel_additional_args}"
414 414
diff --git a/debian/patches/mkconfig-loopback.patch b/debian/patches/mkconfig-loopback.patch
index 0c7498b..ce4465d 100644
--- a/debian/patches/mkconfig-loopback.patch
+++ b/debian/patches/mkconfig-loopback.patch
@@ -1,4 +1,4 @@
1From 4750b94c28b61e29d3f1bfce6bc7fa8f48c45526 Mon Sep 17 00:00:00 20011From 3883a00c8f4a4f59b6a677622776d5bf51337b65 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org>2From: Colin Watson <cjwatson@debian.org>
3Date: Mon, 13 Jan 2014 12:13:00 +00003Date: Mon, 13 Jan 2014 12:13:00 +0000
4Subject: Handle filesystems loop-mounted on file images4Subject: Handle filesystems loop-mounted on file images
@@ -21,7 +21,7 @@ Patch-Name: mkconfig-loopback.patch
21 3 files changed, 34 insertions(+)21 3 files changed, 34 insertions(+)
2222
23diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in23diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
24index b6606c16e..b05df554d 10064424index b6606c16e0..b05df554da 100644
25--- a/util/grub-mkconfig_lib.in25--- a/util/grub-mkconfig_lib.in
26+++ b/util/grub-mkconfig_lib.in26+++ b/util/grub-mkconfig_lib.in
27@@ -133,6 +133,22 @@ prepare_grub_to_access_device ()27@@ -133,6 +133,22 @@ prepare_grub_to_access_device ()
@@ -63,7 +63,7 @@ index b6606c16e..b05df554d 100644
63 63
64 grub_get_device_id ()64 grub_get_device_id ()
65diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in65diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
66index f839b3b55..d927b60ae 10064466index f839b3b55f..d927b60ae2 100644
67--- a/util/grub.d/10_linux.in67--- a/util/grub.d/10_linux.in
68+++ b/util/grub.d/10_linux.in68+++ b/util/grub.d/10_linux.in
69@@ -40,6 +40,11 @@ fi69@@ -40,6 +40,11 @@ fi
@@ -79,7 +79,7 @@ index f839b3b55..d927b60ae 100644
79 esac79 esac
80 80
81diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in81diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
82index 96179ea61..9a8d42fb5 10064482index 96179ea613..9a8d42fb57 100644
83--- a/util/grub.d/20_linux_xen.in83--- a/util/grub.d/20_linux_xen.in
84+++ b/util/grub.d/20_linux_xen.in84+++ b/util/grub.d/20_linux_xen.in
85@@ -40,6 +40,11 @@ fi85@@ -40,6 +40,11 @@ fi
diff --git a/debian/patches/mkconfig-mid-upgrade.patch b/debian/patches/mkconfig-mid-upgrade.patch
index 248f6c3..c033bba 100644
--- a/debian/patches/mkconfig-mid-upgrade.patch
+++ b/debian/patches/mkconfig-mid-upgrade.patch
@@ -1,4 +1,4 @@
1From 8ce50d6419c04a49070868a4245664419e0901fa Mon Sep 17 00:00:00 20011From 16f168810740a2fd3defa4856ead7b8ded2d1fb5 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@ubuntu.com>2From: Colin Watson <cjwatson@ubuntu.com>
3Date: Mon, 13 Jan 2014 12:13:03 +00003Date: Mon, 13 Jan 2014 12:13:03 +0000
4Subject: Bail out if trying to run grub-mkconfig during upgrade to 2.004Subject: Bail out if trying to run grub-mkconfig during upgrade to 2.00
@@ -20,7 +20,7 @@ Patch-Name: mkconfig-mid-upgrade.patch
20 1 file changed, 7 insertions(+)20 1 file changed, 7 insertions(+)
2121
22diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in22diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
23index 45cd4cc54..b506d63bf 10064423index 45cd4cc541..b506d63bf9 100644
24--- a/util/grub-mkconfig.in24--- a/util/grub-mkconfig.in
25+++ b/util/grub-mkconfig.in25+++ b/util/grub-mkconfig.in
26@@ -102,6 +102,13 @@ do26@@ -102,6 +102,13 @@ do
diff --git a/debian/patches/mkconfig-nonexistent-loopback.patch b/debian/patches/mkconfig-nonexistent-loopback.patch
index 9b8b848..9ff8309 100644
--- a/debian/patches/mkconfig-nonexistent-loopback.patch
+++ b/debian/patches/mkconfig-nonexistent-loopback.patch
@@ -1,4 +1,4 @@
1From c754f6529f31d14b1110f457e9244f6454a2ed4e Mon Sep 17 00:00:00 20011From 0a12aab871f0e938738305d89fc1e32915ea7fda Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@ubuntu.com>2From: Colin Watson <cjwatson@ubuntu.com>
3Date: Mon, 13 Jan 2014 12:13:08 +00003Date: Mon, 13 Jan 2014 12:13:08 +0000
4Subject: Avoid getting confused by inaccessible loop device backing paths4Subject: Avoid getting confused by inaccessible loop device backing paths
@@ -14,7 +14,7 @@ Patch-Name: mkconfig-nonexistent-loopback.patch
14 2 files changed, 6 insertions(+), 5 deletions(-)14 2 files changed, 6 insertions(+), 5 deletions(-)
1515
16diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in16diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
17index b05df554d..fe6319abe 10064417index b05df554da..fe6319abe0 100644
18--- a/util/grub-mkconfig_lib.in18--- a/util/grub-mkconfig_lib.in
19+++ b/util/grub-mkconfig_lib.in19+++ b/util/grub-mkconfig_lib.in
20@@ -143,7 +143,7 @@ prepare_grub_to_access_device ()20@@ -143,7 +143,7 @@ prepare_grub_to_access_device ()
@@ -27,7 +27,7 @@ index b05df554d..fe6319abe 100644
27 esac27 esac
28 ;;28 ;;
29diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in29diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
30index 775ceb2e0..b7e1147c4 10064430index 775ceb2e04..b7e1147c41 100644
31--- a/util/grub.d/30_os-prober.in31--- a/util/grub.d/30_os-prober.in
32+++ b/util/grub.d/30_os-prober.in32+++ b/util/grub.d/30_os-prober.in
33@@ -219,6 +219,11 @@ EOF33@@ -219,6 +219,11 @@ EOF
diff --git a/debian/patches/mkconfig-other-inits.patch b/debian/patches/mkconfig-other-inits.patch
index e7dd0b6..4b504fb 100644
--- a/debian/patches/mkconfig-other-inits.patch
+++ b/debian/patches/mkconfig-other-inits.patch
@@ -1,4 +1,4 @@
1From 0564e92b1f182280d433e829406bdf91dd19a357 Mon Sep 17 00:00:00 20011From 22359dec23434867f467cb704aa771fd63e5ecd9 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org>2From: Colin Watson <cjwatson@debian.org>
3Date: Sat, 3 Jan 2015 12:04:59 +00003Date: Sat, 3 Jan 2015 12:04:59 +0000
4Subject: Generate alternative init entries in advanced menu4Subject: Generate alternative init entries in advanced menu
@@ -18,7 +18,7 @@ Patch-Name: mkconfig-other-inits.patch
18 2 files changed, 21 insertions(+)18 2 files changed, 21 insertions(+)
1919
20diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in20diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
21index 85b30084a..dff84edea 10064421index 85b30084ad..dff84edea5 100644
22--- a/util/grub.d/10_linux.in22--- a/util/grub.d/10_linux.in
23+++ b/util/grub.d/10_linux.in23+++ b/util/grub.d/10_linux.in
24@@ -32,6 +32,7 @@ export TEXTDOMAIN=@PACKAGE@24@@ -32,6 +32,7 @@ export TEXTDOMAIN=@PACKAGE@
@@ -53,7 +53,7 @@ index 85b30084a..dff84edea 100644
53 linux_entry "${OS}" "${version}" recovery \53 linux_entry "${OS}" "${version}" recovery \
54 "${GRUB_CMDLINE_LINUX_RECOVERY} ${GRUB_CMDLINE_LINUX}"54 "${GRUB_CMDLINE_LINUX_RECOVERY} ${GRUB_CMDLINE_LINUX}"
55diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in55diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
56index f2ee0532b..81e5f0d7e 10064456index f2ee0532bd..81e5f0d7e4 100644
57--- a/util/grub.d/20_linux_xen.in57--- a/util/grub.d/20_linux_xen.in
58+++ b/util/grub.d/20_linux_xen.in58+++ b/util/grub.d/20_linux_xen.in
59@@ -27,6 +27,7 @@ export TEXTDOMAIN=@PACKAGE@59@@ -27,6 +27,7 @@ export TEXTDOMAIN=@PACKAGE@
diff --git a/debian/patches/mkconfig-recovery-title.patch b/debian/patches/mkconfig-recovery-title.patch
index 869fc30..c398318 100644
--- a/debian/patches/mkconfig-recovery-title.patch
+++ b/debian/patches/mkconfig-recovery-title.patch
@@ -1,4 +1,4 @@
1From 0636b004bd56946dd24ce0afff820f9ed76da34b Mon Sep 17 00:00:00 20011From cc1216264113d2471a5ee5d472358e265fde1ab5 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@ubuntu.com>2From: Colin Watson <cjwatson@ubuntu.com>
3Date: Mon, 13 Jan 2014 12:13:33 +00003Date: Mon, 13 Jan 2014 12:13:33 +0000
4Subject: Add GRUB_RECOVERY_TITLE option4Subject: Add GRUB_RECOVERY_TITLE option
@@ -22,7 +22,7 @@ Patch-Name: mkconfig-recovery-title.patch
22 8 files changed, 21 insertions(+), 11 deletions(-)22 8 files changed, 21 insertions(+), 11 deletions(-)
2323
24diff --git a/docs/grub.texi b/docs/grub.texi24diff --git a/docs/grub.texi b/docs/grub.texi
25index a835d0ae4..3ec35d315 10064425index a835d0ae42..3ec35d315a 100644
26--- a/docs/grub.texi26--- a/docs/grub.texi
27+++ b/docs/grub.texi27+++ b/docs/grub.texi
28@@ -1536,6 +1536,11 @@ a console is restricted or limited.28@@ -1536,6 +1536,11 @@ a console is restricted or limited.
@@ -38,7 +38,7 @@ index a835d0ae4..3ec35d315 100644
38 38
39 The following options are still accepted for compatibility with existing39 The following options are still accepted for compatibility with existing
40diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in40diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
41index 307214310..9c1da6477 10064441index 3072143105..9c1da64771 100644
42--- a/util/grub-mkconfig.in42--- a/util/grub-mkconfig.in
43+++ b/util/grub-mkconfig.in43+++ b/util/grub-mkconfig.in
44@@ -196,6 +196,10 @@ GRUB_ACTUAL_DEFAULT="$GRUB_DEFAULT"44@@ -196,6 +196,10 @@ GRUB_ACTUAL_DEFAULT="$GRUB_DEFAULT"
@@ -63,7 +63,7 @@ index 307214310..9c1da6477 100644
63 if test "x${grub_cfg}" != "x"; then63 if test "x${grub_cfg}" != "x"; then
64 rm -f "${grub_cfg}.new"64 rm -f "${grub_cfg}.new"
65diff --git a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in65diff --git a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in
66index 59a9a48a2..7fa3a3fbd 10064466index 59a9a48a2f..7fa3a3fbd8 100644
67--- a/util/grub.d/10_hurd.in67--- a/util/grub.d/10_hurd.in
68+++ b/util/grub.d/10_hurd.in68+++ b/util/grub.d/10_hurd.in
69@@ -88,8 +88,8 @@ hurd_entry () {69@@ -88,8 +88,8 @@ hurd_entry () {
@@ -78,7 +78,7 @@ index 59a9a48a2..7fa3a3fbd 100644
78 title="$(gettext_printf "%s, with Hurd %s" "${OS}" "${kernel_base}")"78 title="$(gettext_printf "%s, with Hurd %s" "${OS}" "${kernel_base}")"
79 oldtitle="$OS using $kernel_base"79 oldtitle="$OS using $kernel_base"
80diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in80diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
81index 9d8e8fd85..8301d361a 10064481index 9d8e8fd852..8301d361a1 100644
82--- a/util/grub.d/10_kfreebsd.in82--- a/util/grub.d/10_kfreebsd.in
83+++ b/util/grub.d/10_kfreebsd.in83+++ b/util/grub.d/10_kfreebsd.in
84@@ -76,7 +76,7 @@ kfreebsd_entry ()84@@ -76,7 +76,7 @@ kfreebsd_entry ()
@@ -91,7 +91,7 @@ index 9d8e8fd85..8301d361a 100644
91 title="$(gettext_printf "%s, with kFreeBSD %s" "${os}" "${version}")"91 title="$(gettext_printf "%s, with kFreeBSD %s" "${os}" "${version}")"
92 fi92 fi
93diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in93diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
94index cc2dd855a..2c418c5ec 10064494index cc2dd855ab..2c418c5ec8 100644
95--- a/util/grub.d/10_linux.in95--- a/util/grub.d/10_linux.in
96+++ b/util/grub.d/10_linux.in96+++ b/util/grub.d/10_linux.in
97@@ -130,7 +130,7 @@ linux_entry ()97@@ -130,7 +130,7 @@ linux_entry ()
@@ -104,10 +104,10 @@ index cc2dd855a..2c418c5ec 100644
104 title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;;104 title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;;
105 esac105 esac
106diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in106diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in
107index b636dc7bb..b068f0e96 100755107index 48a4e68976..4477fa6061 100755
108--- a/util/grub.d/10_linux_zfs.in108--- a/util/grub.d/10_linux_zfs.in
109+++ b/util/grub.d/10_linux_zfs.in109+++ b/util/grub.d/10_linux_zfs.in
110@@ -954,7 +954,7 @@ generate_grub_menu() {110@@ -957,7 +957,7 @@ generate_grub_menu() {
111 111
112 GRUB_DISABLE_RECOVERY=${GRUB_DISABLE_RECOVERY:-}112 GRUB_DISABLE_RECOVERY=${GRUB_DISABLE_RECOVERY:-}
113 if [ "${GRUB_DISABLE_RECOVERY}" != "true" ]; then113 if [ "${GRUB_DISABLE_RECOVERY}" != "true" ]; then
@@ -116,7 +116,7 @@ index b636dc7bb..b068f0e96 100755
116 zfs_linux_entry 1 "${title}" "recovery" "${dataset}" "${device}" "${initrd}" "${kernel}"116 zfs_linux_entry 1 "${title}" "recovery" "${dataset}" "${device}" "${initrd}" "${kernel}"
117 fi117 fi
118 at_least_one_entry=1118 at_least_one_entry=1
119@@ -982,9 +982,9 @@ generate_grub_menu() {119@@ -985,9 +985,9 @@ generate_grub_menu() {
120 120
121 GRUB_DISABLE_RECOVERY="${GRUB_DISABLE_RECOVERY:-}"121 GRUB_DISABLE_RECOVERY="${GRUB_DISABLE_RECOVERY:-}"
122 if [ "${GRUB_DISABLE_RECOVERY}" != "true" ]; then122 if [ "${GRUB_DISABLE_RECOVERY}" != "true" ]; then
@@ -128,7 +128,7 @@ index b636dc7bb..b068f0e96 100755
128 zfs_linux_entry 2 "${title}" "recovery" "${dataset}" "${device}" "${initrd}" "${kernel}" "zsys-revert=userdata"128 zfs_linux_entry 2 "${title}" "recovery" "${dataset}" "${device}" "${initrd}" "${kernel}" "zsys-revert=userdata"
129 fi129 fi
130 # Non-zsys: boot temporarly on snapshots or rollback (destroying intermediate snapshots)130 # Non-zsys: boot temporarly on snapshots or rollback (destroying intermediate snapshots)
131@@ -994,7 +994,7 @@ generate_grub_menu() {131@@ -997,7 +997,7 @@ generate_grub_menu() {
132 132
133 GRUB_DISABLE_RECOVERY="${GRUB_DISABLE_RECOVERY:-}"133 GRUB_DISABLE_RECOVERY="${GRUB_DISABLE_RECOVERY:-}"
134 if [ "${GRUB_DISABLE_RECOVERY}" != "true" ]; then134 if [ "${GRUB_DISABLE_RECOVERY}" != "true" ]; then
@@ -138,7 +138,7 @@ index b636dc7bb..b068f0e96 100755
138 fi138 fi
139 139
140diff --git a/util/grub.d/10_netbsd.in b/util/grub.d/10_netbsd.in140diff --git a/util/grub.d/10_netbsd.in b/util/grub.d/10_netbsd.in
141index 874f59969..bb29cc046 100644141index 874f59969e..bb29cc0468 100644
142--- a/util/grub.d/10_netbsd.in142--- a/util/grub.d/10_netbsd.in
143+++ b/util/grub.d/10_netbsd.in143+++ b/util/grub.d/10_netbsd.in
144@@ -102,7 +102,7 @@ netbsd_entry ()144@@ -102,7 +102,7 @@ netbsd_entry ()
@@ -151,7 +151,7 @@ index 874f59969..bb29cc046 100644
151 title="$(gettext_printf "%s, with kernel %s (via %s)" "${OS}" "$(echo ${kernel} | sed -e 's,^.*/,,')" "${loader}")"151 title="$(gettext_printf "%s, with kernel %s (via %s)" "${OS}" "$(echo ${kernel} | sed -e 's,^.*/,,')" "${loader}")"
152 fi152 fi
153diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in153diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
154index 9a8d42fb5..f2ee0532b 100644154index 9a8d42fb57..f2ee0532bd 100644
155--- a/util/grub.d/20_linux_xen.in155--- a/util/grub.d/20_linux_xen.in
156+++ b/util/grub.d/20_linux_xen.in156+++ b/util/grub.d/20_linux_xen.in
157@@ -105,7 +105,7 @@ linux_entry ()157@@ -105,7 +105,7 @@ linux_entry ()
diff --git a/debian/patches/mkconfig-signed-kernel.patch b/debian/patches/mkconfig-signed-kernel.patch
index ea7cdb0..79ae0da 100644
--- a/debian/patches/mkconfig-signed-kernel.patch
+++ b/debian/patches/mkconfig-signed-kernel.patch
@@ -1,4 +1,4 @@
1From 956c3d193e7c756f52fc0cfda463eb17ed58b4ce Mon Sep 17 00:00:00 20011From 16c328eee53e3fe8c24db8c2438a7410755c58db Mon Sep 17 00:00:00 2001
2From: Didier Roche <didrocks@ubuntu.com>2From: Didier Roche <didrocks@ubuntu.com>
3Date: Tue, 31 Mar 2020 15:17:45 +02003Date: Tue, 31 Mar 2020 15:17:45 +0200
4Subject: Generate configuration for signed UEFI kernels if available4Subject: Generate configuration for signed UEFI kernels if available
@@ -13,7 +13,7 @@ Patch-Name: mkconfig-signed-kernel.patch
13 2 files changed, 36 insertions(+)13 2 files changed, 36 insertions(+)
1414
15diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in15diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
16index 19e4df4ad..cb1cc200e 10064416index 19e4df4ad8..cb1cc200e4 100644
17--- a/util/grub.d/10_linux.in17--- a/util/grub.d/10_linux.in
18+++ b/util/grub.d/10_linux.in18+++ b/util/grub.d/10_linux.in
19@@ -165,8 +165,16 @@ linux_entry ()19@@ -165,8 +165,16 @@ linux_entry ()
@@ -48,7 +48,7 @@ index 19e4df4ad..cb1cc200e 100644
48 basename=`basename $linux`48 basename=`basename $linux`
49 dirname=`dirname $linux`49 dirname=`dirname $linux`
50diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in50diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in
51index bd5b963b6..c1dfe8ae8 10075551index 7f88e771e0..bd4f1a2123 100755
52--- a/util/grub.d/10_linux_zfs.in52--- a/util/grub.d/10_linux_zfs.in
53+++ b/util/grub.d/10_linux_zfs.in53+++ b/util/grub.d/10_linux_zfs.in
54@@ -339,6 +339,16 @@ try_default_layout_bpool() {54@@ -339,6 +339,16 @@ try_default_layout_bpool() {
@@ -68,7 +68,7 @@ index bd5b963b6..c1dfe8ae8 100755
68 # Given a filesystem or snapshot dataset, returns dataset|machine id|pretty name|last used68 # Given a filesystem or snapshot dataset, returns dataset|machine id|pretty name|last used
69 # $1 is dataset we want information from69 # $1 is dataset we want information from
70 # $2 is the temporary mount directory to use70 # $2 is the temporary mount directory to use
71@@ -409,6 +419,17 @@ get_dataset_info() {71@@ -412,6 +422,17 @@ get_dataset_info() {
72 continue72 continue
73 fi73 fi
74 74
diff --git a/debian/patches/mkconfig-ubuntu-distributor.patch b/debian/patches/mkconfig-ubuntu-distributor.patch
index 6ae0bef..d1e2f67 100644
--- a/debian/patches/mkconfig-ubuntu-distributor.patch
+++ b/debian/patches/mkconfig-ubuntu-distributor.patch
@@ -1,4 +1,4 @@
1From 5cddc9390afad242b31604806e8fb46ca92bf891 Mon Sep 17 00:00:00 20011From 77ada294ae9feca7e4202f454ddf56245eee16bf Mon Sep 17 00:00:00 2001
2From: Mario Limonciello <Mario_Limonciello@dell.com>2From: Mario Limonciello <Mario_Limonciello@dell.com>
3Date: Mon, 13 Jan 2014 12:13:14 +00003Date: Mon, 13 Jan 2014 12:13:14 +0000
4Subject: Remove GNU/Linux from default distributor string for Ubuntu4Subject: Remove GNU/Linux from default distributor string for Ubuntu
@@ -17,7 +17,7 @@ Patch-Name: mkconfig-ubuntu-distributor.patch
17 2 files changed, 16 insertions(+), 2 deletions(-)17 2 files changed, 16 insertions(+), 2 deletions(-)
1818
19diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in19diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
20index fcd303387..19e4df4ad 10064420index fcd3033872..19e4df4ad8 100644
21--- a/util/grub.d/10_linux.in21--- a/util/grub.d/10_linux.in
22+++ b/util/grub.d/10_linux.in22+++ b/util/grub.d/10_linux.in
23@@ -32,7 +32,14 @@ CLASS="--class gnu-linux --class gnu --class os"23@@ -32,7 +32,14 @@ CLASS="--class gnu-linux --class gnu --class os"
@@ -37,10 +37,10 @@ index fcd303387..19e4df4ad 100644
37 fi37 fi
38 38
39diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in39diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in
40index 5db1f6682..bd5b963b6 10075540index de4d215900..7f88e771e0 100755
41--- a/util/grub.d/10_linux_zfs.in41--- a/util/grub.d/10_linux_zfs.in
42+++ b/util/grub.d/10_linux_zfs.in42+++ b/util/grub.d/10_linux_zfs.in
43@@ -787,7 +787,14 @@ generate_grub_menu() {43@@ -790,7 +790,14 @@ generate_grub_menu() {
44 if [ "${GRUB_DISTRIBUTOR}" = "" ] ; then44 if [ "${GRUB_DISTRIBUTOR}" = "" ] ; then
45 OS=GNU/Linux45 OS=GNU/Linux
46 else46 else
diff --git a/debian/patches/mkconfig-ubuntu-recovery.patch b/debian/patches/mkconfig-ubuntu-recovery.patch
index f81ab40..097df91 100644
--- a/debian/patches/mkconfig-ubuntu-recovery.patch
+++ b/debian/patches/mkconfig-ubuntu-recovery.patch
@@ -1,4 +1,4 @@
1From fb4d204572ca4dec63b3d3f25a3b69da97815726 Mon Sep 17 00:00:00 20011From 51814873e68db3d990a080f705e6562ef140b416 Mon Sep 17 00:00:00 2001
2From: Didier Roche <didrocks@ubuntu.com>2From: Didier Roche <didrocks@ubuntu.com>
3Date: Tue, 31 Mar 2020 15:16:36 +02003Date: Tue, 31 Mar 2020 15:16:36 +0200
4Subject: "single" -> "recovery" when friendly-recovery is installed4Subject: "single" -> "recovery" when friendly-recovery is installed
@@ -24,7 +24,7 @@ Patch-Name: mkconfig-ubuntu-recovery.patch
24 4 files changed, 39 insertions(+), 5 deletions(-)24 4 files changed, 39 insertions(+), 5 deletions(-)
2525
26diff --git a/configure.ac b/configure.ac26diff --git a/configure.ac b/configure.ac
27index 7656f2434..1e5abc67d 10064427index 7656f2434e..1e5abc67d9 100644
28--- a/configure.ac28--- a/configure.ac
29+++ b/configure.ac29+++ b/configure.ac
30@@ -1846,6 +1846,17 @@ fi30@@ -1846,6 +1846,17 @@ fi
@@ -46,7 +46,7 @@ index 7656f2434..1e5abc67d 100644
46 46
47 AC_SUBST([FONT_SOURCE])47 AC_SUBST([FONT_SOURCE])
48diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in48diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
49index d927b60ae..fcd303387 10064449index d927b60ae2..fcd3033872 100644
50--- a/util/grub.d/10_linux.in50--- a/util/grub.d/10_linux.in
51+++ b/util/grub.d/10_linux.in51+++ b/util/grub.d/10_linux.in
52@@ -20,6 +20,7 @@ set -e52@@ -20,6 +20,7 @@ set -e
@@ -94,7 +94,7 @@ index d927b60ae..fcd303387 100644
94 94
95 list=`echo $list | tr ' ' '\n' | fgrep -vx "$linux" | tr '\n' ' '`95 list=`echo $list | tr ' ' '\n' | fgrep -vx "$linux" | tr '\n' ' '`
96diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in96diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in
97index d27634738..5db1f6682 10075597index b24587f0a5..de4d215900 100755
98--- a/util/grub.d/10_linux_zfs.in98--- a/util/grub.d/10_linux_zfs.in
99+++ b/util/grub.d/10_linux_zfs.in99+++ b/util/grub.d/10_linux_zfs.in
100@@ -19,6 +19,7 @@ set -e100@@ -19,6 +19,7 @@ set -e
@@ -105,7 +105,7 @@ index d27634738..5db1f6682 100755
105 105
106 . "${pkgdatadir}/grub-mkconfig_lib"106 . "${pkgdatadir}/grub-mkconfig_lib"
107 107
108@@ -745,7 +746,9 @@ zfs_linux_entry () {108@@ -748,7 +749,9 @@ zfs_linux_entry () {
109 if [ "${GRUB_GFXPAYLOAD_LINUX}" != "text" ]; then109 if [ "${GRUB_GFXPAYLOAD_LINUX}" != "text" ]; then
110 echo "${submenu_indentation} load_video"110 echo "${submenu_indentation} load_video"
111 fi111 fi
@@ -116,7 +116,7 @@ index d27634738..5db1f6682 100755
116 fi116 fi
117 117
118 echo "${submenu_indentation} insmod gzio"118 echo "${submenu_indentation} insmod gzio"
119@@ -756,7 +759,7 @@ zfs_linux_entry () {119@@ -759,7 +762,7 @@ zfs_linux_entry () {
120 120
121 linux_default_args="${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"121 linux_default_args="${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
122 if [ ${type} = "recovery" ]; then122 if [ ${type} = "recovery" ]; then
@@ -125,7 +125,7 @@ index d27634738..5db1f6682 100755
125 fi125 fi
126 126
127 echo "${submenu_indentation} linux ${kernel} root=ZFS=${dataset} ro ${linux_default_args} ${kernel_additional_args}"127 echo "${submenu_indentation} linux ${kernel} root=ZFS=${dataset} ro ${linux_default_args} ${kernel_additional_args}"
128@@ -788,6 +791,14 @@ generate_grub_menu() {128@@ -791,6 +794,14 @@ generate_grub_menu() {
129 CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1 | LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"129 CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1 | LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
130 fi130 fi
131 131
@@ -141,7 +141,7 @@ index d27634738..5db1f6682 100755
141 # IFS is set to TAB (ASCII 0x09)141 # IFS is set to TAB (ASCII 0x09)
142 echo "${menu_metadata}" |142 echo "${menu_metadata}" |
143diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in143diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
144index 515a68c7a..775ceb2e0 100644144index 515a68c7aa..775ceb2e04 100644
145--- a/util/grub.d/30_os-prober.in145--- a/util/grub.d/30_os-prober.in
146+++ b/util/grub.d/30_os-prober.in146+++ b/util/grub.d/30_os-prober.in
147@@ -220,7 +220,7 @@ EOF147@@ -220,7 +220,7 @@ EOF
diff --git a/debian/patches/mkrescue-efi-modules.patch b/debian/patches/mkrescue-efi-modules.patch
index d0e0688..54d15e4 100644
--- a/debian/patches/mkrescue-efi-modules.patch
+++ b/debian/patches/mkrescue-efi-modules.patch
@@ -1,4 +1,4 @@
1From 40df0707380bf528d9f849b065c3a5e4e96113ac Mon Sep 17 00:00:00 20011From 20edd1abb590756c35b886849a15d17d80f82170 Mon Sep 17 00:00:00 2001
2From: Mario Limonciello <Mario_Limonciello@dell.com>2From: Mario Limonciello <Mario_Limonciello@dell.com>
3Date: Mon, 13 Jan 2014 12:12:59 +00003Date: Mon, 13 Jan 2014 12:12:59 +0000
4Subject: Build vfat into EFI boot images4Subject: Build vfat into EFI boot images
@@ -14,7 +14,7 @@ Patch-Name: mkrescue-efi-modules.patch
14 1 file changed, 2 insertions(+)14 1 file changed, 2 insertions(+)
1515
16diff --git a/util/grub-mkrescue.c b/util/grub-mkrescue.c16diff --git a/util/grub-mkrescue.c b/util/grub-mkrescue.c
17index ce2cbc4f1..45d6140d3 10064417index ce2cbc4f10..45d6140d3e 100644
18--- a/util/grub-mkrescue.c18--- a/util/grub-mkrescue.c
19+++ b/util/grub-mkrescue.c19+++ b/util/grub-mkrescue.c
20@@ -750,6 +750,7 @@ main (int argc, char *argv[])20@@ -750,6 +750,7 @@ main (int argc, char *argv[])
diff --git a/debian/patches/net-read-bracketed-ipv6-addr.patch b/debian/patches/net-read-bracketed-ipv6-addr.patch
index 9afab37..76e97c9 100644
--- a/debian/patches/net-read-bracketed-ipv6-addr.patch
+++ b/debian/patches/net-read-bracketed-ipv6-addr.patch
@@ -1,4 +1,4 @@
1From 5b535ee06d2b6e98a6b9c7d1a79ff611e10e1b0a Mon Sep 17 00:00:00 20011From 370386aaaed787b4b9082cd75f155f1b21350878 Mon Sep 17 00:00:00 2001
2From: Aaron Miller <aaronmiller@fb.com>2From: Aaron Miller <aaronmiller@fb.com>
3Date: Thu, 27 Oct 2016 17:39:49 -04003Date: Thu, 27 Oct 2016 17:39:49 -0400
4Subject: net: read bracketed ipv6 addrs and port numbers4Subject: net: read bracketed ipv6 addrs and port numbers
@@ -16,7 +16,7 @@ Patch-Name: net-read-bracketed-ipv6-addr.patch
16 4 files changed, 110 insertions(+), 11 deletions(-)16 4 files changed, 110 insertions(+), 11 deletions(-)
1717
18diff --git a/grub-core/net/http.c b/grub-core/net/http.c18diff --git a/grub-core/net/http.c b/grub-core/net/http.c
19index 5aa4ad3be..f182d7b87 10064419index 5aa4ad3bef..f182d7b871 100644
20--- a/grub-core/net/http.c20--- a/grub-core/net/http.c
21+++ b/grub-core/net/http.c21+++ b/grub-core/net/http.c
22@@ -312,12 +312,14 @@ http_establish (struct grub_file *file, grub_off_t offset, int initial)22@@ -312,12 +312,14 @@ http_establish (struct grub_file *file, grub_off_t offset, int initial)
@@ -74,7 +74,7 @@ index 5aa4ad3be..f182d7b87 100644
74 file);74 file);
75 if (!data->sock)75 if (!data->sock)
76diff --git a/grub-core/net/net.c b/grub-core/net/net.c76diff --git a/grub-core/net/net.c b/grub-core/net/net.c
77index d5d726a31..b917a75d5 10064477index d5d726a315..b917a75d54 100644
78--- a/grub-core/net/net.c78--- a/grub-core/net/net.c
79+++ b/grub-core/net/net.c79+++ b/grub-core/net/net.c
80@@ -437,6 +437,12 @@ parse_ip6 (const char *val, grub_uint64_t *ip, const char **rest)80@@ -437,6 +437,12 @@ parse_ip6 (const char *val, grub_uint64_t *ip, const char **rest)
@@ -211,7 +211,7 @@ index d5d726a31..b917a75d5 100644
211 }211 }
212 }212 }
213diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c213diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
214index 7d90bf66e..a0817a075 100644214index 7d90bf66e7..a0817a075d 100644
215--- a/grub-core/net/tftp.c215--- a/grub-core/net/tftp.c
216+++ b/grub-core/net/tftp.c216+++ b/grub-core/net/tftp.c
217@@ -314,6 +314,7 @@ tftp_open (struct grub_file *file, const char *filename)217@@ -314,6 +314,7 @@ tftp_open (struct grub_file *file, const char *filename)
@@ -241,7 +241,7 @@ index 7d90bf66e..a0817a075 100644
241 if (!data->sock)241 if (!data->sock)
242 {242 {
243diff --git a/include/grub/net.h b/include/grub/net.h243diff --git a/include/grub/net.h b/include/grub/net.h
244index 4a9069a14..cc114286e 100644244index 4a9069a147..cc114286ea 100644
245--- a/include/grub/net.h245--- a/include/grub/net.h
246+++ b/include/grub/net.h246+++ b/include/grub/net.h
247@@ -270,6 +270,7 @@ typedef struct grub_net247@@ -270,6 +270,7 @@ typedef struct grub_net
diff --git a/debian/patches/no-devicetree-if-secure-boot.patch b/debian/patches/no-devicetree-if-secure-boot.patch
index 2c20d15..c56d2e3 100644
--- a/debian/patches/no-devicetree-if-secure-boot.patch
+++ b/debian/patches/no-devicetree-if-secure-boot.patch
@@ -1,4 +1,4 @@
1From e7c4e6c655bc9eebdd22fb6f3d9b2aafabffa1b4 Mon Sep 17 00:00:00 20011From 7419d200192a1214872a70852200922529baa7b8 Mon Sep 17 00:00:00 2001
2From: Peter Jones <pjones@redhat.com>2From: Peter Jones <pjones@redhat.com>
3Date: Wed, 24 Apr 2019 10:03:04 -04003Date: Wed, 24 Apr 2019 10:03:04 -0400
4Subject: Forbid the "devicetree" command when Secure Boot is enabled.4Subject: Forbid the "devicetree" command when Secure Boot is enabled.
@@ -17,7 +17,7 @@ Patch-Name: no-devicetree-if-secure-boot.patch
17 2 files changed, 20 insertions(+)17 2 files changed, 20 insertions(+)
1818
19diff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c19diff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c
20index 51684914c..092e8e307 10064420index 51684914cf..092e8e3077 100644
21--- a/grub-core/loader/arm/linux.c21--- a/grub-core/loader/arm/linux.c
22+++ b/grub-core/loader/arm/linux.c22+++ b/grub-core/loader/arm/linux.c
23@@ -30,6 +30,10 @@23@@ -30,6 +30,10 @@
@@ -47,7 +47,7 @@ index 51684914c..092e8e307 100644
47 if (!dtb)47 if (!dtb)
48 return grub_errno;48 return grub_errno;
49diff --git a/grub-core/loader/efi/fdt.c b/grub-core/loader/efi/fdt.c49diff --git a/grub-core/loader/efi/fdt.c b/grub-core/loader/efi/fdt.c
50index ee9c5592c..f0c2d91be 10064450index ee9c5592c7..f0c2d91be2 100644
51--- a/grub-core/loader/efi/fdt.c51--- a/grub-core/loader/efi/fdt.c
52+++ b/grub-core/loader/efi/fdt.c52+++ b/grub-core/loader/efi/fdt.c
53@@ -123,6 +123,14 @@ grub_cmd_devicetree (grub_command_t cmd __attribute__ ((unused)),53@@ -123,6 +123,14 @@ grub_cmd_devicetree (grub_command_t cmd __attribute__ ((unused)),
diff --git a/debian/patches/no-insmod-on-sb.patch b/debian/patches/no-insmod-on-sb.patch
index 95a34cd..5ed0187 100644
--- a/debian/patches/no-insmod-on-sb.patch
+++ b/debian/patches/no-insmod-on-sb.patch
@@ -1,4 +1,4 @@
1From 98ac694bdd7938cdfcd5615cc78e3211a0bcba93 Mon Sep 17 00:00:00 20011From df8702b930179447a7ecaf8bb0f9842522967a41 Mon Sep 17 00:00:00 2001
2From: Matthew Garrett <mjg@redhat.com>2From: Matthew Garrett <mjg@redhat.com>
3Date: Mon, 13 Jan 2014 12:13:09 +00003Date: Mon, 13 Jan 2014 12:13:09 +0000
4Subject: Don't permit loading modules on UEFI secure boot4Subject: Don't permit loading modules on UEFI secure boot
@@ -16,7 +16,7 @@ Patch-Name: no-insmod-on-sb.patch
16 3 files changed, 42 insertions(+)16 3 files changed, 42 insertions(+)
1717
18diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c18diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
19index 48eb5e7b6..074dfc3c6 10064419index 48eb5e7b62..074dfc3c6f 100644
20--- a/grub-core/kern/dl.c20--- a/grub-core/kern/dl.c
21+++ b/grub-core/kern/dl.c21+++ b/grub-core/kern/dl.c
22@@ -38,6 +38,10 @@22@@ -38,6 +38,10 @@
@@ -47,7 +47,7 @@ index 48eb5e7b6..074dfc3c6 100644
47 47
48 file = grub_file_open (filename, GRUB_FILE_TYPE_GRUB_MODULE);48 file = grub_file_open (filename, GRUB_FILE_TYPE_GRUB_MODULE);
49diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c49diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
50index 6e1ceb905..96204e39b 10064450index 6e1ceb9051..96204e39b9 100644
51--- a/grub-core/kern/efi/efi.c51--- a/grub-core/kern/efi/efi.c
52+++ b/grub-core/kern/efi/efi.c52+++ b/grub-core/kern/efi/efi.c
53@@ -273,6 +273,34 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,53@@ -273,6 +273,34 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
@@ -86,7 +86,7 @@ index 6e1ceb905..96204e39b 100644
86 86
87 /* Search the mods section from the PE32/PE32+ image. This code uses87 /* Search the mods section from the PE32/PE32+ image. This code uses
88diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h88diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
89index e90e00dc4..a237952b3 10064489index e90e00dc43..a237952b37 100644
90--- a/include/grub/efi/efi.h90--- a/include/grub/efi/efi.h
91+++ b/include/grub/efi/efi.h91+++ b/include/grub/efi/efi.h
92@@ -82,6 +82,7 @@ EXPORT_FUNC (grub_efi_set_variable) (const char *var,92@@ -82,6 +82,7 @@ EXPORT_FUNC (grub_efi_set_variable) (const char *var,
diff --git a/debian/patches/olpc-prefix-hack.patch b/debian/patches/olpc-prefix-hack.patch
index b14c333..d40729f 100644
--- a/debian/patches/olpc-prefix-hack.patch
+++ b/debian/patches/olpc-prefix-hack.patch
@@ -11,7 +11,7 @@ Patch-Name: olpc-prefix-hack.patch
11 1 file changed, 11 insertions(+)11 1 file changed, 11 insertions(+)
1212
13diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c13diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
14index d483e35ee..8b089b48d 10064414index d483e35eed..8b089b48d0 100644
15--- a/grub-core/kern/ieee1275/init.c15--- a/grub-core/kern/ieee1275/init.c
16+++ b/grub-core/kern/ieee1275/init.c16+++ b/grub-core/kern/ieee1275/init.c
17@@ -76,6 +76,7 @@ grub_exit (void)17@@ -76,6 +76,7 @@ grub_exit (void)
diff --git a/debian/patches/ppc64el-disable-vsx.patch b/debian/patches/ppc64el-disable-vsx.patch
index ab96b1d..3aef631 100644
--- a/debian/patches/ppc64el-disable-vsx.patch
+++ b/debian/patches/ppc64el-disable-vsx.patch
@@ -1,4 +1,4 @@
1From 0bdaf481feca277ee87f42052fad4a59ede0c8e4 Mon Sep 17 00:00:00 20011From 7736a6a5e58402b8f88d053ce2409b2d16262be5 Mon Sep 17 00:00:00 2001
2From: Paulo Flabiano Smorigo <pfsmorigo@linux.vnet.ibm.com>2From: Paulo Flabiano Smorigo <pfsmorigo@linux.vnet.ibm.com>
3Date: Thu, 25 Sep 2014 19:33:39 -03003Date: Thu, 25 Sep 2014 19:33:39 -0300
4Subject: Disable VSX instruction4Subject: Disable VSX instruction
@@ -21,7 +21,7 @@ Patch-Name: ppc64el-disable-vsx.patch
21 1 file changed, 12 insertions(+)21 1 file changed, 12 insertions(+)
2222
23diff --git a/grub-core/kern/powerpc/ieee1275/startup.S b/grub-core/kern/powerpc/ieee1275/startup.S23diff --git a/grub-core/kern/powerpc/ieee1275/startup.S b/grub-core/kern/powerpc/ieee1275/startup.S
24index 21c884b43..de9a9601a 10064424index 21c884b433..de9a9601a9 100644
25--- a/grub-core/kern/powerpc/ieee1275/startup.S25--- a/grub-core/kern/powerpc/ieee1275/startup.S
26+++ b/grub-core/kern/powerpc/ieee1275/startup.S26+++ b/grub-core/kern/powerpc/ieee1275/startup.S
27@@ -20,6 +20,8 @@27@@ -20,6 +20,8 @@
diff --git a/debian/patches/probe-fusionio.patch b/debian/patches/probe-fusionio.patch
index 7756341..ad7ef51 100644
--- a/debian/patches/probe-fusionio.patch
+++ b/debian/patches/probe-fusionio.patch
@@ -1,4 +1,4 @@
1From 738369f06f930cedd51f22f9d519a09aa7e73176 Mon Sep 17 00:00:00 20011From c89a80f695775566c7f184ec19b4ad34f58906bb Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@ubuntu.com>2From: Colin Watson <cjwatson@ubuntu.com>
3Date: Mon, 13 Jan 2014 12:13:31 +00003Date: Mon, 13 Jan 2014 12:13:31 +0000
4Subject: Probe FusionIO devices4Subject: Probe FusionIO devices
@@ -14,7 +14,7 @@ Patch-Name: probe-fusionio.patch
14 2 files changed, 32 insertions(+)14 2 files changed, 32 insertions(+)
1515
16diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c16diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
17index 90d92d3ad..7adc0f30e 10064417index 90d92d3ad5..7adc0f30ee 100644
18--- a/grub-core/osdep/linux/getroot.c18--- a/grub-core/osdep/linux/getroot.c
19+++ b/grub-core/osdep/linux/getroot.c19+++ b/grub-core/osdep/linux/getroot.c
20@@ -950,6 +950,19 @@ grub_util_part_to_disk (const char *os_dev, struct stat *st,20@@ -950,6 +950,19 @@ grub_util_part_to_disk (const char *os_dev, struct stat *st,
@@ -38,7 +38,7 @@ index 90d92d3ad..7adc0f30e 100644
38 38
39 return path;39 return path;
40diff --git a/util/deviceiter.c b/util/deviceiter.c40diff --git a/util/deviceiter.c b/util/deviceiter.c
41index a4971ef42..dddc50da7 10064441index a4971ef429..dddc50da7a 100644
42--- a/util/deviceiter.c42--- a/util/deviceiter.c
43+++ b/util/deviceiter.c43+++ b/util/deviceiter.c
44@@ -383,6 +383,12 @@ get_nvme_disk_name (char *name, int controller, int namespace)44@@ -383,6 +383,12 @@ get_nvme_disk_name (char *name, int controller, int namespace)
diff --git a/debian/patches/quick-boot-lvm.patch b/debian/patches/quick-boot-lvm.patch
index 23a9989..e313019 100644
--- a/debian/patches/quick-boot-lvm.patch
+++ b/debian/patches/quick-boot-lvm.patch
@@ -1,4 +1,4 @@
1From ff47caaf5a89c61bb85e7ed22570b24481b9ff15 Mon Sep 17 00:00:00 20011From 193f060dd7c98d850e81a0b73383ff19c4374d64 Mon Sep 17 00:00:00 2001
2From: Steve Langasek <steve.langasek@ubuntu.com>2From: Steve Langasek <steve.langasek@ubuntu.com>
3Date: Tue, 30 Oct 2018 15:04:16 -07003Date: Tue, 30 Oct 2018 15:04:16 -0700
4Subject: If we don't have writable grubenv and we're on EFI, always show the4Subject: If we don't have writable grubenv and we're on EFI, always show the
@@ -26,7 +26,7 @@ Patch-Name: quick-boot-lvm.patch
26 1 file changed, 15 insertions(+), 3 deletions(-)26 1 file changed, 15 insertions(+), 3 deletions(-)
2727
28diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in28diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
29index 674a76140..b7135b655 10064429index 674a761402..b7135b655f 100644
30--- a/util/grub.d/00_header.in30--- a/util/grub.d/00_header.in
31+++ b/util/grub.d/00_header.in31+++ b/util/grub.d/00_header.in
32@@ -115,7 +115,7 @@ EOF32@@ -115,7 +115,7 @@ EOF
diff --git a/debian/patches/quick-boot.patch b/debian/patches/quick-boot.patch
index 01fc3c9..ad4650d 100644
--- a/debian/patches/quick-boot.patch
+++ b/debian/patches/quick-boot.patch
@@ -1,4 +1,4 @@
1From a62555d9b0bc27ecf2c018018d61589ebdf15321 Mon Sep 17 00:00:00 20011From a34a2ebb74968f6a460fd0f90c545f3e847a3411 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@ubuntu.com>2From: Colin Watson <cjwatson@ubuntu.com>
3Date: Mon, 13 Jan 2014 12:13:28 +00003Date: Mon, 13 Jan 2014 12:13:28 +0000
4Subject: Add configure option to bypass boot menu if possible4Subject: Add configure option to bypass boot menu if possible
@@ -34,7 +34,7 @@ Patch-Name: quick-boot.patch
34 8 files changed, 146 insertions(+), 13 deletions(-)34 8 files changed, 146 insertions(+), 13 deletions(-)
3535
36diff --git a/configure.ac b/configure.ac36diff --git a/configure.ac b/configure.ac
37index ea00ccd69..7dda5bb32 10064437index ea00ccd691..7dda5bb32b 100644
38--- a/configure.ac38--- a/configure.ac
39+++ b/configure.ac39+++ b/configure.ac
40@@ -1868,6 +1868,17 @@ else40@@ -1868,6 +1868,17 @@ else
@@ -56,7 +56,7 @@ index ea00ccd69..7dda5bb32 100644
56 56
57 AC_SUBST([FONT_SOURCE])57 AC_SUBST([FONT_SOURCE])
58diff --git a/docs/grub.texi b/docs/grub.texi58diff --git a/docs/grub.texi b/docs/grub.texi
59index 87795075a..a835d0ae4 10064459index 87795075a8..a835d0ae42 100644
60--- a/docs/grub.texi60--- a/docs/grub.texi
61+++ b/docs/grub.texi61+++ b/docs/grub.texi
62@@ -1522,6 +1522,20 @@ This option may be set to a list of GRUB module names separated by spaces.62@@ -1522,6 +1522,20 @@ This option may be set to a list of GRUB module names separated by spaces.
@@ -81,7 +81,7 @@ index 87795075a..a835d0ae4 100644
81 81
82 The following options are still accepted for compatibility with existing82 The following options are still accepted for compatibility with existing
83diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c83diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
84index ebf5a0f10..42c82290d 10064484index ebf5a0f109..42c82290de 100644
85--- a/grub-core/normal/menu.c85--- a/grub-core/normal/menu.c
86+++ b/grub-core/normal/menu.c86+++ b/grub-core/normal/menu.c
87@@ -604,6 +604,30 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)87@@ -604,6 +604,30 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
@@ -116,7 +116,7 @@ index ebf5a0f10..42c82290d 100644
116 {116 {
117 pos = grub_term_save_pos ();117 pos = grub_term_save_pos ();
118diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in118diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
119index d18bf972f..307214310 100644119index d18bf972f7..3072143105 100644
120--- a/util/grub-mkconfig.in120--- a/util/grub-mkconfig.in
121+++ b/util/grub-mkconfig.in121+++ b/util/grub-mkconfig.in
122@@ -250,7 +250,8 @@ export GRUB_DEFAULT \122@@ -250,7 +250,8 @@ export GRUB_DEFAULT \
@@ -130,7 +130,7 @@ index d18bf972f..307214310 100644
130 if test "x${grub_cfg}" != "x"; then130 if test "x${grub_cfg}" != "x"; then
131 rm -f "${grub_cfg}.new"131 rm -f "${grub_cfg}.new"
132diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in132diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
133index 93a90233e..674a76140 100644133index 93a90233ea..674a761402 100644
134--- a/util/grub.d/00_header.in134--- a/util/grub.d/00_header.in
135+++ b/util/grub.d/00_header.in135+++ b/util/grub.d/00_header.in
136@@ -21,6 +21,8 @@ prefix="@prefix@"136@@ -21,6 +21,8 @@ prefix="@prefix@"
@@ -259,7 +259,7 @@ index 93a90233e..674a76140 100644
259 EOF259 EOF
260 }260 }
261diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in261diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
262index 479a8bf4e..2be66c702 100644262index 479a8bf4e5..2be66c7028 100644
263--- a/util/grub.d/10_linux.in263--- a/util/grub.d/10_linux.in
264+++ b/util/grub.d/10_linux.in264+++ b/util/grub.d/10_linux.in
265@@ -22,6 +22,7 @@ exec_prefix="@exec_prefix@"265@@ -22,6 +22,7 @@ exec_prefix="@exec_prefix@"
@@ -281,7 +281,7 @@ index 479a8bf4e..2be66c702 100644
281 save_default_entry | grub_add_tab281 save_default_entry | grub_add_tab
282 fi282 fi
283diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in283diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in
284index 1a656b2dd..548e14856 100755284index 3a0e6d1035..ec4b49d9d7 100755
285--- a/util/grub.d/10_linux_zfs.in285--- a/util/grub.d/10_linux_zfs.in
286+++ b/util/grub.d/10_linux_zfs.in286+++ b/util/grub.d/10_linux_zfs.in
287@@ -21,6 +21,7 @@ prefix="@prefix@"287@@ -21,6 +21,7 @@ prefix="@prefix@"
@@ -292,7 +292,7 @@ index 1a656b2dd..548e14856 100755
292 292
293 . "${pkgdatadir}/grub-mkconfig_lib"293 . "${pkgdatadir}/grub-mkconfig_lib"
294 294
295@@ -752,6 +753,10 @@ zfs_linux_entry () {295@@ -755,6 +756,10 @@ zfs_linux_entry () {
296 296
297 echo "${submenu_indentation}menuentry '$(echo "${title}" | grub_quote)' ${CLASS} \${menuentry_id_option} 'gnulinux-${dataset}-${kernel_version}' {"297 echo "${submenu_indentation}menuentry '$(echo "${title}" | grub_quote)' ${CLASS} \${menuentry_id_option} 'gnulinux-${dataset}-${kernel_version}' {"
298 298
@@ -304,7 +304,7 @@ index 1a656b2dd..548e14856 100755
304 GRUB_SAVEDEFAULT=${GRUB_SAVEDEFAULT:-}304 GRUB_SAVEDEFAULT=${GRUB_SAVEDEFAULT:-}
305 default_entry="$(save_default_entry)"305 default_entry="$(save_default_entry)"
306diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in306diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
307index 271044f59..da5f28876 100644307index 271044f592..da5f28876d 100644
308--- a/util/grub.d/30_os-prober.in308--- a/util/grub.d/30_os-prober.in
309+++ b/util/grub.d/30_os-prober.in309+++ b/util/grub.d/30_os-prober.in
310@@ -20,12 +20,26 @@ set -e310@@ -20,12 +20,26 @@ set -e
diff --git a/debian/patches/restore-mkdevicemap.patch b/debian/patches/restore-mkdevicemap.patch
index 267b972..7236a7b 100644
--- a/debian/patches/restore-mkdevicemap.patch
+++ b/debian/patches/restore-mkdevicemap.patch
@@ -1,4 +1,4 @@
1From 6db8234a46f194578fb414730dd3ea80a60b13d4 Mon Sep 17 00:00:00 20011From 9e77654bae1ee822ee7ae4e90e5f043105388ee4 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org>2From: Colin Watson <cjwatson@debian.org>
3Date: Mon, 13 Jan 2014 12:13:01 +00003Date: Mon, 13 Jan 2014 12:13:01 +0000
4Subject: Restore grub-mkdevicemap4Subject: Restore grub-mkdevicemap
@@ -28,7 +28,7 @@ Patch-Name: restore-mkdevicemap.patch
28 create mode 100644 util/grub-mkdevicemap.c28 create mode 100644 util/grub-mkdevicemap.c
2929
30diff --git a/Makefile.util.def b/Makefile.util.def30diff --git a/Makefile.util.def b/Makefile.util.def
31index bac85e284..eec1924b0 10064431index bac85e2840..eec1924b0e 100644
32--- a/Makefile.util.def32--- a/Makefile.util.def
33+++ b/Makefile.util.def33+++ b/Makefile.util.def
34@@ -324,6 +324,23 @@ program = {34@@ -324,6 +324,23 @@ program = {
@@ -57,7 +57,7 @@ index bac85e284..eec1924b0 100644
57 installdir = sbin;57 installdir = sbin;
58diff --git a/docs/man/grub-mkdevicemap.h2m b/docs/man/grub-mkdevicemap.h2m58diff --git a/docs/man/grub-mkdevicemap.h2m b/docs/man/grub-mkdevicemap.h2m
59new file mode 10064459new file mode 100644
60index 000000000..96cd6ee7260index 0000000000..96cd6ee723
61--- /dev/null61--- /dev/null
62+++ b/docs/man/grub-mkdevicemap.h2m62+++ b/docs/man/grub-mkdevicemap.h2m
63@@ -0,0 +1,4 @@63@@ -0,0 +1,4 @@
@@ -67,7 +67,7 @@ index 000000000..96cd6ee72
67+.BR grub-probe (8)67+.BR grub-probe (8)
68diff --git a/include/grub/util/deviceiter.h b/include/grub/util/deviceiter.h68diff --git a/include/grub/util/deviceiter.h b/include/grub/util/deviceiter.h
69new file mode 10064469new file mode 100644
70index 000000000..85374978c70index 0000000000..85374978c5
71--- /dev/null71--- /dev/null
72+++ b/include/grub/util/deviceiter.h72+++ b/include/grub/util/deviceiter.h
73@@ -0,0 +1,14 @@73@@ -0,0 +1,14 @@
@@ -87,7 +87,7 @@ index 000000000..85374978c
87+#endif /* ! GRUB_DEVICEITER_MACHINE_UTIL_HEADER */87+#endif /* ! GRUB_DEVICEITER_MACHINE_UTIL_HEADER */
88diff --git a/util/deviceiter.c b/util/deviceiter.c88diff --git a/util/deviceiter.c b/util/deviceiter.c
89new file mode 10064489new file mode 100644
90index 000000000..a4971ef4290index 0000000000..a4971ef429
91--- /dev/null91--- /dev/null
92+++ b/util/deviceiter.c92+++ b/util/deviceiter.c
93@@ -0,0 +1,1021 @@93@@ -0,0 +1,1021 @@
@@ -1114,7 +1114,7 @@ index 000000000..a4971ef42
1114+}1114+}
1115diff --git a/util/devicemap.c b/util/devicemap.c1115diff --git a/util/devicemap.c b/util/devicemap.c
1116new file mode 1006441116new file mode 100644
1117index 000000000..c618644201117index 0000000000..c61864420a
1118--- /dev/null1118--- /dev/null
1119+++ b/util/devicemap.c1119+++ b/util/devicemap.c
1120@@ -0,0 +1,13 @@1120@@ -0,0 +1,13 @@
@@ -1133,7 +1133,7 @@ index 000000000..c61864420
1133+}1133+}
1134diff --git a/util/grub-mkdevicemap.c b/util/grub-mkdevicemap.c1134diff --git a/util/grub-mkdevicemap.c b/util/grub-mkdevicemap.c
1135new file mode 1006441135new file mode 100644
1136index 000000000..c4bbdbf691136index 0000000000..c4bbdbf69c
1137--- /dev/null1137--- /dev/null
1138+++ b/util/grub-mkdevicemap.c1138+++ b/util/grub-mkdevicemap.c
1139@@ -0,0 +1,181 @@1139@@ -0,0 +1,181 @@
diff --git a/debian/patches/series b/debian/patches/series
index 74189fd..4f8471c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -62,7 +62,6 @@ ubuntu-shorter-version-info.patch
62ubuntu-add-initrd-less-boot-fallback.patch62ubuntu-add-initrd-less-boot-fallback.patch
63ubuntu-mkconfig-leave-breadcrumbs.patch63ubuntu-mkconfig-leave-breadcrumbs.patch
64ubuntu-fix-lzma-decompressor-objcopy.patch64ubuntu-fix-lzma-decompressor-objcopy.patch
65ubuntu-clear-invalid-initrd-spacing.patch
66ubuntu-temp-keep-auto-nvram.patch65ubuntu-temp-keep-auto-nvram.patch
67ubuntu-add-devicetree-command-support.patch66ubuntu-add-devicetree-command-support.patch
68ubuntu-boot-from-multipath-dependent-symlink.patch67ubuntu-boot-from-multipath-dependent-symlink.patch
@@ -72,35 +71,38 @@ ubuntu-efi-allow-loopmount-chainload.patch
72cherrypick-lsefisystab-define-smbios3.patch71cherrypick-lsefisystab-define-smbios3.patch
73cherrypick-smbios-module.patch72cherrypick-smbios-module.patch
74cherrypick-lsefisystab-show-dtb.patch73cherrypick-lsefisystab-show-dtb.patch
750075-uefi-firmware-rename-fwsetup-menuentry-to-UEFI-Firmw.patch740074-uefi-firmware-rename-fwsetup-menuentry-to-UEFI-Firmw.patch
760076-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch750075-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch
770077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch760076-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch
780078-ubuntu-Update-the-linux-boot-protocol-version-check.patch770077-ubuntu-Update-the-linux-boot-protocol-version-check.patch
79ubuntu-resilient-boot-ignore-alternative-esps.patch78ubuntu-resilient-boot-ignore-alternative-esps.patch
80ubuntu-resilient-boot-boot-order.patch79ubuntu-resilient-boot-boot-order.patch
81ubuntu-speed-zsys-history.patch80ubuntu-speed-zsys-history.patch
820082-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch810081-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch
830083-safemath-Add-some-arithmetic-primitives-that-check-f.patch820082-safemath-Add-some-arithmetic-primitives-that-check-f.patch
840084-calloc-Make-sure-we-always-have-an-overflow-checking.patch830083-calloc-Make-sure-we-always-have-an-overflow-checking.patch
850085-calloc-Use-calloc-at-most-places.patch840084-calloc-Use-calloc-at-most-places.patch
860086-malloc-Use-overflow-checking-primitives-where-we-do-.patch850085-malloc-Use-overflow-checking-primitives-where-we-do-.patch
870087-iso9660-Don-t-leak-memory-on-realloc-failures.patch860086-iso9660-Don-t-leak-memory-on-realloc-failures.patch
880088-font-Do-not-load-more-than-one-NAME-section.patch870087-font-Do-not-load-more-than-one-NAME-section.patch
890089-gfxmenu-Fix-double-free-in-load_image.patch880088-gfxmenu-Fix-double-free-in-load_image.patch
900090-lzma-Make-sure-we-don-t-dereference-past-array.patch890089-lzma-Make-sure-we-don-t-dereference-past-array.patch
910091-tftp-Do-not-use-priority-queue.patch900090-tftp-Do-not-use-priority-queue.patch
920092-script-Remove-unused-fields-from-grub_script_functio.patch910091-script-Remove-unused-fields-from-grub_script_functio.patch
930093-script-Avoid-a-use-after-free-when-redefining-a-func.patch920092-script-Avoid-a-use-after-free-when-redefining-a-func.patch
940094-hfsplus-fix-two-more-overflows.patch930093-hfsplus-fix-two-more-overflows.patch
950095-lvm-fix-two-more-potential-data-dependent-alloc-over.patch940094-lvm-fix-two-more-potential-data-dependent-alloc-over.patch
960096-efi-fix-some-malformed-device-path-arithmetic-errors.patch950095-efi-fix-some-malformed-device-path-arithmetic-errors.patch
970097-linuxefi-fail-kernel-validation-without-shim-protoco.patch960096-linuxefi-fail-kernel-validation-without-shim-protoco.patch
980098-Fix-a-regression-caused-by-efi-fix-some-malformed-de.patch970097-Fix-a-regression-caused-by-efi-fix-some-malformed-de.patch
990099-efi-Fix-use-after-free-in-halt-reboot-path.patch980098-efi-Fix-use-after-free-in-halt-reboot-path.patch
1000100-chainloader-Avoid-a-double-free-when-validation-fail.patch990099-chainloader-Avoid-a-double-free-when-validation-fail.patch
1010101-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch1000100-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch
1020102-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch1010101-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch
1030103-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch1020102-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch
1040104-linux-loader-avoid-overflow-on-initrd-size-calculati.patch1030103-linux-loader-avoid-overflow-on-initrd-size-calculati.patch
1050105-linux-Fix-integer-overflows-in-initrd-size-handling.patch1040104-linux-Fix-integer-overflows-in-initrd-size-handling.patch
1060106-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch1050105-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
106ubuntu-flavour-order.patch
107ubuntu-dont-verify-loopback-images.patch
108ubuntu-recovery-dis_ucode_ldr.patch
diff --git a/debian/patches/skip-grub_cmd_set_date.patch b/debian/patches/skip-grub_cmd_set_date.patch
index 08e663b..6aa97f4 100644
--- a/debian/patches/skip-grub_cmd_set_date.patch
+++ b/debian/patches/skip-grub_cmd_set_date.patch
@@ -1,4 +1,4 @@
1From e37f5abdb9057be5d79ec34bab535ff059fa6b7f Mon Sep 17 00:00:00 20011From 0bd95cc9927bd92aa12a5fa9ba6ffd11ffc8b910 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org>2From: Colin Watson <cjwatson@debian.org>
3Date: Sun, 28 Oct 2018 19:45:56 +00003Date: Sun, 28 Oct 2018 19:45:56 +0000
4Subject: Skip flaky grub_cmd_set_date test4Subject: Skip flaky grub_cmd_set_date test
@@ -12,7 +12,7 @@ Patch-Name: skip-grub_cmd_set_date.patch
12 1 file changed, 3 insertions(+)12 1 file changed, 3 insertions(+)
1313
14diff --git a/tests/grub_cmd_set_date.in b/tests/grub_cmd_set_date.in14diff --git a/tests/grub_cmd_set_date.in b/tests/grub_cmd_set_date.in
15index aac120a6c..1bb5be4ca 10064415index aac120a6c5..1bb5be4ca7 100644
16--- a/tests/grub_cmd_set_date.in16--- a/tests/grub_cmd_set_date.in
17+++ b/tests/grub_cmd_set_date.in17+++ b/tests/grub_cmd_set_date.in
18@@ -1,6 +1,9 @@18@@ -1,6 +1,9 @@
diff --git a/debian/patches/sleep-shift.patch b/debian/patches/sleep-shift.patch
index b739b45..9d1aae3 100644
--- a/debian/patches/sleep-shift.patch
+++ b/debian/patches/sleep-shift.patch
@@ -1,4 +1,4 @@
1From 8ff02f24d30da862a7ffe530aa2ff692ad8f1b06 Mon Sep 17 00:00:00 20011From e731dba24511ce3c9a06923db223ddd337798719 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@ubuntu.com>2From: Colin Watson <cjwatson@ubuntu.com>
3Date: Mon, 13 Jan 2014 12:13:23 +00003Date: Mon, 13 Jan 2014 12:13:23 +0000
4Subject: Allow Shift to interrupt 'sleep --interruptible'4Subject: Allow Shift to interrupt 'sleep --interruptible'
@@ -17,7 +17,7 @@ Patch-Name: sleep-shift.patch
17 2 files changed, 45 insertions(+), 1 deletion(-)17 2 files changed, 45 insertions(+), 1 deletion(-)
1818
19diff --git a/grub-core/commands/sleep.c b/grub-core/commands/sleep.c19diff --git a/grub-core/commands/sleep.c b/grub-core/commands/sleep.c
20index e77e7900f..3906b1410 10064420index e77e7900fa..3906b14103 100644
21--- a/grub-core/commands/sleep.c21--- a/grub-core/commands/sleep.c
22+++ b/grub-core/commands/sleep.c22+++ b/grub-core/commands/sleep.c
23@@ -46,6 +46,31 @@ do_print (int n)23@@ -46,6 +46,31 @@ do_print (int n)
@@ -62,7 +62,7 @@ index e77e7900f..3906b1410 100644
62 62
63 return 0;63 return 0;
64diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c64diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
65index d5e0c79a7..3611ee9ea 10064465index d5e0c79a70..3611ee9ea7 100644
66--- a/grub-core/normal/menu.c66--- a/grub-core/normal/menu.c
67+++ b/grub-core/normal/menu.c67+++ b/grub-core/normal/menu.c
68@@ -615,8 +615,27 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)68@@ -615,8 +615,27 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
diff --git a/debian/patches/ubuntu-add-devicetree-command-support.patch b/debian/patches/ubuntu-add-devicetree-command-support.patch
index 316ed31..aa41aba 100644
--- a/debian/patches/ubuntu-add-devicetree-command-support.patch
+++ b/debian/patches/ubuntu-add-devicetree-command-support.patch
@@ -1,4 +1,4 @@
1From a30c330fb776934ef1dbaa9784960172650ecdfa Mon Sep 17 00:00:00 20011From 56ec016fe65a634c583cd347fc4e90992cb0c111 Mon Sep 17 00:00:00 2001
2From: Dimitri John Ledkov <xnox@ubuntu.com>2From: Dimitri John Ledkov <xnox@ubuntu.com>
3Date: Wed, 22 May 2019 19:57:29 +01003Date: Wed, 22 May 2019 19:57:29 +0100
4Subject: Add devicetree command, if a dtb is present.4Subject: Add devicetree command, if a dtb is present.
@@ -14,10 +14,10 @@ Patch-Name: ubuntu-add-devicetree-command-support.patch
14 1 file changed, 19 insertions(+)14 1 file changed, 19 insertions(+)
1515
16diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in16diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
17index a95992a77..d6937cfef 10064417index af1e096bd6..bbf5d73e39 100644
18--- a/util/grub.d/10_linux.in18--- a/util/grub.d/10_linux.in
19+++ b/util/grub.d/10_linux.in19+++ b/util/grub.d/10_linux.in
20@@ -240,6 +240,17 @@ EOF20@@ -254,6 +254,17 @@ EOF
21 EOF21 EOF
22 fi22 fi
23 fi23 fi
@@ -35,7 +35,7 @@ index a95992a77..d6937cfef 100644
35 fi35 fi
36 sed "s/^/$submenu_indentation/" << EOF36 sed "s/^/$submenu_indentation/" << EOF
37 }37 }
38@@ -378,6 +389,14 @@ while [ "x$list" != "x" ] ; do38@@ -389,6 +400,14 @@ while [ "x$list" != "x" ] ; do
39 gettext_printf "Found initrd image: %s\n" "$(echo $initrd_display)" >&239 gettext_printf "Found initrd image: %s\n" "$(echo $initrd_display)" >&2
40 fi40 fi
41 41
diff --git a/debian/patches/ubuntu-add-initrd-less-boot-fallback.patch b/debian/patches/ubuntu-add-initrd-less-boot-fallback.patch
index 8778d34..e734a87 100644
--- a/debian/patches/ubuntu-add-initrd-less-boot-fallback.patch
+++ b/debian/patches/ubuntu-add-initrd-less-boot-fallback.patch
@@ -1,4 +1,4 @@
1From f44b20b94883a77b5f8ef8370bedb8457456907d Mon Sep 17 00:00:00 20011From 978947c3f5d769ee423c73418783ec4ef8f7ab3b Mon Sep 17 00:00:00 2001
2From: Chris Glass <chris.glass@canonical.com>2From: Chris Glass <chris.glass@canonical.com>
3Date: Fri, 9 Mar 2018 13:47:07 +01003Date: Fri, 9 Mar 2018 13:47:07 +0100
4Subject: UBUNTU: Added initrd-less boot capabilities.4Subject: UBUNTU: Added initrd-less boot capabilities.
@@ -11,15 +11,15 @@ Signed-off-by: Steve Langasek <steve.langasek@canonical.com>
11Patch-Name: ubuntu-add-initrd-less-boot-fallback.patch11Patch-Name: ubuntu-add-initrd-less-boot-fallback.patch
12---12---
13 Makefile.am | 3 ++13 Makefile.am | 3 ++
14 configure.ac | 10 +++++++14 configure.ac | 10 ++++++
15 grub-initrd-fallback.service | 12 ++++++++15 grub-initrd-fallback.service | 12 +++++++
16 util/grub.d/00_header.in | 27 +++++++++++++++++16 util/grub.d/00_header.in | 27 ++++++++++++++
17 util/grub.d/10_linux.in | 56 +++++++++++++++++++++++++-----------17 util/grub.d/10_linux.in | 68 +++++++++++++++++++++++++++---------
18 5 files changed, 91 insertions(+), 17 deletions(-)18 5 files changed, 104 insertions(+), 16 deletions(-)
19 create mode 100644 grub-initrd-fallback.service19 create mode 100644 grub-initrd-fallback.service
2020
21diff --git a/Makefile.am b/Makefile.am21diff --git a/Makefile.am b/Makefile.am
22index 1f4bb9b8c..e6a220711 10064422index 1f4bb9b8c5..e6a220711e 100644
23--- a/Makefile.am23--- a/Makefile.am
24+++ b/Makefile.am24+++ b/Makefile.am
25@@ -473,6 +473,9 @@ ChangeLog: FORCE25@@ -473,6 +473,9 @@ ChangeLog: FORCE
@@ -33,7 +33,7 @@ index 1f4bb9b8c..e6a220711 100644
33 33
34 syslinux_test: $(top_builddir)/config.status tests/syslinux/ubuntu10.04_grub.cfg34 syslinux_test: $(top_builddir)/config.status tests/syslinux/ubuntu10.04_grub.cfg
35diff --git a/configure.ac b/configure.ac35diff --git a/configure.ac b/configure.ac
36index 883245553..1819188f9 10064436index 883245553d..1819188f9f 100644
37--- a/configure.ac37--- a/configure.ac
38+++ b/configure.ac38+++ b/configure.ac
39@@ -305,6 +305,16 @@ AC_SUBST(grubdirname)39@@ -305,6 +305,16 @@ AC_SUBST(grubdirname)
@@ -55,7 +55,7 @@ index 883245553..1819188f9 100644
55 #55 #
56diff --git a/grub-initrd-fallback.service b/grub-initrd-fallback.service56diff --git a/grub-initrd-fallback.service b/grub-initrd-fallback.service
57new file mode 10064457new file mode 100644
58index 000000000..48778c9f758index 0000000000..48778c9f76
59--- /dev/null59--- /dev/null
60+++ b/grub-initrd-fallback.service60+++ b/grub-initrd-fallback.service
61@@ -0,0 +1,12 @@61@@ -0,0 +1,12 @@
@@ -72,7 +72,7 @@ index 000000000..48778c9f7
72+[Install]72+[Install]
73+WantedBy=multi-user.target rescue.target emergency.target73+WantedBy=multi-user.target rescue.target emergency.target
74diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in74diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
75index b7135b655..2642f66c5 10064475index b7135b655f..2642f66c59 100644
76--- a/util/grub.d/00_header.in76--- a/util/grub.d/00_header.in
77+++ b/util/grub.d/00_header.in77+++ b/util/grub.d/00_header.in
78@@ -50,6 +50,18 @@ if [ -s \$prefix/grubenv ]; then78@@ -50,6 +50,18 @@ if [ -s \$prefix/grubenv ]; then
@@ -117,7 +117,7 @@ index b7135b655..2642f66c5 100644
117 cat <<EOF117 cat <<EOF
118 function recordfail {118 function recordfail {
119diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in119diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
120index aa9666e5a..13f39b9f6 100644120index aa9666e5ad..af1e096bd6 100644
121--- a/util/grub.d/10_linux.in121--- a/util/grub.d/10_linux.in
122+++ b/util/grub.d/10_linux.in122+++ b/util/grub.d/10_linux.in
123@@ -118,6 +118,10 @@ if [ "$vt_handoff" = 1 ]; then123@@ -118,6 +118,10 @@ if [ "$vt_handoff" = 1 ]; then
@@ -131,7 +131,7 @@ index aa9666e5a..13f39b9f6 100644
131 linux_entry ()131 linux_entry ()
132 {132 {
133 os="$1"133 os="$1"
134@@ -193,31 +197,49 @@ EOF134@@ -193,31 +197,63 @@ EOF
135 linux ${rel_dirname}/${basename}.efi.signed root=${linux_root_device_thisversion} ro ${args}135 linux ${rel_dirname}/${basename}.efi.signed root=${linux_root_device_thisversion} ro ${args}
136 EOF136 EOF
137 else137 else
@@ -143,6 +143,14 @@ index aa9666e5a..13f39b9f6 100644
143+ linux_root_device_thisversion="PARTUUID=${GRUB_FORCE_PARTUUID}"143+ linux_root_device_thisversion="PARTUUID=${GRUB_FORCE_PARTUUID}"
144+ fi144+ fi
145+ message="$(gettext_printf "Loading initial ramdisk ...")"145+ message="$(gettext_printf "Loading initial ramdisk ...")"
146+ initrd_path=
147+ for i in ${initrd}; do
148+ initrd_path="${initrd_path} ${rel_dirname}/${i}"
149+ done
150+ initrd_path_only_early=
151+ for i in ${initrd_early}; do
152+ initrd_path_only_early="${initrd_path_only_early} ${rel_dirname}/${i}"
153+ done
146+ if test -n "${initrd}" && [ x"$GRUB_FORCE_PARTUUID" != x ]; then154+ if test -n "${initrd}" && [ x"$GRUB_FORCE_PARTUUID" != x ]; then
147+ sed "s/^/$submenu_indentation/" << EOF155+ sed "s/^/$submenu_indentation/" << EOF
148+ if [ "\${initrdfail}" = 1 ]; then156+ if [ "\${initrdfail}" = 1 ]; then
@@ -153,12 +161,18 @@ index aa9666e5a..13f39b9f6 100644
153+ echo '$(echo "$message" | grub_quote)'161+ echo '$(echo "$message" | grub_quote)'
154+EOF162+EOF
155+ fi163+ fi
156+
157 sed "s/^/$submenu_indentation/" << EOF164 sed "s/^/$submenu_indentation/" << EOF
158- linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}165- linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
159+ initrd ${rel_dirname}/${initrd}166+ initrd $(echo $initrd_path)
160+ else167+ else
161+ linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} panic=-1168+ linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} panic=-1
169+EOF
170+ if [ -n "$initrd_path_only_early" ]; then
171+ sed "s/^/$submenu_indentation/" << EOF
172+ initrd $(echo $initrd_path_only_early)
173+EOF
174+ fi
175+ sed "s/^/$submenu_indentation/" << EOF
162+ fi176+ fi
163+ initrdfail177+ initrdfail
164 EOF178 EOF
@@ -188,10 +202,9 @@ index aa9666e5a..13f39b9f6 100644
188- initrd_path="${initrd_path} ${rel_dirname}/${i}"202- initrd_path="${initrd_path} ${rel_dirname}/${i}"
189- done203- done
190- sed "s/^/$submenu_indentation/" << EOF204- sed "s/^/$submenu_indentation/" << EOF
191- initrd $(echo $initrd_path)
192+ fi205+ fi
193+ sed "s/^/$submenu_indentation/" << EOF206+ sed "s/^/$submenu_indentation/" << EOF
194+ initrd ${rel_dirname}/${initrd}207 initrd $(echo $initrd_path)
195 EOF208 EOF
196+ fi209+ fi
197+ fi210+ fi
diff --git a/debian/patches/ubuntu-boot-from-multipath-dependent-symlink.patch b/debian/patches/ubuntu-boot-from-multipath-dependent-symlink.patch
index d8b8810..5e19f72 100644
--- a/debian/patches/ubuntu-boot-from-multipath-dependent-symlink.patch
+++ b/debian/patches/ubuntu-boot-from-multipath-dependent-symlink.patch
@@ -1,4 +1,4 @@
1From 4f4f4b1ce88642c1c13f12b425484906098590b5 Mon Sep 17 00:00:00 20011From c51cc4664ac67fcd7c3177ea6c6dd0d2c06c43e6 Mon Sep 17 00:00:00 2001
2From: Michael Hudson-Doyle <michael.hudson@canonical.com>2From: Michael Hudson-Doyle <michael.hudson@canonical.com>
3Date: Tue, 6 Aug 2019 12:31:47 +12003Date: Tue, 6 Aug 2019 12:31:47 +1200
4Subject: UBUNTU: Boot from multipath-dependent symlink when / is multipathed.4Subject: UBUNTU: Boot from multipath-dependent symlink when / is multipathed.
@@ -16,7 +16,7 @@ Patch-Name: ubuntu-boot-from-multipath-dependent-symlink.patch
16 1 file changed, 41 insertions(+)16 1 file changed, 41 insertions(+)
1717
18diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in18diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
19index d