Merge ~xnox/grub:xnox/hirsute-next into ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu

[Dimitri John Ledkov]

xnox hirsute-next

diff --git a/debian/.git-dpm b/debian/.git-dpm
index c865f62..33e85f2 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-d7d0f4147560ec746246e44bd03b815961700d79
-d7d0f4147560ec746246e44bd03b815961700d79
+ecea6495041ee81331d245cf25ac53d66f07561c
+ecea6495041ee81331d245cf25ac53d66f07561c
 578bb115fbd47e1c464696f1f8d6183e5443975d
 578bb115fbd47e1c464696f1f8d6183e5443975d
 grub2_2.04.orig.tar.xz
diff --git a/debian/changelog b/debian/changelog
index 46d0faf..03b2301 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-grub2 (2.04-1ubuntu37) UNRELEASED; urgency=medium
+grub2 (2.04-1ubuntu37) hirsute; urgency=medium
 
   * debian/patches/grub-install-backup-and-restore.patch: Fix-up the patch
     to correctly initialyze the names of the modules to restore. LP:
@@ -7,8 +7,25 @@ grub2 (2.04-1ubuntu37) UNRELEASED; urgency=medium
     and fails triggering fallback. LP: #1901553
   * grub-common.service: port init.d script to systemd unit. Add warning
     message, when initrdless boot fails triggering fallback. LP: #1901553
-
- -- Dimitri John Ledkov <[e-mail]>  Mon, 07 Dec 2020 10:44:30 +0000
+  * debian/rules: undo po/ directory patching in
+    override_dh_autoreconf_clean.
+  * minilzo: built using the distribution's minilzo
+  * ubuntu-fix-reproducible-squashfs-test.patch: fix squashfs-test with
+    new squashfs-tools in hirsute.
+  * rhboot-f34-make-exit-take-a-return-code.patch,
+    rhboot-f34-dont-use-int-for-efi-status.patch: allow grub to exit
+    non-zero under EFI, this should allow falling back to the next
+    BootOrder BootEntry.
+  * rhboot-f34-tcp-add-window-scaling-support.patch: speed up netboot
+    transfer speed.
+  * rhboot-f34-support-non-ethernet.patch,
+    ubuntu-fixup-rhboot-f34-support-non-ethernet.patch,
+    ubuntu-fixup-rhboot-f34-support-non-ethernet-2.patch:
+    add support for link layer addresses of up to 32-bytes.
+  * rhboot-f34-make-pmtimer-tsc-calibration-fast.patch:
+    speed up calibration time, especially when booting VMs.
+
+ -- Dimitri John Ledkov <[e-mail]>  Sat, 12 Dec 2020 00:50:47 +0000
 
 grub2 (2.04-1ubuntu36) hirsute; urgency=medium
 
diff --git a/debian/control b/debian/control
index f9fd5b0..9aafb52 100644
--- a/debian/control
+++ b/debian/control
@@ -30,6 +30,7 @@ Build-Depends: debhelper (>= 10~),
  libfuse-dev (>= 2.8.4-1.4) [linux-any kfreebsd-any],
  fonts-dejavu-core,
  liblzma-dev,
+ liblzo2-dev,
  dosfstools [any-i386 any-amd64 any-arm64],
  mtools [any-i386 any-amd64 any-arm64],
  wamerican,
@@ -77,6 +78,7 @@ Description: GRand Unified Bootloader, version 2 (dummy package)
 
 Package: grub-common
 Architecture: any
+Built-Using: ${Built-Using}
 Depends: ${shlibs:Depends}, ${misc:Depends}, gettext-base, ${lsb-base-depends}
 Replaces: grub-pc (<< 2.00-4), grub-ieee1275 (<< 2.00-4), grub-efi (<< 1.99-1), grub-coreboot (<< 2.00-4), grub-linuxbios (<< 1.96+20080831-1), grub-efi-ia32 (<< 2.00-4), grub-efi-amd64 (<< 2.00-4), grub-efi-ia64 (<< 2.00-4), grub-yeeloong (<< 2.00-4), init-select
 Recommends: os-prober (>= 1.33)
diff --git a/debian/patches/0074-uefi-firmware-rename-fwsetup-menuentry-to-UEFI-Firmw.patch b/debian/patches/0074-uefi-firmware-rename-fwsetup-menuentry-to-UEFI-Firmw.patch
index 97e1d84..20dbfb4 100644
--- a/debian/patches/0074-uefi-firmware-rename-fwsetup-menuentry-to-UEFI-Firmw.patch
+++ b/debian/patches/0074-uefi-firmware-rename-fwsetup-menuentry-to-UEFI-Firmw.patch
@@ -9,7 +9,7 @@ LP: #1864547
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/util/grub.d/30_uefi-firmware.in b/util/grub.d/30_uefi-firmware.in
-index 3c9f533d8..b072d219f 100644
+index 3c9f533d8c..b072d219f6 100644
 --- a/util/grub.d/30_uefi-firmware.in
 +++ b/util/grub.d/30_uefi-firmware.in
 @@ -32,9 +32,9 @@ OsIndications="$efi_vars_dir/OsIndicationsSupported-$EFI_GLOBAL_VARIABLE/data"
diff --git a/debian/patches/0075-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch b/debian/patches/0075-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch
index aca2636..3f8f67c 100644
--- a/debian/patches/0075-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch
+++ b/debian/patches/0075-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch
@@ -16,7 +16,7 @@ Origin: upstream, https://git.savannah.gnu.org/cgit/grub.git/commit/?id=87049f97
  1 file changed, 24 insertions(+)
 
 diff --git a/grub-core/commands/smbios.c b/grub-core/commands/smbios.c
-index 7a6a391fc..1a9086ddd 100644
+index 7a6a391fc1..1a9086ddd4 100644
 --- a/grub-core/commands/smbios.c
 +++ b/grub-core/commands/smbios.c
 @@ -64,6 +64,21 @@ grub_smbios_get_eps3 (void)
diff --git a/debian/patches/0076-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
index de249ed..8460c3c 100644
--- a/debian/patches/0076-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
@@ -18,7 +18,7 @@ only if secure boot is disabled.
  2 files changed, 35 insertions(+), 26 deletions(-)
 
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index 6b6aef87f..fe3ca2c59 100644
+index 6b6aef87f7..fe3ca2c596 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
 @@ -27,6 +27,7 @@
@@ -51,7 +51,7 @@ index 6b6aef87f..fe3ca2c59 100644
  
    params = grub_efi_allocate_pages_max (0x3fffffff,
 diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
-index 4328bcbdb..991eb29db 100644
+index 4328bcbdb0..991eb29db9 100644
 --- a/grub-core/loader/i386/linux.c
 +++ b/grub-core/loader/i386/linux.c
 @@ -658,35 +658,40 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
diff --git a/debian/patches/0077-ubuntu-Update-the-linux-boot-protocol-version-check.patch b/debian/patches/0077-ubuntu-Update-the-linux-boot-protocol-version-check.patch
index fa2d92a..dfd3ee8 100644
--- a/debian/patches/0077-ubuntu-Update-the-linux-boot-protocol-version-check.patch
+++ b/debian/patches/0077-ubuntu-Update-the-linux-boot-protocol-version-check.patch
@@ -11,7 +11,7 @@ check accordingly.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index fe3ca2c59..2929da7a2 100644
+index fe3ca2c596..2929da7a29 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
 @@ -245,7 +245,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
diff --git a/debian/patches/0081-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch b/debian/patches/0081-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch
index dc9a05a..5ce30a2 100644
--- a/debian/patches/0081-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch
+++ b/debian/patches/0081-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch
@@ -47,7 +47,7 @@ Reviewed-by: Daniel Kiper <[e-mail]>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/script/yylex.l b/grub-core/script/yylex.l
-index 7b44c37b7..b7203c823 100644
+index 7b44c37b76..b7203c8230 100644
 --- a/grub-core/script/yylex.l
 +++ b/grub-core/script/yylex.l
 @@ -37,11 +37,11 @@
diff --git a/debian/patches/0082-safemath-Add-some-arithmetic-primitives-that-check-f.patch b/debian/patches/0082-safemath-Add-some-arithmetic-primitives-that-check-f.patch
index 9916356..b87a7fb 100644
--- a/debian/patches/0082-safemath-Add-some-arithmetic-primitives-that-check-f.patch
+++ b/debian/patches/0082-safemath-Add-some-arithmetic-primitives-that-check-f.patch
@@ -25,7 +25,7 @@ Reviewed-by: Daniel Kiper <[e-mail]>
  create mode 100644 include/grub/safemath.h
 
 diff --git a/INSTALL b/INSTALL
-index 342c158e9..991479b52 100644
+index 342c158e91..991479b521 100644
 --- a/INSTALL
 +++ b/INSTALL
 @@ -11,27 +11,9 @@ GRUB depends on some software packages installed into your system. If
@@ -59,7 +59,7 @@ index 342c158e9..991479b52 100644
  * GNU Bison 2.3 or later
  * GNU gettext 0.17 or later
 diff --git a/include/grub/compiler.h b/include/grub/compiler.h
-index c9e1d7a73..8f3be3ae7 100644
+index c9e1d7a73d..8f3be3ae70 100644
 --- a/include/grub/compiler.h
 +++ b/include/grub/compiler.h
 @@ -48,4 +48,12 @@
@@ -77,7 +77,7 @@ index c9e1d7a73..8f3be3ae7 100644
  #endif /* ! GRUB_COMPILER_HEADER */
 diff --git a/include/grub/safemath.h b/include/grub/safemath.h
 new file mode 100644
-index 000000000..c17b89bba
+index 0000000000..c17b89bba1
 --- /dev/null
 +++ b/include/grub/safemath.h
 @@ -0,0 +1,37 @@
diff --git a/debian/patches/0083-calloc-Make-sure-we-always-have-an-overflow-checking.patch b/debian/patches/0083-calloc-Make-sure-we-always-have-an-overflow-checking.patch
index 85019d5..6238eee 100644
--- a/debian/patches/0083-calloc-Make-sure-we-always-have-an-overflow-checking.patch
+++ b/debian/patches/0083-calloc-Make-sure-we-always-have-an-overflow-checking.patch
@@ -22,7 +22,7 @@ Reviewed-by: Daniel Kiper <[e-mail]>
  7 files changed, 85 insertions(+), 3 deletions(-)
 
 diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
-index 65db79baa..dfd8a8ec4 100644
+index 65db79baa1..dfd8a8ec48 100644
 --- a/grub-core/kern/emu/misc.c
 +++ b/grub-core/kern/emu/misc.c
 @@ -85,6 +85,18 @@ grub_util_error (const char *fmt, ...)
@@ -45,7 +45,7 @@ index 65db79baa..dfd8a8ec4 100644
  xmalloc (grub_size_t size)
  {
 diff --git a/grub-core/kern/emu/mm.c b/grub-core/kern/emu/mm.c
-index f262e95e3..145b01d37 100644
+index f262e95e38..145b01d371 100644
 --- a/grub-core/kern/emu/mm.c
 +++ b/grub-core/kern/emu/mm.c
 @@ -25,6 +25,16 @@
@@ -66,7 +66,7 @@ index f262e95e3..145b01d37 100644
  grub_malloc (grub_size_t size)
  {
 diff --git a/grub-core/kern/mm.c b/grub-core/kern/mm.c
-index ee88ff611..f2822a836 100644
+index ee88ff6118..f2822a8364 100644
 --- a/grub-core/kern/mm.c
 +++ b/grub-core/kern/mm.c
 @@ -67,8 +67,10 @@
@@ -133,7 +133,7 @@ index ee88ff611..f2822a836 100644
  grub_debug_malloc (const char *file, int line, grub_size_t size)
  {
 diff --git a/grub-core/lib/libgcrypt_wrap/mem.c b/grub-core/lib/libgcrypt_wrap/mem.c
-index beeb661a3..74c6eafe5 100644
+index beeb661a3c..74c6eafe52 100644
 --- a/grub-core/lib/libgcrypt_wrap/mem.c
 +++ b/grub-core/lib/libgcrypt_wrap/mem.c
 @@ -4,6 +4,7 @@
@@ -169,7 +169,7 @@ index beeb661a3..74c6eafe5 100644
      grub_fatal ("gcry_xcalloc failed");
    return ret;
 diff --git a/grub-core/lib/posix_wrap/stdlib.h b/grub-core/lib/posix_wrap/stdlib.h
-index 3b46f47ff..7a8d385e9 100644
+index 3b46f47ff5..7a8d385e97 100644
 --- a/grub-core/lib/posix_wrap/stdlib.h
 +++ b/grub-core/lib/posix_wrap/stdlib.h
 @@ -21,6 +21,7 @@
@@ -195,7 +195,7 @@ index 3b46f47ff..7a8d385e9 100644
  
  static inline void *
 diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
-index ce464cfd0..ff9c48a64 100644
+index ce464cfd00..ff9c48a649 100644
 --- a/include/grub/emu/misc.h
 +++ b/include/grub/emu/misc.h
 @@ -47,6 +47,7 @@ grub_util_device_is_mapped (const char *dev);
@@ -207,7 +207,7 @@ index ce464cfd0..ff9c48a64 100644
  void * EXPORT_FUNC(xrealloc) (void *ptr, grub_size_t size) WARN_UNUSED_RESULT;
  char * EXPORT_FUNC(xstrdup) (const char *str) WARN_UNUSED_RESULT;
 diff --git a/include/grub/mm.h b/include/grub/mm.h
-index 28e2e53eb..9c38dd3ca 100644
+index 28e2e53eb3..9c38dd3ca5 100644
 --- a/include/grub/mm.h
 +++ b/include/grub/mm.h
 @@ -29,6 +29,7 @@
diff --git a/debian/patches/0084-calloc-Use-calloc-at-most-places.patch b/debian/patches/0084-calloc-Use-calloc-at-most-places.patch
index 4a90d3f..ac5217f 100644
--- a/debian/patches/0084-calloc-Use-calloc-at-most-places.patch
+++ b/debian/patches/0084-calloc-Use-calloc-at-most-places.patch
@@ -111,7 +111,7 @@ Reviewed-by: Daniel Kiper <[e-mail]>
  86 files changed, 176 insertions(+), 175 deletions(-)
 
 diff --git a/grub-core/bus/usb/usbhub.c b/grub-core/bus/usb/usbhub.c
-index 34a7ff1b5..a06cce302 100644
+index 34a7ff1b5f..a06cce302d 100644
 --- a/grub-core/bus/usb/usbhub.c
 +++ b/grub-core/bus/usb/usbhub.c
 @@ -149,8 +149,8 @@ grub_usb_add_hub (grub_usb_device_t dev)
@@ -137,7 +137,7 @@ index 34a7ff1b5..a06cce302 100644
      {
        grub_free (hub->devices);
 diff --git a/grub-core/commands/efi/lsefisystab.c b/grub-core/commands/efi/lsefisystab.c
-index 902788250..d29188efa 100644
+index 902788250e..d29188efaf 100644
 --- a/grub-core/commands/efi/lsefisystab.c
 +++ b/grub-core/commands/efi/lsefisystab.c
 @@ -73,7 +73,8 @@ grub_cmd_lsefisystab (struct grub_command *cmd __attribute__ ((unused)),
@@ -151,7 +151,7 @@ index 902788250..d29188efa 100644
        return grub_errno;
      *grub_utf16_to_utf8 ((grub_uint8_t *) vendor, st->firmware_vendor,
 diff --git a/grub-core/commands/legacycfg.c b/grub-core/commands/legacycfg.c
-index db7a8f002..5e3ec0d5e 100644
+index db7a8f0027..5e3ec0d5e4 100644
 --- a/grub-core/commands/legacycfg.c
 +++ b/grub-core/commands/legacycfg.c
 @@ -314,7 +314,7 @@ grub_cmd_legacy_kernel (struct grub_command *mycmd __attribute__ ((unused)),
@@ -182,7 +182,7 @@ index db7a8f002..5e3ec0d5e 100644
  	return grub_errno;
        grub_memcpy (newargs + 1, args, argc * sizeof (newargs[0]));
 diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c
-index 2c5363da7..9164df744 100644
+index 2c5363da7f..9164df744a 100644
 --- a/grub-core/commands/menuentry.c
 +++ b/grub-core/commands/menuentry.c
 @@ -154,7 +154,7 @@ grub_normal_add_menu_entry (int argc, const char **args,
@@ -195,7 +195,7 @@ index 2c5363da7..9164df744 100644
      goto fail;
  
 diff --git a/grub-core/commands/nativedisk.c b/grub-core/commands/nativedisk.c
-index 699447d11..7c8f97f6a 100644
+index 699447d11e..7c8f97f6ad 100644
 --- a/grub-core/commands/nativedisk.c
 +++ b/grub-core/commands/nativedisk.c
 @@ -195,7 +195,7 @@ grub_cmd_nativedisk (grub_command_t cmd __attribute__ ((unused)),
@@ -208,7 +208,7 @@ index 699447d11..7c8f97f6a 100644
      return grub_errno;
  
 diff --git a/grub-core/commands/parttool.c b/grub-core/commands/parttool.c
-index 22b46b187..051e31320 100644
+index 22b46b1874..051e31320e 100644
 --- a/grub-core/commands/parttool.c
 +++ b/grub-core/commands/parttool.c
 @@ -59,7 +59,13 @@ grub_parttool_register(const char *part_name,
@@ -245,7 +245,7 @@ index 22b46b187..051e31320 100644
  	  if (! parsed[j])
  	    {
 diff --git a/grub-core/commands/regexp.c b/grub-core/commands/regexp.c
-index f00b184c8..4019164f3 100644
+index f00b184c81..4019164f36 100644
 --- a/grub-core/commands/regexp.c
 +++ b/grub-core/commands/regexp.c
 @@ -116,7 +116,7 @@ grub_cmd_regexp (grub_extcmd_context_t ctxt, int argc, char **args)
@@ -258,7 +258,7 @@ index f00b184c8..4019164f3 100644
      goto fail;
  
 diff --git a/grub-core/commands/search_wrap.c b/grub-core/commands/search_wrap.c
-index d7fd26b94..47fc8eb99 100644
+index d7fd26b940..47fc8eb996 100644
 --- a/grub-core/commands/search_wrap.c
 +++ b/grub-core/commands/search_wrap.c
 @@ -122,7 +122,7 @@ grub_cmd_search (grub_extcmd_context_t ctxt, int argc, char **args)
@@ -271,7 +271,7 @@ index d7fd26b94..47fc8eb99 100644
      return grub_errno;
    j = 0;
 diff --git a/grub-core/disk/diskfilter.c b/grub-core/disk/diskfilter.c
-index c3b578acf..68ca9e0be 100644
+index c3b578acf2..68ca9e0be9 100644
 --- a/grub-core/disk/diskfilter.c
 +++ b/grub-core/disk/diskfilter.c
 @@ -1134,7 +1134,7 @@ grub_diskfilter_make_raid (grub_size_t uuidlen, char *uuid, int nmemb,
@@ -293,7 +293,7 @@ index c3b578acf..68ca9e0be 100644
  	  for (p = disk->partition; p; p = p->parent)
  	    pv->partmaps[s++] = xstrdup (p->partmap->name);
 diff --git a/grub-core/disk/ieee1275/ofdisk.c b/grub-core/disk/ieee1275/ofdisk.c
-index f73257e66..03674cb47 100644
+index f73257e66d..03674cb477 100644
 --- a/grub-core/disk/ieee1275/ofdisk.c
 +++ b/grub-core/disk/ieee1275/ofdisk.c
 @@ -297,7 +297,7 @@ dev_iterate (const struct grub_ieee1275_devalias *alias)
@@ -306,7 +306,7 @@ index f73257e66..03674cb47 100644
        if (!table)
          {
 diff --git a/grub-core/disk/ldm.c b/grub-core/disk/ldm.c
-index 2a22d2d6c..e6323701a 100644
+index 2a22d2d6c1..e6323701ab 100644
 --- a/grub-core/disk/ldm.c
 +++ b/grub-core/disk/ldm.c
 @@ -323,8 +323,8 @@ make_vg (grub_disk_t disk,
@@ -352,7 +352,7 @@ index 2a22d2d6c..e6323701a 100644
  	return grub_errno;
        for (i = 0; i < *nsectors; i++)
 diff --git a/grub-core/disk/luks.c b/grub-core/disk/luks.c
-index 86c50c612..18b3a8bb1 100644
+index 86c50c6121..18b3a8bb1d 100644
 --- a/grub-core/disk/luks.c
 +++ b/grub-core/disk/luks.c
 @@ -336,7 +336,7 @@ luks_recover_key (grub_disk_t source,
@@ -365,7 +365,7 @@ index 86c50c612..18b3a8bb1 100644
      return grub_errno;
  
 diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c
-index 7b265c780..d1df640b3 100644
+index 7b265c780c..d1df640b31 100644
 --- a/grub-core/disk/lvm.c
 +++ b/grub-core/disk/lvm.c
 @@ -173,7 +173,7 @@ grub_lvm_detect (grub_disk_t disk,
@@ -398,7 +398,7 @@ index 7b265c780..d1df640b3 100644
  
  		      p = grub_strstr (p, "stripes = [");
 diff --git a/grub-core/disk/xen/xendisk.c b/grub-core/disk/xen/xendisk.c
-index 48476cbbf..d6612eebd 100644
+index 48476cbbf9..d6612eebd7 100644
 --- a/grub-core/disk/xen/xendisk.c
 +++ b/grub-core/disk/xen/xendisk.c
 @@ -426,7 +426,7 @@ grub_xendisk_init (void)
@@ -411,7 +411,7 @@ index 48476cbbf..d6612eebd 100644
      return;
    if (grub_xenstore_dir ("device/vbd", fill, &ctr))
 diff --git a/grub-core/efiemu/loadcore.c b/grub-core/efiemu/loadcore.c
-index 44085ef81..2b924623f 100644
+index 44085ef818..2b924623f5 100644
 --- a/grub-core/efiemu/loadcore.c
 +++ b/grub-core/efiemu/loadcore.c
 @@ -201,7 +201,7 @@ grub_efiemu_count_symbols (const Elf_Ehdr *e)
@@ -424,7 +424,7 @@ index 44085ef81..2b924623f 100644
    /* Relocators */
    for (i = 0, s = (Elf_Shdr *) ((char *) e + e->e_shoff);
 diff --git a/grub-core/efiemu/mm.c b/grub-core/efiemu/mm.c
-index 52a032f7b..9b8e0d0ad 100644
+index 52a032f7b2..9b8e0d0ad1 100644
 --- a/grub-core/efiemu/mm.c
 +++ b/grub-core/efiemu/mm.c
 @@ -554,11 +554,11 @@ grub_efiemu_mmap_sort_and_uniq (void)
@@ -451,7 +451,7 @@ index 52a032f7b..9b8e0d0ad 100644
      {
        grub_efiemu_unload ();
 diff --git a/grub-core/font/font.c b/grub-core/font/font.c
-index 85a292557..8e118b315 100644
+index 85a292557a..8e118b315c 100644
 --- a/grub-core/font/font.c
 +++ b/grub-core/font/font.c
 @@ -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
      return 1;
    font->bmp_idx = grub_malloc (0x10000 * sizeof (grub_uint16_t));
 diff --git a/grub-core/fs/affs.c b/grub-core/fs/affs.c
-index 6b6a2bc91..220b3712f 100644
+index 6b6a2bc913..220b3712f2 100644
 --- a/grub-core/fs/affs.c
 +++ b/grub-core/fs/affs.c
 @@ -301,7 +301,7 @@ grub_affs_read_symlink (grub_fshelp_node_t node)
@@ -496,7 +496,7 @@ index 6b6a2bc91..220b3712f 100644
  	*grub_latin1_to_utf8 ((grub_uint8_t *) *label, file.name, len) = '\0';
      }
 diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index 48bd3d04a..11272efc1 100644
+index 48bd3d04a5..11272efc1a 100644
 --- a/grub-core/fs/btrfs.c
 +++ b/grub-core/fs/btrfs.c
 @@ -413,7 +413,7 @@ lower_bound (struct grub_btrfs_data *data,
@@ -527,7 +527,7 @@ index 48bd3d04a..11272efc1 100644
      return grub_errno;
    for (i = 0; i < *nsectors; i++)
 diff --git a/grub-core/fs/hfs.c b/grub-core/fs/hfs.c
-index ac0a40990..3fe842b4d 100644
+index ac0a40990e..3fe842b4d8 100644
 --- a/grub-core/fs/hfs.c
 +++ b/grub-core/fs/hfs.c
 @@ -1360,7 +1360,7 @@ grub_hfs_label (grub_device_t device, char **label)
@@ -540,7 +540,7 @@ index ac0a40990..3fe842b4d 100644
  	macroman_to_utf8 (*label, data->sblock.volname + 1,
  			  len + 1, 0);
 diff --git a/grub-core/fs/hfsplus.c b/grub-core/fs/hfsplus.c
-index 54786bb1c..dae43becc 100644
+index 54786bb1c6..dae43becc9 100644
 --- a/grub-core/fs/hfsplus.c
 +++ b/grub-core/fs/hfsplus.c
 @@ -720,7 +720,7 @@ list_nodes (void *record, void *hook_arg)
@@ -571,7 +571,7 @@ index 54786bb1c..dae43becc 100644
      {
        grub_free (label_name);
 diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c
-index 49c0c632b..4f1b52a55 100644
+index 49c0c632bf..4f1b52a552 100644
 --- a/grub-core/fs/iso9660.c
 +++ b/grub-core/fs/iso9660.c
 @@ -331,7 +331,7 @@ grub_iso9660_convert_string (grub_uint8_t *us, int len)
@@ -584,7 +584,7 @@ index 49c0c632b..4f1b52a55 100644
      return NULL;
  
 diff --git a/grub-core/fs/ntfs.c b/grub-core/fs/ntfs.c
-index fc4e1f678..2f34f76da 100644
+index fc4e1f678d..2f34f76da8 100644
 --- a/grub-core/fs/ntfs.c
 +++ b/grub-core/fs/ntfs.c
 @@ -556,8 +556,8 @@ get_utf8 (grub_uint8_t *in, grub_size_t len)
@@ -599,7 +599,7 @@ index fc4e1f678..2f34f76da 100644
      {
        grub_free (buf);
 diff --git a/grub-core/fs/sfs.c b/grub-core/fs/sfs.c
-index 50c1fe72f..90f7fb379 100644
+index 50c1fe72f4..90f7fb3791 100644
 --- a/grub-core/fs/sfs.c
 +++ b/grub-core/fs/sfs.c
 @@ -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
  	{
  	  grub_errno = 0;
 diff --git a/grub-core/fs/tar.c b/grub-core/fs/tar.c
-index 7d63e0c99..c551ed6b5 100644
+index 7d63e0c99c..c551ed6b52 100644
 --- a/grub-core/fs/tar.c
 +++ b/grub-core/fs/tar.c
 @@ -120,7 +120,7 @@ grub_cpio_find_file (struct grub_archelp_data *data, char **name,
@@ -625,7 +625,7 @@ index 7d63e0c99..c551ed6b5 100644
  		return grub_errno;
  	      grub_free (data->linkname);
 diff --git a/grub-core/fs/udf.c b/grub-core/fs/udf.c
-index dc8b6e2d1..a83761674 100644
+index dc8b6e2d1c..a83761674a 100644
 --- a/grub-core/fs/udf.c
 +++ b/grub-core/fs/udf.c
 @@ -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
  	return NULL;
        for (i = 0; i < utf16len; i++)
 diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c
-index 2f72e42bf..381dde556 100644
+index 2f72e42bf8..381dde556d 100644
 --- a/grub-core/fs/zfs/zfs.c
 +++ b/grub-core/fs/zfs/zfs.c
 @@ -3325,7 +3325,7 @@ dnode_get_fullpath (const char *fullpath, struct subvolume *subvol,
@@ -669,7 +669,7 @@ index 2f72e42bf..381dde556 100644
      return grub_errno;
    for (i = 0; i < *nsectors; i++)
 diff --git a/grub-core/gfxmenu/gui_string_util.c b/grub-core/gfxmenu/gui_string_util.c
-index a9a415e31..ba1e1eab3 100644
+index a9a415e312..ba1e1eab31 100644
 --- a/grub-core/gfxmenu/gui_string_util.c
 +++ b/grub-core/gfxmenu/gui_string_util.c
 @@ -55,7 +55,7 @@ canonicalize_path (const char *path)
@@ -682,7 +682,7 @@ index a9a415e31..ba1e1eab3 100644
      return 0;
  
 diff --git a/grub-core/gfxmenu/widget-box.c b/grub-core/gfxmenu/widget-box.c
-index b60602889..470597ded 100644
+index b606028891..470597ded2 100644
 --- a/grub-core/gfxmenu/widget-box.c
 +++ b/grub-core/gfxmenu/widget-box.c
 @@ -303,10 +303,10 @@ grub_gfxmenu_create_box (const char *pixmaps_prefix,
@@ -699,7 +699,7 @@ index b60602889..470597ded 100644
    /* Initialize all pixmap pointers to NULL so that proper destruction can
       be performed if an error is encountered partway through construction.  */
 diff --git a/grub-core/io/gzio.c b/grub-core/io/gzio.c
-index 6208a9763..43d98a7bd 100644
+index 6208a97636..43d98a7bdf 100644
 --- a/grub-core/io/gzio.c
 +++ b/grub-core/io/gzio.c
 @@ -554,7 +554,7 @@ huft_build (unsigned *b,	/* code lengths in bits (all assumed <= BMAX) */
@@ -712,7 +712,7 @@ index 6208a9763..43d98a7bd 100644
  		{
  		  if (h)
 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index 6e1ceb905..dc31caa21 100644
+index 6e1ceb9051..dc31caa213 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
 @@ -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
  	    {
  	      grub_free (name);
 diff --git a/grub-core/kern/emu/hostdisk.c b/grub-core/kern/emu/hostdisk.c
-index 8ac523953..f90b6c9ce 100644
+index 8ac5239538..f90b6c9ce4 100644
 --- a/grub-core/kern/emu/hostdisk.c
 +++ b/grub-core/kern/emu/hostdisk.c
 @@ -627,7 +627,7 @@ static char *
@@ -756,7 +756,7 @@ index 8ac523953..f90b6c9ce 100644
    size_t i;
    int first = 1;
 diff --git a/grub-core/kern/fs.c b/grub-core/kern/fs.c
-index 2b85f4950..f90be6566 100644
+index 2b85f4950b..f90be6566b 100644
 --- a/grub-core/kern/fs.c
 +++ b/grub-core/kern/fs.c
 @@ -151,7 +151,7 @@ grub_fs_blocklist_open (grub_file_t file, const char *name)
@@ -769,7 +769,7 @@ index 2b85f4950..f90be6566 100644
      return 0;
  
 diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index 18cad5803..83c068d61 100644
+index 18cad5803b..83c068d61b 100644
 --- a/grub-core/kern/misc.c
 +++ b/grub-core/kern/misc.c
 @@ -691,7 +691,7 @@ parse_printf_args (const char *fmt0, struct printf_args *args,
@@ -782,7 +782,7 @@ index 18cad5803..83c068d61 100644
  	{
  	  grub_errno = GRUB_ERR_NONE;
 diff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c
-index 78175aac2..619db3122 100644
+index 78175aac2d..619db3122a 100644
 --- a/grub-core/kern/parser.c
 +++ b/grub-core/kern/parser.c
 @@ -213,7 +213,7 @@ grub_parser_split_cmdline (const char *cmdline,
@@ -795,7 +795,7 @@ index 78175aac2..619db3122 100644
      {
        grub_free (args);
 diff --git a/grub-core/kern/uboot/uboot.c b/grub-core/kern/uboot/uboot.c
-index be4816fe6..aac8f9ae1 100644
+index be4816fe6f..aac8f9ae1f 100644
 --- a/grub-core/kern/uboot/uboot.c
 +++ b/grub-core/kern/uboot/uboot.c
 @@ -133,7 +133,7 @@ grub_uboot_dev_enum (void)
@@ -808,7 +808,7 @@ index be4816fe6..aac8f9ae1 100644
      return 0;
  
 diff --git a/grub-core/lib/libgcrypt/cipher/ac.c b/grub-core/lib/libgcrypt/cipher/ac.c
-index f5e946a2d..63f6fcd11 100644
+index f5e946a2d8..63f6fcd11e 100644
 --- a/grub-core/lib/libgcrypt/cipher/ac.c
 +++ b/grub-core/lib/libgcrypt/cipher/ac.c
 @@ -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
      {
        err = gcry_error_from_errno (errno);
 diff --git a/grub-core/lib/libgcrypt/cipher/primegen.c b/grub-core/lib/libgcrypt/cipher/primegen.c
-index 2788e349f..b12e79b19 100644
+index 2788e349fa..b12e79b192 100644
 --- a/grub-core/lib/libgcrypt/cipher/primegen.c
 +++ b/grub-core/lib/libgcrypt/cipher/primegen.c
 @@ -383,7 +383,7 @@ prime_generate_internal (int need_q_factor,
@@ -870,7 +870,7 @@ index 2788e349f..b12e79b19 100644
    val_2  = mpi_alloc_set_ui( 2 );
    val_3 = mpi_alloc_set_ui( 3);
 diff --git a/grub-core/lib/libgcrypt/cipher/pubkey.c b/grub-core/lib/libgcrypt/cipher/pubkey.c
-index 910982141..ca087ad75 100644
+index 910982141e..ca087ad75b 100644
 --- a/grub-core/lib/libgcrypt/cipher/pubkey.c
 +++ b/grub-core/lib/libgcrypt/cipher/pubkey.c
 @@ -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
          {
            rc = gpg_err_code_from_syserror ();
 diff --git a/grub-core/lib/priority_queue.c b/grub-core/lib/priority_queue.c
-index 659be0b7f..7d5e7c05a 100644
+index 659be0b7f4..7d5e7c05aa 100644
 --- a/grub-core/lib/priority_queue.c
 +++ b/grub-core/lib/priority_queue.c
 @@ -92,7 +92,7 @@ grub_priority_queue_new (grub_size_t elsize,
@@ -905,7 +905,7 @@ index 659be0b7f..7d5e7c05a 100644
      return 0;
    ret = (struct grub_priority_queue *) grub_malloc (sizeof (*ret));
 diff --git a/grub-core/lib/reed_solomon.c b/grub-core/lib/reed_solomon.c
-index ee9fa7b4f..467305b46 100644
+index ee9fa7b4fe..467305b46a 100644
 --- a/grub-core/lib/reed_solomon.c
 +++ b/grub-core/lib/reed_solomon.c
 @@ -20,6 +20,7 @@
@@ -931,7 +931,7 @@ index ee9fa7b4f..467305b46 100644
    /* Multiply with X - a^r */
    for (j = 0; j < rs; j++)
 diff --git a/grub-core/lib/relocator.c b/grub-core/lib/relocator.c
-index ea3ebc719..5847aac36 100644
+index ea3ebc719b..5847aac364 100644
 --- a/grub-core/lib/relocator.c
 +++ b/grub-core/lib/relocator.c
 @@ -495,9 +495,9 @@ malloc_in_range (struct grub_relocator *rel,
@@ -967,7 +967,7 @@ index ea3ebc719..5847aac36 100644
        {
  	grub_free (from);
 diff --git a/grub-core/lib/zstd/fse_decompress.c b/grub-core/lib/zstd/fse_decompress.c
-index 72bbead5b..2227b84bc 100644
+index 72bbead5be..2227b84bc7 100644
 --- a/grub-core/lib/zstd/fse_decompress.c
 +++ b/grub-core/lib/zstd/fse_decompress.c
 @@ -82,7 +82,7 @@
@@ -980,7 +980,7 @@ index 72bbead5b..2227b84bc 100644
  
  void FSE_freeDTable (FSE_DTable* dt)
 diff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c
-index 092e8e307..979d425df 100644
+index 092e8e3077..979d425dfb 100644
 --- a/grub-core/loader/arm/linux.c
 +++ b/grub-core/loader/arm/linux.c
 @@ -82,7 +82,7 @@ linux_prepare_atag (void *target_atag)
@@ -993,7 +993,7 @@ index 092e8e307..979d425df 100644
      return grub_errno;
  
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index 04e815c05..b9a2df34b 100644
+index 04e815c052..b9a2df34b1 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
 @@ -126,7 +126,7 @@ copy_file_path (grub_efi_file_path_device_path_t *fp,
@@ -1006,7 +1006,7 @@ index 04e815c05..b9a2df34b 100644
      return;
  
 diff --git a/grub-core/loader/i386/bsdXX.c b/grub-core/loader/i386/bsdXX.c
-index af6741d15..a8d8bf7da 100644
+index af6741d157..a8d8bf7dae 100644
 --- a/grub-core/loader/i386/bsdXX.c
 +++ b/grub-core/loader/i386/bsdXX.c
 @@ -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
      return grub_errno;
  
 diff --git a/grub-core/loader/i386/xnu.c b/grub-core/loader/i386/xnu.c
-index e64ed08f5..b7d176b5d 100644
+index e64ed08f58..b7d176b5d3 100644
 --- a/grub-core/loader/i386/xnu.c
 +++ b/grub-core/loader/i386/xnu.c
 @@ -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
      return grub_errno;
    grub_memcpy (utf16, name, sizeof (grub_uint16_t) * namelen);
 diff --git a/grub-core/loader/macho.c b/grub-core/loader/macho.c
-index 085f9c689..05710c48e 100644
+index 085f9c6890..05710c48e0 100644
 --- a/grub-core/loader/macho.c
 +++ b/grub-core/loader/macho.c
 @@ -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
  	goto fail;
        if (grub_file_read (macho->file, archs,
 diff --git a/grub-core/loader/multiboot_elfxx.c b/grub-core/loader/multiboot_elfxx.c
-index 70cd1db51..cc6853692 100644
+index 70cd1db513..cc6853692a 100644
 --- a/grub-core/loader/multiboot_elfxx.c
 +++ b/grub-core/loader/multiboot_elfxx.c
 @@ -217,7 +217,7 @@ CONCAT(grub_multiboot_load_elf, XX) (mbi_load_data_t *mld)
@@ -1067,7 +1067,7 @@ index 70cd1db51..cc6853692 100644
  	return grub_errno;
        
 diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c
-index e0f47e72b..2f0ebd0b8 100644
+index e0f47e72b0..2f0ebd0b8b 100644
 --- a/grub-core/loader/xnu.c
 +++ b/grub-core/loader/xnu.c
 @@ -801,7 +801,7 @@ grub_cmd_xnu_mkext (grub_command_t cmd __attribute__ ((unused)),
@@ -1080,7 +1080,7 @@ index e0f47e72b..2f0ebd0b8 100644
  	{
  	  grub_file_close (file);
 diff --git a/grub-core/mmap/mmap.c b/grub-core/mmap/mmap.c
-index 6a31cbae3..57b4e9a72 100644
+index 6a31cbae32..57b4e9a72a 100644
 --- a/grub-core/mmap/mmap.c
 +++ b/grub-core/mmap/mmap.c
 @@ -143,9 +143,9 @@ grub_mmap_iterate (grub_memory_hook_t hook, void *hook_data)
@@ -1096,7 +1096,7 @@ index 6a31cbae3..57b4e9a72 100644
    if (! ctx.scanline_events || !present)
      {
 diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
-index 558d97ba1..dd0ffcdae 100644
+index 558d97ba1e..dd0ffcdaea 100644
 --- a/grub-core/net/bootp.c
 +++ b/grub-core/net/bootp.c
 @@ -1559,7 +1559,7 @@ grub_cmd_bootp (struct grub_command *cmd __attribute__ ((unused)),
@@ -1109,7 +1109,7 @@ index 558d97ba1..dd0ffcdae 100644
      return grub_errno;
  
 diff --git a/grub-core/net/dns.c b/grub-core/net/dns.c
-index 5d9afe093..e332d5eb4 100644
+index 5d9afe093c..e332d5eb4a 100644
 --- a/grub-core/net/dns.c
 +++ b/grub-core/net/dns.c
 @@ -285,8 +285,8 @@ recv_hook (grub_net_udp_socket_t sock __attribute__ ((unused)),
@@ -1144,7 +1144,7 @@ index 5d9afe093..e332d5eb4 100644
      return grub_errno;
  
 diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index b917a75d5..fed7bc57c 100644
+index b917a75d54..fed7bc57cb 100644
 --- a/grub-core/net/net.c
 +++ b/grub-core/net/net.c
 @@ -333,8 +333,8 @@ grub_cmd_ipv6_autoconf (struct grub_command *cmd __attribute__ ((unused)),
@@ -1159,7 +1159,7 @@ index b917a75d5..fed7bc57c 100644
      {
        grub_free (ifaces);
 diff --git a/grub-core/normal/charset.c b/grub-core/normal/charset.c
-index b0ab47d73..d57fb72fa 100644
+index b0ab47d73f..d57fb72faa 100644
 --- a/grub-core/normal/charset.c
 +++ b/grub-core/normal/charset.c
 @@ -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
      return -1;
    for (ptr = logical; ptr <= logical + logical_len; ptr++)
 diff --git a/grub-core/normal/cmdline.c b/grub-core/normal/cmdline.c
-index c037d5050..c57242e2e 100644
+index c037d5050e..c57242e2ea 100644
 --- a/grub-core/normal/cmdline.c
 +++ b/grub-core/normal/cmdline.c
 @@ -41,7 +41,7 @@ grub_err_t
@@ -1268,7 +1268,7 @@ index c037d5050..c57242e2e 100644
  		{
  		  grub_print_error ();
 diff --git a/grub-core/normal/menu_entry.c b/grub-core/normal/menu_entry.c
-index cdf3590a3..1993995be 100644
+index cdf3590a36..1993995be6 100644
 --- a/grub-core/normal/menu_entry.c
 +++ b/grub-core/normal/menu_entry.c
 @@ -95,8 +95,8 @@ init_line (struct screen *screen, struct line *linep)
@@ -1328,7 +1328,7 @@ index cdf3590a3..1993995be 100644
      {
        grub_print_error ();
 diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index e22bb91f6..18240e76c 100644
+index e22bb91f6e..18240e76ce 100644
 --- a/grub-core/normal/menu_text.c
 +++ b/grub-core/normal/menu_text.c
 @@ -78,7 +78,7 @@ grub_print_message_indented_real (const char *msg, int margin_left,
@@ -1350,7 +1350,7 @@ index e22bb91f6..18240e76c 100644
      /* XXX How to show this error?  */
      return;
 diff --git a/grub-core/normal/term.c b/grub-core/normal/term.c
-index a1e5c5a0d..cc8c173b6 100644
+index a1e5c5a0da..cc8c173b6e 100644
 --- a/grub-core/normal/term.c
 +++ b/grub-core/normal/term.c
 @@ -264,7 +264,7 @@ grub_term_save_pos (void)
@@ -1372,7 +1372,7 @@ index a1e5c5a0d..cc8c173b6 100644
    grub_error_pop ();
  
 diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
-index 7adc0f30e..a5bd0752f 100644
+index 7adc0f30ee..a5bd0752fb 100644
 --- a/grub-core/osdep/linux/getroot.c
 +++ b/grub-core/osdep/linux/getroot.c
 @@ -168,7 +168,7 @@ grub_util_raid_getmembers (const char *name, int bootable)
@@ -1403,7 +1403,7 @@ index 7adc0f30e..a5bd0752f 100644
  again:
    fp = grub_util_fopen ("/proc/self/mountinfo", "r");
 diff --git a/grub-core/osdep/unix/config.c b/grub-core/osdep/unix/config.c
-index 5478030fd..89dc70d93 100644
+index 5478030fde..89dc70d93c 100644
 --- a/grub-core/osdep/unix/config.c
 +++ b/grub-core/osdep/unix/config.c
 @@ -130,7 +130,7 @@ grub_util_load_config (struct grub_util_config *cfg)
@@ -1416,7 +1416,7 @@ index 5478030fd..89dc70d93 100644
    if (grub_util_is_regular (cfgfile))
      sorted_cfgpaths[i++] = xstrdup (cfgfile);
 diff --git a/grub-core/osdep/windows/getroot.c b/grub-core/osdep/windows/getroot.c
-index 661d95461..eada663b2 100644
+index 661d954619..eada663b26 100644
 --- a/grub-core/osdep/windows/getroot.c
 +++ b/grub-core/osdep/windows/getroot.c
 @@ -59,7 +59,7 @@ grub_get_mount_point (const TCHAR *path)
@@ -1429,7 +1429,7 @@ index 661d95461..eada663b2 100644
    /* When pointing to EFI system partition GetVolumePathName fails
       for ESP root and returns abberant information for everything
 diff --git a/grub-core/osdep/windows/hostdisk.c b/grub-core/osdep/windows/hostdisk.c
-index 355100789..0be327394 100644
+index 355100789a..0be3273949 100644
 --- a/grub-core/osdep/windows/hostdisk.c
 +++ b/grub-core/osdep/windows/hostdisk.c
 @@ -111,7 +111,7 @@ grub_util_get_windows_path_real (const char *path)
@@ -1451,7 +1451,7 @@ index 355100789..0be327394 100644
    pattern[l] = '\\';
    pattern[l + 1] = '*';
 diff --git a/grub-core/osdep/windows/init.c b/grub-core/osdep/windows/init.c
-index e8ffd62c6..6297de632 100644
+index e8ffd62c6a..6297de6326 100644
 --- a/grub-core/osdep/windows/init.c
 +++ b/grub-core/osdep/windows/init.c
 @@ -161,7 +161,7 @@ grub_util_host_init (int *argc __attribute__ ((unused)),
@@ -1464,7 +1464,7 @@ index e8ffd62c6..6297de632 100644
    for (i = 0; i < *argc; i++)
      (*argv)[i] = grub_util_tchar_to_utf8 (targv[i]); 
 diff --git a/grub-core/osdep/windows/platform.c b/grub-core/osdep/windows/platform.c
-index a3f738fb9..b160949d8 100644
+index a3f738fb9b..b160949d8e 100644
 --- a/grub-core/osdep/windows/platform.c
 +++ b/grub-core/osdep/windows/platform.c
 @@ -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
  				      (const grub_uint8_t *) efi_distributor,
  				      distrib8_len, 0);
 diff --git a/grub-core/osdep/windows/relpath.c b/grub-core/osdep/windows/relpath.c
-index cb0861744..478e8ef14 100644
+index cb0861744a..478e8ef14d 100644
 --- a/grub-core/osdep/windows/relpath.c
 +++ b/grub-core/osdep/windows/relpath.c
 @@ -72,7 +72,7 @@ grub_make_system_path_relative_to_its_root (const char *path)
@@ -1492,7 +1492,7 @@ index cb0861744..478e8ef14 100644
        && dirwindows[offset] != '/'
        && dirwindows[offset])
 diff --git a/grub-core/partmap/gpt.c b/grub-core/partmap/gpt.c
-index 103f6796f..72a2e37cd 100644
+index 103f6796f3..72a2e37cd4 100644
 --- a/grub-core/partmap/gpt.c
 +++ b/grub-core/partmap/gpt.c
 @@ -199,7 +199,7 @@ gpt_partition_map_embed (struct grub_disk *disk, unsigned int *nsectors,
@@ -1505,7 +1505,7 @@ index 103f6796f..72a2e37cd 100644
      return grub_errno;
    for (i = 0; i < *nsectors; i++)
 diff --git a/grub-core/partmap/msdos.c b/grub-core/partmap/msdos.c
-index 7b8e45076..ee3f24982 100644
+index 7b8e450762..ee3f24982b 100644
 --- a/grub-core/partmap/msdos.c
 +++ b/grub-core/partmap/msdos.c
 @@ -337,7 +337,7 @@ pc_partition_map_embed (struct grub_disk *disk, unsigned int *nsectors,
@@ -1518,7 +1518,7 @@ index 7b8e45076..ee3f24982 100644
  	return grub_errno;
        for (i = 0; i < *nsectors; i++)
 diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
-index ee299fd0e..c8d6806fe 100644
+index ee299fd0ea..c8d6806fe0 100644
 --- a/grub-core/script/execute.c
 +++ b/grub-core/script/execute.c
 @@ -553,7 +553,7 @@ gettext_append (struct grub_script_argv *result, const char *orig_str)
@@ -1531,7 +1531,7 @@ index ee299fd0e..c8d6806fe 100644
    if (parse_string (orig_str, gettext_save_allow, &ctx, 0))
      goto fail;
 diff --git a/grub-core/tests/fake_input.c b/grub-core/tests/fake_input.c
-index 2d6085298..b5eb516be 100644
+index 2d60852989..b5eb516be2 100644
 --- a/grub-core/tests/fake_input.c
 +++ b/grub-core/tests/fake_input.c
 @@ -49,7 +49,7 @@ grub_terminal_input_fake_sequence (int *seq_in, int nseq_in)
@@ -1544,7 +1544,7 @@ index 2d6085298..b5eb516be 100644
      return;
  
 diff --git a/grub-core/tests/video_checksum.c b/grub-core/tests/video_checksum.c
-index 74d5b65e5..44d081069 100644
+index 74d5b65e5c..44d0810698 100644
 --- a/grub-core/tests/video_checksum.c
 +++ b/grub-core/tests/video_checksum.c
 @@ -336,7 +336,7 @@ grub_video_capture_write_bmp (const char *fname,
@@ -1575,7 +1575,7 @@ index 74d5b65e5..44d081069 100644
  	grub_uint16_t gmask = ((1 << mode_info->green_mask_size) - 1);
  	grub_uint16_t bmask = ((1 << mode_info->blue_mask_size) - 1);
 diff --git a/grub-core/video/capture.c b/grub-core/video/capture.c
-index 4f83c7441..4d3195e01 100644
+index 4f83c74411..4d3195e017 100644
 --- a/grub-core/video/capture.c
 +++ b/grub-core/video/capture.c
 @@ -89,7 +89,7 @@ grub_video_capture_start (const struct grub_video_mode_info *mode_info,
@@ -1588,7 +1588,7 @@ index 4f83c7441..4d3195e01 100644
      return grub_errno;
    
 diff --git a/grub-core/video/emu/sdl.c b/grub-core/video/emu/sdl.c
-index a2f639f66..0ebab6f57 100644
+index a2f639f66d..0ebab6f57d 100644
 --- a/grub-core/video/emu/sdl.c
 +++ b/grub-core/video/emu/sdl.c
 @@ -172,7 +172,7 @@ grub_video_sdl_set_palette (unsigned int start, unsigned int count,
@@ -1601,7 +1601,7 @@ index a2f639f66..0ebab6f57 100644
  	{
  	  tmp[i].r = palette_data[i].r;
 diff --git a/grub-core/video/i386/pc/vga.c b/grub-core/video/i386/pc/vga.c
-index 01f47112d..b2f776c99 100644
+index 01f47112d3..b2f776c997 100644
 --- a/grub-core/video/i386/pc/vga.c
 +++ b/grub-core/video/i386/pc/vga.c
 @@ -127,7 +127,7 @@ grub_video_vga_setup (unsigned int width, unsigned int height,
@@ -1614,7 +1614,7 @@ index 01f47112d..b2f776c99 100644
    framebuffer.back_page = 0;
    if (!framebuffer.temporary_buffer)
 diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c
-index 777e71334..61bd64537 100644
+index 777e71334c..61bd645379 100644
 --- a/grub-core/video/readers/png.c
 +++ b/grub-core/video/readers/png.c
 @@ -309,7 +309,7 @@ grub_png_decode_image_header (struct grub_png_data *data)
@@ -1627,7 +1627,7 @@ index 777e71334..61bd64537 100644
          return grub_errno;
  
 diff --git a/include/grub/unicode.h b/include/grub/unicode.h
-index a0403e91f..4de986a85 100644
+index a0403e91f9..4de986a857 100644
 --- a/include/grub/unicode.h
 +++ b/include/grub/unicode.h
 @@ -293,7 +293,7 @@ grub_unicode_glyph_dup (const struct grub_unicode_glyph *in)
@@ -1649,7 +1649,7 @@ index a0403e91f..4de986a85 100644
  	return;
        grub_memcpy (out->combining_ptr, in->combining_ptr,
 diff --git a/util/getroot.c b/util/getroot.c
-index cdd41153c..6ae35ecaa 100644
+index cdd41153c5..6ae35ecaa6 100644
 --- a/util/getroot.c
 +++ b/util/getroot.c
 @@ -200,7 +200,7 @@ make_device_name (const char *drive)
@@ -1662,7 +1662,7 @@ index cdd41153c..6ae35ecaa 100644
    for (iptr = drive; *iptr; iptr++)
      {
 diff --git a/util/grub-file.c b/util/grub-file.c
-index 50c18b683..b2e7dd69f 100644
+index 50c18b6835..b2e7dd69f4 100644
 --- a/util/grub-file.c
 +++ b/util/grub-file.c
 @@ -54,7 +54,7 @@ main (int argc, char *argv[])
@@ -1675,7 +1675,7 @@ index 50c18b683..b2e7dd69f 100644
    if (argc == 2 && strcmp (argv[1], "--version") == 0)
      {
 diff --git a/util/grub-fstest.c b/util/grub-fstest.c
-index f14e02d97..57246af7c 100644
+index f14e02d972..57246af7c6 100644
 --- a/util/grub-fstest.c
 +++ b/util/grub-fstest.c
 @@ -650,7 +650,7 @@ argp_parser (int key, char *arg, struct argp_state *state)
@@ -1697,7 +1697,7 @@ index f14e02d97..57246af7c 100644
    argp_parse (&argp, argc, argv, 0, 0, 0);
  
 diff --git a/util/grub-install-common.c b/util/grub-install-common.c
-index fdfe2c7ea..447504d3f 100644
+index fdfe2c7ead..447504d3f4 100644
 --- a/util/grub-install-common.c
 +++ b/util/grub-install-common.c
 @@ -286,7 +286,7 @@ handle_install_list (struct install_list *il, const char *val,
@@ -1710,7 +1710,7 @@ index fdfe2c7ea..447504d3f 100644
    for (ce = il->entries; ; ce++)
      {
 diff --git a/util/grub-install.c b/util/grub-install.c
-index f408b1986..843dfc7c8 100644
+index f408b19860..843dfc7c80 100644
 --- a/util/grub-install.c
 +++ b/util/grub-install.c
 @@ -658,7 +658,7 @@ device_map_check_duplicates (const char *dev_map)
@@ -1732,7 +1732,7 @@ index f408b1986..843dfc7c8 100644
    for (curdev = grub_devices, curdrive = grub_drives; *curdev; curdev++,
         curdrive++)
 diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c
-index bc087c2b5..d97d0e7be 100644
+index bc087c2b57..d97d0e7bef 100644
 --- a/util/grub-mkimagexx.c
 +++ b/util/grub-mkimagexx.c
 @@ -2294,10 +2294,8 @@ SUFFIX (grub_mkimage_load_image) (const char *kernel_path,
@@ -1749,7 +1749,7 @@ index bc087c2b5..d97d0e7be 100644
    SUFFIX (locate_sections) (e, kernel_path, &smd, layout, image_target);
  
 diff --git a/util/grub-mkrescue.c b/util/grub-mkrescue.c
-index 45d6140d3..cb972f120 100644
+index 45d6140d3e..cb972f120b 100644
 --- a/util/grub-mkrescue.c
 +++ b/util/grub-mkrescue.c
 @@ -441,8 +441,8 @@ main (int argc, char *argv[])
@@ -1764,7 +1764,7 @@ index 45d6140d3..cb972f120 100644
    xorriso_tail_argc = 0;
    /* Program name */
 diff --git a/util/grub-mkstandalone.c b/util/grub-mkstandalone.c
-index 4907d44c0..edf309717 100644
+index 4907d44c0b..edf309717c 100644
 --- a/util/grub-mkstandalone.c
 +++ b/util/grub-mkstandalone.c
 @@ -296,7 +296,7 @@ main (int argc, char *argv[])
@@ -1777,7 +1777,7 @@ index 4907d44c0..edf309717 100644
    argp_parse (&argp, argc, argv, 0, 0, 0);
  
 diff --git a/util/grub-pe2elf.c b/util/grub-pe2elf.c
-index 0d4084a10..11331294f 100644
+index 0d4084a108..11331294f1 100644
 --- a/util/grub-pe2elf.c
 +++ b/util/grub-pe2elf.c
 @@ -100,9 +100,9 @@ write_section_data (FILE* fp, const char *name, char *image,
@@ -1817,7 +1817,7 @@ index 0d4084a10..11331294f 100644
    for (i = 0; i < (int) pe_chdr->num_symbols;
         i += pe_symtab->num_aux + 1, pe_symtab += pe_symtab->num_aux + 1)
 diff --git a/util/grub-probe.c b/util/grub-probe.c
-index 81d27eead..cbe6ed94c 100644
+index 81d27eead5..cbe6ed94ca 100644
 --- a/util/grub-probe.c
 +++ b/util/grub-probe.c
 @@ -361,8 +361,8 @@ probe (const char *path, char **device_names, char delim)
diff --git a/debian/patches/0085-malloc-Use-overflow-checking-primitives-where-we-do-.patch b/debian/patches/0085-malloc-Use-overflow-checking-primitives-where-we-do-.patch
index 851135d..e0bb952 100644
--- a/debian/patches/0085-malloc-Use-overflow-checking-primitives-where-we-do-.patch
+++ b/debian/patches/0085-malloc-Use-overflow-checking-primitives-where-we-do-.patch
@@ -55,7 +55,7 @@ Reviewed-by: Daniel Kiper <[e-mail]>
  23 files changed, 382 insertions(+), 113 deletions(-)
 
 diff --git a/grub-core/commands/legacycfg.c b/grub-core/commands/legacycfg.c
-index 5e3ec0d5e..cc5971f4d 100644
+index 5e3ec0d5e4..cc5971f4db 100644
 --- a/grub-core/commands/legacycfg.c
 +++ b/grub-core/commands/legacycfg.c
 @@ -32,6 +32,7 @@
@@ -118,7 +118,7 @@ index 5e3ec0d5e..cc5971f4d 100644
  		  grub_free (suffix);
  		  return grub_errno;
 diff --git a/grub-core/commands/wildcard.c b/grub-core/commands/wildcard.c
-index 4a106ca04..cc3290311 100644
+index 4a106ca040..cc3290311f 100644
 --- a/grub-core/commands/wildcard.c
 +++ b/grub-core/commands/wildcard.c
 @@ -23,6 +23,7 @@
@@ -220,7 +220,7 @@ index 4a106ca04..cc3290311 100644
        return 1;
      }
 diff --git a/grub-core/disk/ldm.c b/grub-core/disk/ldm.c
-index e6323701a..58f8a53e1 100644
+index e6323701ab..58f8a53e1a 100644
 --- a/grub-core/disk/ldm.c
 +++ b/grub-core/disk/ldm.c
 @@ -25,6 +25,7 @@
@@ -291,7 +291,7 @@ index e6323701a..58f8a53e1 100644
  		    goto fail2;
  		  comp->segments = t;
 diff --git a/grub-core/font/font.c b/grub-core/font/font.c
-index 8e118b315..5edb477ac 100644
+index 8e118b315c..5edb477ac2 100644
 --- a/grub-core/font/font.c
 +++ b/grub-core/font/font.c
 @@ -30,6 +30,7 @@
@@ -318,7 +318,7 @@ index 8e118b315..5edb477ac 100644
      return 0;
  
 diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index 11272efc1..2b65bd56a 100644
+index 11272efc1a..2b65bd56a0 100644
 --- a/grub-core/fs/btrfs.c
 +++ b/grub-core/fs/btrfs.c
 @@ -40,6 +40,7 @@
@@ -375,7 +375,7 @@ index 11272efc1..2b65bd56a 100644
  	}
      }
 diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c
-index 9b389802a..ac33bcd68 100644
+index 9b389802a3..ac33bcd68c 100644
 --- a/grub-core/fs/ext2.c
 +++ b/grub-core/fs/ext2.c
 @@ -46,6 +46,7 @@
@@ -410,7 +410,7 @@ index 9b389802a..ac33bcd68 100644
      return 0;
  
 diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c
-index 4f1b52a55..7ba5b300b 100644
+index 4f1b52a552..7ba5b300bc 100644
 --- a/grub-core/fs/iso9660.c
 +++ b/grub-core/fs/iso9660.c
 @@ -28,6 +28,7 @@
@@ -514,7 +514,7 @@ index 4f1b52a55..7ba5b300b 100644
  		      grub_free (ctx.filename);
  		    grub_free (node);
 diff --git a/grub-core/fs/sfs.c b/grub-core/fs/sfs.c
-index 90f7fb379..de2b107a4 100644
+index 90f7fb3791..de2b107a4a 100644
 --- a/grub-core/fs/sfs.c
 +++ b/grub-core/fs/sfs.c
 @@ -26,6 +26,7 @@
@@ -578,7 +578,7 @@ index 90f7fb379..de2b107a4 100644
  	*grub_latin1_to_utf8 ((grub_uint8_t *) *label,
  			      (const grub_uint8_t *) data->label,
 diff --git a/grub-core/fs/squash4.c b/grub-core/fs/squash4.c
-index 95d5c1e1f..785123894 100644
+index 95d5c1e1ff..785123894e 100644
 --- a/grub-core/fs/squash4.c
 +++ b/grub-core/fs/squash4.c
 @@ -26,6 +26,7 @@
@@ -677,7 +677,7 @@ index 95d5c1e1f..785123894 100644
  	  node->ino = ino;
  	  node->stack[node->stsize].ino_chunk = grub_le_to_cpu32 (dh.ino_chunk);
 diff --git a/grub-core/fs/udf.c b/grub-core/fs/udf.c
-index a83761674..21ac7f446 100644
+index a83761674a..21ac7f4460 100644
 --- a/grub-core/fs/udf.c
 +++ b/grub-core/fs/udf.c
 @@ -28,6 +28,7 @@
@@ -786,7 +786,7 @@ index a83761674..21ac7f446 100644
    grub_free (out);
    grub_error (GRUB_ERR_BAD_FS, "invalid symlink");
 diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c
-index 96ffecbfc..ea6590290 100644
+index 96ffecbfc9..ea6590290b 100644
 --- a/grub-core/fs/xfs.c
 +++ b/grub-core/fs/xfs.c
 @@ -25,6 +25,7 @@
@@ -822,7 +822,7 @@ index 96ffecbfc..ea6590290 100644
    if (! data)
      goto fail;
 diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c
-index 381dde556..36d0373a6 100644
+index 381dde556d..36d0373a6a 100644
 --- a/grub-core/fs/zfs/zfs.c
 +++ b/grub-core/fs/zfs/zfs.c
 @@ -55,6 +55,7 @@
@@ -875,7 +875,7 @@ index 381dde556..36d0373a6 100644
      return 0;
    grub_memcpy (ret, nvlist, sizeof (grub_uint32_t));
 diff --git a/grub-core/fs/zfs/zfscrypt.c b/grub-core/fs/zfs/zfscrypt.c
-index 1402e0bc2..de3b015f5 100644
+index 1402e0bc29..de3b015f58 100644
 --- a/grub-core/fs/zfs/zfscrypt.c
 +++ b/grub-core/fs/zfs/zfscrypt.c
 @@ -22,6 +22,7 @@
@@ -902,7 +902,7 @@ index 1402e0bc2..de3b015f5 100644
      return grub_errno;
    key->is_passphrase = passphrase;
 diff --git a/grub-core/lib/arg.c b/grub-core/lib/arg.c
-index fd7744a6f..3288609a5 100644
+index fd7744a6ff..3288609a5e 100644
 --- a/grub-core/lib/arg.c
 +++ b/grub-core/lib/arg.c
 @@ -23,6 +23,7 @@
@@ -954,7 +954,7 @@ index fd7744a6f..3288609a5 100644
      return 0;
  
 diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
-index 5b9b92d6b..ef0d63afc 100644
+index 5b9b92d6ba..ef0d63afc8 100644
 --- a/grub-core/loader/i386/bsd.c
 +++ b/grub-core/loader/i386/bsd.c
 @@ -35,6 +35,7 @@
@@ -984,7 +984,7 @@ index 5b9b92d6b..ef0d63afc 100644
      return grub_errno;
  
 diff --git a/grub-core/net/dns.c b/grub-core/net/dns.c
-index e332d5eb4..906ec7d67 100644
+index e332d5eb4a..906ec7d678 100644
 --- a/grub-core/net/dns.c
 +++ b/grub-core/net/dns.c
 @@ -22,6 +22,7 @@
@@ -1013,7 +1013,7 @@ index e332d5eb4..906ec7d67 100644
  	return grub_errno;
        dns_servers_alloc = na;
 diff --git a/grub-core/normal/charset.c b/grub-core/normal/charset.c
-index d57fb72fa..4dfcc3107 100644
+index d57fb72faa..4dfcc31078 100644
 --- a/grub-core/normal/charset.c
 +++ b/grub-core/normal/charset.c
 @@ -48,6 +48,7 @@
@@ -1050,7 +1050,7 @@ index d57fb72fa..4dfcc3107 100644
  		  continue;
  		}
 diff --git a/grub-core/normal/cmdline.c b/grub-core/normal/cmdline.c
-index c57242e2e..de03fe63b 100644
+index c57242e2ea..de03fe63b3 100644
 --- a/grub-core/normal/cmdline.c
 +++ b/grub-core/normal/cmdline.c
 @@ -28,6 +28,7 @@
@@ -1086,7 +1086,7 @@ index c57242e2e..de03fe63b 100644
  	  grub_errno = GRUB_ERR_NONE;
  	  (*max_len) /= 2;
 diff --git a/grub-core/normal/menu_entry.c b/grub-core/normal/menu_entry.c
-index 1993995be..50eef918c 100644
+index 1993995be6..50eef918cf 100644
 --- a/grub-core/normal/menu_entry.c
 +++ b/grub-core/normal/menu_entry.c
 @@ -27,6 +27,7 @@
@@ -1119,7 +1119,7 @@ index 1993995be..50eef918c 100644
  
    return 1;
 diff --git a/grub-core/script/argv.c b/grub-core/script/argv.c
-index 217ec5d1e..5751fdd57 100644
+index 217ec5d1e1..5751fdd570 100644
 --- a/grub-core/script/argv.c
 +++ b/grub-core/script/argv.c
 @@ -20,6 +20,7 @@
@@ -1170,7 +1170,7 @@ index 217ec5d1e..5751fdd57 100644
      return 1;
  
 diff --git a/grub-core/script/lexer.c b/grub-core/script/lexer.c
-index c6bd3172f..5fb0cbd0b 100644
+index c6bd3172fa..5fb0cbd0bc 100644
 --- a/grub-core/script/lexer.c
 +++ b/grub-core/script/lexer.c
 @@ -24,6 +24,7 @@
@@ -1231,7 +1231,7 @@ index c6bd3172f..5fb0cbd0b 100644
      }
  
 diff --git a/grub-core/video/bitmap.c b/grub-core/video/bitmap.c
-index b2e031566..6256e209a 100644
+index b2e0315665..6256e209a6 100644
 --- a/grub-core/video/bitmap.c
 +++ b/grub-core/video/bitmap.c
 @@ -23,6 +23,7 @@
@@ -1286,7 +1286,7 @@ index b2e031566..6256e209a 100644
  
  /* Frees all resources allocated by bitmap.  */
 diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c
-index 61bd64537..0157ff742 100644
+index 61bd645379..0157ff7420 100644
 --- a/grub-core/video/readers/png.c
 +++ b/grub-core/video/readers/png.c
 @@ -23,6 +23,7 @@
diff --git a/debian/patches/0086-iso9660-Don-t-leak-memory-on-realloc-failures.patch b/debian/patches/0086-iso9660-Don-t-leak-memory-on-realloc-failures.patch
index aa649ab..438d655 100644
--- a/debian/patches/0086-iso9660-Don-t-leak-memory-on-realloc-failures.patch
+++ b/debian/patches/0086-iso9660-Don-t-leak-memory-on-realloc-failures.patch
@@ -10,7 +10,7 @@ Reviewed-by: Daniel Kiper <[e-mail]>
  1 file changed, 20 insertions(+), 4 deletions(-)
 
 diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c
-index 7ba5b300b..5ec4433b8 100644
+index 7ba5b300bc..5ec4433b8f 100644
 --- a/grub-core/fs/iso9660.c
 +++ b/grub-core/fs/iso9660.c
 @@ -533,14 +533,20 @@ add_part (struct iterate_dir_ctx *ctx,
diff --git a/debian/patches/0087-font-Do-not-load-more-than-one-NAME-section.patch b/debian/patches/0087-font-Do-not-load-more-than-one-NAME-section.patch
index 2721623..2935ce4 100644
--- a/debian/patches/0087-font-Do-not-load-more-than-one-NAME-section.patch
+++ b/debian/patches/0087-font-Do-not-load-more-than-one-NAME-section.patch
@@ -16,7 +16,7 @@ Reviewed-by: Jan Setje-Eilers <[e-mail]>
  1 file changed, 6 insertions(+)
 
 diff --git a/grub-core/font/font.c b/grub-core/font/font.c
-index 5edb477ac..d09bb38d8 100644
+index 5edb477ac2..d09bb38d89 100644
 --- a/grub-core/font/font.c
 +++ b/grub-core/font/font.c
 @@ -532,6 +532,12 @@ grub_font_load (const char *filename)
diff --git a/debian/patches/0088-gfxmenu-Fix-double-free-in-load_image.patch b/debian/patches/0088-gfxmenu-Fix-double-free-in-load_image.patch
index 993dcbd..dbf1ae4 100644
--- a/debian/patches/0088-gfxmenu-Fix-double-free-in-load_image.patch
+++ b/debian/patches/0088-gfxmenu-Fix-double-free-in-load_image.patch
@@ -15,7 +15,7 @@ Reviewed-by: Daniel Kiper <[e-mail]>
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/gfxmenu/gui_image.c b/grub-core/gfxmenu/gui_image.c
-index 29784ed2d..6b2e976f1 100644
+index 29784ed2d9..6b2e976f16 100644
 --- a/grub-core/gfxmenu/gui_image.c
 +++ b/grub-core/gfxmenu/gui_image.c
 @@ -195,7 +195,10 @@ load_image (grub_gui_image_t self, const char *path)
diff --git a/debian/patches/0089-lzma-Make-sure-we-don-t-dereference-past-array.patch b/debian/patches/0089-lzma-Make-sure-we-don-t-dereference-past-array.patch
index 737b79e..eb283a5 100644
--- a/debian/patches/0089-lzma-Make-sure-we-don-t-dereference-past-array.patch
+++ b/debian/patches/0089-lzma-Make-sure-we-don-t-dereference-past-array.patch
@@ -21,7 +21,7 @@ Reviewed-by: Daniel Kiper <[e-mail]>
  1 file changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/lib/LzmaEnc.c b/grub-core/lib/LzmaEnc.c
-index f2ec04a8c..753e56a95 100644
+index f2ec04a8c2..753e56a95e 100644
 --- a/grub-core/lib/LzmaEnc.c
 +++ b/grub-core/lib/LzmaEnc.c
 @@ -1877,13 +1877,19 @@ static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize
diff --git a/debian/patches/0090-tftp-Do-not-use-priority-queue.patch b/debian/patches/0090-tftp-Do-not-use-priority-queue.patch
index a002fcd..df1a56c 100644
--- a/debian/patches/0090-tftp-Do-not-use-priority-queue.patch
+++ b/debian/patches/0090-tftp-Do-not-use-priority-queue.patch
@@ -34,7 +34,7 @@ Reviewed-by: Daniel Kiper <[e-mail]>
  1 file changed, 53 insertions(+), 118 deletions(-)
 
 diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
-index a0817a075..e6566fa17 100644
+index a0817a075d..e6566fa176 100644
 --- a/grub-core/net/tftp.c
 +++ b/grub-core/net/tftp.c
 @@ -25,7 +25,6 @@
diff --git a/debian/patches/0091-script-Remove-unused-fields-from-grub_script_functio.patch b/debian/patches/0091-script-Remove-unused-fields-from-grub_script_functio.patch
index 53bcd7a..4865443 100644
--- a/debian/patches/0091-script-Remove-unused-fields-from-grub_script_functio.patch
+++ b/debian/patches/0091-script-Remove-unused-fields-from-grub_script_functio.patch
@@ -10,7 +10,7 @@ Reviewed-by: Daniel Kiper <[e-mail]>
  1 file changed, 5 deletions(-)
 
 diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
-index 360c2be1f..b382bcf09 100644
+index 360c2be1f0..b382bcf09b 100644
 --- a/include/grub/script_sh.h
 +++ b/include/grub/script_sh.h
 @@ -359,13 +359,8 @@ struct grub_script_function
diff --git a/debian/patches/0092-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
index 537d3ca..08e4973 100644
--- a/debian/patches/0092-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
@@ -27,7 +27,7 @@ Reviewed-by: Daniel Kiper <[e-mail]>
  4 files changed, 19 insertions(+), 4 deletions(-)
 
 diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
-index c8d6806fe..7e028e135 100644
+index c8d6806fe0..7e028e1355 100644
 --- a/grub-core/script/execute.c
 +++ b/grub-core/script/execute.c
 @@ -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
    function_return = 0;
    active_loops = loops;
 diff --git a/grub-core/script/function.c b/grub-core/script/function.c
-index d36655e51..3aad04bf9 100644
+index d36655e510..3aad04bf9d 100644
 --- a/grub-core/script/function.c
 +++ b/grub-core/script/function.c
 @@ -34,6 +34,7 @@ grub_script_function_create (struct grub_script_arg *functionname_arg,
@@ -76,7 +76,7 @@ index d36655e51..3aad04bf9 100644
    else
      {
 diff --git a/grub-core/script/parser.y b/grub-core/script/parser.y
-index 4f0ab8319..f80b86b6f 100644
+index 4f0ab8319e..f80b86b6f1 100644
 --- a/grub-core/script/parser.y
 +++ b/grub-core/script/parser.y
 @@ -289,7 +289,8 @@ function: "function" "name"
@@ -90,7 +90,7 @@ index 4f0ab8319..f80b86b6f 100644
  
  	    state->scripts = $<scripts>3;
 diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
-index b382bcf09..6c48e0751 100644
+index b382bcf09b..6c48e07512 100644
 --- a/include/grub/script_sh.h
 +++ b/include/grub/script_sh.h
 @@ -361,6 +361,8 @@ struct grub_script_function
diff --git a/debian/patches/0093-hfsplus-fix-two-more-overflows.patch b/debian/patches/0093-hfsplus-fix-two-more-overflows.patch
index 407f8f5..cb67208 100644
--- a/debian/patches/0093-hfsplus-fix-two-more-overflows.patch
+++ b/debian/patches/0093-hfsplus-fix-two-more-overflows.patch
@@ -15,7 +15,7 @@ Reviewed-by: Darren Kenny <[e-mail]>
  1 file changed, 8 insertions(+), 3 deletions(-)
 
 diff --git a/grub-core/fs/hfsplus.c b/grub-core/fs/hfsplus.c
-index dae43becc..9c4e4c88c 100644
+index dae43becc9..9c4e4c88c9 100644
 --- a/grub-core/fs/hfsplus.c
 +++ b/grub-core/fs/hfsplus.c
 @@ -31,6 +31,7 @@
diff --git a/debian/patches/0094-lvm-fix-two-more-potential-data-dependent-alloc-over.patch b/debian/patches/0094-lvm-fix-two-more-potential-data-dependent-alloc-over.patch
index e07fb97..36e67c6 100644
--- a/debian/patches/0094-lvm-fix-two-more-potential-data-dependent-alloc-over.patch
+++ b/debian/patches/0094-lvm-fix-two-more-potential-data-dependent-alloc-over.patch
@@ -15,7 +15,7 @@ Signed-off-by: Peter Jones <[e-mail]>
  1 file changed, 31 insertions(+), 8 deletions(-)
 
 diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c
-index d1df640b3..d154f7c01 100644
+index d1df640b31..d154f7c01b 100644
 --- a/grub-core/disk/lvm.c
 +++ b/grub-core/disk/lvm.c
 @@ -25,6 +25,7 @@
diff --git a/debian/patches/0095-efi-fix-some-malformed-device-path-arithmetic-errors.patch b/debian/patches/0095-efi-fix-some-malformed-device-path-arithmetic-errors.patch
index e4f696d..7509a9d 100644
--- a/debian/patches/0095-efi-fix-some-malformed-device-path-arithmetic-errors.patch
+++ b/debian/patches/0095-efi-fix-some-malformed-device-path-arithmetic-errors.patch
@@ -24,7 +24,7 @@ Signed-off-by: Peter Jones <[e-mail]>
  4 files changed, 88 insertions(+), 21 deletions(-)
 
 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index dc31caa21..b1a8b39b4 100644
+index dc31caa213..b1a8b39b49 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
 @@ -332,7 +332,7 @@ grub_efi_get_filename (grub_efi_device_path_t *dp0)
@@ -150,7 +150,7 @@ index dc31caa21..b1a8b39b4 100644
    return 0;
  }
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index b9a2df34b..f8a34cd49 100644
+index b9a2df34b1..f8a34cd491 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
 @@ -126,6 +126,12 @@ copy_file_path (grub_efi_file_path_device_path_t *fp,
@@ -188,7 +188,7 @@ index b9a2df34b..f8a34cd49 100644
  	break;
        d = GRUB_EFI_NEXT_DEVICE_PATH (d);
 diff --git a/grub-core/loader/i386/xnu.c b/grub-core/loader/i386/xnu.c
-index b7d176b5d..c50cb5410 100644
+index b7d176b5d3..c50cb54109 100644
 --- a/grub-core/loader/i386/xnu.c
 +++ b/grub-core/loader/i386/xnu.c
 @@ -516,14 +516,15 @@ grub_cmd_devprop_load (grub_command_t cmd __attribute__ ((unused)),
@@ -212,7 +212,7 @@ index b7d176b5d..c50cb5410 100644
        dev = grub_xnu_devprop_add_device (dpstart, (char *) buf
  					 - (char *) dpstart);
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index 9824fbcd0..08bff60b5 100644
+index 9824fbcd0d..08bff60b51 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
 @@ -640,6 +640,7 @@ typedef struct grub_efi_device_path grub_efi_device_path_protocol_t;
diff --git a/debian/patches/0096-linuxefi-fail-kernel-validation-without-shim-protoco.patch b/debian/patches/0096-linuxefi-fail-kernel-validation-without-shim-protoco.patch
index f85e211..0e0f9e5 100644
--- a/debian/patches/0096-linuxefi-fail-kernel-validation-without-shim-protoco.patch
+++ b/debian/patches/0096-linuxefi-fail-kernel-validation-without-shim-protoco.patch
@@ -20,7 +20,7 @@ Signed-off-by: Dimitri John Ledkov <[e-mail]>
  4 files changed, 12 insertions(+), 5 deletions(-)
 
 diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index 1a5296a60..3f5496fc5 100644
+index 1a5296a60c..3f5496fc55 100644
 --- a/grub-core/loader/arm64/linux.c
 +++ b/grub-core/loader/arm64/linux.c
 @@ -34,6 +34,7 @@
@@ -52,7 +52,7 @@ index 1a5296a60..3f5496fc5 100644
  
    cmdline_size = grub_loader_cmdline_size (argc, argv) + sizeof (LINUX_IMAGE);
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index f8a34cd49..cf89cedf8 100644
+index f8a34cd491..cf89cedf8d 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
 @@ -1096,6 +1096,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
@@ -64,7 +64,7 @@ index f8a34cd49..cf89cedf8 100644
    grub_file_close (file);
    grub_device_close (dev);
 diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
-index e372b26a1..f6d30bcf7 100644
+index e372b26a1b..f6d30bcf7c 100644
 --- a/grub-core/loader/efi/linux.c
 +++ b/grub-core/loader/efi/linux.c
 @@ -34,6 +34,7 @@ struct grub_efi_shim_lock
@@ -76,7 +76,7 @@ index e372b26a1..f6d30bcf7 100644
  grub_linuxefi_secure_validate (void *data, grub_uint32_t size)
  {
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index 2929da7a2..e357bf67c 100644
+index 2929da7a29..e357bf67c6 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
 @@ -199,7 +199,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
diff --git a/debian/patches/0097-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
index 5015df4..fd7f502 100644
--- a/debian/patches/0097-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
@@ -21,7 +21,7 @@ Remove the bogus check, and also propagate errors from copy_file_path.
  1 file changed, 13 insertions(+), 12 deletions(-)
 
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index cf89cedf8..d0c53077e 100644
+index cf89cedf8d..d0c53077e8 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
 @@ -116,7 +116,7 @@ grub_chainloader_boot (void)
diff --git a/debian/patches/0098-efi-Fix-use-after-free-in-halt-reboot-path.patch b/debian/patches/0098-efi-Fix-use-after-free-in-halt-reboot-path.patch
index 4e43597..7ea7d7d 100644
--- a/debian/patches/0098-efi-Fix-use-after-free-in-halt-reboot-path.patch
+++ b/debian/patches/0098-efi-Fix-use-after-free-in-halt-reboot-path.patch
@@ -52,7 +52,7 @@ Reviewed-by: Darren Kenny <[e-mail]>
  9 files changed, 28 insertions(+), 7 deletions(-)
 
 diff --git a/grub-core/kern/arm/efi/init.c b/grub-core/kern/arm/efi/init.c
-index 06df60e2f..40c3b467f 100644
+index 06df60e2f0..40c3b467fc 100644
 --- a/grub-core/kern/arm/efi/init.c
 +++ b/grub-core/kern/arm/efi/init.c
 @@ -71,4 +71,7 @@ grub_machine_fini (int flags)
@@ -64,7 +64,7 @@ index 06df60e2f..40c3b467f 100644
 +    grub_efi_memory_fini ();
  }
 diff --git a/grub-core/kern/arm64/efi/init.c b/grub-core/kern/arm64/efi/init.c
-index 6224999ec..5010caefd 100644
+index 6224999ec9..5010caefd6 100644
 --- a/grub-core/kern/arm64/efi/init.c
 +++ b/grub-core/kern/arm64/efi/init.c
 @@ -57,4 +57,7 @@ grub_machine_fini (int flags)
@@ -76,7 +76,7 @@ index 6224999ec..5010caefd 100644
 +    grub_efi_memory_fini ();
  }
 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index b1a8b39b4..88bbd34ea 100644
+index b1a8b39b49..88bbd34eac 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
 @@ -157,7 +157,8 @@ grub_efi_get_loaded_image (grub_efi_handle_t image_handle)
@@ -90,7 +90,7 @@ index b1a8b39b4..88bbd34ea 100644
                GRUB_EFI_RESET_COLD, GRUB_EFI_SUCCESS, 0, NULL);
    for (;;) ;
 diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c
-index 3dfdf2d22..2c31847bf 100644
+index 3dfdf2d22b..2c31847bf6 100644
 --- a/grub-core/kern/efi/init.c
 +++ b/grub-core/kern/efi/init.c
 @@ -80,5 +80,4 @@ grub_efi_fini (void)
@@ -100,7 +100,7 @@ index 3dfdf2d22..2c31847bf 100644
 -  grub_efi_memory_fini ();
  }
 diff --git a/grub-core/kern/i386/efi/init.c b/grub-core/kern/i386/efi/init.c
-index da499aba0..deb2eacd8 100644
+index da499aba04..deb2eacd8d 100644
 --- a/grub-core/kern/i386/efi/init.c
 +++ b/grub-core/kern/i386/efi/init.c
 @@ -39,6 +39,11 @@ grub_machine_init (void)
@@ -118,7 +118,7 @@ index da499aba0..deb2eacd8 100644
 +    grub_efi_memory_fini ();
  }
 diff --git a/grub-core/kern/ia64/efi/init.c b/grub-core/kern/ia64/efi/init.c
-index b5ecbd091..f1965571b 100644
+index b5ecbd0912..f1965571b1 100644
 --- a/grub-core/kern/ia64/efi/init.c
 +++ b/grub-core/kern/ia64/efi/init.c
 @@ -70,6 +70,11 @@ grub_machine_init (void)
@@ -136,7 +136,7 @@ index b5ecbd091..f1965571b 100644
 +    grub_efi_memory_fini ();
  }
 diff --git a/grub-core/kern/riscv/efi/init.c b/grub-core/kern/riscv/efi/init.c
-index 7eb1969d0..38795fe67 100644
+index 7eb1969d0b..38795fe674 100644
 --- a/grub-core/kern/riscv/efi/init.c
 +++ b/grub-core/kern/riscv/efi/init.c
 @@ -73,4 +73,7 @@ grub_machine_fini (int flags)
@@ -148,7 +148,7 @@ index 7eb1969d0..38795fe67 100644
 +    grub_efi_memory_fini ();
  }
 diff --git a/grub-core/lib/efi/halt.c b/grub-core/lib/efi/halt.c
-index 5859f0498..29d413641 100644
+index 5859f0498a..29d4136416 100644
 --- a/grub-core/lib/efi/halt.c
 +++ b/grub-core/lib/efi/halt.c
 @@ -28,7 +28,8 @@
@@ -162,7 +162,7 @@ index 5859f0498..29d413641 100644
      !defined(__riscv)
    grub_acpi_halt ();
 diff --git a/include/grub/loader.h b/include/grub/loader.h
-index 7f82a499f..b20864282 100644
+index 7f82a499fd..b208642821 100644
 --- a/include/grub/loader.h
 +++ b/include/grub/loader.h
 @@ -33,6 +33,7 @@ enum
diff --git a/debian/patches/0099-chainloader-Avoid-a-double-free-when-validation-fail.patch b/debian/patches/0099-chainloader-Avoid-a-double-free-when-validation-fail.patch
index 89c1a00..42d6ff3 100644
--- a/debian/patches/0099-chainloader-Avoid-a-double-free-when-validation-fail.patch
+++ b/debian/patches/0099-chainloader-Avoid-a-double-free-when-validation-fail.patch
@@ -8,7 +8,7 @@ Subject: chainloader: Avoid a double free when validation fails
  1 file changed, 6 insertions(+), 3 deletions(-)
 
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index d0c53077e..144a6549d 100644
+index d0c53077e8..144a6549df 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
 @@ -1085,6 +1085,9 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
diff --git a/debian/patches/0100-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch b/debian/patches/0100-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch
index 2cdc917..34464ab 100644
--- a/debian/patches/0100-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch
+++ b/debian/patches/0100-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch
@@ -19,7 +19,7 @@ Reviewed-by: Daniel Kiper <[e-mail]>
  4 files changed, 31 insertions(+), 10 deletions(-)
 
 diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
-index 991eb29db..4e14eb188 100644
+index 991eb29db9..4e14eb1887 100644
 --- a/grub-core/loader/i386/linux.c
 +++ b/grub-core/loader/i386/linux.c
 @@ -36,6 +36,7 @@
@@ -47,7 +47,7 @@ index 991eb29db..4e14eb188 100644
       return err;
      real_mode_mem = get_virtual_current_address (ch);
 diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
-index 3866f048b..81ab3c0c1 100644
+index 3866f048bb..81ab3c0c15 100644
 --- a/grub-core/loader/i386/pc/linux.c
 +++ b/grub-core/loader/i386/pc/linux.c
 @@ -36,6 +36,7 @@
@@ -74,7 +74,7 @@ index 3866f048b..81ab3c0c1 100644
    if (! grub_linux_is_bzimage
        && GRUB_LINUX_ZIMAGE_ADDR + grub_linux16_prot_size
 diff --git a/grub-core/loader/i386/xen.c b/grub-core/loader/i386/xen.c
-index 8f662c8ac..cd24874ca 100644
+index 8f662c8ac8..cd24874ca3 100644
 --- a/grub-core/loader/i386/xen.c
 +++ b/grub-core/loader/i386/xen.c
 @@ -41,6 +41,7 @@
@@ -111,7 +111,7 @@ index 8f662c8ac..cd24874ca 100644
      goto fail;
    kern_chunk_src = get_virtual_current_address (ch);
 diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c
-index 2f0ebd0b8..3fd653993 100644
+index 2f0ebd0b8b..3fd653993f 100644
 --- a/grub-core/loader/xnu.c
 +++ b/grub-core/loader/xnu.c
 @@ -35,6 +35,7 @@
diff --git a/debian/patches/0101-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch b/debian/patches/0101-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch
index d3e5e6e..5f955e5 100644
--- a/debian/patches/0101-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch
+++ b/debian/patches/0101-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch
@@ -35,7 +35,7 @@ Reviewed-by: Daniel Kiper <[e-mail]>
  13 files changed, 69 insertions(+), 58 deletions(-)
 
 diff --git a/grub-core/lib/i386/relocator.c b/grub-core/lib/i386/relocator.c
-index 71dd4f0ab..34cbe834f 100644
+index 71dd4f0ab0..34cbe834fa 100644
 --- a/grub-core/lib/i386/relocator.c
 +++ b/grub-core/lib/i386/relocator.c
 @@ -83,11 +83,10 @@ grub_relocator32_boot (struct grub_relocator *rel,
@@ -88,7 +88,7 @@ index 71dd4f0ab..34cbe834f 100644
      return err;
  
 diff --git a/grub-core/lib/mips/relocator.c b/grub-core/lib/mips/relocator.c
-index 9d5f49cb9..743b213e6 100644
+index 9d5f49cb93..743b213e69 100644
 --- a/grub-core/lib/mips/relocator.c
 +++ b/grub-core/lib/mips/relocator.c
 @@ -120,10 +120,8 @@ grub_relocator32_boot (struct grub_relocator *rel,
@@ -105,7 +105,7 @@ index 9d5f49cb9..743b213e6 100644
    if (err)
      return err;
 diff --git a/grub-core/lib/powerpc/relocator.c b/grub-core/lib/powerpc/relocator.c
-index bdf2b111b..8ffb8b686 100644
+index bdf2b111be..8ffb8b6868 100644
 --- a/grub-core/lib/powerpc/relocator.c
 +++ b/grub-core/lib/powerpc/relocator.c
 @@ -115,10 +115,8 @@ grub_relocator32_boot (struct grub_relocator *rel,
@@ -122,7 +122,7 @@ index bdf2b111b..8ffb8b686 100644
    if (err)
      return err;
 diff --git a/grub-core/lib/x86_64/efi/relocator.c b/grub-core/lib/x86_64/efi/relocator.c
-index 3caef7a40..7d200a125 100644
+index 3caef7a402..7d200a125e 100644
 --- a/grub-core/lib/x86_64/efi/relocator.c
 +++ b/grub-core/lib/x86_64/efi/relocator.c
 @@ -50,10 +50,9 @@ grub_relocator64_efi_boot (struct grub_relocator *rel,
@@ -140,7 +140,7 @@ index 3caef7a40..7d200a125 100644
      return err;
  
 diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
-index 4e14eb188..04bd78a1f 100644
+index 4e14eb1887..04bd78a1fa 100644
 --- a/grub-core/loader/i386/linux.c
 +++ b/grub-core/loader/i386/linux.c
 @@ -184,9 +184,8 @@ allocate_pages (grub_size_t prot_size, grub_size_t *align,
@@ -156,7 +156,7 @@ index 4e14eb188..04bd78a1f 100644
  						    GRUB_RELOCATOR_PREFERENCE_LOW,
  						    1);
 diff --git a/grub-core/loader/i386/multiboot_mbi.c b/grub-core/loader/i386/multiboot_mbi.c
-index ad3cc292f..a67d9d0a8 100644
+index ad3cc292fd..a67d9d0a80 100644
 --- a/grub-core/loader/i386/multiboot_mbi.c
 +++ b/grub-core/loader/i386/multiboot_mbi.c
 @@ -466,10 +466,9 @@ grub_multiboot_make_mbi (grub_uint32_t *target)
@@ -174,7 +174,7 @@ index ad3cc292f..a67d9d0a8 100644
      return err;
    ptrorig = get_virtual_current_address (ch);
 diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
-index 81ab3c0c1..6400a5b91 100644
+index 81ab3c0c15..6400a5b91d 100644
 --- a/grub-core/loader/i386/pc/linux.c
 +++ b/grub-core/loader/i386/pc/linux.c
 @@ -463,10 +463,8 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
@@ -191,7 +191,7 @@ index 81ab3c0c1..6400a5b91 100644
        return err;
      initrd_chunk = get_virtual_current_address (ch);
 diff --git a/grub-core/loader/mips/linux.c b/grub-core/loader/mips/linux.c
-index 7b723bf18..e4ed95921 100644
+index 7b723bf189..e4ed95921d 100644
 --- a/grub-core/loader/mips/linux.c
 +++ b/grub-core/loader/mips/linux.c
 @@ -442,12 +442,9 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
@@ -211,7 +211,7 @@ index 7b723bf18..e4ed95921 100644
      if (err)
        goto fail;
 diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c
-index 3e6ad166d..3e286908d 100644
+index 3e6ad166dc..3e286908dd 100644
 --- a/grub-core/loader/multiboot.c
 +++ b/grub-core/loader/multiboot.c
 @@ -404,7 +404,7 @@ grub_cmd_module (grub_command_t cmd __attribute__ ((unused)),
@@ -224,7 +224,7 @@ index 3e6ad166d..3e286908d 100644
  					    GRUB_RELOCATOR_PREFERENCE_NONE, 1);
      if (err)
 diff --git a/grub-core/loader/multiboot_elfxx.c b/grub-core/loader/multiboot_elfxx.c
-index cc6853692..f2318e0d1 100644
+index cc6853692a..f2318e0d16 100644
 --- a/grub-core/loader/multiboot_elfxx.c
 +++ b/grub-core/loader/multiboot_elfxx.c
 @@ -109,10 +109,10 @@ CONCAT(grub_multiboot_load_elf, XX) (mbi_load_data_t *mld)
@@ -252,7 +252,7 @@ index cc6853692..f2318e0d1 100644
  						  GRUB_RELOCATOR_PREFERENCE_NONE,
  						  mld->avoid_efi_boot_services);
 diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c
-index 53da78615..3ec209283 100644
+index 53da786151..3ec2092839 100644
 --- a/grub-core/loader/multiboot_mbi2.c
 +++ b/grub-core/loader/multiboot_mbi2.c
 @@ -295,10 +295,10 @@ grub_multiboot2_load (grub_file_t file, const char *filename)
@@ -280,7 +280,7 @@ index 53da78615..3ec209283 100644
  					  GRUB_RELOCATOR_PREFERENCE_NONE, 1);
    if (err)
 diff --git a/grub-core/loader/xnu_resume.c b/grub-core/loader/xnu_resume.c
-index 8089804d4..d648ef0cd 100644
+index 8089804d48..d648ef0cd3 100644
 --- a/grub-core/loader/xnu_resume.c
 +++ b/grub-core/loader/xnu_resume.c
 @@ -129,7 +129,7 @@ grub_xnu_resume (char *imagename)
@@ -293,7 +293,7 @@ index 8089804d4..d648ef0cd 100644
  					    GRUB_XNU_PAGESIZE,
  					    GRUB_RELOCATOR_PREFERENCE_NONE, 0);
 diff --git a/include/grub/relocator.h b/include/grub/relocator.h
-index 24d8672d2..1b3bdd92a 100644
+index 24d8672d22..1b3bdd92ac 100644
 --- a/include/grub/relocator.h
 +++ b/include/grub/relocator.h
 @@ -49,6 +49,35 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel,
diff --git a/debian/patches/0102-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch b/debian/patches/0102-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch
index 6adea77..a4d7edd 100644
--- a/debian/patches/0102-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch
+++ b/debian/patches/0102-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch
@@ -26,7 +26,7 @@ Reviewed-by: Daniel Kiper <[e-mail]>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/lib/relocator.c b/grub-core/lib/relocator.c
-index 5847aac36..f2c1944c2 100644
+index 5847aac364..f2c1944c28 100644
 --- a/grub-core/lib/relocator.c
 +++ b/grub-core/lib/relocator.c
 @@ -1386,8 +1386,8 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel,
diff --git a/debian/patches/0103-linux-loader-avoid-overflow-on-initrd-size-calculati.patch b/debian/patches/0103-linux-loader-avoid-overflow-on-initrd-size-calculati.patch
index b91f616..0bf8d98 100644
--- a/debian/patches/0103-linux-loader-avoid-overflow-on-initrd-size-calculati.patch
+++ b/debian/patches/0103-linux-loader-avoid-overflow-on-initrd-size-calculati.patch
@@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <[e-mail]>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/loader/linux.c b/grub-core/loader/linux.c
-index 471b214d6..25624ebc1 100644
+index 471b214d6c..25624ebc11 100644
 --- a/grub-core/loader/linux.c
 +++ b/grub-core/loader/linux.c
 @@ -151,8 +151,8 @@ grub_initrd_init (int argc, char *argv[],
diff --git a/debian/patches/0104-linux-Fix-integer-overflows-in-initrd-size-handling.patch b/debian/patches/0104-linux-Fix-integer-overflows-in-initrd-size-handling.patch
index 46521c3..e7c41b2 100644
--- a/debian/patches/0104-linux-Fix-integer-overflows-in-initrd-size-handling.patch
+++ b/debian/patches/0104-linux-Fix-integer-overflows-in-initrd-size-handling.patch
@@ -14,7 +14,7 @@ Reviewed-by: Jan Setje-Eilers <[e-mail]>
  1 file changed, 54 insertions(+), 20 deletions(-)
 
 diff --git a/grub-core/loader/linux.c b/grub-core/loader/linux.c
-index 25624ebc1..e9f819ee9 100644
+index 25624ebc11..e9f819ee95 100644
 --- a/grub-core/loader/linux.c
 +++ b/grub-core/loader/linux.c
 @@ -4,6 +4,7 @@
diff --git a/debian/patches/0105-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch b/debian/patches/0105-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
index d030dc0..c364981 100644
--- a/debian/patches/0105-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
+++ b/debian/patches/0105-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
@@ -15,7 +15,7 @@ Signed-off-by: Colin Watson <[e-mail]>
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index e357bf67c..381459ce0 100644
+index e357bf67c6..381459ce08 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
 @@ -28,6 +28,7 @@
diff --git a/debian/patches/at_keyboard-module-init.patch b/debian/patches/at_keyboard-module-init.patch
index 5d51a5b..fe36d6e 100644
--- a/debian/patches/at_keyboard-module-init.patch
+++ b/debian/patches/at_keyboard-module-init.patch
@@ -16,7 +16,7 @@ Patch-Name: at_keyboard-module-init.patch
  1 file changed, 9 insertions(+)
 
 diff --git a/grub-core/term/at_keyboard.c b/grub-core/term/at_keyboard.c
-index f0a986eb1..d4395c201 100644
+index f0a986eb17..d4395c2019 100644
 --- a/grub-core/term/at_keyboard.c
 +++ b/grub-core/term/at_keyboard.c
 @@ -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 713b79d..806cf54 100644
--- a/debian/patches/bash-completion-drop-have-checks.patch
+++ b/debian/patches/bash-completion-drop-have-checks.patch
@@ -16,7 +16,7 @@ Patch-Name: bash-completion-drop-have-checks.patch
  1 file changed, 13 insertions(+), 26 deletions(-)
 
 diff --git a/util/bash-completion.d/grub-completion.bash.in b/util/bash-completion.d/grub-completion.bash.in
-index 44bf135b9..d4235e7ef 100644
+index 44bf135b9f..d4235e7ef8 100644
 --- a/util/bash-completion.d/grub-completion.bash.in
 +++ b/util/bash-completion.d/grub-completion.bash.in
 @@ -166,13 +166,11 @@ _grub_set_entry () {
diff --git a/debian/patches/blacklist-1440x900x32.patch b/debian/patches/blacklist-1440x900x32.patch
index e205af0..432726d 100644
--- a/debian/patches/blacklist-1440x900x32.patch
+++ b/debian/patches/blacklist-1440x900x32.patch
@@ -13,7 +13,7 @@ Patch-Name: blacklist-1440x900x32.patch
  1 file changed, 9 insertions(+)
 
 diff --git a/grub-core/video/i386/pc/vbe.c b/grub-core/video/i386/pc/vbe.c
-index b7f911926..4b1bd7d5e 100644
+index b7f911926d..4b1bd7d5ea 100644
 --- a/grub-core/video/i386/pc/vbe.c
 +++ b/grub-core/video/i386/pc/vbe.c
 @@ -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 d3d95dc..67f690b 100644
--- a/debian/patches/bootp-new-net_bootp6-command.patch
+++ b/debian/patches/bootp-new-net_bootp6-command.patch
@@ -17,7 +17,7 @@ Patch-Name: bootp-new-net_bootp6-command.patch
  3 files changed, 1018 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
-index 04cfbb045..21c1824ef 100644
+index 04cfbb0450..21c1824efb 100644
 --- a/grub-core/net/bootp.c
 +++ b/grub-core/net/bootp.c
 @@ -24,6 +24,98 @@
@@ -969,7 +969,7 @@ index 04cfbb045..21c1824ef 100644
 +  grub_unregister_command (cmd_bootp6);
  }
 diff --git a/grub-core/net/ip.c b/grub-core/net/ip.c
-index ea5edf8f1..01410798b 100644
+index ea5edf8f1f..01410798b3 100644
 --- a/grub-core/net/ip.c
 +++ b/grub-core/net/ip.c
 @@ -239,6 +239,45 @@ handle_dgram (struct grub_net_buff *nb,
@@ -1019,7 +1019,7 @@ index ea5edf8f1..01410798b 100644
        {
  	const struct grub_net_bootp_packet *bootp;
 diff --git a/include/grub/net.h b/include/grub/net.h
-index cc114286e..58cff96d2 100644
+index cc114286ea..58cff96d2a 100644
 --- a/include/grub/net.h
 +++ b/include/grub/net.h
 @@ -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 1033c3d..aabd41a 100644
--- a/debian/patches/bootp-process-dhcpack-http-boot.patch
+++ b/debian/patches/bootp-process-dhcpack-http-boot.patch
@@ -24,7 +24,7 @@ Patch-Name: bootp-process-dhcpack-http-boot.patch
  2 files changed, 60 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
-index 21c1824ef..558d97ba1 100644
+index 21c1824efb..558d97ba1e 100644
 --- a/grub-core/net/bootp.c
 +++ b/grub-core/net/bootp.c
 @@ -154,7 +154,7 @@ struct grub_dhcp_request_options
@@ -109,7 +109,7 @@ index 21c1824ef..558d97ba1 100644
        },
        GRUB_NET_BOOTP_END,
 diff --git a/include/grub/net.h b/include/grub/net.h
-index 58cff96d2..b5f9e617e 100644
+index 58cff96d2a..b5f9e617e5 100644
 --- a/include/grub/net.h
 +++ b/include/grub/net.h
 @@ -523,6 +523,7 @@ enum
diff --git a/debian/patches/cherrypick-lsefisystab-define-smbios3.patch b/debian/patches/cherrypick-lsefisystab-define-smbios3.patch
index d30ebba..48619ef 100644
--- a/debian/patches/cherrypick-lsefisystab-define-smbios3.patch
+++ b/debian/patches/cherrypick-lsefisystab-define-smbios3.patch
@@ -16,7 +16,7 @@ Patch-Name: cherrypick-lsefisystab-define-smbios3.patch
  2 files changed, 6 insertions(+)
 
 diff --git a/grub-core/commands/efi/lsefisystab.c b/grub-core/commands/efi/lsefisystab.c
-index df1030221..7c039c509 100644
+index df10302218..7c039c5097 100644
 --- a/grub-core/commands/efi/lsefisystab.c
 +++ b/grub-core/commands/efi/lsefisystab.c
 @@ -48,6 +48,7 @@ static const struct guid_mapping guid_mappings[] =
@@ -28,7 +28,7 @@ index df1030221..7c039c509 100644
      { GRUB_EFI_TIANO_CUSTOM_DECOMPRESS_GUID, "TIANO CUSTOM DECOMPRESS"},
      { GRUB_EFI_TSC_FREQUENCY_GUID, "TSC FREQUENCY"},
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index 75befd10e..9824fbcd0 100644
+index 75befd10e5..9824fbcd0d 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
 @@ -314,6 +314,11 @@
diff --git a/debian/patches/cherrypick-lsefisystab-show-dtb.patch b/debian/patches/cherrypick-lsefisystab-show-dtb.patch
index a253105..727628f 100644
--- a/debian/patches/cherrypick-lsefisystab-show-dtb.patch
+++ b/debian/patches/cherrypick-lsefisystab-show-dtb.patch
@@ -27,7 +27,7 @@ Patch-Name: cherrypick-lsefisystab-show-dtb.patch
  1 file changed, 1 insertion(+)
 
 diff --git a/grub-core/commands/efi/lsefisystab.c b/grub-core/commands/efi/lsefisystab.c
-index 7c039c509..902788250 100644
+index 7c039c5097..902788250e 100644
 --- a/grub-core/commands/efi/lsefisystab.c
 +++ b/grub-core/commands/efi/lsefisystab.c
 @@ -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 3a64dd0..a0a649e 100644
--- a/debian/patches/cherrypick-smbios-module.patch
+++ b/debian/patches/cherrypick-smbios-module.patch
@@ -33,7 +33,7 @@ Patch-Name: cherrypick-smbios-module.patch
  create mode 100644 include/grub/smbios.h
 
 diff --git a/docs/grub.texi b/docs/grub.texi
-index 1baa0fa20..d573f32cb 100644
+index 1baa0fa20f..d573f32cbb 100644
 --- a/docs/grub.texi
 +++ b/docs/grub.texi
 @@ -3976,6 +3976,7 @@ you forget a command, you can run the command @command{help}
@@ -126,7 +126,7 @@ index 1baa0fa20..d573f32cb 100644
  @subsection source
  
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 33e75021d..9b20f3335 100644
+index 33e75021da..9b20f33355 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
 @@ -1106,6 +1106,21 @@ module = {
@@ -153,7 +153,7 @@ index 33e75021d..9b20f3335 100644
    ieee1275 = commands/ieee1275/suspend.c;
 diff --git a/grub-core/commands/efi/smbios.c b/grub-core/commands/efi/smbios.c
 new file mode 100644
-index 000000000..75202d5aa
+index 0000000000..75202d5aad
 --- /dev/null
 +++ b/grub-core/commands/efi/smbios.c
 @@ -0,0 +1,61 @@
@@ -220,7 +220,7 @@ index 000000000..75202d5aa
 +}
 diff --git a/grub-core/commands/i386/pc/smbios.c b/grub-core/commands/i386/pc/smbios.c
 new file mode 100644
-index 000000000..069d66367
+index 0000000000..069d663673
 --- /dev/null
 +++ b/grub-core/commands/i386/pc/smbios.c
 @@ -0,0 +1,52 @@
@@ -278,7 +278,7 @@ index 000000000..069d66367
 +}
 diff --git a/grub-core/commands/smbios.c b/grub-core/commands/smbios.c
 new file mode 100644
-index 000000000..7a6a391fc
+index 0000000000..7a6a391fc1
 --- /dev/null
 +++ b/grub-core/commands/smbios.c
 @@ -0,0 +1,374 @@
@@ -657,7 +657,7 @@ index 000000000..7a6a391fc
 +  grub_unregister_extcmd (cmd);
 +}
 diff --git a/grub-core/efiemu/i386/pc/cfgtables.c b/grub-core/efiemu/i386/pc/cfgtables.c
-index 492c07c46..e5fffb7d4 100644
+index 492c07c468..e5fffb7d4a 100644
 --- a/grub-core/efiemu/i386/pc/cfgtables.c
 +++ b/grub-core/efiemu/i386/pc/cfgtables.c
 @@ -22,11 +22,11 @@
@@ -696,7 +696,7 @@ index 492c07c46..e5fffb7d4 100644
      }
 diff --git a/include/grub/smbios.h b/include/grub/smbios.h
 new file mode 100644
-index 000000000..15ec260b3
+index 0000000000..15ec260b32
 --- /dev/null
 +++ b/include/grub/smbios.h
 @@ -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
  1 file changed, 8 insertions(+)
 
 diff --git a/util/setup.c b/util/setup.c
-index 6f88f3cc4..fbdf2fcc5 100644
+index 6f88f3cc43..fbdf2fcc59 100644
 --- a/util/setup.c
 +++ b/util/setup.c
 @@ -58,6 +58,8 @@
diff --git a/debian/patches/default-grub-d.patch b/debian/patches/default-grub-d.patch
index c7d8119..cf024d6 100644
--- a/debian/patches/default-grub-d.patch
+++ b/debian/patches/default-grub-d.patch
@@ -14,7 +14,7 @@ Patch-Name: default-grub-d.patch
  2 files changed, 98 insertions(+), 21 deletions(-)
 
 diff --git a/grub-core/osdep/unix/config.c b/grub-core/osdep/unix/config.c
-index 65effa9f3..5478030fd 100644
+index 65effa9f3a..5478030fde 100644
 --- a/grub-core/osdep/unix/config.c
 +++ b/grub-core/osdep/unix/config.c
 @@ -24,6 +24,8 @@
@@ -178,7 +178,7 @@ index 65effa9f3..5478030fd 100644
 +  free (cfgdir);
  }
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index b506d63bf..d18bf972f 100644
+index b506d63bf9..d18bf972f7 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
 @@ -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
  1 file changed, 12 insertions(+)
 
 diff --git a/grub-core/kern/emu/hostdisk.c b/grub-core/kern/emu/hostdisk.c
-index e9ec680cd..8ac523953 100644
+index e9ec680cdb..8ac5239538 100644
 --- a/grub-core/kern/emu/hostdisk.c
 +++ b/grub-core/kern/emu/hostdisk.c
 @@ -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
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
-index 0f801cab3..b6606c16e 100644
+index 0f801cab3e..b6606c16e0 100644
 --- a/util/grub-mkconfig_lib.in
 +++ b/util/grub-mkconfig_lib.in
 @@ -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 399e8a2..44ac1ae 100644
--- a/debian/patches/efi-variable-storage-minimise-writes.patch
+++ b/debian/patches/efi-variable-storage-minimise-writes.patch
@@ -60,7 +60,7 @@ Patch-Name: efi-variable-storage-minimise-writes.patch
  create mode 100644 grub-core/osdep/unix/efivar.c
 
 diff --git a/INSTALL b/INSTALL
-index 8acb40902..342c158e9 100644
+index 8acb409023..342c158e91 100644
 --- a/INSTALL
 +++ b/INSTALL
 @@ -41,6 +41,11 @@ configuring the GRUB.
@@ -76,7 +76,7 @@ index 8acb40902..342c158e9 100644
  
  * libdevmapper 1.02.34 or later (recommended)
 diff --git a/Makefile.util.def b/Makefile.util.def
-index ce133e694..504d1c058 100644
+index ce133e694e..504d1c0581 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
 @@ -565,6 +565,8 @@ program = {
@@ -180,7 +180,7 @@ index ce133e694..504d1c058 100644
  
  script = {
 diff --git a/configure.ac b/configure.ac
-index e382c7480..883245553 100644
+index e382c7480d..883245553d 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -443,6 +443,18 @@ AC_CHECK_HEADER([util.h], [
@@ -204,7 +204,7 @@ index e382c7480..883245553 100644
    CFLAGS="$HOST_CFLAGS -Wtrampolines -Werror"
 diff --git a/grub-core/osdep/efivar.c b/grub-core/osdep/efivar.c
 new file mode 100644
-index 000000000..d2750e252
+index 0000000000..d2750e2524
 --- /dev/null
 +++ b/grub-core/osdep/efivar.c
 @@ -0,0 +1,3 @@
@@ -213,7 +213,7 @@ index 000000000..d2750e252
 +#endif
 diff --git a/grub-core/osdep/unix/efivar.c b/grub-core/osdep/unix/efivar.c
 new file mode 100644
-index 000000000..4a58328b4
+index 0000000000..4a58328b42
 --- /dev/null
 +++ b/grub-core/osdep/unix/efivar.c
 @@ -0,0 +1,508 @@
@@ -726,7 +726,7 @@ index 000000000..4a58328b4
 +
 +#endif /* HAVE_EFIVAR */
 diff --git a/grub-core/osdep/unix/platform.c b/grub-core/osdep/unix/platform.c
-index 9c439326a..b561174ea 100644
+index 9c439326a0..b561174ea9 100644
 --- a/grub-core/osdep/unix/platform.c
 +++ b/grub-core/osdep/unix/platform.c
 @@ -19,15 +19,12 @@
@@ -856,7 +856,7 @@ index 9c439326a..b561174ea 100644
  
  void
 diff --git a/include/grub/util/install.h b/include/grub/util/install.h
-index 8aeb5c4f2..a521f1663 100644
+index 8aeb5c4f20..a521f1663f 100644
 --- a/include/grub/util/install.h
 +++ b/include/grub/util/install.h
 @@ -219,6 +219,11 @@ grub_install_get_default_x86_platform (void);
@@ -872,7 +872,7 @@ index 8aeb5c4f2..a521f1663 100644
  grub_install_register_efi (grub_device_t efidir_grub_dev,
  			   const char *efifile_path,
 diff --git a/util/grub-install.c b/util/grub-install.c
-index 4bad8de61..63462e4e0 100644
+index 4bad8de612..63462e4e09 100644
 --- a/util/grub-install.c
 +++ b/util/grub-install.c
 @@ -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 c120841..fdf062b 100644
--- a/debian/patches/efinet-set-dns-from-uefi-proto.patch
+++ b/debian/patches/efinet-set-dns-from-uefi-proto.patch
@@ -35,7 +35,7 @@ Patch-Name: efinet-set-dns-from-uefi-proto.patch
  2 files changed, 239 insertions(+)
 
 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index 2d3b00f0e..82a28fb6e 100644
+index 2d3b00f0e1..82a28fb6e9 100644
 --- a/grub-core/net/drivers/efi/efinet.c
 +++ b/grub-core/net/drivers/efi/efinet.c
 @@ -30,6 +30,8 @@ GRUB_MOD_LICENSE ("GPLv3+");
@@ -244,7 +244,7 @@ index 2d3b00f0e..82a28fb6e 100644
      }
  
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index 664cea37b..75befd10e 100644
+index 664cea37b5..75befd10e5 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
 @@ -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 a9821ad..d0d2240 100644
--- a/debian/patches/efinet-set-network-from-uefi-devpath.patch
+++ b/debian/patches/efinet-set-network-from-uefi-devpath.patch
@@ -34,7 +34,7 @@ Patch-Name: efinet-set-network-from-uefi-devpath.patch
  2 files changed, 270 insertions(+), 9 deletions(-)
 
 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index fc90415f2..2d3b00f0e 100644
+index fc90415f29..2d3b00f0e1 100644
 --- a/grub-core/net/drivers/efi/efinet.c
 +++ b/grub-core/net/drivers/efi/efinet.c
 @@ -23,6 +23,7 @@
@@ -358,7 +358,7 @@ index fc90415f2..2d3b00f0e 100644
    }
  }
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index ca6cdc159..664cea37b 100644
+index ca6cdc1596..664cea37b5 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
 @@ -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 3934638..d1f2c02 100644
--- a/debian/patches/efinet-uefi-ipv6-pxe-support.patch
+++ b/debian/patches/efinet-uefi-ipv6-pxe-support.patch
@@ -17,7 +17,7 @@ Patch-Name: efinet-uefi-ipv6-pxe-support.patch
  2 files changed, 73 insertions(+), 6 deletions(-)
 
 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index 5388f952b..fc90415f2 100644
+index 5388f952ba..fc90415f29 100644
 --- a/grub-core/net/drivers/efi/efinet.c
 +++ b/grub-core/net/drivers/efi/efinet.c
 @@ -378,11 +378,25 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
@@ -52,7 +52,7 @@ index 5388f952b..fc90415f2 100644
    }
  }
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index addcbfa8f..ca6cdc159 100644
+index addcbfa8fb..ca6cdc1596 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
 @@ -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 49f25d4..6e5d4c2 100644
--- a/debian/patches/gettext-quiet.patch
+++ b/debian/patches/gettext-quiet.patch
@@ -13,7 +13,7 @@ Patch-Name: gettext-quiet.patch
  1 file changed, 5 insertions(+)
 
 diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c
-index 4d02e62c1..2a19389f2 100644
+index 4d02e62c10..2a19389f2a 100644
 --- a/grub-core/gettext/gettext.c
 +++ b/grub-core/gettext/gettext.c
 @@ -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 57a0c28..efdaa14 100644
--- a/debian/patches/gfxpayload-dynamic.patch
+++ b/debian/patches/gfxpayload-dynamic.patch
@@ -23,7 +23,7 @@ Patch-Name: gfxpayload-dynamic.patch
  create mode 100644 grub-core/commands/i386/pc/hwmatch.c
 
 diff --git a/configure.ac b/configure.ac
-index 7dda5bb32..dbc429ce0 100644
+index 7dda5bb32b..dbc429ce0a 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1879,6 +1879,17 @@ else
@@ -45,7 +45,7 @@ index 7dda5bb32..dbc429ce0 100644
  
  AC_SUBST([FONT_SOURCE])
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 474a63e68..aadb4cdff 100644
+index 474a63e68c..aadb4cdff8 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
 @@ -971,6 +971,14 @@ module = {
@@ -65,7 +65,7 @@ index 474a63e68..aadb4cdff 100644
    common = commands/keystatus.c;
 diff --git a/grub-core/commands/i386/pc/hwmatch.c b/grub-core/commands/i386/pc/hwmatch.c
 new file mode 100644
-index 000000000..6de07cecc
+index 0000000000..6de07cecc8
 --- /dev/null
 +++ b/grub-core/commands/i386/pc/hwmatch.c
 @@ -0,0 +1,146 @@
@@ -216,7 +216,7 @@ index 000000000..6de07cecc
 +  grub_unregister_command (cmd);
 +}
 diff --git a/include/grub/file.h b/include/grub/file.h
-index 31567483c..e3c4cae2b 100644
+index 31567483cc..e3c4cae2b5 100644
 --- a/include/grub/file.h
 +++ b/include/grub/file.h
 @@ -122,6 +122,7 @@ enum grub_file_type
@@ -228,7 +228,7 @@ index 31567483c..e3c4cae2b 100644
      GRUB_FILE_TYPE_LOADENV,
      GRUB_FILE_TYPE_SAVEENV,
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 2be66c702..09393c28e 100644
+index 2be66c7028..09393c28ee 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -23,6 +23,7 @@ datarootdir="@datarootdir@"
@@ -290,7 +290,7 @@ index 2be66c702..09393c28e 100644
  # yet, so it's empty. In a submenu it will be equal to '\t' (one tab).
  submenu_indentation=""
 diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in
-index ec4b49d9d..8cd7d1285 100755
+index ec4b49d9d7..8cd7d12851 100755
 --- a/util/grub.d/10_linux_zfs.in
 +++ b/util/grub.d/10_linux_zfs.in
 @@ -22,6 +22,7 @@ datarootdir="@datarootdir@"
diff --git a/debian/patches/gfxpayload-keep-default.patch b/debian/patches/gfxpayload-keep-default.patch
index d160ade..8f48114 100644
--- a/debian/patches/gfxpayload-keep-default.patch
+++ b/debian/patches/gfxpayload-keep-default.patch
@@ -24,7 +24,7 @@ Patch-Name: gfxpayload-keep-default.patch
  2 files changed, 8 deletions(-)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index a75096609..f839b3b55 100644
+index a75096609a..f839b3b55f 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -118,10 +118,6 @@ linux_entry ()
@@ -39,7 +39,7 @@ index a75096609..f839b3b55 100644
        if [ "x$GRUB_GFXPAYLOAD_LINUX" != xtext ]; then
  	  echo "	load_video" | sed "s/^/$submenu_indentation/"
 diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in
-index 5ec65fa94..b24587f0a 100755
+index 5ec65fa941..b24587f0a5 100755
 --- a/util/grub.d/10_linux_zfs.in
 +++ b/util/grub.d/10_linux_zfs.in
 @@ -744,10 +744,6 @@ zfs_linux_entry () {
diff --git a/debian/patches/grub-install-backup-and-restore.patch b/debian/patches/grub-install-backup-and-restore.patch
index 10b4ab0..cc76eac 100644
--- a/debian/patches/grub-install-backup-and-restore.patch
+++ b/debian/patches/grub-install-backup-and-restore.patch
@@ -28,7 +28,7 @@ Patch-Name: grub-install-backup-and-restore.patch
  2 files changed, 91 insertions(+), 16 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 1819188f9..6a88b9b0c 100644
+index 1819188f9f..6a88b9b0c0 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -420,7 +420,7 @@ else
@@ -41,7 +41,7 @@ index 1819188f9..6a88b9b0c 100644
  
  # glibc 2.25 still includes sys/sysmacros.h in sys/types.h but emits deprecation
 diff --git a/util/grub-install-common.c b/util/grub-install-common.c
-index 447504d3f..61f9075bc 100644
+index 447504d3f4..61f9075bcc 100644
 --- a/util/grub-install-common.c
 +++ b/util/grub-install-common.c
 @@ -185,38 +185,113 @@ grub_install_mkdir_p (const char *dst)
diff --git a/debian/patches/grub-install-pvxen-paths.patch b/debian/patches/grub-install-pvxen-paths.patch
index 30cbc14..b1ca1c4 100644
--- a/debian/patches/grub-install-pvxen-paths.patch
+++ b/debian/patches/grub-install-pvxen-paths.patch
@@ -28,7 +28,7 @@ v2: Respect bootdir, create /boot/xen as needed.
  1 file changed, 22 insertions(+), 2 deletions(-)
 
 diff --git a/util/grub-install.c b/util/grub-install.c
-index 70d6700de..64c292383 100644
+index 70d6700de8..64c292383f 100644
 --- a/util/grub-install.c
 +++ b/util/grub-install.c
 @@ -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
  1 file changed, 14 insertions(+)
 
 diff --git a/util/getroot.c b/util/getroot.c
-index 847406fba..cdd41153c 100644
+index 847406fbab..cdd41153c5 100644
 --- a/util/getroot.c
 +++ b/util/getroot.c
 @@ -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
  1 file changed, 4 insertions(+)
 
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 9f477ff05..45cd4cc54 100644
+index 9f477ff054..45cd4cc541 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
 @@ -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 e6b08af..3d73e0c 100644
--- a/debian/patches/ieee1275-clear-reset.patch
+++ b/debian/patches/ieee1275-clear-reset.patch
@@ -18,7 +18,7 @@ Patch-Name: ieee1275-clear-reset.patch
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/grub-core/term/terminfo.c b/grub-core/term/terminfo.c
-index d317efa36..63892ad42 100644
+index d317efa368..63892ad427 100644
 --- a/grub-core/term/terminfo.c
 +++ b/grub-core/term/terminfo.c
 @@ -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 c8fa4ce..76734f6 100644
--- a/debian/patches/ignore-grub_func_test-failures.patch
+++ b/debian/patches/ignore-grub_func_test-failures.patch
@@ -14,7 +14,7 @@ Patch-Name: ignore-grub_func_test-failures.patch
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/tests/grub_func_test.in b/tests/grub_func_test.in
-index c67f9e422..728cd6e06 100644
+index c67f9e4225..728cd6e066 100644
 --- a/tests/grub_func_test.in
 +++ b/tests/grub_func_test.in
 @@ -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 b531a5c..6570f74 100644
--- a/debian/patches/insmod-xzio-and-lzopio-on-xen.patch
+++ b/debian/patches/insmod-xzio-and-lzopio-on-xen.patch
@@ -21,7 +21,7 @@ Patch-Name: insmod-xzio-and-lzopio-on-xen.patch
  2 files changed, 2 insertions(+)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 2c418c5ec..85b30084a 100644
+index 2c418c5ec8..85b30084ad 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -166,6 +166,7 @@ linux_entry ()
@@ -33,7 +33,7 @@ index 2c418c5ec..85b30084a 100644
    if [ x$dirname = x/ ]; then
      if [ -z "${prepare_root_cache}" ]; then
 diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in
-index 4477fa606..4c48abef0 100755
+index 4477fa6061..4c48abef01 100755
 --- a/util/grub.d/10_linux_zfs.in
 +++ b/util/grub.d/10_linux_zfs.in
 @@ -838,6 +838,7 @@ zfs_linux_entry () {
diff --git a/debian/patches/install-efi-fallback.patch b/debian/patches/install-efi-fallback.patch
index ff3451b..5a36b4e 100644
--- a/debian/patches/install-efi-fallback.patch
+++ b/debian/patches/install-efi-fallback.patch
@@ -19,7 +19,7 @@ Patch-Name: install-efi-fallback.patch
  1 file changed, 35 insertions(+), 5 deletions(-)
 
 diff --git a/grub-core/osdep/linux/platform.c b/grub-core/osdep/linux/platform.c
-index e28a79dab..2e7f72086 100644
+index e28a79dab3..2e7f720869 100644
 --- a/grub-core/osdep/linux/platform.c
 +++ b/grub-core/osdep/linux/platform.c
 @@ -19,10 +19,12 @@
diff --git a/debian/patches/install-efi-ubuntu-flavours.patch b/debian/patches/install-efi-ubuntu-flavours.patch
index 597f3e2..1a6023c 100644
--- a/debian/patches/install-efi-ubuntu-flavours.patch
+++ b/debian/patches/install-efi-ubuntu-flavours.patch
@@ -17,7 +17,7 @@ Patch-Name: install-efi-ubuntu-flavours.patch
  1 file changed, 2 insertions(+)
 
 diff --git a/util/grub-install.c b/util/grub-install.c
-index e1e40cf2b..f0d59c180 100644
+index e1e40cf2b5..f0d59c1809 100644
 --- a/util/grub-install.c
 +++ b/util/grub-install.c
 @@ -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 37b1b01..531fb38 100644
--- a/debian/patches/install-locale-langpack.patch
+++ b/debian/patches/install-locale-langpack.patch
@@ -13,7 +13,7 @@ Patch-Name: install-locale-langpack.patch
  1 file changed, 30 insertions(+), 7 deletions(-)
 
 diff --git a/util/grub-install-common.c b/util/grub-install-common.c
-index ca0ac612a..fdfe2c7ea 100644
+index ca0ac612ac..fdfe2c7ead 100644
 --- a/util/grub-install-common.c
 +++ b/util/grub-install-common.c
 @@ -609,17 +609,25 @@ get_localedir (void)
diff --git a/debian/patches/install-powerpc-machtypes.patch b/debian/patches/install-powerpc-machtypes.patch
index 046b269..0bd6bcc 100644
--- a/debian/patches/install-powerpc-machtypes.patch
+++ b/debian/patches/install-powerpc-machtypes.patch
@@ -25,7 +25,7 @@ Patch-Name: install-powerpc-machtypes.patch
  6 files changed, 119 insertions(+), 6 deletions(-)
 
 diff --git a/grub-core/osdep/basic/platform.c b/grub-core/osdep/basic/platform.c
-index a7dafd85a..6c293ed2d 100644
+index a7dafd85a9..6c293ed2d0 100644
 --- a/grub-core/osdep/basic/platform.c
 +++ b/grub-core/osdep/basic/platform.c
 @@ -30,3 +30,8 @@ grub_install_get_default_x86_platform (void)
@@ -38,7 +38,7 @@ index a7dafd85a..6c293ed2d 100644
 +  return "generic";
 +}
 diff --git a/grub-core/osdep/linux/platform.c b/grub-core/osdep/linux/platform.c
-index 2e7f72086..5b37366d4 100644
+index 2e7f720869..5b37366d4d 100644
 --- a/grub-core/osdep/linux/platform.c
 +++ b/grub-core/osdep/linux/platform.c
 @@ -24,6 +24,7 @@
@@ -125,7 +125,7 @@ index 2e7f72086..5b37366d4 100644
 +  return machtype;
 +}
 diff --git a/grub-core/osdep/unix/platform.c b/grub-core/osdep/unix/platform.c
-index 55b8f4016..9c439326a 100644
+index 55b8f40162..9c439326a0 100644
 --- a/grub-core/osdep/unix/platform.c
 +++ b/grub-core/osdep/unix/platform.c
 @@ -218,13 +218,29 @@ grub_install_register_ieee1275 (int is_prep, const char *install_device,
@@ -165,7 +165,7 @@ index 55b8f4016..9c439326a 100644
  
    free (boot_device);
 diff --git a/grub-core/osdep/windows/platform.c b/grub-core/osdep/windows/platform.c
-index 7eb53fe01..e19a3d9a8 100644
+index 7eb53fe01b..e19a3d9a8a 100644
 --- a/grub-core/osdep/windows/platform.c
 +++ b/grub-core/osdep/windows/platform.c
 @@ -128,6 +128,12 @@ grub_install_get_default_x86_platform (void)
@@ -182,7 +182,7 @@ index 7eb53fe01..e19a3d9a8 100644
  get_efi_variable (const wchar_t *varname, ssize_t *len)
  {
 diff --git a/include/grub/util/install.h b/include/grub/util/install.h
-index 2631b1074..8aeb5c4f2 100644
+index 2631b10745..8aeb5c4f20 100644
 --- a/include/grub/util/install.h
 +++ b/include/grub/util/install.h
 @@ -216,6 +216,9 @@ grub_install_get_default_arm_platform (void);
@@ -196,7 +196,7 @@ index 2631b1074..8aeb5c4f2 100644
  grub_install_register_efi (grub_device_t efidir_grub_dev,
  			   const char *efifile_path,
 diff --git a/util/grub-install.c b/util/grub-install.c
-index f0d59c180..70d6700de 100644
+index f0d59c1809..70d6700de8 100644
 --- a/util/grub-install.c
 +++ b/util/grub-install.c
 @@ -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 ba2443b..fafe60f 100644
--- a/debian/patches/install-stage2-confusion.patch
+++ b/debian/patches/install-stage2-confusion.patch
@@ -13,7 +13,7 @@ Patch-Name: install-stage2-confusion.patch
  1 file changed, 14 insertions(+)
 
 diff --git a/util/grub-install.c b/util/grub-install.c
-index 8a55ad4b8..3b4606eef 100644
+index 8a55ad4b8d..3b4606eef1 100644
 --- a/util/grub-install.c
 +++ b/util/grub-install.c
 @@ -42,6 +42,7 @@
diff --git a/debian/patches/maybe-quiet.patch b/debian/patches/maybe-quiet.patch
index 30c02df..da80c4b 100644
--- a/debian/patches/maybe-quiet.patch
+++ b/debian/patches/maybe-quiet.patch
@@ -47,7 +47,7 @@ Patch-Name: maybe-quiet.patch
  10 files changed, 118 insertions(+), 8 deletions(-)
 
 diff --git a/config.h.in b/config.h.in
-index 9e8f9911b..d2c4ce8e5 100644
+index 9e8f9911b1..d2c4ce8e51 100644
 --- a/config.h.in
 +++ b/config.h.in
 @@ -12,6 +12,8 @@
@@ -60,7 +60,7 @@ index 9e8f9911b..d2c4ce8e5 100644
  /* We don't need those.  */
  #define MINILZO_CFG_SKIP_LZO_PTR 1
 diff --git a/configure.ac b/configure.ac
-index 1e5abc67d..ea00ccd69 100644
+index 1e5abc67d9..ea00ccd691 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1857,6 +1857,17 @@ else
@@ -93,7 +93,7 @@ index 1e5abc67d..ea00ccd69 100644
  echo "*******************************************************"
  ]
 diff --git a/grub-core/boot/i386/pc/boot.S b/grub-core/boot/i386/pc/boot.S
-index 2bd0b2d28..b0c0f2225 100644
+index 2bd0b2d286..b0c0f2225e 100644
 --- a/grub-core/boot/i386/pc/boot.S
 +++ b/grub-core/boot/i386/pc/boot.S
 @@ -19,6 +19,9 @@
@@ -125,7 +125,7 @@ index 2bd0b2d28..b0c0f2225 100644
  	movw	$disk_address_packet, %si
  
 diff --git a/grub-core/boot/i386/pc/diskboot.S b/grub-core/boot/i386/pc/diskboot.S
-index c1addc0df..9b6d7a7ed 100644
+index c1addc0df2..9b6d7a7edc 100644
 --- a/grub-core/boot/i386/pc/diskboot.S
 +++ b/grub-core/boot/i386/pc/diskboot.S
 @@ -18,6 +18,9 @@
@@ -205,7 +205,7 @@ index c1addc0df..9b6d7a7ed 100644
  
  notification_step:	.asciz "."
 diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
-index 9cad0c448..714b63d67 100644
+index 9cad0c4485..714b63d674 100644
 --- a/grub-core/kern/main.c
 +++ b/grub-core/kern/main.c
 @@ -264,15 +264,25 @@ reclaim_module_space (void)
@@ -248,7 +248,7 @@ index 9cad0c448..714b63d67 100644
    grub_rescue_run ();
  }
 diff --git a/grub-core/kern/rescue_reader.c b/grub-core/kern/rescue_reader.c
-index dcd7d4439..a93524eab 100644
+index dcd7d44397..a93524eabb 100644
 --- a/grub-core/kern/rescue_reader.c
 +++ b/grub-core/kern/rescue_reader.c
 @@ -78,7 +78,9 @@ grub_rescue_read_line (char **line, int cont,
@@ -262,7 +262,7 @@ index dcd7d4439..a93524eab 100644
    while (1)
      {
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 1b03dfd57..0aa389fa1 100644
+index 1b03dfd57b..0aa389fa16 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
 @@ -389,6 +389,15 @@ static grub_err_t
@@ -292,7 +292,7 @@ index 1b03dfd57..0aa389fa1 100644
    while (1)
      {
 diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
-index 3611ee9ea..ebf5a0f10 100644
+index 3611ee9ea7..ebf5a0f109 100644
 --- a/grub-core/normal/menu.c
 +++ b/grub-core/normal/menu.c
 @@ -827,12 +827,18 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
@@ -339,7 +339,7 @@ index 3611ee9ea..ebf5a0f10 100644
        if (auto_boot)
  	grub_menu_execute_with_fallback (menu, e, autobooted,
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index cb1cc200e..479a8bf4e 100644
+index cb1cc200e4..479a8bf4e5 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -21,6 +21,7 @@ prefix="@prefix@"
@@ -386,7 +386,7 @@ index cb1cc200e..479a8bf4e 100644
  EOF
    fi
 diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in
-index bd4f1a212..3a0e6d103 100755
+index bd4f1a2123..3a0e6d1035 100755
 --- a/util/grub.d/10_linux_zfs.in
 +++ b/util/grub.d/10_linux_zfs.in
 @@ -20,6 +20,7 @@ set -e
diff --git a/debian/patches/mkconfig-loopback.patch b/debian/patches/mkconfig-loopback.patch
index 5833697..ce4465d 100644
--- a/debian/patches/mkconfig-loopback.patch
+++ b/debian/patches/mkconfig-loopback.patch
@@ -21,7 +21,7 @@ Patch-Name: mkconfig-loopback.patch
  3 files changed, 34 insertions(+)
 
 diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
-index b6606c16e..b05df554d 100644
+index b6606c16e0..b05df554da 100644
 --- a/util/grub-mkconfig_lib.in
 +++ b/util/grub-mkconfig_lib.in
 @@ -133,6 +133,22 @@ prepare_grub_to_access_device ()
@@ -63,7 +63,7 @@ index b6606c16e..b05df554d 100644
  
  grub_get_device_id ()
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index f839b3b55..d927b60ae 100644
+index f839b3b55f..d927b60ae2 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -40,6 +40,11 @@ fi
@@ -79,7 +79,7 @@ index f839b3b55..d927b60ae 100644
  esac
  
 diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
-index 96179ea61..9a8d42fb5 100644
+index 96179ea613..9a8d42fb57 100644
 --- a/util/grub.d/20_linux_xen.in
 +++ b/util/grub.d/20_linux_xen.in
 @@ -40,6 +40,11 @@ fi
diff --git a/debian/patches/mkconfig-mid-upgrade.patch b/debian/patches/mkconfig-mid-upgrade.patch
index ebb7e9b..c033bba 100644
--- a/debian/patches/mkconfig-mid-upgrade.patch
+++ b/debian/patches/mkconfig-mid-upgrade.patch
@@ -20,7 +20,7 @@ Patch-Name: mkconfig-mid-upgrade.patch
  1 file changed, 7 insertions(+)
 
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 45cd4cc54..b506d63bf 100644
+index 45cd4cc541..b506d63bf9 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
 @@ -102,6 +102,13 @@ do
diff --git a/debian/patches/mkconfig-nonexistent-loopback.patch b/debian/patches/mkconfig-nonexistent-loopback.patch
index babde9b..9ff8309 100644
--- a/debian/patches/mkconfig-nonexistent-loopback.patch
+++ b/debian/patches/mkconfig-nonexistent-loopback.patch
@@ -14,7 +14,7 @@ Patch-Name: mkconfig-nonexistent-loopback.patch
  2 files changed, 6 insertions(+), 5 deletions(-)
 
 diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
-index b05df554d..fe6319abe 100644
+index b05df554da..fe6319abe0 100644
 --- a/util/grub-mkconfig_lib.in
 +++ b/util/grub-mkconfig_lib.in
 @@ -143,7 +143,7 @@ prepare_grub_to_access_device ()
@@ -27,7 +27,7 @@ index b05df554d..fe6319abe 100644
        esac
      ;;
 diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
-index 775ceb2e0..b7e1147c4 100644
+index 775ceb2e04..b7e1147c41 100644
 --- a/util/grub.d/30_os-prober.in
 +++ b/util/grub.d/30_os-prober.in
 @@ -219,6 +219,11 @@ EOF
diff --git a/debian/patches/mkconfig-other-inits.patch b/debian/patches/mkconfig-other-inits.patch
index f96bc18..4b504fb 100644
--- a/debian/patches/mkconfig-other-inits.patch
+++ b/debian/patches/mkconfig-other-inits.patch
@@ -18,7 +18,7 @@ Patch-Name: mkconfig-other-inits.patch
  2 files changed, 21 insertions(+)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 85b30084a..dff84edea 100644
+index 85b30084ad..dff84edea5 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -32,6 +32,7 @@ export TEXTDOMAIN=@PACKAGE@
@@ -53,7 +53,7 @@ index 85b30084a..dff84edea 100644
      linux_entry "${OS}" "${version}" recovery \
                  "${GRUB_CMDLINE_LINUX_RECOVERY} ${GRUB_CMDLINE_LINUX}"
 diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
-index f2ee0532b..81e5f0d7e 100644
+index f2ee0532bd..81e5f0d7e4 100644
 --- a/util/grub.d/20_linux_xen.in
 +++ b/util/grub.d/20_linux_xen.in
 @@ -27,6 +27,7 @@ export TEXTDOMAIN=@PACKAGE@
diff --git a/debian/patches/mkconfig-recovery-title.patch b/debian/patches/mkconfig-recovery-title.patch
index 7924342..c398318 100644
--- a/debian/patches/mkconfig-recovery-title.patch
+++ b/debian/patches/mkconfig-recovery-title.patch
@@ -22,7 +22,7 @@ Patch-Name: mkconfig-recovery-title.patch
  8 files changed, 21 insertions(+), 11 deletions(-)
 
 diff --git a/docs/grub.texi b/docs/grub.texi
-index a835d0ae4..3ec35d315 100644
+index a835d0ae42..3ec35d315a 100644
 --- a/docs/grub.texi
 +++ b/docs/grub.texi
 @@ -1536,6 +1536,11 @@ a console is restricted or limited.
@@ -38,7 +38,7 @@ index a835d0ae4..3ec35d315 100644
  
  The following options are still accepted for compatibility with existing
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 307214310..9c1da6477 100644
+index 3072143105..9c1da64771 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
 @@ -196,6 +196,10 @@ GRUB_ACTUAL_DEFAULT="$GRUB_DEFAULT"
@@ -63,7 +63,7 @@ index 307214310..9c1da6477 100644
  if test "x${grub_cfg}" != "x"; then
    rm -f "${grub_cfg}.new"
 diff --git a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in
-index 59a9a48a2..7fa3a3fbd 100644
+index 59a9a48a2f..7fa3a3fbd8 100644
 --- a/util/grub.d/10_hurd.in
 +++ b/util/grub.d/10_hurd.in
 @@ -88,8 +88,8 @@ hurd_entry () {
@@ -78,7 +78,7 @@ index 59a9a48a2..7fa3a3fbd 100644
  	  title="$(gettext_printf "%s, with Hurd %s" "${OS}" "${kernel_base}")"
  	  oldtitle="$OS using $kernel_base"
 diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
-index 9d8e8fd85..8301d361a 100644
+index 9d8e8fd852..8301d361a1 100644
 --- a/util/grub.d/10_kfreebsd.in
 +++ b/util/grub.d/10_kfreebsd.in
 @@ -76,7 +76,7 @@ kfreebsd_entry ()
@@ -91,7 +91,7 @@ index 9d8e8fd85..8301d361a 100644
  	  title="$(gettext_printf "%s, with kFreeBSD %s" "${os}" "${version}")"
        fi
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index cc2dd855a..2c418c5ec 100644
+index cc2dd855ab..2c418c5ec8 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -130,7 +130,7 @@ linux_entry ()
@@ -104,7 +104,7 @@ index cc2dd855a..2c418c5ec 100644
  	      title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;;
        esac
 diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in
-index 48a4e6897..4477fa606 100755
+index 48a4e68976..4477fa6061 100755
 --- a/util/grub.d/10_linux_zfs.in
 +++ b/util/grub.d/10_linux_zfs.in
 @@ -957,7 +957,7 @@ generate_grub_menu() {
@@ -138,7 +138,7 @@ index 48a4e6897..4477fa606 100755
                          fi
  
 diff --git a/util/grub.d/10_netbsd.in b/util/grub.d/10_netbsd.in
-index 874f59969..bb29cc046 100644
+index 874f59969e..bb29cc0468 100644
 --- a/util/grub.d/10_netbsd.in
 +++ b/util/grub.d/10_netbsd.in
 @@ -102,7 +102,7 @@ netbsd_entry ()
@@ -151,7 +151,7 @@ index 874f59969..bb29cc046 100644
  	  title="$(gettext_printf "%s, with kernel %s (via %s)" "${OS}" "$(echo ${kernel} | sed -e 's,^.*/,,')" "${loader}")"
        fi
 diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
-index 9a8d42fb5..f2ee0532b 100644
+index 9a8d42fb57..f2ee0532bd 100644
 --- a/util/grub.d/20_linux_xen.in
 +++ b/util/grub.d/20_linux_xen.in
 @@ -105,7 +105,7 @@ linux_entry ()
diff --git a/debian/patches/mkconfig-signed-kernel.patch b/debian/patches/mkconfig-signed-kernel.patch
index 8f118a4..79ae0da 100644
--- a/debian/patches/mkconfig-signed-kernel.patch
+++ b/debian/patches/mkconfig-signed-kernel.patch
@@ -13,7 +13,7 @@ Patch-Name: mkconfig-signed-kernel.patch
  2 files changed, 36 insertions(+)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 19e4df4ad..cb1cc200e 100644
+index 19e4df4ad8..cb1cc200e4 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -165,8 +165,16 @@ linux_entry ()
@@ -48,7 +48,7 @@ index 19e4df4ad..cb1cc200e 100644
    basename=`basename $linux`
    dirname=`dirname $linux`
 diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in
-index 7f88e771e..bd4f1a212 100755
+index 7f88e771e0..bd4f1a2123 100755
 --- a/util/grub.d/10_linux_zfs.in
 +++ b/util/grub.d/10_linux_zfs.in
 @@ -339,6 +339,16 @@ try_default_layout_bpool() {
diff --git a/debian/patches/mkconfig-ubuntu-distributor.patch b/debian/patches/mkconfig-ubuntu-distributor.patch
index 3b21188..d1e2f67 100644
--- a/debian/patches/mkconfig-ubuntu-distributor.patch
+++ b/debian/patches/mkconfig-ubuntu-distributor.patch
@@ -17,7 +17,7 @@ Patch-Name: mkconfig-ubuntu-distributor.patch
  2 files changed, 16 insertions(+), 2 deletions(-)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index fcd303387..19e4df4ad 100644
+index fcd3033872..19e4df4ad8 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -32,7 +32,14 @@ CLASS="--class gnu-linux --class gnu --class os"
@@ -37,7 +37,7 @@ index fcd303387..19e4df4ad 100644
  fi
  
 diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in
-index de4d21590..7f88e771e 100755
+index de4d215900..7f88e771e0 100755
 --- a/util/grub.d/10_linux_zfs.in
 +++ b/util/grub.d/10_linux_zfs.in
 @@ -790,7 +790,14 @@ generate_grub_menu() {
diff --git a/debian/patches/mkconfig-ubuntu-recovery.patch b/debian/patches/mkconfig-ubuntu-recovery.patch
index 45a0563..097df91 100644
--- a/debian/patches/mkconfig-ubuntu-recovery.patch
+++ b/debian/patches/mkconfig-ubuntu-recovery.patch
@@ -24,7 +24,7 @@ Patch-Name: mkconfig-ubuntu-recovery.patch
  4 files changed, 39 insertions(+), 5 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 7656f2434..1e5abc67d 100644
+index 7656f2434e..1e5abc67d9 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1846,6 +1846,17 @@ fi
@@ -46,7 +46,7 @@ index 7656f2434..1e5abc67d 100644
  
  AC_SUBST([FONT_SOURCE])
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index d927b60ae..fcd303387 100644
+index d927b60ae2..fcd3033872 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -20,6 +20,7 @@ set -e
@@ -94,7 +94,7 @@ index d927b60ae..fcd303387 100644
  
    list=`echo $list | tr ' ' '\n' | fgrep -vx "$linux" | tr '\n' ' '`
 diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in
-index b24587f0a..de4d21590 100755
+index b24587f0a5..de4d215900 100755
 --- a/util/grub.d/10_linux_zfs.in
 +++ b/util/grub.d/10_linux_zfs.in
 @@ -19,6 +19,7 @@ set -e
@@ -141,7 +141,7 @@ index b24587f0a..de4d21590 100755
      # IFS is set to TAB (ASCII 0x09)
      echo "${menu_metadata}" |
 diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
-index 515a68c7a..775ceb2e0 100644
+index 515a68c7aa..775ceb2e04 100644
 --- a/util/grub.d/30_os-prober.in
 +++ b/util/grub.d/30_os-prober.in
 @@ -220,7 +220,7 @@ EOF
diff --git a/debian/patches/mkrescue-efi-modules.patch b/debian/patches/mkrescue-efi-modules.patch
index 624c96f..54d15e4 100644
--- a/debian/patches/mkrescue-efi-modules.patch
+++ b/debian/patches/mkrescue-efi-modules.patch
@@ -14,7 +14,7 @@ Patch-Name: mkrescue-efi-modules.patch
  1 file changed, 2 insertions(+)
 
 diff --git a/util/grub-mkrescue.c b/util/grub-mkrescue.c
-index ce2cbc4f1..45d6140d3 100644
+index ce2cbc4f10..45d6140d3e 100644
 --- a/util/grub-mkrescue.c
 +++ b/util/grub-mkrescue.c
 @@ -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 20a0dd1..76e97c9 100644
--- a/debian/patches/net-read-bracketed-ipv6-addr.patch
+++ b/debian/patches/net-read-bracketed-ipv6-addr.patch
@@ -16,7 +16,7 @@ Patch-Name: net-read-bracketed-ipv6-addr.patch
  4 files changed, 110 insertions(+), 11 deletions(-)
 
 diff --git a/grub-core/net/http.c b/grub-core/net/http.c
-index 5aa4ad3be..f182d7b87 100644
+index 5aa4ad3bef..f182d7b871 100644
 --- a/grub-core/net/http.c
 +++ b/grub-core/net/http.c
 @@ -312,12 +312,14 @@ http_establish (struct grub_file *file, grub_off_t offset, int initial)
@@ -74,7 +74,7 @@ index 5aa4ad3be..f182d7b87 100644
  				  file);
    if (!data->sock)
 diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index d5d726a31..b917a75d5 100644
+index d5d726a315..b917a75d54 100644
 --- a/grub-core/net/net.c
 +++ b/grub-core/net/net.c
 @@ -437,6 +437,12 @@ parse_ip6 (const char *val, grub_uint64_t *ip, const char **rest)
@@ -211,7 +211,7 @@ index d5d726a31..b917a75d5 100644
  	  }
        }
 diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
-index 7d90bf66e..a0817a075 100644
+index 7d90bf66e7..a0817a075d 100644
 --- a/grub-core/net/tftp.c
 +++ b/grub-core/net/tftp.c
 @@ -314,6 +314,7 @@ tftp_open (struct grub_file *file, const char *filename)
@@ -241,7 +241,7 @@ index 7d90bf66e..a0817a075 100644
    if (!data->sock)
      {
 diff --git a/include/grub/net.h b/include/grub/net.h
-index 4a9069a14..cc114286e 100644
+index 4a9069a147..cc114286ea 100644
 --- a/include/grub/net.h
 +++ b/include/grub/net.h
 @@ -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 b75f1eb..c56d2e3 100644
--- a/debian/patches/no-devicetree-if-secure-boot.patch
+++ b/debian/patches/no-devicetree-if-secure-boot.patch
@@ -17,7 +17,7 @@ Patch-Name: no-devicetree-if-secure-boot.patch
  2 files changed, 20 insertions(+)
 
 diff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c
-index 51684914c..092e8e307 100644
+index 51684914cf..092e8e3077 100644
 --- a/grub-core/loader/arm/linux.c
 +++ b/grub-core/loader/arm/linux.c
 @@ -30,6 +30,10 @@
@@ -47,7 +47,7 @@ index 51684914c..092e8e307 100644
    if (!dtb)
      return grub_errno;
 diff --git a/grub-core/loader/efi/fdt.c b/grub-core/loader/efi/fdt.c
-index ee9c5592c..f0c2d91be 100644
+index ee9c5592c7..f0c2d91be2 100644
 --- a/grub-core/loader/efi/fdt.c
 +++ b/grub-core/loader/efi/fdt.c
 @@ -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 b2800ef..5ed0187 100644
--- a/debian/patches/no-insmod-on-sb.patch
+++ b/debian/patches/no-insmod-on-sb.patch
@@ -16,7 +16,7 @@ Patch-Name: no-insmod-on-sb.patch
  3 files changed, 42 insertions(+)
 
 diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
-index 48eb5e7b6..074dfc3c6 100644
+index 48eb5e7b62..074dfc3c6f 100644
 --- a/grub-core/kern/dl.c
 +++ b/grub-core/kern/dl.c
 @@ -38,6 +38,10 @@
@@ -47,7 +47,7 @@ index 48eb5e7b6..074dfc3c6 100644
  
    file = grub_file_open (filename, GRUB_FILE_TYPE_GRUB_MODULE);
 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index 6e1ceb905..96204e39b 100644
+index 6e1ceb9051..96204e39b9 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
 @@ -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
  
  /* Search the mods section from the PE32/PE32+ image. This code uses
 diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
-index e90e00dc4..a237952b3 100644
+index e90e00dc43..a237952b37 100644
 --- a/include/grub/efi/efi.h
 +++ b/include/grub/efi/efi.h
 @@ -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
  1 file changed, 11 insertions(+)
 
 diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
-index d483e35ee..8b089b48d 100644
+index d483e35eed..8b089b48d0 100644
 --- a/grub-core/kern/ieee1275/init.c
 +++ b/grub-core/kern/ieee1275/init.c
 @@ -76,6 +76,7 @@ grub_exit (void)
diff --git a/debian/patches/ppc64el-disable-vsx.patch b/debian/patches/ppc64el-disable-vsx.patch
index e2aa833..3aef631 100644
--- a/debian/patches/ppc64el-disable-vsx.patch
+++ b/debian/patches/ppc64el-disable-vsx.patch
@@ -21,7 +21,7 @@ Patch-Name: ppc64el-disable-vsx.patch
  1 file changed, 12 insertions(+)
 
 diff --git a/grub-core/kern/powerpc/ieee1275/startup.S b/grub-core/kern/powerpc/ieee1275/startup.S
-index 21c884b43..de9a9601a 100644
+index 21c884b433..de9a9601a9 100644
 --- a/grub-core/kern/powerpc/ieee1275/startup.S
 +++ b/grub-core/kern/powerpc/ieee1275/startup.S
 @@ -20,6 +20,8 @@
diff --git a/debian/patches/probe-fusionio.patch b/debian/patches/probe-fusionio.patch
index b7932cc..ad7ef51 100644
--- a/debian/patches/probe-fusionio.patch
+++ b/debian/patches/probe-fusionio.patch
@@ -14,7 +14,7 @@ Patch-Name: probe-fusionio.patch
  2 files changed, 32 insertions(+)
 
 diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
-index 90d92d3ad..7adc0f30e 100644
+index 90d92d3ad5..7adc0f30ee 100644
 --- a/grub-core/osdep/linux/getroot.c
 +++ b/grub-core/osdep/linux/getroot.c
 @@ -950,6 +950,19 @@ grub_util_part_to_disk (const char *os_dev, struct stat *st,
@@ -38,7 +38,7 @@ index 90d92d3ad..7adc0f30e 100644
  
    return path;
 diff --git a/util/deviceiter.c b/util/deviceiter.c
-index a4971ef42..dddc50da7 100644
+index a4971ef429..dddc50da7a 100644
 --- a/util/deviceiter.c
 +++ b/util/deviceiter.c
 @@ -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 d091af7..e313019 100644
--- a/debian/patches/quick-boot-lvm.patch
+++ b/debian/patches/quick-boot-lvm.patch
@@ -26,7 +26,7 @@ Patch-Name: quick-boot-lvm.patch
  1 file changed, 15 insertions(+), 3 deletions(-)
 
 diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index 674a76140..b7135b655 100644
+index 674a761402..b7135b655f 100644
 --- a/util/grub.d/00_header.in
 +++ b/util/grub.d/00_header.in
 @@ -115,7 +115,7 @@ EOF
diff --git a/debian/patches/quick-boot.patch b/debian/patches/quick-boot.patch
index c9c0a98..ad4650d 100644
--- a/debian/patches/quick-boot.patch
+++ b/debian/patches/quick-boot.patch
@@ -34,7 +34,7 @@ Patch-Name: quick-boot.patch
  8 files changed, 146 insertions(+), 13 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index ea00ccd69..7dda5bb32 100644
+index ea00ccd691..7dda5bb32b 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1868,6 +1868,17 @@ else
@@ -56,7 +56,7 @@ index ea00ccd69..7dda5bb32 100644
  
  AC_SUBST([FONT_SOURCE])
 diff --git a/docs/grub.texi b/docs/grub.texi
-index 87795075a..a835d0ae4 100644
+index 87795075a8..a835d0ae42 100644
 --- a/docs/grub.texi
 +++ b/docs/grub.texi
 @@ -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
  
  The following options are still accepted for compatibility with existing
 diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
-index ebf5a0f10..42c82290d 100644
+index ebf5a0f109..42c82290de 100644
 --- a/grub-core/normal/menu.c
 +++ b/grub-core/normal/menu.c
 @@ -604,6 +604,30 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
@@ -116,7 +116,7 @@ index ebf5a0f10..42c82290d 100644
  	{
  	  pos = grub_term_save_pos ();
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index d18bf972f..307214310 100644
+index d18bf972f7..3072143105 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
 @@ -250,7 +250,8 @@ export GRUB_DEFAULT \
@@ -130,7 +130,7 @@ index d18bf972f..307214310 100644
  if test "x${grub_cfg}" != "x"; then
    rm -f "${grub_cfg}.new"
 diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index 93a90233e..674a76140 100644
+index 93a90233ea..674a761402 100644
 --- a/util/grub.d/00_header.in
 +++ b/util/grub.d/00_header.in
 @@ -21,6 +21,8 @@ prefix="@prefix@"
@@ -259,7 +259,7 @@ index 93a90233e..674a76140 100644
  EOF
  }
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 479a8bf4e..2be66c702 100644
+index 479a8bf4e5..2be66c7028 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -22,6 +22,7 @@ exec_prefix="@exec_prefix@"
@@ -281,7 +281,7 @@ index 479a8bf4e..2be66c702 100644
        save_default_entry | grub_add_tab
    fi
 diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in
-index 3a0e6d103..ec4b49d9d 100755
+index 3a0e6d1035..ec4b49d9d7 100755
 --- a/util/grub.d/10_linux_zfs.in
 +++ b/util/grub.d/10_linux_zfs.in
 @@ -21,6 +21,7 @@ prefix="@prefix@"
@@ -304,7 +304,7 @@ index 3a0e6d103..ec4b49d9d 100755
          GRUB_SAVEDEFAULT=${GRUB_SAVEDEFAULT:-}
          default_entry="$(save_default_entry)"
 diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
-index 271044f59..da5f28876 100644
+index 271044f592..da5f28876d 100644
 --- a/util/grub.d/30_os-prober.in
 +++ b/util/grub.d/30_os-prober.in
 @@ -20,12 +20,26 @@ set -e
diff --git a/debian/patches/restore-mkdevicemap.patch b/debian/patches/restore-mkdevicemap.patch
index 3fbce62..7236a7b 100644
--- a/debian/patches/restore-mkdevicemap.patch
+++ b/debian/patches/restore-mkdevicemap.patch
@@ -28,7 +28,7 @@ Patch-Name: restore-mkdevicemap.patch
  create mode 100644 util/grub-mkdevicemap.c
 
 diff --git a/Makefile.util.def b/Makefile.util.def
-index bac85e284..eec1924b0 100644
+index bac85e2840..eec1924b0e 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
 @@ -324,6 +324,23 @@ program = {
@@ -57,7 +57,7 @@ index bac85e284..eec1924b0 100644
    installdir = sbin;
 diff --git a/docs/man/grub-mkdevicemap.h2m b/docs/man/grub-mkdevicemap.h2m
 new file mode 100644
-index 000000000..96cd6ee72
+index 0000000000..96cd6ee723
 --- /dev/null
 +++ b/docs/man/grub-mkdevicemap.h2m
 @@ -0,0 +1,4 @@
@@ -67,7 +67,7 @@ index 000000000..96cd6ee72
 +.BR grub-probe (8)
 diff --git a/include/grub/util/deviceiter.h b/include/grub/util/deviceiter.h
 new file mode 100644
-index 000000000..85374978c
+index 0000000000..85374978c5
 --- /dev/null
 +++ b/include/grub/util/deviceiter.h
 @@ -0,0 +1,14 @@
@@ -87,7 +87,7 @@ index 000000000..85374978c
 +#endif /* ! GRUB_DEVICEITER_MACHINE_UTIL_HEADER */
 diff --git a/util/deviceiter.c b/util/deviceiter.c
 new file mode 100644
-index 000000000..a4971ef42
+index 0000000000..a4971ef429
 --- /dev/null
 +++ b/util/deviceiter.c
 @@ -0,0 +1,1021 @@
@@ -1114,7 +1114,7 @@ index 000000000..a4971ef42
 +}
 diff --git a/util/devicemap.c b/util/devicemap.c
 new file mode 100644
-index 000000000..c61864420
+index 0000000000..c61864420a
 --- /dev/null
 +++ b/util/devicemap.c
 @@ -0,0 +1,13 @@
@@ -1133,7 +1133,7 @@ index 000000000..c61864420
 +}
 diff --git a/util/grub-mkdevicemap.c b/util/grub-mkdevicemap.c
 new file mode 100644
-index 000000000..c4bbdbf69
+index 0000000000..c4bbdbf69c
 --- /dev/null
 +++ b/util/grub-mkdevicemap.c
 @@ -0,0 +1,181 @@
diff --git a/debian/patches/rhboot-f34-dont-use-int-for-efi-status.patch b/debian/patches/rhboot-f34-dont-use-int-for-efi-status.patch
new file mode 100644
index 0000000..ade1154
--- /dev/null
+++ b/debian/patches/rhboot-f34-dont-use-int-for-efi-status.patch
@@ -0,0 +1,24 @@
+From 3a80091a585e71363cd4f62f93fd48e5631362d2 Mon Sep 17 00:00:00 2001
+From: Peter Jones <[e-mail]>
+Date: Mon, 26 Jun 2017 12:44:59 -0400
+Subject: don't use int for efi status
+
+(cherry picked from commit eee6d2db7e3a392b8fe134fa75a7e28c9ae8cda5)
+Patch-Name: rhboot-f34-dont-use-int-for-efi-status.patch
+---
+ grub-core/kern/efi/efi.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
+index d4a4be57cb..7cf003f713 100644
+--- a/grub-core/kern/efi/efi.c
++++ b/grub-core/kern/efi/efi.c
+@@ -167,7 +167,7 @@ grub_reboot (void)
+ void
+ grub_exit (int retval)
+ {
+-  int rc = GRUB_EFI_LOAD_ERROR;
++  grub_efi_status_t rc = GRUB_EFI_LOAD_ERROR;
+ 
+   if (retval == 0)
+     rc = GRUB_EFI_SUCCESS;
diff --git a/debian/patches/rhboot-f34-make-exit-take-a-return-code.patch b/debian/patches/rhboot-f34-make-exit-take-a-return-code.patch
new file mode 100644
index 0000000..81feddf
--- /dev/null
+++ b/debian/patches/rhboot-f34-make-exit-take-a-return-code.patch
@@ -0,0 +1,269 @@
+From f58cd1f3cf1cf8bf3ee5f57ae035a14888840448 Mon Sep 17 00:00:00 2001
+From: Peter Jones <[e-mail]>
+Date: Wed, 26 Feb 2014 21:49:12 -0500
+Subject: Make "exit" take a return code.
+
+This adds "exit" with a return code.  With this patch, any "exit"
+command /may/ include a return code, and on platforms that support
+returning with an exit status, we will do so.  By default we return the
+same exit status we did before this patch.
+
+Signed-off-by: Peter Jones <[e-mail]>
+(cherry picked from commit ccce3d69ae3eacc7bdc70217304586bd7e74fe1e)
+Patch-Name: rhboot-f34-make-exit-take-a-return-code.patch
+---
+ grub-core/commands/minicmd.c         | 20 ++++++++++++++++----
+ grub-core/kern/efi/efi.c             |  9 +++++++--
+ grub-core/kern/emu/main.c            |  2 +-
+ grub-core/kern/emu/misc.c            |  5 +++--
+ grub-core/kern/i386/coreboot/init.c  |  2 +-
+ grub-core/kern/i386/qemu/init.c      |  2 +-
+ grub-core/kern/ieee1275/init.c       |  2 +-
+ grub-core/kern/mips/arc/init.c       |  2 +-
+ grub-core/kern/mips/loongson/init.c  |  2 +-
+ grub-core/kern/mips/qemu_mips/init.c |  2 +-
+ grub-core/kern/misc.c                | 11 ++++++++++-
+ grub-core/kern/uboot/init.c          |  6 +++---
+ grub-core/kern/xen/init.c            |  2 +-
+ include/grub/misc.h                  |  2 +-
+ 14 files changed, 48 insertions(+), 21 deletions(-)
+
+diff --git a/grub-core/commands/minicmd.c b/grub-core/commands/minicmd.c
+index 6bbce3128c..6d66b7c453 100644
+--- a/grub-core/commands/minicmd.c
++++ b/grub-core/commands/minicmd.c
+@@ -179,12 +179,24 @@ grub_mini_cmd_lsmod (struct grub_command *cmd __attribute__ ((unused)),
+ }
+ 
+ /* exit */
+-static grub_err_t __attribute__ ((noreturn))
++static grub_err_t
+ grub_mini_cmd_exit (struct grub_command *cmd __attribute__ ((unused)),
+-		    int argc __attribute__ ((unused)),
+-		    char *argv[] __attribute__ ((unused)))
++		    int argc, char *argv[])
+ {
+-  grub_exit ();
++  int retval = -1;
++  unsigned long n;
++
++  if (argc < 0 || argc > 1)
++    return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("one argument expected"));
++
++  if (argc == 1)
++    {
++      n = grub_strtoul (argv[0], 0, 10);
++      if (n != ~0UL)
++	retval = n;
++    }
++
++  grub_exit (retval);
+   /* Not reached.  */
+ }
+ 
+diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
+index 88bbd34eac..d4a4be57cb 100644
+--- a/grub-core/kern/efi/efi.c
++++ b/grub-core/kern/efi/efi.c
+@@ -165,11 +165,16 @@ grub_reboot (void)
+ }
+ 
+ void
+-grub_exit (void)
++grub_exit (int retval)
+ {
++  int rc = GRUB_EFI_LOAD_ERROR;
++
++  if (retval == 0)
++    rc = GRUB_EFI_SUCCESS;
++
+   grub_machine_fini (GRUB_LOADER_FLAG_NORETURN);
+   efi_call_4 (grub_efi_system_table->boot_services->exit,
+-              grub_efi_image_handle, GRUB_EFI_SUCCESS, 0, 0);
++              grub_efi_image_handle, rc, 0, 0);
+   for (;;) ;
+ }
+ 
+diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
+index 425bb96034..55ea5a11cc 100644
+--- a/grub-core/kern/emu/main.c
++++ b/grub-core/kern/emu/main.c
+@@ -67,7 +67,7 @@ grub_reboot (void)
+ }
+ 
+ void
+-grub_exit (void)
++grub_exit (int retval __attribute__((unused)))
+ {
+   grub_reboot ();
+ }
+diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
+index dfd8a8ec48..0ff13bcaf8 100644
+--- a/grub-core/kern/emu/misc.c
++++ b/grub-core/kern/emu/misc.c
+@@ -151,9 +151,10 @@ xasprintf (const char *fmt, ...)
+ 
+ #if !defined (GRUB_MACHINE_EMU) || defined (GRUB_UTIL)
+ void
+-grub_exit (void)
++__attribute__ ((noreturn))
++grub_exit (int rc)
+ {
+-  exit (1);
++  exit (rc < 0 ? 1 : rc);
+ }
+ #endif
+ 
+diff --git a/grub-core/kern/i386/coreboot/init.c b/grub-core/kern/i386/coreboot/init.c
+index 3314f027fe..36f9134b7b 100644
+--- a/grub-core/kern/i386/coreboot/init.c
++++ b/grub-core/kern/i386/coreboot/init.c
+@@ -41,7 +41,7 @@ extern grub_uint8_t _end[];
+ extern grub_uint8_t _edata[];
+ 
+ void  __attribute__ ((noreturn))
+-grub_exit (void)
++grub_exit (int rc __attribute__((unused)))
+ {
+   /* We can't use grub_fatal() in this function.  This would create an infinite
+      loop, since grub_fatal() calls grub_abort() which in turn calls grub_exit().  */
+diff --git a/grub-core/kern/i386/qemu/init.c b/grub-core/kern/i386/qemu/init.c
+index 271b6fbfab..9fafe98f01 100644
+--- a/grub-core/kern/i386/qemu/init.c
++++ b/grub-core/kern/i386/qemu/init.c
+@@ -42,7 +42,7 @@ extern grub_uint8_t _end[];
+ extern grub_uint8_t _edata[];
+ 
+ void  __attribute__ ((noreturn))
+-grub_exit (void)
++grub_exit (int rc __attribute__((unused)))
+ {
+   /* We can't use grub_fatal() in this function.  This would create an infinite
+      loop, since grub_fatal() calls grub_abort() which in turn calls grub_exit().  */
+diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
+index 8b089b48d0..085a6a33f8 100644
+--- a/grub-core/kern/ieee1275/init.c
++++ b/grub-core/kern/ieee1275/init.c
+@@ -71,7 +71,7 @@ grub_addr_t grub_ieee1275_original_stack;
+ #endif
+ 
+ void
+-grub_exit (void)
++grub_exit (int rc __attribute__((unused)))
+ {
+   grub_ieee1275_exit ();
+ }
+diff --git a/grub-core/kern/mips/arc/init.c b/grub-core/kern/mips/arc/init.c
+index 3834a14909..86b3a25ec4 100644
+--- a/grub-core/kern/mips/arc/init.c
++++ b/grub-core/kern/mips/arc/init.c
+@@ -276,7 +276,7 @@ grub_halt (void)
+ }
+ 
+ void
+-grub_exit (void)
++grub_exit (int rc __attribute__((unused)))
+ {
+   GRUB_ARC_FIRMWARE_VECTOR->exit ();
+ 
+diff --git a/grub-core/kern/mips/loongson/init.c b/grub-core/kern/mips/loongson/init.c
+index 7b96531b98..dff598ca7b 100644
+--- a/grub-core/kern/mips/loongson/init.c
++++ b/grub-core/kern/mips/loongson/init.c
+@@ -304,7 +304,7 @@ grub_halt (void)
+ }
+ 
+ void
+-grub_exit (void)
++grub_exit (int rc __attribute__((unused)))
+ {
+   grub_halt ();
+ }
+diff --git a/grub-core/kern/mips/qemu_mips/init.c b/grub-core/kern/mips/qemu_mips/init.c
+index be88b77d22..8b6c55ffc0 100644
+--- a/grub-core/kern/mips/qemu_mips/init.c
++++ b/grub-core/kern/mips/qemu_mips/init.c
+@@ -75,7 +75,7 @@ grub_machine_fini (int flags __attribute__ ((unused)))
+ }
+ 
+ void
+-grub_exit (void)
++grub_exit (int rc __attribute__((unused)))
+ {
+   grub_halt ();
+ }
+diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
+index 83c068d61b..e742f56d20 100644
+--- a/grub-core/kern/misc.c
++++ b/grub-core/kern/misc.c
+@@ -1098,9 +1098,18 @@ grub_abort (void)
+       grub_getkey ();
+     }
+ 
+-  grub_exit ();
++  grub_exit (1);
+ }
+ 
++#if defined (__clang__) && !defined (GRUB_UTIL)
++/* clang emits references to abort().  */
++void __attribute__ ((noreturn))
++abort (void)
++{
++  grub_abort ();
++}
++#endif
++
+ void
+ grub_fatal (const char *fmt, ...)
+ {
+diff --git a/grub-core/kern/uboot/init.c b/grub-core/kern/uboot/init.c
+index 3e338645c5..be2a5be1d0 100644
+--- a/grub-core/kern/uboot/init.c
++++ b/grub-core/kern/uboot/init.c
+@@ -39,9 +39,9 @@ extern grub_size_t grub_total_module_size;
+ static unsigned long timer_start;
+ 
+ void
+-grub_exit (void)
++grub_exit (int rc)
+ {
+-  grub_uboot_return (0);
++  grub_uboot_return (rc < 0 ? 1 : rc);
+ }
+ 
+ static grub_uint64_t
+@@ -78,7 +78,7 @@ grub_machine_init (void)
+   if (!ver)
+     {
+       /* Don't even have a console to log errors to... */
+-      grub_exit ();
++      grub_exit (-1);
+     }
+   else if (ver > API_SIG_VERSION)
+     {
+diff --git a/grub-core/kern/xen/init.c b/grub-core/kern/xen/init.c
+index 782ca72952..708b060f32 100644
+--- a/grub-core/kern/xen/init.c
++++ b/grub-core/kern/xen/init.c
+@@ -584,7 +584,7 @@ grub_machine_init (void)
+ }
+ 
+ void
+-grub_exit (void)
++grub_exit (int rc __attribute__((unused)))
+ {
+   struct sched_shutdown arg;
+ 
+diff --git a/include/grub/misc.h b/include/grub/misc.h
+index ee48eb7a72..f9135b62e3 100644
+--- a/include/grub/misc.h
++++ b/include/grub/misc.h
+@@ -334,7 +334,7 @@ int EXPORT_FUNC(grub_vsnprintf) (char *str, grub_size_t n, const char *fmt,
+ char *EXPORT_FUNC(grub_xasprintf) (const char *fmt, ...)
+      __attribute__ ((format (GNU_PRINTF, 1, 2))) WARN_UNUSED_RESULT;
+ char *EXPORT_FUNC(grub_xvasprintf) (const char *fmt, va_list args) WARN_UNUSED_RESULT;
+-void EXPORT_FUNC(grub_exit) (void) __attribute__ ((noreturn));
++void EXPORT_FUNC(grub_exit) (int rc) __attribute__ ((noreturn));
+ grub_uint64_t EXPORT_FUNC(grub_divmod64) (grub_uint64_t n,
+ 					  grub_uint64_t d,
+ 					  grub_uint64_t *r);
diff --git a/debian/patches/rhboot-f34-make-pmtimer-tsc-calibration-fast.patch b/debian/patches/rhboot-f34-make-pmtimer-tsc-calibration-fast.patch
new file mode 100644
index 0000000..37eb216
--- /dev/null
+++ b/debian/patches/rhboot-f34-make-pmtimer-tsc-calibration-fast.patch
@@ -0,0 +1,214 @@
+From ecea6495041ee81331d245cf25ac53d66f07561c Mon Sep 17 00:00:00 2001
+From: Peter Jones <[e-mail]>
+Date: Tue, 7 Nov 2017 17:12:17 -0500
+Subject: Make pmtimer tsc calibration not take 51 seconds to fail.
+
+On my laptop running at 2.4GHz, if I run a VM where tsc calibration
+using pmtimer will fail presuming a broken pmtimer, it takes ~51 seconds
+to do so (as measured with the stopwatch on my phone), with a tsc delta
+of 0x1cd1c85300, or around 125 billion cycles.
+
+If instead of trying to wait for 5-200ms to show up on the pmtimer, we try
+to wait for 5-200us, it decides it's broken in ~0x2626aa0 TSCs, aka ~2.4
+million cycles, or more or less instantly.
+
+Additionally, this reading the pmtimer was returning 0xffffffff anyway,
+and that's obviously an invalid return.  I've added a check for that and
+0 so we don't bother waiting for the test if what we're seeing is dead
+pins with no response at all.
+
+If "debug" is includes "pmtimer", you will see one of the following
+three outcomes.  If pmtimer gives all 0 or all 1 bits, you will see:
+
+kern/i386/tsc_pmtimer.c:77: pmtimer: 0xffffff bad_reads: 1
+kern/i386/tsc_pmtimer.c:77: pmtimer: 0xffffff bad_reads: 2
+kern/i386/tsc_pmtimer.c:77: pmtimer: 0xffffff bad_reads: 3
+kern/i386/tsc_pmtimer.c:77: pmtimer: 0xffffff bad_reads: 4
+kern/i386/tsc_pmtimer.c:77: pmtimer: 0xffffff bad_reads: 5
+kern/i386/tsc_pmtimer.c:77: pmtimer: 0xffffff bad_reads: 6
+kern/i386/tsc_pmtimer.c:77: pmtimer: 0xffffff bad_reads: 7
+kern/i386/tsc_pmtimer.c:77: pmtimer: 0xffffff bad_reads: 8
+kern/i386/tsc_pmtimer.c:77: pmtimer: 0xffffff bad_reads: 9
+kern/i386/tsc_pmtimer.c:77: pmtimer: 0xffffff bad_reads: 10
+kern/i386/tsc_pmtimer.c:78: timer is broken; giving up.
+
+This outcome was tested using qemu+kvm with UEFI (OVMF) firmware and
+these options: -machine pc-q35-2.10 -cpu Broadwell-noTSX
+
+If pmtimer gives any other bit patterns but is not actually marching
+forward fast enough to use for clock calibration, you will see:
+
+kern/i386/tsc_pmtimer.c:121: pmtimer delta is 0x0 (1904 iterations)
+kern/i386/tsc_pmtimer.c:124: tsc delta is implausible: 0x2626aa0
+
+This outcome was tested using grub compiled with GRUB_PMTIMER_IGNORE_BAD_READS
+defined (so as not to trip the bad read test) using qemu+kvm with UEFI
+(OVMF) firmware, and these options: -machine pc-q35-2.10 -cpu Broadwell-noTSX
+
+If pmtimer actually works, you'll see something like:
+
+kern/i386/tsc_pmtimer.c:121: pmtimer delta is 0x0 (1904 iterations)
+kern/i386/tsc_pmtimer.c:124: tsc delta is implausible: 0x2626aa0
+
+This outcome was tested using qemu+kvm with UEFI (OVMF) firmware, and
+these options: -machine pc-i440fx-2.4 -cpu Broadwell-noTSX
+
+I've also tested this outcome on a real Intel Xeon E3-1275v3 on an Intel
+Server Board S1200V3RPS using the SDV.RP.B8 "Release" build here:
+https://firmware.intel.com/sites/default/files/UEFIDevKit_S1200RP_vB8.zip
+
+Signed-off-by: Peter Jones <[e-mail]>
+(cherry picked from commit cf0448d61e00acb548f8f22d57ba6e4f3b37f394)
+
+Patch-Name: rhboot-f34-make-pmtimer-tsc-calibration-fast.patch
+---
+ grub-core/kern/i386/tsc_pmtimer.c | 109 ++++++++++++++++++++++++------
+ 1 file changed, 89 insertions(+), 20 deletions(-)
+
+diff --git a/grub-core/kern/i386/tsc_pmtimer.c b/grub-core/kern/i386/tsc_pmtimer.c
+index c9c3616997..ca15c3aacd 100644
+--- a/grub-core/kern/i386/tsc_pmtimer.c
++++ b/grub-core/kern/i386/tsc_pmtimer.c
+@@ -28,40 +28,101 @@
+ #include <grub/acpi.h>
+ #include <grub/cpu/io.h>
+ 
++/*
++ * Define GRUB_PMTIMER_IGNORE_BAD_READS if you're trying to test a timer that's
++ * present but doesn't keep time well.
++ */
++// #define GRUB_PMTIMER_IGNORE_BAD_READS
++
+ grub_uint64_t
+ grub_pmtimer_wait_count_tsc (grub_port_t pmtimer,
+ 			     grub_uint16_t num_pm_ticks)
+ {
+   grub_uint32_t start;
+-  grub_uint32_t last;
+-  grub_uint32_t cur, end;
++  grub_uint64_t cur, end;
+   grub_uint64_t start_tsc;
+   grub_uint64_t end_tsc;
+-  int num_iter = 0;
++  unsigned int num_iter = 0;
++#ifndef GRUB_PMTIMER_IGNORE_BAD_READS
++  int bad_reads = 0;
++#endif
+ 
+-  start = grub_inl (pmtimer) & 0xffffff;
+-  last = start;
++  /*
++   * Some timers are 24-bit and some are 32-bit, but it doesn't make much
++   * difference to us.  Caring which one we have isn't really worth it since
++   * the low-order digits will give us enough data to calibrate TSC.  So just
++   * mask the top-order byte off.
++   */
++  cur = start = grub_inl (pmtimer) & 0xffffffUL;
+   end = start + num_pm_ticks;
+   start_tsc = grub_get_tsc ();
+   while (1)
+     {
+-      cur = grub_inl (pmtimer) & 0xffffff;
+-      if (cur < last)
+-	cur |= 0x1000000;
+-      num_iter++;
++      cur &= 0xffffffffff000000ULL;
++      cur |= grub_inl (pmtimer) & 0xffffffUL;
++
++      end_tsc = grub_get_tsc();
++
++#ifndef GRUB_PMTIMER_IGNORE_BAD_READS
++      /*
++       * If we get 10 reads in a row that are obviously dead pins, there's no
++       * reason to do this thousands of times.
++       */
++      if (cur == 0xffffffUL || cur == 0)
++	{
++	  bad_reads++;
++	  grub_dprintf ("pmtimer",
++			"pmtimer: 0x%"PRIxGRUB_UINT64_T" bad_reads: %d\n",
++			cur, bad_reads);
++	  grub_dprintf ("pmtimer", "timer is broken; giving up.\n");
++
++	  if (bad_reads == 10)
++	    return 0;
++	}
++#endif
++
++      if (cur < start)
++	cur += 0x1000000;
++
+       if (cur >= end)
+ 	{
+-	  end_tsc = grub_get_tsc ();
++	  grub_dprintf ("pmtimer", "pmtimer delta is 0x%"PRIxGRUB_UINT64_T"\n",
++			cur - start);
++	  grub_dprintf ("pmtimer", "tsc delta is 0x%"PRIxGRUB_UINT64_T"\n",
++			end_tsc - start_tsc);
+ 	  return end_tsc - start_tsc;
+ 	}
+-      /* Check for broken PM timer.
+-	 50000000 TSCs is between 5 ms (10GHz) and 200 ms (250 MHz)
+-	 if after this time we still don't have 1 ms on pmtimer, then
+-	 pmtimer is broken.
++
++      /*
++       * Check for broken PM timer.  1ms at 10GHz should be 1E+7 TSCs; at
++       * 250MHz it should be 2.5E6.  So if after 4E+7 TSCs on a 10GHz machine,
++       * we should have seen pmtimer show 4ms of change (i.e. cur =~
++       * start+14320); on a 250MHz machine that should be 16ms (start+57280).
++       * If after this a time we still don't have 1ms on pmtimer, then pmtimer
++       * is broken.
++       *
++       * Likewise, if our code is perfectly efficient and introduces no delays
++       * whatsoever, on a 10GHz system we should see a TSC delta of 3580 in
++       * ~3580 iterations.  On a 250MHz machine that should be ~900 iterations.
++       *
++       * With those factors in mind, there are two limits here.  There's a hard
++       * limit here at 8x our desired pm timer delta, picked as an arbitrarily
++       * large value that's still not a lot of time to humans, because if we
++       * get that far this is either an implausibly fast machine or the pmtimer
++       * is not running.  And there's another limit on 4x our 10GHz tsc delta
++       * without seeing cur converge on our target value.
+        */
+-      if ((num_iter & 0xffffff) == 0 && grub_get_tsc () - start_tsc > 5000000) {
+-	return 0;
+-      }
++      if ((++num_iter > (grub_uint32_t)num_pm_ticks << 3UL) ||
++	  end_tsc - start_tsc > 40000000)
++	{
++	  grub_dprintf ("pmtimer",
++			"pmtimer delta is 0x%"PRIxGRUB_UINT64_T" (%u iterations)\n",
++			cur - start, num_iter);
++	  grub_dprintf ("pmtimer",
++			"tsc delta is implausible: 0x%"PRIxGRUB_UINT64_T"\n",
++			end_tsc - start_tsc);
++	  return 0;
++	}
+     }
+ }
+ 
+@@ -74,12 +135,20 @@ grub_tsc_calibrate_from_pmtimer (void)
+ 
+   fadt = grub_acpi_find_fadt ();
+   if (!fadt)
+-    return 0;
++    {
++      grub_dprintf ("pmtimer", "No FADT found; not using pmtimer.\n");
++      return 0;
++    }
+   pmtimer = fadt->pmtimer;
+   if (!pmtimer)
+-    return 0;
++    {
++      grub_dprintf ("pmtimer", "FADT does not specify pmtimer; skipping.\n");
++      return 0;
++    }
+ 
+-  /* It's 3.579545 MHz clock. Wait 1 ms.  */
++  /*
++   * It's 3.579545 MHz clock. Wait 1 ms.
++   */
+   tsc_diff = grub_pmtimer_wait_count_tsc (pmtimer, 3580);
+   if (tsc_diff == 0)
+     return 0;
diff --git a/debian/patches/rhboot-f34-support-non-ethernet.patch b/debian/patches/rhboot-f34-support-non-ethernet.patch
new file mode 100644
index 0000000..377cba5
--- /dev/null
+++ b/debian/patches/rhboot-f34-support-non-ethernet.patch
@@ -0,0 +1,770 @@
+From f017d81d8d38a91e5b9bea1597c94d42935702f4 Mon Sep 17 00:00:00 2001
+From: Andrzej Kacprowski <[e-mail]>
+Date: Wed, 10 Jul 2019 15:22:29 +0200
+Subject: Add support for non-Ethernet network cards
+
+This patch replaces fixed 6-byte link layer address with
+up to 32-byte variable sized address.
+This allows supporting Infiniband and Omni-Path fabric
+which use 20-byte address, but other network card types
+can also take advantage of this change.
+The network card driver is responsible for replacing L2
+header provided by grub2 if needed.
+This approach is compatible with UEFI network stack which
+also allows up to 32-byte variable size link address.
+
+The BOOTP/DHCP packet format is limited to 16 byte client
+hardware address, if link address is more that 16-bytes
+then chaddr field in BOOTP it will be set to 0 as per rfc4390.
+
+Resolves: rhbz#1370642
+
+Signed-off-by: Andrzej Kacprowski <[e-mail]>
+[msalter: Fix max string calculation in grub_net_hwaddr_to_str]
+Signed-off-by: Mark Salter <[e-mail]>
+(cherry picked from commit 50f3f90fe7ef5a875ede559124280d226d40743b)
+
+Patch-Name: rhboot-f34-support-non-ethernet.patch
+---
+ grub-core/net/arp.c                    | 157 ++++++++++++++++---------
+ grub-core/net/bootp.c                  |  15 +--
+ grub-core/net/drivers/efi/efinet.c     |   8 +-
+ grub-core/net/drivers/emu/emunet.c     |   1 +
+ grub-core/net/drivers/i386/pc/pxe.c    |  13 +-
+ grub-core/net/drivers/ieee1275/ofnet.c |   2 +
+ grub-core/net/drivers/uboot/ubootnet.c |   1 +
+ grub-core/net/ethernet.c               |  88 +++++++-------
+ grub-core/net/icmp6.c                  |  15 ++-
+ grub-core/net/ip.c                     |   4 +-
+ grub-core/net/net.c                    |  50 ++++----
+ include/grub/net.h                     |  19 +--
+ 12 files changed, 220 insertions(+), 153 deletions(-)
+
+diff --git a/grub-core/net/arp.c b/grub-core/net/arp.c
+index 54306e3b16..67b409a8ac 100644
+--- a/grub-core/net/arp.c
++++ b/grub-core/net/arp.c
+@@ -31,22 +31,12 @@ enum
+     ARP_REPLY = 2
+   };
+ 
+-enum
+-  {
+-    /* IANA ARP constant to define hardware type as ethernet. */
+-    GRUB_NET_ARPHRD_ETHERNET = 1
+-  };
+-
+-struct arppkt {
++struct arphdr {
+   grub_uint16_t hrd;
+   grub_uint16_t pro;
+   grub_uint8_t hln;
+   grub_uint8_t pln;
+   grub_uint16_t op;
+-  grub_uint8_t sender_mac[6];
+-  grub_uint32_t sender_ip;
+-  grub_uint8_t recv_mac[6];
+-  grub_uint32_t recv_ip;
+ } GRUB_PACKED;
+ 
+ static int have_pending;
+@@ -57,12 +47,16 @@ grub_net_arp_send_request (struct grub_net_network_level_interface *inf,
+ 			   const grub_net_network_level_address_t *proto_addr)
+ {
+   struct grub_net_buff nb;
+-  struct arppkt *arp_packet;
++  struct arphdr *arp_header;
+   grub_net_link_level_address_t target_mac_addr;
+   grub_err_t err;
+   int i;
+   grub_uint8_t *nbd;
+   grub_uint8_t arp_data[128];
++  grub_uint8_t hln;
++  grub_uint8_t pln;
++  grub_uint8_t arp_packet_len;
++  grub_uint8_t *tmp_ptr;
+ 
+   if (proto_addr->type != GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4)
+     return grub_error (GRUB_ERR_BUG, "unsupported address family");
+@@ -73,23 +67,39 @@ grub_net_arp_send_request (struct grub_net_network_level_interface *inf,
+   grub_netbuff_clear (&nb);
+   grub_netbuff_reserve (&nb, 128);
+ 
+-  err = grub_netbuff_push (&nb, sizeof (*arp_packet));
++  hln = inf->card->default_address.len;
++  pln = sizeof (proto_addr->ipv4);
++  arp_packet_len = sizeof (*arp_header) + 2 * (hln + pln);
++
++  err = grub_netbuff_push (&nb, arp_packet_len);
+   if (err)
+     return err;
+ 
+-  arp_packet = (struct arppkt *) nb.data;
+-  arp_packet->hrd = grub_cpu_to_be16_compile_time (GRUB_NET_ARPHRD_ETHERNET);
+-  arp_packet->hln = 6;
+-  arp_packet->pro = grub_cpu_to_be16_compile_time (GRUB_NET_ETHERTYPE_IP);
+-  arp_packet->pln = 4;
+-  arp_packet->op = grub_cpu_to_be16_compile_time (ARP_REQUEST);
+-  /* Sender hardware address.  */
+-  grub_memcpy (arp_packet->sender_mac, &inf->hwaddress.mac, 6);
+-  arp_packet->sender_ip = inf->address.ipv4;
+-  grub_memset (arp_packet->recv_mac, 0, 6);
+-  arp_packet->recv_ip = proto_addr->ipv4;
+-  /* Target protocol address */
+-  grub_memset (&target_mac_addr.mac, 0xff, 6);
++  arp_header = (struct arphdr *) nb.data;
++  arp_header->hrd = grub_cpu_to_be16 (inf->card->default_address.type);
++  arp_header->hln = hln;
++  arp_header->pro = grub_cpu_to_be16_compile_time (GRUB_NET_ETHERTYPE_IP);
++  arp_header->pln = pln;
++  arp_header->op = grub_cpu_to_be16_compile_time (ARP_REQUEST);
++  tmp_ptr = nb.data + sizeof (*arp_header);
++
++  /* The source hardware address. */
++  grub_memcpy (tmp_ptr, inf->hwaddress.mac, hln);
++  tmp_ptr += hln;
++
++  /* The source protocol address. */
++  grub_memcpy (tmp_ptr, &inf->address.ipv4, pln);
++  tmp_ptr += pln;
++
++  /* The target hardware address. */
++  grub_memset (tmp_ptr, 0, hln);
++  tmp_ptr += hln;
++
++  /* The target protocol address */
++  grub_memcpy (tmp_ptr, &proto_addr->ipv4, pln);
++  tmp_ptr += pln;
++
++  grub_memset (&target_mac_addr.mac, 0xff, hln);
+ 
+   nbd = nb.data;
+   send_ethernet_packet (inf, &nb, target_mac_addr, GRUB_NET_ETHERTYPE_ARP);
+@@ -114,28 +124,53 @@ grub_err_t
+ grub_net_arp_receive (struct grub_net_buff *nb, struct grub_net_card *card,
+                       grub_uint16_t *vlantag)
+ {
+-  struct arppkt *arp_packet = (struct arppkt *) nb->data;
++  struct arphdr *arp_header = (struct arphdr *) nb->data;
+   grub_net_network_level_address_t sender_addr, target_addr;
+   grub_net_link_level_address_t sender_mac_addr;
+   struct grub_net_network_level_interface *inf;
+-
+-  if (arp_packet->pro != grub_cpu_to_be16_compile_time (GRUB_NET_ETHERTYPE_IP)
+-      || arp_packet->pln != 4 || arp_packet->hln != 6
+-      || nb->tail - nb->data < (int) sizeof (*arp_packet))
++  grub_uint16_t hw_type;
++  grub_uint8_t hln;
++  grub_uint8_t pln;
++  grub_uint8_t arp_packet_len;
++  grub_uint8_t *tmp_ptr;
++
++  hw_type = card->default_address.type;
++  hln = card->default_address.len;
++  pln = sizeof(sender_addr.ipv4);
++  arp_packet_len = sizeof (*arp_header) + 2 * (pln + hln);
++
++  if (arp_header->pro != grub_cpu_to_be16_compile_time (GRUB_NET_ETHERTYPE_IP)
++      || arp_header->hrd != grub_cpu_to_be16 (hw_type)
++      || arp_header->hln != hln || arp_header->pln != pln
++      || nb->tail - nb->data < (int) arp_packet_len) {
+     return GRUB_ERR_NONE;
++  }
+ 
++  tmp_ptr =  nb->data + sizeof (*arp_header);
++
++  /* The source hardware address. */
++  sender_mac_addr.type = hw_type;
++  sender_mac_addr.len = hln;
++  grub_memcpy (sender_mac_addr.mac, tmp_ptr, hln);
++  tmp_ptr += hln;
++
++  /* The source protocol address. */
+   sender_addr.type = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4;
+-  target_addr.type = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4;
+-  sender_addr.ipv4 = arp_packet->sender_ip;
+-  target_addr.ipv4 = arp_packet->recv_ip;
+-  if (arp_packet->sender_ip == pending_req)
+-    have_pending = 1;
++  grub_memcpy(&sender_addr.ipv4, tmp_ptr, pln);
++  tmp_ptr += pln;
+ 
+-  sender_mac_addr.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
+-  grub_memcpy (sender_mac_addr.mac, arp_packet->sender_mac,
+-	       sizeof (sender_mac_addr.mac));
+   grub_net_link_layer_add_address (card, &sender_addr, &sender_mac_addr, 1);
+ 
++  /* The target hardware address. */
++  tmp_ptr += hln;
++
++  /* The target protocol address. */
++  target_addr.type = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4;
++  grub_memcpy(&target_addr.ipv4, tmp_ptr, pln);
++
++  if (sender_addr.ipv4 == pending_req)
++    have_pending = 1;
++
+   FOR_NET_NETWORK_LEVEL_INTERFACES (inf)
+   {
+     /* Verify vlantag id */
+@@ -148,11 +183,11 @@ grub_net_arp_receive (struct grub_net_buff *nb, struct grub_net_card *card,
+ 
+     /* Am I the protocol address target? */
+     if (grub_net_addr_cmp (&inf->address, &target_addr) == 0
+-	&& arp_packet->op == grub_cpu_to_be16_compile_time (ARP_REQUEST))
++	&& arp_header->op == grub_cpu_to_be16_compile_time (ARP_REQUEST))
+       {
+ 	grub_net_link_level_address_t target;
+ 	struct grub_net_buff nb_reply;
+-	struct arppkt *arp_reply;
++	struct arphdr *arp_reply;
+ 	grub_uint8_t arp_data[128];
+ 	grub_err_t err;
+ 
+@@ -161,25 +196,39 @@ grub_net_arp_receive (struct grub_net_buff *nb, struct grub_net_card *card,
+ 	grub_netbuff_clear (&nb_reply);
+ 	grub_netbuff_reserve (&nb_reply, 128);
+ 
+-	err = grub_netbuff_push (&nb_reply, sizeof (*arp_packet));
++	err = grub_netbuff_push (&nb_reply, arp_packet_len);
+ 	if (err)
+ 	  return err;
+ 
+-	arp_reply = (struct arppkt *) nb_reply.data;
++	arp_reply = (struct arphdr *) nb_reply.data;
+ 
+-	arp_reply->hrd = grub_cpu_to_be16_compile_time (GRUB_NET_ARPHRD_ETHERNET);
++	arp_reply->hrd = grub_cpu_to_be16 (hw_type);
+ 	arp_reply->pro = grub_cpu_to_be16_compile_time (GRUB_NET_ETHERTYPE_IP);
+-	arp_reply->pln = 4;
+-	arp_reply->hln = 6;
++	arp_reply->pln = pln;
++	arp_reply->hln = hln;
+ 	arp_reply->op = grub_cpu_to_be16_compile_time (ARP_REPLY);
+-	arp_reply->sender_ip = arp_packet->recv_ip;
+-	arp_reply->recv_ip = arp_packet->sender_ip;
+-	arp_reply->hln = 6;
+-
+-	target.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
+-	grub_memcpy (target.mac, arp_packet->sender_mac, 6);
+-	grub_memcpy (arp_reply->sender_mac, inf->hwaddress.mac, 6);
+-	grub_memcpy (arp_reply->recv_mac, arp_packet->sender_mac, 6);
++
++	tmp_ptr = nb_reply.data + sizeof (*arp_reply);
++
++	/* The source hardware address. */
++	grub_memcpy (tmp_ptr, inf->hwaddress.mac, hln);
++	tmp_ptr += hln;
++
++	/* The source protocol address. */
++	grub_memcpy (tmp_ptr, &target_addr.ipv4, pln);
++	tmp_ptr += pln;
++
++	/* The target hardware address. */
++	grub_memcpy (tmp_ptr, sender_mac_addr.mac, hln);
++	tmp_ptr += hln;
++
++	/* The target protocol address */
++	grub_memcpy (tmp_ptr, &sender_addr.ipv4, pln);
++	tmp_ptr += pln;
++
++	target.type = hw_type;
++	target.len = hln;
++	grub_memcpy (target.mac, sender_mac_addr.mac, hln);
+ 
+ 	/* Change operation to REPLY and send packet */
+ 	send_ethernet_packet (inf, &nb_reply, target, GRUB_NET_ETHERTYPE_ARP);
+diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
+index dd0ffcdaea..233af56bcd 100644
+--- a/grub-core/net/bootp.c
++++ b/grub-core/net/bootp.c
+@@ -314,7 +314,6 @@ grub_net_configure_by_dhcp_ack (const char *name,
+ 				int is_def, char **device, char **path)
+ {
+   grub_net_network_level_address_t addr;
+-  grub_net_link_level_address_t hwaddr;
+   struct grub_net_network_level_interface *inter;
+   int mask = -1;
+   char server_ip[sizeof ("xxx.xxx.xxx.xxx")];
+@@ -331,12 +330,8 @@ grub_net_configure_by_dhcp_ack (const char *name,
+   if (path)
+     *path = 0;
+ 
+-  grub_memcpy (hwaddr.mac, bp->mac_addr,
+-	       bp->hw_len < sizeof (hwaddr.mac) ? bp->hw_len
+-	       : sizeof (hwaddr.mac));
+-  hwaddr.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
+-
+-  inter = grub_net_add_addr (name, card, &addr, &hwaddr, flags);
++  grub_dprintf("dhcp", "configuring dhcp for %s\n", name);
++  inter = grub_net_add_addr (name, card, &addr, &card->default_address, flags);
+   if (!inter)
+     return 0;
+ 
+@@ -673,7 +668,9 @@ send_dhcp_packet (struct grub_net_network_level_interface *iface)
+   grub_memset (pack, 0, sizeof (*pack));
+   pack->opcode = 1;
+   pack->hw_type = 1;
+-  pack->hw_len = 6;
++  pack->hw_len = iface->hwaddress.len > 16 ? 0
++                                              : iface->hwaddress.len;
++
+   err = grub_get_datetime (&date);
+   if (err || !grub_datetime2unixtime (&date, &t))
+     {
+@@ -686,7 +683,7 @@ send_dhcp_packet (struct grub_net_network_level_interface *iface)
+   else
+     pack->ident = iface->xid;
+ 
+-  grub_memcpy (&pack->mac_addr, &iface->hwaddress.mac, 6);
++  grub_memcpy (&pack->mac_addr, &iface->hwaddress.mac, pack->hw_len);
+ 
+   grub_netbuff_push (nb, sizeof (*udph));
+ 
+diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
+index 82a28fb6e9..e771364045 100644
+--- a/grub-core/net/drivers/efi/efinet.c
++++ b/grub-core/net/drivers/efi/efinet.c
+@@ -279,6 +279,9 @@ grub_efinet_findcards (void)
+ 	/* This should not happen... Why?  */
+ 	continue;
+ 
++      if (net->mode->hwaddr_size > GRUB_NET_MAX_LINK_ADDRESS_SIZE)
++	continue;
++
+       if (net->mode->state == GRUB_EFI_NETWORK_STOPPED
+ 	  && efi_call_1 (net->start, net) != GRUB_EFI_SUCCESS)
+ 	continue;
+@@ -315,10 +318,11 @@ grub_efinet_findcards (void)
+       card->name = grub_xasprintf ("efinet%d", i++);
+       card->driver = &efidriver;
+       card->flags = 0;
+-      card->default_address.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
++      card->default_address.type = net->mode->if_type;
++      card->default_address.len = net->mode->hwaddr_size;
+       grub_memcpy (card->default_address.mac,
+ 		   net->mode->current_address,
+-		   sizeof (card->default_address.mac));
++		   net->mode->hwaddr_size);
+       card->efi_net = net;
+       card->efi_handle = *handle;
+ 
+diff --git a/grub-core/net/drivers/emu/emunet.c b/grub-core/net/drivers/emu/emunet.c
+index b194920861..5b6c5e16a6 100644
+--- a/grub-core/net/drivers/emu/emunet.c
++++ b/grub-core/net/drivers/emu/emunet.c
+@@ -46,6 +46,7 @@ static struct grub_net_card emucard =
+     .mtu = 1500,
+     .default_address = {
+ 			 .type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET,
++			 . len = 6,
+ 			 {.mac = {0, 1, 2, 3, 4, 5}}
+ 		       },
+     .flags = 0
+diff --git a/grub-core/net/drivers/i386/pc/pxe.c b/grub-core/net/drivers/i386/pc/pxe.c
+index 3f4152d036..9f8fb4b6d2 100644
+--- a/grub-core/net/drivers/i386/pc/pxe.c
++++ b/grub-core/net/drivers/i386/pc/pxe.c
+@@ -386,20 +386,21 @@ GRUB_MOD_INIT(pxe)
+   grub_memset (ui, 0, sizeof (*ui));
+   grub_pxe_call (GRUB_PXENV_UNDI_GET_INFORMATION, ui, pxe_rm_entry);
+ 
++  grub_pxe_card.default_address.len = 6;
+   grub_memcpy (grub_pxe_card.default_address.mac, ui->current_addr,
+-	       sizeof (grub_pxe_card.default_address.mac));
+-  for (i = 0; i < sizeof (grub_pxe_card.default_address.mac); i++)
++	       grub_pxe_card.default_address.len);
++  for (i = 0; i < grub_pxe_card.default_address.len; i++)
+     if (grub_pxe_card.default_address.mac[i] != 0)
+       break;
+-  if (i != sizeof (grub_pxe_card.default_address.mac))
++  if (i != grub_pxe_card.default_address.len)
+     {
+-      for (i = 0; i < sizeof (grub_pxe_card.default_address.mac); i++)
++      for (i = 0; i < grub_pxe_card.default_address.len; i++)
+ 	if (grub_pxe_card.default_address.mac[i] != 0xff)
+ 	  break;
+     }
+-  if (i == sizeof (grub_pxe_card.default_address.mac))
++  if (i == grub_pxe_card.default_address.len)
+     grub_memcpy (grub_pxe_card.default_address.mac, ui->permanent_addr,
+-		 sizeof (grub_pxe_card.default_address.mac));
++		 grub_pxe_card.default_address.len);
+   grub_pxe_card.mtu = ui->mtu;
+ 
+   grub_pxe_card.default_address.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
+diff --git a/grub-core/net/drivers/ieee1275/ofnet.c b/grub-core/net/drivers/ieee1275/ofnet.c
+index ac4e62a95c..057ba85973 100644
+--- a/grub-core/net/drivers/ieee1275/ofnet.c
++++ b/grub-core/net/drivers/ieee1275/ofnet.c
+@@ -160,6 +160,7 @@ grub_ieee1275_parse_bootpath (const char *devpath, char *bootpath,
+   grub_uint16_t vlantag = 0;
+ 
+   hw_addr.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
++  hw_addr.len = 6;
+ 
+   args = bootpath + grub_strlen (devpath) + 1;
+   do
+@@ -504,6 +505,7 @@ search_net_devices (struct grub_ieee1275_devalias *alias)
+     grub_memcpy (&lla.mac, pprop, 6);
+ 
+   lla.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
++  lla.len = 6;
+   card->default_address = lla;
+ 
+   card->txbufsize = ALIGN_UP (card->mtu, 64) + 256;
+diff --git a/grub-core/net/drivers/uboot/ubootnet.c b/grub-core/net/drivers/uboot/ubootnet.c
+index 056052e40d..22ebcbf211 100644
+--- a/grub-core/net/drivers/uboot/ubootnet.c
++++ b/grub-core/net/drivers/uboot/ubootnet.c
+@@ -131,6 +131,7 @@ GRUB_MOD_INIT (ubootnet)
+ 
+       grub_memcpy (&(card->default_address.mac), &devinfo->di_net.hwaddr, 6);
+       card->default_address.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
++      card->default_address.len = 6;
+ 
+       card->txbufsize = ALIGN_UP (card->mtu, 64) + 256;
+       card->txbuf = grub_zalloc (card->txbufsize);
+diff --git a/grub-core/net/ethernet.c b/grub-core/net/ethernet.c
+index 4d7ceed6f9..9aae83a5eb 100644
+--- a/grub-core/net/ethernet.c
++++ b/grub-core/net/ethernet.c
+@@ -29,13 +29,6 @@
+ 
+ #define LLCADDRMASK 0x7f
+ 
+-struct etherhdr
+-{
+-  grub_uint8_t dst[6];
+-  grub_uint8_t src[6];
+-  grub_uint16_t type;
+-} GRUB_PACKED;
+-
+ struct llchdr
+ {
+   grub_uint8_t dsap;
+@@ -55,13 +48,15 @@ send_ethernet_packet (struct grub_net_network_level_interface *inf,
+ 		      grub_net_link_level_address_t target_addr,
+ 		      grub_net_ethertype_t ethertype)
+ {
+-  struct etherhdr *eth;
++  grub_uint8_t *eth;
+   grub_err_t err;
+-  grub_uint8_t etherhdr_size;
+-  grub_uint16_t vlantag_id = VLANTAG_IDENTIFIER;
++  grub_uint32_t vlantag = 0;
++  grub_uint8_t hw_addr_len = inf->card->default_address.len;
++  grub_uint8_t etherhdr_size = 2 * hw_addr_len + 2;
+ 
+-  etherhdr_size = sizeof (*eth);
+-  COMPILE_TIME_ASSERT (sizeof (*eth) + 4 < GRUB_NET_MAX_LINK_HEADER_SIZE);
++  /* Source and destination link addresses + ethertype + vlan tag */
++  COMPILE_TIME_ASSERT ((GRUB_NET_MAX_LINK_ADDRESS_SIZE * 2 + 2 + 4) <
++		       GRUB_NET_MAX_LINK_HEADER_SIZE);
+ 
+   /* Increase ethernet header in case of vlantag */
+   if (inf->vlantag != 0)
+@@ -70,11 +65,22 @@ send_ethernet_packet (struct grub_net_network_level_interface *inf,
+   err = grub_netbuff_push (nb, etherhdr_size);
+   if (err)
+     return err;
+-  eth = (struct etherhdr *) nb->data;
+-  grub_memcpy (eth->dst, target_addr.mac, 6);
+-  grub_memcpy (eth->src, inf->hwaddress.mac, 6);
++  eth = nb->data;
++  grub_memcpy (eth, target_addr.mac, hw_addr_len);
++  eth += hw_addr_len;
++  grub_memcpy (eth, inf->hwaddress.mac, hw_addr_len);
++  eth += hw_addr_len;
++
++  /* Check if a vlan-tag is present. */
++  if (vlantag != 0)
++    {
++      *((grub_uint32_t *)eth) = grub_cpu_to_be32 (vlantag);
++      eth += sizeof (vlantag);
++    }
++
++  /* Write ethertype */
++  *((grub_uint16_t*) eth) = grub_cpu_to_be16 (ethertype);
+ 
+-  eth->type = grub_cpu_to_be16 (ethertype);
+   if (!inf->card->opened)
+     {
+       err = GRUB_ERR_NONE;
+@@ -85,18 +91,6 @@ send_ethernet_packet (struct grub_net_network_level_interface *inf,
+       inf->card->opened = 1;
+     }
+ 
+-  /* Check and add a vlan-tag if needed. */
+-  if (inf->vlantag != 0)
+-    {
+-      /* Move eth type to the right */
+-      grub_memcpy ((char *) nb->data + etherhdr_size - 2,
+-                   (char *) nb->data + etherhdr_size - 6, 2);
+-
+-      /* Add the tag in the middle */
+-      grub_memcpy ((char *) nb->data + etherhdr_size - 6, &vlantag_id, 2);
+-      grub_memcpy ((char *) nb->data + etherhdr_size - 4, (char *) &(inf->vlantag), 2);
+-    }
+-
+   return inf->card->driver->send (inf->card, nb);
+ }
+ 
+@@ -104,31 +98,40 @@ grub_err_t
+ grub_net_recv_ethernet_packet (struct grub_net_buff *nb,
+ 			       struct grub_net_card *card)
+ {
+-  struct etherhdr *eth;
++  grub_uint8_t *eth;
+   struct llchdr *llch;
+   struct snaphdr *snaph;
+   grub_net_ethertype_t type;
+   grub_net_link_level_address_t hwaddress;
+   grub_net_link_level_address_t src_hwaddress;
+   grub_err_t err;
+-  grub_uint8_t etherhdr_size = sizeof (*eth);
++  grub_uint8_t hw_addr_len = card->default_address.len;
++  grub_uint8_t etherhdr_size = 2 * hw_addr_len + 2;
+   grub_uint16_t vlantag = 0;
+ 
++  eth = nb->data;
+ 
+-  /* Check if a vlan-tag is present. If so, the ethernet header is 4 bytes */
+-  /* longer than the original one. The vlantag id is extracted and the header */
+-  /* is reseted to the original size. */
+-  if (grub_get_unaligned16 (nb->data + etherhdr_size - 2) == VLANTAG_IDENTIFIER)
++  hwaddress.type = card->default_address.type;
++  hwaddress.len = hw_addr_len;
++  grub_memcpy (hwaddress.mac, eth, hw_addr_len);
++  eth += hw_addr_len;
++
++  src_hwaddress.type = card->default_address.type;
++  src_hwaddress.len = hw_addr_len;
++  grub_memcpy (src_hwaddress.mac, eth, hw_addr_len);
++  eth += hw_addr_len;
++
++  type = grub_be_to_cpu16 (*(grub_uint16_t*)(eth));
++  if (type == VLANTAG_IDENTIFIER)
+     {
+-      vlantag = grub_get_unaligned16 (nb->data + etherhdr_size);
++      /* Skip vlan tag */
++      eth += 2;
++      vlantag = grub_be_to_cpu16 (*(grub_uint16_t*)(eth));
+       etherhdr_size += 4;
+-      /* Move eth type to the original position */
+-      grub_memcpy((char *) nb->data + etherhdr_size - 6,
+-                  (char *) nb->data + etherhdr_size - 2, 2);
++      eth += 2;
++      type = grub_be_to_cpu16 (*(grub_uint16_t*)(eth));
+     }
+ 
+-  eth = (struct etherhdr *) nb->data;
+-  type = grub_be_to_cpu16 (eth->type);
+   err = grub_netbuff_pull (nb, etherhdr_size);
+   if (err)
+     return err;
+@@ -148,11 +151,6 @@ grub_net_recv_ethernet_packet (struct grub_net_buff *nb,
+ 	}
+     }
+ 
+-  hwaddress.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
+-  grub_memcpy (hwaddress.mac, eth->dst, sizeof (hwaddress.mac));
+-  src_hwaddress.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
+-  grub_memcpy (src_hwaddress.mac, eth->src, sizeof (src_hwaddress.mac));
+-
+   switch (type)
+     {
+       /* ARP packet. */
+diff --git a/grub-core/net/icmp6.c b/grub-core/net/icmp6.c
+index 2cbd95dce2..56a3ec5c8e 100644
+--- a/grub-core/net/icmp6.c
++++ b/grub-core/net/icmp6.c
+@@ -231,8 +231,9 @@ grub_net_recv_icmp6_packet (struct grub_net_buff *nb,
+ 		&& ohdr->len == 1)
+ 	      {
+ 		grub_net_link_level_address_t ll_address;
+-		ll_address.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
+-		grub_memcpy (ll_address.mac, ohdr + 1, sizeof (ll_address.mac));
++		ll_address.type = card->default_address.type;
++		ll_address.len = card->default_address.len;
++		grub_memcpy (ll_address.mac, ohdr + 1, ll_address.len);
+ 		grub_net_link_layer_add_address (card, source, &ll_address, 0);
+ 	      }
+ 	  }
+@@ -335,8 +336,9 @@ grub_net_recv_icmp6_packet (struct grub_net_buff *nb,
+ 		&& ohdr->len == 1)
+ 	      {
+ 		grub_net_link_level_address_t ll_address;
+-		ll_address.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
+-		grub_memcpy (ll_address.mac, ohdr + 1, sizeof (ll_address.mac));
++		ll_address.type = card->default_address.type;
++		ll_address.len = card->default_address.len;
++		grub_memcpy (ll_address.mac, ohdr + 1, ll_address.len);
+ 		grub_net_link_layer_add_address (card, source, &ll_address, 0);
+ 	      }
+ 	  }
+@@ -384,8 +386,9 @@ grub_net_recv_icmp6_packet (struct grub_net_buff *nb,
+ 		&& ohdr->len == 1)
+ 	      {
+ 		grub_net_link_level_address_t ll_address;
+-		ll_address.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
+-		grub_memcpy (ll_address.mac, ohdr + 1, sizeof (ll_address.mac));
++		ll_address.type = card->default_address.type;
++		ll_address.len = card->default_address.len;
++		grub_memcpy (ll_address.mac, ohdr + 1, ll_address.len);
+ 		grub_net_link_layer_add_address (card, source, &ll_address, 0);
+ 	      }
+ 	    if (ohdr->type == OPTION_PREFIX && ohdr->len == 4)
+diff --git a/grub-core/net/ip.c b/grub-core/net/ip.c
+index 01410798b3..ce6bdc75c6 100644
+--- a/grub-core/net/ip.c
++++ b/grub-core/net/ip.c
+@@ -315,8 +315,8 @@ handle_dgram (struct grub_net_buff *nb,
+ 	  if (inf->card == card
+ 	      && inf->address.type == GRUB_NET_NETWORK_LEVEL_PROTOCOL_DHCP_RECV
+ 	      && inf->hwaddress.type == GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET
+-	      && grub_memcmp (inf->hwaddress.mac, &bootp->mac_addr,
+-			      sizeof (inf->hwaddress.mac)) == 0)
++	      && (grub_memcmp (inf->hwaddress.mac, &bootp->mac_addr,
++			       bootp->hw_len) == 0 || bootp->hw_len == 0))
+ 	    {
+ 	      grub_net_process_dhcp (nb, inf);
+ 	      grub_netbuff_free (nb);
+diff --git a/grub-core/net/net.c b/grub-core/net/net.c
+index fed7bc57cb..cdae1fe398 100644
+--- a/grub-core/net/net.c
++++ b/grub-core/net/net.c
+@@ -128,8 +128,9 @@ grub_net_link_layer_resolve (struct grub_net_network_level_interface *inf,
+ 								   << 48)
+ 	  && proto_addr->ipv6[1] == (grub_be_to_cpu64_compile_time (1))))
+     {
+-      hw_addr->type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
+-      grub_memset (hw_addr->mac, -1, 6);
++      hw_addr->type = inf->card->default_address.type;
++      hw_addr->len = inf->card->default_address.len;
++      grub_memset (hw_addr->mac, -1, hw_addr->len);
+       return GRUB_ERR_NONE;
+     }
+ 
+@@ -137,6 +138,7 @@ grub_net_link_layer_resolve (struct grub_net_network_level_interface *inf,
+       && ((grub_be_to_cpu64 (proto_addr->ipv6[0]) >> 56) == 0xff))
+     {
+       hw_addr->type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET;
++      hw_addr->len = inf->card->default_address.len;
+       hw_addr->mac[0] = 0x33;
+       hw_addr->mac[1] = 0x33;
+       hw_addr->mac[2] = ((grub_be_to_cpu64 (proto_addr->ipv6[1]) >> 24) & 0xff);
+@@ -766,23 +768,23 @@ grub_net_addr_to_str (const grub_net_network_level_address_t *target, char *buf)
+ void
+ grub_net_hwaddr_to_str (const grub_net_link_level_address_t *addr, char *str)
+ {
+-  str[0] = 0;
+-  switch (addr->type)
++  char *ptr;
++  unsigned i;
++  int maxstr;
++
++  if (addr->len > GRUB_NET_MAX_LINK_ADDRESS_SIZE)
+     {
+-    case GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET:
+-      {
+-	char *ptr;
+-	unsigned i;
+-	for (ptr = str, i = 0; i < ARRAY_SIZE (addr->mac); i++)
+-	  {
+-	    grub_snprintf (ptr, GRUB_NET_MAX_STR_HWADDR_LEN - (ptr - str),
+-			   "%02x:", addr->mac[i] & 0xff);
+-	    ptr += (sizeof ("XX:") - 1);
+-	  }
+-      return;
+-      }
++       str[0] = 0;
++       grub_printf (_("Unsupported hw address type %d len %d\n"),
++		    addr->type, addr->len);
++       return;
++    }
++  maxstr = addr->len * grub_strlen ("XX:");
++  for (ptr = str, i = 0; i < addr->len; i++)
++    {
++      ptr += grub_snprintf (ptr, maxstr - (ptr - str),
++		     "%02x:", addr->mac[i] & 0xff);
+     }
+-  grub_printf (_("Unsupported hw address type %d\n"), addr->type);
+ }
+ 
+ int
+@@ -793,13 +795,17 @@ grub_net_hwaddr_cmp (const grub_net_link_level_address_t *a,
+     return -1;
+   if (a->type > b->type)
+     return +1;
+-  switch (a->type)
++  if (a->len < b->len)
++    return -1;
++  if (a->len > b->len)
++    return +1;
++  if (a->len > GRUB_NET_MAX_LINK_ADDRESS_SIZE)
+     {
+-    case GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET:
+-      return grub_memcmp (a->mac, b->mac, sizeof (a->mac));
++      grub_printf (_("Unsupported hw address type %d len %d\n"),
++		   a->type, a->len);
++      return + 1;
+     }
+-  grub_printf (_("Unsupported hw address type %d\n"), a->type);
+-  return 1;
++  return grub_memcmp (a->mac, b->mac, a->len);
+ }
+ 
+ int
+diff --git a/include/grub/net.h b/include/grub/net.h
+index b5f9e617e5..66375af068 100644
+--- a/include/grub/net.h
++++ b/include/grub/net.h
+@@ -29,7 +29,8 @@
+ 
+ enum
+   {
+-    GRUB_NET_MAX_LINK_HEADER_SIZE = 64,
++    GRUB_NET_MAX_LINK_HEADER_SIZE = 96,
++    GRUB_NET_MAX_LINK_ADDRESS_SIZE = 32,
+     GRUB_NET_UDP_HEADER_SIZE = 8,
+     GRUB_NET_TCP_HEADER_SIZE = 20,
+     GRUB_NET_OUR_IPV4_HEADER_SIZE = 20,
+@@ -42,15 +43,17 @@ enum
+ 
+ typedef enum grub_link_level_protocol_id 
+ {
+-  GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET
++  /* IANA ARP constant to define hardware type. */
++  GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET = 1,
+ } grub_link_level_protocol_id_t;
+ 
+ typedef struct grub_net_link_level_address
+ {
+   grub_link_level_protocol_id_t type;
++  grub_uint8_t len;
+   union
+   {
+-    grub_uint8_t mac[6];
++    grub_uint8_t mac[GRUB_NET_MAX_LINK_ADDRESS_SIZE];
+   };
+ } grub_net_link_level_address_t;
+ 
+@@ -578,11 +581,13 @@ grub_net_addr_cmp (const grub_net_network_level_address_t *a,
+ #define GRUB_NET_MAX_STR_ADDR_LEN sizeof ("XXXX:XXXX:XXXX:XXXX:XXXX:XXXX:XXXX:XXXX")
+ 
+ /*
+-  Currently suppoerted adresses:
+-  ethernet:   XX:XX:XX:XX:XX:XX
++  Up to 32 byte hardware address supported, see GRUB_NET_MAX_LINK_ADDRESS_SIZE
+  */
+-
+-#define GRUB_NET_MAX_STR_HWADDR_LEN (sizeof ("XX:XX:XX:XX:XX:XX"))
++#define GRUB_NET_MAX_STR_HWADDR_LEN (sizeof (\
++	"XX:XX:XX:XX:XX:XX:XX:XX:"\
++	"XX:XX:XX:XX:XX:XX:XX:XX:"\
++	"XX:XX:XX:XX:XX:XX:XX:XX:"\
++	"XX:XX:XX:XX:XX:XX:XX:XX"))
+ 
+ void
+ grub_net_addr_to_str (const grub_net_network_level_address_t *target,
diff --git a/debian/patches/rhboot-f34-tcp-add-window-scaling-support.patch b/debian/patches/rhboot-f34-tcp-add-window-scaling-support.patch
new file mode 100644
index 0000000..5ae89a9
--- /dev/null
+++ b/debian/patches/rhboot-f34-tcp-add-window-scaling-support.patch
@@ -0,0 +1,90 @@
+From e236246964433c2acd448707bdcaf0197d97e69d Mon Sep 17 00:00:00 2001
+From: Josef Bacik <[e-mail]>
+Date: Wed, 12 Aug 2015 08:57:55 -0700
+Subject: tcp: add window scaling support
+
+Sometimes we have to provision boxes across regions, such as California to
+Sweden.  The http server has a 10 minute timeout, so if we can't get our 250mb
+image transferred fast enough our provisioning fails, which is not ideal.  So
+add tcp window scaling on open connections and set the window size to 1mb.  With
+this change we're able to get higher sustained transfers between regions and can
+transfer our image in well below 10 minutes.  Without this patch we'd time out
+every time halfway through the transfer.  Thanks,
+
+Signed-off-by: Josef Bacik <[e-mail]>
+(cherry picked from commit 995d66fc218e3ddd852269753be0ebd71b72174f)
+
+Patch-Name: rhboot-f34-tcp-add-window-scaling-support.patch
+---
+ grub-core/net/tcp.c | 42 +++++++++++++++++++++++++++++-------------
+ 1 file changed, 29 insertions(+), 13 deletions(-)
+
+diff --git a/grub-core/net/tcp.c b/grub-core/net/tcp.c
+index e8ad34b84d..7d4b822626 100644
+--- a/grub-core/net/tcp.c
++++ b/grub-core/net/tcp.c
+@@ -106,6 +106,18 @@ struct tcphdr
+   grub_uint16_t urgent;
+ } GRUB_PACKED;
+ 
++struct tcp_scale_opt {
++  grub_uint8_t kind;
++  grub_uint8_t length;
++  grub_uint8_t scale;
++} GRUB_PACKED;
++
++struct tcp_synhdr {
++  struct tcphdr tcphdr;
++  struct tcp_scale_opt scale_opt;
++  grub_uint8_t padding;
++};
++
+ struct tcp_pseudohdr
+ {
+   grub_uint32_t src;
+@@ -566,7 +578,7 @@ grub_net_tcp_open (char *server,
+   grub_net_tcp_socket_t socket;
+   static grub_uint16_t in_port = 21550;
+   struct grub_net_buff *nb;
+-  struct tcphdr *tcph;
++  struct tcp_synhdr *tcph;
+   int i;
+   grub_uint8_t *nbd;
+   grub_net_link_level_address_t ll_target_addr;
+@@ -635,20 +647,24 @@ grub_net_tcp_open (char *server,
+     }
+ 
+   tcph = (void *) nb->data;
++  grub_memset(tcph, 0, sizeof (*tcph));
+   socket->my_start_seq = grub_get_time_ms ();
+   socket->my_cur_seq = socket->my_start_seq + 1;
+-  socket->my_window = 8192;
+-  tcph->seqnr = grub_cpu_to_be32 (socket->my_start_seq);
+-  tcph->ack = grub_cpu_to_be32_compile_time (0);
+-  tcph->flags = grub_cpu_to_be16_compile_time ((5 << 12) | TCP_SYN);
+-  tcph->window = grub_cpu_to_be16 (socket->my_window);
+-  tcph->urgent = 0;
+-  tcph->src = grub_cpu_to_be16 (socket->in_port);
+-  tcph->dst = grub_cpu_to_be16 (socket->out_port);
+-  tcph->checksum = 0;
+-  tcph->checksum = grub_net_ip_transport_checksum (nb, GRUB_NET_IP_TCP,
+-						   &socket->inf->address,
+-						   &socket->out_nla);
++  socket->my_window = 32768;
++  tcph->tcphdr.seqnr = grub_cpu_to_be32 (socket->my_start_seq);
++  tcph->tcphdr.ack = grub_cpu_to_be32_compile_time (0);
++  tcph->tcphdr.flags = grub_cpu_to_be16_compile_time ((6 << 12) | TCP_SYN);
++  tcph->tcphdr.window = grub_cpu_to_be16 (socket->my_window);
++  tcph->tcphdr.urgent = 0;
++  tcph->tcphdr.src = grub_cpu_to_be16 (socket->in_port);
++  tcph->tcphdr.dst = grub_cpu_to_be16 (socket->out_port);
++  tcph->tcphdr.checksum = 0;
++  tcph->scale_opt.kind = 3;
++  tcph->scale_opt.length = 3;
++  tcph->scale_opt.scale = 5;
++  tcph->tcphdr.checksum = grub_net_ip_transport_checksum (nb, GRUB_NET_IP_TCP,
++							  &socket->inf->address,
++							  &socket->out_nla);
+ 
+   tcp_socket_register (socket);
+ 
diff --git a/debian/patches/series b/debian/patches/series
index fb45477..07193df 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -112,3 +112,11 @@ ubuntu-dejavu-font-path.patch
 ubuntu-linuxefi-arm64-set-base-addr.patch
 tftp-rollover-block-counter.patch
 ubuntu-add-initrd-less-boot-messages.patch
+ubuntu-fix-reproducible-squashfs-test.patch
+rhboot-f34-make-exit-take-a-return-code.patch
+rhboot-f34-dont-use-int-for-efi-status.patch
+rhboot-f34-tcp-add-window-scaling-support.patch
+rhboot-f34-support-non-ethernet.patch
+ubuntu-fixup-rhboot-f34-support-non-ethernet.patch
+ubuntu-fixup-rhboot-f34-support-non-ethernet-2.patch
+rhboot-f34-make-pmtimer-tsc-calibration-fast.patch
diff --git a/debian/patches/skip-grub_cmd_set_date.patch b/debian/patches/skip-grub_cmd_set_date.patch
index d5ba8ef..6aa97f4 100644
--- a/debian/patches/skip-grub_cmd_set_date.patch
+++ b/debian/patches/skip-grub_cmd_set_date.patch
@@ -12,7 +12,7 @@ Patch-Name: skip-grub_cmd_set_date.patch
  1 file changed, 3 insertions(+)
 
 diff --git a/tests/grub_cmd_set_date.in b/tests/grub_cmd_set_date.in
-index aac120a6c..1bb5be4ca 100644
+index aac120a6c5..1bb5be4ca7 100644
 --- a/tests/grub_cmd_set_date.in
 +++ b/tests/grub_cmd_set_date.in
 @@ -1,6 +1,9 @@
diff --git a/debian/patches/sleep-shift.patch b/debian/patches/sleep-shift.patch
index bb0f0a3..9d1aae3 100644
--- a/debian/patches/sleep-shift.patch
+++ b/debian/patches/sleep-shift.patch
@@ -17,7 +17,7 @@ Patch-Name: sleep-shift.patch
  2 files changed, 45 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/commands/sleep.c b/grub-core/commands/sleep.c
-index e77e7900f..3906b1410 100644
+index e77e7900fa..3906b14103 100644
 --- a/grub-core/commands/sleep.c
 +++ b/grub-core/commands/sleep.c
 @@ -46,6 +46,31 @@ do_print (int n)
@@ -62,7 +62,7 @@ index e77e7900f..3906b1410 100644
  
    return 0;
 diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
-index d5e0c79a7..3611ee9ea 100644
+index d5e0c79a70..3611ee9ea7 100644
 --- a/grub-core/normal/menu.c
 +++ b/grub-core/normal/menu.c
 @@ -615,8 +615,27 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
diff --git a/debian/patches/tftp-rollover-block-counter.patch b/debian/patches/tftp-rollover-block-counter.patch
index d172a63..5aad7b0 100644
--- a/debian/patches/tftp-rollover-block-counter.patch
+++ b/debian/patches/tftp-rollover-block-counter.patch
@@ -49,7 +49,7 @@ Patch-Name: tftp-rollover-block-counter.patch
  1 file changed, 14 insertions(+), 3 deletions(-)
 
 diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
-index e6566fa17..33c0b8214 100644
+index e6566fa176..33c0b8214e 100644
 --- a/grub-core/net/tftp.c
 +++ b/grub-core/net/tftp.c
 @@ -183,11 +183,22 @@ tftp_receive (grub_net_udp_socket_t sock __attribute__ ((unused)),
diff --git a/debian/patches/ubuntu-add-devicetree-command-support.patch b/debian/patches/ubuntu-add-devicetree-command-support.patch
index 2b28d0a..aa41aba 100644
--- a/debian/patches/ubuntu-add-devicetree-command-support.patch
+++ b/debian/patches/ubuntu-add-devicetree-command-support.patch
@@ -14,7 +14,7 @@ Patch-Name: ubuntu-add-devicetree-command-support.patch
  1 file changed, 19 insertions(+)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index af1e096bd..bbf5d73e3 100644
+index af1e096bd6..bbf5d73e39 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -254,6 +254,17 @@ EOF
diff --git a/debian/patches/ubuntu-add-initrd-less-boot-fallback.patch b/debian/patches/ubuntu-add-initrd-less-boot-fallback.patch
index cf6d6bb..e734a87 100644
--- a/debian/patches/ubuntu-add-initrd-less-boot-fallback.patch
+++ b/debian/patches/ubuntu-add-initrd-less-boot-fallback.patch
@@ -19,7 +19,7 @@ Patch-Name: ubuntu-add-initrd-less-boot-fallback.patch
  create mode 100644 grub-initrd-fallback.service
 
 diff --git a/Makefile.am b/Makefile.am
-index 1f4bb9b8c..e6a220711 100644
+index 1f4bb9b8c5..e6a220711e 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -473,6 +473,9 @@ ChangeLog: FORCE
@@ -33,7 +33,7 @@ index 1f4bb9b8c..e6a220711 100644
  
  syslinux_test: $(top_builddir)/config.status tests/syslinux/ubuntu10.04_grub.cfg
 diff --git a/configure.ac b/configure.ac
-index 883245553..1819188f9 100644
+index 883245553d..1819188f9f 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -305,6 +305,16 @@ AC_SUBST(grubdirname)
@@ -55,7 +55,7 @@ index 883245553..1819188f9 100644
  #
 diff --git a/grub-initrd-fallback.service b/grub-initrd-fallback.service
 new file mode 100644
-index 000000000..48778c9f7
+index 0000000000..48778c9f76
 --- /dev/null
 +++ b/grub-initrd-fallback.service
 @@ -0,0 +1,12 @@
@@ -72,7 +72,7 @@ index 000000000..48778c9f7
 +[Install]
 +WantedBy=multi-user.target rescue.target emergency.target
 diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index b7135b655..2642f66c5 100644
+index b7135b655f..2642f66c59 100644
 --- a/util/grub.d/00_header.in
 +++ b/util/grub.d/00_header.in
 @@ -50,6 +50,18 @@ if [ -s \$prefix/grubenv ]; then
@@ -117,7 +117,7 @@ index b7135b655..2642f66c5 100644
      cat <<EOF
  function recordfail {
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index aa9666e5a..af1e096bd 100644
+index aa9666e5ad..af1e096bd6 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -118,6 +118,10 @@ if [ "$vt_handoff" = 1 ]; then
diff --git a/debian/patches/ubuntu-add-initrd-less-boot-messages.patch b/debian/patches/ubuntu-add-initrd-less-boot-messages.patch
index 22baf95..45406ac 100644
--- a/debian/patches/ubuntu-add-initrd-less-boot-messages.patch
+++ b/debian/patches/ubuntu-add-initrd-less-boot-messages.patch
@@ -13,7 +13,7 @@ Patch-Name: ubuntu-add-initrd-less-boot-messages.patch
  1 file changed, 10 insertions(+)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 49e627228..47daf51ee 100644
+index 49e627228f..47daf51eed 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -160,6 +160,12 @@ if [ "$vt_handoff" = 1 ]; then
diff --git a/debian/patches/ubuntu-boot-from-multipath-dependent-symlink.patch b/debian/patches/ubuntu-boot-from-multipath-dependent-symlink.patch
index e5ed41f..5e19f72 100644
--- a/debian/patches/ubuntu-boot-from-multipath-dependent-symlink.patch
+++ b/debian/patches/ubuntu-boot-from-multipath-dependent-symlink.patch
@@ -16,7 +16,7 @@ Patch-Name: ubuntu-boot-from-multipath-dependent-symlink.patch
  1 file changed, 41 insertions(+)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index bbf5d73e3..14a89ba13 100644
+index bbf5d73e39..14a89ba13d 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -65,6 +65,47 @@ esac
diff --git a/debian/patches/ubuntu-dejavu-font-path.patch b/debian/patches/ubuntu-dejavu-font-path.patch
index fdd7949..a6c3582 100644
--- a/debian/patches/ubuntu-dejavu-font-path.patch
+++ b/debian/patches/ubuntu-dejavu-font-path.patch
@@ -11,7 +11,7 @@ Patch-Name: ubuntu-dejavu-font-path.patch
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 6a88b9b0c..fae917102 100644
+index 6a88b9b0c0..fae9171022 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1671,7 +1671,7 @@ fi
diff --git a/debian/patches/ubuntu-dont-verify-loopback-images.patch b/debian/patches/ubuntu-dont-verify-loopback-images.patch
index 0e5caf5..d5a2a29 100644
--- a/debian/patches/ubuntu-dont-verify-loopback-images.patch
+++ b/debian/patches/ubuntu-dont-verify-loopback-images.patch
@@ -22,7 +22,7 @@ Patch-Name: ubuntu-dont-verify-loopback-images.patch
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/disk/loopback.c b/grub-core/disk/loopback.c
-index ccb4b167c..210201d22 100644
+index ccb4b167cc..210201d22d 100644
 --- a/grub-core/disk/loopback.c
 +++ b/grub-core/disk/loopback.c
 @@ -86,7 +86,8 @@ grub_cmd_loopback (grub_extcmd_context_t ctxt, int argc, char **args)
diff --git a/debian/patches/ubuntu-efi-allow-loopmount-chainload.patch b/debian/patches/ubuntu-efi-allow-loopmount-chainload.patch
index a562868..ecc94e8 100644
--- a/debian/patches/ubuntu-efi-allow-loopmount-chainload.patch
+++ b/debian/patches/ubuntu-efi-allow-loopmount-chainload.patch
@@ -15,7 +15,7 @@ Patch-Name: ubuntu-efi-allow-loopmount-chainload.patch
  create mode 100644 include/grub/loopback.h
 
 diff --git a/grub-core/disk/loopback.c b/grub-core/disk/loopback.c
-index cdf9123fa..ccb4b167c 100644
+index cdf9123fa5..ccb4b167cc 100644
 --- a/grub-core/disk/loopback.c
 +++ b/grub-core/disk/loopback.c
 @@ -21,20 +21,13 @@
@@ -41,7 +41,7 @@ index cdf9123fa..ccb4b167c 100644
  static unsigned long last_id = 0;
  
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index ec80f415b..04e815c05 100644
+index ec80f415b8..04e815c052 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
 @@ -24,6 +24,7 @@
@@ -91,7 +91,7 @@ index ec80f415b..04e815c05 100644
  
 diff --git a/include/grub/loopback.h b/include/grub/loopback.h
 new file mode 100644
-index 000000000..3b9a9e32e
+index 0000000000..3b9a9e32e8
 --- /dev/null
 +++ b/include/grub/loopback.h
 @@ -0,0 +1,30 @@
diff --git a/debian/patches/ubuntu-efi-console-set-text-mode-as-needed.patch b/debian/patches/ubuntu-efi-console-set-text-mode-as-needed.patch
index a8a41c1..7d117b7 100644
--- a/debian/patches/ubuntu-efi-console-set-text-mode-as-needed.patch
+++ b/debian/patches/ubuntu-efi-console-set-text-mode-as-needed.patch
@@ -15,7 +15,7 @@ Patch-Name: ubuntu-efi-console-set-text-mode-as-needed.patch
  1 file changed, 45 insertions(+), 23 deletions(-)
 
 diff --git a/grub-core/term/efi/console.c b/grub-core/term/efi/console.c
-index 4840cc59d..b61da7d0d 100644
+index 4840cc59d3..b61da7d0d0 100644
 --- a/grub-core/term/efi/console.c
 +++ b/grub-core/term/efi/console.c
 @@ -24,6 +24,11 @@
diff --git a/debian/patches/ubuntu-fix-lzma-decompressor-objcopy.patch b/debian/patches/ubuntu-fix-lzma-decompressor-objcopy.patch
index 6074c3e..66834d3 100644
--- a/debian/patches/ubuntu-fix-lzma-decompressor-objcopy.patch
+++ b/debian/patches/ubuntu-fix-lzma-decompressor-objcopy.patch
@@ -16,7 +16,7 @@ Signed-off-by: Mathieu Trudel-Lapierre <[e-mail]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 1731c53f0..33e75021d 100644
+index 1731c53f08..33e75021da 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
 @@ -547,7 +547,7 @@ image = {
diff --git a/debian/patches/ubuntu-fix-reproducible-squashfs-test.patch b/debian/patches/ubuntu-fix-reproducible-squashfs-test.patch
new file mode 100644
index 0000000..bdff56a
--- /dev/null
+++ b/debian/patches/ubuntu-fix-reproducible-squashfs-test.patch
@@ -0,0 +1,31 @@
+From 0be5ee2a020c2db7842352e05392d5223c1b3f17 Mon Sep 17 00:00:00 2001
+From: Dimitri John Ledkov <[e-mail]>
+Date: Wed, 9 Dec 2020 16:07:10 +0000
+Subject: grub-fs-tester: Add compatibility with reproducible squashfs-tools
+ 4.4
+
+squashfs-tools 4.4 builds reproducible builds by default, when
+SOURCE_DATE_EPOCH is set. This is true during package built time for
+many Linux distributions. And causes the squashfs test case to fail.
+
+Patch-Name: ubuntu-fix-reproducible-squashfs-test.patch
+Signed-off-by: Dimitri John Ledkov <[e-mail]>
+---
+ tests/util/grub-fs-tester.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in
+index bc14a05ca3..26989d58c7 100644
+--- a/tests/util/grub-fs-tester.in
++++ b/tests/util/grub-fs-tester.in
+@@ -1048,8 +1048,8 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do
+ 		x"romfs")
+ 		    genromfs -V "$FSLABEL" -f "${FSIMAGEP}0.img" -d "$MASTER" ;;
+ 		xsquash4_*)
+-		    echo mksquashfs "$MASTER" "${FSIMAGEP}0.img" -always-use-fragments -comp "${fs/squash4_/}" -b $BLKSIZE
+-		    mksquashfs "$MASTER" "${FSIMAGEP}0.img" -always-use-fragments -comp "${fs/squash4_/}" -b $BLKSIZE ;;
++		    echo mksquashfs "$MASTER" "${FSIMAGEP}0.img" -always-use-fragments -comp "${fs/squash4_/}" -b $BLKSIZE -not-reproducible
++		    mksquashfs "$MASTER" "${FSIMAGEP}0.img" -always-use-fragments -comp "${fs/squash4_/}" -b $BLKSIZE -not-reproducible ;;
+ 		x"bfs")
+ 		    sleep 1
+ 		    fusermount -u "$MNTPOINTRW"
diff --git a/debian/patches/ubuntu-fixup-rhboot-f34-support-non-ethernet-2.patch b/debian/patches/ubuntu-fixup-rhboot-f34-support-non-ethernet-2.patch
new file mode 100644
index 0000000..75252fc
--- /dev/null
+++ b/debian/patches/ubuntu-fixup-rhboot-f34-support-non-ethernet-2.patch
@@ -0,0 +1,54 @@
+From 72cff34035e5ba35d01fc6cbc00f3b9b135ff5a6 Mon Sep 17 00:00:00 2001
+From: Dimitri John Ledkov <[e-mail]>
+Date: Sat, 12 Dec 2020 00:21:15 +0000
+Subject: UBUNTU: fixup unaligned access.
+
+Use unaligned helpers, to get/set values within a
+datastructure. Otherwise armhf build of grub-uboot platform fails due
+to -Wcast-align errors.
+
+Fixes: rhboot-f34-support-non-ethernet.patch
+
+Patch-Name: ubuntu-fixup-rhboot-f34-support-non-ethernet-2.patch
+---
+ grub-core/net/ethernet.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/grub-core/net/ethernet.c b/grub-core/net/ethernet.c
+index 9aae83a5eb..01cd21785a 100644
+--- a/grub-core/net/ethernet.c
++++ b/grub-core/net/ethernet.c
+@@ -74,12 +74,12 @@ send_ethernet_packet (struct grub_net_network_level_interface *inf,
+   /* Check if a vlan-tag is present. */
+   if (vlantag != 0)
+     {
+-      *((grub_uint32_t *)eth) = grub_cpu_to_be32 (vlantag);
++      grub_set_unaligned32 (eth, grub_cpu_to_be32 (vlantag));
+       eth += sizeof (vlantag);
+     }
+ 
+   /* Write ethertype */
+-  *((grub_uint16_t*) eth) = grub_cpu_to_be16 (ethertype);
++  grub_set_unaligned16 (eth, grub_cpu_to_be16 (ethertype));
+ 
+   if (!inf->card->opened)
+     {
+@@ -121,15 +121,15 @@ grub_net_recv_ethernet_packet (struct grub_net_buff *nb,
+   grub_memcpy (src_hwaddress.mac, eth, hw_addr_len);
+   eth += hw_addr_len;
+ 
+-  type = grub_be_to_cpu16 (*(grub_uint16_t*)(eth));
++  type = grub_be_to_cpu16 (grub_get_unaligned16 (eth));
+   if (type == VLANTAG_IDENTIFIER)
+     {
+       /* Skip vlan tag */
+       eth += 2;
+-      vlantag = grub_be_to_cpu16 (*(grub_uint16_t*)(eth));
++      vlantag = grub_be_to_cpu16 (grub_get_unaligned16 (eth));
+       etherhdr_size += 4;
+       eth += 2;
+-      type = grub_be_to_cpu16 (*(grub_uint16_t*)(eth));
++      type = grub_be_to_cpu16 (grub_get_unaligned16 (eth));
+     }
+ 
+   err = grub_netbuff_pull (nb, etherhdr_size);
diff --git a/debian/patches/ubuntu-fixup-rhboot-f34-support-non-ethernet.patch b/debian/patches/ubuntu-fixup-rhboot-f34-support-non-ethernet.patch
new file mode 100644
index 0000000..5204d92
--- /dev/null
+++ b/debian/patches/ubuntu-fixup-rhboot-f34-support-non-ethernet.patch
@@ -0,0 +1,25 @@
+From a819547bd60ba1c6088977b7bfe288f4f867fad9 Mon Sep 17 00:00:00 2001
+From: Dimitri John Ledkov <[e-mail]>
+Date: Thu, 10 Dec 2020 13:42:13 +0000
+Subject: UBUNTU: fixup ofnet initialization.
+
+Signed-off-by: Dimitri John Ledkov <[e-mail]>
+
+Patch-Name: ubuntu-fixup-rhboot-f34-support-non-ethernet.patch
+---
+ grub-core/net/drivers/ieee1275/ofnet.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/net/drivers/ieee1275/ofnet.c b/grub-core/net/drivers/ieee1275/ofnet.c
+index 057ba85973..4621b0a346 100644
+--- a/grub-core/net/drivers/ieee1275/ofnet.c
++++ b/grub-core/net/drivers/ieee1275/ofnet.c
+@@ -154,7 +154,7 @@ grub_ieee1275_parse_bootpath (const char *devpath, char *bootpath,
+   char *equal_char = 0;
+   grub_size_t field_counter = 0;
+   grub_net_network_level_address_t client_addr = {0, {0}, 0}, gateway_addr = {0, {0}, 0}, subnet_mask = {0, {0}, 0};
+-  grub_net_link_level_address_t hw_addr = {0, {{0, 0, 0, 0, 0, 0}}};
++  grub_net_link_level_address_t hw_addr = {0, 0, {{0, 0, 0, 0, 0, 0}}};
+   grub_net_interface_flags_t flags = 0;
+   struct grub_net_network_level_interface *inter = NULL;
+   grub_uint16_t vlantag = 0;
diff --git a/debian/patches/ubuntu-flavour-order.patch b/debian/patches/ubuntu-flavour-order.patch
index 4421ecf..30cc2bb 100644
--- a/debian/patches/ubuntu-flavour-order.patch
+++ b/debian/patches/ubuntu-flavour-order.patch
@@ -20,7 +20,7 @@ Patch-Name: ubuntu-flavour-order.patch
  2 files changed, 17 insertions(+), 1 deletion(-)
 
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 72f1e25a0..6c8988fd6 100644
+index 72f1e25a03..6c8988fd60 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
 @@ -260,7 +260,8 @@ export GRUB_DEFAULT \
@@ -34,7 +34,7 @@ index 72f1e25a0..6c8988fd6 100644
  if test "x${grub_cfg}" != "x"; then
    rm -f "${grub_cfg}.new"
 diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
-index fe6319abe..7e2d1bc21 100644
+index fe6319abe0..7e2d1bc214 100644
 --- a/util/grub-mkconfig_lib.in
 +++ b/util/grub-mkconfig_lib.in
 @@ -270,6 +270,21 @@ version_test_gt ()
diff --git a/debian/patches/ubuntu-grub-install-extra-removable.patch b/debian/patches/ubuntu-grub-install-extra-removable.patch
index 3e7211b..d01763e 100644
--- a/debian/patches/ubuntu-grub-install-extra-removable.patch
+++ b/debian/patches/ubuntu-grub-install-extra-removable.patch
@@ -23,7 +23,7 @@ Patch-Name: ubuntu-grub-install-extra-removable.patch
  1 file changed, 133 insertions(+), 2 deletions(-)
 
 diff --git a/util/grub-install.c b/util/grub-install.c
-index 64c292383..030464645 100644
+index 64c292383f..0304646453 100644
 --- a/util/grub-install.c
 +++ b/util/grub-install.c
 @@ -56,6 +56,7 @@
diff --git a/debian/patches/ubuntu-install-signed.patch b/debian/patches/ubuntu-install-signed.patch
index 64e88a0..626fedb 100644
--- a/debian/patches/ubuntu-install-signed.patch
+++ b/debian/patches/ubuntu-install-signed.patch
@@ -19,7 +19,7 @@ Patch-Name: ubuntu-install-signed.patch
  1 file changed, 156 insertions(+), 59 deletions(-)
 
 diff --git a/util/grub-install.c b/util/grub-install.c
-index 3b4606eef..e1e40cf2b 100644
+index 3b4606eef1..e1e40cf2b5 100644
 --- a/util/grub-install.c
 +++ b/util/grub-install.c
 @@ -80,6 +80,7 @@ static char *label_color;
diff --git a/debian/patches/ubuntu-linuxefi-arm64-set-base-addr.patch b/debian/patches/ubuntu-linuxefi-arm64-set-base-addr.patch
index f604a7c..43945f1 100644
--- a/debian/patches/ubuntu-linuxefi-arm64-set-base-addr.patch
+++ b/debian/patches/ubuntu-linuxefi-arm64-set-base-addr.patch
@@ -34,7 +34,7 @@ Patch-Name: ubuntu-linuxefi-arm64-set-base-addr.patch
  1 file changed, 15 insertions(+)
 
 diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
-index f6d30bcf7..a09479cd6 100644
+index f6d30bcf7c..a09479cd6d 100644
 --- a/grub-core/loader/efi/linux.c
 +++ b/grub-core/loader/efi/linux.c
 @@ -72,6 +72,7 @@ grub_err_t
diff --git a/debian/patches/ubuntu-linuxefi-arm64.patch b/debian/patches/ubuntu-linuxefi-arm64.patch
index d9d3f1d..ad770de 100644
--- a/debian/patches/ubuntu-linuxefi-arm64.patch
+++ b/debian/patches/ubuntu-linuxefi-arm64.patch
@@ -17,7 +17,7 @@ Patch-Name: ubuntu-linuxefi-arm64.patch
  1 file changed, 56 insertions(+), 50 deletions(-)
 
 diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index 3f5496fc5..130e9c09b 100644
+index 3f5496fc55..130e9c09b4 100644
 --- a/grub-core/loader/arm64/linux.c
 +++ b/grub-core/loader/arm64/linux.c
 @@ -43,6 +43,8 @@ static int loaded;
diff --git a/debian/patches/ubuntu-linuxefi.patch b/debian/patches/ubuntu-linuxefi.patch
index 5d5b012..750cda6 100644
--- a/debian/patches/ubuntu-linuxefi.patch
+++ b/debian/patches/ubuntu-linuxefi.patch
@@ -358,7 +358,7 @@ Last-Update: 2018-12-07
  create mode 100644 include/grub/sparc64/linux.h
 
 diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
-index 3ea8e7ff4..c6ba5b2d7 100644
+index 3ea8e7ff45..c6ba5b2d76 100644
 --- a/grub-core/Makefile.am
 +++ b/grub-core/Makefile.am
 @@ -71,6 +71,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/command.h
@@ -370,7 +370,7 @@ index 3ea8e7ff4..c6ba5b2d7 100644
  KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env_private.h
  KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/err.h
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index aadb4cdff..1731c53f0 100644
+index aadb4cdff8..1731c53f08 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
 @@ -207,6 +207,7 @@ kernel = {
@@ -428,7 +428,7 @@ index aadb4cdff..1731c53f0 100644
    enable = i386_coreboot;
    enable = efi;
 diff --git a/grub-core/commands/iorw.c b/grub-core/commands/iorw.c
-index a0c164e54..41a7f3f04 100644
+index a0c164e54f..41a7f3f046 100644
 --- a/grub-core/commands/iorw.c
 +++ b/grub-core/commands/iorw.c
 @@ -23,6 +23,7 @@
@@ -460,7 +460,7 @@ index a0c164e54..41a7f3f04 100644
    grub_unregister_extcmd (cmd_read_word);
    grub_unregister_extcmd (cmd_read_dword);