diff --git a/README.debrand b/README.debrand
deleted file mode 100644
index 01c46d2..0000000
--- a/README.debrand
+++ /dev/null
@@ -1,2 +0,0 @@
-Warning: This package was configured for automatic debranding, but the changes
-failed to apply.
diff --git a/SOURCES/0001-Add-support-for-Linux-EFI-stub-loading.patch b/SOURCES/0001-Add-support-for-Linux-EFI-stub-loading.patch
index 88fae3c..6f6fb7e 100644
--- a/SOURCES/0001-Add-support-for-Linux-EFI-stub-loading.patch
+++ b/SOURCES/0001-Add-support-for-Linux-EFI-stub-loading.patch
@@ -45,7 +45,7 @@ moves the check into grub_dl_load_file.
create mode 100644 include/grub/efi/linux.h
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 9590e87d9c0..0b4b0c2122d 100644
+index 9590e87d9..0b4b0c212 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -1626,13 +1626,6 @@ module = {
@@ -89,7 +89,7 @@ index 9590e87d9c0..0b4b0c2122d 100644
module = {
diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
-index e394cd96f8c..04e804d1668 100644
+index e394cd96f..04e804d16 100644
--- a/grub-core/kern/dl.c
+++ b/grub-core/kern/dl.c
@@ -38,6 +38,14 @@
@@ -128,7 +128,7 @@ index e394cd96f8c..04e804d1668 100644
file = grub_file_open (filename);
diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index 708581fcbde..c8a9d8307c0 100644
+index 708581fcb..c8a9d8307 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,
@@ -167,7 +167,7 @@ index 708581fcbde..c8a9d8307c0 100644
/* Search the mods section from the PE32/PE32+ image. This code uses
diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
-index 42ad7c570a5..5cdf6c943f2 100644
+index 42ad7c570..5cdf6c943 100644
--- a/grub-core/kern/efi/mm.c
+++ b/grub-core/kern/efi/mm.c
@@ -113,6 +113,38 @@ grub_efi_drop_alloc (grub_efi_physical_address_t address,
@@ -210,7 +210,7 @@ index 42ad7c570a5..5cdf6c943f2 100644
void *
grub_efi_allocate_pages_real (grub_efi_physical_address_t address,
diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index 1f86229f86b..6c00af98dce 100644
+index 1f86229f8..6c00af98d 100644
--- a/grub-core/loader/arm64/linux.c
+++ b/grub-core/loader/arm64/linux.c
@@ -29,6 +29,7 @@
@@ -391,7 +391,7 @@ index 1f86229f86b..6c00af98dce 100644
linux_args = grub_malloc (cmdline_size);
if (!linux_args)
diff --git a/grub-core/loader/arm64/xen_boot.c b/grub-core/loader/arm64/xen_boot.c
-index 1003a0b9997..f35b16caa92 100644
+index 1003a0b99..f35b16caa 100644
--- a/grub-core/loader/arm64/xen_boot.c
+++ b/grub-core/loader/arm64/xen_boot.c
@@ -266,7 +266,6 @@ xen_boot (void)
@@ -404,7 +404,7 @@ index 1003a0b9997..f35b16caa92 100644
diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
new file mode 100644
-index 00000000000..c24202a5dd1
+index 000000000..c24202a5d
--- /dev/null
+++ b/grub-core/loader/efi/linux.c
@@ -0,0 +1,70 @@
@@ -480,7 +480,7 @@ index 00000000000..c24202a5dd1
+#pragma GCC diagnostic pop
diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
new file mode 100644
-index 00000000000..3db82e782df
+index 000000000..3db82e782
--- /dev/null
+++ b/grub-core/loader/i386/efi/linux.c
@@ -0,0 +1,335 @@
@@ -820,7 +820,7 @@ index 00000000000..3db82e782df
+ grub_unregister_command (cmd_initrdefi);
+}
diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
-index b69cb7a3a7f..a3c87cf2fc2 100644
+index b69cb7a3a..a3c87cf2f 100644
--- a/grub-core/loader/i386/pc/linux.c
+++ b/grub-core/loader/i386/pc/linux.c
@@ -468,14 +468,20 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
@@ -854,7 +854,7 @@ index b69cb7a3a7f..a3c87cf2fc2 100644
+ grub_unregister_command (cmd_initrd16);
}
diff --git a/include/grub/arm/linux.h b/include/grub/arm/linux.h
-index 712ba17b9ba..5900fc8a40c 100644
+index 712ba17b9..5900fc8a4 100644
--- a/include/grub/arm/linux.h
+++ b/include/grub/arm/linux.h
@@ -20,6 +20,7 @@
@@ -884,7 +884,7 @@ index 712ba17b9ba..5900fc8a40c 100644
#if defined GRUB_MACHINE_UBOOT
diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h
-index 8655067e039..7b533b57139 100644
+index 8655067e0..7b533b571 100644
--- a/include/grub/arm64/linux.h
+++ b/include/grub/arm64/linux.h
@@ -19,6 +19,8 @@
@@ -915,7 +915,7 @@ index 8655067e039..7b533b57139 100644
#endif /* ! GRUB_ARM64_LINUX_HEADER */
diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
-index 2c6648d46fc..1061aee9726 100644
+index 2c6648d46..1061aee97 100644
--- a/include/grub/efi/efi.h
+++ b/include/grub/efi/efi.h
@@ -47,6 +47,9 @@ EXPORT_FUNC(grub_efi_allocate_fixed) (grub_efi_physical_address_t address,
@@ -948,7 +948,7 @@ index 2c6648d46fc..1061aee9726 100644
grub_addr_t grub_efi_modules_addr (void);
diff --git a/include/grub/efi/linux.h b/include/grub/efi/linux.h
new file mode 100644
-index 00000000000..d9ede36773b
+index 000000000..d9ede3677
--- /dev/null
+++ b/include/grub/efi/linux.h
@@ -0,0 +1,31 @@
@@ -984,7 +984,7 @@ index 00000000000..d9ede36773b
+
+#endif /* ! GRUB_EFI_LINUX_HEADER */
diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h
-index 60c7c3b5e66..bb19dbd5a77 100644
+index 60c7c3b5e..bb19dbd5a 100644
--- a/include/grub/i386/linux.h
+++ b/include/grub/i386/linux.h
@@ -142,6 +142,7 @@ struct linux_i386_kernel_header
diff --git a/SOURCES/0002-Rework-linux-command.patch b/SOURCES/0002-Rework-linux-command.patch
index 485541f..b8143aa 100644
--- a/SOURCES/0002-Rework-linux-command.patch
+++ b/SOURCES/0002-Rework-linux-command.patch
@@ -11,7 +11,7 @@ before pulling out the individual blocks later on.
1 file changed, 24 insertions(+), 13 deletions(-)
diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
-index 9b53d3168f9..f7186be4002 100644
+index 9b53d3168..f7186be40 100644
--- a/grub-core/loader/i386/linux.c
+++ b/grub-core/loader/i386/linux.c
@@ -685,13 +685,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
diff --git a/SOURCES/0003-Rework-linux16-command.patch b/SOURCES/0003-Rework-linux16-command.patch
index 99d6e7c..2b4b8dd 100644
--- a/SOURCES/0003-Rework-linux16-command.patch
+++ b/SOURCES/0003-Rework-linux16-command.patch
@@ -11,7 +11,7 @@ before pulling out the individual blocks later on.
1 file changed, 21 insertions(+), 13 deletions(-)
diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
-index a3c87cf2fc2..caa76bee8af 100644
+index a3c87cf2f..caa76bee8 100644
--- a/grub-core/loader/i386/pc/linux.c
+++ b/grub-core/loader/i386/pc/linux.c
@@ -123,13 +123,14 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
diff --git a/SOURCES/0004-Add-secureboot-support-on-efi-chainloader.patch b/SOURCES/0004-Add-secureboot-support-on-efi-chainloader.patch
index 6a347d8..50781d6 100644
--- a/SOURCES/0004-Add-secureboot-support-on-efi-chainloader.patch
+++ b/SOURCES/0004-Add-secureboot-support-on-efi-chainloader.patch
@@ -175,7 +175,7 @@ Signed-off-by: Laszlo Ersek <lersek@redhat.com>
7 files changed, 840 insertions(+), 91 deletions(-)
diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index c8a9d8307c0..91129e33566 100644
+index c8a9d8307..91129e335 100644
--- a/grub-core/kern/efi/efi.c
+++ b/grub-core/kern/efi/efi.c
@@ -283,14 +283,20 @@ grub_efi_secure_boot (void)
@@ -204,7 +204,7 @@ index c8a9d8307c0..91129e33566 100644
if (*secure_boot && !*setup_mode)
ret = 1;
diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index 6c00af98dce..a1ac7a38867 100644
+index 6c00af98d..a1ac7a388 100644
--- a/grub-core/loader/arm64/linux.c
+++ b/grub-core/loader/arm64/linux.c
@@ -282,6 +282,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
@@ -226,7 +226,7 @@ index 6c00af98dce..a1ac7a38867 100644
grub_error (GRUB_ERR_INVALID_COMMAND, N_("%s has invalid signature"), argv[0]);
goto fail;
diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index adc85636633..af2189619a3 100644
+index adc856366..af2189619 100644
--- a/grub-core/loader/efi/chainloader.c
+++ b/grub-core/loader/efi/chainloader.c
@@ -32,6 +32,8 @@
@@ -1173,7 +1173,7 @@ index adc85636633..af2189619a3 100644
return grub_errno;
diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
-index c24202a5dd1..c8ecce6dfd0 100644
+index c24202a5d..c8ecce6df 100644
--- a/grub-core/loader/efi/linux.c
+++ b/grub-core/loader/efi/linux.c
@@ -33,21 +33,34 @@ struct grub_efi_shim_lock
@@ -1218,7 +1218,7 @@ index c24202a5dd1..c8ecce6dfd0 100644
#pragma GCC diagnostic push
diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index 3db82e782df..8db228c5bf5 100644
+index 3db82e782..8db228c5b 100644
--- a/grub-core/loader/i386/efi/linux.c
+++ b/grub-core/loader/i386/efi/linux.c
@@ -118,6 +118,8 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
@@ -1286,7 +1286,7 @@ index 3db82e782df..8db228c5bf5 100644
grub_file_close (file);
diff --git a/include/grub/efi/linux.h b/include/grub/efi/linux.h
-index d9ede36773b..0033d9305a9 100644
+index d9ede3677..0033d9305 100644
--- a/include/grub/efi/linux.h
+++ b/include/grub/efi/linux.h
@@ -22,7 +22,7 @@
@@ -1299,7 +1299,7 @@ index d9ede36773b..0033d9305a9 100644
grub_err_t
EXPORT_FUNC(grub_efi_linux_boot) (void *kernel_address, grub_off_t offset,
diff --git a/include/grub/efi/pe32.h b/include/grub/efi/pe32.h
-index 7d44732d2c3..c03cc599f63 100644
+index 7d44732d2..c03cc599f 100644
--- a/include/grub/efi/pe32.h
+++ b/include/grub/efi/pe32.h
@@ -214,7 +214,11 @@ struct grub_pe64_optional_header
diff --git a/SOURCES/0005-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch b/SOURCES/0005-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch
index 3c86bee..7286c16 100644
--- a/SOURCES/0005-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch
+++ b/SOURCES/0005-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch
@@ -38,7 +38,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
create mode 100644 include/grub/sparc64/linux.h
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 0b4b0c2122d..e92a7ef322f 100644
+index 0b4b0c212..e92a7ef32 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -195,6 +195,7 @@ kernel = {
@@ -50,7 +50,7 @@ index 0b4b0c2122d..e92a7ef322f 100644
x86 = kern/i386/tsc.c;
x86 = kern/i386/tsc_pit.c;
diff --git a/grub-core/commands/iorw.c b/grub-core/commands/iorw.c
-index a0c164e54f0..41a7f3f0466 100644
+index a0c164e54..41a7f3f04 100644
--- a/grub-core/commands/iorw.c
+++ b/grub-core/commands/iorw.c
@@ -23,6 +23,7 @@
@@ -82,7 +82,7 @@ index a0c164e54f0..41a7f3f0466 100644
grub_unregister_extcmd (cmd_read_word);
grub_unregister_extcmd (cmd_read_dword);
diff --git a/grub-core/commands/memrw.c b/grub-core/commands/memrw.c
-index 98769eadb34..088cbe9e2bc 100644
+index 98769eadb..088cbe9e2 100644
--- a/grub-core/commands/memrw.c
+++ b/grub-core/commands/memrw.c
@@ -22,6 +22,7 @@
@@ -114,7 +114,7 @@ index 98769eadb34..088cbe9e2bc 100644
grub_unregister_extcmd (cmd_read_word);
grub_unregister_extcmd (cmd_read_dword);
diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
-index 04e804d1668..621070918d4 100644
+index 04e804d16..621070918 100644
--- a/grub-core/kern/dl.c
+++ b/grub-core/kern/dl.c
@@ -32,6 +32,7 @@
@@ -126,7 +126,7 @@ index 04e804d1668..621070918d4 100644
/* Platforms where modules are in a readonly area of memory. */
#if defined(GRUB_MACHINE_QEMU)
diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index 91129e33566..708581fcbde 100644
+index 91129e335..708581fcb 100644
--- a/grub-core/kern/efi/efi.c
+++ b/grub-core/kern/efi/efi.c
@@ -273,40 +273,6 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
@@ -172,7 +172,7 @@ index 91129e33566..708581fcbde 100644
/* Search the mods section from the PE32/PE32+ image. This code uses
diff --git a/grub-core/kern/efi/sb.c b/grub-core/kern/efi/sb.c
new file mode 100644
-index 00000000000..d74778b0cac
+index 000000000..d74778b0c
--- /dev/null
+++ b/grub-core/kern/efi/sb.c
@@ -0,0 +1,64 @@
@@ -241,7 +241,7 @@ index 00000000000..d74778b0cac
+#endif
+}
diff --git a/grub-core/loader/efi/appleloader.c b/grub-core/loader/efi/appleloader.c
-index 74888c463ba..69c2a10d351 100644
+index 74888c463..69c2a10d3 100644
--- a/grub-core/loader/efi/appleloader.c
+++ b/grub-core/loader/efi/appleloader.c
@@ -24,6 +24,7 @@
@@ -272,7 +272,7 @@ index 74888c463ba..69c2a10d351 100644
grub_unregister_command (cmd);
}
diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index af2189619a3..5cd9b6e08a8 100644
+index af2189619..5cd9b6e08 100644
--- a/grub-core/loader/efi/chainloader.c
+++ b/grub-core/loader/efi/chainloader.c
@@ -34,6 +34,7 @@
@@ -284,7 +284,7 @@ index af2189619a3..5cd9b6e08a8 100644
#include <grub/i18n.h>
#include <grub/net.h>
diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
-index 7f96515da65..87709aa23e8 100644
+index 7f96515da..87709aa23 100644
--- a/grub-core/loader/i386/bsd.c
+++ b/grub-core/loader/i386/bsd.c
@@ -38,6 +38,7 @@
@@ -316,7 +316,7 @@ index 7f96515da65..87709aa23e8 100644
grub_unregister_extcmd (cmd_openbsd);
grub_unregister_extcmd (cmd_netbsd);
diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
-index f7186be4002..c84747ea857 100644
+index f7186be40..c84747ea8 100644
--- a/grub-core/loader/i386/linux.c
+++ b/grub-core/loader/i386/linux.c
@@ -35,6 +35,7 @@
@@ -348,7 +348,7 @@ index f7186be4002..c84747ea857 100644
grub_unregister_command (cmd_initrd);
}
diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
-index caa76bee8af..783a3cd93bc 100644
+index caa76bee8..783a3cd93 100644
--- a/grub-core/loader/i386/pc/linux.c
+++ b/grub-core/loader/i386/pc/linux.c
@@ -35,6 +35,7 @@
@@ -380,7 +380,7 @@ index caa76bee8af..783a3cd93bc 100644
grub_unregister_command (cmd_linux16);
grub_unregister_command (cmd_initrd);
diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c
-index 40c67e82489..26df46a4161 100644
+index 40c67e824..26df46a41 100644
--- a/grub-core/loader/multiboot.c
+++ b/grub-core/loader/multiboot.c
@@ -50,6 +50,7 @@
@@ -412,7 +412,7 @@ index 40c67e82489..26df46a4161 100644
grub_unregister_command (cmd_module);
}
diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c
-index c9885b1bcd7..df8dfdb4ba0 100644
+index c9885b1bc..df8dfdb4b 100644
--- a/grub-core/loader/xnu.c
+++ b/grub-core/loader/xnu.c
@@ -33,6 +33,7 @@
@@ -444,7 +444,7 @@ index c9885b1bcd7..df8dfdb4ba0 100644
grub_unregister_command (cmd_resume);
#endif
diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
-index 1061aee9726..39480b38674 100644
+index 1061aee97..39480b386 100644
--- a/include/grub/efi/efi.h
+++ b/include/grub/efi/efi.h
@@ -85,7 +85,6 @@ EXPORT_FUNC (grub_efi_set_variable) (const char *var,
@@ -457,7 +457,7 @@ index 1061aee9726..39480b38674 100644
const grub_efi_device_path_t *dp2);
diff --git a/include/grub/efi/sb.h b/include/grub/efi/sb.h
new file mode 100644
-index 00000000000..9629fbb0f9e
+index 000000000..9629fbb0f
--- /dev/null
+++ b/include/grub/efi/sb.h
@@ -0,0 +1,29 @@
@@ -492,18 +492,18 @@ index 00000000000..9629fbb0f9e
+#endif /* ! GRUB_EFI_SB_HEADER */
diff --git a/include/grub/ia64/linux.h b/include/grub/ia64/linux.h
new file mode 100644
-index 00000000000..e69de29bb2d
+index 000000000..e69de29bb
diff --git a/include/grub/mips/linux.h b/include/grub/mips/linux.h
new file mode 100644
-index 00000000000..e69de29bb2d
+index 000000000..e69de29bb
diff --git a/include/grub/powerpc/linux.h b/include/grub/powerpc/linux.h
new file mode 100644
-index 00000000000..e69de29bb2d
+index 000000000..e69de29bb
diff --git a/include/grub/sparc64/linux.h b/include/grub/sparc64/linux.h
new file mode 100644
-index 00000000000..e69de29bb2d
+index 000000000..e69de29bb
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
-index f4ff62b769a..9c69aa88626 100644
+index f4ff62b76..9c69aa886 100644
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -71,6 +71,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/command.h
diff --git a/SOURCES/0006-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch b/SOURCES/0006-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch
index 76b1183..f836fa5 100644
--- a/SOURCES/0006-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch
+++ b/SOURCES/0006-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch
@@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
3 files changed, 89 insertions(+), 37 deletions(-)
diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
-index c8ecce6dfd0..0622dfa48d4 100644
+index c8ecce6df..0622dfa48 100644
--- a/grub-core/loader/efi/linux.c
+++ b/grub-core/loader/efi/linux.c
@@ -69,12 +69,17 @@ grub_linuxefi_secure_validate (void *data, grub_uint32_t size)
@@ -37,7 +37,7 @@ index c8ecce6dfd0..0622dfa48d4 100644
return GRUB_ERR_BUG;
diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index 8db228c5bf5..800c3e54022 100644
+index 8db228c5b..800c3e540 100644
--- a/grub-core/loader/i386/efi/linux.c
+++ b/grub-core/loader/i386/efi/linux.c
@@ -44,14 +44,10 @@ static char *linux_cmdline;
@@ -244,7 +244,7 @@ index 8db228c5bf5..800c3e54022 100644
if (kernel_mem && !loaded)
grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)kernel_mem,
diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h
-index bb19dbd5a77..8474a857ed2 100644
+index bb19dbd5a..8474a857e 100644
--- a/include/grub/i386/linux.h
+++ b/include/grub/i386/linux.h
@@ -133,7 +133,12 @@ struct linux_i386_kernel_header
diff --git a/SOURCES/0007-re-write-.gitignore.patch b/SOURCES/0007-re-write-.gitignore.patch
index 34deea7..4a65068 100644
--- a/SOURCES/0007-re-write-.gitignore.patch
+++ b/SOURCES/0007-re-write-.gitignore.patch
@@ -24,7 +24,7 @@ Subject: [PATCH] re-write .gitignore
create mode 100644 util/bash-completion.d/.gitignore
diff --git a/.gitignore b/.gitignore
-index eca17bec9b8..43f04d47277 100644
+index eca17bec9..43f04d472 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,249 +1,126 @@
@@ -396,7 +396,7 @@ index eca17bec9b8..43f04d47277 100644
+/widthspec.h
diff --git a/build-aux/.gitignore b/build-aux/.gitignore
new file mode 100644
-index 00000000000..f2f17aab9ff
+index 000000000..f2f17aab9
--- /dev/null
+++ b/build-aux/.gitignore
@@ -0,0 +1,9 @@
@@ -411,7 +411,7 @@ index 00000000000..f2f17aab9ff
+/texinfo.tex
diff --git a/docs/.gitignore b/docs/.gitignore
new file mode 100644
-index 00000000000..91aee84d3e9
+index 000000000..91aee84d3
--- /dev/null
+++ b/docs/.gitignore
@@ -0,0 +1,4 @@
@@ -421,7 +421,7 @@ index 00000000000..91aee84d3e9
+/version*.texi
diff --git a/grub-core/.gitignore b/grub-core/.gitignore
new file mode 100644
-index 00000000000..c738ac6c649
+index 000000000..c738ac6c6
--- /dev/null
+++ b/grub-core/.gitignore
@@ -0,0 +1,15 @@
@@ -442,7 +442,7 @@ index 00000000000..c738ac6c649
+/trigtables.c
diff --git a/grub-core/gnulib/.gitignore b/grub-core/gnulib/.gitignore
new file mode 100644
-index 00000000000..29e199c2db4
+index 000000000..29e199c2d
--- /dev/null
+++ b/grub-core/gnulib/.gitignore
@@ -0,0 +1,22 @@
@@ -470,14 +470,14 @@ index 00000000000..29e199c2db4
+/wctype.h
diff --git a/grub-core/lib/.gitignore b/grub-core/lib/.gitignore
new file mode 100644
-index 00000000000..68154591404
+index 000000000..681545914
--- /dev/null
+++ b/grub-core/lib/.gitignore
@@ -0,0 +1 @@
+/libgcrypt-grub/
diff --git a/include/grub/gcrypt/.gitignore b/include/grub/gcrypt/.gitignore
new file mode 100644
-index 00000000000..8fbf5646246
+index 000000000..8fbf56462
--- /dev/null
+++ b/include/grub/gcrypt/.gitignore
@@ -0,0 +1,2 @@
@@ -485,7 +485,7 @@ index 00000000000..8fbf5646246
+gcrypt.h
diff --git a/po/.gitignore b/po/.gitignore
new file mode 100644
-index 00000000000..97b679c3138
+index 000000000..97b679c31
--- /dev/null
+++ b/po/.gitignore
@@ -0,0 +1,4 @@
@@ -495,7 +495,7 @@ index 00000000000..97b679c3138
+/stamp-po
diff --git a/util/bash-completion.d/.gitignore b/util/bash-completion.d/.gitignore
new file mode 100644
-index 00000000000..b7e1eb12428
+index 000000000..b7e1eb124
--- /dev/null
+++ b/util/bash-completion.d/.gitignore
@@ -0,0 +1 @@
diff --git a/SOURCES/0008-IBM-client-architecture-CAS-reboot-support.patch b/SOURCES/0008-IBM-client-architecture-CAS-reboot-support.patch
index 0dcaa0a..8a0842a 100644
--- a/SOURCES/0008-IBM-client-architecture-CAS-reboot-support.patch
+++ b/SOURCES/0008-IBM-client-architecture-CAS-reboot-support.patch
@@ -25,7 +25,7 @@ parameters
4 files changed, 91 insertions(+)
diff --git a/grub-core/kern/ieee1275/openfw.c b/grub-core/kern/ieee1275/openfw.c
-index 62929d983bf..2d53c0e8608 100644
+index 62929d983..2d53c0e86 100644
--- a/grub-core/kern/ieee1275/openfw.c
+++ b/grub-core/kern/ieee1275/openfw.c
@@ -588,3 +588,66 @@ grub_ieee1275_get_boot_dev (void)
@@ -96,7 +96,7 @@ index 62929d983bf..2d53c0e8608 100644
+ return 0;
+}
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 78a70a8bf47..249e19bc788 100644
+index 78a70a8bf..249e19bc7 100644
--- a/grub-core/normal/main.c
+++ b/grub-core/normal/main.c
@@ -33,6 +33,9 @@
@@ -133,7 +133,7 @@ index 78a70a8bf47..249e19bc788 100644
grub_errno = GRUB_ERR_NONE;
}
diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
-index a8502d90711..ab78ca87f90 100644
+index a8502d907..ab78ca87f 100644
--- a/grub-core/script/execute.c
+++ b/grub-core/script/execute.c
@@ -27,6 +27,9 @@
@@ -158,7 +158,7 @@ index a8502d90711..ab78ca87f90 100644
{
char *line;
diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h
-index 8868f3a756f..2310f33dbc2 100644
+index 8868f3a75..2310f33db 100644
--- a/include/grub/ieee1275/ieee1275.h
+++ b/include/grub/ieee1275/ieee1275.h
@@ -252,6 +252,8 @@ int EXPORT_FUNC(grub_ieee1275_devalias_next) (struct grub_ieee1275_devalias *ali
diff --git a/SOURCES/0009-for-ppc-reset-console-display-attr-when-clear-screen.patch b/SOURCES/0009-for-ppc-reset-console-display-attr-when-clear-screen.patch
index ac67453..78a10f7 100644
--- a/SOURCES/0009-for-ppc-reset-console-display-attr-when-clear-screen.patch
+++ b/SOURCES/0009-for-ppc-reset-console-display-attr-when-clear-screen.patch
@@ -15,7 +15,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/term/terminfo.c b/grub-core/term/terminfo.c
-index d317efa368d..29df35e6d20 100644
+index d317efa36..29df35e6d 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/SOURCES/0010-Disable-GRUB-video-support-for-IBM-power-machines.patch b/SOURCES/0010-Disable-GRUB-video-support-for-IBM-power-machines.patch
index ab411af..c630234 100644
--- a/SOURCES/0010-Disable-GRUB-video-support-for-IBM-power-machines.patch
+++ b/SOURCES/0010-Disable-GRUB-video-support-for-IBM-power-machines.patch
@@ -12,7 +12,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=973205
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/grub-core/kern/ieee1275/cmain.c b/grub-core/kern/ieee1275/cmain.c
-index 3e12e6b24e1..3e14f539368 100644
+index 3e12e6b24..3e14f5393 100644
--- a/grub-core/kern/ieee1275/cmain.c
+++ b/grub-core/kern/ieee1275/cmain.c
@@ -90,7 +90,10 @@ grub_ieee1275_find_options (void)
@@ -28,7 +28,7 @@ index 3e12e6b24e1..3e14f539368 100644
/* Old Macs have no key repeat, newer ones have fully working one.
The ones inbetween when repeated key generates an escaoe sequence
diff --git a/grub-core/video/ieee1275.c b/grub-core/video/ieee1275.c
-index 17a3dbbb575..b8e4b3feb32 100644
+index 17a3dbbb5..b8e4b3feb 100644
--- a/grub-core/video/ieee1275.c
+++ b/grub-core/video/ieee1275.c
@@ -352,9 +352,12 @@ static struct grub_video_adapter grub_video_ieee1275_adapter =
@@ -48,7 +48,7 @@ index 17a3dbbb575..b8e4b3feb32 100644
GRUB_MOD_FINI(ieee1275_fb)
diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h
-index 2310f33dbc2..ca08bd96681 100644
+index 2310f33db..ca08bd966 100644
--- a/include/grub/ieee1275/ieee1275.h
+++ b/include/grub/ieee1275/ieee1275.h
@@ -146,6 +146,8 @@ enum grub_ieee1275_flag
diff --git a/SOURCES/0011-Honor-a-symlink-when-generating-configuration-by-gru.patch b/SOURCES/0011-Honor-a-symlink-when-generating-configuration-by-gru.patch
index 1ea476c..8cd707a 100644
--- a/SOURCES/0011-Honor-a-symlink-when-generating-configuration-by-gru.patch
+++ b/SOURCES/0011-Honor-a-symlink-when-generating-configuration-by-gru.patch
@@ -11,7 +11,7 @@ the -o option follows it rather than overwriting it with a regular file.
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 33332360eec..bc5a3f17541 100644
+index 33332360e..bc5a3f175 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -287,7 +287,8 @@ and /etc/grub.d/* files or please file a bug report with
diff --git a/SOURCES/0012-Move-bash-completion-script-922997.patch b/SOURCES/0012-Move-bash-completion-script-922997.patch
index 6c3c773..0107bea 100644
--- a/SOURCES/0012-Move-bash-completion-script-922997.patch
+++ b/SOURCES/0012-Move-bash-completion-script-922997.patch
@@ -10,7 +10,7 @@ Apparently these go in a new place now.
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index c7888e40f66..783118ccdcd 100644
+index c7888e40f..783118ccd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -289,6 +289,14 @@ AC_SUBST(grubdirname)
@@ -39,7 +39,7 @@ index c7888e40f66..783118ccdcd 100644
if test "x$target_alias" != x && test "x$host_alias" != "x$target_alias"; then
tmp_ac_tool_prefix="$ac_tool_prefix"
diff --git a/util/bash-completion.d/Makefile.am b/util/bash-completion.d/Makefile.am
-index 136287cf1bf..61108f05429 100644
+index 136287cf1..61108f054 100644
--- a/util/bash-completion.d/Makefile.am
+++ b/util/bash-completion.d/Makefile.am
@@ -6,7 +6,6 @@ EXTRA_DIST = $(bash_completion_source)
diff --git a/SOURCES/0013-Update-to-minilzo-2.08.patch b/SOURCES/0013-Update-to-minilzo-2.08.patch
index a71c501..13160c3 100644
--- a/SOURCES/0013-Update-to-minilzo-2.08.patch
+++ b/SOURCES/0013-Update-to-minilzo-2.08.patch
@@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
4 files changed, 4489 insertions(+), 1869 deletions(-)
diff --git a/grub-core/lib/minilzo/minilzo.c b/grub-core/lib/minilzo/minilzo.c
-index 25a1f68b3b5..ab2be5f4fd0 100644
+index 25a1f68b3..ab2be5f4f 100644
--- a/grub-core/lib/minilzo/minilzo.c
+++ b/grub-core/lib/minilzo/minilzo.c
@@ -2,22 +2,7 @@
@@ -5251,7 +5251,7 @@ index 25a1f68b3b5..ab2be5f4fd0 100644
/***** End of minilzo.c *****/
-
diff --git a/grub-core/lib/minilzo/lzoconf.h b/grub-core/lib/minilzo/lzoconf.h
-index 1d0fe14fcda..61be29c5dc2 100644
+index 1d0fe14fc..61be29c5d 100644
--- a/grub-core/lib/minilzo/lzoconf.h
+++ b/grub-core/lib/minilzo/lzoconf.h
@@ -2,22 +2,7 @@
@@ -5590,7 +5590,7 @@ index 1d0fe14fcda..61be29c5dc2 100644
-/* vim:set ts=4 et: */
+/* vim:set ts=4 sw=4 et: */
diff --git a/grub-core/lib/minilzo/lzodefs.h b/grub-core/lib/minilzo/lzodefs.h
-index 0e40e332a8d..f4ae9487ebe 100644
+index 0e40e332a..f4ae9487e 100644
--- a/grub-core/lib/minilzo/lzodefs.h
+++ b/grub-core/lib/minilzo/lzodefs.h
@@ -2,22 +2,7 @@
@@ -8462,7 +8462,7 @@ index 0e40e332a8d..f4ae9487ebe 100644
-/* vim:set ts=4 et: */
+/* vim:set ts=4 sw=4 et: */
diff --git a/grub-core/lib/minilzo/minilzo.h b/grub-core/lib/minilzo/minilzo.h
-index 74fefa9fe20..79374546748 100644
+index 74fefa9fe..793745467 100644
--- a/grub-core/lib/minilzo/minilzo.h
+++ b/grub-core/lib/minilzo/minilzo.h
@@ -2,22 +2,7 @@
diff --git a/SOURCES/0014-Allow-fallback-to-include-entries-by-title-not-just-.patch b/SOURCES/0014-Allow-fallback-to-include-entries-by-title-not-just-.patch
index bee65ed..7ca1f9b 100644
--- a/SOURCES/0014-Allow-fallback-to-include-entries-by-title-not-just-.patch
+++ b/SOURCES/0014-Allow-fallback-to-include-entries-by-title-not-just-.patch
@@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 58 insertions(+), 27 deletions(-)
diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
-index e7a83c2d6e2..d2f64b05e0a 100644
+index e7a83c2d6..d2f64b05e 100644
--- a/grub-core/normal/menu.c
+++ b/grub-core/normal/menu.c
@@ -163,16 +163,41 @@ grub_menu_set_timeout (int timeout)
diff --git a/SOURCES/0015-Add-GRUB_DISABLE_UUID.patch b/SOURCES/0015-Add-GRUB_DISABLE_UUID.patch
index a6856d2..8b77ebe 100644
--- a/SOURCES/0015-Add-GRUB_DISABLE_UUID.patch
+++ b/SOURCES/0015-Add-GRUB_DISABLE_UUID.patch
@@ -15,7 +15,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
3 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/docs/grub.texi b/docs/grub.texi
-index 2adfa97bee8..2fd32608c01 100644
+index 2adfa97be..2fd32608c 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -1441,6 +1441,13 @@ enable the use of partition UUIDs, set this option to @samp{false}.
@@ -33,7 +33,7 @@ index 2adfa97bee8..2fd32608c01 100644
If graphical video support is required, either because the @samp{gfxterm}
graphical terminal is in use or because @samp{GRUB_GFXPAYLOAD_LINUX} is set,
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index bc5a3f17541..b0a8626dd1c 100644
+index bc5a3f175..b0a8626dd 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -133,12 +133,12 @@ fi
@@ -83,7 +83,7 @@ index bc5a3f17541..b0a8626dd1c 100644
GRUB_GFXMODE \
GRUB_BACKGROUND \
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
-index 0f801cab3e4..1001a12232b 100644
+index 0f801cab3..1001a1223 100644
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -156,7 +156,7 @@ prepare_grub_to_access_device ()
diff --git a/SOURCES/0016-Make-exit-take-a-return-code.patch b/SOURCES/0016-Make-exit-take-a-return-code.patch
index 937c774..437a360 100644
--- a/SOURCES/0016-Make-exit-take-a-return-code.patch
+++ b/SOURCES/0016-Make-exit-take-a-return-code.patch
@@ -27,7 +27,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
14 files changed, 39 insertions(+), 21 deletions(-)
diff --git a/grub-core/commands/minicmd.c b/grub-core/commands/minicmd.c
-index a3a11824172..b25ca4b9f17 100644
+index a3a118241..b25ca4b9f 100644
--- a/grub-core/commands/minicmd.c
+++ b/grub-core/commands/minicmd.c
@@ -176,12 +176,24 @@ grub_mini_cmd_lsmod (struct grub_command *cmd __attribute__ ((unused)),
@@ -60,7 +60,7 @@ index a3a11824172..b25ca4b9f17 100644
}
diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index 708581fcbde..e339f264b3a 100644
+index 708581fcb..e339f264b 100644
--- a/grub-core/kern/efi/efi.c
+++ b/grub-core/kern/efi/efi.c
@@ -164,11 +164,16 @@ grub_reboot (void)
@@ -83,7 +83,7 @@ index 708581fcbde..e339f264b3a 100644
}
diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
-index 425bb960347..55ea5a11ccd 100644
+index 425bb9603..55ea5a11c 100644
--- a/grub-core/kern/emu/main.c
+++ b/grub-core/kern/emu/main.c
@@ -67,7 +67,7 @@ grub_reboot (void)
@@ -96,7 +96,7 @@ index 425bb960347..55ea5a11ccd 100644
grub_reboot ();
}
diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
-index 76661337f10..82012a72fcb 100644
+index 76661337f..82012a72f 100644
--- a/grub-core/kern/emu/misc.c
+++ b/grub-core/kern/emu/misc.c
@@ -137,9 +137,10 @@ xasprintf (const char *fmt, ...)
@@ -113,7 +113,7 @@ index 76661337f10..82012a72fcb 100644
#endif
diff --git a/grub-core/kern/i386/coreboot/init.c b/grub-core/kern/i386/coreboot/init.c
-index 3314f027fec..36f9134b7b7 100644
+index 3314f027f..36f9134b7 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[];
@@ -126,7 +126,7 @@ index 3314f027fec..36f9134b7b7 100644
/* 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 271b6fbfabd..9fafe98f015 100644
+index 271b6fbfa..9fafe98f0 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[];
@@ -139,7 +139,7 @@ index 271b6fbfabd..9fafe98f015 100644
/* 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 0d8ebf58b95..f5423ce27d9 100644
+index 0d8ebf58b..f5423ce27 100644
--- a/grub-core/kern/ieee1275/init.c
+++ b/grub-core/kern/ieee1275/init.c
@@ -68,7 +68,7 @@ grub_addr_t grub_ieee1275_original_stack;
@@ -152,7 +152,7 @@ index 0d8ebf58b95..f5423ce27d9 100644
grub_ieee1275_exit ();
}
diff --git a/grub-core/kern/mips/arc/init.c b/grub-core/kern/mips/arc/init.c
-index 3834a149093..86b3a25ec40 100644
+index 3834a1490..86b3a25ec 100644
--- a/grub-core/kern/mips/arc/init.c
+++ b/grub-core/kern/mips/arc/init.c
@@ -276,7 +276,7 @@ grub_halt (void)
@@ -165,7 +165,7 @@ index 3834a149093..86b3a25ec40 100644
GRUB_ARC_FIRMWARE_VECTOR->exit ();
diff --git a/grub-core/kern/mips/loongson/init.c b/grub-core/kern/mips/loongson/init.c
-index 7b96531b983..dff598ca7b0 100644
+index 7b96531b9..dff598ca7 100644
--- a/grub-core/kern/mips/loongson/init.c
+++ b/grub-core/kern/mips/loongson/init.c
@@ -304,7 +304,7 @@ grub_halt (void)
@@ -178,7 +178,7 @@ index 7b96531b983..dff598ca7b0 100644
grub_halt ();
}
diff --git a/grub-core/kern/mips/qemu_mips/init.c b/grub-core/kern/mips/qemu_mips/init.c
-index be88b77d22d..8b6c55ffc01 100644
+index be88b77d2..8b6c55ffc 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)))
@@ -191,7 +191,7 @@ index be88b77d22d..8b6c55ffc01 100644
grub_halt ();
}
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index 3b633d51f4c..952411d5dc6 100644
+index 3b633d51f..952411d5d 100644
--- a/grub-core/kern/misc.c
+++ b/grub-core/kern/misc.c
@@ -1095,7 +1095,7 @@ grub_abort (void)
@@ -204,7 +204,7 @@ index 3b633d51f4c..952411d5dc6 100644
void
diff --git a/grub-core/kern/uboot/init.c b/grub-core/kern/uboot/init.c
-index 3e338645c57..be2a5be1d07 100644
+index 3e338645c..be2a5be1d 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;
@@ -229,7 +229,7 @@ index 3e338645c57..be2a5be1d07 100644
else if (ver > API_SIG_VERSION)
{
diff --git a/grub-core/kern/xen/init.c b/grub-core/kern/xen/init.c
-index 0559c033c3d..fce526d417b 100644
+index 0559c033c..fce526d41 100644
--- a/grub-core/kern/xen/init.c
+++ b/grub-core/kern/xen/init.c
@@ -549,7 +549,7 @@ grub_machine_init (void)
@@ -242,7 +242,7 @@ index 0559c033c3d..fce526d417b 100644
struct sched_shutdown arg;
diff --git a/include/grub/misc.h b/include/grub/misc.h
-index 372f009e84f..83fd69f4ada 100644
+index 372f009e8..83fd69f4a 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,
diff --git a/SOURCES/0017-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch b/SOURCES/0017-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch
index 942116a..d5ec678 100644
--- a/SOURCES/0017-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch
+++ b/SOURCES/0017-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch
@@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
-index 00000000000..33ffaa40460
+index 000000000..33ffaa404
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
diff --git a/SOURCES/0018-Make-efi-machines-load-an-env-block-from-a-variable.patch b/SOURCES/0018-Make-efi-machines-load-an-env-block-from-a-variable.patch
index 2748c1c..9355df7 100644
--- a/SOURCES/0018-Make-efi-machines-load-an-env-block-from-a-variable.patch
+++ b/SOURCES/0018-Make-efi-machines-load-an-env-block-from-a-variable.patch
@@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
2 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index e92a7ef322f..f8065388213 100644
+index e92a7ef32..f80653882 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -191,6 +191,7 @@ kernel = {
@@ -22,7 +22,7 @@ index e92a7ef322f..f8065388213 100644
i386_multiboot = kern/i386/pc/acpi.c;
i386_coreboot = kern/acpi.c;
diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c
-index 3dfdf2d22b0..71d2279a0c1 100644
+index 3dfdf2d22..71d2279a0 100644
--- a/grub-core/kern/efi/init.c
+++ b/grub-core/kern/efi/init.c
@@ -25,9 +25,40 @@
diff --git a/SOURCES/0019-DHCP-client-ID-and-UUID-options-added.patch b/SOURCES/0019-DHCP-client-ID-and-UUID-options-added.patch
index ddc17fe..a71e80e 100644
--- a/SOURCES/0019-DHCP-client-ID-and-UUID-options-added.patch
+++ b/SOURCES/0019-DHCP-client-ID-and-UUID-options-added.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] DHCP client ID and UUID options added.
2 files changed, 81 insertions(+), 8 deletions(-)
diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
-index 9e2fdb795f5..f03eeab2fb4 100644
+index 9e2fdb795..f03eeab2f 100644
--- a/grub-core/net/bootp.c
+++ b/grub-core/net/bootp.c
@@ -25,6 +25,49 @@
@@ -128,7 +128,7 @@ index 9e2fdb795f5..f03eeab2fb4 100644
grub_cmd_dhcpopt (struct grub_command *cmd __attribute__ ((unused)),
int argc, char **args)
diff --git a/include/grub/net.h b/include/grub/net.h
-index 1096b24322e..e266bae23f4 100644
+index 1096b2432..e266bae23 100644
--- a/include/grub/net.h
+++ b/include/grub/net.h
@@ -457,6 +457,8 @@ enum
diff --git a/SOURCES/0020-trim-arp-packets-with-abnormal-size.patch b/SOURCES/0020-trim-arp-packets-with-abnormal-size.patch
index 1a6990a..62b00cc 100644
--- a/SOURCES/0020-trim-arp-packets-with-abnormal-size.patch
+++ b/SOURCES/0020-trim-arp-packets-with-abnormal-size.patch
@@ -10,7 +10,7 @@ is foobared, GRUB needs to trim the arp response packet before sending it.
1 file changed, 6 insertions(+)
diff --git a/grub-core/net/arp.c b/grub-core/net/arp.c
-index 54306e3b16d..d1c69ed2b55 100644
+index 54306e3b1..d1c69ed2b 100644
--- a/grub-core/net/arp.c
+++ b/grub-core/net/arp.c
@@ -150,6 +150,12 @@ grub_net_arp_receive (struct grub_net_buff *nb, struct grub_net_card *card,
diff --git a/SOURCES/0021-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch b/SOURCES/0021-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch
index e219fa5..66a0712 100644
--- a/SOURCES/0021-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch
+++ b/SOURCES/0021-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch
@@ -20,7 +20,7 @@ Resolves: rhbz#1063414
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 61ebd7dc714..87a7da34982 100644
+index 61ebd7dc7..87a7da349 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -261,7 +261,11 @@ while [ "x$list" != "x" ] ; do
diff --git a/SOURCES/0022-Add-support-for-UEFI-operating-systems-returned-by-o.patch b/SOURCES/0022-Add-support-for-UEFI-operating-systems-returned-by-o.patch
index 6ddda34..726afa9 100644
--- a/SOURCES/0022-Add-support-for-UEFI-operating-systems-returned-by-o.patch
+++ b/SOURCES/0022-Add-support-for-UEFI-operating-systems-returned-by-o.patch
@@ -14,7 +14,7 @@ contrast to legacy OSes, where path is the device string. Handle this case.
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
-index 515a68c7aa0..9b8f5968e2d 100644
+index 515a68c7a..9b8f5968e 100644
--- a/util/grub.d/30_os-prober.in
+++ b/util/grub.d/30_os-prober.in
@@ -328,8 +328,23 @@ EOF
diff --git a/SOURCES/0023-Migrate-PPC-from-Yaboot-to-Grub2.patch b/SOURCES/0023-Migrate-PPC-from-Yaboot-to-Grub2.patch
index 7008926..2a9802e 100644
--- a/SOURCES/0023-Migrate-PPC-from-Yaboot-to-Grub2.patch
+++ b/SOURCES/0023-Migrate-PPC-from-Yaboot-to-Grub2.patch
@@ -12,7 +12,7 @@ maximum screen size so that text is not overwritten.
create mode 100644 util/grub.d/20_ppc_terminfo.in
diff --git a/Makefile.util.def b/Makefile.util.def
-index 3180ac880a9..c7b775bce73 100644
+index 3180ac880..c7b775bce 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -487,6 +487,13 @@ script = {
@@ -31,7 +31,7 @@ index 3180ac880a9..c7b775bce73 100644
common = util/grub.d/30_os-prober.in;
diff --git a/util/grub.d/20_ppc_terminfo.in b/util/grub.d/20_ppc_terminfo.in
new file mode 100644
-index 00000000000..10d66586820
+index 000000000..10d665868
--- /dev/null
+++ b/util/grub.d/20_ppc_terminfo.in
@@ -0,0 +1,114 @@
diff --git a/SOURCES/0024-Add-fw_path-variable-revised.patch b/SOURCES/0024-Add-fw_path-variable-revised.patch
index 3126d2e..787599b 100644
--- a/SOURCES/0024-Add-fw_path-variable-revised.patch
+++ b/SOURCES/0024-Add-fw_path-variable-revised.patch
@@ -14,7 +14,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=857936
2 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
-index 9cad0c4485c..8ab7794c47b 100644
+index 9cad0c448..8ab7794c4 100644
--- a/grub-core/kern/main.c
+++ b/grub-core/kern/main.c
@@ -127,16 +127,15 @@ grub_set_prefix_and_root (void)
@@ -41,7 +41,7 @@ index 9cad0c4485c..8ab7794c47b 100644
}
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 249e19bc788..759c475c4d9 100644
+index 249e19bc7..759c475c4 100644
--- a/grub-core/normal/main.c
+++ b/grub-core/normal/main.c
@@ -338,7 +338,30 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
diff --git a/SOURCES/0025-Pass-x-hex-hex-straight-through-unmolested.patch b/SOURCES/0025-Pass-x-hex-hex-straight-through-unmolested.patch
index 5f4884d..0a4c15c 100644
--- a/SOURCES/0025-Pass-x-hex-hex-straight-through-unmolested.patch
+++ b/SOURCES/0025-Pass-x-hex-hex-straight-through-unmolested.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] Pass "\x[[:hex:]][[:hex:]]" straight through unmolested.
3 files changed, 84 insertions(+), 9 deletions(-)
diff --git a/grub-core/commands/wildcard.c b/grub-core/commands/wildcard.c
-index 9b4e72766ff..02c46f9fdfa 100644
+index 9b4e72766..02c46f9fd 100644
--- a/grub-core/commands/wildcard.c
+++ b/grub-core/commands/wildcard.c
@@ -462,6 +462,12 @@ check_file (const char *dir, const char *basename)
@@ -44,7 +44,7 @@ index 9b4e72766ff..02c46f9fdfa 100644
*optr++ = iptr[1];
iptr += 2;
diff --git a/grub-core/lib/cmdline.c b/grub-core/lib/cmdline.c
-index d5e10ee8798..0a5b2afb94b 100644
+index d5e10ee87..0a5b2afb9 100644
--- a/grub-core/lib/cmdline.c
+++ b/grub-core/lib/cmdline.c
@@ -20,6 +20,12 @@
@@ -103,7 +103,7 @@ index d5e10ee8798..0a5b2afb94b 100644
*buf++ = *c;
diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
-index ab78ca87f90..cf6cd6601d6 100644
+index ab78ca87f..cf6cd6601 100644
--- a/grub-core/script/execute.c
+++ b/grub-core/script/execute.c
@@ -55,6 +55,12 @@ static struct grub_script_scope *scope = 0;
diff --git a/SOURCES/0026-Add-X-option-to-printf-functions.patch b/SOURCES/0026-Add-X-option-to-printf-functions.patch
index 4fd28fc..23b0ccf 100644
--- a/SOURCES/0026-Add-X-option-to-printf-functions.patch
+++ b/SOURCES/0026-Add-X-option-to-printf-functions.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] Add %X option to printf functions.
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index 952411d5dc6..8344526be7f 100644
+index 952411d5d..8344526be 100644
--- a/grub-core/kern/misc.c
+++ b/grub-core/kern/misc.c
@@ -588,7 +588,7 @@ grub_divmod64 (grub_uint64_t n, grub_uint64_t d, grub_uint64_t *r)
diff --git a/SOURCES/0027-Search-for-specific-config-file-for-netboot.patch b/SOURCES/0027-Search-for-specific-config-file-for-netboot.patch
index 7436e03..5eaba01 100644
--- a/SOURCES/0027-Search-for-specific-config-file-for-netboot.patch
+++ b/SOURCES/0027-Search-for-specific-config-file-for-netboot.patch
@@ -22,7 +22,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=873406
3 files changed, 135 insertions(+), 4 deletions(-)
diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index 10773fc3435..0769bf850d3 100644
+index 10773fc34..0769bf850 100644
--- a/grub-core/net/net.c
+++ b/grub-core/net/net.c
@@ -1735,6 +1735,124 @@ grub_net_restore_hw (void)
@@ -151,7 +151,7 @@ index 10773fc3435..0769bf850d3 100644
static grub_command_t cmd_addaddr, cmd_deladdr, cmd_addroute, cmd_delroute;
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 759c475c4d9..b2654ef62e8 100644
+index 759c475c4..b2654ef62 100644
--- a/grub-core/normal/main.c
+++ b/grub-core/normal/main.c
@@ -33,6 +33,7 @@
@@ -187,7 +187,7 @@ index 759c475c4d9..b2654ef62e8 100644
grub_enter_normal_mode (config);
grub_free (config);
diff --git a/include/grub/net.h b/include/grub/net.h
-index e266bae23f4..50d62ab0c8c 100644
+index e266bae23..50d62ab0c 100644
--- a/include/grub/net.h
+++ b/include/grub/net.h
@@ -566,4 +566,7 @@ extern char *grub_net_default_server;
diff --git a/SOURCES/0028-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch b/SOURCES/0028-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
index fd63493..bef5393 100644
--- a/SOURCES/0028-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
+++ b/SOURCES/0028-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
@@ -21,7 +21,7 @@ Signed-off-by: Peter Jones <grub2-owner@fedoraproject.org>
create mode 100644 grub-core/commands/blscfg.c
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index f8065388213..cd0902b46b8 100644
+index f80653882..cd0902b46 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -768,6 +768,14 @@ module = {
@@ -41,7 +41,7 @@ index f8065388213..cd0902b46b8 100644
common = commands/boot.c;
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
new file mode 100644
-index 00000000000..4274aca5a9d
+index 000000000..4274aca5a
--- /dev/null
+++ b/grub-core/commands/blscfg.c
@@ -0,0 +1,201 @@
diff --git a/SOURCES/0029-Add-devicetree-loading.patch b/SOURCES/0029-Add-devicetree-loading.patch
index 4cb1a2a..38d3e7b 100644
--- a/SOURCES/0029-Add-devicetree-loading.patch
+++ b/SOURCES/0029-Add-devicetree-loading.patch
@@ -20,7 +20,7 @@ Signed-off-by: David A. Marlin <dmarlin@redhat.com>
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index b0a8626dd1c..f68d4925ee6 100644
+index b0a8626dd..f68d4925e 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -254,7 +254,8 @@ export GRUB_DEFAULT \
@@ -34,7 +34,7 @@ index b0a8626dd1c..f68d4925ee6 100644
if test "x${grub_cfg}" != "x"; then
rm -f "${grub_cfg}.new"
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 87a7da34982..233754ff296 100644
+index 87a7da349..233754ff2 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -153,6 +153,13 @@ EOF
diff --git a/SOURCES/0030-Don-t-write-messages-to-the-screen.patch b/SOURCES/0030-Don-t-write-messages-to-the-screen.patch
index e96a234..9c481ea 100644
--- a/SOURCES/0030-Don-t-write-messages-to-the-screen.patch
+++ b/SOURCES/0030-Don-t-write-messages-to-the-screen.patch
@@ -15,7 +15,7 @@ very appealing.
5 files changed, 5 insertions(+), 40 deletions(-)
diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c
-index 4880cefe3f8..b22e1bcc94b 100644
+index 4880cefe3..b22e1bcc9 100644
--- a/grub-core/gettext/gettext.c
+++ b/grub-core/gettext/gettext.c
@@ -434,16 +434,12 @@ static char *
@@ -97,7 +97,7 @@ index 4880cefe3f8..b22e1bcc94b 100644
grub_register_variable_hook ("locale_dir", NULL, read_main);
grub_register_variable_hook ("secondary_locale_dir", NULL, read_secondary);
diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
-index 8ab7794c47b..da47b18b50e 100644
+index 8ab7794c4..da47b18b5 100644
--- a/grub-core/kern/main.c
+++ b/grub-core/kern/main.c
@@ -268,11 +268,6 @@ grub_main (void)
@@ -113,7 +113,7 @@ index 8ab7794c47b..da47b18b50e 100644
grub_boot_time ("Before loading embedded modules.");
diff --git a/grub-core/boot/i386/pc/boot.S b/grub-core/boot/i386/pc/boot.S
-index 2bd0b2d2866..ea167fe1206 100644
+index 2bd0b2d28..ea167fe12 100644
--- a/grub-core/boot/i386/pc/boot.S
+++ b/grub-core/boot/i386/pc/boot.S
@@ -249,9 +249,6 @@ real_start:
@@ -127,7 +127,7 @@ index 2bd0b2d2866..ea167fe1206 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 c1addc0df29..68d31de0c4c 100644
+index c1addc0df..68d31de0c 100644
--- a/grub-core/boot/i386/pc/diskboot.S
+++ b/grub-core/boot/i386/pc/diskboot.S
@@ -50,11 +50,6 @@ _start:
@@ -143,7 +143,7 @@ index c1addc0df29..68d31de0c4c 100644
movw $LOCAL(firstlist), %di
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 233754ff296..3a5aa0f8dc9 100644
+index 233754ff2..3a5aa0f8d 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -138,27 +138,20 @@ linux_entry ()
diff --git a/SOURCES/0031-Don-t-print-GNU-GRUB-header.patch b/SOURCES/0031-Don-t-print-GNU-GRUB-header.patch
index cdcdb13..44e0ef9 100644
--- a/SOURCES/0031-Don-t-print-GNU-GRUB-header.patch
+++ b/SOURCES/0031-Don-t-print-GNU-GRUB-header.patch
@@ -9,7 +9,7 @@ No one cares.
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index b2654ef62e8..f57b7508a76 100644
+index b2654ef62..f57b7508a 100644
--- a/grub-core/normal/main.c
+++ b/grub-core/normal/main.c
@@ -202,15 +202,16 @@ read_config_file (const char *config)
diff --git a/SOURCES/0032-Don-t-add-to-highlighted-row.patch b/SOURCES/0032-Don-t-add-to-highlighted-row.patch
index b2d5575..5255678 100644
--- a/SOURCES/0032-Don-t-add-to-highlighted-row.patch
+++ b/SOURCES/0032-Don-t-add-to-highlighted-row.patch
@@ -9,7 +9,7 @@ It is already highlighted.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index e22bb91f6e8..a3d1f23f68f 100644
+index e22bb91f6..a3d1f23f6 100644
--- a/grub-core/normal/menu_text.c
+++ b/grub-core/normal/menu_text.c
@@ -242,7 +242,7 @@ print_entry (int y, int highlight, grub_menu_entry_t entry,
diff --git a/SOURCES/0033-Message-string-cleanups.patch b/SOURCES/0033-Message-string-cleanups.patch
index 9b6208e..b417ebb 100644
--- a/SOURCES/0033-Message-string-cleanups.patch
+++ b/SOURCES/0033-Message-string-cleanups.patch
@@ -9,7 +9,7 @@ Make use of terminology consistent. Remove jargon.
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index a3d1f23f68f..64a83862f66 100644
+index a3d1f23f6..64a83862f 100644
--- a/grub-core/normal/menu_text.c
+++ b/grub-core/normal/menu_text.c
@@ -157,9 +157,8 @@ print_message (int nested, int edit, struct grub_term_output *term, int dry_run)
diff --git a/SOURCES/0034-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch b/SOURCES/0034-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch
index 504f273..b233953 100644
--- a/SOURCES/0034-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch
+++ b/SOURCES/0034-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] Fix border spacing now that we aren't displaying it
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index 64a83862f66..1062d64ee29 100644
+index 64a83862f..1062d64ee 100644
--- a/grub-core/normal/menu_text.c
+++ b/grub-core/normal/menu_text.c
@@ -331,12 +331,12 @@ grub_menu_init_page (int nested, int edit,
diff --git a/SOURCES/0035-Use-the-correct-indentation-for-the-term-help-text.patch b/SOURCES/0035-Use-the-correct-indentation-for-the-term-help-text.patch
index d2bf366..a3a4b18 100644
--- a/SOURCES/0035-Use-the-correct-indentation-for-the-term-help-text.patch
+++ b/SOURCES/0035-Use-the-correct-indentation-for-the-term-help-text.patch
@@ -9,7 +9,7 @@ That is consistent with the menu help text
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index f57b7508a76..0ce59fdc3f0 100644
+index f57b7508a..0ce59fdc3 100644
--- a/grub-core/normal/main.c
+++ b/grub-core/normal/main.c
@@ -426,8 +426,8 @@ grub_normal_reader_init (int nested)
diff --git a/SOURCES/0036-Indent-menu-entries.patch b/SOURCES/0036-Indent-menu-entries.patch
index 7a843ec..750343b 100644
--- a/SOURCES/0036-Indent-menu-entries.patch
+++ b/SOURCES/0036-Indent-menu-entries.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] Indent menu entries
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index 1062d64ee29..ecc60f99fc3 100644
+index 1062d64ee..ecc60f99f 100644
--- a/grub-core/normal/menu_text.c
+++ b/grub-core/normal/menu_text.c
@@ -239,7 +239,8 @@ print_entry (int y, int highlight, grub_menu_entry_t entry,
diff --git a/SOURCES/0037-Fix-margins.patch b/SOURCES/0037-Fix-margins.patch
index 9be1731..3a34064 100644
--- a/SOURCES/0037-Fix-margins.patch
+++ b/SOURCES/0037-Fix-margins.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] Fix margins
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index ecc60f99fc3..0e43f2c10cc 100644
+index ecc60f99f..0e43f2c10 100644
--- a/grub-core/normal/menu_text.c
+++ b/grub-core/normal/menu_text.c
@@ -333,17 +333,15 @@ grub_menu_init_page (int nested, int edit,
diff --git a/SOURCES/0038-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch b/SOURCES/0038-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
index 3a37839..2c906de 100644
--- a/SOURCES/0038-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
+++ b/SOURCES/0038-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
@@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <grub2-owner@fedoraproject.org>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index 0e43f2c10cc..537d4bf86ff 100644
+index 0e43f2c10..537d4bf86 100644
--- a/grub-core/normal/menu_text.c
+++ b/grub-core/normal/menu_text.c
@@ -334,7 +334,7 @@ grub_menu_init_page (int nested, int edit,
diff --git a/SOURCES/0039-Enable-pager-by-default.-985860.patch b/SOURCES/0039-Enable-pager-by-default.-985860.patch
index d92fbcc..24f2cbf 100644
--- a/SOURCES/0039-Enable-pager-by-default.-985860.patch
+++ b/SOURCES/0039-Enable-pager-by-default.-985860.patch
@@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 2 insertions(+)
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index 93a90233ead..858b526c925 100644
+index 93a90233e..858b526c9 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -43,6 +43,8 @@ if [ "x${GRUB_DEFAULT_BUTTON}" = "xsaved" ] ; then GRUB_DEFAULT_BUTTON='${saved_
diff --git a/SOURCES/0040-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch b/SOURCES/0040-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch
index 93233bc..968ca6b 100644
--- a/SOURCES/0040-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch
+++ b/SOURCES/0040-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch
@@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index 537d4bf86ff..452d55bf9ff 100644
+index 537d4bf86..452d55bf9 100644
--- a/grub-core/normal/menu_text.c
+++ b/grub-core/normal/menu_text.c
@@ -157,7 +157,7 @@ print_message (int nested, int edit, struct grub_term_output *term, int dry_run)
diff --git a/SOURCES/0041-Don-t-say-GNU-Linux-in-generated-menus.patch b/SOURCES/0041-Don-t-say-GNU-Linux-in-generated-menus.patch
index 85b0cde..9dd570c 100644
--- a/SOURCES/0041-Don-t-say-GNU-Linux-in-generated-menus.patch
+++ b/SOURCES/0041-Don-t-say-GNU-Linux-in-generated-menus.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] Don't say "GNU/Linux" in generated menus.
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 3a5aa0f8dc9..6299836b5cd 100644
+index 3a5aa0f8d..6299836b5 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@"
@@ -25,7 +25,7 @@ index 3a5aa0f8dc9..6299836b5cd 100644
fi
diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
-index e8143b079dc..972a4b5a03d 100644
+index e8143b079..972a4b5a0 100644
--- a/util/grub.d/20_linux_xen.in
+++ b/util/grub.d/20_linux_xen.in
@@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@"
diff --git a/SOURCES/0042-Don-t-draw-a-border-around-the-menu.patch b/SOURCES/0042-Don-t-draw-a-border-around-the-menu.patch
index e5d11ac..ace3bef 100644
--- a/SOURCES/0042-Don-t-draw-a-border-around-the-menu.patch
+++ b/SOURCES/0042-Don-t-draw-a-border-around-the-menu.patch
@@ -9,7 +9,7 @@ It looks cleaner without it.
1 file changed, 43 deletions(-)
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index 452d55bf9ff..1ed2bd92cf8 100644
+index 452d55bf9..1ed2bd92c 100644
--- a/grub-core/normal/menu_text.c
+++ b/grub-core/normal/menu_text.c
@@ -108,47 +108,6 @@ grub_print_message_indented (const char *msg, int margin_left, int margin_right,
diff --git a/SOURCES/0043-Use-the-standard-margin-for-the-timeout-string.patch b/SOURCES/0043-Use-the-standard-margin-for-the-timeout-string.patch
index c6c770c..b7e0101 100644
--- a/SOURCES/0043-Use-the-standard-margin-for-the-timeout-string.patch
+++ b/SOURCES/0043-Use-the-standard-margin-for-the-timeout-string.patch
@@ -9,7 +9,7 @@ So that it aligns with the other messages
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index 1ed2bd92cf8..7681f7d2893 100644
+index 1ed2bd92c..7681f7d28 100644
--- a/grub-core/normal/menu_text.c
+++ b/grub-core/normal/menu_text.c
@@ -372,7 +372,7 @@ grub_menu_init_page (int nested, int edit,
diff --git a/SOURCES/0044-Add-.eh_frame-to-list-of-relocations-stripped.patch b/SOURCES/0044-Add-.eh_frame-to-list-of-relocations-stripped.patch
index d837061..9800667 100644
--- a/SOURCES/0044-Add-.eh_frame-to-list-of-relocations-stripped.patch
+++ b/SOURCES/0044-Add-.eh_frame-to-list-of-relocations-stripped.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] Add .eh_frame to list of relocations stripped
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/conf/Makefile.common b/conf/Makefile.common
-index 311da61c6c5..044ab3abe88 100644
+index 311da61c6..044ab3abe 100644
--- a/conf/Makefile.common
+++ b/conf/Makefile.common
@@ -38,7 +38,7 @@ CFLAGS_KERNEL = $(CFLAGS_PLATFORM) -ffreestanding
diff --git a/SOURCES/0045-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch b/SOURCES/0045-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch
index 33bdad2..d80311d 100644
--- a/SOURCES/0045-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch
+++ b/SOURCES/0045-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch
@@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/grub-core/lib/cmdline.c b/grub-core/lib/cmdline.c
-index 0a5b2afb94b..970ea868c14 100644
+index 0a5b2afb9..970ea868c 100644
--- a/grub-core/lib/cmdline.c
+++ b/grub-core/lib/cmdline.c
@@ -97,16 +97,7 @@ int grub_create_loader_cmdline (int argc, char *argv[], char *buf,
diff --git a/SOURCES/0046-Don-t-require-a-password-to-boot-entries-generated-b.patch b/SOURCES/0046-Don-t-require-a-password-to-boot-entries-generated-b.patch
index b0b2b0e..bc67768 100644
--- a/SOURCES/0046-Don-t-require-a-password-to-boot-entries-generated-b.patch
+++ b/SOURCES/0046-Don-t-require-a-password-to-boot-entries-generated-b.patch
@@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 6299836b5cd..b744438e04a 100644
+index 6299836b5..b744438e0 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -26,7 +26,7 @@ datarootdir="@datarootdir@"
diff --git a/SOURCES/0047-Don-t-emit-Booting-.-message.patch b/SOURCES/0047-Don-t-emit-Booting-.-message.patch
index 725ae09..5e82935 100644
--- a/SOURCES/0047-Don-t-emit-Booting-.-message.patch
+++ b/SOURCES/0047-Don-t-emit-Booting-.-message.patch
@@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
-index d2f64b05e0a..5e2f5283d3d 100644
+index d2f64b05e..5e2f5283d 100644
--- a/grub-core/normal/menu.c
+++ b/grub-core/normal/menu.c
@@ -838,12 +838,14 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
@@ -34,7 +34,7 @@ index d2f64b05e0a..5e2f5283d3d 100644
/* Callback invoked when a default menu entry executed because of a timeout
diff --git a/grub-core/normal/menu_entry.c b/grub-core/normal/menu_entry.c
-index cdf3590a364..5785f67ee1c 100644
+index cdf3590a3..5785f67ee 100644
--- a/grub-core/normal/menu_entry.c
+++ b/grub-core/normal/menu_entry.c
@@ -1167,9 +1167,6 @@ run (struct screen *screen)
diff --git a/SOURCES/0048-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch b/SOURCES/0048-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch
index d6169aa..84370d4 100644
--- a/SOURCES/0048-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch
+++ b/SOURCES/0048-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch
@@ -122,7 +122,7 @@ Replace a bunch of machine generated ones with ones that look nicer.
create mode 100644 util/grub-sparc64-setup.8
diff --git a/configure.ac b/configure.ac
-index 783118ccdcd..d5db2803ec4 100644
+index 783118ccd..d5db2803e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,6 +70,29 @@ grub_TRANSFORM([grub-set-default])
@@ -156,7 +156,7 @@ index 783118ccdcd..d5db2803ec4 100644
# Optimization flag. Allow user to override.
if test "x$TARGET_CFLAGS" = x; then
diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
-index b16bd925320..39eb94bded6 100644
+index b16bd9253..39eb94bde 100644
--- a/conf/Makefile.extra-dist
+++ b/conf/Makefile.extra-dist
@@ -11,7 +11,6 @@ EXTRA_DIST += unicode
@@ -168,7 +168,7 @@ index b16bd925320..39eb94bded6 100644
EXTRA_DIST += docs/grub.cfg
EXTRA_DIST += docs/osdetect.cfg
diff --git a/docs/Makefile.am b/docs/Makefile.am
-index 93eb3962765..ab28f199694 100644
+index 93eb39627..ab28f1996 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -5,5 +5,3 @@ info_TEXINFOS = grub.texi grub-dev.texi
@@ -179,7 +179,7 @@ index 93eb3962765..ab28f199694 100644
-
diff --git a/docs/man/grub-bios-setup.h2m b/docs/man/grub-bios-setup.h2m
deleted file mode 100644
-index ac6ede36296..00000000000
+index ac6ede362..000000000
--- a/docs/man/grub-bios-setup.h2m
+++ /dev/null
@@ -1,6 +0,0 @@
@@ -191,7 +191,7 @@ index ac6ede36296..00000000000
-.BR grub-mkrescue (1)
diff --git a/docs/man/grub-editenv.h2m b/docs/man/grub-editenv.h2m
deleted file mode 100644
-index 3859d3d4c4f..00000000000
+index 3859d3d4c..000000000
--- a/docs/man/grub-editenv.h2m
+++ /dev/null
@@ -1,5 +0,0 @@
@@ -202,7 +202,7 @@ index 3859d3d4c4f..00000000000
-.BR grub-set-default (8)
diff --git a/docs/man/grub-emu.h2m b/docs/man/grub-emu.h2m
deleted file mode 100644
-index ef1c000656a..00000000000
+index ef1c00065..000000000
--- a/docs/man/grub-emu.h2m
+++ /dev/null
@@ -1,6 +0,0 @@
@@ -214,7 +214,7 @@ index ef1c000656a..00000000000
-rather than this program.
diff --git a/docs/man/grub-file.h2m b/docs/man/grub-file.h2m
deleted file mode 100644
-index e09bb4d3101..00000000000
+index e09bb4d31..000000000
--- a/docs/man/grub-file.h2m
+++ /dev/null
@@ -1,2 +0,0 @@
@@ -222,7 +222,7 @@ index e09bb4d3101..00000000000
-grub-file \- check file type
diff --git a/docs/man/grub-fstest.h2m b/docs/man/grub-fstest.h2m
deleted file mode 100644
-index 9676b159afd..00000000000
+index 9676b159a..000000000
--- a/docs/man/grub-fstest.h2m
+++ /dev/null
@@ -1,4 +0,0 @@
@@ -232,7 +232,7 @@ index 9676b159afd..00000000000
-.BR grub-probe (8)
diff --git a/docs/man/grub-glue-efi.h2m b/docs/man/grub-glue-efi.h2m
deleted file mode 100644
-index c1c6ded49ff..00000000000
+index c1c6ded49..000000000
--- a/docs/man/grub-glue-efi.h2m
+++ /dev/null
@@ -1,4 +0,0 @@
@@ -242,7 +242,7 @@ index c1c6ded49ff..00000000000
-grub-glue-efi processes ia32 and amd64 EFI images and glues them according to Apple format.
diff --git a/docs/man/grub-install.h2m b/docs/man/grub-install.h2m
deleted file mode 100644
-index 8cbbc87a0f2..00000000000
+index 8cbbc87a0..000000000
--- a/docs/man/grub-install.h2m
+++ /dev/null
@@ -1,6 +0,0 @@
@@ -254,7 +254,7 @@ index 8cbbc87a0f2..00000000000
-.BR grub-mkrescue (1)
diff --git a/docs/man/grub-kbdcomp.h2m b/docs/man/grub-kbdcomp.h2m
deleted file mode 100644
-index d81f9157e01..00000000000
+index d81f9157e..000000000
--- a/docs/man/grub-kbdcomp.h2m
+++ /dev/null
@@ -1,10 +0,0 @@
@@ -270,7 +270,7 @@ index d81f9157e01..00000000000
-.BR grub-mklayout (8)
diff --git a/docs/man/grub-macbless.h2m b/docs/man/grub-macbless.h2m
deleted file mode 100644
-index 0197c0087d7..00000000000
+index 0197c0087..000000000
--- a/docs/man/grub-macbless.h2m
+++ /dev/null
@@ -1,4 +0,0 @@
@@ -280,7 +280,7 @@ index 0197c0087d7..00000000000
-.BR grub-install (1)
diff --git a/docs/man/grub-macho2img.h2m b/docs/man/grub-macho2img.h2m
deleted file mode 100644
-index d79aaeed8f9..00000000000
+index d79aaeed8..000000000
--- a/docs/man/grub-macho2img.h2m
+++ /dev/null
@@ -1,4 +0,0 @@
@@ -290,7 +290,7 @@ index d79aaeed8f9..00000000000
-.BR grub-mkimage (1)
diff --git a/docs/man/grub-menulst2cfg.h2m b/docs/man/grub-menulst2cfg.h2m
deleted file mode 100644
-index c2e0055ed7e..00000000000
+index c2e0055ed..000000000
--- a/docs/man/grub-menulst2cfg.h2m
+++ /dev/null
@@ -1,4 +0,0 @@
@@ -300,7 +300,7 @@ index c2e0055ed7e..00000000000
-.BR grub-mkconfig (8)
diff --git a/docs/man/grub-mkconfig.h2m b/docs/man/grub-mkconfig.h2m
deleted file mode 100644
-index 9b42f813010..00000000000
+index 9b42f8130..000000000
--- a/docs/man/grub-mkconfig.h2m
+++ /dev/null
@@ -1,4 +0,0 @@
@@ -310,7 +310,7 @@ index 9b42f813010..00000000000
-.BR grub-install (8)
diff --git a/docs/man/grub-mkfont.h2m b/docs/man/grub-mkfont.h2m
deleted file mode 100644
-index d46fe600eca..00000000000
+index d46fe600e..000000000
--- a/docs/man/grub-mkfont.h2m
+++ /dev/null
@@ -1,4 +0,0 @@
@@ -320,7 +320,7 @@ index d46fe600eca..00000000000
-.BR grub-mkconfig (8)
diff --git a/docs/man/grub-mkimage.h2m b/docs/man/grub-mkimage.h2m
deleted file mode 100644
-index f0fbc2bb197..00000000000
+index f0fbc2bb1..000000000
--- a/docs/man/grub-mkimage.h2m
+++ /dev/null
@@ -1,6 +0,0 @@
@@ -332,7 +332,7 @@ index f0fbc2bb197..00000000000
-.BR grub-mknetdir (8)
diff --git a/docs/man/grub-mklayout.h2m b/docs/man/grub-mklayout.h2m
deleted file mode 100644
-index 1e43409c0ab..00000000000
+index 1e43409c0..000000000
--- a/docs/man/grub-mklayout.h2m
+++ /dev/null
@@ -1,10 +0,0 @@
@@ -348,7 +348,7 @@ index 1e43409c0ab..00000000000
-.BR grub-mkconfig (8)
diff --git a/docs/man/grub-mknetdir.h2m b/docs/man/grub-mknetdir.h2m
deleted file mode 100644
-index a2ef13ec111..00000000000
+index a2ef13ec1..000000000
--- a/docs/man/grub-mknetdir.h2m
+++ /dev/null
@@ -1,4 +0,0 @@
@@ -358,7 +358,7 @@ index a2ef13ec111..00000000000
-.BR grub-mkimage (1)
diff --git a/docs/man/grub-mkpasswd-pbkdf2.h2m b/docs/man/grub-mkpasswd-pbkdf2.h2m
deleted file mode 100644
-index 4d202f3da7e..00000000000
+index 4d202f3da..000000000
--- a/docs/man/grub-mkpasswd-pbkdf2.h2m
+++ /dev/null
@@ -1,4 +0,0 @@
@@ -368,7 +368,7 @@ index 4d202f3da7e..00000000000
-.BR grub-mkconfig (8)
diff --git a/docs/man/grub-mkrelpath.h2m b/docs/man/grub-mkrelpath.h2m
deleted file mode 100644
-index d01f3961e3f..00000000000
+index d01f3961e..000000000
--- a/docs/man/grub-mkrelpath.h2m
+++ /dev/null
@@ -1,4 +0,0 @@
@@ -378,7 +378,7 @@ index d01f3961e3f..00000000000
-.BR grub-probe (8)
diff --git a/docs/man/grub-mkrescue.h2m b/docs/man/grub-mkrescue.h2m
deleted file mode 100644
-index a427f02e3c6..00000000000
+index a427f02e3..000000000
--- a/docs/man/grub-mkrescue.h2m
+++ /dev/null
@@ -1,4 +0,0 @@
@@ -388,7 +388,7 @@ index a427f02e3c6..00000000000
-.BR grub-mkimage (1)
diff --git a/docs/man/grub-mkstandalone.h2m b/docs/man/grub-mkstandalone.h2m
deleted file mode 100644
-index c77313978ad..00000000000
+index c77313978..000000000
--- a/docs/man/grub-mkstandalone.h2m
+++ /dev/null
@@ -1,4 +0,0 @@
@@ -398,7 +398,7 @@ index c77313978ad..00000000000
-.BR grub-mkimage (1)
diff --git a/docs/man/grub-mount.h2m b/docs/man/grub-mount.h2m
deleted file mode 100644
-index 8d168982d72..00000000000
+index 8d168982d..000000000
--- a/docs/man/grub-mount.h2m
+++ /dev/null
@@ -1,2 +0,0 @@
@@ -406,7 +406,7 @@ index 8d168982d72..00000000000
-grub-mount \- export GRUB filesystem with FUSE
diff --git a/docs/man/grub-ofpathname.h2m b/docs/man/grub-ofpathname.h2m
deleted file mode 100644
-index 74b43eea039..00000000000
+index 74b43eea0..000000000
--- a/docs/man/grub-ofpathname.h2m
+++ /dev/null
@@ -1,4 +0,0 @@
@@ -416,7 +416,7 @@ index 74b43eea039..00000000000
-.BR grub-probe (8)
diff --git a/docs/man/grub-pe2elf.h2m b/docs/man/grub-pe2elf.h2m
deleted file mode 100644
-index 7ca29bd703c..00000000000
+index 7ca29bd70..000000000
--- a/docs/man/grub-pe2elf.h2m
+++ /dev/null
@@ -1,4 +0,0 @@
@@ -426,7 +426,7 @@ index 7ca29bd703c..00000000000
-.BR grub-mkimage (1)
diff --git a/docs/man/grub-probe.h2m b/docs/man/grub-probe.h2m
deleted file mode 100644
-index 6e1ffdcf937..00000000000
+index 6e1ffdcf9..000000000
--- a/docs/man/grub-probe.h2m
+++ /dev/null
@@ -1,4 +0,0 @@
@@ -436,7 +436,7 @@ index 6e1ffdcf937..00000000000
-.BR grub-fstest (1)
diff --git a/docs/man/grub-reboot.h2m b/docs/man/grub-reboot.h2m
deleted file mode 100644
-index e4acace65ce..00000000000
+index e4acace65..000000000
--- a/docs/man/grub-reboot.h2m
+++ /dev/null
@@ -1,5 +0,0 @@
@@ -447,7 +447,7 @@ index e4acace65ce..00000000000
-.BR grub-editenv (1)
diff --git a/docs/man/grub-render-label.h2m b/docs/man/grub-render-label.h2m
deleted file mode 100644
-index 50ae5247c05..00000000000
+index 50ae5247c..000000000
--- a/docs/man/grub-render-label.h2m
+++ /dev/null
@@ -1,3 +0,0 @@
@@ -456,7 +456,7 @@ index 50ae5247c05..00000000000
-
diff --git a/docs/man/grub-script-check.h2m b/docs/man/grub-script-check.h2m
deleted file mode 100644
-index 3653682671a..00000000000
+index 365368267..000000000
--- a/docs/man/grub-script-check.h2m
+++ /dev/null
@@ -1,4 +0,0 @@
@@ -466,7 +466,7 @@ index 3653682671a..00000000000
-.BR grub-mkconfig (8)
diff --git a/docs/man/grub-set-default.h2m b/docs/man/grub-set-default.h2m
deleted file mode 100644
-index 7945001c154..00000000000
+index 7945001c1..000000000
--- a/docs/man/grub-set-default.h2m
+++ /dev/null
@@ -1,5 +0,0 @@
@@ -477,7 +477,7 @@ index 7945001c154..00000000000
-.BR grub-editenv (1)
diff --git a/docs/man/grub-sparc64-setup.h2m b/docs/man/grub-sparc64-setup.h2m
deleted file mode 100644
-index 18f803a50db..00000000000
+index 18f803a50..000000000
--- a/docs/man/grub-sparc64-setup.h2m
+++ /dev/null
@@ -1,6 +0,0 @@
@@ -489,7 +489,7 @@ index 18f803a50db..00000000000
-.BR grub-mkrescue (1)
diff --git a/docs/man/grub-syslinux2cfg.h2m b/docs/man/grub-syslinux2cfg.h2m
deleted file mode 100644
-index ad25c8ab753..00000000000
+index ad25c8ab7..000000000
--- a/docs/man/grub-syslinux2cfg.h2m
+++ /dev/null
@@ -1,4 +0,0 @@
@@ -498,7 +498,7 @@ index ad25c8ab753..00000000000
-[SEE ALSO]
-.BR grub-menulst2cfg (8)
diff --git a/gentpl.py b/gentpl.py
-index da67965a41a..bf8439fa743 100644
+index da67965a4..bf8439fa7 100644
--- a/gentpl.py
+++ b/gentpl.py
@@ -802,10 +802,7 @@ def manpage(defn, adddeps):
@@ -515,7 +515,7 @@ index da67965a41a..bf8439fa743 100644
diff --git a/util/grub-bios-setup.8 b/util/grub-bios-setup.8
new file mode 100644
-index 00000000000..56f582b3d75
+index 000000000..56f582b3d
--- /dev/null
+++ b/util/grub-bios-setup.8
@@ -0,0 +1,54 @@
@@ -575,7 +575,7 @@ index 00000000000..56f582b3d75
+.BR "info grub"
diff --git a/util/grub-editenv.1 b/util/grub-editenv.1
new file mode 100644
-index 00000000000..d28ba03ba42
+index 000000000..d28ba03ba
--- /dev/null
+++ b/util/grub-editenv.1
@@ -0,0 +1,46 @@
@@ -627,7 +627,7 @@ index 00000000000..d28ba03ba42
+.BR "info grub"
diff --git a/util/grub-file.1 b/util/grub-file.1
new file mode 100644
-index 00000000000..b29cb327889
+index 000000000..b29cb3278
--- /dev/null
+++ b/util/grub-file.1
@@ -0,0 +1,165 @@
@@ -798,7 +798,7 @@ index 00000000000..b29cb327889
+.BR "info grub"
diff --git a/util/grub-fstest.1 b/util/grub-fstest.1
new file mode 100644
-index 00000000000..792fa78634c
+index 000000000..792fa7863
--- /dev/null
+++ b/util/grub-fstest.1
@@ -0,0 +1,99 @@
@@ -903,7 +903,7 @@ index 00000000000..792fa78634c
+.BR "info grub"
diff --git a/util/grub-glue-efi.1 b/util/grub-glue-efi.1
new file mode 100644
-index 00000000000..72bd555d577
+index 000000000..72bd555d5
--- /dev/null
+++ b/util/grub-glue-efi.1
@@ -0,0 +1,31 @@
@@ -940,7 +940,7 @@ index 00000000000..72bd555d577
+.BR "info grub"
diff --git a/util/grub-install.8 b/util/grub-install.8
new file mode 100644
-index 00000000000..76272a39d2e
+index 000000000..76272a39d
--- /dev/null
+++ b/util/grub-install.8
@@ -0,0 +1,129 @@
@@ -1075,7 +1075,7 @@ index 00000000000..76272a39d2e
+.BR "info grub"
diff --git a/util/grub-kbdcomp.1 b/util/grub-kbdcomp.1
new file mode 100644
-index 00000000000..0bb969a5b43
+index 000000000..0bb969a5b
--- /dev/null
+++ b/util/grub-kbdcomp.1
@@ -0,0 +1,19 @@
@@ -1100,7 +1100,7 @@ index 00000000000..0bb969a5b43
+.BR "info grub"
diff --git a/util/grub-macbless.1 b/util/grub-macbless.1
new file mode 100644
-index 00000000000..41a96186f70
+index 000000000..41a96186f
--- /dev/null
+++ b/util/grub-macbless.1
@@ -0,0 +1,22 @@
@@ -1128,7 +1128,7 @@ index 00000000000..41a96186f70
+.BR "info grub"
diff --git a/util/grub-menulst2cfg.1 b/util/grub-menulst2cfg.1
new file mode 100644
-index 00000000000..91e2ef87113
+index 000000000..91e2ef871
--- /dev/null
+++ b/util/grub-menulst2cfg.1
@@ -0,0 +1,12 @@
@@ -1146,7 +1146,7 @@ index 00000000000..91e2ef87113
+.BR "info grub"
diff --git a/util/grub-mkconfig.8 b/util/grub-mkconfig.8
new file mode 100644
-index 00000000000..a2d1f577b9b
+index 000000000..a2d1f577b
--- /dev/null
+++ b/util/grub-mkconfig.8
@@ -0,0 +1,17 @@
@@ -1169,7 +1169,7 @@ index 00000000000..a2d1f577b9b
+.BR "info grub"
diff --git a/util/grub-mkfont.1 b/util/grub-mkfont.1
new file mode 100644
-index 00000000000..3494857987d
+index 000000000..349485798
--- /dev/null
+++ b/util/grub-mkfont.1
@@ -0,0 +1,87 @@
@@ -1262,7 +1262,7 @@ index 00000000000..3494857987d
+.BR "info grub"
diff --git a/util/grub-mkimage.1 b/util/grub-mkimage.1
new file mode 100644
-index 00000000000..4dea4f54597
+index 000000000..4dea4f545
--- /dev/null
+++ b/util/grub-mkimage.1
@@ -0,0 +1,95 @@
@@ -1363,7 +1363,7 @@ index 00000000000..4dea4f54597
+.BR "info grub"
diff --git a/util/grub-mklayout.1 b/util/grub-mklayout.1
new file mode 100644
-index 00000000000..d1bbc2ec515
+index 000000000..d1bbc2ec5
--- /dev/null
+++ b/util/grub-mklayout.1
@@ -0,0 +1,27 @@
@@ -1396,7 +1396,7 @@ index 00000000000..d1bbc2ec515
+.BR "info grub"
diff --git a/util/grub-mknetdir.1 b/util/grub-mknetdir.1
new file mode 100644
-index 00000000000..fa7e8d4ef0d
+index 000000000..fa7e8d4ef
--- /dev/null
+++ b/util/grub-mknetdir.1
@@ -0,0 +1,12 @@
@@ -1414,7 +1414,7 @@ index 00000000000..fa7e8d4ef0d
+.BR "info grub"
diff --git a/util/grub-mkpasswd-pbkdf2.1 b/util/grub-mkpasswd-pbkdf2.1
new file mode 100644
-index 00000000000..73c437c15d8
+index 000000000..73c437c15
--- /dev/null
+++ b/util/grub-mkpasswd-pbkdf2.1
@@ -0,0 +1,27 @@
@@ -1447,7 +1447,7 @@ index 00000000000..73c437c15d8
+.BR "info grub"
diff --git a/util/grub-mkrelpath.1 b/util/grub-mkrelpath.1
new file mode 100644
-index 00000000000..85f1113621d
+index 000000000..85f111362
--- /dev/null
+++ b/util/grub-mkrelpath.1
@@ -0,0 +1,12 @@
@@ -1465,7 +1465,7 @@ index 00000000000..85f1113621d
+.BR "info grub"
diff --git a/util/grub-mkrescue.1 b/util/grub-mkrescue.1
new file mode 100644
-index 00000000000..4ed9fc723fd
+index 000000000..4ed9fc723
--- /dev/null
+++ b/util/grub-mkrescue.1
@@ -0,0 +1,123 @@
@@ -1594,7 +1594,7 @@ index 00000000000..4ed9fc723fd
+.BR "info grub"
diff --git a/util/grub-mkstandalone.1 b/util/grub-mkstandalone.1
new file mode 100644
-index 00000000000..ba2d2bdf279
+index 000000000..ba2d2bdf2
--- /dev/null
+++ b/util/grub-mkstandalone.1
@@ -0,0 +1,100 @@
@@ -1700,7 +1700,7 @@ index 00000000000..ba2d2bdf279
+.BR "info grub"
diff --git a/util/grub-ofpathname.8 b/util/grub-ofpathname.8
new file mode 100644
-index 00000000000..bf3743aeba1
+index 000000000..bf3743aeb
--- /dev/null
+++ b/util/grub-ofpathname.8
@@ -0,0 +1,12 @@
@@ -1718,7 +1718,7 @@ index 00000000000..bf3743aeba1
+.BR "info grub"
diff --git a/util/grub-probe.8 b/util/grub-probe.8
new file mode 100644
-index 00000000000..04e26c832bb
+index 000000000..04e26c832
--- /dev/null
+++ b/util/grub-probe.8
@@ -0,0 +1,80 @@
@@ -1804,7 +1804,7 @@ index 00000000000..04e26c832bb
+.BR "info grub"
diff --git a/util/grub-reboot.8 b/util/grub-reboot.8
new file mode 100644
-index 00000000000..faa5e4eece2
+index 000000000..faa5e4eec
--- /dev/null
+++ b/util/grub-reboot.8
@@ -0,0 +1,21 @@
@@ -1831,7 +1831,7 @@ index 00000000000..faa5e4eece2
+.BR "info grub"
diff --git a/util/grub-render-label.1 b/util/grub-render-label.1
new file mode 100644
-index 00000000000..4d51c8abf01
+index 000000000..4d51c8abf
--- /dev/null
+++ b/util/grub-render-label.1
@@ -0,0 +1,51 @@
@@ -1888,7 +1888,7 @@ index 00000000000..4d51c8abf01
+.BR "info grub"
diff --git a/util/grub-script-check.1 b/util/grub-script-check.1
new file mode 100644
-index 00000000000..0f1f625b05d
+index 000000000..0f1f625b0
--- /dev/null
+++ b/util/grub-script-check.1
@@ -0,0 +1,21 @@
@@ -1915,7 +1915,7 @@ index 00000000000..0f1f625b05d
+.BR "info grub"
diff --git a/util/grub-set-default.8 b/util/grub-set-default.8
new file mode 100644
-index 00000000000..a96265a1509
+index 000000000..a96265a15
--- /dev/null
+++ b/util/grub-set-default.8
@@ -0,0 +1,21 @@
@@ -1942,7 +1942,7 @@ index 00000000000..a96265a1509
+.BR "info grub"
diff --git a/util/grub-sparc64-setup.8 b/util/grub-sparc64-setup.8
new file mode 100644
-index 00000000000..37ea2dd5eaa
+index 000000000..37ea2dd5e
--- /dev/null
+++ b/util/grub-sparc64-setup.8
@@ -0,0 +1,12 @@
diff --git a/SOURCES/0049-use-fw_path-prefix-when-fallback-searching-for-grub-.patch b/SOURCES/0049-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
index 0035e62..fdaf734 100644
--- a/SOURCES/0049-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
+++ b/SOURCES/0049-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
@@ -17,7 +17,7 @@ Signed-off-by: Mark Salter <msalter@redhat.com>
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 0ce59fdc3f0..a3713efcd90 100644
+index 0ce59fdc3..a3713efcd 100644
--- a/grub-core/normal/main.c
+++ b/grub-core/normal/main.c
@@ -343,7 +343,7 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
diff --git a/SOURCES/0050-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch b/SOURCES/0050-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
index 84b8d7a..3fd2c29 100644
--- a/SOURCES/0050-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
+++ b/SOURCES/0050-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
@@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 43 insertions(+), 37 deletions(-)
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index a3713efcd90..7d9c4f09b9b 100644
+index a3713efcd..7d9c4f09b 100644
--- a/grub-core/normal/main.c
+++ b/grub-core/normal/main.c
@@ -341,53 +341,59 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
diff --git a/SOURCES/0051-Fix-convert-function-to-support-NVMe-devices.patch b/SOURCES/0051-Fix-convert-function-to-support-NVMe-devices.patch
index 0fb6616..9cab67f 100644
--- a/SOURCES/0051-Fix-convert-function-to-support-NVMe-devices.patch
+++ b/SOURCES/0051-Fix-convert-function-to-support-NVMe-devices.patch
@@ -18,7 +18,7 @@ Signed-off-by: Peter Jones <grub2-owner@fedoraproject.org>
1 file changed, 19 insertions(+)
diff --git a/util/getroot.c b/util/getroot.c
-index 847406fbab0..fa3460d6cd8 100644
+index 847406fba..fa3460d6c 100644
--- a/util/getroot.c
+++ b/util/getroot.c
@@ -153,6 +153,7 @@ convert_system_partition_to_system_disk (const char *os_dev, int *is_part)
diff --git a/SOURCES/0052-reopen-SNP-protocol-for-exclusive-use-by-grub.patch b/SOURCES/0052-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
index fb2875b..f5968a2 100644
--- a/SOURCES/0052-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
+++ b/SOURCES/0052-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] reopen SNP protocol for exclusive use by grub
1 file changed, 16 insertions(+)
diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index 5388f952ba9..ea0e0ca360e 100644
+index 5388f952b..ea0e0ca36 100644
--- a/grub-core/net/drivers/efi/efinet.c
+++ b/grub-core/net/drivers/efi/efinet.c
@@ -330,6 +330,7 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
diff --git a/SOURCES/0053-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch b/SOURCES/0053-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
index 4238b7d..de98c2d 100644
--- a/SOURCES/0053-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
+++ b/SOURCES/0053-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
@@ -16,7 +16,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 16 deletions(-)
diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index ea0e0ca360e..5388f952ba9 100644
+index ea0e0ca36..5388f952b 100644
--- a/grub-core/net/drivers/efi/efinet.c
+++ b/grub-core/net/drivers/efi/efinet.c
@@ -330,7 +330,6 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
diff --git a/SOURCES/0054-Add-grub_util_readlink.patch b/SOURCES/0054-Add-grub_util_readlink.patch
index 6ea7df1..ea37152 100644
--- a/SOURCES/0054-Add-grub_util_readlink.patch
+++ b/SOURCES/0054-Add-grub_util_readlink.patch
@@ -54,7 +54,7 @@ Reviewed-by: Adam Jackson <ajax@redhat.com>
diff --git a/grub-core/gnulib/gettimeofday.c b/grub-core/gnulib/gettimeofday.c
new file mode 100644
-index 00000000000..8b2058e8c87
+index 000000000..8b2058e8c
--- /dev/null
+++ b/grub-core/gnulib/gettimeofday.c
@@ -0,0 +1,154 @@
@@ -214,7 +214,7 @@ index 00000000000..8b2058e8c87
+}
diff --git a/grub-core/gnulib/readlink.c b/grub-core/gnulib/readlink.c
new file mode 100644
-index 00000000000..4c496395176
+index 000000000..4c4963951
--- /dev/null
+++ b/grub-core/gnulib/readlink.c
@@ -0,0 +1,74 @@
@@ -294,7 +294,7 @@ index 00000000000..4c496395176
+#endif /* HAVE_READLINK */
diff --git a/grub-core/gnulib/stat.c b/grub-core/gnulib/stat.c
new file mode 100644
-index 00000000000..35f4b0b1a51
+index 000000000..35f4b0b1a
--- /dev/null
+++ b/grub-core/gnulib/stat.c
@@ -0,0 +1,138 @@
@@ -437,7 +437,7 @@ index 00000000000..35f4b0b1a51
+ return result;
+}
diff --git a/grub-core/osdep/windows/hostdisk.c b/grub-core/osdep/windows/hostdisk.c
-index 85507af88e3..6f49df465d7 100644
+index 85507af88..6f49df465 100644
--- a/grub-core/osdep/windows/hostdisk.c
+++ b/grub-core/osdep/windows/hostdisk.c
@@ -353,6 +353,12 @@ grub_util_mkdir (const char *dir)
@@ -455,7 +455,7 @@ index 85507af88e3..6f49df465d7 100644
{
diff --git a/grub-core/gnulib/pathmax.h b/grub-core/gnulib/pathmax.h
new file mode 100644
-index 00000000000..33fc3553d75
+index 000000000..33fc3553d
--- /dev/null
+++ b/grub-core/gnulib/pathmax.h
@@ -0,0 +1,83 @@
@@ -544,7 +544,7 @@ index 00000000000..33fc3553d75
+#endif /* _PATHMAX_H */
diff --git a/grub-core/gnulib/sys_stat.in.h b/grub-core/gnulib/sys_stat.in.h
new file mode 100644
-index 00000000000..b47a7ff0ae7
+index 000000000..b47a7ff0a
--- /dev/null
+++ b/grub-core/gnulib/sys_stat.in.h
@@ -0,0 +1,732 @@
@@ -1282,7 +1282,7 @@ index 00000000000..b47a7ff0ae7
+#endif
diff --git a/grub-core/gnulib/sys_time.in.h b/grub-core/gnulib/sys_time.in.h
new file mode 100644
-index 00000000000..30057ad49fd
+index 000000000..30057ad49
--- /dev/null
+++ b/grub-core/gnulib/sys_time.in.h
@@ -0,0 +1,213 @@
@@ -1500,7 +1500,7 @@ index 00000000000..30057ad49fd
+#endif /* _CYGWIN_SYS_TIME_H */
+#endif /* _@GUARD_PREFIX@_SYS_TIME_H */
diff --git a/grub-core/gnulib/sys_types.in.h b/grub-core/gnulib/sys_types.in.h
-index d7da35623b1..9520c09030c 100644
+index d7da35623..9520c0903 100644
--- a/grub-core/gnulib/sys_types.in.h
+++ b/grub-core/gnulib/sys_types.in.h
@@ -23,7 +23,9 @@
@@ -1515,7 +1515,7 @@ index d7da35623b1..9520c09030c 100644
#define _@GUARD_PREFIX@_SYS_TYPES_H
diff --git a/grub-core/gnulib/time.h b/grub-core/gnulib/time.h
new file mode 100644
-index 00000000000..b9203d5569a
+index 000000000..b9203d556
--- /dev/null
+++ b/grub-core/gnulib/time.h
@@ -0,0 +1,586 @@
@@ -2107,7 +2107,7 @@ index 00000000000..b9203d5569a
+#endif
diff --git a/grub-core/gnulib/time.in.h b/grub-core/gnulib/time.in.h
new file mode 100644
-index 00000000000..81abdf46e0b
+index 000000000..81abdf46e
--- /dev/null
+++ b/grub-core/gnulib/time.in.h
@@ -0,0 +1,274 @@
@@ -2386,7 +2386,7 @@ index 00000000000..81abdf46e0b
+
+#endif
diff --git a/include/grub/osdep/hostfile_aros.h b/include/grub/osdep/hostfile_aros.h
-index a059c0fa40a..161fbb7bdfd 100644
+index a059c0fa4..161fbb7bd 100644
--- a/include/grub/osdep/hostfile_aros.h
+++ b/include/grub/osdep/hostfile_aros.h
@@ -68,6 +68,12 @@ grub_util_rename (const char *from, const char *to)
@@ -2403,7 +2403,7 @@ index a059c0fa40a..161fbb7bdfd 100644
struct grub_util_fd
diff --git a/include/grub/osdep/hostfile_unix.h b/include/grub/osdep/hostfile_unix.h
-index 9ffe46fa3ca..17cd3aa8b30 100644
+index 9ffe46fa3..17cd3aa8b 100644
--- a/include/grub/osdep/hostfile_unix.h
+++ b/include/grub/osdep/hostfile_unix.h
@@ -71,6 +71,12 @@ grub_util_rename (const char *from, const char *to)
@@ -2420,7 +2420,7 @@ index 9ffe46fa3ca..17cd3aa8b30 100644
#if defined (__NetBSD__)
diff --git a/include/grub/osdep/hostfile_windows.h b/include/grub/osdep/hostfile_windows.h
-index bf6451b6db4..8c92d0591bb 100644
+index bf6451b6d..8c92d0591 100644
--- a/include/grub/osdep/hostfile_windows.h
+++ b/include/grub/osdep/hostfile_windows.h
@@ -41,6 +41,8 @@ typedef struct grub_util_fd_dir *grub_util_fd_dir_t;
@@ -2433,7 +2433,7 @@ index bf6451b6db4..8c92d0591bb 100644
grub_util_unlink (const char *name);
void
diff --git a/grub-core/gnulib/Makefile.am b/grub-core/gnulib/Makefile.am
-index 3444397fe37..b7c5e60e1c3 100644
+index 3444397fe..b7c5e60e1 100644
--- a/grub-core/gnulib/Makefile.am
+++ b/grub-core/gnulib/Makefile.am
@@ -21,7 +21,7 @@
@@ -2664,7 +2664,7 @@ index 3444397fe37..b7c5e60e1c3 100644
BUILT_SOURCES += unistd.h
diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4
new file mode 100644
-index 00000000000..1c2d66ee261
+index 000000000..1c2d66ee2
--- /dev/null
+++ b/m4/gettimeofday.m4
@@ -0,0 +1,138 @@
@@ -2807,7 +2807,7 @@ index 00000000000..1c2d66ee261
+ AC_CHECK_FUNCS([_ftime])
+])
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
-index 408918440b6..ef2ec5bcce0 100644
+index 408918440..ef2ec5bcc 100644
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -27,7 +27,7 @@
@@ -2828,7 +2828,7 @@ index 408918440b6..ef2ec5bcce0 100644
])
gl_AVOID([])
diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4
-index 7a19f60d85e..66fd0eda901 100644
+index 7a19f60d8..66fd0eda9 100644
--- a/m4/gnulib-comp.m4
+++ b/m4/gnulib-comp.m4
@@ -60,10 +60,13 @@ AC_DEFUN([gl_EARLY],
@@ -3035,7 +3035,7 @@ index 7a19f60d85e..66fd0eda901 100644
m4/vasnprintf.m4
diff --git a/m4/largefile.m4 b/m4/largefile.m4
new file mode 100644
-index 00000000000..a1b564ad9af
+index 000000000..a1b564ad9
--- /dev/null
+++ b/m4/largefile.m4
@@ -0,0 +1,146 @@
@@ -3187,7 +3187,7 @@ index 00000000000..a1b564ad9af
+])
diff --git a/m4/pathmax.m4 b/m4/pathmax.m4
new file mode 100644
-index 00000000000..114f91f04b5
+index 000000000..114f91f04
--- /dev/null
+++ b/m4/pathmax.m4
@@ -0,0 +1,42 @@
@@ -3235,7 +3235,7 @@ index 00000000000..114f91f04b5
+])
diff --git a/m4/readlink.m4 b/m4/readlink.m4
new file mode 100644
-index 00000000000..f9ce868c2e4
+index 000000000..f9ce868c2
--- /dev/null
+++ b/m4/readlink.m4
@@ -0,0 +1,71 @@
@@ -3312,7 +3312,7 @@ index 00000000000..f9ce868c2e4
+])
diff --git a/m4/stat.m4 b/m4/stat.m4
new file mode 100644
-index 00000000000..1ae327b3684
+index 000000000..1ae327b36
--- /dev/null
+++ b/m4/stat.m4
@@ -0,0 +1,71 @@
@@ -3389,7 +3389,7 @@ index 00000000000..1ae327b3684
+AC_DEFUN([gl_PREREQ_STAT], [:])
diff --git a/m4/sys_stat_h.m4 b/m4/sys_stat_h.m4
new file mode 100644
-index 00000000000..eaa7642ba31
+index 000000000..eaa7642ba
--- /dev/null
+++ b/m4/sys_stat_h.m4
@@ -0,0 +1,96 @@
@@ -3491,7 +3491,7 @@ index 00000000000..eaa7642ba31
+])
diff --git a/m4/sys_time_h.m4 b/m4/sys_time_h.m4
new file mode 100644
-index 00000000000..5c79300f8ec
+index 000000000..5c79300f8
--- /dev/null
+++ b/m4/sys_time_h.m4
@@ -0,0 +1,110 @@
@@ -3607,7 +3607,7 @@ index 00000000000..5c79300f8ec
+])
diff --git a/m4/time_h.m4 b/m4/time_h.m4
new file mode 100644
-index 00000000000..9852778f9a5
+index 000000000..9852778f9
--- /dev/null
+++ b/m4/time_h.m4
@@ -0,0 +1,118 @@
diff --git a/SOURCES/0055-Make-editenv-chase-symlinks-including-those-across-d.patch b/SOURCES/0055-Make-editenv-chase-symlinks-including-those-across-d.patch
index 73e316e..0717fb5 100644
--- a/SOURCES/0055-Make-editenv-chase-symlinks-including-those-across-d.patch
+++ b/SOURCES/0055-Make-editenv-chase-symlinks-including-those-across-d.patch
@@ -16,7 +16,7 @@ Reviewed-by: Adam Jackson <ajax@redhat.com>
2 files changed, 53 insertions(+), 2 deletions(-)
diff --git a/Makefile.util.def b/Makefile.util.def
-index c7b775bce73..d08713b5500 100644
+index c7b775bce..d08713b55 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -231,8 +231,17 @@ program = {
@@ -38,7 +38,7 @@ index c7b775bce73..d08713b5500 100644
ldadd = libgrubgcry.a;
ldadd = libgrubkern.a;
diff --git a/util/editenv.c b/util/editenv.c
-index c6f8d2298c3..d8d1dad6ab9 100644
+index c6f8d2298..d8d1dad6a 100644
--- a/util/editenv.c
+++ b/util/editenv.c
@@ -37,6 +37,7 @@ grub_util_create_envblk_file (const char *name)
diff --git a/SOURCES/0056-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch b/SOURCES/0056-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
index 81e0e52..013b7dd 100644
--- a/SOURCES/0056-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
+++ b/SOURCES/0056-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
@@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index b744438e04a..43d98476b88 100644
+index b744438e0..43d98476b 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -29,7 +29,8 @@ export TEXTDOMAINDIR="@localedir@"
diff --git a/SOURCES/0057-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch b/SOURCES/0057-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
index fc29633..8114eb5 100644
--- a/SOURCES/0057-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
+++ b/SOURCES/0057-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
@@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 8 insertions(+)
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
-index 1001a12232b..1a4a57898f9 100644
+index 1001a1223..1a4a57898 100644
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -249,6 +249,14 @@ version_test_gt ()
diff --git a/SOURCES/0058-Try-prefix-if-fw_path-doesn-t-work.patch b/SOURCES/0058-Try-prefix-if-fw_path-doesn-t-work.patch
index 1ded908..b1dbd8e 100644
--- a/SOURCES/0058-Try-prefix-if-fw_path-doesn-t-work.patch
+++ b/SOURCES/0058-Try-prefix-if-fw_path-doesn-t-work.patch
@@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
3 files changed, 75 insertions(+), 75 deletions(-)
diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
-index f5423ce27d9..e01bc6eab19 100644
+index f5423ce27..e01bc6eab 100644
--- a/grub-core/kern/ieee1275/init.c
+++ b/grub-core/kern/ieee1275/init.c
@@ -124,23 +124,25 @@ grub_machine_get_bootlocation (char **device, char **path)
@@ -56,7 +56,7 @@ index f5423ce27d9..e01bc6eab19 100644
}
diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index 0769bf850d3..16d2ce06d5a 100644
+index 0769bf850..16d2ce06d 100644
--- a/grub-core/net/net.c
+++ b/grub-core/net/net.c
@@ -1850,7 +1850,7 @@ grub_net_search_configfile (char *config)
@@ -69,7 +69,7 @@ index 0769bf850d3..16d2ce06d5a 100644
static struct grub_preboot *fini_hnd;
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 7d9c4f09b9b..b69f9e738fa 100644
+index 7d9c4f09b..b69f9e738 100644
--- a/grub-core/normal/main.c
+++ b/grub-core/normal/main.c
@@ -331,74 +331,72 @@ grub_enter_normal_mode (const char *config)
diff --git a/SOURCES/0059-Update-info-with-grub.cfg-netboot-selection-order-11.patch b/SOURCES/0059-Update-info-with-grub.cfg-netboot-selection-order-11.patch
index 26de3f4..6b6a53e 100644
--- a/SOURCES/0059-Update-info-with-grub.cfg-netboot-selection-order-11.patch
+++ b/SOURCES/0059-Update-info-with-grub.cfg-netboot-selection-order-11.patch
@@ -12,7 +12,7 @@ Resolves rhbz#1148650
1 file changed, 42 insertions(+)
diff --git a/docs/grub.texi b/docs/grub.texi
-index 2fd32608c01..a7155c22ffe 100644
+index 2fd32608c..a7155c22f 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -2493,6 +2493,48 @@ grub-mknetdir --net-directory=/srv/tftp --subdir=/boot/grub -d /usr/lib/grub/i38
diff --git a/SOURCES/0060-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch b/SOURCES/0060-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch
index d686cf3..5d7de8f 100644
--- a/SOURCES/0060-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch
+++ b/SOURCES/0060-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch
@@ -21,7 +21,7 @@ Resolves rhbz#1124074
create mode 100644 util/grub-rpm-sort.8
diff --git a/configure.ac b/configure.ac
-index d5db2803ec4..056df1cbaf9 100644
+index d5db2803e..056df1cba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,6 +65,7 @@ grub_TRANSFORM([grub-mkrelpath])
@@ -75,7 +75,7 @@ index d5db2803ec4..056df1cbaf9 100644
if test x$host_kernel = xkfreebsd; then
AC_CHECK_LIB([geom], [geom_gettree], [],
diff --git a/Makefile.util.def b/Makefile.util.def
-index d08713b5500..406d96861b6 100644
+index d08713b55..406d96861 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -685,6 +685,22 @@ program = {
@@ -103,7 +103,7 @@ index d08713b5500..406d96861b6 100644
common = util/grub-mkconfig.in;
diff --git a/util/grub-rpm-sort.c b/util/grub-rpm-sort.c
new file mode 100644
-index 00000000000..f33bd1ed568
+index 000000000..f33bd1ed5
--- /dev/null
+++ b/util/grub-rpm-sort.c
@@ -0,0 +1,281 @@
@@ -389,7 +389,7 @@ index 00000000000..f33bd1ed568
+ return 0;
+}
diff --git a/.gitignore b/.gitignore
-index 43f04d47277..fa2e5b609b1 100644
+index 43f04d472..fa2e5b609 100644
--- a/.gitignore
+++ b/.gitignore
@@ -105,6 +105,8 @@ grub-*.tar.*
@@ -402,7 +402,7 @@ index 43f04d47277..fa2e5b609b1 100644
/grub*-script-check.1
/grub*-set-default
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
-index 1a4a57898f9..7fe3598435c 100644
+index 1a4a57898..7fe359843 100644
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -214,6 +214,12 @@ version_sort ()
@@ -429,7 +429,7 @@ index 1a4a57898f9..7fe3598435c 100644
return 1
diff --git a/util/grub-rpm-sort.8 b/util/grub-rpm-sort.8
new file mode 100644
-index 00000000000..8ce21488448
+index 000000000..8ce214884
--- /dev/null
+++ b/util/grub-rpm-sort.8
@@ -0,0 +1,12 @@
diff --git a/SOURCES/0061-Handle-rssd-storage-devices.patch b/SOURCES/0061-Handle-rssd-storage-devices.patch
index 8f25692..7434dab 100644
--- a/SOURCES/0061-Handle-rssd-storage-devices.patch
+++ b/SOURCES/0061-Handle-rssd-storage-devices.patch
@@ -11,7 +11,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 13 insertions(+)
diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
-index 90d92d3ad5c..6d9f4e5faa2 100644
+index 90d92d3ad..6d9f4e5fa 100644
--- a/grub-core/osdep/linux/getroot.c
+++ b/grub-core/osdep/linux/getroot.c
@@ -921,6 +921,19 @@ grub_util_part_to_disk (const char *os_dev, struct stat *st,
diff --git a/SOURCES/0062-Make-grub2-mkconfig-construct-titles-that-look-like-.patch b/SOURCES/0062-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
index 3bbaa1d..b9125dc 100644
--- a/SOURCES/0062-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
+++ b/SOURCES/0062-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
@@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 27 insertions(+), 7 deletions(-)
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 43d98476b88..a8a8e2cf325 100644
+index 43d98476b..a8a8e2cf3 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -78,6 +78,32 @@ case x"$GRUB_FS" in
diff --git a/SOURCES/0063-Add-friendly-grub2-password-config-tool-985962.patch b/SOURCES/0063-Add-friendly-grub2-password-config-tool-985962.patch
index 49ebfa7..f7cbd0a 100644
--- a/SOURCES/0063-Add-friendly-grub2-password-config-tool-985962.patch
+++ b/SOURCES/0063-Add-friendly-grub2-password-config-tool-985962.patch
@@ -22,7 +22,7 @@ Resolves: rhbz#985962
create mode 100644 util/grub.d/01_users.in
diff --git a/configure.ac b/configure.ac
-index 056df1cbaf9..679f634ce4c 100644
+index 056df1cba..679f634ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,6 +65,7 @@ grub_TRANSFORM([grub-mkrelpath])
@@ -34,7 +34,7 @@ index 056df1cbaf9..679f634ce4c 100644
grub_TRANSFORM([grub-script-check])
grub_TRANSFORM([grub-set-default])
diff --git a/Makefile.util.def b/Makefile.util.def
-index 406d96861b6..fd91045bd6d 100644
+index 406d96861..fd91045bd 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -440,6 +440,12 @@ script = {
@@ -65,7 +65,7 @@ index 406d96861b6..fd91045bd6d 100644
name = grub-mkconfig_lib;
common = util/grub-mkconfig_lib.in;
diff --git a/.gitignore b/.gitignore
-index fa2e5b609b1..5066689bc0a 100644
+index fa2e5b609..5066689bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -111,6 +111,8 @@ grub-*.tar.*
@@ -78,7 +78,7 @@ index fa2e5b609b1..5066689bc0a 100644
/grub*-shell-tester
/grub*-sparc64-setup
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index f68d4925ee6..bdb9982aefb 100644
+index f68d4925e..bdb9982ae 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -282,6 +282,8 @@ for i in "${grub_mkconfig_dir}"/* ; do
@@ -92,7 +92,7 @@ index f68d4925ee6..bdb9982aefb 100644
echo
diff --git a/util/grub-setpassword.8 b/util/grub-setpassword.8
new file mode 100644
-index 00000000000..49200a848b7
+index 000000000..49200a848
--- /dev/null
+++ b/util/grub-setpassword.8
@@ -0,0 +1,28 @@
@@ -126,7 +126,7 @@ index 00000000000..49200a848b7
+.BR "info grub2-mkpasswd-pbkdf2"
diff --git a/util/grub-setpassword.in b/util/grub-setpassword.in
new file mode 100644
-index 00000000000..dd76f00fc0e
+index 000000000..dd76f00fc
--- /dev/null
+++ b/util/grub-setpassword.in
@@ -0,0 +1,123 @@
@@ -255,7 +255,7 @@ index 00000000000..dd76f00fc0e
+echo "GRUB2_PASSWORD=${MYPASS}" > "${grubdir}/user.cfg"
diff --git a/util/grub.d/01_users.in b/util/grub.d/01_users.in
new file mode 100644
-index 00000000000..db2f44bfb78
+index 000000000..db2f44bfb
--- /dev/null
+++ b/util/grub.d/01_users.in
@@ -0,0 +1,11 @@
diff --git a/SOURCES/0064-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch b/SOURCES/0064-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch
index 09061ce..9caa8ce 100644
--- a/SOURCES/0064-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch
+++ b/SOURCES/0064-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch
@@ -15,7 +15,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 679f634ce4c..71d1056969e 100644
+index 679f634ce..71d105696 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1796,7 +1796,7 @@ AC_SUBST([LIBDEVMAPPER])
@@ -28,7 +28,7 @@ index 679f634ce4c..71d1056969e 100644
fi
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
-index 7fe3598435c..113a41f9409 100644
+index 7fe359843..113a41f94 100644
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -33,6 +33,9 @@ fi
diff --git a/SOURCES/0065-tcp-add-window-scaling-support.patch b/SOURCES/0065-tcp-add-window-scaling-support.patch
index 7d1996c..e19ddf8 100644
--- a/SOURCES/0065-tcp-add-window-scaling-support.patch
+++ b/SOURCES/0065-tcp-add-window-scaling-support.patch
@@ -17,7 +17,7 @@ Signed-off-by: Josef Bacik <jbacik@fb.com>
1 file changed, 29 insertions(+), 13 deletions(-)
diff --git a/grub-core/net/tcp.c b/grub-core/net/tcp.c
-index e8ad34b84d4..7d4b822626d 100644
+index e8ad34b84..7d4b82262 100644
--- a/grub-core/net/tcp.c
+++ b/grub-core/net/tcp.c
@@ -106,6 +106,18 @@ struct tcphdr
diff --git a/SOURCES/0066-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch b/SOURCES/0066-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch
index 691d4dc..4990bcd 100644
--- a/SOURCES/0066-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch
+++ b/SOURCES/0066-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] efinet: add filter for the first exclusive reopen of SNP
1 file changed, 39 insertions(+)
diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index 5388f952ba9..d15a799f29a 100644
+index 5388f952b..d15a799f2 100644
--- a/grub-core/net/drivers/efi/efinet.c
+++ b/grub-core/net/drivers/efi/efinet.c
@@ -383,6 +383,45 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
diff --git a/SOURCES/0067-Fix-security-issue-when-reading-username-and-passwor.patch b/SOURCES/0067-Fix-security-issue-when-reading-username-and-passwor.patch
index 11bc434..94b7b7f 100644
--- a/SOURCES/0067-Fix-security-issue-when-reading-username-and-passwor.patch
+++ b/SOURCES/0067-Fix-security-issue-when-reading-username-and-passwor.patch
@@ -17,7 +17,7 @@ Signed-off-by: Ismael Ripoll-Ripoll <iripoll@disca.upv.es>
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/grub-core/lib/crypto.c b/grub-core/lib/crypto.c
-index ca334d5a40e..e6c78d16d39 100644
+index ca334d5a4..e6c78d16d 100644
--- a/grub-core/lib/crypto.c
+++ b/grub-core/lib/crypto.c
@@ -468,7 +468,7 @@ grub_password_get (char buf[], unsigned buf_size)
@@ -30,7 +30,7 @@ index ca334d5a40e..e6c78d16d39 100644
if (cur_len)
cur_len--;
diff --git a/grub-core/normal/auth.c b/grub-core/normal/auth.c
-index 6be678c0de1..c35ce972473 100644
+index 6be678c0d..c35ce9724 100644
--- a/grub-core/normal/auth.c
+++ b/grub-core/normal/auth.c
@@ -172,7 +172,7 @@ grub_username_get (char buf[], unsigned buf_size)
diff --git a/SOURCES/0068-Warn-if-grub-password-will-not-be-read-1290803.patch b/SOURCES/0068-Warn-if-grub-password-will-not-be-read-1290803.patch
index de4a6ae..9cfd656 100644
--- a/SOURCES/0068-Warn-if-grub-password-will-not-be-read-1290803.patch
+++ b/SOURCES/0068-Warn-if-grub-password-will-not-be-read-1290803.patch
@@ -14,7 +14,7 @@ Resolves: rhbz#1290803
1 file changed, 5 insertions(+)
diff --git a/util/grub-setpassword.in b/util/grub-setpassword.in
-index dd76f00fc0e..fb9d3a3b6f9 100644
+index dd76f00fc..fb9d3a3b6 100644
--- a/util/grub-setpassword.in
+++ b/util/grub-setpassword.in
@@ -121,3 +121,8 @@ fi
diff --git a/SOURCES/0069-Clean-up-grub-setpassword-documentation-1290799.patch b/SOURCES/0069-Clean-up-grub-setpassword-documentation-1290799.patch
index a405e88..65460be 100644
--- a/SOURCES/0069-Clean-up-grub-setpassword-documentation-1290799.patch
+++ b/SOURCES/0069-Clean-up-grub-setpassword-documentation-1290799.patch
@@ -14,7 +14,7 @@ Resolves: rhbz#1290799
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/util/grub-setpassword.8 b/util/grub-setpassword.8
-index 49200a848b7..dc91dd6697b 100644
+index 49200a848..dc91dd669 100644
--- a/util/grub-setpassword.8
+++ b/util/grub-setpassword.8
@@ -19,7 +19,7 @@ Display program usage and exit.
@@ -27,7 +27,7 @@ index 49200a848b7..dc91dd6697b 100644
.SH SEE ALSO
diff --git a/util/grub-setpassword.in b/util/grub-setpassword.in
-index fb9d3a3b6f9..c8c0fa4199d 100644
+index fb9d3a3b6..c8c0fa419 100644
--- a/util/grub-setpassword.in
+++ b/util/grub-setpassword.in
@@ -16,15 +16,14 @@ grub_mkpasswd="${bindir}/@grub_mkpasswd_pbkdf2@"
diff --git a/SOURCES/0070-Fix-locale-issue-in-grub-setpassword-1294243.patch b/SOURCES/0070-Fix-locale-issue-in-grub-setpassword-1294243.patch
index 9b315cc..319e1f5 100644
--- a/SOURCES/0070-Fix-locale-issue-in-grub-setpassword-1294243.patch
+++ b/SOURCES/0070-Fix-locale-issue-in-grub-setpassword-1294243.patch
@@ -13,7 +13,7 @@ Resolves: rhbz#1294243
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/util/grub-setpassword.in b/util/grub-setpassword.in
-index c8c0fa4199d..d7924af5192 100644
+index c8c0fa419..d7924af51 100644
--- a/util/grub-setpassword.in
+++ b/util/grub-setpassword.in
@@ -104,7 +104,7 @@ getpass() {
diff --git a/SOURCES/0071-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch b/SOURCES/0071-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch
index 0891f8f..12773d4 100644
--- a/SOURCES/0071-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch
+++ b/SOURCES/0071-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch
@@ -12,7 +12,7 @@ Resolves: rhbz#1288608
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/grub-core/efiemu/mm.c b/grub-core/efiemu/mm.c
-index 52a032f7b2e..92e7df7e501 100644
+index 52a032f7b..92e7df7e5 100644
--- a/grub-core/efiemu/mm.c
+++ b/grub-core/efiemu/mm.c
@@ -410,8 +410,8 @@ fill_hook (grub_uint64_t addr, grub_uint64_t size, grub_memory_type_t type,
diff --git a/SOURCES/0072-efiemu-Fix-compilation-failure.patch b/SOURCES/0072-efiemu-Fix-compilation-failure.patch
index 0c1c10f..d8d4b06 100644
--- a/SOURCES/0072-efiemu-Fix-compilation-failure.patch
+++ b/SOURCES/0072-efiemu-Fix-compilation-failure.patch
@@ -11,7 +11,7 @@ Resolves: rhbz#1288608
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/grub-core/efiemu/mm.c b/grub-core/efiemu/mm.c
-index 92e7df7e501..52a032f7b2e 100644
+index 92e7df7e5..52a032f7b 100644
--- a/grub-core/efiemu/mm.c
+++ b/grub-core/efiemu/mm.c
@@ -410,8 +410,8 @@ fill_hook (grub_uint64_t addr, grub_uint64_t size, grub_memory_type_t type,
diff --git a/SOURCES/0073-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch b/SOURCES/0073-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
index 9482299..5849d2e 100644
--- a/SOURCES/0073-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
+++ b/SOURCES/0073-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
@@ -14,7 +14,7 @@ This reverts commit 147daeab22db793978f952b6f0d832919a1b0081.
1 file changed, 39 deletions(-)
diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index d15a799f29a..5388f952ba9 100644
+index d15a799f2..5388f952b 100644
--- a/grub-core/net/drivers/efi/efinet.c
+++ b/grub-core/net/drivers/efi/efinet.c
@@ -383,45 +383,6 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
diff --git a/SOURCES/0074-Add-a-url-parser.patch b/SOURCES/0074-Add-a-url-parser.patch
index 2697fd2..b962bef 100644
--- a/SOURCES/0074-Add-a-url-parser.patch
+++ b/SOURCES/0074-Add-a-url-parser.patch
@@ -20,7 +20,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
create mode 100644 include/grub/net/url.h
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index cd0902b46b8..991891a6e09 100644
+index cd0902b46..991891a6e 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -2185,6 +2185,7 @@ module = {
@@ -32,7 +32,7 @@ index cd0902b46b8..991891a6e09 100644
module = {
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index 8344526be7f..f1fab700048 100644
+index 8344526be..f1fab7000 100644
--- a/grub-core/kern/misc.c
+++ b/grub-core/kern/misc.c
@@ -296,6 +296,19 @@ grub_strrchr (const char *s, int c)
@@ -57,7 +57,7 @@ index 8344526be7f..f1fab700048 100644
{
diff --git a/grub-core/net/url.c b/grub-core/net/url.c
new file mode 100644
-index 00000000000..146858284cd
+index 000000000..146858284
--- /dev/null
+++ b/grub-core/net/url.c
@@ -0,0 +1,861 @@
@@ -923,7 +923,7 @@ index 00000000000..146858284cd
+}
+#endif
diff --git a/include/grub/misc.h b/include/grub/misc.h
-index 83fd69f4ada..fcaf1201e39 100644
+index 83fd69f4a..fcaf1201e 100644
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -85,6 +85,7 @@ int EXPORT_FUNC(grub_strncmp) (const char *s1, const char *s2, grub_size_t n);
@@ -987,7 +987,7 @@ index 83fd69f4ada..fcaf1201e39 100644
{
diff --git a/include/grub/net/url.h b/include/grub/net/url.h
new file mode 100644
-index 00000000000..a215fa27d0a
+index 000000000..a215fa27d
--- /dev/null
+++ b/include/grub/net/url.h
@@ -0,0 +1,28 @@
diff --git a/SOURCES/0075-efinet-and-bootp-add-support-for-dhcpv6.patch b/SOURCES/0075-efinet-and-bootp-add-support-for-dhcpv6.patch
index 97038c1..a85bdfd 100644
--- a/SOURCES/0075-efinet-and-bootp-add-support-for-dhcpv6.patch
+++ b/SOURCES/0075-efinet-and-bootp-add-support-for-dhcpv6.patch
@@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
6 files changed, 478 insertions(+), 14 deletions(-)
diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
-index f03eeab2fb4..da3e454466b 100644
+index f03eeab2f..da3e45446 100644
--- a/grub-core/net/bootp.c
+++ b/grub-core/net/bootp.c
@@ -23,6 +23,7 @@
@@ -206,7 +206,7 @@ index f03eeab2fb4..da3e454466b 100644
grub_net_process_dhcp (struct grub_net_buff *nb,
struct grub_net_card *card)
diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index 5388f952ba9..a4daaa460bd 100644
+index 5388f952b..a4daaa460 100644
--- a/grub-core/net/drivers/efi/efinet.c
+++ b/grub-core/net/drivers/efi/efinet.c
@@ -18,11 +18,15 @@
@@ -315,7 +315,7 @@ index 5388f952ba9..a4daaa460bd 100644
}
}
diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index 16d2ce06d5a..4be228d9576 100644
+index 16d2ce06d..4be228d95 100644
--- a/grub-core/net/net.c
+++ b/grub-core/net/net.c
@@ -955,6 +955,78 @@ grub_net_network_level_interface_register (struct grub_net_network_level_interfa
@@ -398,7 +398,7 @@ index 16d2ce06d5a..4be228d9576 100644
grub_err_t
grub_net_add_ipv4_local (struct grub_net_network_level_interface *inter,
diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
-index 7d90bf66e76..1157524fc50 100644
+index 7d90bf66e..1157524fc 100644
--- a/grub-core/net/tftp.c
+++ b/grub-core/net/tftp.c
@@ -379,19 +379,23 @@ tftp_open (struct grub_file *file, const char *filename)
@@ -426,7 +426,7 @@ index 7d90bf66e76..1157524fc50 100644
grub_free (data);
return grub_errno;
diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index c7c9f0e1db1..28b6adf7648 100644
+index c7c9f0e1d..28b6adf76 100644
--- a/include/grub/efi/api.h
+++ b/include/grub/efi/api.h
@@ -572,10 +572,16 @@ typedef void *grub_efi_handle_t;
@@ -581,7 +581,7 @@ index c7c9f0e1db1..28b6adf7648 100644
typedef struct grub_efi_pxe
diff --git a/include/grub/net.h b/include/grub/net.h
-index 50d62ab0c8c..f8f3ec13acc 100644
+index 50d62ab0c..f8f3ec13a 100644
--- a/include/grub/net.h
+++ b/include/grub/net.h
@@ -442,6 +442,51 @@ struct grub_net_bootp_packet
diff --git a/SOURCES/0076-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch b/SOURCES/0076-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
index 7ea79d1..ebb11af 100644
--- a/SOURCES/0076-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
+++ b/SOURCES/0076-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
@@ -24,7 +24,7 @@ Resolves: rhbz#1226325
create mode 100644 util/grub-get-kernel-settings.in
diff --git a/configure.ac b/configure.ac
-index 71d1056969e..aa06ed59c8d 100644
+index 71d105696..aa06ed59c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,6 +58,7 @@ grub_TRANSFORM([grub-install])
@@ -44,7 +44,7 @@ index 71d1056969e..aa06ed59c8d 100644
grub_TRANSFORM([grub-install.1])
grub_TRANSFORM([grub-kbdcomp.3])
diff --git a/Makefile.util.def b/Makefile.util.def
-index fd91045bd6d..2d032643de7 100644
+index fd91045bd..2d032643d 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -714,6 +714,13 @@ script = {
@@ -62,7 +62,7 @@ index fd91045bd6d..2d032643de7 100644
name = grub-set-default;
common = util/grub-set-default.in;
diff --git a/.gitignore b/.gitignore
-index 5066689bc0a..54795fa60be 100644
+index 5066689bc..54795fa60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,6 +68,8 @@ grub-*.tar.*
@@ -75,7 +75,7 @@ index 5066689bc0a..54795fa60be 100644
/grub*-glue-efi.1
/grub*-install
diff --git a/util/bash-completion.d/grub-completion.bash.in b/util/bash-completion.d/grub-completion.bash.in
-index 44bf135b9f8..5c4acd496d4 100644
+index 44bf135b9..5c4acd496 100644
--- a/util/bash-completion.d/grub-completion.bash.in
+++ b/util/bash-completion.d/grub-completion.bash.in
@@ -264,6 +264,28 @@ have ${__grub_sparc64_setup_program} && \
@@ -109,7 +109,7 @@ index 44bf135b9f8..5c4acd496d4 100644
#
diff --git a/util/grub-get-kernel-settings.3 b/util/grub-get-kernel-settings.3
new file mode 100644
-index 00000000000..ba33330e28d
+index 000000000..ba33330e2
--- /dev/null
+++ b/util/grub-get-kernel-settings.3
@@ -0,0 +1,20 @@
@@ -135,7 +135,7 @@ index 00000000000..ba33330e28d
+.BR "info grub"
diff --git a/util/grub-get-kernel-settings.in b/util/grub-get-kernel-settings.in
new file mode 100644
-index 00000000000..12046219878
+index 000000000..120462198
--- /dev/null
+++ b/util/grub-get-kernel-settings.in
@@ -0,0 +1,78 @@
@@ -218,7 +218,7 @@ index 00000000000..12046219878
+ echo export GRUB_LINUX_DEBUG_TITLE_POSTFIX
+fi
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index bdb9982aefb..8218f3d477f 100644
+index bdb9982ae..8218f3d47 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -45,6 +45,7 @@ grub_probe="${sbindir}/@grub_probe@"
@@ -239,7 +239,7 @@ index bdb9982aefb..8218f3d477f 100644
if [ -z "$GRUB_DEVICE_UUID" ]; then
GRUB_DEVICE_UUID="$GRUB_DEVICE_UUID_GENERATED"
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index a8a8e2cf325..4e49ccdf742 100644
+index a8a8e2cf3..4e49ccdf7 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -111,7 +111,8 @@ linux_entry ()
diff --git a/SOURCES/0077-Normalize-slashes-in-tftp-paths.patch b/SOURCES/0077-Normalize-slashes-in-tftp-paths.patch
index 5ea5afa..66033a1 100644
--- a/SOURCES/0077-Normalize-slashes-in-tftp-paths.patch
+++ b/SOURCES/0077-Normalize-slashes-in-tftp-paths.patch
@@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
-index 1157524fc50..5ca0a96a6f6 100644
+index 1157524fc..5ca0a96a6 100644
--- a/grub-core/net/tftp.c
+++ b/grub-core/net/tftp.c
@@ -300,6 +300,25 @@ destroy_pq (tftp_data_t data)
diff --git a/SOURCES/0078-Fix-malformed-tftp-packets.patch b/SOURCES/0078-Fix-malformed-tftp-packets.patch
index 2445137..2c6aae6 100644
--- a/SOURCES/0078-Fix-malformed-tftp-packets.patch
+++ b/SOURCES/0078-Fix-malformed-tftp-packets.patch
@@ -16,7 +16,7 @@ Signed-off-by: Mark Salter <msalter@redhat.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
-index 5ca0a96a6f6..dcd82494309 100644
+index 5ca0a96a6..dcd824943 100644
--- a/grub-core/net/tftp.c
+++ b/grub-core/net/tftp.c
@@ -360,8 +360,8 @@ tftp_open (struct grub_file *file, const char *filename)
diff --git a/SOURCES/0079-bz1374141-fix-incorrect-mask-for-ppc64.patch b/SOURCES/0079-bz1374141-fix-incorrect-mask-for-ppc64.patch
index 628ff7e..cff2869 100644
--- a/SOURCES/0079-bz1374141-fix-incorrect-mask-for-ppc64.patch
+++ b/SOURCES/0079-bz1374141-fix-incorrect-mask-for-ppc64.patch
@@ -30,7 +30,7 @@ The count of zero with __builtin_clz can be 22. (clz counts the number of one bi
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/grub-core/net/drivers/ieee1275/ofnet.c b/grub-core/net/drivers/ieee1275/ofnet.c
-index 002446be1c3..3df75357a70 100644
+index 002446be1..3df75357a 100644
--- a/grub-core/net/drivers/ieee1275/ofnet.c
+++ b/grub-core/net/drivers/ieee1275/ofnet.c
@@ -220,8 +220,7 @@ grub_ieee1275_parse_bootpath (const char *devpath, char *bootpath,
diff --git a/SOURCES/0080-Make-grub_fatal-also-backtrace.patch b/SOURCES/0080-Make-grub_fatal-also-backtrace.patch
index a9af329..8ca42f7 100644
--- a/SOURCES/0080-Make-grub_fatal-also-backtrace.patch
+++ b/SOURCES/0080-Make-grub_fatal-also-backtrace.patch
@@ -13,7 +13,7 @@ Subject: [PATCH] Make grub_fatal() also backtrace.
create mode 100644 grub-core/lib/arm64/backtrace.c
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 991891a6e09..27563743ba9 100644
+index 991891a6e..27563743b 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -175,6 +175,9 @@ kernel = {
@@ -27,7 +27,7 @@ index 991891a6e09..27563743ba9 100644
i386_xen = kern/i386/dl.c;
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index f1fab700048..5ce89a40c68 100644
+index f1fab7000..5ce89a40c 100644
--- a/grub-core/kern/misc.c
+++ b/grub-core/kern/misc.c
@@ -24,6 +24,7 @@
@@ -55,7 +55,7 @@ index f1fab700048..5ce89a40c68 100644
#endif
diff --git a/grub-core/lib/arm64/backtrace.c b/grub-core/lib/arm64/backtrace.c
new file mode 100644
-index 00000000000..1079b5380e1
+index 000000000..1079b5380
--- /dev/null
+++ b/grub-core/lib/arm64/backtrace.c
@@ -0,0 +1,62 @@
@@ -122,7 +122,7 @@ index 00000000000..1079b5380e1
+}
+
diff --git a/grub-core/lib/backtrace.c b/grub-core/lib/backtrace.c
-index 825a8800e25..c0ad6ab8be1 100644
+index 825a8800e..c0ad6ab8b 100644
--- a/grub-core/lib/backtrace.c
+++ b/grub-core/lib/backtrace.c
@@ -29,6 +29,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
@@ -142,7 +142,7 @@ index 825a8800e25..c0ad6ab8be1 100644
}
diff --git a/grub-core/lib/i386/backtrace.c b/grub-core/lib/i386/backtrace.c
-index c3e03c7275c..c67273db3ae 100644
+index c3e03c727..c67273db3 100644
--- a/grub-core/lib/i386/backtrace.c
+++ b/grub-core/lib/i386/backtrace.c
@@ -15,11 +15,23 @@
diff --git a/SOURCES/0081-Make-grub-editenv-build-again.patch b/SOURCES/0081-Make-grub-editenv-build-again.patch
index 64c001f..6e4a753 100644
--- a/SOURCES/0081-Make-grub-editenv-build-again.patch
+++ b/SOURCES/0081-Make-grub-editenv-build-again.patch
@@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 2 insertions(+)
diff --git a/Makefile.util.def b/Makefile.util.def
-index 2d032643de7..879e8eb98a4 100644
+index 2d032643d..879e8eb98 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -237,6 +237,8 @@ program = {
diff --git a/SOURCES/0082-Fix-up-some-man-pages-rpmdiff-noticed.patch b/SOURCES/0082-Fix-up-some-man-pages-rpmdiff-noticed.patch
index 71b0a22..94ce902 100644
--- a/SOURCES/0082-Fix-up-some-man-pages-rpmdiff-noticed.patch
+++ b/SOURCES/0082-Fix-up-some-man-pages-rpmdiff-noticed.patch
@@ -13,7 +13,7 @@ Subject: [PATCH] Fix up some man pages rpmdiff noticed.
create mode 100644 util/grub-syslinux2cfg.1
diff --git a/configure.ac b/configure.ac
-index aa06ed59c8d..f69f8986791 100644
+index aa06ed59c..f69f89867 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,6 +80,7 @@ grub_TRANSFORM([grub-get-kernel-settings.3])
@@ -34,7 +34,7 @@ index aa06ed59c8d..f69f8986791 100644
if test "x$TARGET_CFLAGS" = x; then
diff --git a/util/grub-macbless.8 b/util/grub-macbless.8
new file mode 100644
-index 00000000000..ae842f3a606
+index 000000000..ae842f3a6
--- /dev/null
+++ b/util/grub-macbless.8
@@ -0,0 +1,26 @@
@@ -65,7 +65,7 @@ index 00000000000..ae842f3a606
+.SH SEE ALSO
+.BR "info grub"
diff --git a/util/grub-mkimage.1 b/util/grub-mkimage.1
-index 4dea4f54597..0eaaafe505b 100644
+index 4dea4f545..0eaaafe50 100644
--- a/util/grub-mkimage.1
+++ b/util/grub-mkimage.1
@@ -17,7 +17,7 @@
@@ -79,7 +79,7 @@ index 4dea4f54597..0eaaafe505b 100644
.TP
diff --git a/util/grub-syslinux2cfg.1 b/util/grub-syslinux2cfg.1
new file mode 100644
-index 00000000000..85309482718
+index 000000000..853094827
--- /dev/null
+++ b/util/grub-syslinux2cfg.1
@@ -0,0 +1,65 @@
diff --git a/SOURCES/0083-Make-exit-take-a-return-code.patch b/SOURCES/0083-Make-exit-take-a-return-code.patch
index b886e12..4592a76 100644
--- a/SOURCES/0083-Make-exit-take-a-return-code.patch
+++ b/SOURCES/0083-Make-exit-take-a-return-code.patch
@@ -15,7 +15,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
2 files changed, 15 insertions(+)
diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
-index 55ea5a11ccd..7e47ec81263 100644
+index 55ea5a11c..7e47ec812 100644
--- a/grub-core/kern/emu/main.c
+++ b/grub-core/kern/emu/main.c
@@ -72,6 +72,12 @@ grub_exit (int retval __attribute__((unused)))
@@ -32,7 +32,7 @@ index 55ea5a11ccd..7e47ec81263 100644
grub_machine_init (void)
{
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index 5ce89a40c68..04371ac49f2 100644
+index 5ce89a40c..04371ac49 100644
--- a/grub-core/kern/misc.c
+++ b/grub-core/kern/misc.c
@@ -1120,6 +1120,15 @@ grub_abort (void)
diff --git a/SOURCES/0084-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch b/SOURCES/0084-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch
index e832337..f471ae3 100644
--- a/SOURCES/0084-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch
+++ b/SOURCES/0084-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch
@@ -14,7 +14,7 @@ make sure they exist.
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index a1ac7a38867..93b5cd306eb 100644
+index a1ac7a388..93b5cd306 100644
--- a/grub-core/loader/arm64/linux.c
+++ b/grub-core/loader/arm64/linux.c
@@ -80,7 +80,21 @@ finalize_params_linux (void)
diff --git a/SOURCES/0085-Make-our-info-pages-say-grub2-where-appropriate.patch b/SOURCES/0085-Make-our-info-pages-say-grub2-where-appropriate.patch
index 800f7f1..75d438a 100644
--- a/SOURCES/0085-Make-our-info-pages-say-grub2-where-appropriate.patch
+++ b/SOURCES/0085-Make-our-info-pages-say-grub2-where-appropriate.patch
@@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
2 files changed, 161 insertions(+), 161 deletions(-)
diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi
-index a9f4de6318c..3ce827ab726 100644
+index a9f4de631..3ce827ab7 100644
--- a/docs/grub-dev.texi
+++ b/docs/grub-dev.texi
@@ -1,7 +1,7 @@
@@ -35,7 +35,7 @@ index a9f4de6318c..3ce827ab726 100644
@setchapternewpage odd
diff --git a/docs/grub.texi b/docs/grub.texi
-index a7155c22ffe..2b7b7faf847 100644
+index a7155c22f..2b7b7faf8 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -1,7 +1,7 @@
diff --git a/SOURCES/0086-print-more-debug-info-in-our-module-loader.patch b/SOURCES/0086-print-more-debug-info-in-our-module-loader.patch
index bf2c42f..52059d9 100644
--- a/SOURCES/0086-print-more-debug-info-in-our-module-loader.patch
+++ b/SOURCES/0086-print-more-debug-info-in-our-module-loader.patch
@@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index e339f264b3a..562d6887e0e 100644
+index e339f264b..562d6887e 100644
--- a/grub-core/kern/efi/efi.c
+++ b/grub-core/kern/efi/efi.c
@@ -313,13 +313,23 @@ grub_efi_modules_addr (void)
diff --git a/SOURCES/0087-macos-just-build-chainloader-entries-don-t-try-any-x.patch b/SOURCES/0087-macos-just-build-chainloader-entries-don-t-try-any-x.patch
index 3a761c0..573f077 100644
--- a/SOURCES/0087-macos-just-build-chainloader-entries-don-t-try-any-x.patch
+++ b/SOURCES/0087-macos-just-build-chainloader-entries-don-t-try-any-x.patch
@@ -20,7 +20,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 18 insertions(+), 60 deletions(-)
diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
-index 9b8f5968e2d..13a3a6bc752 100644
+index 9b8f5968e..13a3a6bc7 100644
--- a/util/grub.d/30_os-prober.in
+++ b/util/grub.d/30_os-prober.in
@@ -42,68 +42,25 @@ if [ -z "${OSPROBED}" ] ; then
diff --git a/SOURCES/0088-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch b/SOURCES/0088-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
index eafb894..99662bb 100644
--- a/SOURCES/0088-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
+++ b/SOURCES/0088-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
@@ -24,7 +24,7 @@ Signed-off-by: Jeff Mahoney <jeffm@suse.com>
2 files changed, 533 insertions(+), 20 deletions(-)
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index be195448dbe..51ed63d429b 100644
+index be195448d..51ed63d42 100644
--- a/grub-core/fs/btrfs.c
+++ b/grub-core/fs/btrfs.c
@@ -29,6 +29,9 @@
@@ -690,7 +690,7 @@ index be195448dbe..51ed63d429b 100644
+
+// vim: si et sw=2:
diff --git a/include/grub/btrfs.h b/include/grub/btrfs.h
-index 9d93fb6c182..234ad976771 100644
+index 9d93fb6c1..234ad9767 100644
--- a/include/grub/btrfs.h
+++ b/include/grub/btrfs.h
@@ -29,6 +29,7 @@ enum
diff --git a/SOURCES/0089-export-btrfs_subvol-and-btrfs_subvolid.patch b/SOURCES/0089-export-btrfs_subvol-and-btrfs_subvolid.patch
index a0989e8..ba167f1 100644
--- a/SOURCES/0089-export-btrfs_subvol-and-btrfs_subvolid.patch
+++ b/SOURCES/0089-export-btrfs_subvol-and-btrfs_subvolid.patch
@@ -12,7 +12,7 @@ Signed-off-by: Michael Chang <mchang@suse.com>
1 file changed, 2 insertions(+)
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index 51ed63d429b..88d727d161f 100644
+index 51ed63d42..88d727d16 100644
--- a/grub-core/fs/btrfs.c
+++ b/grub-core/fs/btrfs.c
@@ -2273,6 +2273,8 @@ GRUB_MOD_INIT (btrfs)
diff --git a/SOURCES/0090-grub2-btrfs-03-follow_default.patch b/SOURCES/0090-grub2-btrfs-03-follow_default.patch
index 26e91f1..4280f55 100644
--- a/SOURCES/0090-grub2-btrfs-03-follow_default.patch
+++ b/SOURCES/0090-grub2-btrfs-03-follow_default.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] grub2-btrfs-03-follow_default
1 file changed, 76 insertions(+), 31 deletions(-)
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index 88d727d161f..a47d297567f 100644
+index 88d727d16..a47d29756 100644
--- a/grub-core/fs/btrfs.c
+++ b/grub-core/fs/btrfs.c
@@ -920,6 +920,7 @@ grub_btrfs_mount (grub_device_t dev)
diff --git a/SOURCES/0091-grub2-btrfs-04-grub2-install.patch b/SOURCES/0091-grub2-btrfs-04-grub2-install.patch
index af81616..4f4df1c 100644
--- a/SOURCES/0091-grub2-btrfs-04-grub2-install.patch
+++ b/SOURCES/0091-grub2-btrfs-04-grub2-install.patch
@@ -13,7 +13,7 @@ Subject: [PATCH] grub2-btrfs-04-grub2-install
6 files changed, 54 insertions(+), 2 deletions(-)
diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
-index 6d9f4e5faa2..5d50dd6f8dc 100644
+index 6d9f4e5fa..5d50dd6f8 100644
--- a/grub-core/osdep/linux/getroot.c
+++ b/grub-core/osdep/linux/getroot.c
@@ -376,6 +376,7 @@ get_btrfs_fs_prefix (const char *mount_path)
@@ -38,7 +38,7 @@ index 6d9f4e5faa2..5d50dd6f8dc 100644
else if (!retry && grub_strcmp (entries[i].fstype, "autofs") == 0)
{
diff --git a/grub-core/osdep/unix/config.c b/grub-core/osdep/unix/config.c
-index 65effa9f3a7..b637c58efb7 100644
+index 65effa9f3..b637c58ef 100644
--- a/grub-core/osdep/unix/config.c
+++ b/grub-core/osdep/unix/config.c
@@ -82,6 +82,19 @@ grub_util_load_config (struct grub_util_config *cfg)
@@ -73,7 +73,7 @@ index 65effa9f3a7..b637c58efb7 100644
argv[2] = script;
argv[3] = '\0';
diff --git a/util/config.c b/util/config.c
-index ebcdd8f5e22..f044a880a76 100644
+index ebcdd8f5e..f044a880a 100644
--- a/util/config.c
+++ b/util/config.c
@@ -42,6 +42,16 @@ grub_util_parse_config (FILE *f, struct grub_util_config *cfg, int simple)
@@ -94,7 +94,7 @@ index ebcdd8f5e22..f044a880a76 100644
sizeof ("GRUB_DISTRIBUTOR=") - 1) == 0)
{
diff --git a/util/grub-install.c b/util/grub-install.c
-index 78d0138cb0a..4375c161955 100644
+index 78d0138cb..4375c1619 100644
--- a/util/grub-install.c
+++ b/util/grub-install.c
@@ -816,6 +816,8 @@ fill_core_services (const char *core_services)
@@ -134,7 +134,7 @@ index 78d0138cb0a..4375c161955 100644
char *install_drive = NULL;
diff --git a/util/grub-mkrelpath.c b/util/grub-mkrelpath.c
-index 47a241a391b..5db7a9a7d97 100644
+index 47a241a39..5db7a9a7d 100644
--- a/util/grub-mkrelpath.c
+++ b/util/grub-mkrelpath.c
@@ -40,9 +40,12 @@ struct arguments
@@ -161,7 +161,7 @@ index 47a241a391b..5db7a9a7d97 100644
if (state->arg_num == 0)
arguments->pathname = xstrdup (arg);
diff --git a/include/grub/emu/config.h b/include/grub/emu/config.h
-index 875d5896ce1..c9a7e5f4ade 100644
+index 875d5896c..c9a7e5f4a 100644
--- a/include/grub/emu/config.h
+++ b/include/grub/emu/config.h
@@ -37,6 +37,7 @@ struct grub_util_config
diff --git a/SOURCES/0092-grub2-btrfs-05-grub2-mkconfig.patch b/SOURCES/0092-grub2-btrfs-05-grub2-mkconfig.patch
index d7bfb4d..8d3cb2f 100644
--- a/SOURCES/0092-grub2-btrfs-05-grub2-mkconfig.patch
+++ b/SOURCES/0092-grub2-btrfs-05-grub2-mkconfig.patch
@@ -12,7 +12,7 @@ Subject: [PATCH] grub2-btrfs-05-grub2-mkconfig
5 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 8218f3d477f..4248b9341ab 100644
+index 8218f3d47..4248b9341 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -258,7 +258,8 @@ export GRUB_DEFAULT \
@@ -26,7 +26,7 @@ index 8218f3d477f..4248b9341ab 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 113a41f9409..b3aae534ddc 100644
+index 113a41f94..b3aae534d 100644
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -52,7 +52,11 @@ grub_warn ()
@@ -42,7 +42,7 @@ index 113a41f9409..b3aae534ddc 100644
is_path_readable_by_grub ()
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index 858b526c925..e2a53300126 100644
+index 858b526c9..e2a533001 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -27,6 +27,14 @@ export TEXTDOMAINDIR="@localedir@"
@@ -88,7 +88,7 @@ index 858b526c925..e2a53300126 100644
+EOF
+fi
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 4e49ccdf742..d9a05937e46 100644
+index 4e49ccdf7..d9a05937e 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -66,10 +66,14 @@ fi
@@ -107,7 +107,7 @@ index 4e49ccdf742..d9a05937e46 100644
xzfs)
rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true`
diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
-index 972a4b5a03d..bcdc3ceac02 100644
+index 972a4b5a0..bcdc3ceac 100644
--- a/util/grub.d/20_linux_xen.in
+++ b/util/grub.d/20_linux_xen.in
@@ -73,10 +73,14 @@ fi
diff --git a/SOURCES/0093-grub2-btrfs-06-subvol-mount.patch b/SOURCES/0093-grub2-btrfs-06-subvol-mount.patch
index 493f133..2c7e2d7 100644
--- a/SOURCES/0093-grub2-btrfs-06-subvol-mount.patch
+++ b/SOURCES/0093-grub2-btrfs-06-subvol-mount.patch
@@ -11,7 +11,7 @@ Subject: [PATCH] grub2-btrfs-06-subvol-mount
4 files changed, 392 insertions(+), 5 deletions(-)
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index a47d297567f..2e36ac47e8a 100644
+index a47d29756..2e36ac47e 100644
--- a/grub-core/fs/btrfs.c
+++ b/grub-core/fs/btrfs.c
@@ -32,6 +32,7 @@
@@ -277,7 +277,7 @@ index a47d297567f..2e36ac47e8a 100644
grub_cmd_btrfs_list_subvols, 0,
"[-p|-n] [-o var] DEVICE",
diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
-index 5d50dd6f8dc..4c5a13022dc 100644
+index 5d50dd6f8..4c5a13022 100644
--- a/grub-core/osdep/linux/getroot.c
+++ b/grub-core/osdep/linux/getroot.c
@@ -107,6 +107,14 @@ struct btrfs_ioctl_search_key
@@ -460,7 +460,7 @@ index 5d50dd6f8dc..4c5a13022dc 100644
grub_make_system_path_relative_to_its_root_os (const char *path)
{
diff --git a/util/grub-install.c b/util/grub-install.c
-index 4375c161955..a0ad99729fd 100644
+index 4375c1619..a0ad99729 100644
--- a/util/grub-install.c
+++ b/util/grub-install.c
@@ -1535,6 +1535,55 @@ main (int argc, char *argv[])
@@ -520,7 +520,7 @@ index 4375c161955..a0ad99729fd 100644
const char *core_name = NULL;
diff --git a/include/grub/emu/getroot.h b/include/grub/emu/getroot.h
-index 73fa2d34abb..9c642ae3fe3 100644
+index 73fa2d34a..9c642ae3f 100644
--- a/include/grub/emu/getroot.h
+++ b/include/grub/emu/getroot.h
@@ -53,6 +53,11 @@ char **
diff --git a/SOURCES/0094-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch b/SOURCES/0094-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch
index b51b025..82b5848 100644
--- a/SOURCES/0094-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch
+++ b/SOURCES/0094-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch
@@ -10,7 +10,7 @@ does a search for "menuentry".
1 file changed, 12 deletions(-)
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index e2a53300126..8a16fea347e 100644
+index e2a533001..8a16fea34 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -366,15 +366,3 @@ fi
diff --git a/SOURCES/0095-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch b/SOURCES/0095-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
index a413446..2ac8498 100644
--- a/SOURCES/0095-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
+++ b/SOURCES/0095-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
@@ -10,7 +10,7 @@ Ref: bsc#953538
1 file changed, 31 insertions(+), 1 deletion(-)
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index 2e36ac47e8a..4a31d39ee74 100644
+index 2e36ac47e..4a31d39ee 100644
--- a/grub-core/fs/btrfs.c
+++ b/grub-core/fs/btrfs.c
@@ -924,11 +924,41 @@ lookup_root_by_name(struct grub_btrfs_data *data, const char *path)
diff --git a/SOURCES/0096-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch b/SOURCES/0096-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
index 0f4ce50..1208271 100644
--- a/SOURCES/0096-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
+++ b/SOURCES/0096-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] Grub not working correctly with btrfs snapshots (bsc#1026511)
1 file changed, 238 insertions(+)
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index 4a31d39ee74..7002ad81b7e 100644
+index 4a31d39ee..7002ad81b 100644
--- a/grub-core/fs/btrfs.c
+++ b/grub-core/fs/btrfs.c
@@ -2446,6 +2446,238 @@ out:
diff --git a/SOURCES/0097-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch b/SOURCES/0097-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
index 9a4a5c2..04d5246 100644
--- a/SOURCES/0097-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
+++ b/SOURCES/0097-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
@@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 32 insertions(+), 4 deletions(-)
diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
-index 39480b38674..09a18e56302 100644
+index 39480b386..09a18e563 100644
--- a/include/grub/efi/efi.h
+++ b/include/grub/efi/efi.h
@@ -24,6 +24,10 @@
diff --git a/SOURCES/0098-Use-grub_efi_.-memory-helpers-where-reasonable.patch b/SOURCES/0098-Use-grub_efi_.-memory-helpers-where-reasonable.patch
index 0dc026f..42e62f4 100644
--- a/SOURCES/0098-Use-grub_efi_.-memory-helpers-where-reasonable.patch
+++ b/SOURCES/0098-Use-grub_efi_.-memory-helpers-where-reasonable.patch
@@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index 5cd9b6e08a8..106eb10a362 100644
+index 5cd9b6e08..106eb10a3 100644
--- a/grub-core/loader/efi/chainloader.c
+++ b/grub-core/loader/efi/chainloader.c
@@ -65,7 +65,7 @@ grub_chainloader_unload (void)
diff --git a/SOURCES/0099-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch b/SOURCES/0099-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
index 004fced..ec7d44f 100644
--- a/SOURCES/0099-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
+++ b/SOURCES/0099-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
@@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index 106eb10a362..3630b0cbf2d 100644
+index 106eb10a3..3630b0cbf 100644
--- a/grub-core/loader/efi/chainloader.c
+++ b/grub-core/loader/efi/chainloader.c
@@ -783,7 +783,8 @@ handle_image (void *data, grub_efi_uint32_t datasize)
@@ -26,7 +26,7 @@ index 106eb10a362..3630b0cbf2d 100644
efi_status = grub_efi_free_pool (buffer);
diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index 28b6adf7648..e5b521bd9be 100644
+index 28b6adf76..e5b521bd9 100644
--- a/include/grub/efi/api.h
+++ b/include/grub/efi/api.h
@@ -527,6 +527,14 @@ typedef grub_uint8_t grub_efi_char8_t;
diff --git a/SOURCES/0100-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch b/SOURCES/0100-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch
index 882cf5d..f62b0bd 100644
--- a/SOURCES/0100-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch
+++ b/SOURCES/0100-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] Don't use dynamic sized arrays since we don't build with
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index 4be228d9576..fa3e2912643 100644
+index 4be228d95..fa3e29126 100644
--- a/grub-core/net/net.c
+++ b/grub-core/net/net.c
@@ -1853,14 +1853,25 @@ grub_net_search_configfile (char *config)
diff --git a/SOURCES/0101-don-t-ignore-const.patch b/SOURCES/0101-don-t-ignore-const.patch
index 6b4d390..e6282ce 100644
--- a/SOURCES/0101-don-t-ignore-const.patch
+++ b/SOURCES/0101-don-t-ignore-const.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] don't ignore const
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
-index dcd82494309..f90071353ad 100644
+index dcd824943..f90071353 100644
--- a/grub-core/net/tftp.c
+++ b/grub-core/net/tftp.c
@@ -307,7 +307,7 @@ static void
diff --git a/SOURCES/0102-don-t-use-int-for-efi-status.patch b/SOURCES/0102-don-t-use-int-for-efi-status.patch
index 6328df9..b3dc9c8 100644
--- a/SOURCES/0102-don-t-use-int-for-efi-status.patch
+++ b/SOURCES/0102-don-t-use-int-for-efi-status.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] don't use int for efi status
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index 562d6887e0e..bcae7f4699d 100644
+index 562d6887e..bcae7f469 100644
--- a/grub-core/kern/efi/efi.c
+++ b/grub-core/kern/efi/efi.c
@@ -166,7 +166,7 @@ grub_reboot (void)
diff --git a/SOURCES/0103-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch b/SOURCES/0103-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
index 1d6f4c4..0418480 100644
--- a/SOURCES/0103-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
+++ b/SOURCES/0103-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] make GRUB_MOD_INIT() declare its function prototypes.
1 file changed, 2 insertions(+)
diff --git a/include/grub/dl.h b/include/grub/dl.h
-index 2bca56ce0e8..b1ed3c33317 100644
+index 2bca56ce0..b1ed3c333 100644
--- a/include/grub/dl.h
+++ b/include/grub/dl.h
@@ -54,6 +54,7 @@ grub_mod_fini (void)
diff --git a/SOURCES/0104-editenv-handle-relative-symlinks.patch b/SOURCES/0104-editenv-handle-relative-symlinks.patch
index 20e1686..8b26324 100644
--- a/SOURCES/0104-editenv-handle-relative-symlinks.patch
+++ b/SOURCES/0104-editenv-handle-relative-symlinks.patch
@@ -14,7 +14,7 @@ Signed-off-by: Jonathan Lebon <jlebon@redhat.com>
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/util/editenv.c b/util/editenv.c
-index d8d1dad6ab9..41bc7cb1c9a 100644
+index d8d1dad6a..41bc7cb1c 100644
--- a/util/editenv.c
+++ b/util/editenv.c
@@ -28,6 +28,7 @@
diff --git a/SOURCES/0105-Make-libgrub.pp-depend-on-config-util.h.patch b/SOURCES/0105-Make-libgrub.pp-depend-on-config-util.h.patch
index dc24fb1..9b9199f 100644
--- a/SOURCES/0105-Make-libgrub.pp-depend-on-config-util.h.patch
+++ b/SOURCES/0105-Make-libgrub.pp-depend-on-config-util.h.patch
@@ -31,7 +31,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
-index 7795baeb654..c7b0e6a9c46 100644
+index 7795baeb6..c7b0e6a9c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,7 +37,7 @@ grub_script.yy.c: grub_script.yy.h
diff --git a/SOURCES/0106-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch b/SOURCES/0106-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch
index 51f5458..e105bc0 100644
--- a/SOURCES/0106-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch
+++ b/SOURCES/0106-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch
@@ -16,7 +16,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/util/grub-install.c b/util/grub-install.c
-index a0ad99729fd..16f137ca854 100644
+index a0ad99729..16f137ca8 100644
--- a/util/grub-install.c
+++ b/util/grub-install.c
@@ -1159,18 +1159,8 @@ main (int argc, char *argv[])
diff --git a/SOURCES/0107-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch b/SOURCES/0107-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch
index c26a3d5..8d216c8 100644
--- a/SOURCES/0107-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch
+++ b/SOURCES/0107-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch
@@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 3 insertions(+)
diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
-index bcdc3ceac02..2bc03fd36b9 100644
+index bcdc3ceac..2bc03fd36 100644
--- a/util/grub.d/20_linux_xen.in
+++ b/util/grub.d/20_linux_xen.in
@@ -136,6 +136,8 @@ linux_entry ()
diff --git a/SOURCES/0108-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch b/SOURCES/0108-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch
index acfb116..0632696 100644
--- a/SOURCES/0108-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch
+++ b/SOURCES/0108-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch
@@ -63,7 +63,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
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 c9c36169978..ca15c3aacd7 100644
+index c9c361699..ca15c3aac 100644
--- a/grub-core/kern/i386/tsc_pmtimer.c
+++ b/grub-core/kern/i386/tsc_pmtimer.c
@@ -28,40 +28,101 @@
diff --git a/SOURCES/0109-align-struct-efi_variable-better.patch b/SOURCES/0109-align-struct-efi_variable-better.patch
index 65bc91b..ef162d3 100644
--- a/SOURCES/0109-align-struct-efi_variable-better.patch
+++ b/SOURCES/0109-align-struct-efi_variable-better.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] align struct efi_variable better...
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/grub/efiemu/runtime.h b/include/grub/efiemu/runtime.h
-index 36d2dedf47e..9d93ba88bac 100644
+index 36d2dedf4..9d93ba88b 100644
--- a/include/grub/efiemu/runtime.h
+++ b/include/grub/efiemu/runtime.h
@@ -33,5 +33,5 @@ struct efi_variable
@@ -20,7 +20,7 @@ index 36d2dedf47e..9d93ba88bac 100644
+} GRUB_PACKED GRUB_ALIGNED(8);
#endif /* ! GRUB_EFI_EMU_RUNTIME_HEADER */
diff --git a/include/grub/types.h b/include/grub/types.h
-index b93e4820194..f6a9723971d 100644
+index b93e48201..f6a972397 100644
--- a/include/grub/types.h
+++ b/include/grub/types.h
@@ -29,6 +29,7 @@
diff --git a/SOURCES/0110-Add-quicksort-implementation.patch b/SOURCES/0110-Add-quicksort-implementation.patch
index 06fe563..2f29cba 100644
--- a/SOURCES/0110-Add-quicksort-implementation.patch
+++ b/SOURCES/0110-Add-quicksort-implementation.patch
@@ -13,7 +13,7 @@ the BootLoaderSpec config files.
diff --git a/grub-core/kern/qsort.c b/grub-core/kern/qsort.c
new file mode 100644
-index 00000000000..7f3fc9ffdae
+index 000000000..7f3fc9ffd
--- /dev/null
+++ b/grub-core/kern/qsort.c
@@ -0,0 +1,279 @@
@@ -297,7 +297,7 @@ index 00000000000..7f3fc9ffdae
+ return NULL;
+}
diff --git a/include/grub/misc.h b/include/grub/misc.h
-index fcaf1201e39..cbfae75a1b4 100644
+index fcaf1201e..cbfae75a1 100644
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -507,4 +507,19 @@ void EXPORT_FUNC(grub_real_boot_time) (const char *file,
diff --git a/SOURCES/0111-Add-blscfg-command-support-to-parse-BootLoaderSpec-c.patch b/SOURCES/0111-Add-blscfg-command-support-to-parse-BootLoaderSpec-c.patch
index 63b0529..7ca78a2 100644
--- a/SOURCES/0111-Add-blscfg-command-support-to-parse-BootLoaderSpec-c.patch
+++ b/SOURCES/0111-Add-blscfg-command-support-to-parse-BootLoaderSpec-c.patch
@@ -20,7 +20,7 @@ the bls_import command, change it to blscfg and improve the BLS support.
create mode 100644 grub-core/commands/loadenv.h
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 27563743ba9..96ccb402125 100644
+index 27563743b..96ccb4021 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -129,6 +129,7 @@ kernel = {
@@ -42,7 +42,7 @@ index 27563743ba9..96ccb402125 100644
};
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
-index 4274aca5a9d..86796c8cd83 100644
+index 4274aca5a..86796c8cd 100644
--- a/grub-core/commands/blscfg.c
+++ b/grub-core/commands/blscfg.c
@@ -30,32 +30,405 @@
@@ -951,7 +951,7 @@ index 4274aca5a9d..86796c8cd83 100644
+ grub_unregister_extcmd (oldcmd);
}
diff --git a/grub-core/commands/loadenv.c b/grub-core/commands/loadenv.c
-index acd93d123ed..91c99456091 100644
+index acd93d123..91c994560 100644
--- a/grub-core/commands/loadenv.c
+++ b/grub-core/commands/loadenv.c
@@ -28,6 +28,8 @@
@@ -1047,7 +1047,7 @@ index acd93d123ed..91c99456091 100644
{
diff --git a/grub-core/commands/loadenv.h b/grub-core/commands/loadenv.h
new file mode 100644
-index 00000000000..952f46121bd
+index 000000000..952f46121
--- /dev/null
+++ b/grub-core/commands/loadenv.h
@@ -0,0 +1,93 @@
@@ -1145,7 +1145,7 @@ index 00000000000..952f46121bd
+ return 0;
+}
diff --git a/include/grub/compiler.h b/include/grub/compiler.h
-index c9e1d7a73dc..9859ff4cc79 100644
+index c9e1d7a73..9859ff4cc 100644
--- a/include/grub/compiler.h
+++ b/include/grub/compiler.h
@@ -48,4 +48,6 @@
diff --git a/SOURCES/0112-Add-BLS-support-to-grub-mkconfig.patch b/SOURCES/0112-Add-BLS-support-to-grub-mkconfig.patch
index 75698fd..e2ac862 100644
--- a/SOURCES/0112-Add-BLS-support-to-grub-mkconfig.patch
+++ b/SOURCES/0112-Add-BLS-support-to-grub-mkconfig.patch
@@ -14,7 +14,7 @@ files are parsed by blscfg command and the entries created dynamically.
3 files changed, 56 insertions(+), 13 deletions(-)
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 4248b9341ab..c20171919d9 100644
+index 4248b9341..c20171919 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -259,7 +259,8 @@ export GRUB_DEFAULT \
@@ -28,7 +28,7 @@ index 4248b9341ab..c20171919d9 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 b3aae534ddc..1acc1d01c39 100644
+index b3aae534d..1acc1d01c 100644
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -30,6 +30,9 @@ fi
@@ -104,7 +104,7 @@ index b3aae534ddc..1acc1d01c39 100644
fi
IFS="$old_ifs"
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index d9a05937e46..839f1fdb655 100644
+index d9a05937e..839f1fdb6 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -121,6 +121,34 @@ linux_entry ()
diff --git a/SOURCES/0113-Remove-duplicated-grub_exit-definition-for-grub-emu-.patch b/SOURCES/0113-Remove-duplicated-grub_exit-definition-for-grub-emu-.patch
index 53bf22e..23d659b 100644
--- a/SOURCES/0113-Remove-duplicated-grub_exit-definition-for-grub-emu-.patch
+++ b/SOURCES/0113-Remove-duplicated-grub_exit-definition-for-grub-emu-.patch
@@ -15,7 +15,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 6 deletions(-)
diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
-index 7e47ec81263..55ea5a11ccd 100644
+index 7e47ec812..55ea5a11c 100644
--- a/grub-core/kern/emu/main.c
+++ b/grub-core/kern/emu/main.c
@@ -72,12 +72,6 @@ grub_exit (int retval __attribute__((unused)))
diff --git a/SOURCES/0114-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch b/SOURCES/0114-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch
index 204abbc..1688995 100644
--- a/SOURCES/0114-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch
+++ b/SOURCES/0114-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch
@@ -12,7 +12,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index 04371ac49f2..636f97e1ba1 100644
+index 04371ac49..636f97e1b 100644
--- a/grub-core/kern/misc.c
+++ b/grub-core/kern/misc.c
@@ -1103,7 +1103,7 @@ static void __attribute__ ((noreturn))
diff --git a/SOURCES/0115-Enable-blscfg-command-for-the-emu-platform.patch b/SOURCES/0115-Enable-blscfg-command-for-the-emu-platform.patch
index 5a2f7b7..1a8190a 100644
--- a/SOURCES/0115-Enable-blscfg-command-for-the-emu-platform.patch
+++ b/SOURCES/0115-Enable-blscfg-command-for-the-emu-platform.patch
@@ -14,7 +14,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
2 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 96ccb402125..e52d776887a 100644
+index 96ccb4021..e52d77688 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -777,6 +777,7 @@ module = {
@@ -26,7 +26,7 @@ index 96ccb402125..e52d776887a 100644
module = {
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
-index 86796c8cd83..e0b65534af4 100644
+index 86796c8cd..e0b65534a 100644
--- a/grub-core/commands/blscfg.c
+++ b/grub-core/commands/blscfg.c
@@ -37,7 +37,12 @@ GRUB_MOD_LICENSE ("GPLv3+");
diff --git a/SOURCES/0116-Add-linux-and-initrd-commands-for-grub-emu.patch b/SOURCES/0116-Add-linux-and-initrd-commands-for-grub-emu.patch
index d2368f3..0c09933 100644
--- a/SOURCES/0116-Add-linux-and-initrd-commands-for-grub-emu.patch
+++ b/SOURCES/0116-Add-linux-and-initrd-commands-for-grub-emu.patch
@@ -18,7 +18,7 @@ to the kexec command line tool, to allow booting the selected menu entry.
create mode 100644 grub-core/loader/emu/linux.c
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index e52d776887a..067b97a4221 100644
+index e52d77688..067b97a42 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -1710,7 +1710,6 @@ module = {
@@ -30,7 +30,7 @@ index e52d776887a..067b97a4221 100644
efi = loader/efi/linux.c;
};
diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
-index 55ea5a11ccd..846fe9715ec 100644
+index 55ea5a11c..846fe9715 100644
--- a/grub-core/kern/emu/main.c
+++ b/grub-core/kern/emu/main.c
@@ -107,6 +107,7 @@ static struct argp_option options[] = {
@@ -52,7 +52,7 @@ index 55ea5a11ccd..846fe9715ec 100644
case ARGP_KEY_ARG:
{
diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
-index 82012a72fcb..3d3a4a4a975 100644
+index 82012a72f..3d3a4a4a9 100644
--- a/grub-core/kern/emu/misc.c
+++ b/grub-core/kern/emu/misc.c
@@ -37,6 +37,7 @@
@@ -100,7 +100,7 @@ index 82012a72fcb..3d3a4a4a975 100644
+}
diff --git a/grub-core/loader/emu/linux.c b/grub-core/loader/emu/linux.c
new file mode 100644
-index 00000000000..fda9e00d24c
+index 000000000..fda9e00d2
--- /dev/null
+++ b/grub-core/loader/emu/linux.c
@@ -0,0 +1,172 @@
@@ -277,7 +277,7 @@ index 00000000000..fda9e00d24c
+ grub_unregister_command (cmd_initrd);
+}
diff --git a/include/grub/emu/exec.h b/include/grub/emu/exec.h
-index d1073ef86af..1b61b4a2e5d 100644
+index d1073ef86..1b61b4a2e 100644
--- a/include/grub/emu/exec.h
+++ b/include/grub/emu/exec.h
@@ -23,6 +23,8 @@
@@ -299,7 +299,7 @@ index d1073ef86af..1b61b4a2e5d 100644
grub_util_exec_redirect (const char *const *argv, const char *stdin_file,
const char *stdout_file);
diff --git a/include/grub/emu/hostfile.h b/include/grub/emu/hostfile.h
-index 8e37d5acb42..12c937a1af9 100644
+index 8e37d5acb..12c937a1a 100644
--- a/include/grub/emu/hostfile.h
+++ b/include/grub/emu/hostfile.h
@@ -22,6 +22,7 @@
@@ -320,7 +320,7 @@ index 8e37d5acb42..12c937a1af9 100644
char *
grub_util_path_concat (size_t n, ...);
diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
-index df6085bcb7c..a653132e36a 100644
+index df6085bcb..a653132e3 100644
--- a/include/grub/emu/misc.h
+++ b/include/grub/emu/misc.h
@@ -60,6 +60,9 @@ void EXPORT_FUNC(grub_util_warn) (const char *fmt, ...) __attribute__ ((format (
@@ -334,7 +334,7 @@ index df6085bcb7c..a653132e36a 100644
#ifdef HAVE_DEVICE_MAPPER
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
-index 9c69aa88626..0108c0d4233 100644
+index 9c69aa886..0108c0d42 100644
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -274,6 +274,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/net.h
diff --git a/SOURCES/0117-Fix-the-efidir-in-grub-setpassword.patch b/SOURCES/0117-Fix-the-efidir-in-grub-setpassword.patch
index 2d815e2..d75fe8e 100644
--- a/SOURCES/0117-Fix-the-efidir-in-grub-setpassword.patch
+++ b/SOURCES/0117-Fix-the-efidir-in-grub-setpassword.patch
@@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/util/grub-setpassword.in b/util/grub-setpassword.in
-index d7924af5192..cf70257eed6 100644
+index d7924af51..cf70257ee 100644
--- a/util/grub-setpassword.in
+++ b/util/grub-setpassword.in
@@ -1,7 +1,8 @@
diff --git a/SOURCES/0118-Add-grub2-switch-to-blscfg.patch b/SOURCES/0118-Add-grub2-switch-to-blscfg.patch
index 17984a2..82cd732 100644
--- a/SOURCES/0118-Add-grub2-switch-to-blscfg.patch
+++ b/SOURCES/0118-Add-grub2-switch-to-blscfg.patch
@@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
create mode 100644 util/grub-switch-to-blscfg.in
diff --git a/Makefile.util.def b/Makefile.util.def
-index 879e8eb98a4..f4fbd250630 100644
+index 879e8eb98..f4fbd2506 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -1348,6 +1348,13 @@ program = {
@@ -32,7 +32,7 @@ index 879e8eb98a4..f4fbd250630 100644
name = grub-glue-efi;
mansection = 1;
diff --git a/.gitignore b/.gitignore
-index 54795fa60be..42475592123 100644
+index 54795fa60..424755921 100644
--- a/.gitignore
+++ b/.gitignore
@@ -121,6 +121,8 @@ grub-*.tar.*
@@ -46,7 +46,7 @@ index 54795fa60be..42475592123 100644
/grub_fstest_init.lst
diff --git a/util/grub-switch-to-blscfg.8 b/util/grub-switch-to-blscfg.8
new file mode 100644
-index 00000000000..134dfc62a7b
+index 000000000..134dfc62a
--- /dev/null
+++ b/util/grub-switch-to-blscfg.8
@@ -0,0 +1,25 @@
@@ -77,7 +77,7 @@ index 00000000000..134dfc62a7b
+.BR "info grub"
diff --git a/util/grub-switch-to-blscfg.in b/util/grub-switch-to-blscfg.in
new file mode 100644
-index 00000000000..3ae5e4ea8d0
+index 000000000..3ae5e4ea8
--- /dev/null
+++ b/util/grub-switch-to-blscfg.in
@@ -0,0 +1,262 @@
diff --git a/SOURCES/0119-Add-grub_debug_enabled.patch b/SOURCES/0119-Add-grub_debug_enabled.patch
index d8e4bde..7022284 100644
--- a/SOURCES/0119-Add-grub_debug_enabled.patch
+++ b/SOURCES/0119-Add-grub_debug_enabled.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] Add grub_debug_enabled()
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index 636f97e1ba1..e758ab3416d 100644
+index 636f97e1b..e758ab341 100644
--- a/grub-core/kern/misc.c
+++ b/grub-core/kern/misc.c
@@ -159,17 +159,28 @@ int grub_err_printf (const char *fmt, ...)
@@ -47,7 +47,7 @@ index 636f97e1ba1..e758ab3416d 100644
grub_printf ("%s:%d: ", file, line);
va_start (args, fmt);
diff --git a/include/grub/misc.h b/include/grub/misc.h
-index cbfae75a1b4..f7473c154f0 100644
+index cbfae75a1..f7473c154 100644
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -367,6 +367,7 @@ grub_puts (const char *s)
diff --git a/SOURCES/0120-make-better-backtraces.patch b/SOURCES/0120-make-better-backtraces.patch
index e017c77..eac7417 100644
--- a/SOURCES/0120-make-better-backtraces.patch
+++ b/SOURCES/0120-make-better-backtraces.patch
@@ -38,7 +38,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
delete mode 100644 grub-core/lib/i386/backtrace.c
diff --git a/Makefile.util.def b/Makefile.util.def
-index f4fbd250630..cbd661d6348 100644
+index f4fbd2506..cbd661d63 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -49,6 +49,12 @@ library = {
@@ -55,7 +55,7 @@ index f4fbd250630..cbd661d6348 100644
library = {
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 067b97a4221..cb24f92a431 100644
+index 067b97a42..cb24f92a4 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -130,6 +130,12 @@ kernel = {
@@ -101,7 +101,7 @@ diff --git a/grub-core/lib/backtrace.c b/grub-core/commands/backtrace.c
similarity index 98%
rename from grub-core/lib/backtrace.c
rename to grub-core/commands/backtrace.c
-index c0ad6ab8be1..8b5ec3913b5 100644
+index c0ad6ab8b..8b5ec3913 100644
--- a/grub-core/lib/backtrace.c
+++ b/grub-core/commands/backtrace.c
@@ -54,7 +54,7 @@ grub_cmd_backtrace (grub_command_t cmd __attribute__ ((unused)),
@@ -114,7 +114,7 @@ index c0ad6ab8be1..8b5ec3913b5 100644
}
diff --git a/grub-core/gdb/cstub.c b/grub-core/gdb/cstub.c
-index b64acd70fee..99281472d36 100644
+index b64acd70f..99281472d 100644
--- a/grub-core/gdb/cstub.c
+++ b/grub-core/gdb/cstub.c
@@ -215,7 +215,6 @@ grub_gdb_trap (int trap_no)
@@ -127,7 +127,7 @@ index b64acd70fee..99281472d36 100644
diff --git a/grub-core/kern/arm64/backtrace.c b/grub-core/kern/arm64/backtrace.c
new file mode 100644
-index 00000000000..019c6fdfef2
+index 000000000..019c6fdfe
--- /dev/null
+++ b/grub-core/kern/arm64/backtrace.c
@@ -0,0 +1,94 @@
@@ -227,7 +227,7 @@ index 00000000000..019c6fdfef2
+}
diff --git a/grub-core/kern/backtrace.c b/grub-core/kern/backtrace.c
new file mode 100644
-index 00000000000..4a82e865cc6
+index 000000000..4a82e865c
--- /dev/null
+++ b/grub-core/kern/backtrace.c
@@ -0,0 +1,97 @@
@@ -329,7 +329,7 @@ index 00000000000..4a82e865cc6
+ grub_backtrace (skip + 1);
+}
diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
-index 621070918d4..5028d157c46 100644
+index 621070918..5028d157c 100644
--- a/grub-core/kern/dl.c
+++ b/grub-core/kern/dl.c
@@ -124,6 +124,50 @@ grub_dl_resolve_symbol (const char *name)
@@ -393,7 +393,7 @@ index 621070918d4..5028d157c46 100644
i++, s = (Elf_Shdr *) ((char *) s + e->e_shentsize))
diff --git a/grub-core/kern/i386/backtrace.c b/grub-core/kern/i386/backtrace.c
new file mode 100644
-index 00000000000..2413f9a57db
+index 000000000..2413f9a57
--- /dev/null
+++ b/grub-core/kern/i386/backtrace.c
@@ -0,0 +1,125 @@
@@ -523,7 +523,7 @@ index 00000000000..2413f9a57db
+#endif
+}
diff --git a/grub-core/kern/i386/pc/init.c b/grub-core/kern/i386/pc/init.c
-index 27bc68b8a53..b51d0abfa6e 100644
+index 27bc68b8a..b51d0abfa 100644
--- a/grub-core/kern/i386/pc/init.c
+++ b/grub-core/kern/i386/pc/init.c
@@ -153,7 +153,7 @@ compact_mem_regions (void)
@@ -545,7 +545,7 @@ index 27bc68b8a53..b51d0abfa6e 100644
/* Initialize the console as early as possible. */
grub_console_init ();
diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
-index e01bc6eab19..e731a57a47b 100644
+index e01bc6eab..e731a57a4 100644
--- a/grub-core/kern/ieee1275/init.c
+++ b/grub-core/kern/ieee1275/init.c
@@ -60,7 +60,6 @@
@@ -557,7 +557,7 @@ index e01bc6eab19..e731a57a47b 100644
#ifdef __sparc__
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index e758ab3416d..5c2d2039d0b 100644
+index e758ab341..5c2d2039d 100644
--- a/grub-core/kern/misc.c
+++ b/grub-core/kern/misc.c
@@ -1110,15 +1110,15 @@ grub_xasprintf (const char *fmt, ...)
@@ -591,7 +591,7 @@ index e758ab3416d..5c2d2039d0b 100644
grub_vprintf (_(fmt), ap);
va_end (ap);
diff --git a/grub-core/kern/mm.c b/grub-core/kern/mm.c
-index ee88ff61187..002cbfa4f3d 100644
+index ee88ff611..002cbfa4f 100644
--- a/grub-core/kern/mm.c
+++ b/grub-core/kern/mm.c
@@ -95,13 +95,13 @@ get_header_from_pointer (void *ptr, grub_mm_header_t *p, grub_mm_region_t *r)
@@ -613,7 +613,7 @@ index ee88ff61187..002cbfa4f3d 100644
diff --git a/grub-core/lib/arm64/backtrace.c b/grub-core/lib/arm64/backtrace.c
deleted file mode 100644
-index 1079b5380e1..00000000000
+index 1079b5380..000000000
--- a/grub-core/lib/arm64/backtrace.c
+++ /dev/null
@@ -1,62 +0,0 @@
@@ -681,7 +681,7 @@ index 1079b5380e1..00000000000
-
diff --git a/grub-core/lib/i386/backtrace.c b/grub-core/lib/i386/backtrace.c
deleted file mode 100644
-index c67273db3ae..00000000000
+index c67273db3..000000000
--- a/grub-core/lib/i386/backtrace.c
+++ /dev/null
@@ -1,78 +0,0 @@
@@ -764,7 +764,7 @@ index c67273db3ae..00000000000
-}
-
diff --git a/include/grub/backtrace.h b/include/grub/backtrace.h
-index 395519762f0..275cf85e2d3 100644
+index 395519762..275cf85e2 100644
--- a/include/grub/backtrace.h
+++ b/include/grub/backtrace.h
@@ -19,8 +19,14 @@
@@ -785,7 +785,7 @@ index 395519762f0..275cf85e2d3 100644
#endif
diff --git a/include/grub/dl.h b/include/grub/dl.h
-index b1ed3c33317..7b5bfb07ce6 100644
+index b1ed3c333..7b5bfb07c 100644
--- a/include/grub/dl.h
+++ b/include/grub/dl.h
@@ -244,6 +244,8 @@ grub_dl_get (const char *name)
@@ -798,7 +798,7 @@ index b1ed3c33317..7b5bfb07ce6 100644
int isfunc, grub_dl_t mod);
diff --git a/include/grub/kernel.h b/include/grub/kernel.h
-index ecd88ca72c6..ae69218af20 100644
+index ecd88ca72..ae69218af 100644
--- a/include/grub/kernel.h
+++ b/include/grub/kernel.h
@@ -108,6 +108,9 @@ grub_addr_t grub_modules_get_end (void);
@@ -812,7 +812,7 @@ index ecd88ca72c6..ae69218af20 100644
void grub_main (void) __attribute__ ((noreturn));
diff --git a/grub-core/kern/arm/efi/startup.S b/grub-core/kern/arm/efi/startup.S
-index 9f8265315a9..f3bc41f9d0f 100644
+index 9f8265315..f3bc41f9d 100644
--- a/grub-core/kern/arm/efi/startup.S
+++ b/grub-core/kern/arm/efi/startup.S
@@ -23,6 +23,8 @@
@@ -825,7 +825,7 @@ index 9f8265315a9..f3bc41f9d0f 100644
/*
* EFI_SYSTEM_TABLE and EFI_HANDLE are passed in r1/r0.
diff --git a/grub-core/kern/arm/startup.S b/grub-core/kern/arm/startup.S
-index 3946fe8e183..5679a1d00ad 100644
+index 3946fe8e1..5679a1d00 100644
--- a/grub-core/kern/arm/startup.S
+++ b/grub-core/kern/arm/startup.S
@@ -48,6 +48,8 @@
@@ -838,7 +838,7 @@ index 3946fe8e183..5679a1d00ad 100644
b codestart
diff --git a/grub-core/kern/arm64/efi/startup.S b/grub-core/kern/arm64/efi/startup.S
-index 666a7ee3c92..41676bdb2b8 100644
+index 666a7ee3c..41676bdb2 100644
--- a/grub-core/kern/arm64/efi/startup.S
+++ b/grub-core/kern/arm64/efi/startup.S
@@ -19,7 +19,9 @@
@@ -852,7 +852,7 @@ index 666a7ee3c92..41676bdb2b8 100644
/*
* EFI_SYSTEM_TABLE and EFI_HANDLE are passed in x1/x0.
diff --git a/grub-core/kern/i386/qemu/startup.S b/grub-core/kern/i386/qemu/startup.S
-index 0d89858d9b3..939f182fc74 100644
+index 0d89858d9..939f182fc 100644
--- a/grub-core/kern/i386/qemu/startup.S
+++ b/grub-core/kern/i386/qemu/startup.S
@@ -24,7 +24,8 @@
@@ -866,7 +866,7 @@ index 0d89858d9b3..939f182fc74 100644
jmp codestart
diff --git a/grub-core/kern/ia64/efi/startup.S b/grub-core/kern/ia64/efi/startup.S
-index d75c6d7cc74..8f2a593e529 100644
+index d75c6d7cc..8f2a593e5 100644
--- a/grub-core/kern/ia64/efi/startup.S
+++ b/grub-core/kern/ia64/efi/startup.S
@@ -24,8 +24,9 @@
@@ -881,7 +881,7 @@ index d75c6d7cc74..8f2a593e529 100644
alloc loc0=ar.pfs,2,4,0,0
mov loc1=rp
diff --git a/grub-core/kern/sparc64/ieee1275/crt0.S b/grub-core/kern/sparc64/ieee1275/crt0.S
-index 03b916f0534..701bf63abcf 100644
+index 03b916f05..701bf63ab 100644
--- a/grub-core/kern/sparc64/ieee1275/crt0.S
+++ b/grub-core/kern/sparc64/ieee1275/crt0.S
@@ -22,7 +22,8 @@
@@ -895,7 +895,7 @@ index 03b916f0534..701bf63abcf 100644
ba codestart
mov %o4, %o0
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
-index 0108c0d4233..f36200bd688 100644
+index 0108c0d42..f36200bd6 100644
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -66,6 +66,7 @@ CLEANFILES += grub_script.yy.c grub_script.yy.h
diff --git a/SOURCES/0121-normal-don-t-draw-our-startup-message-if-debug-is-se.patch b/SOURCES/0121-normal-don-t-draw-our-startup-message-if-debug-is-se.patch
index d2a8fd0..8b3dc39 100644
--- a/SOURCES/0121-normal-don-t-draw-our-startup-message-if-debug-is-se.patch
+++ b/SOURCES/0121-normal-don-t-draw-our-startup-message-if-debug-is-se.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] normal: don't draw our startup message if debug is set
1 file changed, 3 insertions(+)
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index b69f9e738fa..04ae9ed02f6 100644
+index b69f9e738..04ae9ed02 100644
--- a/grub-core/normal/main.c
+++ b/grub-core/normal/main.c
@@ -419,6 +419,9 @@ grub_normal_reader_init (int nested)
diff --git a/SOURCES/0122-Work-around-some-minor-include-path-weirdnesses.patch b/SOURCES/0122-Work-around-some-minor-include-path-weirdnesses.patch
index 460d792..589f335 100644
--- a/SOURCES/0122-Work-around-some-minor-include-path-weirdnesses.patch
+++ b/SOURCES/0122-Work-around-some-minor-include-path-weirdnesses.patch
@@ -17,7 +17,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
diff --git a/include/grub/arm/efi/console.h b/include/grub/arm/efi/console.h
new file mode 100644
-index 00000000000..1592f6f76b5
+index 000000000..1592f6f76
--- /dev/null
+++ b/include/grub/arm/efi/console.h
@@ -0,0 +1,24 @@
@@ -47,7 +47,7 @@ index 00000000000..1592f6f76b5
+#endif /* ! GRUB_ARM_EFI_CONSOLE_H */
diff --git a/include/grub/arm64/efi/console.h b/include/grub/arm64/efi/console.h
new file mode 100644
-index 00000000000..95689339384
+index 000000000..956893393
--- /dev/null
+++ b/include/grub/arm64/efi/console.h
@@ -0,0 +1,24 @@
@@ -77,7 +77,7 @@ index 00000000000..95689339384
+#endif /* ! GRUB_ARM64_EFI_CONSOLE_H */
diff --git a/include/grub/i386/efi/console.h b/include/grub/i386/efi/console.h
new file mode 100644
-index 00000000000..9231375cb07
+index 000000000..9231375cb
--- /dev/null
+++ b/include/grub/i386/efi/console.h
@@ -0,0 +1,24 @@
@@ -107,7 +107,7 @@ index 00000000000..9231375cb07
+#endif /* ! GRUB_I386_EFI_CONSOLE_H */
diff --git a/include/grub/x86_64/efi/console.h b/include/grub/x86_64/efi/console.h
new file mode 100644
-index 00000000000..dba9d8678d0
+index 000000000..dba9d8678
--- /dev/null
+++ b/include/grub/x86_64/efi/console.h
@@ -0,0 +1,24 @@
diff --git a/SOURCES/0123-Make-it-possible-to-enabled-build-id-sha1.patch b/SOURCES/0123-Make-it-possible-to-enabled-build-id-sha1.patch
index 2ed085c..99f0fd8 100644
--- a/SOURCES/0123-Make-it-possible-to-enabled-build-id-sha1.patch
+++ b/SOURCES/0123-Make-it-possible-to-enabled-build-id-sha1.patch
@@ -10,7 +10,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
2 files changed, 27 insertions(+)
diff --git a/configure.ac b/configure.ac
-index f69f8986791..359cac3c26b 100644
+index f69f89867..359cac3c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1386,7 +1386,15 @@ grub_PROG_TARGET_CC
@@ -30,7 +30,7 @@ index f69f8986791..359cac3c26b 100644
if test "$platform" != emu && test "x$TARGET_APPLE_LINKER" != x1 ; then
if test ! -z "$TARGET_IMG_LDSCRIPT"; then
diff --git a/acinclude.m4 b/acinclude.m4
-index 78cdf6e1d01..242e829ff23 100644
+index 78cdf6e1d..242e829ff 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -136,6 +136,25 @@ if test "x$grub_cv_prog_ld_build_id_none" = xyes; then
diff --git a/SOURCES/0124-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch b/SOURCES/0124-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch
index 8bd5548..dd2e4ce 100644
--- a/SOURCES/0124-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch
+++ b/SOURCES/0124-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch
@@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
2 files changed, 20 insertions(+)
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index 5c2d2039d0b..0e89c483d5e 100644
+index 5c2d2039d..0e89c483d 100644
--- a/grub-core/kern/misc.c
+++ b/grub-core/kern/misc.c
@@ -190,6 +190,24 @@ grub_real_dprintf (const char *file, const int line, const char *condition,
@@ -42,7 +42,7 @@ index 5c2d2039d0b..0e89c483d5e 100644
int
diff --git a/include/grub/misc.h b/include/grub/misc.h
-index f7473c154f0..5f1c1c1be4e 100644
+index f7473c154..5f1c1c1be 100644
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -372,6 +372,8 @@ void EXPORT_FUNC(grub_real_dprintf) (const char *file,
diff --git a/SOURCES/0125-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch b/SOURCES/0125-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch
index f3e24d5..f0ee79c 100644
--- a/SOURCES/0125-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch
+++ b/SOURCES/0125-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch
@@ -20,7 +20,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
4 files changed, 78 insertions(+), 4 deletions(-)
diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
-index 5028d157c46..eb8b969cded 100644
+index 5028d157c..eb8b969cd 100644
--- a/grub-core/kern/dl.c
+++ b/grub-core/kern/dl.c
@@ -501,6 +501,23 @@ grub_dl_find_section (Elf_Ehdr *e, const char *name)
@@ -95,7 +95,7 @@ index 5028d157c46..eb8b969cded 100644
{
grub_dl_unload (mod);
diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index bcae7f4699d..a2a732ffc0d 100644
+index bcae7f469..a2a732ffc 100644
--- a/grub-core/kern/efi/efi.c
+++ b/grub-core/kern/efi/efi.c
@@ -283,7 +283,7 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
@@ -117,7 +117,7 @@ index bcae7f4699d..a2a732ffc0d 100644
}
diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c
-index 71d2279a0c1..e6183a4c44d 100644
+index 71d2279a0..e6183a4c4 100644
--- a/grub-core/kern/efi/init.c
+++ b/grub-core/kern/efi/init.c
@@ -59,10 +59,33 @@ grub_efi_env_init (void)
@@ -164,7 +164,7 @@ index 71d2279a0c1..e6183a4c44d 100644
}
diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
-index 09a18e56302..570a69361a5 100644
+index 09a18e563..570a69361 100644
--- a/include/grub/efi/efi.h
+++ b/include/grub/efi/efi.h
@@ -132,7 +132,7 @@ grub_err_t grub_armxx_efi_linux_check_image(struct linux_armxx_kernel_header *lh
diff --git a/SOURCES/0126-Only-attempt-to-scan-different-BLS-directories-on-EF.patch b/SOURCES/0126-Only-attempt-to-scan-different-BLS-directories-on-EF.patch
index 52a1085..175add0 100644
--- a/SOURCES/0126-Only-attempt-to-scan-different-BLS-directories-on-EF.patch
+++ b/SOURCES/0126-Only-attempt-to-scan-different-BLS-directories-on-EF.patch
@@ -16,7 +16,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
-index e0b65534af4..e775c6b8794 100644
+index e0b65534a..e775c6b87 100644
--- a/grub-core/commands/blscfg.c
+++ b/grub-core/commands/blscfg.c
@@ -676,8 +676,8 @@ static int find_entry (const char *filename,
diff --git a/SOURCES/0127-Core-TPM-support.patch b/SOURCES/0127-Core-TPM-support.patch
index 43ab689..ebfc37b 100644
--- a/SOURCES/0127-Core-TPM-support.patch
+++ b/SOURCES/0127-Core-TPM-support.patch
@@ -23,7 +23,7 @@ will measure all modules as they're loaded.
create mode 100644 include/grub/tpm.h
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index cb24f92a431..420831bc89e 100644
+index cb24f92a4..420831bc8 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -131,6 +131,7 @@ kernel = {
@@ -51,7 +51,7 @@ index cb24f92a431..420831bc89e 100644
i386_qemu = bus/pci.c;
diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
-index eb8b969cded..387d1e6446d 100644
+index eb8b969cd..387d1e644 100644
--- a/grub-core/kern/dl.c
+++ b/grub-core/kern/dl.c
@@ -33,6 +33,7 @@
@@ -73,7 +73,7 @@ index eb8b969cded..387d1e6446d 100644
if (! mod)
diff --git a/grub-core/kern/efi/tpm.c b/grub-core/kern/efi/tpm.c
new file mode 100644
-index 00000000000..c9fb3c133f3
+index 000000000..c9fb3c133
--- /dev/null
+++ b/grub-core/kern/efi/tpm.c
@@ -0,0 +1,282 @@
@@ -361,7 +361,7 @@ index 00000000000..c9fb3c133f3
+}
diff --git a/grub-core/kern/i386/pc/tpm.c b/grub-core/kern/i386/pc/tpm.c
new file mode 100644
-index 00000000000..8c6c1e6ece2
+index 000000000..8c6c1e6ec
--- /dev/null
+++ b/grub-core/kern/i386/pc/tpm.c
@@ -0,0 +1,132 @@
@@ -499,7 +499,7 @@ index 00000000000..8c6c1e6ece2
+}
diff --git a/grub-core/kern/tpm.c b/grub-core/kern/tpm.c
new file mode 100644
-index 00000000000..1a991876c83
+index 000000000..1a991876c
--- /dev/null
+++ b/grub-core/kern/tpm.c
@@ -0,0 +1,13 @@
@@ -518,7 +518,7 @@ index 00000000000..1a991876c83
+}
diff --git a/include/grub/efi/tpm.h b/include/grub/efi/tpm.h
new file mode 100644
-index 00000000000..e2aff4a3c22
+index 000000000..e2aff4a3c
--- /dev/null
+++ b/include/grub/efi/tpm.h
@@ -0,0 +1,153 @@
@@ -677,7 +677,7 @@ index 00000000000..e2aff4a3c22
+#endif
diff --git a/include/grub/tpm.h b/include/grub/tpm.h
new file mode 100644
-index 00000000000..40d3cf65ba6
+index 000000000..40d3cf65b
--- /dev/null
+++ b/include/grub/tpm.h
@@ -0,0 +1,91 @@
@@ -773,7 +773,7 @@ index 00000000000..40d3cf65ba6
+
+#endif
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
-index f36200bd688..3781bb9cbb9 100644
+index f36200bd6..3781bb9cb 100644
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -94,6 +94,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/term.h
diff --git a/SOURCES/0128-Measure-kernel-initrd.patch b/SOURCES/0128-Measure-kernel-initrd.patch
index ff1f10b..475086d 100644
--- a/SOURCES/0128-Measure-kernel-initrd.patch
+++ b/SOURCES/0128-Measure-kernel-initrd.patch
@@ -9,7 +9,7 @@ Measure the kernel and initrd when loaded on UEFI systems
1 file changed, 4 insertions(+)
diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index 800c3e54022..d837249b4a1 100644
+index 800c3e540..d837249b4 100644
--- a/grub-core/loader/i386/efi/linux.c
+++ b/grub-core/loader/i386/efi/linux.c
@@ -27,6 +27,7 @@
diff --git a/SOURCES/0129-Add-BIOS-boot-measurement.patch b/SOURCES/0129-Add-BIOS-boot-measurement.patch
index a428d32..4f6cd9e 100644
--- a/SOURCES/0129-Add-BIOS-boot-measurement.patch
+++ b/SOURCES/0129-Add-BIOS-boot-measurement.patch
@@ -11,7 +11,7 @@ can't do this stage for us.
2 files changed, 73 insertions(+), 1 deletion(-)
diff --git a/grub-core/boot/i386/pc/boot.S b/grub-core/boot/i386/pc/boot.S
-index ea167fe1206..c1df86dec0b 100644
+index ea167fe12..c1df86dec 100644
--- a/grub-core/boot/i386/pc/boot.S
+++ b/grub-core/boot/i386/pc/boot.S
@@ -24,11 +24,14 @@
@@ -99,7 +99,7 @@ index ea167fe1206..c1df86dec0b 100644
jmp *(LOCAL(kernel_address))
diff --git a/grub-core/boot/i386/pc/diskboot.S b/grub-core/boot/i386/pc/diskboot.S
-index 68d31de0c4c..f4744ec6fcb 100644
+index 68d31de0c..f4744ec6f 100644
--- a/grub-core/boot/i386/pc/diskboot.S
+++ b/grub-core/boot/i386/pc/diskboot.S
@@ -19,6 +19,8 @@
diff --git a/SOURCES/0130-Measure-kernel-and-initrd-on-BIOS-systems.patch b/SOURCES/0130-Measure-kernel-and-initrd-on-BIOS-systems.patch
index 69d58fb..33200b4 100644
--- a/SOURCES/0130-Measure-kernel-and-initrd-on-BIOS-systems.patch
+++ b/SOURCES/0130-Measure-kernel-and-initrd-on-BIOS-systems.patch
@@ -11,7 +11,7 @@ Measure the kernel and initrd when loaded on BIOS systems
3 files changed, 10 insertions(+)
diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
-index c84747ea857..94526966e8a 100644
+index c84747ea8..94526966e 100644
--- a/grub-core/loader/i386/linux.c
+++ b/grub-core/loader/i386/linux.c
@@ -36,6 +36,7 @@
@@ -42,7 +42,7 @@ index c84747ea857..94526966e8a 100644
if (grub_errno == GRUB_ERR_NONE)
{
diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
-index 783a3cd93bc..15544230763 100644
+index 783a3cd93..155442307 100644
--- a/grub-core/loader/i386/pc/linux.c
+++ b/grub-core/loader/i386/pc/linux.c
@@ -36,6 +36,7 @@
@@ -63,7 +63,7 @@ index 783a3cd93bc..15544230763 100644
kernel_offset = sizeof (lh);
diff --git a/grub-core/loader/linux.c b/grub-core/loader/linux.c
-index be6fa0f4d45..3005c0d19c9 100644
+index be6fa0f4d..3005c0d19 100644
--- a/grub-core/loader/linux.c
+++ b/grub-core/loader/linux.c
@@ -4,6 +4,7 @@
diff --git a/SOURCES/0131-Measure-the-kernel-commandline.patch b/SOURCES/0131-Measure-the-kernel-commandline.patch
index 7fe2809..1da6952 100644
--- a/SOURCES/0131-Measure-the-kernel-commandline.patch
+++ b/SOURCES/0131-Measure-the-kernel-commandline.patch
@@ -9,7 +9,7 @@ Measure the kernel commandline to ensure that it hasn't been modified
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/grub-core/lib/cmdline.c b/grub-core/lib/cmdline.c
-index 970ea868c14..6b56304d4a7 100644
+index 970ea868c..6b56304d4 100644
--- a/grub-core/lib/cmdline.c
+++ b/grub-core/lib/cmdline.c
@@ -19,6 +19,7 @@
diff --git a/SOURCES/0132-Measure-commands.patch b/SOURCES/0132-Measure-commands.patch
index bac4c8d..c5e2d91 100644
--- a/SOURCES/0132-Measure-commands.patch
+++ b/SOURCES/0132-Measure-commands.patch
@@ -10,7 +10,7 @@ Measure each command executed by grub, which includes script execution.
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
-index cf6cd6601d6..9ae04a05160 100644
+index cf6cd6601..9ae04a051 100644
--- a/grub-core/script/execute.c
+++ b/grub-core/script/execute.c
@@ -30,6 +30,7 @@
@@ -60,7 +60,7 @@ index cf6cd6601d6..9ae04a05160 100644
argc = argv.argc - 1;
args = argv.args + 1;
diff --git a/include/grub/tpm.h b/include/grub/tpm.h
-index 40d3cf65ba6..7fc9d77d277 100644
+index 40d3cf65b..7fc9d77d2 100644
--- a/include/grub/tpm.h
+++ b/include/grub/tpm.h
@@ -30,6 +30,7 @@
diff --git a/SOURCES/0133-Measure-multiboot-images-and-modules.patch b/SOURCES/0133-Measure-multiboot-images-and-modules.patch
index 0c19d8d..ee01073 100644
--- a/SOURCES/0133-Measure-multiboot-images-and-modules.patch
+++ b/SOURCES/0133-Measure-multiboot-images-and-modules.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] Measure multiboot images and modules
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/grub-core/loader/i386/multiboot_mbi.c b/grub-core/loader/i386/multiboot_mbi.c
-index dc98dbcae25..1c5b0ac25ce 100644
+index dc98dbcae..1c5b0ac25 100644
--- a/grub-core/loader/i386/multiboot_mbi.c
+++ b/grub-core/loader/i386/multiboot_mbi.c
@@ -36,6 +36,7 @@
@@ -31,7 +31,7 @@ index dc98dbcae25..1c5b0ac25ce 100644
if (header == 0)
diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c
-index 26df46a4161..93e026c53db 100644
+index 26df46a41..93e026c53 100644
--- a/grub-core/loader/multiboot.c
+++ b/grub-core/loader/multiboot.c
@@ -51,6 +51,7 @@
@@ -51,7 +51,7 @@ index 26df46a4161..93e026c53db 100644
}
diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c
-index 4df6595954d..d5ad02a33a1 100644
+index 4df659595..d5ad02a33 100644
--- a/grub-core/loader/multiboot_mbi2.c
+++ b/grub-core/loader/multiboot_mbi2.c
@@ -36,6 +36,7 @@
diff --git a/SOURCES/0134-Fix-boot-when-there-s-no-TPM.patch b/SOURCES/0134-Fix-boot-when-there-s-no-TPM.patch
index 60efb93..0e8b53d 100644
--- a/SOURCES/0134-Fix-boot-when-there-s-no-TPM.patch
+++ b/SOURCES/0134-Fix-boot-when-there-s-no-TPM.patch
@@ -12,7 +12,7 @@ without popping the registers back onto the stack. Fix that.
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/grub-core/boot/i386/pc/boot.S b/grub-core/boot/i386/pc/boot.S
-index c1df86dec0b..acab37369ae 100644
+index c1df86dec..acab37369 100644
--- a/grub-core/boot/i386/pc/boot.S
+++ b/grub-core/boot/i386/pc/boot.S
@@ -473,9 +473,9 @@ LOCAL(copy_buffer):
diff --git a/SOURCES/0135-Rework-TPM-measurements.patch b/SOURCES/0135-Rework-TPM-measurements.patch
index eb18094..9faef12 100644
--- a/SOURCES/0135-Rework-TPM-measurements.patch
+++ b/SOURCES/0135-Rework-TPM-measurements.patch
@@ -25,7 +25,7 @@ out the measurements.
12 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
-index 387d1e6446d..d0989573866 100644
+index 387d1e644..d09895738 100644
--- a/grub-core/kern/dl.c
+++ b/grub-core/kern/dl.c
@@ -830,7 +830,7 @@ grub_dl_load_file (const char *filename)
@@ -38,7 +38,7 @@ index 387d1e6446d..d0989573866 100644
mod = grub_dl_load_core (core, size);
grub_free (core);
diff --git a/grub-core/kern/tpm.c b/grub-core/kern/tpm.c
-index 1a991876c83..cb5a812035d 100644
+index 1a991876c..cb5a81203 100644
--- a/grub-core/kern/tpm.c
+++ b/grub-core/kern/tpm.c
@@ -7,7 +7,13 @@
@@ -58,7 +58,7 @@ index 1a991876c83..cb5a812035d 100644
+ return ret;
}
diff --git a/grub-core/lib/cmdline.c b/grub-core/lib/cmdline.c
-index 6b56304d4a7..178f7382f07 100644
+index 6b56304d4..178f7382f 100644
--- a/grub-core/lib/cmdline.c
+++ b/grub-core/lib/cmdline.c
@@ -126,8 +126,8 @@ int grub_create_loader_cmdline (int argc, char *argv[], char *buf,
@@ -73,7 +73,7 @@ index 6b56304d4a7..178f7382f07 100644
return i;
}
diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index d837249b4a1..074dbd6513e 100644
+index d837249b4..074dbd651 100644
--- a/grub-core/loader/i386/efi/linux.c
+++ b/grub-core/loader/i386/efi/linux.c
@@ -132,7 +132,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
@@ -95,7 +95,7 @@ index d837249b4a1..074dbd6513e 100644
rc = grub_linuxefi_secure_validate (kernel, filelen);
if (rc < 0)
diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
-index 94526966e8a..273f48a6c88 100644
+index 94526966e..273f48a6c 100644
--- a/grub-core/loader/i386/linux.c
+++ b/grub-core/loader/i386/linux.c
@@ -725,7 +725,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
@@ -108,7 +108,7 @@ index 94526966e8a..273f48a6c88 100644
grub_memcpy (&lh, kernel, sizeof (lh));
diff --git a/grub-core/loader/i386/multiboot_mbi.c b/grub-core/loader/i386/multiboot_mbi.c
-index 1c5b0ac25ce..2ce424a997b 100644
+index 1c5b0ac25..2ce424a99 100644
--- a/grub-core/loader/i386/multiboot_mbi.c
+++ b/grub-core/loader/i386/multiboot_mbi.c
@@ -174,7 +174,7 @@ grub_multiboot_load (grub_file_t file, const char *filename)
@@ -121,7 +121,7 @@ index 1c5b0ac25ce..2ce424a997b 100644
header = find_header (buffer, len);
diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
-index 15544230763..4f8c02288ec 100644
+index 155442307..4f8c02288 100644
--- a/grub-core/loader/i386/pc/linux.c
+++ b/grub-core/loader/i386/pc/linux.c
@@ -162,7 +162,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
@@ -134,7 +134,7 @@ index 15544230763..4f8c02288ec 100644
grub_memcpy (&lh, kernel, sizeof (lh));
kernel_offset = sizeof (lh);
diff --git a/grub-core/loader/linux.c b/grub-core/loader/linux.c
-index 3005c0d19c9..78c41e33416 100644
+index 3005c0d19..78c41e334 100644
--- a/grub-core/loader/linux.c
+++ b/grub-core/loader/linux.c
@@ -289,7 +289,7 @@ grub_initrd_load (struct grub_linux_initrd_context *initrd_ctx,
@@ -147,7 +147,7 @@ index 3005c0d19c9..78c41e33416 100644
}
if (newc)
diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c
-index 93e026c53db..3b87dc4fab3 100644
+index 93e026c53..3b87dc4fa 100644
--- a/grub-core/loader/multiboot.c
+++ b/grub-core/loader/multiboot.c
@@ -441,7 +441,7 @@ grub_cmd_module (grub_command_t cmd __attribute__ ((unused)),
@@ -160,7 +160,7 @@ index 93e026c53db..3b87dc4fab3 100644
}
diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c
-index d5ad02a33a1..60ae4606fda 100644
+index d5ad02a33..60ae4606f 100644
--- a/grub-core/loader/multiboot_mbi2.c
+++ b/grub-core/loader/multiboot_mbi2.c
@@ -132,7 +132,7 @@ grub_multiboot2_load (grub_file_t file, const char *filename)
@@ -173,7 +173,7 @@ index d5ad02a33a1..60ae4606fda 100644
header = find_header (mld.buffer, len);
if (header == 0)
diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
-index 9ae04a05160..976643c47b0 100644
+index 9ae04a051..976643c47 100644
--- a/grub-core/script/execute.c
+++ b/grub-core/script/execute.c
@@ -995,8 +995,8 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
@@ -188,7 +188,7 @@ index 9ae04a05160..976643c47b0 100644
invert = 0;
argc = argv.argc - 1;
diff --git a/include/grub/tpm.h b/include/grub/tpm.h
-index 7fc9d77d277..ecb2d09ff5d 100644
+index 7fc9d77d2..ecb2d09ff 100644
--- a/include/grub/tpm.h
+++ b/include/grub/tpm.h
@@ -26,11 +26,8 @@
diff --git a/SOURCES/0136-Fix-event-log-prefix.patch b/SOURCES/0136-Fix-event-log-prefix.patch
index 7b98f9a..7b19fe6 100644
--- a/SOURCES/0136-Fix-event-log-prefix.patch
+++ b/SOURCES/0136-Fix-event-log-prefix.patch
@@ -12,7 +12,7 @@ Fix that.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/kern/tpm.c b/grub-core/kern/tpm.c
-index cb5a812035d..e5e8fced624 100644
+index cb5a81203..e5e8fced6 100644
--- a/grub-core/kern/tpm.c
+++ b/grub-core/kern/tpm.c
@@ -13,7 +13,7 @@ grub_tpm_measure (unsigned char *buf, grub_size_t size, grub_uint8_t pcr,
diff --git a/SOURCES/0137-Set-the-first-boot-menu-entry-as-default-when-using-.patch b/SOURCES/0137-Set-the-first-boot-menu-entry-as-default-when-using-.patch
index 1e8e73f..8811699 100644
--- a/SOURCES/0137-Set-the-first-boot-menu-entry-as-default-when-using-.patch
+++ b/SOURCES/0137-Set-the-first-boot-menu-entry-as-default-when-using-.patch
@@ -14,7 +14,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 1 insertion(+)
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 839f1fdb655..89cd71d852d 100644
+index 839f1fdb6..89cd71d85 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -144,6 +144,7 @@ if [ -s \$prefix/grubenv ]; then
diff --git a/SOURCES/0138-tpm-fix-warnings-when-compiling-for-platforms-other-.patch b/SOURCES/0138-tpm-fix-warnings-when-compiling-for-platforms-other-.patch
index 9f9373f..b3dd8fa 100644
--- a/SOURCES/0138-tpm-fix-warnings-when-compiling-for-platforms-other-.patch
+++ b/SOURCES/0138-tpm-fix-warnings-when-compiling-for-platforms-other-.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] tpm: fix warnings when compiling for platforms other than pc
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/include/grub/tpm.h b/include/grub/tpm.h
-index ecb2d09ff5d..972a5edc836 100644
+index ecb2d09ff..972a5edc8 100644
--- a/include/grub/tpm.h
+++ b/include/grub/tpm.h
@@ -75,12 +75,17 @@ grub_err_t grub_tpm_execute(PassThroughToTPM_InputParamBlock *inbuf,
diff --git a/SOURCES/0139-Make-TPM-errors-less-fatal.patch b/SOURCES/0139-Make-TPM-errors-less-fatal.patch
index bcee8a1..ecceb6f 100644
--- a/SOURCES/0139-Make-TPM-errors-less-fatal.patch
+++ b/SOURCES/0139-Make-TPM-errors-less-fatal.patch
@@ -19,7 +19,7 @@ Handle TPM errors, and stop trying to use the TPM once we hit one.
11 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
-index d0989573866..91105bc4677 100644
+index d09895738..91105bc46 100644
--- a/grub-core/kern/dl.c
+++ b/grub-core/kern/dl.c
@@ -831,6 +831,7 @@ grub_dl_load_file (const char *filename)
@@ -31,7 +31,7 @@ index d0989573866..91105bc4677 100644
mod = grub_dl_load_core (core, size);
grub_free (core);
diff --git a/grub-core/kern/i386/pc/tpm.c b/grub-core/kern/i386/pc/tpm.c
-index 8c6c1e6ece2..f6f264aff2e 100644
+index 8c6c1e6ec..f6f264aff 100644
--- a/grub-core/kern/i386/pc/tpm.c
+++ b/grub-core/kern/i386/pc/tpm.c
@@ -7,21 +7,28 @@
@@ -90,7 +90,7 @@ index 8c6c1e6ece2..f6f264aff2e 100644
return 0;
}
diff --git a/grub-core/lib/cmdline.c b/grub-core/lib/cmdline.c
-index 178f7382f07..d5c12957cad 100644
+index 178f7382f..d5c12957c 100644
--- a/grub-core/lib/cmdline.c
+++ b/grub-core/lib/cmdline.c
@@ -128,6 +128,7 @@ int grub_create_loader_cmdline (int argc, char *argv[], char *buf,
@@ -102,7 +102,7 @@ index 178f7382f07..d5c12957cad 100644
return i;
}
diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index 074dbd6513e..ea9f5134e67 100644
+index 074dbd651..ea9f5134e 100644
--- a/grub-core/loader/i386/efi/linux.c
+++ b/grub-core/loader/i386/efi/linux.c
@@ -133,6 +133,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
@@ -122,7 +122,7 @@ index 074dbd6513e..ea9f5134e67 100644
rc = grub_linuxefi_secure_validate (kernel, filelen);
if (rc < 0)
diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
-index 273f48a6c88..76304f05700 100644
+index 273f48a6c..76304f057 100644
--- a/grub-core/loader/i386/linux.c
+++ b/grub-core/loader/i386/linux.c
@@ -726,6 +726,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
@@ -134,7 +134,7 @@ index 273f48a6c88..76304f05700 100644
grub_memcpy (&lh, kernel, sizeof (lh));
diff --git a/grub-core/loader/i386/multiboot_mbi.c b/grub-core/loader/i386/multiboot_mbi.c
-index 2ce424a997b..ca85358f771 100644
+index 2ce424a99..ca85358f7 100644
--- a/grub-core/loader/i386/multiboot_mbi.c
+++ b/grub-core/loader/i386/multiboot_mbi.c
@@ -175,6 +175,7 @@ grub_multiboot_load (grub_file_t file, const char *filename)
@@ -146,7 +146,7 @@ index 2ce424a997b..ca85358f771 100644
header = find_header (buffer, len);
diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
-index 4f8c02288ec..cfff25c21b5 100644
+index 4f8c02288..cfff25c21 100644
--- a/grub-core/loader/i386/pc/linux.c
+++ b/grub-core/loader/i386/pc/linux.c
@@ -163,6 +163,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
@@ -158,7 +158,7 @@ index 4f8c02288ec..cfff25c21b5 100644
grub_memcpy (&lh, kernel, sizeof (lh));
kernel_offset = sizeof (lh);
diff --git a/grub-core/loader/linux.c b/grub-core/loader/linux.c
-index 78c41e33416..c2c7cfcd0fd 100644
+index 78c41e334..c2c7cfcd0 100644
--- a/grub-core/loader/linux.c
+++ b/grub-core/loader/linux.c
@@ -290,6 +290,8 @@ grub_initrd_load (struct grub_linux_initrd_context *initrd_ctx,
@@ -171,7 +171,7 @@ index 78c41e33416..c2c7cfcd0fd 100644
}
if (newc)
diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c
-index 3b87dc4fab3..9a8dae5565b 100644
+index 3b87dc4fa..9a8dae556 100644
--- a/grub-core/loader/multiboot.c
+++ b/grub-core/loader/multiboot.c
@@ -442,6 +442,7 @@ grub_cmd_module (grub_command_t cmd __attribute__ ((unused)),
@@ -183,7 +183,7 @@ index 3b87dc4fab3..9a8dae5565b 100644
}
diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c
-index 60ae4606fda..54078455e2f 100644
+index 60ae4606f..54078455e 100644
--- a/grub-core/loader/multiboot_mbi2.c
+++ b/grub-core/loader/multiboot_mbi2.c
@@ -133,6 +133,7 @@ grub_multiboot2_load (grub_file_t file, const char *filename)
@@ -195,7 +195,7 @@ index 60ae4606fda..54078455e2f 100644
header = find_header (mld.buffer, len);
if (header == 0)
diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
-index 976643c47b0..93965777138 100644
+index 976643c47..939657771 100644
--- a/grub-core/script/execute.c
+++ b/grub-core/script/execute.c
@@ -997,6 +997,7 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
diff --git a/SOURCES/0140-blscfg-handle-multiple-initramfs-images.patch b/SOURCES/0140-blscfg-handle-multiple-initramfs-images.patch
index 2050ffa..41af100 100644
--- a/SOURCES/0140-blscfg-handle-multiple-initramfs-images.patch
+++ b/SOURCES/0140-blscfg-handle-multiple-initramfs-images.patch
@@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 44 insertions(+), 10 deletions(-)
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
-index e775c6b8794..6ab85df6b3a 100644
+index e775c6b87..6ab85df6b 100644
--- a/grub-core/commands/blscfg.c
+++ b/grub-core/commands/blscfg.c
@@ -587,6 +587,7 @@ static void create_entry (struct bls_entry *entry, const char *cfgfile)
diff --git a/SOURCES/0141-BLS-Fix-grub2-switch-to-blscfg-on-non-EFI-machines.patch b/SOURCES/0141-BLS-Fix-grub2-switch-to-blscfg-on-non-EFI-machines.patch
index a045646..4ebe652 100644
--- a/SOURCES/0141-BLS-Fix-grub2-switch-to-blscfg-on-non-EFI-machines.patch
+++ b/SOURCES/0141-BLS-Fix-grub2-switch-to-blscfg-on-non-EFI-machines.patch
@@ -11,7 +11,7 @@ snippets into the /boot directory. But the right location is
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/util/grub-switch-to-blscfg.in b/util/grub-switch-to-blscfg.in
-index 3ae5e4ea8d0..f740b8f4d03 100644
+index 3ae5e4ea8..f740b8f4d 100644
--- a/util/grub-switch-to-blscfg.in
+++ b/util/grub-switch-to-blscfg.in
@@ -44,7 +44,7 @@ if [ -d /sys/firmware/efi/efivars/ ]; then
diff --git a/SOURCES/0142-BLS-Use-etcdefaultgrub-instead-of-etc.patch b/SOURCES/0142-BLS-Use-etcdefaultgrub-instead-of-etc.patch
index db97410..77a69e0 100644
--- a/SOURCES/0142-BLS-Use-etcdefaultgrub-instead-of-etc.patch
+++ b/SOURCES/0142-BLS-Use-etcdefaultgrub-instead-of-etc.patch
@@ -10,7 +10,7 @@ is used. So replace the hardcoded /etc/default/grub with it.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/util/grub-switch-to-blscfg.in b/util/grub-switch-to-blscfg.in
-index f740b8f4d03..eae3c379e4a 100644
+index f740b8f4d..eae3c379e 100644
--- a/util/grub-switch-to-blscfg.in
+++ b/util/grub-switch-to-blscfg.in
@@ -252,7 +252,7 @@ if [[ "${GENERATE}" -eq 1 ]] ; then
diff --git a/SOURCES/0143-Add-missing-options-to-grub2-switch-to-blscfg-man-pa.patch b/SOURCES/0143-Add-missing-options-to-grub2-switch-to-blscfg-man-pa.patch
index 16ab928..591b104 100644
--- a/SOURCES/0143-Add-missing-options-to-grub2-switch-to-blscfg-man-pa.patch
+++ b/SOURCES/0143-Add-missing-options-to-grub2-switch-to-blscfg-man-pa.patch
@@ -12,7 +12,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 8 insertions(+)
diff --git a/util/grub-switch-to-blscfg.8 b/util/grub-switch-to-blscfg.8
-index 134dfc62a7b..7d99de2d2f9 100644
+index 134dfc62a..7d99de2d2 100644
--- a/util/grub-switch-to-blscfg.8
+++ b/util/grub-switch-to-blscfg.8
@@ -21,5 +21,13 @@ The grub config file to use. The default value is \fI/etc/grub2-efi.cfg\fR on U
diff --git a/SOURCES/0144-Make-grub2-switch-to-blscfg-to-generate-debug-BLS-wh.patch b/SOURCES/0144-Make-grub2-switch-to-blscfg-to-generate-debug-BLS-wh.patch
index 5e47f2d..f108a05 100644
--- a/SOURCES/0144-Make-grub2-switch-to-blscfg-to-generate-debug-BLS-wh.patch
+++ b/SOURCES/0144-Make-grub2-switch-to-blscfg-to-generate-debug-BLS-wh.patch
@@ -14,7 +14,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 15 insertions(+)
diff --git a/util/grub-switch-to-blscfg.in b/util/grub-switch-to-blscfg.in
-index eae3c379e4a..c59299ffa6a 100644
+index eae3c379e..c59299ffa 100644
--- a/util/grub-switch-to-blscfg.in
+++ b/util/grub-switch-to-blscfg.in
@@ -21,6 +21,7 @@
diff --git a/SOURCES/0145-Make-grub2-switch-to-blscfg-to-generate-BLS-fragment.patch b/SOURCES/0145-Make-grub2-switch-to-blscfg-to-generate-BLS-fragment.patch
index eb1726b..9916456 100644
--- a/SOURCES/0145-Make-grub2-switch-to-blscfg-to-generate-BLS-fragment.patch
+++ b/SOURCES/0145-Make-grub2-switch-to-blscfg-to-generate-BLS-fragment.patch
@@ -12,7 +12,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 4 insertions(+)
diff --git a/util/grub-switch-to-blscfg.in b/util/grub-switch-to-blscfg.in
-index c59299ffa6a..bc28053cd30 100644
+index c59299ffa..bc28053cd 100644
--- a/util/grub-switch-to-blscfg.in
+++ b/util/grub-switch-to-blscfg.in
@@ -243,6 +243,10 @@ for kernelver in $(cd /lib/modules/ ; ls -1) "" ; do
diff --git a/SOURCES/0146-Only-attempt-to-query-dev-mounted-in-boot-efi-as-boo.patch b/SOURCES/0146-Only-attempt-to-query-dev-mounted-in-boot-efi-as-boo.patch
index 84b0167..e571fc0 100644
--- a/SOURCES/0146-Only-attempt-to-query-dev-mounted-in-boot-efi-as-boo.patch
+++ b/SOURCES/0146-Only-attempt-to-query-dev-mounted-in-boot-efi-as-boo.patch
@@ -19,7 +19,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 89cd71d852d..61d0664fb5c 100644
+index 89cd71d85..61d0664fb 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -133,8 +133,13 @@ linux_entry ()
diff --git a/SOURCES/0147-Include-OSTree-path-when-searching-kernels-images-if.patch b/SOURCES/0147-Include-OSTree-path-when-searching-kernels-images-if.patch
index 70b33b3..bc88e97 100644
--- a/SOURCES/0147-Include-OSTree-path-when-searching-kernels-images-if.patch
+++ b/SOURCES/0147-Include-OSTree-path-when-searching-kernels-images-if.patch
@@ -20,7 +20,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 6 insertions(+)
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 61d0664fb5c..9682e97b7f5 100644
+index 61d0664fb..9682e97b7 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -237,6 +237,12 @@ case "x$machine" in
diff --git a/SOURCES/0148-Use-BLS-version-field-to-compare-entries-if-id-field.patch b/SOURCES/0148-Use-BLS-version-field-to-compare-entries-if-id-field.patch
index 0d76ad8..d9f11a5 100644
--- a/SOURCES/0148-Use-BLS-version-field-to-compare-entries-if-id-field.patch
+++ b/SOURCES/0148-Use-BLS-version-field-to-compare-entries-if-id-field.patch
@@ -14,7 +14,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 3 insertions(+)
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
-index 6ab85df6b3a..c52d2b2e05a 100644
+index 6ab85df6b..c52d2b2e0 100644
--- a/grub-core/commands/blscfg.c
+++ b/grub-core/commands/blscfg.c
@@ -418,6 +418,9 @@ static int bls_cmp(const void *p0, const void *p1, void *state UNUSED)
diff --git a/SOURCES/0149-Add-version-field-to-BLS-generated-by-grub2-switch-t.patch b/SOURCES/0149-Add-version-field-to-BLS-generated-by-grub2-switch-t.patch
index 27e0a17..3bb0169 100644
--- a/SOURCES/0149-Add-version-field-to-BLS-generated-by-grub2-switch-t.patch
+++ b/SOURCES/0149-Add-version-field-to-BLS-generated-by-grub2-switch-t.patch
@@ -13,7 +13,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 3 insertions(+)
diff --git a/util/grub-switch-to-blscfg.in b/util/grub-switch-to-blscfg.in
-index bc28053cd30..89487ad611c 100644
+index bc28053cd..89487ad61 100644
--- a/util/grub-switch-to-blscfg.in
+++ b/util/grub-switch-to-blscfg.in
@@ -190,12 +190,14 @@ mkbls() {
diff --git a/SOURCES/0150-Fixup-for-newer-compiler.patch b/SOURCES/0150-Fixup-for-newer-compiler.patch
index a63ca6b..0478420 100644
--- a/SOURCES/0150-Fixup-for-newer-compiler.patch
+++ b/SOURCES/0150-Fixup-for-newer-compiler.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] Fixup for newer compiler
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index 7002ad81b7e..dac73b2fa8b 100644
+index 7002ad81b..dac73b2fa 100644
--- a/grub-core/fs/btrfs.c
+++ b/grub-core/fs/btrfs.c
@@ -198,7 +198,7 @@ struct grub_btrfs_inode
@@ -22,7 +22,7 @@ index 7002ad81b7e..dac73b2fa8b 100644
struct grub_btrfs_extent_data
{
diff --git a/include/grub/gpt_partition.h b/include/grub/gpt_partition.h
-index 7a93f43291c..8212697bf6b 100644
+index 7a93f4329..8212697bf 100644
--- a/include/grub/gpt_partition.h
+++ b/include/grub/gpt_partition.h
@@ -76,7 +76,7 @@ struct grub_gpt_partentry
diff --git a/SOURCES/0151-Don-t-attempt-to-export-the-start-and-_start-symbols.patch b/SOURCES/0151-Don-t-attempt-to-export-the-start-and-_start-symbols.patch
index 33ceb3d..7091467 100644
--- a/SOURCES/0151-Don-t-attempt-to-export-the-start-and-_start-symbols.patch
+++ b/SOURCES/0151-Don-t-attempt-to-export-the-start-and-_start-symbols.patch
@@ -26,7 +26,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 2 insertions(+)
diff --git a/include/grub/kernel.h b/include/grub/kernel.h
-index ae69218af20..9548d552aad 100644
+index ae69218af..9548d552a 100644
--- a/include/grub/kernel.h
+++ b/include/grub/kernel.h
@@ -108,8 +108,10 @@ grub_addr_t grub_modules_get_end (void);
diff --git a/SOURCES/0152-Simplify-BLS-entry-key-val-pairs-lookup.patch b/SOURCES/0152-Simplify-BLS-entry-key-val-pairs-lookup.patch
index f3d2613..89b7489 100644
--- a/SOURCES/0152-Simplify-BLS-entry-key-val-pairs-lookup.patch
+++ b/SOURCES/0152-Simplify-BLS-entry-key-val-pairs-lookup.patch
@@ -52,7 +52,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 18 insertions(+), 70 deletions(-)
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
-index c52d2b2e05a..fb08d8e4c12 100644
+index c52d2b2e0..fb08d8e4c 100644
--- a/grub-core/commands/blscfg.c
+++ b/grub-core/commands/blscfg.c
@@ -169,84 +169,35 @@ static void bls_free_entry(struct bls_entry *entry)
diff --git a/SOURCES/0153-Add-relative-path-to-the-kernel-and-initrds-BLS-fiel.patch b/SOURCES/0153-Add-relative-path-to-the-kernel-and-initrds-BLS-fiel.patch
index 5a5a77d..615b11a 100644
--- a/SOURCES/0153-Add-relative-path-to-the-kernel-and-initrds-BLS-fiel.patch
+++ b/SOURCES/0153-Add-relative-path-to-the-kernel-and-initrds-BLS-fiel.patch
@@ -20,7 +20,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/util/grub-switch-to-blscfg.in b/util/grub-switch-to-blscfg.in
-index 89487ad611c..2482483a437 100644
+index 89487ad61..2482483a4 100644
--- a/util/grub-switch-to-blscfg.in
+++ b/util/grub-switch-to-blscfg.in
@@ -188,6 +188,7 @@ fi
diff --git a/SOURCES/0154-Skip-leading-spaces-on-BLS-field-values.patch b/SOURCES/0154-Skip-leading-spaces-on-BLS-field-values.patch
index df80edf..c0b4ee9 100644
--- a/SOURCES/0154-Skip-leading-spaces-on-BLS-field-values.patch
+++ b/SOURCES/0154-Skip-leading-spaces-on-BLS-field-values.patch
@@ -38,7 +38,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
-index fb08d8e4c12..831cdcaccdf 100644
+index fb08d8e4c..831cdcacc 100644
--- a/grub-core/commands/blscfg.c
+++ b/grub-core/commands/blscfg.c
@@ -448,7 +448,11 @@ static int read_entry (
diff --git a/SOURCES/0155-Fixup-for-newer-compiler.patch b/SOURCES/0155-Fixup-for-newer-compiler.patch
index e518af8..c6ccf12 100644
--- a/SOURCES/0155-Fixup-for-newer-compiler.patch
+++ b/SOURCES/0155-Fixup-for-newer-compiler.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] Fixup for newer compiler
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/conf/Makefile.common b/conf/Makefile.common
-index 044ab3abe88..c75848f5c06 100644
+index 044ab3abe..c75848f5c 100644
--- a/conf/Makefile.common
+++ b/conf/Makefile.common
@@ -38,7 +38,7 @@ CFLAGS_KERNEL = $(CFLAGS_PLATFORM) -ffreestanding
diff --git a/SOURCES/0156-TPM-Fix-hash_log_extend_event-function-prototype.patch b/SOURCES/0156-TPM-Fix-hash_log_extend_event-function-prototype.patch
index 56cd169..fadda1e 100644
--- a/SOURCES/0156-TPM-Fix-hash_log_extend_event-function-prototype.patch
+++ b/SOURCES/0156-TPM-Fix-hash_log_extend_event-function-prototype.patch
@@ -23,7 +23,7 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/grub-core/kern/efi/tpm.c b/grub-core/kern/efi/tpm.c
-index c9fb3c133f3..36e1f69df16 100644
+index c9fb3c133..36e1f69df 100644
--- a/grub-core/kern/efi/tpm.c
+++ b/grub-core/kern/efi/tpm.c
@@ -245,7 +245,7 @@ grub_tpm2_log_event(grub_efi_handle_t tpm_handle, unsigned char *buf,
@@ -36,7 +36,7 @@ index c9fb3c133f3..36e1f69df16 100644
switch (status) {
diff --git a/include/grub/efi/tpm.h b/include/grub/efi/tpm.h
-index e2aff4a3c22..63d8a0fe714 100644
+index e2aff4a3c..63d8a0fe7 100644
--- a/include/grub/efi/tpm.h
+++ b/include/grub/efi/tpm.h
@@ -129,7 +129,7 @@ struct grub_efi_tpm2_protocol
diff --git a/SOURCES/0157-TPM-Fix-compiler-warnings.patch b/SOURCES/0157-TPM-Fix-compiler-warnings.patch
index b19d484..3787b1f 100644
--- a/SOURCES/0157-TPM-Fix-compiler-warnings.patch
+++ b/SOURCES/0157-TPM-Fix-compiler-warnings.patch
@@ -18,7 +18,7 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
1 file changed, 8 insertions(+), 16 deletions(-)
diff --git a/grub-core/kern/efi/tpm.c b/grub-core/kern/efi/tpm.c
-index 36e1f69df16..0d3ebe22e57 100644
+index 36e1f69df..0d3ebe22e 100644
--- a/grub-core/kern/efi/tpm.c
+++ b/grub-core/kern/efi/tpm.c
@@ -161,21 +161,12 @@ grub_tpm_execute(PassThroughToTPM_InputParamBlock *inbuf,
diff --git a/SOURCES/0158-grub-switch-to-blscfg.in-get-rid-of-a-bunch-of-bashi.patch b/SOURCES/0158-grub-switch-to-blscfg.in-get-rid-of-a-bunch-of-bashi.patch
index 54c4322..0c96f6c 100644
--- a/SOURCES/0158-grub-switch-to-blscfg.in-get-rid-of-a-bunch-of-bashi.patch
+++ b/SOURCES/0158-grub-switch-to-blscfg.in-get-rid-of-a-bunch-of-bashi.patch
@@ -11,7 +11,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/util/grub-switch-to-blscfg.in b/util/grub-switch-to-blscfg.in
-index 2482483a437..dac41e73836 100644
+index 2482483a4..dac41e738 100644
--- a/util/grub-switch-to-blscfg.in
+++ b/util/grub-switch-to-blscfg.in
@@ -151,18 +151,18 @@ done
diff --git a/SOURCES/0159-grub-switch-to-blscfg.in-Better-boot-prefix-checking.patch b/SOURCES/0159-grub-switch-to-blscfg.in-Better-boot-prefix-checking.patch
index 8437c68..922d134 100644
--- a/SOURCES/0159-grub-switch-to-blscfg.in-Better-boot-prefix-checking.patch
+++ b/SOURCES/0159-grub-switch-to-blscfg.in-Better-boot-prefix-checking.patch
@@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 17 insertions(+), 19 deletions(-)
diff --git a/util/grub-switch-to-blscfg.in b/util/grub-switch-to-blscfg.in
-index dac41e73836..884cf45b1e1 100644
+index dac41e738..884cf45b1 100644
--- a/util/grub-switch-to-blscfg.in
+++ b/util/grub-switch-to-blscfg.in
@@ -219,30 +219,31 @@ EOF
diff --git a/SOURCES/0160-Use-boot-loader-entries-as-BLS-directory-path-also-o.patch b/SOURCES/0160-Use-boot-loader-entries-as-BLS-directory-path-also-o.patch
index 88b9bc2..0888517 100644
--- a/SOURCES/0160-Use-boot-loader-entries-as-BLS-directory-path-also-o.patch
+++ b/SOURCES/0160-Use-boot-loader-entries-as-BLS-directory-path-also-o.patch
@@ -19,7 +19,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
2 files changed, 38 insertions(+), 14 deletions(-)
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
-index 831cdcaccdf..70939a81826 100644
+index 831cdcacc..70939a818 100644
--- a/grub-core/commands/blscfg.c
+++ b/grub-core/commands/blscfg.c
@@ -381,9 +381,14 @@ static int bls_cmp(const void *p0, const void *p1, void *state UNUSED)
@@ -131,7 +131,7 @@ index 831cdcaccdf..70939a81826 100644
grub_free (entries);
diff --git a/util/grub-switch-to-blscfg.in b/util/grub-switch-to-blscfg.in
-index 884cf45b1e1..2f37a1f740b 100644
+index 884cf45b1..2f37a1f74 100644
--- a/util/grub-switch-to-blscfg.in
+++ b/util/grub-switch-to-blscfg.in
@@ -44,13 +44,13 @@ EFIDIR=$(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/')
diff --git a/SOURCES/0161-Use-BLS-fragment-filename-as-menu-entry-id-and-for-c.patch b/SOURCES/0161-Use-BLS-fragment-filename-as-menu-entry-id-and-for-c.patch
index 7f765e7..63c2551 100644
--- a/SOURCES/0161-Use-BLS-fragment-filename-as-menu-entry-id-and-for-c.patch
+++ b/SOURCES/0161-Use-BLS-fragment-filename-as-menu-entry-id-and-for-c.patch
@@ -13,7 +13,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 12 insertions(+), 50 deletions(-)
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
-index 70939a81826..cd8659384e4 100644
+index 70939a818..cd8659384 100644
--- a/grub-core/commands/blscfg.c
+++ b/grub-core/commands/blscfg.c
@@ -70,6 +70,7 @@ struct bls_entry
diff --git a/SOURCES/0162-Fix-grub-switch-to-blscfg-boot-prefix-handling.patch b/SOURCES/0162-Fix-grub-switch-to-blscfg-boot-prefix-handling.patch
index be7d1a3..bc380e2 100644
--- a/SOURCES/0162-Fix-grub-switch-to-blscfg-boot-prefix-handling.patch
+++ b/SOURCES/0162-Fix-grub-switch-to-blscfg-boot-prefix-handling.patch
@@ -13,7 +13,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/util/grub-switch-to-blscfg.in b/util/grub-switch-to-blscfg.in
-index 2f37a1f740b..40612e00686 100644
+index 2f37a1f74..40612e006 100644
--- a/util/grub-switch-to-blscfg.in
+++ b/util/grub-switch-to-blscfg.in
@@ -220,7 +220,8 @@ EOF
diff --git a/SOURCES/0163-Revert-trim-arp-packets-with-abnormal-size.patch b/SOURCES/0163-Revert-trim-arp-packets-with-abnormal-size.patch
index 5a169d7..5e02bb7 100644
--- a/SOURCES/0163-Revert-trim-arp-packets-with-abnormal-size.patch
+++ b/SOURCES/0163-Revert-trim-arp-packets-with-abnormal-size.patch
@@ -9,7 +9,7 @@ This reverts commit d11b2eb425d2125f67dd8d8e9b11d9be7d6f3f11.
1 file changed, 6 deletions(-)
diff --git a/grub-core/net/arp.c b/grub-core/net/arp.c
-index d1c69ed2b55..54306e3b16d 100644
+index d1c69ed2b..54306e3b1 100644
--- a/grub-core/net/arp.c
+++ b/grub-core/net/arp.c
@@ -150,12 +150,6 @@ grub_net_arp_receive (struct grub_net_buff *nb, struct grub_net_card *card,
diff --git a/SOURCES/0164-Use-xid-to-match-DHCP-replies.patch b/SOURCES/0164-Use-xid-to-match-DHCP-replies.patch
index 657ebb7..b2eca7c 100644
--- a/SOURCES/0164-Use-xid-to-match-DHCP-replies.patch
+++ b/SOURCES/0164-Use-xid-to-match-DHCP-replies.patch
@@ -17,7 +17,7 @@ Signed-off-by: Andrzej Kacprowski <andrzej.kacprowski@intel.com>
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
-index da3e454466b..2869482fe06 100644
+index da3e45446..2869482fe 100644
--- a/grub-core/net/bootp.c
+++ b/grub-core/net/bootp.c
@@ -777,7 +777,8 @@ grub_cmd_bootp (struct grub_command *cmd __attribute__ ((unused)),
@@ -31,7 +31,7 @@ index da3e454466b..2869482fe06 100644
grub_memcpy (&pack->mac_addr, &ifaces[j].hwaddress.mac, 6);
diff --git a/grub-core/net/ip.c b/grub-core/net/ip.c
-index 7c95cc7464a..8411e0ecca3 100644
+index 7c95cc746..8411e0ecc 100644
--- a/grub-core/net/ip.c
+++ b/grub-core/net/ip.c
@@ -275,6 +275,7 @@ handle_dgram (struct grub_net_buff *nb,
@@ -43,7 +43,7 @@ index 7c95cc7464a..8411e0ecca3 100644
&& grub_memcmp (inf->hwaddress.mac, &bootp->mac_addr,
sizeof (inf->hwaddress.mac)) == 0)
diff --git a/include/grub/net.h b/include/grub/net.h
-index f8f3ec13acc..de51894cbbf 100644
+index f8f3ec13a..de51894cb 100644
--- a/include/grub/net.h
+++ b/include/grub/net.h
@@ -292,6 +292,7 @@ struct grub_net_network_level_interface
diff --git a/SOURCES/0165-Add-support-for-non-Ethernet-network-cards.patch b/SOURCES/0165-Add-support-for-non-Ethernet-network-cards.patch
index ffd126c..d4c7efd 100644
--- a/SOURCES/0165-Add-support-for-non-Ethernet-network-cards.patch
+++ b/SOURCES/0165-Add-support-for-non-Ethernet-network-cards.patch
@@ -39,7 +39,7 @@ Conflicts:
12 files changed, 216 insertions(+), 152 deletions(-)
diff --git a/grub-core/net/arp.c b/grub-core/net/arp.c
-index 54306e3b16d..67b409a8acc 100644
+index 54306e3b1..67b409a8a 100644
--- a/grub-core/net/arp.c
+++ b/grub-core/net/arp.c
@@ -31,22 +31,12 @@ enum
@@ -272,7 +272,7 @@ index 54306e3b16d..67b409a8acc 100644
/* 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 2869482fe06..4e55adc557b 100644
+index 2869482fe..4e55adc55 100644
--- a/grub-core/net/bootp.c
+++ b/grub-core/net/bootp.c
@@ -219,7 +219,6 @@ grub_net_configure_by_dhcp_ack (const char *name,
@@ -318,7 +318,7 @@ index 2869482fe06..4e55adc557b 100644
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 a4daaa460bd..cd6dba79f63 100644
+index a4daaa460..cd6dba79f 100644
--- a/grub-core/net/drivers/efi/efinet.c
+++ b/grub-core/net/drivers/efi/efinet.c
@@ -280,6 +280,9 @@ grub_efinet_findcards (void)
@@ -346,7 +346,7 @@ index a4daaa460bd..cd6dba79f63 100644
card->efi_handle = *handle;
diff --git a/grub-core/net/drivers/emu/emunet.c b/grub-core/net/drivers/emu/emunet.c
-index b194920861f..5b6c5e16a6d 100644
+index b19492086..5b6c5e16a 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 =
@@ -358,7 +358,7 @@ index b194920861f..5b6c5e16a6d 100644
},
.flags = 0
diff --git a/grub-core/net/drivers/i386/pc/pxe.c b/grub-core/net/drivers/i386/pc/pxe.c
-index 3f4152d036c..9f8fb4b6d2b 100644
+index 3f4152d03..9f8fb4b6d 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)
@@ -390,7 +390,7 @@ index 3f4152d036c..9f8fb4b6d2b 100644
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 3df75357a70..ba50415f5f6 100644
+index 3df75357a..ba50415f5 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,
@@ -410,7 +410,7 @@ index 3df75357a70..ba50415f5f6 100644
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 056052e40d5..22ebcbf211e 100644
+index 056052e40..22ebcbf21 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)
@@ -422,7 +422,7 @@ index 056052e40d5..22ebcbf211e 100644
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 4d7ceed6f93..9aae83a5eb4 100644
+index 4d7ceed6f..9aae83a5e 100644
--- a/grub-core/net/ethernet.c
+++ b/grub-core/net/ethernet.c
@@ -29,13 +29,6 @@
@@ -572,7 +572,7 @@ index 4d7ceed6f93..9aae83a5eb4 100644
{
/* ARP packet. */
diff --git a/grub-core/net/icmp6.c b/grub-core/net/icmp6.c
-index 2cbd95dce25..56a3ec5c8e8 100644
+index 2cbd95dce..56a3ec5c8 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,
@@ -612,7 +612,7 @@ index 2cbd95dce25..56a3ec5c8e8 100644
}
if (ohdr->type == OPTION_PREFIX && ohdr->len == 4)
diff --git a/grub-core/net/ip.c b/grub-core/net/ip.c
-index 8411e0ecca3..b2ca74b6eb1 100644
+index 8411e0ecc..b2ca74b6e 100644
--- a/grub-core/net/ip.c
+++ b/grub-core/net/ip.c
@@ -277,8 +277,8 @@ handle_dgram (struct grub_net_buff *nb,
@@ -627,7 +627,7 @@ index 8411e0ecca3..b2ca74b6eb1 100644
grub_net_process_dhcp (nb, inf->card);
grub_netbuff_free (nb);
diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index fa3e2912643..9b8944292c7 100644
+index fa3e29126..9b8944292 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,
@@ -711,7 +711,7 @@ index fa3e2912643..9b8944292c7 100644
int
diff --git a/include/grub/net.h b/include/grub/net.h
-index de51894cbbf..e9ebc6a1b4f 100644
+index de51894cb..e9ebc6a1b 100644
--- a/include/grub/net.h
+++ b/include/grub/net.h
@@ -29,7 +29,8 @@
diff --git a/SOURCES/0166-misc-fix-invalid-character-recongition-in-strto-l.patch b/SOURCES/0166-misc-fix-invalid-character-recongition-in-strto-l.patch
index 4006028..0c59b1f 100644
--- a/SOURCES/0166-misc-fix-invalid-character-recongition-in-strto-l.patch
+++ b/SOURCES/0166-misc-fix-invalid-character-recongition-in-strto-l.patch
@@ -12,7 +12,7 @@ parses: ` = 9, _ = 8, ^ = 7, ] = 6, \ = 5, and [ = 4
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index 0e89c483d5e..5c3899f0e5b 100644
+index 0e89c483d..5c3899f0e 100644
--- a/grub-core/kern/misc.c
+++ b/grub-core/kern/misc.c
@@ -434,11 +434,14 @@ grub_strtoull (const char *str, char **end, int base)
diff --git a/SOURCES/0167-net-read-bracketed-ipv6-addrs-and-port-numbers.patch b/SOURCES/0167-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
index 4f68187..4d0c18c 100644
--- a/SOURCES/0167-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
+++ b/SOURCES/0167-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
@@ -14,7 +14,7 @@ number
4 files changed, 101 insertions(+), 6 deletions(-)
diff --git a/grub-core/net/http.c b/grub-core/net/http.c
-index 5aa4ad3befc..f182d7b871d 100644
+index 5aa4ad3be..f182d7b87 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)
@@ -72,7 +72,7 @@ index 5aa4ad3befc..f182d7b871d 100644
file);
if (!data->sock)
diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index 9b8944292c7..1f887d44b32 100644
+index 9b8944292..1f887d44b 100644
--- a/grub-core/net/net.c
+++ b/grub-core/net/net.c
@@ -439,6 +439,12 @@ parse_ip6 (const char *val, grub_uint64_t *ip, const char **rest)
@@ -183,7 +183,7 @@ index 9b8944292c7..1f887d44b32 100644
{
FOR_NET_APP_LEVEL (proto)
diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
-index f90071353ad..e267af354f4 100644
+index f90071353..e267af354 100644
--- a/grub-core/net/tftp.c
+++ b/grub-core/net/tftp.c
@@ -333,6 +333,7 @@ tftp_open (struct grub_file *file, const char *filename)
@@ -216,7 +216,7 @@ index f90071353ad..e267af354f4 100644
if (!data->sock)
{
diff --git a/include/grub/net.h b/include/grub/net.h
-index e9ebc6a1b4f..f4cd86e582f 100644
+index e9ebc6a1b..f4cd86e58 100644
--- a/include/grub/net.h
+++ b/include/grub/net.h
@@ -273,6 +273,7 @@ typedef struct grub_net
diff --git a/SOURCES/0168-net-read-bracketed-ipv6-addrs-and-port-numbers-pjone.patch b/SOURCES/0168-net-read-bracketed-ipv6-addrs-and-port-numbers-pjone.patch
index a0f3859..ec497d1 100644
--- a/SOURCES/0168-net-read-bracketed-ipv6-addrs-and-port-numbers-pjone.patch
+++ b/SOURCES/0168-net-read-bracketed-ipv6-addrs-and-port-numbers-pjone.patch
@@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
2 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/grub-core/net/http.c b/grub-core/net/http.c
-index f182d7b871d..00737c52750 100644
+index f182d7b87..00737c527 100644
--- a/grub-core/net/http.c
+++ b/grub-core/net/http.c
@@ -289,7 +289,9 @@ http_receive (grub_net_tcp_socket_t sock __attribute__ ((unused)),
@@ -37,7 +37,7 @@ index f182d7b871d..00737c52750 100644
if (!data->sock)
{
diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index 1f887d44b32..a0f4d00f0be 100644
+index 1f887d44b..a0f4d00f0 100644
--- a/grub-core/net/net.c
+++ b/grub-core/net/net.c
@@ -441,10 +441,11 @@ parse_ip6 (const char *val, grub_uint64_t *ip, const char **rest)
diff --git a/SOURCES/0169-bootp-New-net_bootp6-command.patch b/SOURCES/0169-bootp-New-net_bootp6-command.patch
index 9e2a5d3..3c78a97 100644
--- a/SOURCES/0169-bootp-New-net_bootp6-command.patch
+++ b/SOURCES/0169-bootp-New-net_bootp6-command.patch
@@ -17,7 +17,7 @@ Signed-off-by: Ken Lin <ken.lin@hpe.com>
5 files changed, 994 insertions(+), 206 deletions(-)
diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
-index 4e55adc557b..ff1d7776e7f 100644
+index 4e55adc55..ff1d7776e 100644
--- a/grub-core/net/bootp.c
+++ b/grub-core/net/bootp.c
@@ -25,6 +25,98 @@
@@ -1125,7 +1125,7 @@ index 4e55adc557b..ff1d7776e7f 100644
+ grub_unregister_command (cmd_bootp6);
}
diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index cd6dba79f63..6fd0a4f4998 100644
+index cd6dba79f..6fd0a4f49 100644
--- a/grub-core/net/drivers/efi/efinet.c
+++ b/grub-core/net/drivers/efi/efinet.c
@@ -393,9 +393,6 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
@@ -1163,7 +1163,7 @@ index cd6dba79f63..6fd0a4f4998 100644
}
else
diff --git a/grub-core/net/ip.c b/grub-core/net/ip.c
-index b2ca74b6eb1..9a4e589aa39 100644
+index b2ca74b6e..9a4e589aa 100644
--- a/grub-core/net/ip.c
+++ b/grub-core/net/ip.c
@@ -239,6 +239,45 @@ handle_dgram (struct grub_net_buff *nb,
@@ -1213,7 +1213,7 @@ index b2ca74b6eb1..9a4e589aa39 100644
{
const struct grub_net_bootp_packet *bootp;
diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index e5b521bd9be..1250d493e25 100644
+index e5b521bd9..1250d493e 100644
--- a/include/grub/efi/api.h
+++ b/include/grub/efi/api.h
@@ -1507,7 +1507,7 @@ typedef struct grub_efi_pxe_ip_filter
@@ -1226,7 +1226,7 @@ index e5b521bd9be..1250d493e25 100644
} grub_efi_pxe_ip_filter_t;
diff --git a/include/grub/net.h b/include/grub/net.h
-index f4cd86e582f..5f78b22e109 100644
+index f4cd86e58..5f78b22e1 100644
--- a/include/grub/net.h
+++ b/include/grub/net.h
@@ -447,50 +447,65 @@ struct grub_net_bootp_packet
diff --git a/SOURCES/0170-Put-back-our-code-to-add-a-local-route.patch b/SOURCES/0170-Put-back-our-code-to-add-a-local-route.patch
index e8da589..aeaf87a 100644
--- a/SOURCES/0170-Put-back-our-code-to-add-a-local-route.patch
+++ b/SOURCES/0170-Put-back-our-code-to-add-a-local-route.patch
@@ -11,7 +11,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 5 insertions(+)
diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
-index ff1d7776e7f..242cd1f4cbd 100644
+index ff1d7776e..242cd1f4c 100644
--- a/grub-core/net/bootp.c
+++ b/grub-core/net/bootp.c
@@ -976,6 +976,7 @@ grub_net_configure_by_dhcpv6_reply (const char *name,
diff --git a/SOURCES/0171-efinet-UEFI-IPv6-PXE-support.patch b/SOURCES/0171-efinet-UEFI-IPv6-PXE-support.patch
index a16b276..3cfe66b 100644
--- a/SOURCES/0171-efinet-UEFI-IPv6-PXE-support.patch
+++ b/SOURCES/0171-efinet-UEFI-IPv6-PXE-support.patch
@@ -15,7 +15,7 @@ Signed-off-by: Ken Lin <ken.lin@hpe.com>
2 files changed, 46 insertions(+), 27 deletions(-)
diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index 6fd0a4f4998..712b4f85962 100644
+index 6fd0a4f49..712b4f859 100644
--- a/grub-core/net/drivers/efi/efinet.c
+++ b/grub-core/net/drivers/efi/efinet.c
@@ -409,6 +409,8 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
@@ -28,7 +28,7 @@ index 6fd0a4f4998..712b4f85962 100644
else
{
diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index 1250d493e25..2f164d4209c 100644
+index 1250d493e..2f164d420 100644
--- a/include/grub/efi/api.h
+++ b/include/grub/efi/api.h
@@ -1499,31 +1499,6 @@ typedef union
diff --git a/SOURCES/0172-grub.texi-Add-net_bootp6-doument.patch b/SOURCES/0172-grub.texi-Add-net_bootp6-doument.patch
index b66a80c..42b885e 100644
--- a/SOURCES/0172-grub.texi-Add-net_bootp6-doument.patch
+++ b/SOURCES/0172-grub.texi-Add-net_bootp6-doument.patch
@@ -12,7 +12,7 @@ Signed-off-by: Ken Lin <ken.lin@hpe.com>
1 file changed, 17 insertions(+)
diff --git a/docs/grub.texi b/docs/grub.texi
-index 2b7b7faf847..c54bee31679 100644
+index 2b7b7faf8..c54bee316 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -5303,6 +5303,7 @@ This command is only available on AArch64 systems.
diff --git a/SOURCES/0173-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch b/SOURCES/0173-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
index 1874107..0a237f8 100644
--- a/SOURCES/0173-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
+++ b/SOURCES/0173-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
@@ -22,7 +22,7 @@ Signed-off-by: Ken Lin <ken.lin@hpe.com>
2 files changed, 67 insertions(+), 2 deletions(-)
diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
-index 242cd1f4cbd..8b6fc9f2411 100644
+index 242cd1f4c..8b6fc9f24 100644
--- a/grub-core/net/bootp.c
+++ b/grub-core/net/bootp.c
@@ -20,6 +20,7 @@
@@ -122,7 +122,7 @@ index 242cd1f4cbd..8b6fc9f2411 100644
inter->dhcp_ack = grub_malloc (size);
diff --git a/include/grub/net.h b/include/grub/net.h
-index 5f78b22e109..9cf6da68973 100644
+index 5f78b22e1..9cf6da689 100644
--- a/include/grub/net.h
+++ b/include/grub/net.h
@@ -522,6 +522,7 @@ enum
diff --git a/SOURCES/0174-efinet-Setting-network-from-UEFI-device-path.patch b/SOURCES/0174-efinet-Setting-network-from-UEFI-device-path.patch
index 9c7b469..685957e 100644
--- a/SOURCES/0174-efinet-Setting-network-from-UEFI-device-path.patch
+++ b/SOURCES/0174-efinet-Setting-network-from-UEFI-device-path.patch
@@ -32,7 +32,7 @@ Signed-off-by: Ken Lin <ken.lin@hpe.com>
2 files changed, 280 insertions(+), 15 deletions(-)
diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index 712b4f85962..3e51e106473 100644
+index 712b4f859..3e51e1064 100644
--- a/grub-core/net/drivers/efi/efinet.c
+++ b/grub-core/net/drivers/efi/efinet.c
@@ -27,6 +27,7 @@
@@ -375,7 +375,7 @@ index 712b4f85962..3e51e106473 100644
}
}
diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index 2f164d4209c..eb6bb50857c 100644
+index 2f164d420..eb6bb5085 100644
--- a/include/grub/efi/api.h
+++ b/include/grub/efi/api.h
@@ -839,6 +839,8 @@ struct grub_efi_ipv4_device_path
diff --git a/SOURCES/0175-efinet-Setting-DNS-server-from-UEFI-protocol.patch b/SOURCES/0175-efinet-Setting-DNS-server-from-UEFI-protocol.patch
index 47cee2f..ba64f0e 100644
--- a/SOURCES/0175-efinet-Setting-DNS-server-from-UEFI-protocol.patch
+++ b/SOURCES/0175-efinet-Setting-DNS-server-from-UEFI-protocol.patch
@@ -33,7 +33,7 @@ Signed-off-by: Ken Lin <ken.lin@hpe.com>
2 files changed, 239 insertions(+)
diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index 3e51e106473..3d775074705 100644
+index 3e51e1064..3d7750747 100644
--- a/grub-core/net/drivers/efi/efinet.c
+++ b/grub-core/net/drivers/efi/efinet.c
@@ -34,6 +34,8 @@ GRUB_MOD_LICENSE ("GPLv3+");
@@ -242,7 +242,7 @@ index 3e51e106473..3d775074705 100644
}
diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index eb6bb50857c..dd3b07eac97 100644
+index eb6bb5085..dd3b07eac 100644
--- a/include/grub/efi/api.h
+++ b/include/grub/efi/api.h
@@ -334,6 +334,16 @@
diff --git a/SOURCES/0176-Fix-one-more-coverity-complaint.patch b/SOURCES/0176-Fix-one-more-coverity-complaint.patch
index ba00fbd..6e9d0c4 100644
--- a/SOURCES/0176-Fix-one-more-coverity-complaint.patch
+++ b/SOURCES/0176-Fix-one-more-coverity-complaint.patch
@@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/grub-core/normal/completion.c b/grub-core/normal/completion.c
-index 2c9b9e9312a..93aa0d8eda8 100644
+index 2c9b9e931..93aa0d8ed 100644
--- a/grub-core/normal/completion.c
+++ b/grub-core/normal/completion.c
@@ -284,7 +284,8 @@ complete_file (void)
diff --git a/SOURCES/0177-Fix-grub_net_hwaddr_to_str.patch b/SOURCES/0177-Fix-grub_net_hwaddr_to_str.patch
index 6c17a32..d2e13c7 100644
--- a/SOURCES/0177-Fix-grub_net_hwaddr_to_str.patch
+++ b/SOURCES/0177-Fix-grub_net_hwaddr_to_str.patch
@@ -16,7 +16,7 @@ Signed-off-by: Mark Salter <msalter@redhat.com>
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index a0f4d00f0be..191e8e41bd6 100644
+index a0f4d00f0..191e8e41b 100644
--- a/grub-core/net/net.c
+++ b/grub-core/net/net.c
@@ -770,6 +770,7 @@ grub_net_hwaddr_to_str (const grub_net_link_level_address_t *addr, char *str)
diff --git a/SOURCES/0178-Support-UEFI-networking-protocols.patch b/SOURCES/0178-Support-UEFI-networking-protocols.patch
index 2a4d586..9e46d4a 100644
--- a/SOURCES/0178-Support-UEFI-networking-protocols.patch
+++ b/SOURCES/0178-Support-UEFI-networking-protocols.patch
@@ -53,7 +53,7 @@ V3:
create mode 100644 include/grub/net/efi.h
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 420831bc89e..2851437e098 100644
+index 420831bc8..2851437e0 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -2181,6 +2181,18 @@ module = {
@@ -89,7 +89,7 @@ index 420831bc89e..2851437e098 100644
module = {
diff --git a/grub-core/io/bufio.c b/grub-core/io/bufio.c
-index dbed6474431..6118bade50d 100644
+index dbed64744..6118bade5 100644
--- a/grub-core/io/bufio.c
+++ b/grub-core/io/bufio.c
@@ -139,7 +139,7 @@ grub_bufio_read (grub_file_t file, char *buf, grub_size_t len)
@@ -102,7 +102,7 @@ index dbed6474431..6118bade50d 100644
if (file->offset + res < next_buf)
{
diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index a2a732ffc0d..4d36fe31177 100644
+index a2a732ffc..4d36fe311 100644
--- a/grub-core/kern/efi/efi.c
+++ b/grub-core/kern/efi/efi.c
@@ -696,7 +696,7 @@ grub_efi_print_device_path (grub_efi_device_path_t *dp)
@@ -233,7 +233,7 @@ index a2a732ffc0d..4d36fe31177 100644
grub_printf ("/UnknownMessaging(%x)", (unsigned) subtype);
break;
diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index 3d775074705..df7760ad203 100644
+index 3d7750747..df7760ad2 100644
--- a/grub-core/net/drivers/efi/efinet.c
+++ b/grub-core/net/drivers/efi/efinet.c
@@ -28,6 +28,7 @@
@@ -306,7 +306,7 @@ index 3d775074705..df7760ad203 100644
diff --git a/grub-core/net/efi/dhcp.c b/grub-core/net/efi/dhcp.c
new file mode 100644
-index 00000000000..dbef63d8c08
+index 000000000..dbef63d8c
--- /dev/null
+++ b/grub-core/net/efi/dhcp.c
@@ -0,0 +1,397 @@
@@ -709,7 +709,7 @@ index 00000000000..dbef63d8c08
+grub_command_func_t grub_efi_net_bootp6 = grub_cmd_efi_bootp6;
diff --git a/grub-core/net/efi/efi_netfs.c b/grub-core/net/efi/efi_netfs.c
new file mode 100644
-index 00000000000..ef371d885ea
+index 000000000..ef371d885
--- /dev/null
+++ b/grub-core/net/efi/efi_netfs.c
@@ -0,0 +1,57 @@
@@ -772,7 +772,7 @@ index 00000000000..ef371d885ea
+}
diff --git a/grub-core/net/efi/http.c b/grub-core/net/efi/http.c
new file mode 100644
-index 00000000000..3f61fd2fa5b
+index 000000000..3f61fd2fa
--- /dev/null
+++ b/grub-core/net/efi/http.c
@@ -0,0 +1,419 @@
@@ -1197,7 +1197,7 @@ index 00000000000..3f61fd2fa5b
+ };
diff --git a/grub-core/net/efi/ip4_config.c b/grub-core/net/efi/ip4_config.c
new file mode 100644
-index 00000000000..b711a5d9457
+index 000000000..b711a5d94
--- /dev/null
+++ b/grub-core/net/efi/ip4_config.c
@@ -0,0 +1,398 @@
@@ -1601,7 +1601,7 @@ index 00000000000..b711a5d9457
+ };
diff --git a/grub-core/net/efi/ip6_config.c b/grub-core/net/efi/ip6_config.c
new file mode 100644
-index 00000000000..017c4d05bc7
+index 000000000..017c4d05b
--- /dev/null
+++ b/grub-core/net/efi/ip6_config.c
@@ -0,0 +1,422 @@
@@ -2029,7 +2029,7 @@ index 00000000000..017c4d05bc7
+ };
diff --git a/grub-core/net/efi/net.c b/grub-core/net/efi/net.c
new file mode 100644
-index 00000000000..9e0078ac1c6
+index 000000000..9e0078ac1
--- /dev/null
+++ b/grub-core/net/efi/net.c
@@ -0,0 +1,1428 @@
@@ -3463,7 +3463,7 @@ index 00000000000..9e0078ac1c6
+}
diff --git a/grub-core/net/efi/pxe.c b/grub-core/net/efi/pxe.c
new file mode 100644
-index 00000000000..531949cba5c
+index 000000000..531949cba
--- /dev/null
+++ b/grub-core/net/efi/pxe.c
@@ -0,0 +1,424 @@
@@ -3892,7 +3892,7 @@ index 00000000000..531949cba5c
+ };
+
diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index 191e8e41bd6..a571ee92efa 100644
+index 191e8e41b..a571ee92e 100644
--- a/grub-core/net/net.c
+++ b/grub-core/net/net.c
@@ -32,6 +32,9 @@
@@ -4002,7 +4002,7 @@ index 191e8e41bd6..a571ee92efa 100644
+#endif
}
diff --git a/util/grub-mknetdir.c b/util/grub-mknetdir.c
-index 82073d5cc94..ae31271bbc0 100644
+index 82073d5cc..ae31271bb 100644
--- a/util/grub-mknetdir.c
+++ b/util/grub-mknetdir.c
@@ -32,13 +32,15 @@
@@ -4084,7 +4084,7 @@ index 82073d5cc94..ae31271bbc0 100644
if (!grub_install_source_directory)
{
diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index dd3b07eac97..b337e1a193d 100644
+index dd3b07eac..b337e1a19 100644
--- a/include/grub/efi/api.h
+++ b/include/grub/efi/api.h
@@ -602,6 +602,23 @@ typedef union
@@ -4335,7 +4335,7 @@ index dd3b07eac97..b337e1a193d 100644
diff --git a/include/grub/efi/dhcp.h b/include/grub/efi/dhcp.h
new file mode 100644
-index 00000000000..fdb88eb810e
+index 000000000..fdb88eb81
--- /dev/null
+++ b/include/grub/efi/dhcp.h
@@ -0,0 +1,343 @@
@@ -4684,7 +4684,7 @@ index 00000000000..fdb88eb810e
+#endif /* ! GRUB_EFI_DHCP_HEADER */
diff --git a/include/grub/efi/http.h b/include/grub/efi/http.h
new file mode 100644
-index 00000000000..c5e9a89f505
+index 000000000..c5e9a89f5
--- /dev/null
+++ b/include/grub/efi/http.h
@@ -0,0 +1,215 @@
@@ -4905,7 +4905,7 @@ index 00000000000..c5e9a89f505
+#endif /* !GRUB_EFI_HTTP_HEADER */
diff --git a/include/grub/net/efi.h b/include/grub/net/efi.h
new file mode 100644
-index 00000000000..de90d223e8e
+index 000000000..de90d223e
--- /dev/null
+++ b/include/grub/net/efi.h
@@ -0,0 +1,144 @@
diff --git a/SOURCES/0179-AUDIT-0-http-boot-tracker-bug.patch b/SOURCES/0179-AUDIT-0-http-boot-tracker-bug.patch
index 3d8d96b..338d7d1 100644
--- a/SOURCES/0179-AUDIT-0-http-boot-tracker-bug.patch
+++ b/SOURCES/0179-AUDIT-0-http-boot-tracker-bug.patch
@@ -22,7 +22,7 @@ Signed-off-by: Michael Chang <mchang@suse.com>
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/grub-core/net/efi/net.c b/grub-core/net/efi/net.c
-index 9e0078ac1c6..2bf15447fd5 100644
+index 9e0078ac1..2bf15447f 100644
--- a/grub-core/net/efi/net.c
+++ b/grub-core/net/efi/net.c
@@ -645,8 +645,10 @@ grub_efihttp_chunk_read (grub_file_t file, char *buf,
@@ -38,7 +38,7 @@ index 9e0078ac1c6..2bf15447fd5 100644
if (buf)
{
diff --git a/grub-core/net/http.c b/grub-core/net/http.c
-index 00737c52750..c9c59690a98 100644
+index 00737c527..c9c59690a 100644
--- a/grub-core/net/http.c
+++ b/grub-core/net/http.c
@@ -31,7 +31,8 @@ GRUB_MOD_LICENSE ("GPLv3+");
diff --git a/SOURCES/0180-grub-core-video-efi_gop.c-Add-support-for-BLT_ONLY-a.patch b/SOURCES/0180-grub-core-video-efi_gop.c-Add-support-for-BLT_ONLY-a.patch
index 33cde3b..4992c30 100644
--- a/SOURCES/0180-grub-core-video-efi_gop.c-Add-support-for-BLT_ONLY-a.patch
+++ b/SOURCES/0180-grub-core-video-efi_gop.c-Add-support-for-BLT_ONLY-a.patch
@@ -21,7 +21,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/grub-core/video/efi_gop.c b/grub-core/video/efi_gop.c
-index 7f9d1c2dfa1..c9e40e8d4e9 100644
+index 7f9d1c2df..c9e40e8d4 100644
--- a/grub-core/video/efi_gop.c
+++ b/grub-core/video/efi_gop.c
@@ -121,6 +121,7 @@ grub_video_gop_get_bpp (struct grub_efi_gop_mode_info *in)
@@ -41,7 +41,7 @@ index 7f9d1c2dfa1..c9e40e8d4e9 100644
out->red_field_pos = 0;
out->green_mask_size = 8;
diff --git a/include/grub/efi/graphics_output.h b/include/grub/efi/graphics_output.h
-index 12977741192..e4388127c66 100644
+index 129777411..e4388127c 100644
--- a/include/grub/efi/graphics_output.h
+++ b/include/grub/efi/graphics_output.h
@@ -28,7 +28,8 @@ typedef enum
diff --git a/SOURCES/0181-efi-uga-use-64-bit-for-fb_base.patch b/SOURCES/0181-efi-uga-use-64-bit-for-fb_base.patch
index bafcb64..c23c17a 100644
--- a/SOURCES/0181-efi-uga-use-64-bit-for-fb_base.patch
+++ b/SOURCES/0181-efi-uga-use-64-bit-for-fb_base.patch
@@ -12,7 +12,7 @@ Closes: 50931
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/grub-core/video/efi_uga.c b/grub-core/video/efi_uga.c
-index 044af1d20d3..97a607c01a5 100644
+index 044af1d20..97a607c01 100644
--- a/grub-core/video/efi_uga.c
+++ b/grub-core/video/efi_uga.c
@@ -34,7 +34,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
diff --git a/SOURCES/0182-EFI-console-Do-not-set-text-mode-until-we-actually-n.patch b/SOURCES/0182-EFI-console-Do-not-set-text-mode-until-we-actually-n.patch
index 20aadf6..c3413a2 100644
--- a/SOURCES/0182-EFI-console-Do-not-set-text-mode-until-we-actually-n.patch
+++ b/SOURCES/0182-EFI-console-Do-not-set-text-mode-until-we-actually-n.patch
@@ -12,7 +12,7 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
1 file changed, 44 insertions(+), 21 deletions(-)
diff --git a/grub-core/term/efi/console.c b/grub-core/term/efi/console.c
-index 4840cc59d3f..051633d71e9 100644
+index 4840cc59d..051633d71 100644
--- a/grub-core/term/efi/console.c
+++ b/grub-core/term/efi/console.c
@@ -24,6 +24,11 @@
diff --git a/SOURCES/0183-EFI-console-Add-grub_console_read_key_stroke-helper-.patch b/SOURCES/0183-EFI-console-Add-grub_console_read_key_stroke-helper-.patch
index 6da36b2..afb9672 100644
--- a/SOURCES/0183-EFI-console-Add-grub_console_read_key_stroke-helper-.patch
+++ b/SOURCES/0183-EFI-console-Add-grub_console_read_key_stroke-helper-.patch
@@ -29,7 +29,7 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
1 file changed, 40 insertions(+), 11 deletions(-)
diff --git a/grub-core/term/efi/console.c b/grub-core/term/efi/console.c
-index 051633d71e9..3d36c5c701b 100644
+index 051633d71..3d36c5c70 100644
--- a/grub-core/term/efi/console.c
+++ b/grub-core/term/efi/console.c
@@ -157,27 +157,56 @@ grub_console_getkey_con (struct grub_term_input *term __attribute__ ((unused)))
diff --git a/SOURCES/0184-EFI-console-Implement-getkeystatus-support.patch b/SOURCES/0184-EFI-console-Implement-getkeystatus-support.patch
index 74fa253..c2eeb7f 100644
--- a/SOURCES/0184-EFI-console-Implement-getkeystatus-support.patch
+++ b/SOURCES/0184-EFI-console-Implement-getkeystatus-support.patch
@@ -19,7 +19,7 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
1 file changed, 34 insertions(+)
diff --git a/grub-core/term/efi/console.c b/grub-core/term/efi/console.c
-index 3d36c5c701b..92dd4996bb7 100644
+index 3d36c5c70..92dd4996b 100644
--- a/grub-core/term/efi/console.c
+++ b/grub-core/term/efi/console.c
@@ -223,6 +223,39 @@ grub_console_getkey_ex(struct grub_term_input *term)
diff --git a/SOURCES/0185-Make-grub_getkeystatus-helper-funtion-available-ever.patch b/SOURCES/0185-Make-grub_getkeystatus-helper-funtion-available-ever.patch
index 9840a55..0435993 100644
--- a/SOURCES/0185-Make-grub_getkeystatus-helper-funtion-available-ever.patch
+++ b/SOURCES/0185-Make-grub_getkeystatus-helper-funtion-available-ever.patch
@@ -16,7 +16,7 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
3 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/grub-core/commands/keystatus.c b/grub-core/commands/keystatus.c
-index 460cf4e7e50..ff3f5878163 100644
+index 460cf4e7e..ff3f58781 100644
--- a/grub-core/commands/keystatus.c
+++ b/grub-core/commands/keystatus.c
@@ -35,24 +35,6 @@ static const struct grub_arg_option options[] =
@@ -45,7 +45,7 @@ index 460cf4e7e50..ff3f5878163 100644
grub_cmd_keystatus (grub_extcmd_context_t ctxt,
int argc __attribute__ ((unused)),
diff --git a/grub-core/kern/term.c b/grub-core/kern/term.c
-index 07720ee6746..93bd3378d18 100644
+index 07720ee67..93bd3378d 100644
--- a/grub-core/kern/term.c
+++ b/grub-core/kern/term.c
@@ -120,6 +120,24 @@ grub_getkey (void)
@@ -74,7 +74,7 @@ index 07720ee6746..93bd3378d18 100644
grub_refresh (void)
{
diff --git a/include/grub/term.h b/include/grub/term.h
-index 8117e2a24da..c215133383f 100644
+index 8117e2a24..c21513338 100644
--- a/include/grub/term.h
+++ b/include/grub/term.h
@@ -327,6 +327,7 @@ grub_term_unregister_output (grub_term_output_t term)
diff --git a/SOURCES/0186-Accept-ESC-F8-and-holding-SHIFT-as-user-interrupt-ke.patch b/SOURCES/0186-Accept-ESC-F8-and-holding-SHIFT-as-user-interrupt-ke.patch
index 2945fd6..46e1639 100644
--- a/SOURCES/0186-Accept-ESC-F8-and-holding-SHIFT-as-user-interrupt-ke.patch
+++ b/SOURCES/0186-Accept-ESC-F8-and-holding-SHIFT-as-user-interrupt-ke.patch
@@ -28,7 +28,7 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
4 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/grub-core/commands/sleep.c b/grub-core/commands/sleep.c
-index e77e7900fac..a1370b710c9 100644
+index e77e7900f..a1370b710 100644
--- a/grub-core/commands/sleep.c
+++ b/grub-core/commands/sleep.c
@@ -55,7 +55,7 @@ grub_interruptible_millisleep (grub_uint32_t ms)
@@ -41,7 +41,7 @@ index e77e7900fac..a1370b710c9 100644
return 0;
diff --git a/grub-core/kern/term.c b/grub-core/kern/term.c
-index 93bd3378d18..6cae4c23e7a 100644
+index 93bd3378d..6cae4c23e 100644
--- a/grub-core/kern/term.c
+++ b/grub-core/kern/term.c
@@ -138,6 +138,22 @@ grub_getkeystatus (void)
@@ -68,7 +68,7 @@ index 93bd3378d18..6cae4c23e7a 100644
grub_refresh (void)
{
diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
-index 5e2f5283d3d..6cb2a071490 100644
+index 5e2f5283d..6cb2a0714 100644
--- a/grub-core/normal/menu.c
+++ b/grub-core/normal/menu.c
@@ -655,7 +655,7 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
@@ -81,7 +81,7 @@ index 5e2f5283d3d..6cb2a071490 100644
timeout = -1;
break;
diff --git a/include/grub/term.h b/include/grub/term.h
-index c215133383f..2b079c29b80 100644
+index c21513338..2b079c29b 100644
--- a/include/grub/term.h
+++ b/include/grub/term.h
@@ -328,6 +328,7 @@ void grub_putcode (grub_uint32_t code, struct grub_term_output *term);
diff --git a/SOURCES/0187-grub-editenv-Add-incr-command-to-increment-integer-v.patch b/SOURCES/0187-grub-editenv-Add-incr-command-to-increment-integer-v.patch
index d836274..13c9796 100644
--- a/SOURCES/0187-grub-editenv-Add-incr-command-to-increment-integer-v.patch
+++ b/SOURCES/0187-grub-editenv-Add-incr-command-to-increment-integer-v.patch
@@ -17,7 +17,7 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
1 file changed, 50 insertions(+)
diff --git a/util/grub-editenv.c b/util/grub-editenv.c
-index 118e89fe57f..2918bb71cfe 100644
+index 118e89fe5..2918bb71c 100644
--- a/util/grub-editenv.c
+++ b/util/grub-editenv.c
@@ -53,6 +53,9 @@ static struct argp_option options[] = {
diff --git a/SOURCES/0188-Add-auto-hide-menu-support.patch b/SOURCES/0188-Add-auto-hide-menu-support.patch
index efbc9eb..444fd8e 100644
--- a/SOURCES/0188-Add-auto-hide-menu-support.patch
+++ b/SOURCES/0188-Add-auto-hide-menu-support.patch
@@ -49,7 +49,7 @@ Changes in v2:
create mode 100644 util/grub.d/00_menu_auto_hide.in
diff --git a/Makefile.util.def b/Makefile.util.def
-index cbd661d6348..0fdfdd91fb0 100644
+index cbd661d63..0fdfdd91f 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -448,6 +448,12 @@ script = {
@@ -67,7 +67,7 @@ index cbd661d6348..0fdfdd91fb0 100644
common = util/grub.d/01_users.in;
diff --git a/util/grub.d/00_menu_auto_hide.in b/util/grub.d/00_menu_auto_hide.in
new file mode 100644
-index 00000000000..a10fe45bb2c
+index 000000000..a10fe45bb
--- /dev/null
+++ b/util/grub.d/00_menu_auto_hide.in
@@ -0,0 +1,50 @@
@@ -122,7 +122,7 @@ index 00000000000..a10fe45bb2c
+fi
+EOF
diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
-index 13a3a6bc752..ab634393a31 100644
+index 13a3a6bc7..ab634393a 100644
--- a/util/grub.d/30_os-prober.in
+++ b/util/grub.d/30_os-prober.in
@@ -42,6 +42,7 @@ if [ -z "${OSPROBED}" ] ; then
diff --git a/SOURCES/0189-Output-a-menu-entry-for-firmware-setup-on-UEFI-FastB.patch b/SOURCES/0189-Output-a-menu-entry-for-firmware-setup-on-UEFI-FastB.patch
index 4daefdb..d361d99 100644
--- a/SOURCES/0189-Output-a-menu-entry-for-firmware-setup-on-UEFI-FastB.patch
+++ b/SOURCES/0189-Output-a-menu-entry-for-firmware-setup-on-UEFI-FastB.patch
@@ -23,7 +23,7 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
create mode 100644 util/grub.d/30_uefi-firmware.in
diff --git a/Makefile.util.def b/Makefile.util.def
-index 0fdfdd91fb0..5a8c390a1da 100644
+index 0fdfdd91f..5a8c390a1 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -529,6 +529,12 @@ script = {
@@ -41,7 +41,7 @@ index 0fdfdd91fb0..5a8c390a1da 100644
common = util/grub.d/40_custom.in;
diff --git a/util/grub.d/30_uefi-firmware.in b/util/grub.d/30_uefi-firmware.in
new file mode 100644
-index 00000000000..3c9f533d8c6
+index 000000000..3c9f533d8
--- /dev/null
+++ b/util/grub.d/30_uefi-firmware.in
@@ -0,0 +1,46 @@
diff --git a/SOURCES/0190-Add-grub-set-bootflag-utility.patch b/SOURCES/0190-Add-grub-set-bootflag-utility.patch
index 9adc1c0..69bdcc8 100644
--- a/SOURCES/0190-Add-grub-set-bootflag-utility.patch
+++ b/SOURCES/0190-Add-grub-set-bootflag-utility.patch
@@ -8,47 +8,48 @@ to set known bootflags in the grubenv: boot_success or menu_show_once.
grub-set-bootflag is different from grub-editenv in 2 ways:
-1) It is intended to be executed by regular users through pkexec, so
-running as root if the polkit policy allows this. As such it is written
-to not use any existing grubenv related code for easy auditing.
+1) It is intended to be executed by regular users so must be installed
+as suid root. As such it is written to not use any existing grubenv
+related code for easy auditing.
+
+It can't be executed through pkexec because we want to call it under gdm
+and pkexec does not work under gdm due the gdm user having /sbin/nologin
+as shell.
2) Since it can be executed by regular users it only allows setting
(assigning a value of 1 to) bootflags which it knows about. Currently
those are just boot_success and menu_show_once.
-This commit also adds a couple of example systemd and polkit files which
-show how this can be used to set boot_success from a user-session:
+This commit also adds a couple of example systemd and files which show
+how this can be used to set boot_success from a user-session:
docs/grub-boot-success.service
docs/grub-boot-success.timer
-docs/org.gnu.grub.policy
The 2 grub-boot-success.systemd files should be placed in /lib/systemd/user
and a symlink to grub-boot-success.timer should be added to
/lib/systemd/user/timers.target.wants.
-The org.gnu.grub.policy polkit file should be placed in
-/usr/share/polkit-1/actions.
-
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+[makhomed: grub-boot-success.timer: Only run if not in a container]
+Signed-off-by: Gena Makhomed <makhomed@gmail.com>
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
+(cherry-picked from commit 555625062cbb10388bb706620e2d8839644fc015)
---
Makefile.util.def | 7 ++
- util/grub-set-bootflag.c | 158 +++++++++++++++++++++++++++++++++++++++++
- .gitignore | 2 +
+ util/grub-set-bootflag.c | 160 +++++++++++++++++++++++++++++++++++++++++
conf/Makefile.extra-dist | 3 +
docs/grub-boot-success.service | 6 ++
- docs/grub-boot-success.timer | 5 ++
- docs/org.gnu.grub.policy | 20 ++++++
+ docs/grub-boot-success.timer | 7 ++
util/grub-set-bootflag.1 | 20 ++++++
- 8 files changed, 221 insertions(+)
+ 6 files changed, 203 insertions(+)
create mode 100644 util/grub-set-bootflag.c
create mode 100644 docs/grub-boot-success.service
create mode 100644 docs/grub-boot-success.timer
- create mode 100644 docs/org.gnu.grub.policy
create mode 100644 util/grub-set-bootflag.1
diff --git a/Makefile.util.def b/Makefile.util.def
-index 5a8c390a1da..5da55393291 100644
+index 5a8c390a1..5da553932 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -1435,3 +1435,10 @@ program = {
@@ -64,10 +65,10 @@ index 5a8c390a1da..5da55393291 100644
+};
diff --git a/util/grub-set-bootflag.c b/util/grub-set-bootflag.c
new file mode 100644
-index 00000000000..f8dc310909a
+index 000000000..bb198f023
--- /dev/null
+++ b/util/grub-set-bootflag.c
-@@ -0,0 +1,158 @@
+@@ -0,0 +1,160 @@
+/* grub-set-bootflag.c - tool to set boot-flags in the grubenv. */
+/*
+ * GRUB -- GRand Unified Bootloader
@@ -96,6 +97,7 @@ index 00000000000..f8dc310909a
+#include <config-util.h> /* For *_DIR_NAME defines */
+#include <grub/types.h>
+#include <grub/lib/envblk.h> /* For GRUB_ENVBLK_DEFCFG define */
++#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
@@ -156,6 +158,7 @@ index 00000000000..f8dc310909a
+ fclose (f);
+ if (ret != GRUBENV_SIZE)
+ {
++ errno = EINVAL;
+ perror ("Error reading from " GRUBENV);
+ return 1;
+ }
@@ -226,21 +229,8 @@ index 00000000000..f8dc310909a
+
+ return 0;
+}
-diff --git a/.gitignore b/.gitignore
-index 42475592123..6c4cfc53781 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -111,6 +111,8 @@ grub-*.tar.*
- /grub*-rpm-sort.8
- /grub*-script-check
- /grub*-script-check.1
-+/grub*-set-bootflag
-+/grub*-set-bootflag.1
- /grub*-set-default
- /grub*-set-default.8
- /grub*-setsetpassword
diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
-index 39eb94bded6..5946ec24a65 100644
+index 39eb94bde..5946ec24a 100644
--- a/conf/Makefile.extra-dist
+++ b/conf/Makefile.extra-dist
@@ -14,6 +14,9 @@ EXTRA_DIST += util/import_unicode.py
@@ -255,7 +245,7 @@ index 39eb94bded6..5946ec24a65 100644
diff --git a/docs/grub-boot-success.service b/docs/grub-boot-success.service
new file mode 100644
-index 00000000000..c8c91c34d49
+index 000000000..80e79584c
--- /dev/null
+++ b/docs/grub-boot-success.service
@@ -0,0 +1,6 @@
@@ -264,47 +254,23 @@ index 00000000000..c8c91c34d49
+
+[Service]
+Type=oneshot
-+ExecStart=/usr/bin/pkexec /usr/sbin/grub2-set-bootflag boot_success
++ExecStart=/usr/sbin/grub2-set-bootflag boot_success
diff --git a/docs/grub-boot-success.timer b/docs/grub-boot-success.timer
new file mode 100644
-index 00000000000..221b532781b
+index 000000000..406f17200
--- /dev/null
+++ b/docs/grub-boot-success.timer
-@@ -0,0 +1,5 @@
+@@ -0,0 +1,7 @@
+[Unit]
+Description=Mark boot as successful after the user session has run 2 minutes
++ConditionUser=!@system
++ConditionVirtualization=!container
+
+[Timer]
+OnActiveSec=2min
-diff --git a/docs/org.gnu.grub.policy b/docs/org.gnu.grub.policy
-new file mode 100644
-index 00000000000..18391efc8e7
---- /dev/null
-+++ b/docs/org.gnu.grub.policy
-@@ -0,0 +1,20 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
-+<policyconfig>
-+ <vendor>GNU GRUB</vendor>
-+ <vendor_url>https://www.gnu.org/software/grub/</vendor_url>
-+ <action id="org.gnu.grub.set-bootflag">
-+ <!-- SECURITY:
-+ - A normal active user on the local machine does not need permission
-+ to set bootflags to show the menu / mark current boot successful.
-+ -->
-+ <description>Set GRUB bootflags</description>
-+ <message>Authentication is required to modify the bootloaders bootflags</message>
-+ <defaults>
-+ <allow_any>no</allow_any>
-+ <allow_inactive>no</allow_inactive>
-+ <allow_active>yes</allow_active>
-+ </defaults>
-+ <annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/grub2-set-bootflag</annotate>
-+ </action>
-+</policyconfig>
diff --git a/util/grub-set-bootflag.1 b/util/grub-set-bootflag.1
new file mode 100644
-index 00000000000..57801da22a0
+index 000000000..57801da22
--- /dev/null
+++ b/util/grub-set-bootflag.1
@@ -0,0 +1,20 @@
diff --git a/SOURCES/0191-Fix-grub-setpassword-o-s-output-path.patch b/SOURCES/0191-Fix-grub-setpassword-o-s-output-path.patch
index f26da57..6ead2b9 100644
--- a/SOURCES/0191-Fix-grub-setpassword-o-s-output-path.patch
+++ b/SOURCES/0191-Fix-grub-setpassword-o-s-output-path.patch
@@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/util/grub-setpassword.in b/util/grub-setpassword.in
-index cf70257eed6..5ebf50576d6 100644
+index cf70257ee..5ebf50576 100644
--- a/util/grub-setpassword.in
+++ b/util/grub-setpassword.in
@@ -118,11 +118,11 @@ fi
diff --git a/SOURCES/0192-Make-grub-set-password-be-named-like-all-the-other-g.patch b/SOURCES/0192-Make-grub-set-password-be-named-like-all-the-other-g.patch
index 678b3ad..2bdd29e 100644
--- a/SOURCES/0192-Make-grub-set-password-be-named-like-all-the-other-g.patch
+++ b/SOURCES/0192-Make-grub-set-password-be-named-like-all-the-other-g.patch
@@ -16,7 +16,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
rename util/{grub-setpassword.in => grub-set-password.in} (100%)
diff --git a/configure.ac b/configure.ac
-index 359cac3c26b..5f47a9265f3 100644
+index 359cac3c2..5f47a9265 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,7 +66,7 @@ grub_TRANSFORM([grub-mkrelpath])
@@ -29,7 +29,7 @@ index 359cac3c26b..5f47a9265f3 100644
grub_TRANSFORM([grub-script-check])
grub_TRANSFORM([grub-set-default])
diff --git a/Makefile.util.def b/Makefile.util.def
-index 5da55393291..97cd8bdebd9 100644
+index 5da553932..97cd8bdeb 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -756,8 +756,8 @@ script = {
@@ -44,11 +44,11 @@ index 5da55393291..97cd8bdebd9 100644
installdir = sbin;
};
diff --git a/.gitignore b/.gitignore
-index 6c4cfc53781..a999024652e 100644
+index 424755921..7aaae594d 100644
--- a/.gitignore
+++ b/.gitignore
-@@ -115,8 +115,8 @@ grub-*.tar.*
- /grub*-set-bootflag.1
+@@ -113,8 +113,8 @@ grub-*.tar.*
+ /grub*-script-check.1
/grub*-set-default
/grub*-set-default.8
-/grub*-setsetpassword
@@ -62,7 +62,7 @@ diff --git a/util/grub-setpassword.8 b/util/grub-set-password.8
similarity index 50%
rename from util/grub-setpassword.8
rename to util/grub-set-password.8
-index dc91dd6697b..9646546e43d 100644
+index dc91dd669..9646546e4 100644
--- a/util/grub-setpassword.8
+++ b/util/grub-set-password.8
@@ -1,12 +1,12 @@
diff --git a/SOURCES/0193-docs-Add-grub-boot-indeterminate.service-example.patch b/SOURCES/0193-docs-Add-grub-boot-indeterminate.service-example.patch
index 44f6ad3..5b8732a 100644
--- a/SOURCES/0193-docs-Add-grub-boot-indeterminate.service-example.patch
+++ b/SOURCES/0193-docs-Add-grub-boot-indeterminate.service-example.patch
@@ -16,7 +16,7 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
diff --git a/docs/grub-boot-indeterminate.service b/docs/grub-boot-indeterminate.service
new file mode 100644
-index 00000000000..6c8dcb186b6
+index 000000000..6c8dcb186
--- /dev/null
+++ b/docs/grub-boot-indeterminate.service
@@ -0,0 +1,11 @@
diff --git a/SOURCES/0194-00_menu_auto_hide-Use-a-timeout-of-60s-for-menu_show.patch b/SOURCES/0194-00_menu_auto_hide-Use-a-timeout-of-60s-for-menu_show.patch
index 367fc6c..b4c736d 100644
--- a/SOURCES/0194-00_menu_auto_hide-Use-a-timeout-of-60s-for-menu_show.patch
+++ b/SOURCES/0194-00_menu_auto_hide-Use-a-timeout-of-60s-for-menu_show.patch
@@ -17,7 +17,7 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/util/grub.d/00_menu_auto_hide.in b/util/grub.d/00_menu_auto_hide.in
-index a10fe45bb2c..ca95c0d1c9f 100644
+index a10fe45bb..ca95c0d1c 100644
--- a/util/grub.d/00_menu_auto_hide.in
+++ b/util/grub.d/00_menu_auto_hide.in
@@ -33,7 +33,7 @@ if [ x\$feature_timeout_style = xy ] ; then
diff --git a/SOURCES/0195-00_menu_auto_hide-Reduce-number-of-save_env-calls.patch b/SOURCES/0195-00_menu_auto_hide-Reduce-number-of-save_env-calls.patch
index 6993508..0f1cfba 100644
--- a/SOURCES/0195-00_menu_auto_hide-Reduce-number-of-save_env-calls.patch
+++ b/SOURCES/0195-00_menu_auto_hide-Reduce-number-of-save_env-calls.patch
@@ -20,7 +20,7 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/util/grub.d/00_menu_auto_hide.in b/util/grub.d/00_menu_auto_hide.in
-index ca95c0d1c9f..ad175870a54 100644
+index ca95c0d1c..ad175870a 100644
--- a/util/grub.d/00_menu_auto_hide.in
+++ b/util/grub.d/00_menu_auto_hide.in
@@ -19,14 +19,12 @@ fi
diff --git a/SOURCES/0196-30_uefi-firmware-fix-use-with-sys-firmware-efi-efiva.patch b/SOURCES/0196-30_uefi-firmware-fix-use-with-sys-firmware-efi-efiva.patch
index e713d69..c3d572a 100644
--- a/SOURCES/0196-30_uefi-firmware-fix-use-with-sys-firmware-efi-efiva.patch
+++ b/SOURCES/0196-30_uefi-firmware-fix-use-with-sys-firmware-efi-efiva.patch
@@ -15,7 +15,7 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/util/grub.d/30_uefi-firmware.in b/util/grub.d/30_uefi-firmware.in
-index 3c9f533d8c6..93ececffea7 100644
+index 3c9f533d8..93ececffe 100644
--- a/util/grub.d/30_uefi-firmware.in
+++ b/util/grub.d/30_uefi-firmware.in
@@ -26,12 +26,12 @@ export TEXTDOMAINDIR="@localedir@"
diff --git a/SOURCES/0197-gentpl-add-disable-support.patch b/SOURCES/0197-gentpl-add-disable-support.patch
index d82d633..3067d0a 100644
--- a/SOURCES/0197-gentpl-add-disable-support.patch
+++ b/SOURCES/0197-gentpl-add-disable-support.patch
@@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/gentpl.py b/gentpl.py
-index bf8439fa743..a8cd540550f 100644
+index bf8439fa7..a8cd54055 100644
--- a/gentpl.py
+++ b/gentpl.py
@@ -589,11 +589,21 @@ def platform_conditional(platform, closure):
diff --git a/SOURCES/0198-gentpl-add-pc-firmware-type.patch b/SOURCES/0198-gentpl-add-pc-firmware-type.patch
index 94737b3..732107e 100644
--- a/SOURCES/0198-gentpl-add-pc-firmware-type.patch
+++ b/SOURCES/0198-gentpl-add-pc-firmware-type.patch
@@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 1 insertion(+)
diff --git a/gentpl.py b/gentpl.py
-index a8cd540550f..baac6a2af69 100644
+index a8cd54055..baac6a2af 100644
--- a/gentpl.py
+++ b/gentpl.py
@@ -49,6 +49,7 @@ GROUPS["arm"] = [ "arm_uboot", "arm_efi", "arm_coreboot" ]
diff --git a/SOURCES/0199-blscfg-remove-unused-typedef.patch b/SOURCES/0199-blscfg-remove-unused-typedef.patch
index 819a144..2fb376c 100644
--- a/SOURCES/0199-blscfg-remove-unused-typedef.patch
+++ b/SOURCES/0199-blscfg-remove-unused-typedef.patch
@@ -15,7 +15,7 @@ Signed-off-by: Will Thompson <wjt@endlessm.com>
1 file changed, 2 deletions(-)
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
-index cd8659384e4..82fb6cdd182 100644
+index cd8659384..82fb6cdd1 100644
--- a/grub-core/commands/blscfg.c
+++ b/grub-core/commands/blscfg.c
@@ -327,8 +327,6 @@ finish:
diff --git a/SOURCES/0200-blscfg-don-t-dynamically-allocate-default_blsdir.patch b/SOURCES/0200-blscfg-don-t-dynamically-allocate-default_blsdir.patch
index ab076ec..b3c5fab 100644
--- a/SOURCES/0200-blscfg-don-t-dynamically-allocate-default_blsdir.patch
+++ b/SOURCES/0200-blscfg-don-t-dynamically-allocate-default_blsdir.patch
@@ -9,7 +9,7 @@ Signed-off-by: Will Thompson <wjt@endlessm.com>
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
-index 82fb6cdd182..b61dddb7f43 100644
+index 82fb6cdd1..b61dddb7f 100644
--- a/grub-core/commands/blscfg.c
+++ b/grub-core/commands/blscfg.c
@@ -623,7 +623,7 @@ static int find_entry (const char *filename,
diff --git a/SOURCES/0201-blscfg-sort-BLS-entries-by-version-field.patch b/SOURCES/0201-blscfg-sort-BLS-entries-by-version-field.patch
index 0ee94af..0d3cbc2 100644
--- a/SOURCES/0201-blscfg-sort-BLS-entries-by-version-field.patch
+++ b/SOURCES/0201-blscfg-sort-BLS-entries-by-version-field.patch
@@ -26,7 +26,7 @@ Signed-off-by: Will Thompson <wjt@endlessm.com>
1 file changed, 16 insertions(+)
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
-index b61dddb7f43..9c928dda470 100644
+index b61dddb7f..9c928dda4 100644
--- a/grub-core/commands/blscfg.c
+++ b/grub-core/commands/blscfg.c
@@ -327,10 +327,26 @@ finish:
diff --git a/SOURCES/0202-blscfg-remove-NULL-guards-around-grub_free.patch b/SOURCES/0202-blscfg-remove-NULL-guards-around-grub_free.patch
index add1766..706043a 100644
--- a/SOURCES/0202-blscfg-remove-NULL-guards-around-grub_free.patch
+++ b/SOURCES/0202-blscfg-remove-NULL-guards-around-grub_free.patch
@@ -13,7 +13,7 @@ Signed-off-by: Will Thompson <wjt@endlessm.com>
1 file changed, 6 insertions(+), 17 deletions(-)
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
-index 9c928dda470..bd78559ef68 100644
+index 9c928dda4..bd78559ef 100644
--- a/grub-core/commands/blscfg.c
+++ b/grub-core/commands/blscfg.c
@@ -600,23 +600,12 @@ static void create_entry (struct bls_entry *entry, const char *cfgfile)
diff --git a/SOURCES/0203-blscfg-fix-filename-in-no-linux-key-error.patch b/SOURCES/0203-blscfg-fix-filename-in-no-linux-key-error.patch
index 37795f6..89b399d 100644
--- a/SOURCES/0203-blscfg-fix-filename-in-no-linux-key-error.patch
+++ b/SOURCES/0203-blscfg-fix-filename-in-no-linux-key-error.patch
@@ -15,7 +15,7 @@ Signed-off-by: Will Thompson <wjt@endlessm.com>
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
-index bd78559ef68..a45f40fe67e 100644
+index bd78559ef..a45f40fe6 100644
--- a/grub-core/commands/blscfg.c
+++ b/grub-core/commands/blscfg.c
@@ -514,7 +514,7 @@ static char **bls_make_list (struct bls_entry *entry, const char *key, int *num)
diff --git a/SOURCES/0204-blscfg-don-t-leak-bls_entry.filename.patch b/SOURCES/0204-blscfg-don-t-leak-bls_entry.filename.patch
index 5080e2e..e4a51b3 100644
--- a/SOURCES/0204-blscfg-don-t-leak-bls_entry.filename.patch
+++ b/SOURCES/0204-blscfg-don-t-leak-bls_entry.filename.patch
@@ -12,7 +12,7 @@ Signed-off-by: Will Thompson <wjt@endlessm.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
-index a45f40fe67e..11a356de81a 100644
+index a45f40fe6..11a356de8 100644
--- a/grub-core/commands/blscfg.c
+++ b/grub-core/commands/blscfg.c
@@ -166,8 +166,8 @@ static void bls_free_entry(struct bls_entry *entry)
diff --git a/SOURCES/0205-blscfg-fix-compilation-on-EFI-and-EMU.patch b/SOURCES/0205-blscfg-fix-compilation-on-EFI-and-EMU.patch
index 04aadc3..c884488 100644
--- a/SOURCES/0205-blscfg-fix-compilation-on-EFI-and-EMU.patch
+++ b/SOURCES/0205-blscfg-fix-compilation-on-EFI-and-EMU.patch
@@ -20,7 +20,7 @@ Signed-off-by: Will Thompson <wjt@endlessm.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
-index 11a356de81a..53676576ba5 100644
+index 11a356de8..53676576b 100644
--- a/grub-core/commands/blscfg.c
+++ b/grub-core/commands/blscfg.c
@@ -843,7 +843,7 @@ grub_cmd_blscfg (grub_extcmd_context_t ctxt UNUSED,
diff --git a/SOURCES/0206-Add-loadenv-to-blscfg-and-loadenv-source-file-list.patch b/SOURCES/0206-Add-loadenv-to-blscfg-and-loadenv-source-file-list.patch
index 76df19c..1e11177 100644
--- a/SOURCES/0206-Add-loadenv-to-blscfg-and-loadenv-source-file-list.patch
+++ b/SOURCES/0206-Add-loadenv-to-blscfg-and-loadenv-source-file-list.patch
@@ -18,7 +18,7 @@ Signed-off-by: Will Thompson <wjt@endlessm.com>
1 file changed, 2 insertions(+)
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 2851437e098..aa44d66aca4 100644
+index 2851437e0..aa44d66ac 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -781,6 +781,7 @@ module = {
diff --git a/SOURCES/0207-blscfg-Get-rid-of-the-linuxefi-linux16-linux-distinc.patch b/SOURCES/0207-blscfg-Get-rid-of-the-linuxefi-linux16-linux-distinc.patch
index df63ac6..c97dee2 100644
--- a/SOURCES/0207-blscfg-Get-rid-of-the-linuxefi-linux16-linux-distinc.patch
+++ b/SOURCES/0207-blscfg-Get-rid-of-the-linuxefi-linux16-linux-distinc.patch
@@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
-index 53676576ba5..c6addc4dc12 100644
+index 53676576b..c6addc4dc 100644
--- a/grub-core/commands/blscfg.c
+++ b/grub-core/commands/blscfg.c
@@ -43,14 +43,6 @@ GRUB_MOD_LICENSE ("GPLv3+");
diff --git a/SOURCES/0208-grub-switch-to-blscfg-Only-fix-boot-prefix-for-non-g.patch b/SOURCES/0208-grub-switch-to-blscfg-Only-fix-boot-prefix-for-non-g.patch
index 9b996bc..17846c9 100644
--- a/SOURCES/0208-grub-switch-to-blscfg-Only-fix-boot-prefix-for-non-g.patch
+++ b/SOURCES/0208-grub-switch-to-blscfg-Only-fix-boot-prefix-for-non-g.patch
@@ -20,7 +20,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/util/grub-switch-to-blscfg.in b/util/grub-switch-to-blscfg.in
-index 40612e00686..9cf64f8e725 100644
+index 40612e006..9cf64f8e7 100644
--- a/util/grub-switch-to-blscfg.in
+++ b/util/grub-switch-to-blscfg.in
@@ -236,6 +236,10 @@ for kernelver in $(cd /lib/modules/ ; ls -1) "" ; do
diff --git a/SOURCES/0209-blscfg-Expand-the-BLS-options-field-instead-of-showi.patch b/SOURCES/0209-blscfg-Expand-the-BLS-options-field-instead-of-showi.patch
index 3dca942..e4841b8 100644
--- a/SOURCES/0209-blscfg-Expand-the-BLS-options-field-instead-of-showi.patch
+++ b/SOURCES/0209-blscfg-Expand-the-BLS-options-field-instead-of-showi.patch
@@ -28,7 +28,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 68 insertions(+), 1 deletion(-)
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
-index c6addc4dc12..80d8814fc3f 100644
+index c6addc4dc..80d8814fc 100644
--- a/grub-core/commands/blscfg.c
+++ b/grub-core/commands/blscfg.c
@@ -32,6 +32,8 @@
diff --git a/SOURCES/0210-blscfg-Fallback-to-search-BLS-snippets-in-boot-loade.patch b/SOURCES/0210-blscfg-Fallback-to-search-BLS-snippets-in-boot-loade.patch
index d04928f..84b67c7 100644
--- a/SOURCES/0210-blscfg-Fallback-to-search-BLS-snippets-in-boot-loade.patch
+++ b/SOURCES/0210-blscfg-Fallback-to-search-BLS-snippets-in-boot-loade.patch
@@ -20,7 +20,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
-index 80d8814fc3f..321c93069f2 100644
+index 80d8814fc..321c93069 100644
--- a/grub-core/commands/blscfg.c
+++ b/grub-core/commands/blscfg.c
@@ -692,6 +692,7 @@ static int find_entry (const char *filename,
diff --git a/SOURCES/0211-blscfg-Don-t-attempt-to-sort-by-version-if-not-prese.patch b/SOURCES/0211-blscfg-Don-t-attempt-to-sort-by-version-if-not-prese.patch
index 60b609d..0034275 100644
--- a/SOURCES/0211-blscfg-Don-t-attempt-to-sort-by-version-if-not-prese.patch
+++ b/SOURCES/0211-blscfg-Don-t-attempt-to-sort-by-version-if-not-prese.patch
@@ -22,7 +22,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 16 insertions(+), 11 deletions(-)
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
-index 321c93069f2..69bfb5db295 100644
+index 321c93069..69bfb5db2 100644
--- a/grub-core/commands/blscfg.c
+++ b/grub-core/commands/blscfg.c
@@ -324,23 +324,21 @@ finish:
diff --git a/SOURCES/0212-blscfg-remove-logic-to-read-the-grubenv-file-and-set.patch b/SOURCES/0212-blscfg-remove-logic-to-read-the-grubenv-file-and-set.patch
index f32b620..1ac611b 100644
--- a/SOURCES/0212-blscfg-remove-logic-to-read-the-grubenv-file-and-set.patch
+++ b/SOURCES/0212-blscfg-remove-logic-to-read-the-grubenv-file-and-set.patch
@@ -25,7 +25,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 16 insertions(+), 163 deletions(-)
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
-index 69bfb5db295..bdb1c5a95aa 100644
+index 69bfb5db2..bdb1c5a95 100644
--- a/grub-core/commands/blscfg.c
+++ b/grub-core/commands/blscfg.c
@@ -45,13 +45,6 @@ GRUB_MOD_LICENSE ("GPLv3+");
diff --git a/SOURCES/0213-Rename-00_menu_auto_hide.in-to-01_menu_auto_hide.in.patch b/SOURCES/0213-Rename-00_menu_auto_hide.in-to-01_menu_auto_hide.in.patch
index 14cc004..0e74b5e 100644
--- a/SOURCES/0213-Rename-00_menu_auto_hide.in-to-01_menu_auto_hide.in.patch
+++ b/SOURCES/0213-Rename-00_menu_auto_hide.in-to-01_menu_auto_hide.in.patch
@@ -13,7 +13,7 @@ boot_success = 0, which will be used by the boot counting script
rename util/grub.d/{00_menu_auto_hide.in => 01_menu_auto_hide.in} (100%)
diff --git a/Makefile.util.def b/Makefile.util.def
-index 97cd8bdebd9..cba4d500198 100644
+index 97cd8bdeb..cba4d5001 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -449,8 +449,8 @@ script = {
diff --git a/SOURCES/0214-efinet-also-use-the-firmware-acceleration-for-http.patch b/SOURCES/0214-efinet-also-use-the-firmware-acceleration-for-http.patch
index 5771c8a..350d261 100644
--- a/SOURCES/0214-efinet-also-use-the-firmware-acceleration-for-http.patch
+++ b/SOURCES/0214-efinet-also-use-the-firmware-acceleration-for-http.patch
@@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/grub-core/net/efi/net.c b/grub-core/net/efi/net.c
-index 2bf15447fd5..f208d1b180c 100644
+index 2bf15447f..f208d1b18 100644
--- a/grub-core/net/efi/net.c
+++ b/grub-core/net/efi/net.c
@@ -1324,7 +1324,9 @@ grub_efi_net_boot_from_https (void)
diff --git a/SOURCES/0215-efi-http-Make-root_url-reflect-the-protocol-hostname.patch b/SOURCES/0215-efi-http-Make-root_url-reflect-the-protocol-hostname.patch
index 985a037..1af9ba0 100644
--- a/SOURCES/0215-efi-http-Make-root_url-reflect-the-protocol-hostname.patch
+++ b/SOURCES/0215-efi-http-Make-root_url-reflect-the-protocol-hostname.patch
@@ -12,7 +12,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 19 insertions(+)
diff --git a/grub-core/net/efi/http.c b/grub-core/net/efi/http.c
-index 3f61fd2fa5b..243acbaa35b 100644
+index 3f61fd2fa..243acbaa3 100644
--- a/grub-core/net/efi/http.c
+++ b/grub-core/net/efi/http.c
@@ -4,6 +4,7 @@
diff --git a/SOURCES/0216-Force-everything-to-use-python3.patch b/SOURCES/0216-Force-everything-to-use-python3.patch
index b4b0d74..af56885 100644
--- a/SOURCES/0216-Force-everything-to-use-python3.patch
+++ b/SOURCES/0216-Force-everything-to-use-python3.patch
@@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/conf/Makefile.common b/conf/Makefile.common
-index c75848f5c06..1ecb921db65 100644
+index c75848f5c..1ecb921db 100644
--- a/conf/Makefile.common
+++ b/conf/Makefile.common
@@ -128,11 +128,11 @@ BUILT_SOURCES =
@@ -31,7 +31,7 @@ index c75848f5c06..1ecb921db65 100644
+ python3 $^ > $@.new || (rm -f $@.new; exit 1)
mv $@.new $@
diff --git a/gentpl.py b/gentpl.py
-index baac6a2af69..6409736e81c 100644
+index baac6a2af..6409736e8 100644
--- a/gentpl.py
+++ b/gentpl.py
@@ -1,4 +1,4 @@
diff --git a/SOURCES/0217-Fix-an-8-year-old-typo.patch b/SOURCES/0217-Fix-an-8-year-old-typo.patch
index 642e46a..e4f3208 100644
--- a/SOURCES/0217-Fix-an-8-year-old-typo.patch
+++ b/SOURCES/0217-Fix-an-8-year-old-typo.patch
@@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index 5f47a9265f3..9ab683fefac 100644
+index 5f47a9265..9ab683fef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -307,7 +307,7 @@ fi
diff --git a/SOURCES/0218-autogen-don-t-run-autoreconf-in-the-topdir.patch b/SOURCES/0218-autogen-don-t-run-autoreconf-in-the-topdir.patch
index e5b7c33..5a7eecc 100644
--- a/SOURCES/0218-autogen-don-t-run-autoreconf-in-the-topdir.patch
+++ b/SOURCES/0218-autogen-don-t-run-autoreconf-in-the-topdir.patch
@@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 2 deletions(-)
diff --git a/autogen.sh b/autogen.sh
-index 7537561ad0d..f608b9467a0 100755
+index 7537561ad..f608b9467 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -82,6 +82,4 @@ done
diff --git a/SOURCES/0219-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch b/SOURCES/0219-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch
index 292e565..fa39361 100644
--- a/SOURCES/0219-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch
+++ b/SOURCES/0219-Make-it-so-we-can-tell-configure-which-cflags-utils-.patch
@@ -17,7 +17,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
3 files changed, 64 insertions(+), 16 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 9ab683fefac..819212095ff 100644
+index 9ab683fef..819212095 100644
--- a/configure.ac
+++ b/configure.ac
@@ -850,11 +850,23 @@ if ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ) && test "x$p
@@ -88,7 +88,7 @@ index 9ab683fefac..819212095ff 100644
GRUB_PLATFORM="${platform}"
diff --git a/conf/Makefile.common b/conf/Makefile.common
-index 1ecb921db65..b93879804c0 100644
+index 1ecb921db..b93879804 100644
--- a/conf/Makefile.common
+++ b/conf/Makefile.common
@@ -40,24 +40,25 @@ CPPFLAGS_KERNEL = $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM) -DGRUB_KERNEL=1
@@ -129,7 +129,7 @@ index 1ecb921db65..b93879804c0 100644
# Other variables
diff --git a/gentpl.py b/gentpl.py
-index 6409736e81c..1e4635f4426 100644
+index 6409736e8..1e4635f44 100644
--- a/gentpl.py
+++ b/gentpl.py
@@ -694,10 +694,10 @@ def module(defn, platform):
diff --git a/SOURCES/0220-module-verifier-make-it-possible-to-run-checkers-on-.patch b/SOURCES/0220-module-verifier-make-it-possible-to-run-checkers-on-.patch
index 0bdfca1..f509b96 100644
--- a/SOURCES/0220-module-verifier-make-it-possible-to-run-checkers-on-.patch
+++ b/SOURCES/0220-module-verifier-make-it-possible-to-run-checkers-on-.patch
@@ -22,7 +22,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
3 files changed, 13 insertions(+)
diff --git a/util/grub-module-verifier32.c b/util/grub-module-verifier32.c
-index 257229f8f08..ba7d41aafea 100644
+index 257229f8f..ba7d41aaf 100644
--- a/util/grub-module-verifier32.c
+++ b/util/grub-module-verifier32.c
@@ -1,2 +1,4 @@
@@ -31,7 +31,7 @@ index 257229f8f08..ba7d41aafea 100644
#include "grub-module-verifierXX.c"
+#endif
diff --git a/util/grub-module-verifier64.c b/util/grub-module-verifier64.c
-index 4db6b4bedd1..fc23ef800b3 100644
+index 4db6b4bed..fc23ef800 100644
--- a/util/grub-module-verifier64.c
+++ b/util/grub-module-verifier64.c
@@ -1,2 +1,4 @@
@@ -40,7 +40,7 @@ index 4db6b4bedd1..fc23ef800b3 100644
#include "grub-module-verifierXX.c"
+#endif
diff --git a/util/grub-module-verifierXX.c b/util/grub-module-verifierXX.c
-index 1feaafc9b9e..597ded14362 100644
+index 1feaafc9b..597ded143 100644
--- a/util/grub-module-verifierXX.c
+++ b/util/grub-module-verifierXX.c
@@ -1,3 +1,12 @@
diff --git a/SOURCES/0221-grub-module-verifier-report-the-filename-or-modname-.patch b/SOURCES/0221-grub-module-verifier-report-the-filename-or-modname-.patch
index c27d065..49b5709 100644
--- a/SOURCES/0221-grub-module-verifier-report-the-filename-or-modname-.patch
+++ b/SOURCES/0221-grub-module-verifier-report-the-filename-or-modname-.patch
@@ -15,7 +15,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
3 files changed, 36 insertions(+), 32 deletions(-)
diff --git a/util/grub-module-verifier.c b/util/grub-module-verifier.c
-index a79271f6631..03ba1ab437a 100644
+index a79271f66..03ba1ab43 100644
--- a/util/grub-module-verifier.c
+++ b/util/grub-module-verifier.c
@@ -157,7 +157,7 @@ main (int argc, char **argv)
@@ -39,7 +39,7 @@ index a79271f6631..03ba1ab437a 100644
return 0;
}
diff --git a/util/grub-module-verifierXX.c b/util/grub-module-verifierXX.c
-index 597ded14362..a98e2f9b1ac 100644
+index 597ded143..a98e2f9b1 100644
--- a/util/grub-module-verifierXX.c
+++ b/util/grub-module-verifierXX.c
@@ -160,14 +160,15 @@ find_section (const struct grub_module_verifier_arch *arch, Elf_Ehdr *e, const c
@@ -237,7 +237,7 @@ index 597ded14362..a98e2f9b1ac 100644
+ check_relocations(modname, arch, e);
}
diff --git a/include/grub/module_verifier.h b/include/grub/module_verifier.h
-index f4870cb9c2d..ba21c75e2eb 100644
+index f4870cb9c..ba21c75e2 100644
--- a/include/grub/module_verifier.h
+++ b/include/grub/module_verifier.h
@@ -16,5 +16,5 @@ struct grub_module_verifier_arch {
diff --git a/SOURCES/0222-Make-efi_netfs-not-duplicate-symbols-from-efinet.patch b/SOURCES/0222-Make-efi_netfs-not-duplicate-symbols-from-efinet.patch
index 394ba2d..5fa34ab 100644
--- a/SOURCES/0222-Make-efi_netfs-not-duplicate-symbols-from-efinet.patch
+++ b/SOURCES/0222-Make-efi_netfs-not-duplicate-symbols-from-efinet.patch
@@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 6 deletions(-)
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index aa44d66aca4..e35217b8668 100644
+index aa44d66ac..e35217b86 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -2186,12 +2186,6 @@ module = {
diff --git a/SOURCES/0223-Rework-how-the-fdt-command-builds.patch b/SOURCES/0223-Rework-how-the-fdt-command-builds.patch
index e864a5e..7802740 100644
--- a/SOURCES/0223-Rework-how-the-fdt-command-builds.patch
+++ b/SOURCES/0223-Rework-how-the-fdt-command-builds.patch
@@ -22,7 +22,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
5 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index e35217b8668..cf3d549d212 100644
+index e35217b86..cf3d549d2 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -166,7 +166,6 @@ kernel = {
@@ -59,7 +59,7 @@ index e35217b8668..cf3d549d212 100644
};
diff --git a/grub-core/lib/fdt.c b/grub-core/lib/fdt.c
-index 0d371c5633e..37e04bd69e7 100644
+index 0d371c563..37e04bd69 100644
--- a/grub-core/lib/fdt.c
+++ b/grub-core/lib/fdt.c
@@ -21,8 +21,6 @@
@@ -72,7 +72,7 @@ index 0d371c5633e..37e04bd69e7 100644
#define FDT_BEGIN_NODE 0x00000001
diff --git a/grub-core/loader/efi/fdt.c b/grub-core/loader/efi/fdt.c
-index a4c6e803645..a9dbcfdfeaf 100644
+index a4c6e8036..a9dbcfdfe 100644
--- a/grub-core/loader/efi/fdt.c
+++ b/grub-core/loader/efi/fdt.c
@@ -26,6 +26,8 @@
@@ -85,7 +85,7 @@ index a4c6e803645..a9dbcfdfeaf 100644
static void *fdt;
diff --git a/include/grub/fdt.h b/include/grub/fdt.h
-index 158b1bc4b3a..6ee57e11ab3 100644
+index 158b1bc4b..6ee57e11a 100644
--- a/include/grub/fdt.h
+++ b/include/grub/fdt.h
@@ -19,6 +19,8 @@
@@ -105,7 +105,7 @@ index 158b1bc4b3a..6ee57e11ab3 100644
+
#endif /* ! GRUB_FDT_HEADER */
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
-index 3781bb9cbb9..4062652506d 100644
+index 3781bb9cb..406265250 100644
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -76,6 +76,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/sb.h
diff --git a/SOURCES/0224-Disable-non-wordsize-allocations-on-arm.patch b/SOURCES/0224-Disable-non-wordsize-allocations-on-arm.patch
index 5c627a3..d07c8bc 100644
--- a/SOURCES/0224-Disable-non-wordsize-allocations-on-arm.patch
+++ b/SOURCES/0224-Disable-non-wordsize-allocations-on-arm.patch
@@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 20 insertions(+)
diff --git a/configure.ac b/configure.ac
-index 819212095ff..9323c125469 100644
+index 819212095..9323c1254 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1234,6 +1234,26 @@ if test "x$target_cpu" = xarm; then
diff --git a/SOURCES/0225-strip-R-.note.gnu.property-at-more-places.patch b/SOURCES/0225-strip-R-.note.gnu.property-at-more-places.patch
index 0bd0be0..0e1adce 100644
--- a/SOURCES/0225-strip-R-.note.gnu.property-at-more-places.patch
+++ b/SOURCES/0225-strip-R-.note.gnu.property-at-more-places.patch
@@ -55,7 +55,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index c7b0e6a9c46..287fff66b20 100644
+index c7b0e6a9c..287fff66b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -209,7 +209,7 @@ pc-chainloader.elf: $(srcdir)/grub-core/tests/boot/kernel-8086.S $(srcdir)/grub-
@@ -68,7 +68,7 @@ index c7b0e6a9c46..287fff66b20 100644
ntldr.elf: $(srcdir)/grub-core/tests/boot/kernel-8086.S $(srcdir)/grub-core/tests/boot/qemu-shutdown-x86.S
$(TARGET_CC) -o $@ $< -DTARGET_NTLDR=1 -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -static -ffreestanding -nostdlib -nostdinc -Wl,--build-id=none -Wl,-N -Wl,-Ttext,0 -m32
diff --git a/gentpl.py b/gentpl.py
-index 1e4635f4426..d662c305f66 100644
+index 1e4635f44..d662c305f 100644
--- a/gentpl.py
+++ b/gentpl.py
@@ -776,7 +776,7 @@ def image(defn, platform):
diff --git a/SOURCES/0226-Prepend-prefix-when-HTTP-path-is-relative.patch b/SOURCES/0226-Prepend-prefix-when-HTTP-path-is-relative.patch
index 9e90636..d45fffa 100644
--- a/SOURCES/0226-Prepend-prefix-when-HTTP-path-is-relative.patch
+++ b/SOURCES/0226-Prepend-prefix-when-HTTP-path-is-relative.patch
@@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
2 files changed, 71 insertions(+), 21 deletions(-)
diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
-index da47b18b50e..dcf48726d54 100644
+index da47b18b5..dcf48726d 100644
--- a/grub-core/kern/main.c
+++ b/grub-core/kern/main.c
@@ -130,11 +130,19 @@ grub_set_prefix_and_root (void)
@@ -39,7 +39,7 @@ index da47b18b50e..dcf48726d54 100644
}
}
diff --git a/grub-core/net/efi/http.c b/grub-core/net/efi/http.c
-index 243acbaa35b..2a9624dacc4 100644
+index 243acbaa3..2a9624dac 100644
--- a/grub-core/net/efi/http.c
+++ b/grub-core/net/efi/http.c
@@ -9,10 +9,52 @@
diff --git a/SOURCES/0227-Make-linux_arm_kernel_header.hdr_offset-be-at-the-ri.patch b/SOURCES/0227-Make-linux_arm_kernel_header.hdr_offset-be-at-the-ri.patch
index e0becd6..ab8d8c1 100644
--- a/SOURCES/0227-Make-linux_arm_kernel_header.hdr_offset-be-at-the-ri.patch
+++ b/SOURCES/0227-Make-linux_arm_kernel_header.hdr_offset-be-at-the-ri.patch
@@ -42,7 +42,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
-index 0622dfa48d4..b56ea0bc041 100644
+index 0622dfa48..b56ea0bc0 100644
--- a/grub-core/loader/efi/linux.c
+++ b/grub-core/loader/efi/linux.c
@@ -79,7 +79,10 @@ grub_efi_linux_boot (void *kernel_addr, grub_off_t handover_offset,
@@ -57,7 +57,7 @@ index 0622dfa48d4..b56ea0bc041 100644
return GRUB_ERR_BUG;
diff --git a/include/grub/arm/linux.h b/include/grub/arm/linux.h
-index 5900fc8a40c..bed308f22cb 100644
+index 5900fc8a4..bed308f22 100644
--- a/include/grub/arm/linux.h
+++ b/include/grub/arm/linux.h
@@ -31,7 +31,7 @@ struct linux_arm_kernel_header {
diff --git a/SOURCES/0228-Mark-some-unused-stuff-unused.patch b/SOURCES/0228-Mark-some-unused-stuff-unused.patch
index 2561754..fec4400 100644
--- a/SOURCES/0228-Mark-some-unused-stuff-unused.patch
+++ b/SOURCES/0228-Mark-some-unused-stuff-unused.patch
@@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
-index bdb1c5a95aa..abd6f00d0de 100644
+index bdb1c5a95..abd6f00d0 100644
--- a/grub-core/commands/blscfg.c
+++ b/grub-core/commands/blscfg.c
@@ -434,7 +434,7 @@ finish:
diff --git a/SOURCES/0229-Make-grub_error-more-verbose.patch b/SOURCES/0229-Make-grub_error-more-verbose.patch
index 6fffdeb..1911f47 100644
--- a/SOURCES/0229-Make-grub_error-more-verbose.patch
+++ b/SOURCES/0229-Make-grub_error-more-verbose.patch
@@ -11,7 +11,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
3 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
-index 5cdf6c943f2..7692e63ba24 100644
+index 5cdf6c943..7692e63ba 100644
--- a/grub-core/kern/efi/mm.c
+++ b/grub-core/kern/efi/mm.c
@@ -157,12 +157,20 @@ grub_efi_allocate_pages_real (grub_efi_physical_address_t address,
@@ -50,7 +50,7 @@ index 5cdf6c943f2..7692e63ba24 100644
grub_efi_store_alloc (address, pages);
diff --git a/grub-core/kern/err.c b/grub-core/kern/err.c
-index 53c734de70e..aebfe0cf839 100644
+index 53c734de7..aebfe0cf8 100644
--- a/grub-core/kern/err.c
+++ b/grub-core/kern/err.c
@@ -33,15 +33,24 @@ static struct grub_error_saved grub_error_stack_items[GRUB_ERROR_STACK_SIZE];
@@ -81,7 +81,7 @@ index 53c734de70e..aebfe0cf839 100644
return n;
diff --git a/include/grub/err.h b/include/grub/err.h
-index 1590c688e1d..9b830757d35 100644
+index 1590c688e..9b830757d 100644
--- a/include/grub/err.h
+++ b/include/grub/err.h
@@ -84,7 +84,10 @@ struct grub_error_saved
diff --git a/SOURCES/0230-arm-arm64-loader-Better-memory-allocation-and-error-.patch b/SOURCES/0230-arm-arm64-loader-Better-memory-allocation-and-error-.patch
index a5cc064..ba43cda 100644
--- a/SOURCES/0230-arm-arm64-loader-Better-memory-allocation-and-error-.patch
+++ b/SOURCES/0230-arm-arm64-loader-Better-memory-allocation-and-error-.patch
@@ -79,7 +79,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
2 files changed, 82 insertions(+), 28 deletions(-)
diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
-index 7692e63ba24..306924f73a4 100644
+index 7692e63ba..306924f73 100644
--- a/grub-core/kern/efi/mm.c
+++ b/grub-core/kern/efi/mm.c
@@ -154,6 +154,7 @@ grub_efi_allocate_pages_real (grub_efi_physical_address_t address,
@@ -155,7 +155,7 @@ index 7692e63ba24..306924f73a4 100644
grub_free(memory_map);
diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index 93b5cd306eb..e1110749eb9 100644
+index 93b5cd306..e1110749e 100644
--- a/grub-core/loader/arm64/linux.c
+++ b/grub-core/loader/arm64/linux.c
@@ -70,13 +70,15 @@ finalize_params_linux (void)
diff --git a/SOURCES/0231-drop-TPM-support-for-legacy-BIOS.patch b/SOURCES/0231-drop-TPM-support-for-legacy-BIOS.patch
index e979dd2..0e6bad1 100644
--- a/SOURCES/0231-drop-TPM-support-for-legacy-BIOS.patch
+++ b/SOURCES/0231-drop-TPM-support-for-legacy-BIOS.patch
@@ -38,7 +38,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
delete mode 100644 grub-core/kern/i386/pc/tpm.c
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index cf3d549d212..fb0a1e0babb 100644
+index cf3d549d2..fb0a1e0ba 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -246,7 +246,6 @@ kernel = {
@@ -51,7 +51,7 @@ index cf3d549d212..fb0a1e0babb 100644
i386_qemu = bus/pci.c;
diff --git a/grub-core/kern/i386/pc/tpm.c b/grub-core/kern/i386/pc/tpm.c
deleted file mode 100644
-index f6f264aff2e..00000000000
+index f6f264aff..000000000
--- a/grub-core/kern/i386/pc/tpm.c
+++ /dev/null
@@ -1,145 +0,0 @@
@@ -201,7 +201,7 @@ index f6f264aff2e..00000000000
- return 0;
-}
diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
-index cfff25c21b5..783a3cd93bc 100644
+index cfff25c21..783a3cd93 100644
--- a/grub-core/loader/i386/pc/linux.c
+++ b/grub-core/loader/i386/pc/linux.c
@@ -36,7 +36,6 @@
@@ -223,7 +223,7 @@ index cfff25c21b5..783a3cd93bc 100644
kernel_offset = sizeof (lh);
diff --git a/include/grub/tpm.h b/include/grub/tpm.h
-index 972a5edc836..ce52be4ff7f 100644
+index 972a5edc8..ce52be4ff 100644
--- a/include/grub/tpm.h
+++ b/include/grub/tpm.h
@@ -69,7 +69,7 @@ typedef struct {
@@ -236,7 +236,7 @@ index 972a5edc836..ce52be4ff7f 100644
PassThroughToTPM_OutputParamBlock *outbuf);
grub_err_t grub_tpm_log_event(unsigned char *buf, grub_size_t size,
diff --git a/grub-core/boot/i386/pc/boot.S b/grub-core/boot/i386/pc/boot.S
-index acab37369ae..ea167fe1206 100644
+index acab37369..ea167fe12 100644
--- a/grub-core/boot/i386/pc/boot.S
+++ b/grub-core/boot/i386/pc/boot.S
@@ -24,14 +24,11 @@
@@ -324,7 +324,7 @@ index acab37369ae..ea167fe1206 100644
jmp *(LOCAL(kernel_address))
diff --git a/grub-core/boot/i386/pc/diskboot.S b/grub-core/boot/i386/pc/diskboot.S
-index f4744ec6fcb..68d31de0c4c 100644
+index f4744ec6f..68d31de0c 100644
--- a/grub-core/boot/i386/pc/diskboot.S
+++ b/grub-core/boot/i386/pc/diskboot.S
@@ -19,8 +19,6 @@
diff --git a/SOURCES/0232-Move-quicksort-function-from-kernel.exec-to-the-blsc.patch b/SOURCES/0232-Move-quicksort-function-from-kernel.exec-to-the-blsc.patch
index bd153f2..2358db5 100644
--- a/SOURCES/0232-Move-quicksort-function-from-kernel.exec-to-the-blsc.patch
+++ b/SOURCES/0232-Move-quicksort-function-from-kernel.exec-to-the-blsc.patch
@@ -27,7 +27,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
rename grub-core/{kern/qsort.c => commands/bls_qsort.h} (93%)
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index fb0a1e0babb..3346d1be658 100644
+index fb0a1e0ba..3346d1be6 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -129,7 +129,6 @@ kernel = {
@@ -47,7 +47,7 @@ index fb0a1e0babb..3346d1be658 100644
enable = efi;
enable = i386_pc;
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
-index abd6f00d0de..bec5a9ffe3e 100644
+index abd6f00d0..bec5a9ffe 100644
--- a/grub-core/commands/blscfg.c
+++ b/grub-core/commands/blscfg.c
@@ -36,6 +36,7 @@
@@ -71,7 +71,7 @@ diff --git a/grub-core/kern/qsort.c b/grub-core/commands/bls_qsort.h
similarity index 93%
rename from grub-core/kern/qsort.c
rename to grub-core/commands/bls_qsort.h
-index 7f3fc9ffdae..572765fa3f2 100644
+index 7f3fc9ffd..572765fa3 100644
--- a/grub-core/kern/qsort.c
+++ b/grub-core/commands/bls_qsort.h
@@ -64,6 +64,7 @@ typedef struct
@@ -123,7 +123,7 @@ index 7f3fc9ffdae..572765fa3f2 100644
- return NULL;
-}
diff --git a/include/grub/misc.h b/include/grub/misc.h
-index 5f1c1c1be4e..de9016ab709 100644
+index 5f1c1c1be..de9016ab7 100644
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -510,19 +510,4 @@ void EXPORT_FUNC(grub_real_boot_time) (const char *file,
diff --git a/SOURCES/0233-Include-blscfg-module-for-powerpc-ieee1275.patch b/SOURCES/0233-Include-blscfg-module-for-powerpc-ieee1275.patch
index 1240713..7527ea1 100644
--- a/SOURCES/0233-Include-blscfg-module-for-powerpc-ieee1275.patch
+++ b/SOURCES/0233-Include-blscfg-module-for-powerpc-ieee1275.patch
@@ -14,7 +14,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 1 insertion(+)
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 3346d1be658..6864e780fd4 100644
+index 3346d1be6..6864e780f 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -782,6 +782,7 @@ module = {
diff --git a/SOURCES/0234-grub-switch-to-blscfg-copy-blscfg-module-for-legacy-.patch b/SOURCES/0234-grub-switch-to-blscfg-copy-blscfg-module-for-legacy-.patch
index 2559203..54e44bc 100644
--- a/SOURCES/0234-grub-switch-to-blscfg-copy-blscfg-module-for-legacy-.patch
+++ b/SOURCES/0234-grub-switch-to-blscfg-copy-blscfg-module-for-legacy-.patch
@@ -16,7 +16,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/util/grub-switch-to-blscfg.in b/util/grub-switch-to-blscfg.in
-index 9cf64f8e725..1c6bd1882a7 100644
+index 9cf64f8e7..1c6bd1882 100644
--- a/util/grub-switch-to-blscfg.in
+++ b/util/grub-switch-to-blscfg.in
@@ -53,6 +53,8 @@ blsdir=`echo "/@bootdirname@/loader/entries" | sed 's,//*,/,g'`
diff --git a/SOURCES/0235-Fix-getroot.c-s-trampolines.patch b/SOURCES/0235-Fix-getroot.c-s-trampolines.patch
index 3a808f7..8419662 100644
--- a/SOURCES/0235-Fix-getroot.c-s-trampolines.patch
+++ b/SOURCES/0235-Fix-getroot.c-s-trampolines.patch
@@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
-index 4c5a13022dc..388a0f70638 100644
+index 4c5a13022..388a0f706 100644
--- a/grub-core/osdep/linux/getroot.c
+++ b/grub-core/osdep/linux/getroot.c
@@ -1264,22 +1264,20 @@ grub_util_get_grub_dev_os (const char *os_dev)
diff --git a/SOURCES/0236-add-10_linux_bls-grub.d-snippet-to-generate-menu-ent.patch b/SOURCES/0236-add-10_linux_bls-grub.d-snippet-to-generate-menu-ent.patch
index bb1b012..74cc327 100644
--- a/SOURCES/0236-add-10_linux_bls-grub.d-snippet-to-generate-menu-ent.patch
+++ b/SOURCES/0236-add-10_linux_bls-grub.d-snippet-to-generate-menu-ent.patch
@@ -20,7 +20,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
create mode 100644 util/grub.d/10_linux_bls.in
diff --git a/Makefile.util.def b/Makefile.util.def
-index cba4d500198..08cc98ddb8b 100644
+index cba4d5001..08cc98ddb 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -502,6 +502,13 @@ script = {
@@ -39,7 +39,7 @@ index cba4d500198..08cc98ddb8b 100644
common = util/grub.d/10_xnu.in;
diff --git a/util/grub.d/10_linux_bls.in b/util/grub.d/10_linux_bls.in
new file mode 100644
-index 00000000000..3cc7803c6a1
+index 000000000..3cc7803c6
--- /dev/null
+++ b/util/grub.d/10_linux_bls.in
@@ -0,0 +1,440 @@
diff --git a/SOURCES/0237-Only-set-kernelopts-in-grubenv-if-it-wasn-t-set-befo.patch b/SOURCES/0237-Only-set-kernelopts-in-grubenv-if-it-wasn-t-set-befo.patch
index be3c867..ce7d8e7 100644
--- a/SOURCES/0237-Only-set-kernelopts-in-grubenv-if-it-wasn-t-set-befo.patch
+++ b/SOURCES/0237-Only-set-kernelopts-in-grubenv-if-it-wasn-t-set-befo.patch
@@ -18,7 +18,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 9682e97b7f5..01e66e5fc74 100644
+index 9682e97b7..01e66e5fc 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -82,6 +82,20 @@ case x"$GRUB_FS" in
@@ -63,7 +63,7 @@ index 9682e97b7f5..01e66e5fc74 100644
exit 0
fi
diff --git a/util/grub.d/10_linux_bls.in b/util/grub.d/10_linux_bls.in
-index 3cc7803c6a1..8a3379578bd 100644
+index 3cc7803c6..8a3379578 100644
--- a/util/grub.d/10_linux_bls.in
+++ b/util/grub.d/10_linux_bls.in
@@ -201,7 +201,9 @@ linux_entry ()
diff --git a/SOURCES/0238-blscfg-don-t-include-.conf-at-the-end-of-our-id.patch b/SOURCES/0238-blscfg-don-t-include-.conf-at-the-end-of-our-id.patch
index 59adb84..dec8e6a 100644
--- a/SOURCES/0238-blscfg-don-t-include-.conf-at-the-end-of-our-id.patch
+++ b/SOURCES/0238-blscfg-don-t-include-.conf-at-the-end-of-our-id.patch
@@ -11,7 +11,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 11 insertions(+)
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
-index bec5a9ffe3e..3847572dabd 100644
+index bec5a9ffe..3847572da 100644
--- a/grub-core/commands/blscfg.c
+++ b/grub-core/commands/blscfg.c
@@ -575,6 +575,7 @@ static void create_entry (struct bls_entry *entry)
diff --git a/SOURCES/0239-grub-get-kernel-settings-expose-some-more-config-var.patch b/SOURCES/0239-grub-get-kernel-settings-expose-some-more-config-var.patch
index 2471e5f..d34ea81 100644
--- a/SOURCES/0239-grub-get-kernel-settings-expose-some-more-config-var.patch
+++ b/SOURCES/0239-grub-get-kernel-settings-expose-some-more-config-var.patch
@@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 10 insertions(+)
diff --git a/util/grub-get-kernel-settings.in b/util/grub-get-kernel-settings.in
-index 12046219878..7e87dfccc0e 100644
+index 120462198..7e87dfccc 100644
--- a/util/grub-get-kernel-settings.in
+++ b/util/grub-get-kernel-settings.in
@@ -76,3 +76,13 @@ if [ "$MAKEDEBUG" = "yes" ]; then
diff --git a/SOURCES/0240-blscfg-sort-everything-with-rpm-package-comparison.patch b/SOURCES/0240-blscfg-sort-everything-with-rpm-package-comparison.patch
index f1d848c..3074e7b 100644
--- a/SOURCES/0240-blscfg-sort-everything-with-rpm-package-comparison.patch
+++ b/SOURCES/0240-blscfg-sort-everything-with-rpm-package-comparison.patch
@@ -14,7 +14,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 108 insertions(+), 10 deletions(-)
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
-index 3847572dabd..347128c9ddd 100644
+index 3847572da..347128c9d 100644
--- a/grub-core/commands/blscfg.c
+++ b/grub-core/commands/blscfg.c
@@ -206,7 +206,7 @@ static int vercmp(const char * a, const char * b)
diff --git a/SOURCES/0241-10_linux_bls-use-grub2-rpm-sort-instead-of-ls-vr-to-.patch b/SOURCES/0241-10_linux_bls-use-grub2-rpm-sort-instead-of-ls-vr-to-.patch
index f23cd47..e3566e0 100644
--- a/SOURCES/0241-10_linux_bls-use-grub2-rpm-sort-instead-of-ls-vr-to-.patch
+++ b/SOURCES/0241-10_linux_bls-use-grub2-rpm-sort-instead-of-ls-vr-to-.patch
@@ -12,7 +12,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/util/grub.d/10_linux_bls.in b/util/grub.d/10_linux_bls.in
-index 8a3379578bd..1bc97f29898 100644
+index 8a3379578..1bc97f298 100644
--- a/util/grub.d/10_linux_bls.in
+++ b/util/grub.d/10_linux_bls.in
@@ -151,10 +151,22 @@ read_config()
diff --git a/SOURCES/0242-don-t-set-saved_entry-on-grub2-mkconfig.patch b/SOURCES/0242-don-t-set-saved_entry-on-grub2-mkconfig.patch
index 8e3ea47..761eb34 100644
--- a/SOURCES/0242-don-t-set-saved_entry-on-grub2-mkconfig.patch
+++ b/SOURCES/0242-don-t-set-saved_entry-on-grub2-mkconfig.patch
@@ -17,7 +17,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
2 files changed, 2 deletions(-)
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 01e66e5fc74..b54d2774a7d 100644
+index 01e66e5fc..b54d2774a 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -165,7 +165,6 @@ if [ -s \$prefix/grubenv ]; then
@@ -29,7 +29,7 @@ index 01e66e5fc74..b54d2774a7d 100644
${grub_editenv} - set kernelopts="root=${linux_root_device_thisversion} ro ${args}"
fi
diff --git a/util/grub.d/10_linux_bls.in b/util/grub.d/10_linux_bls.in
-index 1bc97f29898..8745e598d0e 100644
+index 1bc97f298..8745e598d 100644
--- a/util/grub.d/10_linux_bls.in
+++ b/util/grub.d/10_linux_bls.in
@@ -212,7 +212,6 @@ linux_entry ()
diff --git a/SOURCES/0243-grub-switch-to-blscfg-use-debug-instead-of-debug-as-.patch b/SOURCES/0243-grub-switch-to-blscfg-use-debug-instead-of-debug-as-.patch
index 9256c23..9047027 100644
--- a/SOURCES/0243-grub-switch-to-blscfg-use-debug-instead-of-debug-as-.patch
+++ b/SOURCES/0243-grub-switch-to-blscfg-use-debug-instead-of-debug-as-.patch
@@ -17,7 +17,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/util/grub-switch-to-blscfg.in b/util/grub-switch-to-blscfg.in
-index 1c6bd1882a7..60cd6ca63cc 100644
+index 1c6bd1882..60cd6ca63 100644
--- a/util/grub-switch-to-blscfg.in
+++ b/util/grub-switch-to-blscfg.in
@@ -250,7 +250,7 @@ for kernelver in $(cd /lib/modules/ ; ls -1) "" ; do
diff --git a/SOURCES/0244-Make-blscfg-debug-messages-more-useful.patch b/SOURCES/0244-Make-blscfg-debug-messages-more-useful.patch
index 9a05606..65c30fa 100644
--- a/SOURCES/0244-Make-blscfg-debug-messages-more-useful.patch
+++ b/SOURCES/0244-Make-blscfg-debug-messages-more-useful.patch
@@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
4 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
-index 347128c9ddd..42892cbfd55 100644
+index 347128c9d..42892cbfd 100644
--- a/grub-core/commands/blscfg.c
+++ b/grub-core/commands/blscfg.c
@@ -46,8 +46,6 @@ GRUB_MOD_LICENSE ("GPLv3+");
@@ -71,7 +71,7 @@ index 347128c9ddd..42892cbfd55 100644
finish:
grub_free (initrd);
diff --git a/grub-core/commands/legacycfg.c b/grub-core/commands/legacycfg.c
-index b32f3c74cb1..f9d7627bdc3 100644
+index b32f3c74c..f9d7627bd 100644
--- a/grub-core/commands/legacycfg.c
+++ b/grub-core/commands/legacycfg.c
@@ -133,7 +133,7 @@ legacy_file (const char *filename)
@@ -93,7 +93,7 @@ index b32f3c74cb1..f9d7627bdc3 100644
}
diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c
-index 2c5363da7f5..8d242b0187e 100644
+index 2c5363da7..8d242b018 100644
--- a/grub-core/commands/menuentry.c
+++ b/grub-core/commands/menuentry.c
@@ -78,7 +78,7 @@ grub_normal_add_menu_entry (int argc, const char **args,
@@ -161,7 +161,7 @@ index 2c5363da7f5..8d242b0187e 100644
src[len - 1] = ch;
args[argc - 1] = src;
diff --git a/include/grub/normal.h b/include/grub/normal.h
-index 218cbabccaf..cb9901f41b3 100644
+index 218cbabcc..cb9901f41 100644
--- a/include/grub/normal.h
+++ b/include/grub/normal.h
@@ -145,7 +145,7 @@ grub_normal_add_menu_entry (int argc, const char **args, char **classes,
diff --git a/SOURCES/0245-Make-grub_strtoul-end-pointer-have-the-right-constif.patch b/SOURCES/0245-Make-grub_strtoul-end-pointer-have-the-right-constif.patch
index 99787bd..bd01a58 100644
--- a/SOURCES/0245-Make-grub_strtoul-end-pointer-have-the-right-constif.patch
+++ b/SOURCES/0245-Make-grub_strtoul-end-pointer-have-the-right-constif.patch
@@ -28,7 +28,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
18 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/grub-core/kern/fs.c b/grub-core/kern/fs.c
-index 9085895b6fe..1bd748be83b 100644
+index 9085895b6..1bd748be8 100644
--- a/grub-core/kern/fs.c
+++ b/grub-core/kern/fs.c
@@ -134,7 +134,7 @@ struct grub_fs_block
@@ -41,7 +41,7 @@ index 9085895b6fe..1bd748be83b 100644
unsigned i;
grub_disk_t disk = file->device->disk;
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index 5c3899f0e5b..aaae9aa0ab7 100644
+index 5c3899f0e..aaae9aa0a 100644
--- a/grub-core/kern/misc.c
+++ b/grub-core/kern/misc.c
@@ -383,7 +383,7 @@ grub_isspace (int c)
@@ -80,7 +80,7 @@ index 5c3899f0e5b..aaae9aa0ab7 100644
if (*fmt == '$')
{
diff --git a/grub-core/kern/partition.c b/grub-core/kern/partition.c
-index e499147cbcb..2c401b866c4 100644
+index e499147cb..2c401b866 100644
--- a/grub-core/kern/partition.c
+++ b/grub-core/kern/partition.c
@@ -126,7 +126,7 @@ grub_partition_probe (struct grub_disk *disk, const char *str)
@@ -93,7 +93,7 @@ index e499147cbcb..2c401b866c4 100644
curpart = 0;
/* Use the first partition map type found. */
diff --git a/grub-core/lib/legacy_parse.c b/grub-core/lib/legacy_parse.c
-index ef56150ac77..05719ab2ccb 100644
+index ef56150ac..05719ab2c 100644
--- a/grub-core/lib/legacy_parse.c
+++ b/grub-core/lib/legacy_parse.c
@@ -418,7 +418,7 @@ adjust_file (const char *in, grub_size_t len)
@@ -106,7 +106,7 @@ index ef56150ac77..05719ab2ccb 100644
{
subpart = rest[1] - 'a';
diff --git a/grub-core/lib/syslinux_parse.c b/grub-core/lib/syslinux_parse.c
-index 28ba3aef0bb..21ca040ada7 100644
+index 28ba3aef0..21ca040ad 100644
--- a/grub-core/lib/syslinux_parse.c
+++ b/grub-core/lib/syslinux_parse.c
@@ -1058,7 +1058,7 @@ write_entry (struct output_buffer *outbuf,
@@ -134,7 +134,7 @@ index 28ba3aef0bb..21ca040ada7 100644
}
/* FIXME: isolinux, ntldr, cmldr, *dos, seg, hide
diff --git a/grub-core/loader/i386/xen_fileXX.c b/grub-core/loader/i386/xen_fileXX.c
-index fb66e66fe96..293f1ad5c3e 100644
+index fb66e66fe..293f1ad5c 100644
--- a/grub-core/loader/i386/xen_fileXX.c
+++ b/grub-core/loader/i386/xen_fileXX.c
@@ -25,7 +25,7 @@ parse_xen_guest (grub_elf_t elf, struct grub_xen_file_info *xi,
@@ -147,7 +147,7 @@ index fb66e66fe96..293f1ad5c3e 100644
grub_errno = GRUB_ERR_NONE;
diff --git a/grub-core/net/efi/ip4_config.c b/grub-core/net/efi/ip4_config.c
-index b711a5d9457..38e2a04747a 100644
+index b711a5d94..38e2a0474 100644
--- a/grub-core/net/efi/ip4_config.c
+++ b/grub-core/net/efi/ip4_config.c
@@ -62,7 +62,7 @@ grub_efi_string_to_ip4_address (const char *val, grub_efi_ipv4_address_t *addres
@@ -160,7 +160,7 @@ index b711a5d9457..38e2a04747a 100644
{
grub_errno = GRUB_ERR_NONE;
diff --git a/grub-core/net/efi/ip6_config.c b/grub-core/net/efi/ip6_config.c
-index 017c4d05bc7..e0e00c23d21 100644
+index 017c4d05b..e0e00c23d 100644
--- a/grub-core/net/efi/ip6_config.c
+++ b/grub-core/net/efi/ip6_config.c
@@ -84,7 +84,7 @@ grub_efi_string_to_ip6_address (const char *val, grub_efi_ipv6_address_t *addres
@@ -173,7 +173,7 @@ index 017c4d05bc7..e0e00c23d21 100644
{
grub_errno = GRUB_ERR_NONE;
diff --git a/grub-core/net/efi/net.c b/grub-core/net/efi/net.c
-index f208d1b180c..4c70fc4da2a 100644
+index f208d1b18..4c70fc4da 100644
--- a/grub-core/net/efi/net.c
+++ b/grub-core/net/efi/net.c
@@ -729,7 +729,7 @@ grub_efi_net_parse_address (const char *address,
@@ -195,7 +195,7 @@ index f208d1b180c..4c70fc4da2a 100644
{
ip6->prefix_length = prefix_length;
diff --git a/grub-core/net/efi/pxe.c b/grub-core/net/efi/pxe.c
-index 531949cba5c..73e2bb01c1b 100644
+index 531949cba..73e2bb01c 100644
--- a/grub-core/net/efi/pxe.c
+++ b/grub-core/net/efi/pxe.c
@@ -187,7 +187,7 @@ parse_ip6 (const char *val, grub_uint64_t *ip, const char **rest)
@@ -226,7 +226,7 @@ index 531949cba5c..73e2bb01c1b 100644
grub_efi_pxe_t *pxe = (prefer_ip6) ? dev->ip6_pxe : dev->ip4_pxe;
grub_efi_uint64_t bufsz = len;
diff --git a/grub-core/net/http.c b/grub-core/net/http.c
-index c9c59690a98..b52b558d631 100644
+index c9c59690a..b52b558d6 100644
--- a/grub-core/net/http.c
+++ b/grub-core/net/http.c
@@ -110,7 +110,7 @@ parse_line (grub_file_t file, http_data_t data, char *ptr, grub_size_t len)
@@ -248,7 +248,7 @@ index c9c59690a98..b52b558d631 100644
return GRUB_ERR_NONE;
}
diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index a571ee92efa..a011b940100 100644
+index a571ee92e..a011b9401 100644
--- a/grub-core/net/net.c
+++ b/grub-core/net/net.c
@@ -411,7 +411,7 @@ parse_ip (const char *val, grub_uint32_t *ip, const char **rest)
@@ -288,7 +288,7 @@ index a571ee92efa..a011b940100 100644
return GRUB_ERR_NONE;
grub_errno = GRUB_ERR_NONE;
diff --git a/grub-core/net/url.c b/grub-core/net/url.c
-index 146858284cd..d9d2fc9a9dc 100644
+index 146858284..d9d2fc9a9 100644
--- a/grub-core/net/url.c
+++ b/grub-core/net/url.c
@@ -235,7 +235,7 @@ extract_http_url_info (char *url, int ssl,
@@ -301,7 +301,7 @@ index 146858284cd..d9d2fc9a9dc 100644
#ifdef URL_TEST
if (portul == ULONG_MAX && errno == ERANGE)
diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
-index 93965777138..7d327f59d92 100644
+index 939657771..7d327f59d 100644
--- a/grub-core/script/execute.c
+++ b/grub-core/script/execute.c
@@ -146,7 +146,7 @@ replace_scope (struct grub_script_scope *new_scope)
@@ -332,7 +332,7 @@ index 93965777138..7d327f59d92 100644
if (! scope || argc > 1)
diff --git a/grub-core/term/serial.c b/grub-core/term/serial.c
-index db80b3ba0fb..f9271b09239 100644
+index db80b3ba0..f9271b092 100644
--- a/grub-core/term/serial.c
+++ b/grub-core/term/serial.c
@@ -269,7 +269,7 @@ grub_cmd_serial (grub_extcmd_context_t ctxt, int argc, char **args)
@@ -345,7 +345,7 @@ index db80b3ba0fb..f9271b09239 100644
if (grub_errno)
return grub_errno;
diff --git a/grub-core/term/terminfo.c b/grub-core/term/terminfo.c
-index 29df35e6d20..537a5c0cb0b 100644
+index 29df35e6d..537a5c0cb 100644
--- a/grub-core/term/terminfo.c
+++ b/grub-core/term/terminfo.c
@@ -737,7 +737,7 @@ grub_cmd_terminfo (grub_extcmd_context_t ctxt, int argc, char **args)
@@ -358,7 +358,7 @@ index 29df35e6d20..537a5c0cb0b 100644
if (grub_errno)
return grub_errno;
diff --git a/grub-core/tests/strtoull_test.c b/grub-core/tests/strtoull_test.c
-index 7da615ff33e..5488ab26b43 100644
+index 7da615ff3..5488ab26b 100644
--- a/grub-core/tests/strtoull_test.c
+++ b/grub-core/tests/strtoull_test.c
@@ -25,7 +25,7 @@ static void
@@ -371,7 +371,7 @@ index 7da615ff33e..5488ab26b43 100644
grub_errno = 0;
value = grub_strtoull(input, &output, base);
diff --git a/include/grub/misc.h b/include/grub/misc.h
-index de9016ab709..1258ec6bbf3 100644
+index de9016ab7..1258ec6bb 100644
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -288,11 +288,11 @@ grub_strncasecmp (const char *s1, const char *s2, grub_size_t n)
diff --git a/SOURCES/0246-Fix-menu-entry-selection-based-on-ID-and-title.patch b/SOURCES/0246-Fix-menu-entry-selection-based-on-ID-and-title.patch
index 065765c..dbb743a 100644
--- a/SOURCES/0246-Fix-menu-entry-selection-based-on-ID-and-title.patch
+++ b/SOURCES/0246-Fix-menu-entry-selection-based-on-ID-and-title.patch
@@ -20,7 +20,7 @@ Resolves: rhbz#1640979
1 file changed, 75 insertions(+), 71 deletions(-)
diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
-index 6cb2a071490..95f7abaf2fd 100644
+index 6cb2a0714..95f7abaf2 100644
--- a/grub-core/normal/menu.c
+++ b/grub-core/normal/menu.c
@@ -164,12 +164,12 @@ grub_menu_set_timeout (int timeout)
diff --git a/SOURCES/0247-Remove-quotes-when-reading-ID-value-from-etc-os-rele.patch b/SOURCES/0247-Remove-quotes-when-reading-ID-value-from-etc-os-rele.patch
index b81f46f..3ac9f21 100644
--- a/SOURCES/0247-Remove-quotes-when-reading-ID-value-from-etc-os-rele.patch
+++ b/SOURCES/0247-Remove-quotes-when-reading-ID-value-from-etc-os-rele.patch
@@ -20,7 +20,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/util/grub-set-password.in b/util/grub-set-password.in
-index 5ebf50576d6..c0b5ebbfdc5 100644
+index 5ebf50576..c0b5ebbfd 100644
--- a/util/grub-set-password.in
+++ b/util/grub-set-password.in
@@ -1,6 +1,6 @@
@@ -32,7 +32,7 @@ index 5ebf50576d6..c0b5ebbfdc5 100644
grubdir=`echo "/@bootdirname@/efi/EFI/${EFIDIR}/" | sed 's,//*,/,g'`
else
diff --git a/util/grub-switch-to-blscfg.in b/util/grub-switch-to-blscfg.in
-index 60cd6ca63cc..d353370cc51 100644
+index 60cd6ca63..d353370cc 100644
--- a/util/grub-switch-to-blscfg.in
+++ b/util/grub-switch-to-blscfg.in
@@ -40,7 +40,7 @@ etcdefaultgrub=/etc/default/grub
diff --git a/SOURCES/0248-blscfg-expand-grub_users-before-passing-to-grub_norm.patch b/SOURCES/0248-blscfg-expand-grub_users-before-passing-to-grub_norm.patch
index d5951b4..be1309b 100644
--- a/SOURCES/0248-blscfg-expand-grub_users-before-passing-to-grub_norm.patch
+++ b/SOURCES/0248-blscfg-expand-grub_users-before-passing-to-grub_norm.patch
@@ -24,7 +24,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
-index 42892cbfd55..c432c6ba27a 100644
+index 42892cbfd..c432c6ba2 100644
--- a/grub-core/commands/blscfg.c
+++ b/grub-core/commands/blscfg.c
@@ -704,7 +704,7 @@ static void create_entry (struct bls_entry *entry)
diff --git a/SOURCES/0249-Make-the-menu-entry-users-option-argument-to-be-opti.patch b/SOURCES/0249-Make-the-menu-entry-users-option-argument-to-be-opti.patch
index 50479ce..f202d19 100644
--- a/SOURCES/0249-Make-the-menu-entry-users-option-argument-to-be-opti.patch
+++ b/SOURCES/0249-Make-the-menu-entry-users-option-argument-to-be-opti.patch
@@ -23,7 +23,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c
-index 8d242b0187e..7004e08ce78 100644
+index 8d242b018..7004e08ce 100644
--- a/grub-core/commands/menuentry.c
+++ b/grub-core/commands/menuentry.c
@@ -29,7 +29,7 @@ static const struct grub_arg_option options[] =
diff --git a/SOURCES/0250-10_linux_bls-add-missing-menu-entries-options.patch b/SOURCES/0250-10_linux_bls-add-missing-menu-entries-options.patch
index 620c55d..f7ff60d 100644
--- a/SOURCES/0250-10_linux_bls-add-missing-menu-entries-options.patch
+++ b/SOURCES/0250-10_linux_bls-add-missing-menu-entries-options.patch
@@ -15,7 +15,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/util/grub.d/10_linux_bls.in b/util/grub.d/10_linux_bls.in
-index 8745e598d0e..8cff4c58ab5 100644
+index 8745e598d..8cff4c58a 100644
--- a/util/grub.d/10_linux_bls.in
+++ b/util/grub.d/10_linux_bls.in
@@ -127,6 +127,9 @@ read_config()
diff --git a/SOURCES/0251-Fix-menu-entry-selection-based-on-title.patch b/SOURCES/0251-Fix-menu-entry-selection-based-on-title.patch
index 31825b0..9b3fa89 100644
--- a/SOURCES/0251-Fix-menu-entry-selection-based-on-title.patch
+++ b/SOURCES/0251-Fix-menu-entry-selection-based-on-title.patch
@@ -19,7 +19,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
-index 95f7abaf2fd..fc25c702f3c 100644
+index 95f7abaf2..fc25c702f 100644
--- a/grub-core/normal/menu.c
+++ b/grub-core/normal/menu.c
@@ -217,14 +217,11 @@ get_entry_number_helper(grub_menu_t menu,
diff --git a/SOURCES/0252-BLS-files-should-only-be-copied-by-grub-switch-to-bl.patch b/SOURCES/0252-BLS-files-should-only-be-copied-by-grub-switch-to-bl.patch
index 1fc6e2d..fbfa6eb 100644
--- a/SOURCES/0252-BLS-files-should-only-be-copied-by-grub-switch-to-bl.patch
+++ b/SOURCES/0252-BLS-files-should-only-be-copied-by-grub-switch-to-bl.patch
@@ -16,7 +16,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 42 insertions(+), 38 deletions(-)
diff --git a/util/grub-switch-to-blscfg.in b/util/grub-switch-to-blscfg.in
-index d353370cc51..eeea1307706 100644
+index d353370cc..eeea13077 100644
--- a/util/grub-switch-to-blscfg.in
+++ b/util/grub-switch-to-blscfg.in
@@ -220,49 +220,51 @@ EOF
diff --git a/SOURCES/0253-Fix-get_entry_number-wrongly-dereferencing-the-tail-.patch b/SOURCES/0253-Fix-get_entry_number-wrongly-dereferencing-the-tail-.patch
index f1667a1..e246bfa 100644
--- a/SOURCES/0253-Fix-get_entry_number-wrongly-dereferencing-the-tail-.patch
+++ b/SOURCES/0253-Fix-get_entry_number-wrongly-dereferencing-the-tail-.patch
@@ -20,7 +20,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
-index fc25c702f3c..7e32c498aa8 100644
+index fc25c702f..7e32c498a 100644
--- a/grub-core/normal/menu.c
+++ b/grub-core/normal/menu.c
@@ -563,7 +563,7 @@ get_entry_number (grub_menu_t menu, const char *name)
diff --git a/SOURCES/0254-Make-grub2-mkconfig-to-honour-GRUB_CMDLINE_LINUX-in-.patch b/SOURCES/0254-Make-grub2-mkconfig-to-honour-GRUB_CMDLINE_LINUX-in-.patch
index 71fbd51..c3161cc 100644
--- a/SOURCES/0254-Make-grub2-mkconfig-to-honour-GRUB_CMDLINE_LINUX-in-.patch
+++ b/SOURCES/0254-Make-grub2-mkconfig-to-honour-GRUB_CMDLINE_LINUX-in-.patch
@@ -27,7 +27,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
4 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/util/grub-mkconfig.8 b/util/grub-mkconfig.8
-index a2d1f577b9b..434fa4deda4 100644
+index a2d1f577b..434fa4ded 100644
--- a/util/grub-mkconfig.8
+++ b/util/grub-mkconfig.8
@@ -13,5 +13,9 @@
@@ -41,7 +41,7 @@ index a2d1f577b9b..434fa4deda4 100644
.SH SEE ALSO
.BR "info grub"
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index c20171919d9..5e643e16973 100644
+index c20171919..5e643e169 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -50,6 +50,8 @@ grub_get_kernel_settings="${sbindir}/@grub_get_kernel_settings@"
@@ -72,7 +72,7 @@ index c20171919d9..5e643e16973 100644
gettext_printf "Unrecognized option \`%s'\n" "$option" 1>&2
usage
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index b54d2774a7d..da2992ac9f1 100644
+index b54d2774a..da2992ac9 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -165,7 +165,7 @@ if [ -s \$prefix/grubenv ]; then
@@ -85,7 +85,7 @@ index b54d2774a7d..da2992ac9f1 100644
fi
diff --git a/util/grub.d/10_linux_bls.in b/util/grub.d/10_linux_bls.in
-index 8cff4c58ab5..175bedd0763 100644
+index 8cff4c58a..175bedd07 100644
--- a/util/grub.d/10_linux_bls.in
+++ b/util/grub.d/10_linux_bls.in
@@ -225,7 +225,7 @@ linux_entry ()
diff --git a/SOURCES/0255-grub-boot-success.timer-Add-a-few-Conditions-for-run.patch b/SOURCES/0255-grub-boot-success.timer-Add-a-few-Conditions-for-run.patch
index 4f82ba2..4040198 100644
--- a/SOURCES/0255-grub-boot-success.timer-Add-a-few-Conditions-for-run.patch
+++ b/SOURCES/0255-grub-boot-success.timer-Add-a-few-Conditions-for-run.patch
@@ -15,18 +15,20 @@ since then it will just lead to a bunch of errors without doing anything:
https://bugzilla.redhat.com/show_bug.cgi?id=1619445
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+[rharwood: rebase fuzz around boot-succes timer commit]
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
---
- docs/grub-boot-success.timer | 2 ++
- 1 file changed, 2 insertions(+)
+ docs/grub-boot-success.timer | 1 +
+ 1 file changed, 1 insertion(+)
diff --git a/docs/grub-boot-success.timer b/docs/grub-boot-success.timer
-index 221b532781b..67bd829b795 100644
+index 406f17200..51d1eb238 100644
--- a/docs/grub-boot-success.timer
+++ b/docs/grub-boot-success.timer
-@@ -1,5 +1,7 @@
- [Unit]
+@@ -2,6 +2,7 @@
Description=Mark boot as successful after the user session has run 2 minutes
-+ConditionUser=!@system
+ ConditionUser=!@system
+ ConditionVirtualization=!container
+ConditionPathExists=/usr/bin/pkexec
[Timer]
diff --git a/SOURCES/0256-docs-Stop-using-polkit-pkexec-for-grub-boot-success..patch b/SOURCES/0256-docs-Stop-using-polkit-pkexec-for-grub-boot-success..patch
index bf4ad27..a457c3b 100644
--- a/SOURCES/0256-docs-Stop-using-polkit-pkexec-for-grub-boot-success..patch
+++ b/SOURCES/0256-docs-Stop-using-polkit-pkexec-for-grub-boot-success..patch
@@ -12,58 +12,21 @@ grub2-set-bootflag was written with this usage in mind, so is safe
to be made suid root.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+[rharwood: rebase fuzz around container]
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
---
- docs/grub-boot-success.service | 2 +-
- docs/grub-boot-success.timer | 1 -
- docs/org.gnu.grub.policy | 20 --------------------
- 3 files changed, 1 insertion(+), 22 deletions(-)
- delete mode 100644 docs/org.gnu.grub.policy
+ docs/grub-boot-success.timer | 1 -
+ 1 file changed, 1 deletion(-)
-diff --git a/docs/grub-boot-success.service b/docs/grub-boot-success.service
-index c8c91c34d49..80e79584c91 100644
---- a/docs/grub-boot-success.service
-+++ b/docs/grub-boot-success.service
-@@ -3,4 +3,4 @@ Description=Mark boot as successful
-
- [Service]
- Type=oneshot
--ExecStart=/usr/bin/pkexec /usr/sbin/grub2-set-bootflag boot_success
-+ExecStart=/usr/sbin/grub2-set-bootflag boot_success
diff --git a/docs/grub-boot-success.timer b/docs/grub-boot-success.timer
-index 67bd829b795..5d8fcba21aa 100644
+index 51d1eb238..406f17200 100644
--- a/docs/grub-boot-success.timer
+++ b/docs/grub-boot-success.timer
-@@ -1,7 +1,6 @@
- [Unit]
+@@ -2,7 +2,6 @@
Description=Mark boot as successful after the user session has run 2 minutes
ConditionUser=!@system
+ ConditionVirtualization=!container
-ConditionPathExists=/usr/bin/pkexec
[Timer]
OnActiveSec=2min
-diff --git a/docs/org.gnu.grub.policy b/docs/org.gnu.grub.policy
-deleted file mode 100644
-index 18391efc8e7..00000000000
---- a/docs/org.gnu.grub.policy
-+++ /dev/null
-@@ -1,20 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
--<policyconfig>
-- <vendor>GNU GRUB</vendor>
-- <vendor_url>https://www.gnu.org/software/grub/</vendor_url>
-- <action id="org.gnu.grub.set-bootflag">
-- <!-- SECURITY:
-- - A normal active user on the local machine does not need permission
-- to set bootflags to show the menu / mark current boot successful.
-- -->
-- <description>Set GRUB bootflags</description>
-- <message>Authentication is required to modify the bootloaders bootflags</message>
-- <defaults>
-- <allow_any>no</allow_any>
-- <allow_inactive>no</allow_inactive>
-- <allow_active>yes</allow_active>
-- </defaults>
-- <annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/grub2-set-bootflag</annotate>
-- </action>
--</policyconfig>
diff --git a/SOURCES/0257-Fix-the-looking-up-grub.cfg-XXX-while-tftp-booting.patch b/SOURCES/0257-Fix-the-looking-up-grub.cfg-XXX-while-tftp-booting.patch
index 3469f7a..bdf0d9b 100644
--- a/SOURCES/0257-Fix-the-looking-up-grub.cfg-XXX-while-tftp-booting.patch
+++ b/SOURCES/0257-Fix-the-looking-up-grub.cfg-XXX-while-tftp-booting.patch
@@ -22,7 +22,7 @@ Resolves: rhbz#1658500
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index a011b940100..19ff2d486a1 100644
+index a011b9401..19ff2d486 100644
--- a/grub-core/net/net.c
+++ b/grub-core/net/net.c
@@ -1942,11 +1942,9 @@ grub_net_search_configfile (char *config)
diff --git a/SOURCES/0258-HTTP-boot-strncmp-returns-0-on-equal.patch b/SOURCES/0258-HTTP-boot-strncmp-returns-0-on-equal.patch
index e3edefb..c559347 100644
--- a/SOURCES/0258-HTTP-boot-strncmp-returns-0-on-equal.patch
+++ b/SOURCES/0258-HTTP-boot-strncmp-returns-0-on-equal.patch
@@ -9,7 +9,7 @@ Resolves: rhbz#1490991
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/net/efi/http.c b/grub-core/net/efi/http.c
-index 2a9624dacc4..484e0c68cee 100644
+index 2a9624dac..484e0c68c 100644
--- a/grub-core/net/efi/http.c
+++ b/grub-core/net/efi/http.c
@@ -19,7 +19,7 @@ http_configure (struct grub_efi_net_device *dev, int prefer_ip6)
diff --git a/SOURCES/0259-Don-t-duplicate-net-name-string-if-not-needed.patch b/SOURCES/0259-Don-t-duplicate-net-name-string-if-not-needed.patch
index f890e90..4322c8a 100644
--- a/SOURCES/0259-Don-t-duplicate-net-name-string-if-not-needed.patch
+++ b/SOURCES/0259-Don-t-duplicate-net-name-string-if-not-needed.patch
@@ -11,7 +11,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/grub-core/net/efi/http.c b/grub-core/net/efi/http.c
-index 484e0c68cee..de351b2cd03 100644
+index 484e0c68c..de351b2cd 100644
--- a/grub-core/net/efi/http.c
+++ b/grub-core/net/efi/http.c
@@ -394,27 +394,27 @@ grub_efihttp_open (struct grub_efi_net_device *dev,
diff --git a/SOURCES/0260-Try-to-set-fPIE-and-friends-on-libgnu.a.patch b/SOURCES/0260-Try-to-set-fPIE-and-friends-on-libgnu.a.patch
index 17f5179..58ae2ad 100644
--- a/SOURCES/0260-Try-to-set-fPIE-and-friends-on-libgnu.a.patch
+++ b/SOURCES/0260-Try-to-set-fPIE-and-friends-on-libgnu.a.patch
@@ -23,7 +23,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/grub-core/gnulib/Makefile.am b/grub-core/gnulib/Makefile.am
-index b7c5e60e1c3..bd3621930ff 100644
+index b7c5e60e1..bd3621930 100644
--- a/grub-core/gnulib/Makefile.am
+++ b/grub-core/gnulib/Makefile.am
@@ -38,8 +38,8 @@ CLEANFILES =
diff --git a/SOURCES/0261-blscfg-fallback-to-default_kernelopts-if-BLS-option-.patch b/SOURCES/0261-blscfg-fallback-to-default_kernelopts-if-BLS-option-.patch
index 13e589f..9479e70 100644
--- a/SOURCES/0261-blscfg-fallback-to-default_kernelopts-if-BLS-option-.patch
+++ b/SOURCES/0261-blscfg-fallback-to-default_kernelopts-if-BLS-option-.patch
@@ -21,7 +21,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
2 files changed, 9 insertions(+)
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
-index c432c6ba27a..11cc82b6f31 100644
+index c432c6ba2..11cc82b6f 100644
--- a/grub-core/commands/blscfg.c
+++ b/grub-core/commands/blscfg.c
@@ -628,6 +628,9 @@ static char *expand_val(char *value)
@@ -46,7 +46,7 @@ index c432c6ba27a..11cc82b6f31 100644
hotkey = bls_get_val (entry, "grub_hotkey", NULL);
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index da2992ac9f1..04fd8953f40 100644
+index da2992ac9..04fd8953f 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -158,6 +158,8 @@ linux_entry ()
diff --git a/SOURCES/0262-Remove-bogus-load_env-after-blscfg-command-in-10_lin.patch b/SOURCES/0262-Remove-bogus-load_env-after-blscfg-command-in-10_lin.patch
index 7b09d5f..2705087 100644
--- a/SOURCES/0262-Remove-bogus-load_env-after-blscfg-command-in-10_lin.patch
+++ b/SOURCES/0262-Remove-bogus-load_env-after-blscfg-command-in-10_lin.patch
@@ -12,7 +12,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 3 deletions(-)
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 04fd8953f40..58d18504790 100644
+index 04fd8953f..58d185047 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -162,9 +162,6 @@ set default_kernelopts="root=${linux_root_device_thisversion} ro ${args}"
diff --git a/SOURCES/0263-10_linux_bls-use-to-separate-id-argument-due-a-Petit.patch b/SOURCES/0263-10_linux_bls-use-to-separate-id-argument-due-a-Petit.patch
index 2ea8828..23b53d4 100644
--- a/SOURCES/0263-10_linux_bls-use-to-separate-id-argument-due-a-Petit.patch
+++ b/SOURCES/0263-10_linux_bls-use-to-separate-id-argument-due-a-Petit.patch
@@ -19,7 +19,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/util/grub.d/10_linux_bls.in b/util/grub.d/10_linux_bls.in
-index 175bedd0763..8e07a79322b 100644
+index 175bedd07..8e07a7932 100644
--- a/util/grub.d/10_linux_bls.in
+++ b/util/grub.d/10_linux_bls.in
@@ -180,7 +180,7 @@ populate_menu()
diff --git a/SOURCES/0264-10_linux_bls-don-t-add-users-option-to-generated-men.patch b/SOURCES/0264-10_linux_bls-don-t-add-users-option-to-generated-men.patch
index 5b5ecdc..de14031 100644
--- a/SOURCES/0264-10_linux_bls-don-t-add-users-option-to-generated-men.patch
+++ b/SOURCES/0264-10_linux_bls-don-t-add-users-option-to-generated-men.patch
@@ -23,7 +23,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/util/grub.d/10_linux_bls.in b/util/grub.d/10_linux_bls.in
-index 8e07a79322b..855dbdd190b 100644
+index 8e07a7932..855dbdd19 100644
--- a/util/grub.d/10_linux_bls.in
+++ b/util/grub.d/10_linux_bls.in
@@ -180,7 +180,7 @@ populate_menu()
diff --git a/SOURCES/0265-grub-set-bootflag-Update-comment-about-running-as-ro.patch b/SOURCES/0265-grub-set-bootflag-Update-comment-about-running-as-ro.patch
index e1fb2b5..c589b5f 100644
--- a/SOURCES/0265-grub-set-bootflag-Update-comment-about-running-as-ro.patch
+++ b/SOURCES/0265-grub-set-bootflag-Update-comment-about-running-as-ro.patch
@@ -13,7 +13,7 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/util/grub-set-bootflag.c b/util/grub-set-bootflag.c
-index f8dc310909a..32f1c104a2b 100644
+index bb198f023..a0ebd08ca 100644
--- a/util/grub-set-bootflag.c
+++ b/util/grub-set-bootflag.c
@@ -18,7 +18,7 @@
diff --git a/SOURCES/0266-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch b/SOURCES/0266-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch
index 32e07d5..d535a11 100644
--- a/SOURCES/0266-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch
+++ b/SOURCES/0266-grub-set-bootflag-Write-new-env-to-tmpfile-and-then-.patch
@@ -8,25 +8,27 @@ writing the modified grubenv to a tmpfile first and then renaming the
tmpfile over the old grubenv (following symlinks).
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+[rharwood: rebase around updates]
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
---
util/grub-set-bootflag.c | 87 +++++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 78 insertions(+), 9 deletions(-)
diff --git a/util/grub-set-bootflag.c b/util/grub-set-bootflag.c
-index 32f1c104a2b..d3b80a0d204 100644
+index a0ebd08ca..a85f11fce 100644
--- a/util/grub-set-bootflag.c
+++ b/util/grub-set-bootflag.c
-@@ -26,7 +26,9 @@
- #include <config-util.h> /* For *_DIR_NAME defines */
+@@ -27,7 +27,9 @@
#include <grub/types.h>
#include <grub/lib/envblk.h> /* For GRUB_ENVBLK_DEFCFG define */
+ #include <errno.h>
+#include <limits.h>
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-@@ -52,8 +54,10 @@ int main(int argc, char *argv[])
+@@ -53,8 +55,10 @@ int main(int argc, char *argv[])
{
/* NOTE buf must be at least the longest bootflag length + 4 bytes */
char env[GRUBENV_SIZE + 1], buf[64], *s;
@@ -38,7 +40,7 @@ index 32f1c104a2b..d3b80a0d204 100644
FILE *f;
if (argc != 2)
-@@ -75,7 +79,32 @@ int main(int argc, char *argv[])
+@@ -76,7 +80,32 @@ int main(int argc, char *argv[])
bootflag = bootflags[i];
len = strlen (bootflag);
@@ -72,7 +74,7 @@ index 32f1c104a2b..d3b80a0d204 100644
if (!f)
{
perror ("Error opening " GRUBENV " for reading");
-@@ -129,30 +158,70 @@ int main(int argc, char *argv[])
+@@ -131,30 +160,70 @@ int main(int argc, char *argv[])
snprintf(buf, sizeof(buf), "%s=1\n", bootflag);
memcpy(s, buf, len + 3);
diff --git a/SOURCES/0267-Fix-PRIxGRUB_EFI_STATUS-definition.patch b/SOURCES/0267-Fix-PRIxGRUB_EFI_STATUS-definition.patch
index fd71d99..5e3c699 100644
--- a/SOURCES/0267-Fix-PRIxGRUB_EFI_STATUS-definition.patch
+++ b/SOURCES/0267-Fix-PRIxGRUB_EFI_STATUS-definition.patch
@@ -22,7 +22,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index b337e1a193d..6c440c61316 100644
+index b337e1a19..6c440c613 100644
--- a/include/grub/efi/api.h
+++ b/include/grub/efi/api.h
@@ -539,11 +539,16 @@ typedef grub_uint16_t grub_efi_char16_t;
diff --git a/SOURCES/0268-TPM-Print-messages-if-measuraments-fail-as-debug-ins.patch b/SOURCES/0268-TPM-Print-messages-if-measuraments-fail-as-debug-ins.patch
index 45dd94b..5e75acd 100644
--- a/SOURCES/0268-TPM-Print-messages-if-measuraments-fail-as-debug-ins.patch
+++ b/SOURCES/0268-TPM-Print-messages-if-measuraments-fail-as-debug-ins.patch
@@ -16,7 +16,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 30 insertions(+), 28 deletions(-)
diff --git a/grub-core/kern/efi/tpm.c b/grub-core/kern/efi/tpm.c
-index 0d3ebe22e57..5dc90865242 100644
+index 0d3ebe22e..5dc908652 100644
--- a/grub-core/kern/efi/tpm.c
+++ b/grub-core/kern/efi/tpm.c
@@ -161,6 +161,34 @@ grub_tpm_execute(PassThroughToTPM_InputParamBlock *inbuf,
diff --git a/SOURCES/0269-unix-platform-Initialize-variable-to-fix-grub-instal.patch b/SOURCES/0269-unix-platform-Initialize-variable-to-fix-grub-instal.patch
index 8044070..a2382f7 100644
--- a/SOURCES/0269-unix-platform-Initialize-variable-to-fix-grub-instal.patch
+++ b/SOURCES/0269-unix-platform-Initialize-variable-to-fix-grub-instal.patch
@@ -52,7 +52,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/osdep/unix/platform.c b/grub-core/osdep/unix/platform.c
-index ca448bc11a0..55b8f401624 100644
+index ca448bc11..55b8f4016 100644
--- a/grub-core/osdep/unix/platform.c
+++ b/grub-core/osdep/unix/platform.c
@@ -85,7 +85,7 @@ grub_install_remove_efi_entries_by_distributor (const char *efi_distributor)
diff --git a/SOURCES/0270-blscfg-add-a-space-char-when-appending-fields-for-va.patch b/SOURCES/0270-blscfg-add-a-space-char-when-appending-fields-for-va.patch
index 80225c2..cf42b47 100644
--- a/SOURCES/0270-blscfg-add-a-space-char-when-appending-fields-for-va.patch
+++ b/SOURCES/0270-blscfg-add-a-space-char-when-appending-fields-for-va.patch
@@ -19,7 +19,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 18 insertions(+), 13 deletions(-)
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
-index 11cc82b6f31..c92e1c84543 100644
+index 11cc82b6f..c92e1c845 100644
--- a/grub-core/commands/blscfg.c
+++ b/grub-core/commands/blscfg.c
@@ -597,26 +597,29 @@ static char **bls_make_list (struct bls_entry *entry, const char *key, int *num)
diff --git a/SOURCES/0271-efi-http-Export-fw-http-_path-variables-to-make-them.patch b/SOURCES/0271-efi-http-Export-fw-http-_path-variables-to-make-them.patch
index 125ff1b..84cec33 100644
--- a/SOURCES/0271-efi-http-Export-fw-http-_path-variables-to-make-them.patch
+++ b/SOURCES/0271-efi-http-Export-fw-http-_path-variables-to-make-them.patch
@@ -25,7 +25,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
2 files changed, 2 insertions(+)
diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
-index dcf48726d54..9bf6a8b231a 100644
+index dcf48726d..9bf6a8b23 100644
--- a/grub-core/kern/main.c
+++ b/grub-core/kern/main.c
@@ -142,6 +142,7 @@ grub_set_prefix_and_root (void)
@@ -37,7 +37,7 @@ index dcf48726d54..9bf6a8b231a 100644
grub_free (fw_path);
}
diff --git a/grub-core/net/efi/http.c b/grub-core/net/efi/http.c
-index de351b2cd03..755b7a6d054 100644
+index de351b2cd..755b7a6d0 100644
--- a/grub-core/net/efi/http.c
+++ b/grub-core/net/efi/http.c
@@ -39,6 +39,7 @@ http_configure (struct grub_efi_net_device *dev, int prefer_ip6)
diff --git a/SOURCES/0272-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch b/SOURCES/0272-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch
index 4756853..69abcc3 100644
--- a/SOURCES/0272-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch
+++ b/SOURCES/0272-efi-http-Enclose-literal-IPv6-addresses-in-square-br.patch
@@ -43,7 +43,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 28 insertions(+), 9 deletions(-)
diff --git a/grub-core/net/efi/http.c b/grub-core/net/efi/http.c
-index 755b7a6d054..fc8cb25ae0a 100644
+index 755b7a6d0..fc8cb25ae 100644
--- a/grub-core/net/efi/http.c
+++ b/grub-core/net/efi/http.c
@@ -158,13 +158,7 @@ efihttp_request (grub_efi_http_t *http, char *server, char *name, int use_https,
diff --git a/SOURCES/0273-efi-net-Allow-to-specify-a-port-number-in-addresses.patch b/SOURCES/0273-efi-net-Allow-to-specify-a-port-number-in-addresses.patch
index 7d5220f..8b7ae22 100644
--- a/SOURCES/0273-efi-net-Allow-to-specify-a-port-number-in-addresses.patch
+++ b/SOURCES/0273-efi-net-Allow-to-specify-a-port-number-in-addresses.patch
@@ -25,7 +25,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/grub-core/net/efi/net.c b/grub-core/net/efi/net.c
-index 4c70fc4da2a..c74854a82b7 100644
+index 4c70fc4da..c74854a82 100644
--- a/grub-core/net/efi/net.c
+++ b/grub-core/net/efi/net.c
@@ -742,7 +742,7 @@ grub_efi_net_parse_address (const char *address,
diff --git a/SOURCES/0274-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch b/SOURCES/0274-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch
index 31d30a8..1ef97f9 100644
--- a/SOURCES/0274-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch
+++ b/SOURCES/0274-efi-ip4_config-Improve-check-to-detect-literal-IPv6-.patch
@@ -21,7 +21,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/grub-core/net/efi/ip4_config.c b/grub-core/net/efi/ip4_config.c
-index 38e2a04747a..6117e60ab12 100644
+index 38e2a0474..6117e60ab 100644
--- a/grub-core/net/efi/ip4_config.c
+++ b/grub-core/net/efi/ip4_config.c
@@ -56,9 +56,20 @@ int
diff --git a/SOURCES/0275-efi-net-Print-a-debug-message-if-parsing-the-address.patch b/SOURCES/0275-efi-net-Print-a-debug-message-if-parsing-the-address.patch
index 50a9af4..5559b56 100644
--- a/SOURCES/0275-efi-net-Print-a-debug-message-if-parsing-the-address.patch
+++ b/SOURCES/0275-efi-net-Print-a-debug-message-if-parsing-the-address.patch
@@ -22,7 +22,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/grub-core/net/efi/net.c b/grub-core/net/efi/net.c
-index c74854a82b7..3ae1fbbe3c8 100644
+index c74854a82..3ae1fbbe3 100644
--- a/grub-core/net/efi/net.c
+++ b/grub-core/net/efi/net.c
@@ -778,9 +778,9 @@ grub_efi_net_parse_address (const char *address,
diff --git a/SOURCES/0276-efi-Set-image-base-address-before-jumping-to-the-PE-.patch b/SOURCES/0276-efi-Set-image-base-address-before-jumping-to-the-PE-.patch
index 4c5a2e2..e6178ab 100644
--- a/SOURCES/0276-efi-Set-image-base-address-before-jumping-to-the-PE-.patch
+++ b/SOURCES/0276-efi-Set-image-base-address-before-jumping-to-the-PE-.patch
@@ -29,7 +29,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 12 insertions(+)
diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
-index b56ea0bc041..e09f824862b 100644
+index b56ea0bc0..e09f82486 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/SOURCES/0277-envblk-Fix-buffer-overrun-when-attempting-to-shrink-.patch b/SOURCES/0277-envblk-Fix-buffer-overrun-when-attempting-to-shrink-.patch
index f8a73b7..58177e8 100644
--- a/SOURCES/0277-envblk-Fix-buffer-overrun-when-attempting-to-shrink-.patch
+++ b/SOURCES/0277-envblk-Fix-buffer-overrun-when-attempting-to-shrink-.patch
@@ -48,7 +48,7 @@ Patch-cc: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/lib/envblk.c b/grub-core/lib/envblk.c
-index 230e0e9d9ab..2e4e78b132d 100644
+index 230e0e9d9..2e4e78b13 100644
--- a/grub-core/lib/envblk.c
+++ b/grub-core/lib/envblk.c
@@ -143,7 +143,7 @@ grub_envblk_set (grub_envblk_t envblk, const char *name, const char *value)
diff --git a/SOURCES/0278-Reimplement-boot_counter.patch b/SOURCES/0278-Reimplement-boot_counter.patch
index 3be1786..3525c41 100644
--- a/SOURCES/0278-Reimplement-boot_counter.patch
+++ b/SOURCES/0278-Reimplement-boot_counter.patch
@@ -23,7 +23,7 @@ Signed-off-by: Christian Glombek <lorbus@fedoraproject.org>
create mode 100644 util/grub.d/01_fallback_counting.in
diff --git a/Makefile.util.def b/Makefile.util.def
-index 08cc98ddb8b..eca3dfa753f 100644
+index 08cc98ddb..eca3dfa75 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -448,6 +448,12 @@ script = {
@@ -40,7 +40,7 @@ index 08cc98ddb8b..eca3dfa753f 100644
name = '01_menu_auto_hide';
common = util/grub.d/01_menu_auto_hide.in;
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 6864e780fd4..c8a50b4fcfa 100644
+index 6864e780f..c8a50b4fc 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -362,6 +362,11 @@ kernel = {
@@ -57,7 +57,7 @@ index 6864e780fd4..c8a50b4fcfa 100644
mansection = 1;
diff --git a/grub-core/commands/increment.c b/grub-core/commands/increment.c
new file mode 100644
-index 00000000000..79cf137656c
+index 000000000..79cf13765
--- /dev/null
+++ b/grub-core/commands/increment.c
@@ -0,0 +1,105 @@
@@ -168,7 +168,7 @@ index 00000000000..79cf137656c
+}
diff --git a/util/grub.d/01_fallback_counting.in b/util/grub.d/01_fallback_counting.in
new file mode 100644
-index 00000000000..be0e770ea82
+index 000000000..be0e770ea
--- /dev/null
+++ b/util/grub.d/01_fallback_counting.in
@@ -0,0 +1,22 @@
diff --git a/SOURCES/0279-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch b/SOURCES/0279-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch
index 82df575..dadf757 100644
--- a/SOURCES/0279-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch
+++ b/SOURCES/0279-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch
@@ -18,7 +18,7 @@ In menu auto hide script, rename last_boot_ok var to menu_hide_ok
rename util/grub.d/{01_menu_auto_hide.in => 12_menu_auto_hide.in} (58%)
diff --git a/Makefile.util.def b/Makefile.util.def
-index eca3dfa753f..5062a0e50fa 100644
+index eca3dfa75..5062a0e50 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -449,14 +449,14 @@ script = {
@@ -57,7 +57,7 @@ diff --git a/util/grub.d/01_fallback_counting.in b/util/grub.d/08_fallback_count
similarity index 65%
rename from util/grub.d/01_fallback_counting.in
rename to util/grub.d/08_fallback_counting.in
-index be0e770ea82..2e2c3ff7d31 100644
+index be0e770ea..2e2c3ff7d 100644
--- a/util/grub.d/01_fallback_counting.in
+++ b/util/grub.d/08_fallback_counting.in
@@ -1,15 +1,17 @@
@@ -86,7 +86,7 @@ index be0e770ea82..2e2c3ff7d31 100644
set boot_counter=-1
diff --git a/util/grub.d/10_reset_boot_success.in b/util/grub.d/10_reset_boot_success.in
new file mode 100644
-index 00000000000..6c88d933dde
+index 000000000..6c88d933d
--- /dev/null
+++ b/util/grub.d/10_reset_boot_success.in
@@ -0,0 +1,25 @@
@@ -119,7 +119,7 @@ diff --git a/util/grub.d/01_menu_auto_hide.in b/util/grub.d/12_menu_auto_hide.in
similarity index 58%
rename from util/grub.d/01_menu_auto_hide.in
rename to util/grub.d/12_menu_auto_hide.in
-index ad175870a54..6a7c0fa0d43 100644
+index ad175870a..6a7c0fa0d 100644
--- a/util/grub.d/01_menu_auto_hide.in
+++ b/util/grub.d/12_menu_auto_hide.in
@@ -1,5 +1,8 @@
diff --git a/SOURCES/0280-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch b/SOURCES/0280-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch
index 54b73e6..2275981 100644
--- a/SOURCES/0280-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch
+++ b/SOURCES/0280-grub.d-Fix-boot_indeterminate-getting-set-on-boot_su.patch
@@ -47,7 +47,7 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/util/grub.d/10_reset_boot_success.in b/util/grub.d/10_reset_boot_success.in
-index 6c88d933dde..737e1ae5b68 100644
+index 6c88d933d..737e1ae5b 100644
--- a/util/grub.d/10_reset_boot_success.in
+++ b/util/grub.d/10_reset_boot_success.in
@@ -6,18 +6,18 @@
diff --git a/SOURCES/0281-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch b/SOURCES/0281-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch
index 99b66f0..89b4b93 100644
--- a/SOURCES/0281-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch
+++ b/SOURCES/0281-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch
@@ -48,7 +48,7 @@ Upstream-commit-id: 926df817dc8
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/grub-core/script/yylex.l b/grub-core/script/yylex.l
-index 7b44c37b76f..b7203c82309 100644
+index 7b44c37b7..b7203c823 100644
--- a/grub-core/script/yylex.l
+++ b/grub-core/script/yylex.l
@@ -37,11 +37,11 @@
diff --git a/SOURCES/0282-safemath-Add-some-arithmetic-primitives-that-check-f.patch b/SOURCES/0282-safemath-Add-some-arithmetic-primitives-that-check-f.patch
index 84443ae..43bc54f 100644
--- a/SOURCES/0282-safemath-Add-some-arithmetic-primitives-that-check-f.patch
+++ b/SOURCES/0282-safemath-Add-some-arithmetic-primitives-that-check-f.patch
@@ -27,7 +27,7 @@ Upstream-commit-id: de1c315841a
create mode 100644 include/grub/safemath.h
diff --git a/include/grub/compiler.h b/include/grub/compiler.h
-index 9859ff4cc79..ebafec68957 100644
+index 9859ff4cc..ebafec689 100644
--- a/include/grub/compiler.h
+++ b/include/grub/compiler.h
@@ -48,6 +48,14 @@
@@ -47,7 +47,7 @@ index 9859ff4cc79..ebafec68957 100644
#endif /* ! GRUB_COMPILER_HEADER */
diff --git a/include/grub/safemath.h b/include/grub/safemath.h
new file mode 100644
-index 00000000000..c17b89bba17
+index 000000000..c17b89bba
--- /dev/null
+++ b/include/grub/safemath.h
@@ -0,0 +1,37 @@
@@ -89,7 +89,7 @@ index 00000000000..c17b89bba17
+
+#endif /* GRUB_SAFEMATH_H */
diff --git a/INSTALL b/INSTALL
-index f3c20edc844..f8bd9116480 100644
+index f3c20edc8..f8bd91164 100644
--- a/INSTALL
+++ b/INSTALL
@@ -11,27 +11,9 @@ GRUB depends on some software packages installed into your system. If
diff --git a/SOURCES/0283-calloc-Make-sure-we-always-have-an-overflow-checking.patch b/SOURCES/0283-calloc-Make-sure-we-always-have-an-overflow-checking.patch
index 0907a8c..2943790 100644
--- a/SOURCES/0283-calloc-Make-sure-we-always-have-an-overflow-checking.patch
+++ b/SOURCES/0283-calloc-Make-sure-we-always-have-an-overflow-checking.patch
@@ -23,7 +23,7 @@ Upstream-commit-id: 79e51ab7a9a
7 files changed, 85 insertions(+), 3 deletions(-)
diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
-index 3d3a4a4a975..b4072767391 100644
+index 3d3a4a4a9..b40727673 100644
--- a/grub-core/kern/emu/misc.c
+++ b/grub-core/kern/emu/misc.c
@@ -84,6 +84,18 @@ grub_util_error (const char *fmt, ...)
@@ -46,7 +46,7 @@ index 3d3a4a4a975..b4072767391 100644
xmalloc (grub_size_t size)
{
diff --git a/grub-core/kern/emu/mm.c b/grub-core/kern/emu/mm.c
-index f262e95e388..145b01d3719 100644
+index f262e95e3..145b01d37 100644
--- a/grub-core/kern/emu/mm.c
+++ b/grub-core/kern/emu/mm.c
@@ -25,6 +25,16 @@
@@ -67,7 +67,7 @@ index f262e95e388..145b01d3719 100644
grub_malloc (grub_size_t size)
{
diff --git a/grub-core/kern/mm.c b/grub-core/kern/mm.c
-index 002cbfa4f3d..80d0720d005 100644
+index 002cbfa4f..80d0720d0 100644
--- a/grub-core/kern/mm.c
+++ b/grub-core/kern/mm.c
@@ -67,8 +67,10 @@
@@ -134,7 +134,7 @@ index 002cbfa4f3d..80d0720d005 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 beeb661a3c8..74c6eafe525 100644
+index beeb661a3..74c6eafe5 100644
--- a/grub-core/lib/libgcrypt_wrap/mem.c
+++ b/grub-core/lib/libgcrypt_wrap/mem.c
@@ -4,6 +4,7 @@
@@ -170,7 +170,7 @@ index beeb661a3c8..74c6eafe525 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 3b46f47ff50..7a8d385e973 100644
+index 3b46f47ff..7a8d385e9 100644
--- a/grub-core/lib/posix_wrap/stdlib.h
+++ b/grub-core/lib/posix_wrap/stdlib.h
@@ -21,6 +21,7 @@
@@ -196,7 +196,7 @@ index 3b46f47ff50..7a8d385e973 100644
static inline void *
diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
-index a653132e36a..09e1f1065f6 100644
+index a653132e3..09e1f1065 100644
--- a/include/grub/emu/misc.h
+++ b/include/grub/emu/misc.h
@@ -51,6 +51,7 @@ grub_util_device_is_mapped (const char *dev);
@@ -208,7 +208,7 @@ index a653132e36a..09e1f1065f6 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 28e2e53eb32..9c38dd3ca5d 100644
+index 28e2e53eb..9c38dd3ca 100644
--- a/include/grub/mm.h
+++ b/include/grub/mm.h
@@ -29,6 +29,7 @@
diff --git a/SOURCES/0284-calloc-Use-calloc-at-most-places.patch b/SOURCES/0284-calloc-Use-calloc-at-most-places.patch
index 2ba4e1a..bfb800b 100644
--- a/SOURCES/0284-calloc-Use-calloc-at-most-places.patch
+++ b/SOURCES/0284-calloc-Use-calloc-at-most-places.patch
@@ -111,7 +111,7 @@ Upstream-commit-id: 48eeedf1e4b
85 files changed, 231 insertions(+), 191 deletions(-)
diff --git a/grub-core/bus/usb/usbhub.c b/grub-core/bus/usb/usbhub.c
-index 34a7ff1b5f8..a06cce302d2 100644
+index 34a7ff1b5..a06cce302 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 34a7ff1b5f8..a06cce302d2 100644
{
grub_free (hub->devices);
diff --git a/grub-core/commands/efi/lsefisystab.c b/grub-core/commands/efi/lsefisystab.c
-index df103022188..cd81507f5d4 100644
+index df1030221..cd81507f5 100644
--- a/grub-core/commands/efi/lsefisystab.c
+++ b/grub-core/commands/efi/lsefisystab.c
@@ -71,7 +71,8 @@ grub_cmd_lsefisystab (struct grub_command *cmd __attribute__ ((unused)),
@@ -151,7 +151,7 @@ index df103022188..cd81507f5d4 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 f9d7627bdc3..da66a8927c4 100644
+index f9d7627bd..da66a8927 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 f9d7627bdc3..da66a8927c4 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 7004e08ce78..4b5fcf2ce9a 100644
+index 7004e08ce..4b5fcf2ce 100644
--- a/grub-core/commands/menuentry.c
+++ b/grub-core/commands/menuentry.c
@@ -157,7 +157,7 @@ grub_normal_add_menu_entry (int argc, const char **args,
@@ -195,7 +195,7 @@ index 7004e08ce78..4b5fcf2ce9a 100644
goto fail;
diff --git a/grub-core/commands/nativedisk.c b/grub-core/commands/nativedisk.c
-index 2f56a870e68..d69214f6de0 100644
+index 2f56a870e..d69214f6d 100644
--- a/grub-core/commands/nativedisk.c
+++ b/grub-core/commands/nativedisk.c
@@ -194,7 +194,7 @@ grub_cmd_nativedisk (grub_command_t cmd __attribute__ ((unused)),
@@ -208,7 +208,7 @@ index 2f56a870e68..d69214f6de0 100644
return grub_errno;
diff --git a/grub-core/commands/parttool.c b/grub-core/commands/parttool.c
-index 693e2cb42fc..36dadc0b1db 100644
+index 693e2cb42..36dadc0b1 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 693e2cb42fc..36dadc0b1db 100644
if (! parsed[j])
{
diff --git a/grub-core/commands/regexp.c b/grub-core/commands/regexp.c
-index f00b184c81e..4019164f365 100644
+index f00b184c8..4019164f3 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 f00b184c81e..4019164f365 100644
goto fail;
diff --git a/grub-core/commands/search_wrap.c b/grub-core/commands/search_wrap.c
-index d7fd26b9405..47fc8eb9966 100644
+index d7fd26b94..47fc8eb99 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 d7fd26b9405..47fc8eb9966 100644
return grub_errno;
j = 0;
diff --git a/grub-core/disk/diskfilter.c b/grub-core/disk/diskfilter.c
-index 6f901c0adf7..2be019269b1 100644
+index 6f901c0ad..2be019269 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 6f901c0adf7..2be019269b1 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 235c0fe2c76..d887d4b6eee 100644
+index 235c0fe2c..d887d4b6e 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 235c0fe2c76..d887d4b6eee 100644
if (!table)
{
diff --git a/grub-core/disk/ldm.c b/grub-core/disk/ldm.c
-index 2a22d2d6c1c..e6323701ab3 100644
+index 2a22d2d6c..e6323701a 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 2a22d2d6c1c..e6323701ab3 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 86c50c61217..18b3a8bb1d3 100644
+index 86c50c612..18b3a8bb1 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 86c50c61217..18b3a8bb1d3 100644
return grub_errno;
diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c
-index 7b265c780c3..d1df640b311 100644
+index 7b265c780..d1df640b3 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 7b265c780c3..d1df640b311 100644
p = grub_strstr (p, "stripes = [");
diff --git a/grub-core/disk/xen/xendisk.c b/grub-core/disk/xen/xendisk.c
-index b18a9238d87..c1b331edba7 100644
+index b18a9238d..c1b331edb 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 b18a9238d87..c1b331edba7 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 44085ef818e..2b924623f51 100644
+index 44085ef81..2b924623f 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 44085ef818e..2b924623f51 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 52a032f7b2e..9b8e0d0ad1a 100644
+index 52a032f7b..9b8e0d0ad 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 52a032f7b2e..9b8e0d0ad1a 100644
{
grub_efiemu_unload ();
diff --git a/grub-core/font/font.c b/grub-core/font/font.c
-index 53d76a64d04..68967dc1c2b 100644
+index 53d76a64d..68967dc1c 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 53d76a64d04..68967dc1c2b 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 f673897e0fd..91073795f90 100644
+index f673897e0..91073795f 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 f673897e0fd..91073795f90 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 dac73b2fa8b..8c8aa9c3103 100644
+index dac73b2fa..8c8aa9c31 100644
--- a/grub-core/fs/btrfs.c
+++ b/grub-core/fs/btrfs.c
@@ -404,7 +404,7 @@ lower_bound (struct grub_btrfs_data *data,
@@ -518,7 +518,7 @@ index dac73b2fa8b..8c8aa9c3103 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 fc36831789c..3fd4eec202c 100644
+index fc3683178..3fd4eec20 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)
@@ -531,7 +531,7 @@ index fc36831789c..3fd4eec202c 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 21159e858ab..f1cd72398ec 100644
+index 21159e858..f1cd72398 100644
--- a/grub-core/fs/hfsplus.c
+++ b/grub-core/fs/hfsplus.c
@@ -661,6 +661,7 @@ list_nodes (void *record, void *hook_arg)
@@ -634,7 +634,7 @@ index 21159e858ab..f1cd72398ec 100644
grub_free (data);
diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c
-index c9c8374bf61..092b8f409ec 100644
+index c9c8374bf..092b8f409 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)
@@ -647,7 +647,7 @@ index c9c8374bf61..092b8f409ec 100644
return NULL;
diff --git a/grub-core/fs/ntfs.c b/grub-core/fs/ntfs.c
-index 6f846886262..9827f9bb8c4 100644
+index 6f8468862..9827f9bb8 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)
@@ -662,7 +662,7 @@ index 6f846886262..9827f9bb8c4 100644
{
grub_free (buf);
diff --git a/grub-core/fs/sfs.c b/grub-core/fs/sfs.c
-index 57b8d8da60b..663931717fd 100644
+index 57b8d8da6..663931717 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)
@@ -675,7 +675,7 @@ index 57b8d8da60b..663931717fd 100644
{
grub_errno = 0;
diff --git a/grub-core/fs/tar.c b/grub-core/fs/tar.c
-index 39bf197aabe..4864451e19b 100644
+index 39bf197aa..4864451e1 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,
@@ -688,7 +688,7 @@ index 39bf197aabe..4864451e19b 100644
return grub_errno;
grub_free (data->linkname);
diff --git a/grub-core/fs/udf.c b/grub-core/fs/udf.c
-index 00a16098b47..44481da7c6d 100644
+index 00a16098b..44481da7c 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)
@@ -710,7 +710,7 @@ index 00a16098b47..44481da7c6d 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 6e1fff9e9ae..f6b95d4fb02 100644
+index 6e1fff9e9..f6b95d4fb 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,
@@ -732,7 +732,7 @@ index 6e1fff9e9ae..f6b95d4fb02 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 a9a415e3129..ba1e1eab319 100644
+index a9a415e31..ba1e1eab3 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)
@@ -745,7 +745,7 @@ index a9a415e3129..ba1e1eab319 100644
return 0;
diff --git a/grub-core/gfxmenu/widget-box.c b/grub-core/gfxmenu/widget-box.c
-index b6060288914..470597ded2b 100644
+index b60602889..470597ded 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,
@@ -762,7 +762,7 @@ index b6060288914..470597ded2b 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 86ea8cfdea2..7024cda84ea 100644
+index 86ea8cfde..7024cda84 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) */
@@ -775,7 +775,7 @@ index 86ea8cfdea2..7024cda84ea 100644
{
if (h)
diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index 4d36fe31177..b1379b92fb8 100644
+index 4d36fe311..b1379b92f 100644
--- a/grub-core/kern/efi/efi.c
+++ b/grub-core/kern/efi/efi.c
@@ -207,7 +207,7 @@ grub_efi_set_variable(const char *var, const grub_efi_guid_t *guid,
@@ -847,7 +847,7 @@ index 4d36fe31177..b1379b92fb8 100644
grub_errno = GRUB_ERR_NONE;
grub_printf ("/File(%s)", buf);
diff --git a/grub-core/kern/emu/hostdisk.c b/grub-core/kern/emu/hostdisk.c
-index 87e3e251204..f57bd334c9e 100644
+index 87e3e2512..f57bd334c 100644
--- a/grub-core/kern/emu/hostdisk.c
+++ b/grub-core/kern/emu/hostdisk.c
@@ -615,7 +615,7 @@ static char *
@@ -860,7 +860,7 @@ index 87e3e251204..f57bd334c9e 100644
size_t i;
int first = 1;
diff --git a/grub-core/kern/fs.c b/grub-core/kern/fs.c
-index 1bd748be83b..730d21770f2 100644
+index 1bd748be8..730d21770 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)
@@ -873,7 +873,7 @@ index 1bd748be83b..730d21770f2 100644
return 0;
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index aaae9aa0ab7..c034f49f97c 100644
+index aaae9aa0a..c034f49f9 100644
--- a/grub-core/kern/misc.c
+++ b/grub-core/kern/misc.c
@@ -737,7 +737,7 @@ parse_printf_args (const char *fmt0, struct printf_args *args,
@@ -886,7 +886,7 @@ index aaae9aa0ab7..c034f49f97c 100644
{
grub_errno = GRUB_ERR_NONE;
diff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c
-index 78175aac2d3..619db3122a0 100644
+index 78175aac2..619db3122 100644
--- a/grub-core/kern/parser.c
+++ b/grub-core/kern/parser.c
@@ -213,7 +213,7 @@ grub_parser_split_cmdline (const char *cmdline,
@@ -899,7 +899,7 @@ index 78175aac2d3..619db3122a0 100644
{
grub_free (args);
diff --git a/grub-core/kern/uboot/uboot.c b/grub-core/kern/uboot/uboot.c
-index cf0168e62dd..efa10f2849d 100644
+index cf0168e62..efa10f284 100644
--- a/grub-core/kern/uboot/uboot.c
+++ b/grub-core/kern/uboot/uboot.c
@@ -133,7 +133,7 @@ grub_uboot_dev_enum (void)
@@ -912,7 +912,7 @@ index cf0168e62dd..efa10f2849d 100644
return 0;
diff --git a/grub-core/lib/libgcrypt/cipher/ac.c b/grub-core/lib/libgcrypt/cipher/ac.c
-index f5e946a2d8f..63f6fcd11ef 100644
+index f5e946a2d..63f6fcd11 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,
@@ -952,7 +952,7 @@ index f5e946a2d8f..63f6fcd11ef 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 2788e349fa9..b12e79b1922 100644
+index 2788e349f..b12e79b19 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,
@@ -974,7 +974,7 @@ index 2788e349fa9..b12e79b1922 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 910982141e0..ca087ad75b9 100644
+index 910982141..ca087ad75 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)
@@ -996,7 +996,7 @@ index 910982141e0..ca087ad75b9 100644
{
rc = gpg_err_code_from_syserror ();
diff --git a/grub-core/lib/priority_queue.c b/grub-core/lib/priority_queue.c
-index 659be0b7f40..7d5e7c05aab 100644
+index 659be0b7f..7d5e7c05a 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,
@@ -1009,7 +1009,7 @@ index 659be0b7f40..7d5e7c05aab 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 ee9fa7b4feb..467305b46ab 100644
+index ee9fa7b4f..467305b46 100644
--- a/grub-core/lib/reed_solomon.c
+++ b/grub-core/lib/reed_solomon.c
@@ -20,6 +20,7 @@
@@ -1035,7 +1035,7 @@ index ee9fa7b4feb..467305b46ab 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 ea3ebc719b1..5847aac3643 100644
+index ea3ebc719..5847aac36 100644
--- a/grub-core/lib/relocator.c
+++ b/grub-core/lib/relocator.c
@@ -495,9 +495,9 @@ malloc_in_range (struct grub_relocator *rel,
@@ -1071,7 +1071,7 @@ index ea3ebc719b1..5847aac3643 100644
{
grub_free (from);
diff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c
-index b4f609d2d01..ea29d7a724a 100644
+index b4f609d2d..ea29d7a72 100644
--- a/grub-core/loader/arm/linux.c
+++ b/grub-core/loader/arm/linux.c
@@ -77,7 +77,7 @@ linux_prepare_atag (void *target_atag)
@@ -1084,7 +1084,7 @@ index b4f609d2d01..ea29d7a724a 100644
return grub_errno;
diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index 3630b0cbf2d..2da119ad513 100644
+index 3630b0cbf..2da119ad5 100644
--- a/grub-core/loader/efi/chainloader.c
+++ b/grub-core/loader/efi/chainloader.c
@@ -119,18 +119,23 @@ static void
@@ -1115,7 +1115,7 @@ index 3630b0cbf2d..2da119ad513 100644
fp->path_name[size++] = '\0';
fp->header.length = size * sizeof (grub_efi_char16_t) + sizeof (*fp);
diff --git a/grub-core/loader/i386/bsdXX.c b/grub-core/loader/i386/bsdXX.c
-index af6741d157c..a8d8bf7daed 100644
+index af6741d15..a8d8bf7da 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)
@@ -1128,7 +1128,7 @@ index af6741d157c..a8d8bf7daed 100644
return grub_errno;
diff --git a/grub-core/loader/i386/xnu.c b/grub-core/loader/i386/xnu.c
-index 59ef73a7385..ee0eaadc4ee 100644
+index 59ef73a73..ee0eaadc4 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
@@ -1150,7 +1150,7 @@ index 59ef73a7385..ee0eaadc4ee 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 59b195e27ea..f61341af515 100644
+index 59b195e27..f61341af5 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)
@@ -1163,7 +1163,7 @@ index 59b195e27ea..f61341af515 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 70cd1db513e..cc6853692a8 100644
+index 70cd1db51..cc6853692 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)
@@ -1176,7 +1176,7 @@ index 70cd1db513e..cc6853692a8 100644
return grub_errno;
diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c
-index df8dfdb4ba0..dc7d5409e1e 100644
+index df8dfdb4b..dc7d5409e 100644
--- a/grub-core/loader/xnu.c
+++ b/grub-core/loader/xnu.c
@@ -792,7 +792,7 @@ grub_cmd_xnu_mkext (grub_command_t cmd __attribute__ ((unused)),
@@ -1189,7 +1189,7 @@ index df8dfdb4ba0..dc7d5409e1e 100644
{
grub_file_close (file);
diff --git a/grub-core/mmap/mmap.c b/grub-core/mmap/mmap.c
-index 6a31cbae325..57b4e9a72a9 100644
+index 6a31cbae3..57b4e9a72 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)
@@ -1205,7 +1205,7 @@ index 6a31cbae325..57b4e9a72a9 100644
if (! ctx.scanline_events || !present)
{
diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
-index 8b6fc9f2411..adf36fa4a9d 100644
+index 8b6fc9f24..adf36fa4a 100644
--- a/grub-core/net/bootp.c
+++ b/grub-core/net/bootp.c
@@ -1326,7 +1326,7 @@ grub_cmd_bootp (struct grub_command *cmd __attribute__ ((unused)),
@@ -1218,7 +1218,7 @@ index 8b6fc9f2411..adf36fa4a9d 100644
return grub_errno;
diff --git a/grub-core/net/dns.c b/grub-core/net/dns.c
-index 5d9afe093c0..e332d5eb4a4 100644
+index 5d9afe093..e332d5eb4 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)),
@@ -1253,7 +1253,7 @@ index 5d9afe093c0..e332d5eb4a4 100644
return grub_errno;
diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index 19ff2d486a1..0e72bbb9b39 100644
+index 19ff2d486..0e72bbb9b 100644
--- a/grub-core/net/net.c
+++ b/grub-core/net/net.c
@@ -338,8 +338,8 @@ grub_cmd_ipv6_autoconf (struct grub_command *cmd __attribute__ ((unused)),
@@ -1268,7 +1268,7 @@ index 19ff2d486a1..0e72bbb9b39 100644
{
grub_free (ifaces);
diff --git a/grub-core/normal/charset.c b/grub-core/normal/charset.c
-index b0ab47d73fd..d57fb72faa8 100644
+index b0ab47d73..d57fb72fa 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,
@@ -1310,7 +1310,7 @@ index b0ab47d73fd..d57fb72faa8 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 c037d5050ed..c57242e2ea9 100644
+index c037d5050..c57242e2e 100644
--- a/grub-core/normal/cmdline.c
+++ b/grub-core/normal/cmdline.c
@@ -41,7 +41,7 @@ grub_err_t
@@ -1377,7 +1377,7 @@ index c037d5050ed..c57242e2ea9 100644
{
grub_print_error ();
diff --git a/grub-core/normal/menu_entry.c b/grub-core/normal/menu_entry.c
-index 5785f67ee1c..f31487c1f58 100644
+index 5785f67ee..f31487c1f 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)
@@ -1437,7 +1437,7 @@ index 5785f67ee1c..f31487c1f58 100644
{
grub_print_error ();
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index 7681f7d2893..ca135624356 100644
+index 7681f7d28..ca1356243 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,
@@ -1459,7 +1459,7 @@ index 7681f7d2893..ca135624356 100644
/* XXX How to show this error? */
return;
diff --git a/grub-core/normal/term.c b/grub-core/normal/term.c
-index ac5d69f0fb5..93a3a0d912e 100644
+index ac5d69f0f..93a3a0d91 100644
--- a/grub-core/normal/term.c
+++ b/grub-core/normal/term.c
@@ -264,7 +264,7 @@ grub_term_save_pos (void)
@@ -1481,7 +1481,7 @@ index ac5d69f0fb5..93a3a0d912e 100644
grub_error_pop ();
diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
-index 388a0f70638..e450f5f0a4c 100644
+index 388a0f706..e450f5f0a 100644
--- a/grub-core/osdep/linux/getroot.c
+++ b/grub-core/osdep/linux/getroot.c
@@ -176,7 +176,7 @@ grub_util_raid_getmembers (const char *name, int bootable)
@@ -1512,7 +1512,7 @@ index 388a0f70638..e450f5f0a4c 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 b637c58efb7..46a881530c0 100644
+index b637c58ef..46a881530 100644
--- a/grub-core/osdep/unix/config.c
+++ b/grub-core/osdep/unix/config.c
@@ -102,7 +102,7 @@ grub_util_load_config (struct grub_util_config *cfg)
@@ -1525,7 +1525,7 @@ index b637c58efb7..46a881530c0 100644
ptr = script;
memcpy (ptr, ". '", 3);
diff --git a/grub-core/osdep/windows/getroot.c b/grub-core/osdep/windows/getroot.c
-index 661d9546192..eada663b261 100644
+index 661d95461..eada663b2 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)
@@ -1538,7 +1538,7 @@ index 661d9546192..eada663b261 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 6f49df465d7..580b3f2dae7 100644
+index 6f49df465..580b3f2da 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)
@@ -1560,7 +1560,7 @@ index 6f49df465d7..580b3f2dae7 100644
pattern[l] = '\\';
pattern[l + 1] = '*';
diff --git a/grub-core/osdep/windows/init.c b/grub-core/osdep/windows/init.c
-index e8ffd62c6a0..6297de6326a 100644
+index e8ffd62c6..6297de632 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)),
@@ -1573,7 +1573,7 @@ index e8ffd62c6a0..6297de6326a 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 912269191eb..04e0eda9aeb 100644
+index 912269191..04e0eda9a 100644
--- a/grub-core/osdep/windows/platform.c
+++ b/grub-core/osdep/windows/platform.c
@@ -225,8 +225,8 @@ grub_install_register_efi (grub_device_t efidir_grub_dev,
@@ -1588,7 +1588,7 @@ index 912269191eb..04e0eda9aeb 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 cb0861744ae..478e8ef14d5 100644
+index cb0861744..478e8ef14 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)
@@ -1601,7 +1601,7 @@ index cb0861744ae..478e8ef14d5 100644
&& dirwindows[offset] != '/'
&& dirwindows[offset])
diff --git a/grub-core/partmap/gpt.c b/grub-core/partmap/gpt.c
-index 103f6796f39..72a2e37cd48 100644
+index 103f6796f..72a2e37cd 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,
@@ -1614,7 +1614,7 @@ index 103f6796f39..72a2e37cd48 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 6d4b455a19c..81ca6b90e67 100644
+index 6d4b455a1..81ca6b90e 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,
@@ -1627,7 +1627,7 @@ index 6d4b455a19c..81ca6b90e67 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 7d327f59d92..528ddfd36f0 100644
+index 7d327f59d..528ddfd36 100644
--- a/grub-core/script/execute.c
+++ b/grub-core/script/execute.c
@@ -587,7 +587,7 @@ gettext_append (struct grub_script_argv *result, const char *orig_str)
@@ -1640,7 +1640,7 @@ index 7d327f59d92..528ddfd36f0 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 2d60852989c..b5eb516be2d 100644
+index 2d6085298..b5eb516be 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)
@@ -1653,7 +1653,7 @@ index 2d60852989c..b5eb516be2d 100644
return;
diff --git a/grub-core/tests/video_checksum.c b/grub-core/tests/video_checksum.c
-index 74d5b65e5c7..44d0810698a 100644
+index 74d5b65e5..44d081069 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,
@@ -1684,7 +1684,7 @@ index 74d5b65e5c7..44d0810698a 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 4f83c744116..4d3195e017b 100644
+index 4f83c7441..4d3195e01 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,
@@ -1697,7 +1697,7 @@ index 4f83c744116..4d3195e017b 100644
return grub_errno;
diff --git a/grub-core/video/emu/sdl.c b/grub-core/video/emu/sdl.c
-index a2f639f66de..0ebab6f57dd 100644
+index a2f639f66..0ebab6f57 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,
@@ -1710,7 +1710,7 @@ index a2f639f66de..0ebab6f57dd 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 01f47112d37..b2f776c997b 100644
+index 01f47112d..b2f776c99 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,
@@ -1723,7 +1723,7 @@ index 01f47112d37..b2f776c997b 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 e1a01e99fd0..e85df3c1b04 100644
+index e1a01e99f..e85df3c1b 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)
@@ -1736,7 +1736,7 @@ index e1a01e99fd0..e85df3c1b04 100644
return grub_errno;
diff --git a/util/getroot.c b/util/getroot.c
-index fa3460d6cd8..6feb2a4de40 100644
+index fa3460d6c..6feb2a4de 100644
--- a/util/getroot.c
+++ b/util/getroot.c
@@ -219,7 +219,7 @@ make_device_name (const char *drive)
@@ -1749,7 +1749,7 @@ index fa3460d6cd8..6feb2a4de40 100644
for (iptr = drive; *iptr; iptr++)
{
diff --git a/util/grub-file.c b/util/grub-file.c
-index 50c18b6835a..b2e7dd69f4c 100644
+index 50c18b683..b2e7dd69f 100644
--- a/util/grub-file.c
+++ b/util/grub-file.c
@@ -54,7 +54,7 @@ main (int argc, char *argv[])
@@ -1762,7 +1762,7 @@ index 50c18b6835a..b2e7dd69f4c 100644
if (argc == 2 && strcmp (argv[1], "--version") == 0)
{
diff --git a/util/grub-fstest.c b/util/grub-fstest.c
-index a358ae47152..793aefa02b1 100644
+index a358ae471..793aefa02 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)
@@ -1784,7 +1784,7 @@ index a358ae47152..793aefa02b1 100644
argp_parse (&argp, argc, argv, 0, 0, 0);
diff --git a/util/grub-install-common.c b/util/grub-install-common.c
-index 0a2e24a79f1..cf993c059ad 100644
+index 0a2e24a79..cf993c059 100644
--- a/util/grub-install-common.c
+++ b/util/grub-install-common.c
@@ -281,7 +281,7 @@ handle_install_list (struct install_list *il, const char *val,
@@ -1797,7 +1797,7 @@ index 0a2e24a79f1..cf993c059ad 100644
for (ce = il->entries; ; ce++)
{
diff --git a/util/grub-install.c b/util/grub-install.c
-index 16f137ca854..3bf0e063a86 100644
+index 16f137ca8..3bf0e063a 100644
--- a/util/grub-install.c
+++ b/util/grub-install.c
@@ -623,7 +623,7 @@ device_map_check_duplicates (const char *dev_map)
@@ -1819,7 +1819,7 @@ index 16f137ca854..3bf0e063a86 100644
for (curdev = grub_devices, curdrive = grub_drives; *curdev; curdev++,
curdrive++)
diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c
-index a483c674c49..f9aa1a033b5 100644
+index a483c674c..f9aa1a033 100644
--- a/util/grub-mkimagexx.c
+++ b/util/grub-mkimagexx.c
@@ -1999,10 +1999,8 @@ SUFFIX (grub_mkimage_load_image) (const char *kernel_path,
@@ -1836,7 +1836,7 @@ index a483c674c49..f9aa1a033b5 100644
SUFFIX (locate_sections) (e, kernel_path, &smd, layout, image_target);
diff --git a/util/grub-mkrescue.c b/util/grub-mkrescue.c
-index 9545945d8f3..21e72bde474 100644
+index 9545945d8..21e72bde4 100644
--- a/util/grub-mkrescue.c
+++ b/util/grub-mkrescue.c
@@ -441,8 +441,8 @@ main (int argc, char *argv[])
@@ -1851,7 +1851,7 @@ index 9545945d8f3..21e72bde474 100644
xorriso_tail_argc = 0;
/* Program name */
diff --git a/util/grub-mkstandalone.c b/util/grub-mkstandalone.c
-index 4907d44c0bd..edf309717c3 100644
+index 4907d44c0..edf309717 100644
--- a/util/grub-mkstandalone.c
+++ b/util/grub-mkstandalone.c
@@ -296,7 +296,7 @@ main (int argc, char *argv[])
@@ -1864,7 +1864,7 @@ index 4907d44c0bd..edf309717c3 100644
argp_parse (&argp, argc, argv, 0, 0, 0);
diff --git a/util/grub-pe2elf.c b/util/grub-pe2elf.c
-index 0d4084a108e..11331294f1b 100644
+index 0d4084a10..11331294f 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,
@@ -1904,7 +1904,7 @@ index 0d4084a108e..11331294f1b 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 e45dbf9e049..2a8c2cdffd5 100644
+index e45dbf9e0..2a8c2cdff 100644
--- a/util/grub-probe.c
+++ b/util/grub-probe.c
@@ -361,8 +361,8 @@ probe (const char *path, char **device_names, char delim)
@@ -1919,7 +1919,7 @@ index e45dbf9e049..2a8c2cdffd5 100644
for (curdev = device_names, curdrive = drives_names; *curdev; curdev++,
curdrive++)
diff --git a/include/grub/unicode.h b/include/grub/unicode.h
-index a0403e91f9a..4de986a8576 100644
+index a0403e91f..4de986a85 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)
diff --git a/SOURCES/0285-malloc-Use-overflow-checking-primitives-where-we-do-.patch b/SOURCES/0285-malloc-Use-overflow-checking-primitives-where-we-do-.patch
index 13d9ab1..38e4972 100644
--- a/SOURCES/0285-malloc-Use-overflow-checking-primitives-where-we-do-.patch
+++ b/SOURCES/0285-malloc-Use-overflow-checking-primitives-where-we-do-.patch
@@ -56,7 +56,7 @@ Upstream-commit-id: 5fb2befbf04
23 files changed, 383 insertions(+), 113 deletions(-)
diff --git a/grub-core/commands/legacycfg.c b/grub-core/commands/legacycfg.c
-index da66a8927c4..0de070eacc4 100644
+index da66a8927..0de070eac 100644
--- a/grub-core/commands/legacycfg.c
+++ b/grub-core/commands/legacycfg.c
@@ -32,6 +32,7 @@
@@ -119,7 +119,7 @@ index da66a8927c4..0de070eacc4 100644
grub_free (suffix);
return grub_errno;
diff --git a/grub-core/commands/wildcard.c b/grub-core/commands/wildcard.c
-index 02c46f9fdfa..c223411371e 100644
+index 02c46f9fd..c22341137 100644
--- a/grub-core/commands/wildcard.c
+++ b/grub-core/commands/wildcard.c
@@ -23,6 +23,7 @@
@@ -221,7 +221,7 @@ index 02c46f9fdfa..c223411371e 100644
return 1;
}
diff --git a/grub-core/disk/ldm.c b/grub-core/disk/ldm.c
-index e6323701ab3..58f8a53e1ab 100644
+index e6323701a..58f8a53e1 100644
--- a/grub-core/disk/ldm.c
+++ b/grub-core/disk/ldm.c
@@ -25,6 +25,7 @@
@@ -292,7 +292,7 @@ index e6323701ab3..58f8a53e1ab 100644
goto fail2;
comp->segments = t;
diff --git a/grub-core/font/font.c b/grub-core/font/font.c
-index 68967dc1c2b..d63354fb51b 100644
+index 68967dc1c..d63354fb5 100644
--- a/grub-core/font/font.c
+++ b/grub-core/font/font.c
@@ -30,6 +30,7 @@
@@ -319,7 +319,7 @@ index 68967dc1c2b..d63354fb51b 100644
return 0;
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index 8c8aa9c3103..1d801f6c9ee 100644
+index 8c8aa9c31..1d801f6c9 100644
--- a/grub-core/fs/btrfs.c
+++ b/grub-core/fs/btrfs.c
@@ -33,6 +33,7 @@
@@ -376,7 +376,7 @@ index 8c8aa9c3103..1d801f6c9ee 100644
}
}
diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c
-index b8ad75a0ff7..b4bd019f49a 100644
+index b8ad75a0f..b4bd019f4 100644
--- a/grub-core/fs/ext2.c
+++ b/grub-core/fs/ext2.c
@@ -46,6 +46,7 @@
@@ -411,7 +411,7 @@ index b8ad75a0ff7..b4bd019f49a 100644
return 0;
diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c
-index 092b8f409ec..f45841e2b47 100644
+index 092b8f409..f45841e2b 100644
--- a/grub-core/fs/iso9660.c
+++ b/grub-core/fs/iso9660.c
@@ -28,6 +28,7 @@
@@ -515,7 +515,7 @@ index 092b8f409ec..f45841e2b47 100644
grub_free (ctx.filename);
grub_free (node);
diff --git a/grub-core/fs/sfs.c b/grub-core/fs/sfs.c
-index 663931717fd..3ddc6b5e287 100644
+index 663931717..3ddc6b5e2 100644
--- a/grub-core/fs/sfs.c
+++ b/grub-core/fs/sfs.c
@@ -26,6 +26,7 @@
@@ -579,7 +579,7 @@ index 663931717fd..3ddc6b5e287 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 2c967c65a42..f9bef38fc42 100644
+index 2c967c65a..f9bef38fc 100644
--- a/grub-core/fs/squash4.c
+++ b/grub-core/fs/squash4.c
@@ -26,6 +26,7 @@
@@ -678,7 +678,7 @@ index 2c967c65a42..f9bef38fc42 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 44481da7c6d..be41b48f913 100644
+index 44481da7c..be41b48f9 100644
--- a/grub-core/fs/udf.c
+++ b/grub-core/fs/udf.c
@@ -28,6 +28,7 @@
@@ -787,7 +787,7 @@ index 44481da7c6d..be41b48f913 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 3b00c744e23..66e66dd58cc 100644
+index 3b00c744e..66e66dd58 100644
--- a/grub-core/fs/xfs.c
+++ b/grub-core/fs/xfs.c
@@ -25,6 +25,7 @@
@@ -823,7 +823,7 @@ index 3b00c744e23..66e66dd58cc 100644
if (! data)
goto fail;
diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c
-index f6b95d4fb02..c6204367e78 100644
+index f6b95d4fb..c6204367e 100644
--- a/grub-core/fs/zfs/zfs.c
+++ b/grub-core/fs/zfs/zfs.c
@@ -55,6 +55,7 @@
@@ -876,7 +876,7 @@ index f6b95d4fb02..c6204367e78 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 87eef621d6d..f8488c35344 100644
+index 87eef621d..f8488c353 100644
--- a/grub-core/fs/zfs/zfscrypt.c
+++ b/grub-core/fs/zfs/zfscrypt.c
@@ -22,6 +22,7 @@
@@ -903,7 +903,7 @@ index 87eef621d6d..f8488c35344 100644
return grub_errno;
key->is_passphrase = passphrase;
diff --git a/grub-core/lib/arg.c b/grub-core/lib/arg.c
-index fd7744a6ff6..3288609a5e1 100644
+index fd7744a6f..3288609a5 100644
--- a/grub-core/lib/arg.c
+++ b/grub-core/lib/arg.c
@@ -23,6 +23,7 @@
@@ -955,7 +955,7 @@ index fd7744a6ff6..3288609a5e1 100644
return 0;
diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
-index 87709aa23e8..0f317632a3b 100644
+index 87709aa23..0f317632a 100644
--- a/grub-core/loader/i386/bsd.c
+++ b/grub-core/loader/i386/bsd.c
@@ -35,6 +35,7 @@
@@ -985,7 +985,7 @@ index 87709aa23e8..0f317632a3b 100644
return grub_errno;
diff --git a/grub-core/net/dns.c b/grub-core/net/dns.c
-index e332d5eb4a4..906ec7d6782 100644
+index e332d5eb4..906ec7d67 100644
--- a/grub-core/net/dns.c
+++ b/grub-core/net/dns.c
@@ -22,6 +22,7 @@
@@ -1014,7 +1014,7 @@ index e332d5eb4a4..906ec7d6782 100644
return grub_errno;
dns_servers_alloc = na;
diff --git a/grub-core/normal/charset.c b/grub-core/normal/charset.c
-index d57fb72faa8..4dfcc31078d 100644
+index d57fb72fa..4dfcc3107 100644
--- a/grub-core/normal/charset.c
+++ b/grub-core/normal/charset.c
@@ -48,6 +48,7 @@
@@ -1051,7 +1051,7 @@ index d57fb72faa8..4dfcc31078d 100644
continue;
}
diff --git a/grub-core/normal/cmdline.c b/grub-core/normal/cmdline.c
-index c57242e2ea9..de03fe63b3d 100644
+index c57242e2e..de03fe63b 100644
--- a/grub-core/normal/cmdline.c
+++ b/grub-core/normal/cmdline.c
@@ -28,6 +28,7 @@
@@ -1087,7 +1087,7 @@ index c57242e2ea9..de03fe63b3d 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 f31487c1f58..de64a367c4e 100644
+index f31487c1f..de64a367c 100644
--- a/grub-core/normal/menu_entry.c
+++ b/grub-core/normal/menu_entry.c
@@ -27,6 +27,7 @@
@@ -1120,7 +1120,7 @@ index f31487c1f58..de64a367c4e 100644
return 1;
diff --git a/grub-core/script/argv.c b/grub-core/script/argv.c
-index 217ec5d1e1b..5751fdd5708 100644
+index 217ec5d1e..5751fdd57 100644
--- a/grub-core/script/argv.c
+++ b/grub-core/script/argv.c
@@ -20,6 +20,7 @@
@@ -1171,7 +1171,7 @@ index 217ec5d1e1b..5751fdd5708 100644
return 1;
diff --git a/grub-core/script/lexer.c b/grub-core/script/lexer.c
-index c6bd3172fab..5fb0cbd0bc9 100644
+index c6bd3172f..5fb0cbd0b 100644
--- a/grub-core/script/lexer.c
+++ b/grub-core/script/lexer.c
@@ -24,6 +24,7 @@
@@ -1232,7 +1232,7 @@ index c6bd3172fab..5fb0cbd0bc9 100644
}
diff --git a/grub-core/video/bitmap.c b/grub-core/video/bitmap.c
-index b2e0315665b..6256e209a6b 100644
+index b2e031566..6256e209a 100644
--- a/grub-core/video/bitmap.c
+++ b/grub-core/video/bitmap.c
@@ -23,6 +23,7 @@
@@ -1287,7 +1287,7 @@ index b2e0315665b..6256e209a6b 100644
/* Frees all resources allocated by bitmap. */
diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c
-index e85df3c1b04..719e647e44f 100644
+index e85df3c1b..719e647e4 100644
--- a/grub-core/video/readers/png.c
+++ b/grub-core/video/readers/png.c
@@ -23,6 +23,7 @@
diff --git a/SOURCES/0286-iso9660-Don-t-leak-memory-on-realloc-failures.patch b/SOURCES/0286-iso9660-Don-t-leak-memory-on-realloc-failures.patch
index 33896cb..3360289 100644
--- a/SOURCES/0286-iso9660-Don-t-leak-memory-on-realloc-failures.patch
+++ b/SOURCES/0286-iso9660-Don-t-leak-memory-on-realloc-failures.patch
@@ -11,7 +11,7 @@ Upstream-commit-id: f2bd30b2fe7
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c
-index f45841e2b47..6fc9302bce3 100644
+index f45841e2b..6fc9302bc 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/SOURCES/0287-font-Do-not-load-more-than-one-NAME-section.patch b/SOURCES/0287-font-Do-not-load-more-than-one-NAME-section.patch
index 302e3ea..043a1f0 100644
--- a/SOURCES/0287-font-Do-not-load-more-than-one-NAME-section.patch
+++ b/SOURCES/0287-font-Do-not-load-more-than-one-NAME-section.patch
@@ -17,7 +17,7 @@ Upstream-commit-id: 482814113dc
1 file changed, 6 insertions(+)
diff --git a/grub-core/font/font.c b/grub-core/font/font.c
-index d63354fb51b..a7b955a1a74 100644
+index d63354fb5..a7b955a1a 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/SOURCES/0288-gfxmenu-Fix-double-free-in-load_image.patch b/SOURCES/0288-gfxmenu-Fix-double-free-in-load_image.patch
index 97416b9..0e0d1c6 100644
--- a/SOURCES/0288-gfxmenu-Fix-double-free-in-load_image.patch
+++ b/SOURCES/0288-gfxmenu-Fix-double-free-in-load_image.patch
@@ -16,7 +16,7 @@ Upstream-commit-id: 5d3e84b15a4
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/grub-core/gfxmenu/gui_image.c b/grub-core/gfxmenu/gui_image.c
-index 29784ed2d9a..6b2e976f16e 100644
+index 29784ed2d..6b2e976f1 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/SOURCES/0289-xnu-Fix-double-free-in-grub_xnu_devprop_add_property.patch b/SOURCES/0289-xnu-Fix-double-free-in-grub_xnu_devprop_add_property.patch
index a97277c..fc4fe29 100644
--- a/SOURCES/0289-xnu-Fix-double-free-in-grub_xnu_devprop_add_property.patch
+++ b/SOURCES/0289-xnu-Fix-double-free-in-grub_xnu_devprop_add_property.patch
@@ -18,7 +18,7 @@ Upstream-commit-id: 4d5e2d13519
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/grub-core/loader/i386/xnu.c b/grub-core/loader/i386/xnu.c
-index ee0eaadc4ee..c760db30fc0 100644
+index ee0eaadc4..c760db30f 100644
--- a/grub-core/loader/i386/xnu.c
+++ b/grub-core/loader/i386/xnu.c
@@ -262,20 +262,19 @@ grub_xnu_devprop_add_property (struct grub_xnu_devprop_device_descriptor *dev,
diff --git a/SOURCES/0290-lzma-Make-sure-we-don-t-dereference-past-array.patch b/SOURCES/0290-lzma-Make-sure-we-don-t-dereference-past-array.patch
index d5a31f5..b1346ac 100644
--- a/SOURCES/0290-lzma-Make-sure-we-don-t-dereference-past-array.patch
+++ b/SOURCES/0290-lzma-Make-sure-we-don-t-dereference-past-array.patch
@@ -22,7 +22,7 @@ Upstream-commit-id: f91e043bda4
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/grub-core/lib/LzmaEnc.c b/grub-core/lib/LzmaEnc.c
-index f2ec04a8c28..753e56a95e3 100644
+index f2ec04a8c..753e56a95 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/SOURCES/0291-term-Fix-overflow-on-user-inputs.patch b/SOURCES/0291-term-Fix-overflow-on-user-inputs.patch
index b381e45..031f348 100644
--- a/SOURCES/0291-term-Fix-overflow-on-user-inputs.patch
+++ b/SOURCES/0291-term-Fix-overflow-on-user-inputs.patch
@@ -28,7 +28,7 @@ Upstream-commit-id: 98dfa546777
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/grub-core/term/terminfo.c b/grub-core/term/terminfo.c
-index 537a5c0cb0b..44d0b3b19fb 100644
+index 537a5c0cb..44d0b3b19 100644
--- a/grub-core/term/terminfo.c
+++ b/grub-core/term/terminfo.c
@@ -398,7 +398,7 @@ grub_terminfo_getwh (struct grub_term_output *term)
diff --git a/SOURCES/0292-udf-Fix-memory-leak.patch b/SOURCES/0292-udf-Fix-memory-leak.patch
index 452ff61..13427d6 100644
--- a/SOURCES/0292-udf-Fix-memory-leak.patch
+++ b/SOURCES/0292-udf-Fix-memory-leak.patch
@@ -14,7 +14,7 @@ Upstream-commit-id: 8da62d8183c
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/grub-core/fs/udf.c b/grub-core/fs/udf.c
-index be41b48f913..6670beb5665 100644
+index be41b48f9..6670beb56 100644
--- a/grub-core/fs/udf.c
+++ b/grub-core/fs/udf.c
@@ -965,8 +965,10 @@ grub_udf_iterate_dir (grub_fshelp_node_t dir,
diff --git a/SOURCES/0293-multiboot2-Fix-memory-leak-if-grub_create_loader_cmd.patch b/SOURCES/0293-multiboot2-Fix-memory-leak-if-grub_create_loader_cmd.patch
index a99103c..b464aaa 100644
--- a/SOURCES/0293-multiboot2-Fix-memory-leak-if-grub_create_loader_cmd.patch
+++ b/SOURCES/0293-multiboot2-Fix-memory-leak-if-grub_create_loader_cmd.patch
@@ -14,7 +14,7 @@ Upstream-commit-id: cd6760b6289
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c
-index 54078455e2f..872dcd42e97 100644
+index 54078455e..872dcd42e 100644
--- a/grub-core/loader/multiboot_mbi2.c
+++ b/grub-core/loader/multiboot_mbi2.c
@@ -1089,6 +1089,7 @@ grub_multiboot2_add_module (grub_addr_t start, grub_size_t size,
diff --git a/SOURCES/0294-tftp-Do-not-use-priority-queue.patch b/SOURCES/0294-tftp-Do-not-use-priority-queue.patch
index 13981f4..38d1523 100644
--- a/SOURCES/0294-tftp-Do-not-use-priority-queue.patch
+++ b/SOURCES/0294-tftp-Do-not-use-priority-queue.patch
@@ -35,7 +35,7 @@ Upstream-commit-id: 8316694c4f7
1 file changed, 54 insertions(+), 120 deletions(-)
diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
-index e267af354f4..79c16f9b041 100644
+index e267af354..79c16f9b0 100644
--- a/grub-core/net/tftp.c
+++ b/grub-core/net/tftp.c
@@ -25,7 +25,6 @@
diff --git a/SOURCES/0295-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch b/SOURCES/0295-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch
index aabb138..7a03461 100644
--- a/SOURCES/0295-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch
+++ b/SOURCES/0295-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch
@@ -20,7 +20,7 @@ Upstream-commit-id: ebb15735f10
4 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
-index 76304f05700..b4a30f607fa 100644
+index 76304f057..b4a30f607 100644
--- a/grub-core/loader/i386/linux.c
+++ b/grub-core/loader/i386/linux.c
@@ -37,6 +37,7 @@
@@ -48,7 +48,7 @@ index 76304f05700..b4a30f607fa 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 783a3cd93bc..540891371f9 100644
+index 783a3cd93..540891371 100644
--- a/grub-core/loader/i386/pc/linux.c
+++ b/grub-core/loader/i386/pc/linux.c
@@ -36,6 +36,7 @@
@@ -75,7 +75,7 @@ index 783a3cd93bc..540891371f9 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 3073f64d5e5..85b93347b25 100644
+index 3073f64d5..85b93347b 100644
--- a/grub-core/loader/i386/xen.c
+++ b/grub-core/loader/i386/xen.c
@@ -40,6 +40,7 @@
@@ -112,7 +112,7 @@ index 3073f64d5e5..85b93347b25 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 dc7d5409e1e..2bf02489bad 100644
+index dc7d5409e..2bf02489b 100644
--- a/grub-core/loader/xnu.c
+++ b/grub-core/loader/xnu.c
@@ -34,6 +34,7 @@
diff --git a/SOURCES/0296-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch b/SOURCES/0296-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch
index 16441e5..abab3aa 100644
--- a/SOURCES/0296-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch
+++ b/SOURCES/0296-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch
@@ -36,7 +36,7 @@ Upstream-commit-id: 10498c8ba17
13 files changed, 69 insertions(+), 58 deletions(-)
diff --git a/grub-core/lib/i386/relocator.c b/grub-core/lib/i386/relocator.c
-index 71dd4f0ab0c..34cbe834fa3 100644
+index 71dd4f0ab..34cbe834f 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,
@@ -89,7 +89,7 @@ index 71dd4f0ab0c..34cbe834fa3 100644
return err;
diff --git a/grub-core/lib/mips/relocator.c b/grub-core/lib/mips/relocator.c
-index 9d5f49cb93a..743b213e695 100644
+index 9d5f49cb9..743b213e6 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,
@@ -106,7 +106,7 @@ index 9d5f49cb93a..743b213e695 100644
if (err)
return err;
diff --git a/grub-core/lib/powerpc/relocator.c b/grub-core/lib/powerpc/relocator.c
-index bdf2b111be7..8ffb8b68683 100644
+index bdf2b111b..8ffb8b686 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,
@@ -123,7 +123,7 @@ index bdf2b111be7..8ffb8b68683 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 3caef7a4021..7d200a125ee 100644
+index 3caef7a40..7d200a125 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,
@@ -141,7 +141,7 @@ index 3caef7a4021..7d200a125ee 100644
return err;
diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
-index b4a30f607fa..191f1631e88 100644
+index b4a30f607..191f1631e 100644
--- a/grub-core/loader/i386/linux.c
+++ b/grub-core/loader/i386/linux.c
@@ -231,9 +231,8 @@ allocate_pages (grub_size_t prot_size, grub_size_t *align,
@@ -157,7 +157,7 @@ index b4a30f607fa..191f1631e88 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 ca85358f771..9d3466d6ace 100644
+index ca85358f7..9d3466d6a 100644
--- a/grub-core/loader/i386/multiboot_mbi.c
+++ b/grub-core/loader/i386/multiboot_mbi.c
@@ -470,10 +470,9 @@ grub_multiboot_make_mbi (grub_uint32_t *target)
@@ -175,7 +175,7 @@ index ca85358f771..9d3466d6ace 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 540891371f9..63736fae950 100644
+index 540891371..63736fae9 100644
--- a/grub-core/loader/i386/pc/linux.c
+++ b/grub-core/loader/i386/pc/linux.c
@@ -460,10 +460,8 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
@@ -192,7 +192,7 @@ index 540891371f9..63736fae950 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 5f383be3d07..27c1db84a44 100644
+index 5f383be3d..27c1db84a 100644
--- a/grub-core/loader/mips/linux.c
+++ b/grub-core/loader/mips/linux.c
@@ -434,12 +434,9 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
@@ -212,7 +212,7 @@ index 5f383be3d07..27c1db84a44 100644
if (err)
goto fail;
diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c
-index 9a8dae5565b..f455e803910 100644
+index 9a8dae556..f455e8039 100644
--- a/grub-core/loader/multiboot.c
+++ b/grub-core/loader/multiboot.c
@@ -407,7 +407,7 @@ grub_cmd_module (grub_command_t cmd __attribute__ ((unused)),
@@ -225,7 +225,7 @@ index 9a8dae5565b..f455e803910 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 cc6853692a8..f2318e0d165 100644
+index cc6853692..f2318e0d1 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)
@@ -253,7 +253,7 @@ index cc6853692a8..f2318e0d165 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 872dcd42e97..3cfb47650a0 100644
+index 872dcd42e..3cfb47650 100644
--- a/grub-core/loader/multiboot_mbi2.c
+++ b/grub-core/loader/multiboot_mbi2.c
@@ -298,10 +298,10 @@ grub_multiboot2_load (grub_file_t file, const char *filename)
@@ -281,7 +281,7 @@ index 872dcd42e97..3cfb47650a0 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 534a74438b2..99119558d21 100644
+index 534a74438..99119558d 100644
--- a/grub-core/loader/xnu_resume.c
+++ b/grub-core/loader/xnu_resume.c
@@ -129,7 +129,7 @@ grub_xnu_resume (char *imagename)
@@ -294,7 +294,7 @@ index 534a74438b2..99119558d21 100644
GRUB_XNU_PAGESIZE,
GRUB_RELOCATOR_PREFERENCE_NONE, 0);
diff --git a/include/grub/relocator.h b/include/grub/relocator.h
-index 24d8672d22c..1b3bdd92ac6 100644
+index 24d8672d2..1b3bdd92a 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/SOURCES/0297-script-Remove-unused-fields-from-grub_script_functio.patch b/SOURCES/0297-script-Remove-unused-fields-from-grub_script_functio.patch
index 93beaac..3c9e704 100644
--- a/SOURCES/0297-script-Remove-unused-fields-from-grub_script_functio.patch
+++ b/SOURCES/0297-script-Remove-unused-fields-from-grub_script_functio.patch
@@ -11,7 +11,7 @@ Upstream-commit-id: d04089c8e52
1 file changed, 5 deletions(-)
diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
-index 360c2be1f05..b382bcf09bc 100644
+index 360c2be1f..b382bcf09 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -359,13 +359,8 @@ struct grub_script_function
diff --git a/SOURCES/0298-script-Avoid-a-use-after-free-when-redefining-a-func.patch b/SOURCES/0298-script-Avoid-a-use-after-free-when-redefining-a-func.patch
index 036db39..6f4b1e3 100644
--- a/SOURCES/0298-script-Avoid-a-use-after-free-when-redefining-a-func.patch
+++ b/SOURCES/0298-script-Avoid-a-use-after-free-when-redefining-a-func.patch
@@ -28,7 +28,7 @@ Upstream-commit-id: f6253a1f540
4 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
-index 528ddfd36f0..a1aadb9ee05 100644
+index 528ddfd36..a1aadb9ee 100644
--- a/grub-core/script/execute.c
+++ b/grub-core/script/execute.c
@@ -872,7 +872,9 @@ grub_script_function_call (grub_script_function_t func, int argc, char **args)
@@ -42,7 +42,7 @@ index 528ddfd36f0..a1aadb9ee05 100644
function_return = 0;
active_loops = loops;
diff --git a/grub-core/script/function.c b/grub-core/script/function.c
-index d36655e510f..3aad04bf9dd 100644
+index d36655e51..3aad04bf9 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,
@@ -77,7 +77,7 @@ index d36655e510f..3aad04bf9dd 100644
else
{
diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
-index b382bcf09bc..6c48e075122 100644
+index b382bcf09..6c48e0751 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -361,6 +361,8 @@ struct grub_script_function
@@ -90,7 +90,7 @@ index b382bcf09bc..6c48e075122 100644
typedef struct grub_script_function *grub_script_function_t;
diff --git a/grub-core/script/parser.y b/grub-core/script/parser.y
-index 4f0ab8319e3..f80b86b6f15 100644
+index 4f0ab8319..f80b86b6f 100644
--- a/grub-core/script/parser.y
+++ b/grub-core/script/parser.y
@@ -289,7 +289,8 @@ function: "function" "name"
diff --git a/SOURCES/0299-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch b/SOURCES/0299-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch
index 850fef7..eff2fb9 100644
--- a/SOURCES/0299-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch
+++ b/SOURCES/0299-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch
@@ -27,7 +27,7 @@ Upstream-commit-id: ab80a97eb1f
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/grub-core/lib/relocator.c b/grub-core/lib/relocator.c
-index 5847aac3643..f2c1944c28d 100644
+index 5847aac36..f2c1944c2 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/SOURCES/0300-hfsplus-fix-two-more-overflows.patch b/SOURCES/0300-hfsplus-fix-two-more-overflows.patch
index 876a364..f9232c0 100644
--- a/SOURCES/0300-hfsplus-fix-two-more-overflows.patch
+++ b/SOURCES/0300-hfsplus-fix-two-more-overflows.patch
@@ -16,7 +16,7 @@ Upstream-commit-id: b4915078903
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/grub-core/fs/hfsplus.c b/grub-core/fs/hfsplus.c
-index f1cd72398ec..8b17ebba296 100644
+index f1cd72398..8b17ebba2 100644
--- a/grub-core/fs/hfsplus.c
+++ b/grub-core/fs/hfsplus.c
@@ -31,6 +31,7 @@
diff --git a/SOURCES/0301-lvm-fix-two-more-potential-data-dependent-alloc-over.patch b/SOURCES/0301-lvm-fix-two-more-potential-data-dependent-alloc-over.patch
index 9f2fb28..5300a55 100644
--- a/SOURCES/0301-lvm-fix-two-more-potential-data-dependent-alloc-over.patch
+++ b/SOURCES/0301-lvm-fix-two-more-potential-data-dependent-alloc-over.patch
@@ -17,7 +17,7 @@ Upstream-commit-id: 45ec6046ea0
1 file changed, 40 insertions(+), 8 deletions(-)
diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c
-index d1df640b311..ca09d469990 100644
+index d1df640b3..ca09d4699 100644
--- a/grub-core/disk/lvm.c
+++ b/grub-core/disk/lvm.c
@@ -25,6 +25,7 @@
diff --git a/SOURCES/0302-emu-make-grub_free-NULL-safe.patch b/SOURCES/0302-emu-make-grub_free-NULL-safe.patch
index 64ecc34..01cfe58 100644
--- a/SOURCES/0302-emu-make-grub_free-NULL-safe.patch
+++ b/SOURCES/0302-emu-make-grub_free-NULL-safe.patch
@@ -16,7 +16,7 @@ Upstream-commit-id: 96bb109e658
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/grub-core/kern/emu/mm.c b/grub-core/kern/emu/mm.c
-index 145b01d3719..4d1046a219e 100644
+index 145b01d37..4d1046a21 100644
--- a/grub-core/kern/emu/mm.c
+++ b/grub-core/kern/emu/mm.c
@@ -60,7 +60,8 @@ grub_zalloc (grub_size_t size)
diff --git a/SOURCES/0303-efi-fix-some-malformed-device-path-arithmetic-errors.patch b/SOURCES/0303-efi-fix-some-malformed-device-path-arithmetic-errors.patch
index 3581152..5103046 100644
--- a/SOURCES/0303-efi-fix-some-malformed-device-path-arithmetic-errors.patch
+++ b/SOURCES/0303-efi-fix-some-malformed-device-path-arithmetic-errors.patch
@@ -25,7 +25,7 @@ Upstream-commit-id: 23e68a83990
4 files changed, 88 insertions(+), 21 deletions(-)
diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index b1379b92fb8..03de9cb14e7 100644
+index b1379b92f..03de9cb14 100644
--- a/grub-core/kern/efi/efi.c
+++ b/grub-core/kern/efi/efi.c
@@ -344,7 +344,7 @@ grub_efi_get_filename (grub_efi_device_path_t *dp0)
@@ -151,7 +151,7 @@ index b1379b92fb8..03de9cb14e7 100644
return 0;
}
diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index 2da119ad513..c2411b6dab2 100644
+index 2da119ad5..c2411b6da 100644
--- a/grub-core/loader/efi/chainloader.c
+++ b/grub-core/loader/efi/chainloader.c
@@ -125,6 +125,12 @@ copy_file_path (grub_efi_file_path_device_path_t *fp,
@@ -189,7 +189,7 @@ index 2da119ad513..c2411b6dab2 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 c760db30fc0..44f7ebfa2b6 100644
+index c760db30f..44f7ebfa2 100644
--- a/grub-core/loader/i386/xnu.c
+++ b/grub-core/loader/i386/xnu.c
@@ -515,14 +515,15 @@ grub_cmd_devprop_load (grub_command_t cmd __attribute__ ((unused)),
@@ -213,7 +213,7 @@ index c760db30fc0..44f7ebfa2b6 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 6c440c61316..a092fddb629 100644
+index 6c440c613..a092fddb6 100644
--- a/include/grub/efi/api.h
+++ b/include/grub/efi/api.h
@@ -671,6 +671,7 @@ typedef struct grub_efi_device_path grub_efi_device_path_protocol_t;
diff --git a/SOURCES/0304-Fix-a-regression-caused-by-efi-fix-some-malformed-de.patch b/SOURCES/0304-Fix-a-regression-caused-by-efi-fix-some-malformed-de.patch
index 1fcf580..5682b8a 100644
--- a/SOURCES/0304-Fix-a-regression-caused-by-efi-fix-some-malformed-de.patch
+++ b/SOURCES/0304-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, 14 insertions(+), 12 deletions(-)
diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index c2411b6dab2..8b99cf23e9d 100644
+index c2411b6da..8b99cf23e 100644
--- a/grub-core/loader/efi/chainloader.c
+++ b/grub-core/loader/efi/chainloader.c
@@ -115,7 +115,7 @@ grub_chainloader_boot (void)
diff --git a/SOURCES/0305-update-safemath-with-fallback-code-for-gcc-older-tha.patch b/SOURCES/0305-update-safemath-with-fallback-code-for-gcc-older-tha.patch
index d0feb8c..50ed132 100644
--- a/SOURCES/0305-update-safemath-with-fallback-code-for-gcc-older-tha.patch
+++ b/SOURCES/0305-update-safemath-with-fallback-code-for-gcc-older-tha.patch
@@ -16,7 +16,7 @@ Signed-off-by: Alex Burmashev <alexander.burmashev@oracle.com>
1 file changed, 118 insertions(+), 1 deletion(-)
diff --git a/include/grub/safemath.h b/include/grub/safemath.h
-index c17b89bba17..1ccac276b59 100644
+index c17b89bba..1ccac276b 100644
--- a/include/grub/safemath.h
+++ b/include/grub/safemath.h
@@ -31,7 +31,124 @@
diff --git a/SOURCES/0306-efi-Fix-use-after-free-in-halt-reboot-path.patch b/SOURCES/0306-efi-Fix-use-after-free-in-halt-reboot-path.patch
index 7a06e60..7080ac5 100644
--- a/SOURCES/0306-efi-Fix-use-after-free-in-halt-reboot-path.patch
+++ b/SOURCES/0306-efi-Fix-use-after-free-in-halt-reboot-path.patch
@@ -51,7 +51,7 @@ Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
8 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/grub-core/kern/arm/efi/init.c b/grub-core/kern/arm/efi/init.c
-index 06df60e2f0e..40c3b467fc6 100644
+index 06df60e2f..40c3b467f 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)
@@ -63,7 +63,7 @@ index 06df60e2f0e..40c3b467fc6 100644
+ grub_efi_memory_fini ();
}
diff --git a/grub-core/kern/arm64/efi/init.c b/grub-core/kern/arm64/efi/init.c
-index 6224999ec9c..5010caefd66 100644
+index 6224999ec..5010caefd 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)
@@ -75,7 +75,7 @@ index 6224999ec9c..5010caefd66 100644
+ grub_efi_memory_fini ();
}
diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index 03de9cb14e7..5dfcf943322 100644
+index 03de9cb14..5dfcf9433 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)
@@ -89,7 +89,7 @@ index 03de9cb14e7..5dfcf943322 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 e6183a4c44d..79243b364a1 100644
+index e6183a4c4..79243b364 100644
--- a/grub-core/kern/efi/init.c
+++ b/grub-core/kern/efi/init.c
@@ -136,5 +136,4 @@ grub_efi_fini (void)
@@ -99,7 +99,7 @@ index e6183a4c44d..79243b364a1 100644
- grub_efi_memory_fini ();
}
diff --git a/grub-core/kern/i386/efi/init.c b/grub-core/kern/i386/efi/init.c
-index a28316cc640..46476e27eae 100644
+index a28316cc6..46476e27e 100644
--- a/grub-core/kern/i386/efi/init.c
+++ b/grub-core/kern/i386/efi/init.c
@@ -38,6 +38,11 @@ grub_machine_init (void)
@@ -117,7 +117,7 @@ index a28316cc640..46476e27eae 100644
+ grub_efi_memory_fini ();
}
diff --git a/grub-core/kern/ia64/efi/init.c b/grub-core/kern/ia64/efi/init.c
-index b5ecbd09121..f1965571b1d 100644
+index b5ecbd091..f1965571b 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)
@@ -135,7 +135,7 @@ index b5ecbd09121..f1965571b1d 100644
+ grub_efi_memory_fini ();
}
diff --git a/grub-core/lib/efi/halt.c b/grub-core/lib/efi/halt.c
-index e9441c844ac..a69a77681e3 100644
+index e9441c844..a69a77681 100644
--- a/grub-core/lib/efi/halt.c
+++ b/grub-core/lib/efi/halt.c
@@ -28,7 +28,8 @@
@@ -149,7 +149,7 @@ index e9441c844ac..a69a77681e3 100644
grub_acpi_halt ();
#endif
diff --git a/include/grub/loader.h b/include/grub/loader.h
-index 7f82a499fd9..b208642821b 100644
+index 7f82a499f..b20864282 100644
--- a/include/grub/loader.h
+++ b/include/grub/loader.h
@@ -33,6 +33,7 @@ enum
diff --git a/SOURCES/0307-efi-dhcp-fix-some-allocation-error-checking.patch b/SOURCES/0307-efi-dhcp-fix-some-allocation-error-checking.patch
index 7549733..b705d12 100644
--- a/SOURCES/0307-efi-dhcp-fix-some-allocation-error-checking.patch
+++ b/SOURCES/0307-efi-dhcp-fix-some-allocation-error-checking.patch
@@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/grub-core/net/efi/dhcp.c b/grub-core/net/efi/dhcp.c
-index dbef63d8c08..e5c79b748b0 100644
+index dbef63d8c..e5c79b748 100644
--- a/grub-core/net/efi/dhcp.c
+++ b/grub-core/net/efi/dhcp.c
@@ -80,7 +80,7 @@ grub_efi_dhcp4_parse_dns (grub_efi_dhcp4_protocol_t *dhcp4, grub_efi_dhcp4_packe
diff --git a/SOURCES/0308-efi-http-fix-some-allocation-error-checking.patch b/SOURCES/0308-efi-http-fix-some-allocation-error-checking.patch
index 4dffab9..6aa40dd 100644
--- a/SOURCES/0308-efi-http-fix-some-allocation-error-checking.patch
+++ b/SOURCES/0308-efi-http-fix-some-allocation-error-checking.patch
@@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/grub-core/net/efi/http.c b/grub-core/net/efi/http.c
-index fc8cb25ae0a..26647a50fa4 100644
+index fc8cb25ae..26647a50f 100644
--- a/grub-core/net/efi/http.c
+++ b/grub-core/net/efi/http.c
@@ -412,8 +412,8 @@ grub_efihttp_open (struct grub_efi_net_device *dev,
diff --git a/SOURCES/0309-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch b/SOURCES/0309-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch
index 28cb49f..6886f98 100644
--- a/SOURCES/0309-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch
+++ b/SOURCES/0309-efi-ip-46-_config.c-fix-some-potential-allocation-ov.patch
@@ -13,7 +13,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
2 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/grub-core/net/efi/ip4_config.c b/grub-core/net/efi/ip4_config.c
-index 6117e60ab12..5ea5ed03925 100644
+index 6117e60ab..5ea5ed039 100644
--- a/grub-core/net/efi/ip4_config.c
+++ b/grub-core/net/efi/ip4_config.c
@@ -4,15 +4,20 @@
@@ -82,7 +82,7 @@ index 6117e60ab12..5ea5ed03925 100644
char *subnet, *gateway, *mask;
grub_uint32_t u32_subnet, u32_gateway;
diff --git a/grub-core/net/efi/ip6_config.c b/grub-core/net/efi/ip6_config.c
-index e0e00c23d21..1c5415d7185 100644
+index e0e00c23d..1c5415d71 100644
--- a/grub-core/net/efi/ip6_config.c
+++ b/grub-core/net/efi/ip6_config.c
@@ -3,6 +3,7 @@
diff --git a/SOURCES/0310-Fix-up-some-types-for-gcc-4.8-compat-safemath.h.patch b/SOURCES/0310-Fix-up-some-types-for-gcc-4.8-compat-safemath.h.patch
index bdf467f..b671318 100644
--- a/SOURCES/0310-Fix-up-some-types-for-gcc-4.8-compat-safemath.h.patch
+++ b/SOURCES/0310-Fix-up-some-types-for-gcc-4.8-compat-safemath.h.patch
@@ -17,7 +17,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
7 files changed, 39 insertions(+), 25 deletions(-)
diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c
-index ca09d469990..4fbb3eac0ea 100644
+index ca09d4699..4fbb3eac0 100644
--- a/grub-core/disk/lvm.c
+++ b/grub-core/disk/lvm.c
@@ -103,7 +103,7 @@ grub_lvm_detect (grub_disk_t disk,
@@ -73,7 +73,7 @@ index ca09d469990..4fbb3eac0ea 100644
lv->fullname = grub_malloc (sz0);
diff --git a/grub-core/font/font.c b/grub-core/font/font.c
-index a7b955a1a74..b36a099b856 100644
+index a7b955a1a..b36a099b8 100644
--- a/grub-core/font/font.c
+++ b/grub-core/font/font.c
@@ -361,10 +361,10 @@ static char *
@@ -90,7 +90,7 @@ index a7b955a1a74..b36a099b856 100644
str = grub_malloc (sz);
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index 1d801f6c9ee..3faf9056c72 100644
+index 1d801f6c9..3faf9056c 100644
--- a/grub-core/fs/btrfs.c
+++ b/grub-core/fs/btrfs.c
@@ -323,10 +323,15 @@ save_ref (struct grub_btrfs_leaf_descriptor *desc,
@@ -133,7 +133,7 @@ index 1d801f6c9ee..3faf9056c72 100644
if (!data->devices_attached)
{
diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c
-index b4bd019f49a..3d59cf13125 100644
+index b4bd019f4..3d59cf131 100644
--- a/grub-core/fs/ext2.c
+++ b/grub-core/fs/ext2.c
@@ -719,7 +719,8 @@ grub_ext2_read_symlink (grub_fshelp_node_t node)
@@ -147,7 +147,7 @@ index b4bd019f49a..3d59cf13125 100644
grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected"));
return NULL;
diff --git a/grub-core/fs/hfsplus.c b/grub-core/fs/hfsplus.c
-index 8b17ebba296..e06bcbb9ba3 100644
+index 8b17ebba2..e06bcbb9b 100644
--- a/grub-core/fs/hfsplus.c
+++ b/grub-core/fs/hfsplus.c
@@ -478,7 +478,7 @@ grub_hfsplus_read_symlink (grub_fshelp_node_t node)
@@ -160,7 +160,7 @@ index 8b17ebba296..e06bcbb9ba3 100644
symlink = grub_malloc (sz);
diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c
-index 6fc9302bce3..a4403e29dee 100644
+index 6fc9302bc..a4403e29d 100644
--- a/grub-core/fs/iso9660.c
+++ b/grub-core/fs/iso9660.c
@@ -536,7 +536,7 @@ add_part (struct iterate_dir_ctx *ctx,
@@ -199,7 +199,7 @@ index 6fc9302bce3..a4403e29dee 100644
grub_mul (sz, sizeof (node->dirents[0]), &sz) ||
grub_add (sz, sizeof (struct grub_fshelp_node), &sz))
diff --git a/grub-core/normal/charset.c b/grub-core/normal/charset.c
-index 4dfcc31078d..f902b13b44e 100644
+index 4dfcc3107..f902b13b4 100644
--- a/grub-core/normal/charset.c
+++ b/grub-core/normal/charset.c
@@ -479,8 +479,9 @@ grub_unicode_aglomerate_comb (const grub_uint32_t *in, grub_size_t inlen,
diff --git a/SOURCES/0311-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch b/SOURCES/0311-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
index d998583..3d73542 100644
--- a/SOURCES/0311-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
+++ b/SOURCES/0311-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
@@ -13,7 +13,7 @@ Signed-off-by: Colin Watson <cjwatson@debian.org>
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 ea9f5134e67..ade7ab8f573 100644
+index ea9f5134e..ade7ab8f5 100644
--- a/grub-core/loader/i386/efi/linux.c
+++ b/grub-core/loader/i386/efi/linux.c
@@ -28,6 +28,7 @@
diff --git a/SOURCES/0312-linux-loader-avoid-overflow-on-initrd-size-calculati.patch b/SOURCES/0312-linux-loader-avoid-overflow-on-initrd-size-calculati.patch
index b309aeb..c21fd30 100644
--- a/SOURCES/0312-linux-loader-avoid-overflow-on-initrd-size-calculati.patch
+++ b/SOURCES/0312-linux-loader-avoid-overflow-on-initrd-size-calculati.patch
@@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/grub-core/loader/linux.c b/grub-core/loader/linux.c
-index c2c7cfcd0fd..61a2e144db0 100644
+index c2c7cfcd0..61a2e144d 100644
--- a/grub-core/loader/linux.c
+++ b/grub-core/loader/linux.c
@@ -152,8 +152,8 @@ grub_initrd_init (int argc, char *argv[],
diff --git a/SOURCES/0313-linuxefi-fail-kernel-validation-without-shim-protoco.patch b/SOURCES/0313-linuxefi-fail-kernel-validation-without-shim-protoco.patch
index be3ecd8..101a75f 100644
--- a/SOURCES/0313-linuxefi-fail-kernel-validation-without-shim-protoco.patch
+++ b/SOURCES/0313-linuxefi-fail-kernel-validation-without-shim-protoco.patch
@@ -23,7 +23,7 @@ Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>
4 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index e1110749eb9..7a076c13171 100644
+index e1110749e..7a076c131 100644
--- a/grub-core/loader/arm64/linux.c
+++ b/grub-core/loader/arm64/linux.c
@@ -381,11 +381,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
@@ -47,7 +47,7 @@ index e1110749eb9..7a076c13171 100644
pe = (void *)((unsigned long)kernel_addr + lh.hdr_offset);
diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index 8b99cf23e9d..a93edc975cd 100644
+index 8b99cf23e..a93edc975 100644
--- a/grub-core/loader/efi/chainloader.c
+++ b/grub-core/loader/efi/chainloader.c
@@ -1079,6 +1079,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
@@ -59,7 +59,7 @@ index 8b99cf23e9d..a93edc975cd 100644
fail:
if (dev)
diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
-index e09f824862b..927d89a90d7 100644
+index e09f82486..927d89a90 100644
--- a/grub-core/loader/efi/linux.c
+++ b/grub-core/loader/efi/linux.c
@@ -33,6 +33,7 @@ struct grub_efi_shim_lock
@@ -71,7 +71,7 @@ index e09f824862b..927d89a90d7 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 ade7ab8f573..361e503cb52 100644
+index ade7ab8f5..361e503cb 100644
--- a/grub-core/loader/i386/efi/linux.c
+++ b/grub-core/loader/i386/efi/linux.c
@@ -206,12 +206,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
diff --git a/SOURCES/0314-linux-Fix-integer-overflows-in-initrd-size-handling.patch b/SOURCES/0314-linux-Fix-integer-overflows-in-initrd-size-handling.patch
index 84305d7..0ba6a8d 100644
--- a/SOURCES/0314-linux-Fix-integer-overflows-in-initrd-size-handling.patch
+++ b/SOURCES/0314-linux-Fix-integer-overflows-in-initrd-size-handling.patch
@@ -14,7 +14,7 @@ Reviewed-by: Jan Setje-Eilers <jan.setjeeilers@oracle.com>
1 file changed, 54 insertions(+), 20 deletions(-)
diff --git a/grub-core/loader/linux.c b/grub-core/loader/linux.c
-index 61a2e144db0..0953f6d3266 100644
+index 61a2e144d..0953f6d32 100644
--- a/grub-core/loader/linux.c
+++ b/grub-core/loader/linux.c
@@ -5,6 +5,7 @@
diff --git a/SOURCES/0315-blscfg-Always-look-for-BLS-snippets-in-the-root-devi.patch b/SOURCES/0315-blscfg-Always-look-for-BLS-snippets-in-the-root-devi.patch
index e2e2e51..838ddd7 100644
--- a/SOURCES/0315-blscfg-Always-look-for-BLS-snippets-in-the-root-devi.patch
+++ b/SOURCES/0315-blscfg-Always-look-for-BLS-snippets-in-the-root-devi.patch
@@ -25,7 +25,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
-index c92e1c84543..70ce5c7bf6f 100644
+index c92e1c845..70ce5c7bf 100644
--- a/grub-core/commands/blscfg.c
+++ b/grub-core/commands/blscfg.c
@@ -874,14 +874,12 @@ grub_cmd_blscfg (grub_extcmd_context_t ctxt UNUSED,
diff --git a/SOURCES/0316-blscfg-Don-t-hardcode-an-env-var-as-fallback-for-the.patch b/SOURCES/0316-blscfg-Don-t-hardcode-an-env-var-as-fallback-for-the.patch
index 30bbae3..b1d68be 100644
--- a/SOURCES/0316-blscfg-Don-t-hardcode-an-env-var-as-fallback-for-the.patch
+++ b/SOURCES/0316-blscfg-Don-t-hardcode-an-env-var-as-fallback-for-the.patch
@@ -23,7 +23,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 58d18504790..48857bb81d3 100644
+index 58d185047..48857bb81 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -158,7 +158,17 @@ linux_entry ()
diff --git a/SOURCES/0317-tftp-roll-over-block-counter-to-prevent-timeouts-wit.patch b/SOURCES/0317-tftp-roll-over-block-counter-to-prevent-timeouts-wit.patch
index 7183892..a4637cf 100644
--- a/SOURCES/0317-tftp-roll-over-block-counter-to-prevent-timeouts-wit.patch
+++ b/SOURCES/0317-tftp-roll-over-block-counter-to-prevent-timeouts-wit.patch
@@ -23,7 +23,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
-index 79c16f9b041..b9a4b607a3d 100644
+index 79c16f9b0..b9a4b607a 100644
--- a/grub-core/net/tftp.c
+++ b/grub-core/net/tftp.c
@@ -183,8 +183,20 @@ tftp_receive (grub_net_udp_socket_t sock __attribute__ ((unused)),
diff --git a/SOURCES/0318-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch b/SOURCES/0318-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch
index 047b07b..a8f4c58 100644
--- a/SOURCES/0318-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch
+++ b/SOURCES/0318-at_keyboard-use-set-1-when-keyboard-is-in-Translate-.patch
@@ -29,7 +29,7 @@ Signed-off-by: Renaud Métrich <rmetrich@redhat.com>
2 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/grub-core/term/at_keyboard.c b/grub-core/term/at_keyboard.c
-index f0a986eb176..69d99b61df5 100644
+index f0a986eb1..69d99b61d 100644
--- a/grub-core/term/at_keyboard.c
+++ b/grub-core/term/at_keyboard.c
@@ -135,20 +135,28 @@ query_mode (void)
@@ -105,7 +105,7 @@ index f0a986eb176..69d99b61df5 100644
}
diff --git a/include/grub/at_keyboard.h b/include/grub/at_keyboard.h
-index bcb4d9ba78f..9414dc1b996 100644
+index bcb4d9ba7..9414dc1b9 100644
--- a/include/grub/at_keyboard.h
+++ b/include/grub/at_keyboard.h
@@ -19,6 +19,10 @@
diff --git a/SOURCES/0319-grub-install-disable-support-for-EFI-platforms.patch b/SOURCES/0319-grub-install-disable-support-for-EFI-platforms.patch
index 2591b60..7142181 100644
--- a/SOURCES/0319-grub-install-disable-support-for-EFI-platforms.patch
+++ b/SOURCES/0319-grub-install-disable-support-for-EFI-platforms.patch
@@ -26,7 +26,7 @@ Signed-off-by: Jan Hlavac <jhlavac@redhat.com>
3 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/util/grub-install.c b/util/grub-install.c
-index 3bf0e063a86..65bb2f99ef1 100644
+index 3bf0e063a..65bb2f99e 100644
--- a/util/grub-install.c
+++ b/util/grub-install.c
@@ -888,6 +888,22 @@ main (int argc, char *argv[])
@@ -80,7 +80,7 @@ index 3bf0e063a86..65bb2f99ef1 100644
{
grub_fs_t fs;
diff --git a/docs/grub.texi b/docs/grub.texi
-index c54bee31679..fa11cc0aff7 100644
+index c54bee316..fa11cc0af 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -6185,6 +6185,13 @@ grub2-install @var{install_device}
@@ -98,7 +98,7 @@ index c54bee31679..fa11cc0aff7 100644
@table @option
diff --git a/util/grub-install.8 b/util/grub-install.8
-index 76272a39d2e..02371930fa1 100644
+index 76272a39d..02371930f 100644
--- a/util/grub-install.8
+++ b/util/grub-install.8
@@ -1,4 +1,4 @@
diff --git a/SOURCES/0320-New-with-debug-timestamps-configure-flag-to-prepend-.patch b/SOURCES/0320-New-with-debug-timestamps-configure-flag-to-prepend-.patch
index 62d61b9..c39ae03 100644
--- a/SOURCES/0320-New-with-debug-timestamps-configure-flag-to-prepend-.patch
+++ b/SOURCES/0320-New-with-debug-timestamps-configure-flag-to-prepend-.patch
@@ -15,7 +15,7 @@ Signed-off-by: Renaud Métrich <rmetrich@redhat.com>
3 files changed, 39 insertions(+)
diff --git a/configure.ac b/configure.ac
-index 9323c125469..0059b938a3a 100644
+index 9323c1254..0059b938a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1514,6 +1514,17 @@ else
@@ -58,7 +58,7 @@ index 9323c125469..0059b938a3a 100644
echo efiemu runtime: Yes
else
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index c034f49f97c..11f2974fce5 100644
+index c034f49f9..11f2974fc 100644
--- a/grub-core/kern/misc.c
+++ b/grub-core/kern/misc.c
@@ -25,6 +25,9 @@
@@ -99,7 +99,7 @@ index c034f49f97c..11f2974fce5 100644
va_start (args, fmt);
grub_vprintf (fmt, args);
diff --git a/config.h.in b/config.h.in
-index 9e8f9911b18..d15480b4163 100644
+index 9e8f9911b..d15480b41 100644
--- a/config.h.in
+++ b/config.h.in
@@ -12,6 +12,7 @@
diff --git a/SOURCES/0321-Added-debug-statements-to-grub_disk_open-and-grub_di.patch b/SOURCES/0321-Added-debug-statements-to-grub_disk_open-and-grub_di.patch
index 6edbdbd..9432f04 100644
--- a/SOURCES/0321-Added-debug-statements-to-grub_disk_open-and-grub_di.patch
+++ b/SOURCES/0321-Added-debug-statements-to-grub_disk_open-and-grub_di.patch
@@ -13,7 +13,7 @@ Signed-off-by: Renaud Métrich <rmetrich@redhat.com>
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/grub-core/kern/disk.c b/grub-core/kern/disk.c
-index 789f8c05233..7f58c561472 100644
+index 789f8c052..7f58c5614 100644
--- a/grub-core/kern/disk.c
+++ b/grub-core/kern/disk.c
@@ -285,6 +285,8 @@ grub_disk_open (const char *name)
diff --git a/SOURCES/0322-Introduce-function-grub_debug_is_enabled-void-return.patch b/SOURCES/0322-Introduce-function-grub_debug_is_enabled-void-return.patch
index e73e302..4bfd325 100644
--- a/SOURCES/0322-Introduce-function-grub_debug_is_enabled-void-return.patch
+++ b/SOURCES/0322-Introduce-function-grub_debug_is_enabled-void-return.patch
@@ -14,7 +14,7 @@ Signed-off-by: Renaud Métrich <rmetrich@redhat.com>
2 files changed, 14 insertions(+)
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index 11f2974fce5..97378c48b22 100644
+index 11f2974fc..97378c48b 100644
--- a/grub-core/kern/misc.c
+++ b/grub-core/kern/misc.c
@@ -162,6 +162,19 @@ int grub_err_printf (const char *fmt, ...)
@@ -38,7 +38,7 @@ index 11f2974fce5..97378c48b22 100644
grub_debug_enabled (const char * condition)
{
diff --git a/include/grub/misc.h b/include/grub/misc.h
-index 1258ec6bbf3..6ca03c4d692 100644
+index 1258ec6bb..6ca03c4d6 100644
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -367,6 +367,7 @@ grub_puts (const char *s)
diff --git a/SOURCES/0323-Don-t-clear-screen-when-debugging-is-enabled.patch b/SOURCES/0323-Don-t-clear-screen-when-debugging-is-enabled.patch
index 20abbf3..92711ab 100644
--- a/SOURCES/0323-Don-t-clear-screen-when-debugging-is-enabled.patch
+++ b/SOURCES/0323-Don-t-clear-screen-when-debugging-is-enabled.patch
@@ -12,7 +12,7 @@ Signed-off-by: Renaud Métrich <rmetrich@redhat.com>
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 04ae9ed02f6..59fd54eb0f1 100644
+index 04ae9ed02..59fd54eb0 100644
--- a/grub-core/normal/main.c
+++ b/grub-core/normal/main.c
@@ -204,7 +204,8 @@ void
diff --git a/SOURCES/0324-grub_file_-instrumentation-new-file-debug-tag.patch b/SOURCES/0324-grub_file_-instrumentation-new-file-debug-tag.patch
index e0f515a..8608891 100644
--- a/SOURCES/0324-grub_file_-instrumentation-new-file-debug-tag.patch
+++ b/SOURCES/0324-grub_file_-instrumentation-new-file-debug-tag.patch
@@ -12,7 +12,7 @@ Signed-off-by: Renaud Métrich <rmetrich@redhat.com>
1 file changed, 14 insertions(+)
diff --git a/grub-core/kern/file.c b/grub-core/kern/file.c
-index 668f8930b19..c2d9a550007 100644
+index 668f8930b..c2d9a5500 100644
--- a/grub-core/kern/file.c
+++ b/grub-core/kern/file.c
@@ -67,6 +67,8 @@ grub_file_open (const char *name)
diff --git a/SOURCES/0325-ieee1275-Avoiding-many-unecessary-open-close.patch b/SOURCES/0325-ieee1275-Avoiding-many-unecessary-open-close.patch
index c92467d..bcaf386 100644
--- a/SOURCES/0325-ieee1275-Avoiding-many-unecessary-open-close.patch
+++ b/SOURCES/0325-ieee1275-Avoiding-many-unecessary-open-close.patch
@@ -9,7 +9,7 @@ Signed-off-by: Diego Domingos <diegodo@br.ibm.com>
1 file changed, 35 insertions(+), 29 deletions(-)
diff --git a/grub-core/disk/ieee1275/ofdisk.c b/grub-core/disk/ieee1275/ofdisk.c
-index d887d4b6eee..f3a6ecd797f 100644
+index d887d4b6e..f3a6ecd79 100644
--- a/grub-core/disk/ieee1275/ofdisk.c
+++ b/grub-core/disk/ieee1275/ofdisk.c
@@ -44,7 +44,7 @@ struct ofdisk_hash_ent
diff --git a/SOURCES/0326-ieee1275-powerpc-implements-fibre-channel-discovery-.patch b/SOURCES/0326-ieee1275-powerpc-implements-fibre-channel-discovery-.patch
index 9fa02bb..94f4eb7 100644
--- a/SOURCES/0326-ieee1275-powerpc-implements-fibre-channel-discovery-.patch
+++ b/SOURCES/0326-ieee1275-powerpc-implements-fibre-channel-discovery-.patch
@@ -15,7 +15,7 @@ Signed-off-by: Diego Domingos <diegodo@br.ibm.com>
1 file changed, 49 insertions(+)
diff --git a/grub-core/osdep/linux/ofpath.c b/grub-core/osdep/linux/ofpath.c
-index a6153d35954..0f5d54e9f2d 100644
+index a6153d359..0f5d54e9f 100644
--- a/grub-core/osdep/linux/ofpath.c
+++ b/grub-core/osdep/linux/ofpath.c
@@ -350,6 +350,38 @@ of_path_of_ide(const char *sys_devname __attribute__((unused)), const char *devi
diff --git a/SOURCES/0327-ieee1275-powerpc-enables-device-mapper-discovery.patch b/SOURCES/0327-ieee1275-powerpc-enables-device-mapper-discovery.patch
index 6f1c21b..8bb1934 100644
--- a/SOURCES/0327-ieee1275-powerpc-enables-device-mapper-discovery.patch
+++ b/SOURCES/0327-ieee1275-powerpc-enables-device-mapper-discovery.patch
@@ -17,7 +17,7 @@ Signed-off-by: Diego Domingos <diegodo@br.ibm.com>
1 file changed, 63 insertions(+), 1 deletion(-)
diff --git a/grub-core/osdep/linux/ofpath.c b/grub-core/osdep/linux/ofpath.c
-index 0f5d54e9f2d..cc849d9c94c 100644
+index 0f5d54e9f..cc849d9c9 100644
--- a/grub-core/osdep/linux/ofpath.c
+++ b/grub-core/osdep/linux/ofpath.c
@@ -37,6 +37,7 @@
diff --git a/SOURCES/0328-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch b/SOURCES/0328-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch
index 2f053c8..02ea7d5 100644
--- a/SOURCES/0328-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch
+++ b/SOURCES/0328-Add-at_keyboard_fallback_set-var-to-force-the-set-ma.patch
@@ -29,7 +29,7 @@ solution":
1 file changed, 96 insertions(+), 25 deletions(-)
diff --git a/grub-core/term/at_keyboard.c b/grub-core/term/at_keyboard.c
-index 69d99b61df5..c805cccbdde 100644
+index 69d99b61d..c805cccbd 100644
--- a/grub-core/term/at_keyboard.c
+++ b/grub-core/term/at_keyboard.c
@@ -31,6 +31,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
diff --git a/SOURCES/0329-bufio-Use-grub_size_t-instead-of-plain-int-for-size.patch b/SOURCES/0329-bufio-Use-grub_size_t-instead-of-plain-int-for-size.patch
index 2d35cc8..197b087 100644
--- a/SOURCES/0329-bufio-Use-grub_size_t-instead-of-plain-int-for-size.patch
+++ b/SOURCES/0329-bufio-Use-grub_size_t-instead-of-plain-int-for-size.patch
@@ -14,7 +14,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/grub-core/io/bufio.c b/grub-core/io/bufio.c
-index 6118bade50d..2781afe0515 100644
+index 6118bade5..2781afe05 100644
--- a/grub-core/io/bufio.c
+++ b/grub-core/io/bufio.c
@@ -43,7 +43,7 @@ typedef struct grub_bufio *grub_bufio_t;
@@ -45,7 +45,7 @@ index 6118bade50d..2781afe0515 100644
grub_file_t io, file;
diff --git a/include/grub/bufio.h b/include/grub/bufio.h
-index acdd0c882c6..77eb8ee5672 100644
+index acdd0c882..77eb8ee56 100644
--- a/include/grub/bufio.h
+++ b/include/grub/bufio.h
@@ -22,7 +22,7 @@
diff --git a/SOURCES/0330-verifiers-File-type-for-fine-grained-signature-verif.patch b/SOURCES/0330-verifiers-File-type-for-fine-grained-signature-verif.patch
index 12baee2..3683ed3 100644
--- a/SOURCES/0330-verifiers-File-type-for-fine-grained-signature-verif.patch
+++ b/SOURCES/0330-verifiers-File-type-for-fine-grained-signature-verif.patch
@@ -89,7 +89,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
70 files changed, 292 insertions(+), 221 deletions(-)
diff --git a/grub-core/commands/acpi.c b/grub-core/commands/acpi.c
-index 9f02f22019a..5a1499aa0e3 100644
+index 9f02f2201..5a1499aa0 100644
--- a/grub-core/commands/acpi.c
+++ b/grub-core/commands/acpi.c
@@ -635,7 +635,7 @@ grub_cmd_acpi (struct grub_extcmd_context *ctxt, int argc, char **args)
@@ -102,7 +102,7 @@ index 9f02f22019a..5a1499aa0e3 100644
{
free_tables ();
diff --git a/grub-core/commands/blocklist.c b/grub-core/commands/blocklist.c
-index d1a47b504bf..944449b77d4 100644
+index d1a47b504..944449b77 100644
--- a/grub-core/commands/blocklist.c
+++ b/grub-core/commands/blocklist.c
@@ -121,8 +121,8 @@ grub_cmd_blocklist (grub_command_t cmd __attribute__ ((unused)),
@@ -117,7 +117,7 @@ index d1a47b504bf..944449b77d4 100644
return grub_errno;
diff --git a/grub-core/commands/cat.c b/grub-core/commands/cat.c
-index 88d90443602..ba5f0061aa5 100644
+index 88d904436..ba5f0061a 100644
--- a/grub-core/commands/cat.c
+++ b/grub-core/commands/cat.c
@@ -56,7 +56,7 @@ grub_cmd_cat (grub_extcmd_context_t ctxt, int argc, char **args)
@@ -130,7 +130,7 @@ index 88d90443602..ba5f0061aa5 100644
return grub_errno;
diff --git a/grub-core/commands/cmp.c b/grub-core/commands/cmp.c
-index cc23ee67ea3..e9c3b25d34c 100644
+index cc23ee67e..e9c3b25d3 100644
--- a/grub-core/commands/cmp.c
+++ b/grub-core/commands/cmp.c
@@ -45,8 +45,8 @@ grub_cmd_cmp (grub_command_t cmd __attribute__ ((unused)),
@@ -145,7 +145,7 @@ index cc23ee67ea3..e9c3b25d34c 100644
goto cleanup;
diff --git a/grub-core/commands/efi/loadbios.c b/grub-core/commands/efi/loadbios.c
-index 132cadbc764..d41d521a4ae 100644
+index 132cadbc7..d41d521a4 100644
--- a/grub-core/commands/efi/loadbios.c
+++ b/grub-core/commands/efi/loadbios.c
@@ -169,7 +169,7 @@ grub_cmd_loadbios (grub_command_t cmd __attribute__ ((unused)),
@@ -167,7 +167,7 @@ index 132cadbc764..d41d521a4ae 100644
return grub_errno;
diff --git a/grub-core/commands/file.c b/grub-core/commands/file.c
-index 3ff6d5522d2..4f81aa1f9e1 100644
+index 3ff6d5522..4f81aa1f9 100644
--- a/grub-core/commands/file.c
+++ b/grub-core/commands/file.c
@@ -165,7 +165,7 @@ grub_cmd_file (grub_extcmd_context_t ctxt, int argc, char **args)
@@ -190,7 +190,7 @@ index 3ff6d5522d2..4f81aa1f9e1 100644
break;
/* FIXME: more checks? */
diff --git a/grub-core/commands/hashsum.c b/grub-core/commands/hashsum.c
-index d18687351a5..456ba908b6f 100644
+index d18687351..456ba908b 100644
--- a/grub-core/commands/hashsum.c
+++ b/grub-core/commands/hashsum.c
@@ -113,7 +113,7 @@ check_list (const gcry_md_spec_t *hash, const char *hashfilename,
@@ -240,7 +240,7 @@ index d18687351a5..456ba908b6f 100644
{
if (!keep)
diff --git a/grub-core/commands/hexdump.c b/grub-core/commands/hexdump.c
-index 4c884b3a19a..eaa12465bb3 100644
+index 4c884b3a1..eaa12465b 100644
--- a/grub-core/commands/hexdump.c
+++ b/grub-core/commands/hexdump.c
@@ -90,7 +90,7 @@ grub_cmd_hexdump (grub_extcmd_context_t ctxt, int argc, char **args)
@@ -253,7 +253,7 @@ index 4c884b3a19a..eaa12465bb3 100644
return 0;
diff --git a/grub-core/commands/i386/pc/play.c b/grub-core/commands/i386/pc/play.c
-index 7712e2a36a1..c8181310515 100644
+index 7712e2a36..c81813105 100644
--- a/grub-core/commands/i386/pc/play.c
+++ b/grub-core/commands/i386/pc/play.c
@@ -93,7 +93,7 @@ grub_cmd_play (grub_command_t cmd __attribute__ ((unused)),
@@ -266,7 +266,7 @@ index 7712e2a36a1..c8181310515 100644
if (! file)
return grub_errno;
diff --git a/grub-core/commands/keylayouts.c b/grub-core/commands/keylayouts.c
-index f35d3a369ba..c05d6128a6d 100644
+index f35d3a369..c05d6128a 100644
--- a/grub-core/commands/keylayouts.c
+++ b/grub-core/commands/keylayouts.c
@@ -220,7 +220,7 @@ grub_cmd_keymap (struct grub_command *cmd __attribute__ ((unused)),
@@ -279,7 +279,7 @@ index f35d3a369ba..c05d6128a6d 100644
goto fail;
diff --git a/grub-core/commands/legacycfg.c b/grub-core/commands/legacycfg.c
-index 0de070eacc4..f5696a51a75 100644
+index 0de070eac..f5696a51a 100644
--- a/grub-core/commands/legacycfg.c
+++ b/grub-core/commands/legacycfg.c
@@ -56,7 +56,7 @@ legacy_file (const char *filename)
@@ -292,7 +292,7 @@ index 0de070eacc4..f5696a51a75 100644
{
grub_free (suffix);
diff --git a/grub-core/commands/loadenv.c b/grub-core/commands/loadenv.c
-index 91c99456091..163b9a09042 100644
+index 91c994560..163b9a090 100644
--- a/grub-core/commands/loadenv.c
+++ b/grub-core/commands/loadenv.c
@@ -46,7 +46,8 @@ static const struct grub_arg_option options[] =
@@ -355,7 +355,7 @@ index 91c99456091..163b9a09042 100644
return grub_errno;
diff --git a/grub-core/commands/ls.c b/grub-core/commands/ls.c
-index c25161cc4f2..2cdb2acc552 100644
+index c25161cc4..2cdb2acc5 100644
--- a/grub-core/commands/ls.c
+++ b/grub-core/commands/ls.c
@@ -129,8 +129,8 @@ print_files_long (const char *filename, const struct grub_dirhook_info *info,
@@ -381,7 +381,7 @@ index c25161cc4f2..2cdb2acc552 100644
goto fail;
diff --git a/grub-core/commands/minicmd.c b/grub-core/commands/minicmd.c
-index b25ca4b9f17..46bf135e8f0 100644
+index b25ca4b9f..46bf135e8 100644
--- a/grub-core/commands/minicmd.c
+++ b/grub-core/commands/minicmd.c
@@ -43,7 +43,7 @@ grub_mini_cmd_cat (struct grub_command *cmd __attribute__ ((unused)),
@@ -394,7 +394,7 @@ index b25ca4b9f17..46bf135e8f0 100644
return grub_errno;
diff --git a/grub-core/commands/nativedisk.c b/grub-core/commands/nativedisk.c
-index d69214f6de0..f200a5ce092 100644
+index d69214f6d..f200a5ce0 100644
--- a/grub-core/commands/nativedisk.c
+++ b/grub-core/commands/nativedisk.c
@@ -242,7 +242,8 @@ grub_cmd_nativedisk (grub_command_t cmd __attribute__ ((unused)),
@@ -408,7 +408,7 @@ index d69214f6de0..f200a5ce092 100644
if (! file)
goto fail;
diff --git a/grub-core/commands/parttool.c b/grub-core/commands/parttool.c
-index 36dadc0b1db..051e31320e9 100644
+index 36dadc0b1..051e31320 100644
--- a/grub-core/commands/parttool.c
+++ b/grub-core/commands/parttool.c
@@ -199,7 +199,7 @@ grub_cmd_parttool (grub_command_t cmd __attribute__ ((unused)),
@@ -421,7 +421,7 @@ index 36dadc0b1db..051e31320e9 100644
{
char *buf = 0;
diff --git a/grub-core/commands/search.c b/grub-core/commands/search.c
-index 7dd32e445c9..ddda6e7c590 100644
+index 7dd32e445..ddda6e7c5 100644
--- a/grub-core/commands/search.c
+++ b/grub-core/commands/search.c
@@ -81,8 +81,8 @@ iterate_device (const char *name, void *data)
@@ -436,7 +436,7 @@ index 7dd32e445c9..ddda6e7c590 100644
{
found = 1;
diff --git a/grub-core/commands/test.c b/grub-core/commands/test.c
-index 5f06642f6c6..13c6ed9534a 100644
+index 5f06642f6..13c6ed953 100644
--- a/grub-core/commands/test.c
+++ b/grub-core/commands/test.c
@@ -355,8 +355,8 @@ test_parse (char **args, int *argn, int argc)
@@ -451,7 +451,7 @@ index 5f06642f6c6..13c6ed9534a 100644
if (file)
grub_file_close (file);
diff --git a/grub-core/commands/testload.c b/grub-core/commands/testload.c
-index cfab6763dc3..ff01a0516dd 100644
+index cfab6763d..ff01a0516 100644
--- a/grub-core/commands/testload.c
+++ b/grub-core/commands/testload.c
@@ -57,7 +57,7 @@ grub_cmd_testload (struct grub_command *cmd __attribute__ ((unused)),
@@ -464,7 +464,7 @@ index cfab6763dc3..ff01a0516dd 100644
return grub_errno;
diff --git a/grub-core/commands/testspeed.c b/grub-core/commands/testspeed.c
-index 042645f8d26..c13a9b8d8d2 100644
+index 042645f8d..c13a9b8d8 100644
--- a/grub-core/commands/testspeed.c
+++ b/grub-core/commands/testspeed.c
@@ -61,7 +61,7 @@ grub_cmd_testspeed (grub_extcmd_context_t ctxt, int argc, char **args)
@@ -477,7 +477,7 @@ index 042645f8d26..c13a9b8d8d2 100644
goto quit;
diff --git a/grub-core/commands/verify.c b/grub-core/commands/verify.c
-index 67cb1c78509..f0dfeceebd4 100644
+index 67cb1c785..f0dfeceeb 100644
--- a/grub-core/commands/verify.c
+++ b/grub-core/commands/verify.c
@@ -680,10 +680,12 @@ grub_cmd_trust (grub_extcmd_context_t ctxt,
@@ -597,7 +597,7 @@ index 67cb1c78509..f0dfeceebd4 100644
verified_free (verified);
grub_free (ret);
diff --git a/grub-core/disk/loopback.c b/grub-core/disk/loopback.c
-index 2d8deaeafbd..9406d931cdd 100644
+index 2d8deaeaf..9406d931c 100644
--- a/grub-core/disk/loopback.c
+++ b/grub-core/disk/loopback.c
@@ -92,7 +92,8 @@ grub_cmd_loopback (grub_extcmd_context_t ctxt, int argc, char **args)
@@ -611,7 +611,7 @@ index 2d8deaeafbd..9406d931cdd 100644
return grub_errno;
diff --git a/grub-core/efiemu/main.c b/grub-core/efiemu/main.c
-index f6813b1ed15..a81934725be 100644
+index f6813b1ed..a81934725 100644
--- a/grub-core/efiemu/main.c
+++ b/grub-core/efiemu/main.c
@@ -187,7 +187,7 @@ grub_efiemu_load_file (const char *filename)
@@ -624,7 +624,7 @@ index f6813b1ed15..a81934725be 100644
return grub_errno;
diff --git a/grub-core/font/font.c b/grub-core/font/font.c
-index b36a099b856..b67507fcc82 100644
+index b36a099b8..b67507fcc 100644
--- a/grub-core/font/font.c
+++ b/grub-core/font/font.c
@@ -422,7 +422,7 @@ grub_font_load (const char *filename)
@@ -646,7 +646,7 @@ index b36a099b856..b67507fcc82 100644
}
if (!file)
diff --git a/grub-core/fs/zfs/zfscrypt.c b/grub-core/fs/zfs/zfscrypt.c
-index f8488c35344..de3b015f582 100644
+index f8488c353..de3b015f5 100644
--- a/grub-core/fs/zfs/zfscrypt.c
+++ b/grub-core/fs/zfs/zfscrypt.c
@@ -430,7 +430,7 @@ grub_cmd_zfs_key (grub_extcmd_context_t ctxt, int argc, char **args)
@@ -659,7 +659,7 @@ index f8488c35344..de3b015f582 100644
return grub_errno;
real_size = grub_file_read (file, buf, 1024);
diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c
-index b22e1bcc94b..84d520cd494 100644
+index b22e1bcc9..84d520cd4 100644
--- a/grub-core/gettext/gettext.c
+++ b/grub-core/gettext/gettext.c
@@ -291,7 +291,7 @@ grub_mofile_open (struct grub_gettext_context *ctx,
@@ -672,7 +672,7 @@ index b22e1bcc94b..84d520cd494 100644
if (!fd)
return grub_errno;
diff --git a/grub-core/gfxmenu/theme_loader.c b/grub-core/gfxmenu/theme_loader.c
-index 02978392ccc..d6829bb5e90 100644
+index 02978392c..d6829bb5e 100644
--- a/grub-core/gfxmenu/theme_loader.c
+++ b/grub-core/gfxmenu/theme_loader.c
@@ -743,7 +743,7 @@ grub_gfxmenu_view_load_theme (grub_gfxmenu_view_t view, const char *theme_path)
@@ -685,7 +685,7 @@ index 02978392ccc..d6829bb5e90 100644
{
grub_free (p.theme_dir);
diff --git a/grub-core/io/bufio.c b/grub-core/io/bufio.c
-index 2781afe0515..0dbac1b3a1e 100644
+index 2781afe05..0dbac1b3a 100644
--- a/grub-core/io/bufio.c
+++ b/grub-core/io/bufio.c
@@ -88,11 +88,11 @@ grub_bufio_open (grub_file_t io, grub_size_t size)
@@ -703,7 +703,7 @@ index 2781afe0515..0dbac1b3a1e 100644
return 0;
diff --git a/grub-core/io/gzio.c b/grub-core/io/gzio.c
-index 7024cda84ea..2ecf076dd5e 100644
+index 7024cda84..2ecf076dd 100644
--- a/grub-core/io/gzio.c
+++ b/grub-core/io/gzio.c
@@ -1156,11 +1156,14 @@ initialize_tables (grub_gzio_t gzio)
@@ -723,7 +723,7 @@ index 7024cda84ea..2ecf076dd5e 100644
if (! file)
return 0;
diff --git a/grub-core/io/lzopio.c b/grub-core/io/lzopio.c
-index 7559c6c9cab..84edf6dd2dc 100644
+index 7559c6c9c..84edf6dd2 100644
--- a/grub-core/io/lzopio.c
+++ b/grub-core/io/lzopio.c
@@ -407,12 +407,14 @@ CORRUPTED:
@@ -744,7 +744,7 @@ index 7559c6c9cab..84edf6dd2dc 100644
if (!file)
return 0;
diff --git a/grub-core/io/offset.c b/grub-core/io/offset.c
-index ebed0ebe63e..ec8e2320871 100644
+index ebed0ebe6..ec8e23208 100644
--- a/grub-core/io/offset.c
+++ b/grub-core/io/offset.c
@@ -69,7 +69,8 @@ grub_file_offset_close (grub_file_t file)
@@ -771,7 +771,7 @@ index ebed0ebe63e..ec8e2320871 100644
if (!off_file)
diff --git a/grub-core/io/xzio.c b/grub-core/io/xzio.c
-index a3536ad73b1..42afeedcd64 100644
+index a3536ad73..42afeedcd 100644
--- a/grub-core/io/xzio.c
+++ b/grub-core/io/xzio.c
@@ -169,12 +169,14 @@ ERROR:
@@ -792,7 +792,7 @@ index a3536ad73b1..42afeedcd64 100644
if (!file)
return 0;
diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
-index 91105bc4677..d7a7c8f97b0 100644
+index 91105bc46..d7a7c8f97 100644
--- a/grub-core/kern/dl.c
+++ b/grub-core/kern/dl.c
@@ -806,7 +806,7 @@ grub_dl_load_file (const char *filename)
@@ -805,7 +805,7 @@ index 91105bc4677..d7a7c8f97b0 100644
return 0;
diff --git a/grub-core/kern/elf.c b/grub-core/kern/elf.c
-index 4f282c9cf43..9d7149b3892 100644
+index 4f282c9cf..9d7149b38 100644
--- a/grub-core/kern/elf.c
+++ b/grub-core/kern/elf.c
@@ -136,12 +136,12 @@ fail:
@@ -824,7 +824,7 @@ index 4f282c9cf43..9d7149b3892 100644
return 0;
diff --git a/grub-core/kern/file.c b/grub-core/kern/file.c
-index c2d9a550007..2efc31da94f 100644
+index c2d9a5500..2efc31da9 100644
--- a/grub-core/kern/file.c
+++ b/grub-core/kern/file.c
@@ -28,8 +28,7 @@
@@ -884,7 +884,7 @@ index c2d9a550007..2efc31da94f 100644
return 0;
diff --git a/grub-core/lib/syslinux_parse.c b/grub-core/lib/syslinux_parse.c
-index 21ca040ada7..83e7bdb9161 100644
+index 21ca040ad..83e7bdb91 100644
--- a/grub-core/lib/syslinux_parse.c
+++ b/grub-core/lib/syslinux_parse.c
@@ -696,7 +696,7 @@ syslinux_parse_real (struct syslinux_menu *menu)
@@ -897,7 +897,7 @@ index 21ca040ada7..83e7bdb9161 100644
return grub_errno;
while ((grub_free (buf), buf = grub_file_getline (file)))
diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index a93edc975cd..29663f71801 100644
+index a93edc975..29663f718 100644
--- a/grub-core/loader/efi/chainloader.c
+++ b/grub-core/loader/efi/chainloader.c
@@ -941,7 +941,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
@@ -910,7 +910,7 @@ index a93edc975cd..29663f71801 100644
goto fail;
diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
-index 0f317632a3b..8306b415abd 100644
+index 0f317632a..8306b415a 100644
--- a/grub-core/loader/i386/bsd.c
+++ b/grub-core/loader/i386/bsd.c
@@ -1464,7 +1464,7 @@ grub_bsd_load (int argc, char *argv[])
@@ -986,7 +986,7 @@ index 0f317632a3b..8306b415abd 100644
return grub_errno;
diff --git a/grub-core/loader/i386/coreboot/chainloader.c b/grub-core/loader/i386/coreboot/chainloader.c
-index 2cb78eee090..0a19ebb9c3e 100644
+index 2cb78eee0..0a19ebb9c 100644
--- a/grub-core/loader/i386/coreboot/chainloader.c
+++ b/grub-core/loader/i386/coreboot/chainloader.c
@@ -439,7 +439,7 @@ grub_cmd_chain (grub_command_t cmd __attribute__ ((unused)),
@@ -999,7 +999,7 @@ index 2cb78eee090..0a19ebb9c3e 100644
return grub_errno;
diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
-index 191f1631e88..aa2cbc4e7eb 100644
+index 191f1631e..aa2cbc4e7 100644
--- a/grub-core/loader/i386/linux.c
+++ b/grub-core/loader/i386/linux.c
@@ -709,7 +709,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
@@ -1012,7 +1012,7 @@ index 191f1631e88..aa2cbc4e7eb 100644
goto fail;
diff --git a/grub-core/loader/i386/pc/chainloader.c b/grub-core/loader/i386/pc/chainloader.c
-index ef3a322b78c..976fea73ab5 100644
+index ef3a322b7..976fea73a 100644
--- a/grub-core/loader/i386/pc/chainloader.c
+++ b/grub-core/loader/i386/pc/chainloader.c
@@ -172,8 +172,8 @@ grub_chainloader_cmd (const char *filename, grub_chainloader_flags_t flags)
@@ -1027,7 +1027,7 @@ index ef3a322b78c..976fea73ab5 100644
goto fail;
diff --git a/grub-core/loader/i386/pc/freedos.c b/grub-core/loader/i386/pc/freedos.c
-index 478f3c5139d..aac6c9715f6 100644
+index 478f3c513..aac6c9715 100644
--- a/grub-core/loader/i386/pc/freedos.c
+++ b/grub-core/loader/i386/pc/freedos.c
@@ -110,7 +110,7 @@ grub_cmd_freedos (grub_command_t cmd __attribute__ ((unused)),
@@ -1040,7 +1040,7 @@ index 478f3c5139d..aac6c9715f6 100644
goto fail;
diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
-index 63736fae950..b5c28c6580e 100644
+index 63736fae9..b5c28c658 100644
--- a/grub-core/loader/i386/pc/linux.c
+++ b/grub-core/loader/i386/pc/linux.c
@@ -142,7 +142,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
@@ -1053,7 +1053,7 @@ index 63736fae950..b5c28c6580e 100644
goto fail;
diff --git a/grub-core/loader/i386/pc/ntldr.c b/grub-core/loader/i386/pc/ntldr.c
-index 1b88f40d871..f0d74145b38 100644
+index 1b88f40d8..f0d74145b 100644
--- a/grub-core/loader/i386/pc/ntldr.c
+++ b/grub-core/loader/i386/pc/ntldr.c
@@ -90,7 +90,7 @@ grub_cmd_ntldr (grub_command_t cmd __attribute__ ((unused)),
@@ -1066,7 +1066,7 @@ index 1b88f40d871..f0d74145b38 100644
goto fail;
diff --git a/grub-core/loader/i386/pc/plan9.c b/grub-core/loader/i386/pc/plan9.c
-index 814a49d5071..0351090daf8 100644
+index 814a49d50..0351090da 100644
--- a/grub-core/loader/i386/pc/plan9.c
+++ b/grub-core/loader/i386/pc/plan9.c
@@ -413,7 +413,7 @@ grub_cmd_plan9 (grub_extcmd_context_t ctxt, int argc, char *argv[])
@@ -1079,7 +1079,7 @@ index 814a49d5071..0351090daf8 100644
goto fail;
diff --git a/grub-core/loader/i386/pc/pxechainloader.c b/grub-core/loader/i386/pc/pxechainloader.c
-index e60c62b1bad..acb061169b9 100644
+index e60c62b1b..acb061169 100644
--- a/grub-core/loader/i386/pc/pxechainloader.c
+++ b/grub-core/loader/i386/pc/pxechainloader.c
@@ -99,7 +99,7 @@ grub_cmd_pxechain (grub_command_t cmd __attribute__ ((unused)),
@@ -1092,7 +1092,7 @@ index e60c62b1bad..acb061169b9 100644
goto fail;
diff --git a/grub-core/loader/i386/pc/truecrypt.c b/grub-core/loader/i386/pc/truecrypt.c
-index 9ea4fde42a5..cbeeec7beae 100644
+index 9ea4fde42..cbeeec7be 100644
--- a/grub-core/loader/i386/pc/truecrypt.c
+++ b/grub-core/loader/i386/pc/truecrypt.c
@@ -99,7 +99,7 @@ grub_cmd_truecrypt (grub_command_t cmd __attribute__ ((unused)),
@@ -1105,7 +1105,7 @@ index 9ea4fde42a5..cbeeec7beae 100644
goto fail;
diff --git a/grub-core/loader/i386/xen.c b/grub-core/loader/i386/xen.c
-index 85b93347b25..82350d3a178 100644
+index 85b93347b..82350d3a1 100644
--- a/grub-core/loader/i386/xen.c
+++ b/grub-core/loader/i386/xen.c
@@ -650,7 +650,7 @@ grub_cmd_xen (grub_command_t cmd __attribute__ ((unused)),
@@ -1130,7 +1130,7 @@ index 85b93347b25..82350d3a178 100644
return grub_errno;
size = grub_file_size (file);
diff --git a/grub-core/loader/i386/xen_file.c b/grub-core/loader/i386/xen_file.c
-index 77a93e7b228..9af5d66dfcd 100644
+index 77a93e7b2..9af5d66df 100644
--- a/grub-core/loader/i386/xen_file.c
+++ b/grub-core/loader/i386/xen_file.c
@@ -78,7 +78,7 @@ grub_xen_file (grub_file_t file)
@@ -1143,7 +1143,7 @@ index 77a93e7b228..9af5d66dfcd 100644
if (!off_file)
goto fail;
diff --git a/grub-core/loader/i386/xnu.c b/grub-core/loader/i386/xnu.c
-index 44f7ebfa2b6..a7009360732 100644
+index 44f7ebfa2..a70093607 100644
--- a/grub-core/loader/i386/xnu.c
+++ b/grub-core/loader/i386/xnu.c
@@ -486,7 +486,7 @@ grub_cmd_devprop_load (grub_command_t cmd __attribute__ ((unused)),
@@ -1156,7 +1156,7 @@ index 44f7ebfa2b6..a7009360732 100644
return grub_errno;
size = grub_file_size (file);
diff --git a/grub-core/loader/linux.c b/grub-core/loader/linux.c
-index 0953f6d3266..2b2f798e754 100644
+index 0953f6d32..2b2f798e7 100644
--- a/grub-core/loader/linux.c
+++ b/grub-core/loader/linux.c
@@ -183,7 +183,6 @@ grub_initrd_init (int argc, char *argv[],
@@ -1180,7 +1180,7 @@ index 0953f6d3266..2b2f798e754 100644
{
grub_initrd_close (initrd_ctx);
diff --git a/grub-core/loader/macho.c b/grub-core/loader/macho.c
-index f61341af515..05710c48e06 100644
+index f61341af5..05710c48e 100644
--- a/grub-core/loader/macho.c
+++ b/grub-core/loader/macho.c
@@ -188,12 +188,12 @@ fail:
@@ -1199,7 +1199,7 @@ index f61341af515..05710c48e06 100644
return 0;
diff --git a/grub-core/loader/mips/linux.c b/grub-core/loader/mips/linux.c
-index 27c1db84a44..10358854458 100644
+index 27c1db84a..103588544 100644
--- a/grub-core/loader/mips/linux.c
+++ b/grub-core/loader/mips/linux.c
@@ -237,7 +237,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
@@ -1212,7 +1212,7 @@ index 27c1db84a44..10358854458 100644
return grub_errno;
diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c
-index f455e803910..e8963d7cdb3 100644
+index f455e8039..e8963d7cd 100644
--- a/grub-core/loader/multiboot.c
+++ b/grub-core/loader/multiboot.c
@@ -323,7 +323,7 @@ grub_cmd_multiboot (grub_command_t cmd __attribute__ ((unused)),
@@ -1238,7 +1238,7 @@ index f455e803910..e8963d7cdb3 100644
return grub_errno;
diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c
-index 2bf02489bad..9f78abb05f9 100644
+index 2bf02489b..9f78abb05 100644
--- a/grub-core/loader/xnu.c
+++ b/grub-core/loader/xnu.c
@@ -355,7 +355,7 @@ grub_cmd_xnu_kernel (grub_command_t cmd __attribute__ ((unused)),
@@ -1314,7 +1314,7 @@ index 2bf02489bad..9f78abb05f9 100644
return grub_errno;
}
diff --git a/grub-core/loader/xnu_resume.c b/grub-core/loader/xnu_resume.c
-index 99119558d21..d648ef0cd3a 100644
+index 99119558d..d648ef0cd 100644
--- a/grub-core/loader/xnu_resume.c
+++ b/grub-core/loader/xnu_resume.c
@@ -53,8 +53,8 @@ grub_xnu_resume (char *imagename)
@@ -1329,7 +1329,7 @@ index 99119558d21..d648ef0cd3a 100644
return 0;
diff --git a/grub-core/normal/autofs.c b/grub-core/normal/autofs.c
-index 721b9c3256d..7a7cf2b0f7e 100644
+index 721b9c325..7a7cf2b0f 100644
--- a/grub-core/normal/autofs.c
+++ b/grub-core/normal/autofs.c
@@ -33,12 +33,6 @@ autoload_fs_module (void)
@@ -1365,7 +1365,7 @@ index 721b9c3256d..7a7cf2b0f7e 100644
{
/* Override previous fs.lst. */
diff --git a/grub-core/normal/crypto.c b/grub-core/normal/crypto.c
-index e6d345f3345..d01e6f271e1 100644
+index e6d345f33..d01e6f271 100644
--- a/grub-core/normal/crypto.c
+++ b/grub-core/normal/crypto.c
@@ -94,7 +94,7 @@ read_crypto_list (const char *prefix)
@@ -1378,7 +1378,7 @@ index e6d345f3345..d01e6f271e1 100644
if (!file)
{
diff --git a/grub-core/normal/dyncmd.c b/grub-core/normal/dyncmd.c
-index 169c126f508..719ebf477f2 100644
+index 169c126f5..719ebf477 100644
--- a/grub-core/normal/dyncmd.c
+++ b/grub-core/normal/dyncmd.c
@@ -106,7 +106,7 @@ read_command_list (const char *prefix)
@@ -1391,7 +1391,7 @@ index 169c126f508..719ebf477f2 100644
{
char *buf = NULL;
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 59fd54eb0f1..cee71a4c2ab 100644
+index 59fd54eb0..cee71a4c2 100644
--- a/grub-core/normal/main.c
+++ b/grub-core/normal/main.c
@@ -127,7 +127,7 @@ read_config_file (const char *config)
@@ -1404,7 +1404,7 @@ index 59fd54eb0f1..cee71a4c2ab 100644
return 0;
diff --git a/grub-core/normal/term.c b/grub-core/normal/term.c
-index 93a3a0d912e..cc8c173b6e8 100644
+index 93a3a0d91..cc8c173b6 100644
--- a/grub-core/normal/term.c
+++ b/grub-core/normal/term.c
@@ -331,7 +331,7 @@ read_terminal_list (const char *prefix)
@@ -1417,7 +1417,7 @@ index 93a3a0d912e..cc8c173b6e8 100644
if (!file)
{
diff --git a/grub-core/video/readers/jpeg.c b/grub-core/video/readers/jpeg.c
-index 21b0d9ded67..31359a4c9c8 100644
+index 21b0d9ded..31359a4c9 100644
--- a/grub-core/video/readers/jpeg.c
+++ b/grub-core/video/readers/jpeg.c
@@ -772,7 +772,7 @@ grub_video_reader_jpeg (struct grub_video_bitmap **bitmap,
@@ -1430,7 +1430,7 @@ index 21b0d9ded67..31359a4c9c8 100644
return grub_errno;
diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c
-index 719e647e44f..0157ff7420b 100644
+index 719e647e4..0157ff742 100644
--- a/grub-core/video/readers/png.c
+++ b/grub-core/video/readers/png.c
@@ -1095,7 +1095,7 @@ grub_video_reader_png (struct grub_video_bitmap **bitmap,
@@ -1443,7 +1443,7 @@ index 719e647e44f..0157ff7420b 100644
return grub_errno;
diff --git a/grub-core/video/readers/tga.c b/grub-core/video/readers/tga.c
-index c7a16fa9cc4..7cb9d1d2a0c 100644
+index c7a16fa9c..7cb9d1d2a 100644
--- a/grub-core/video/readers/tga.c
+++ b/grub-core/video/readers/tga.c
@@ -297,7 +297,7 @@ grub_video_reader_tga (struct grub_video_bitmap **bitmap,
@@ -1456,7 +1456,7 @@ index c7a16fa9cc4..7cb9d1d2a0c 100644
return grub_errno;
diff --git a/util/grub-fstest.c b/util/grub-fstest.c
-index 793aefa02b1..fe5982220d0 100644
+index 793aefa02..fe5982220 100644
--- a/util/grub-fstest.c
+++ b/util/grub-fstest.c
@@ -120,9 +120,9 @@ read_file (char *pathname, int (*hook) (grub_off_t ofs, char *buf, int len, void
@@ -1473,7 +1473,7 @@ index 793aefa02b1..fe5982220d0 100644
{
grub_util_error (_("cannot open `%s': %s"), pathname,
diff --git a/util/grub-mount.c b/util/grub-mount.c
-index a25db8a7181..e32b502e7e4 100644
+index a25db8a71..e32b502e7 100644
--- a/util/grub-mount.c
+++ b/util/grub-mount.c
@@ -208,7 +208,7 @@ fuse_getattr (const char *path, struct stat *st)
@@ -1504,7 +1504,7 @@ index a25db8a7181..e32b502e7e4 100644
/* Symlink to directory. */
if (! file && grub_errno == GRUB_ERR_BAD_FILE_TYPE)
diff --git a/include/grub/bufio.h b/include/grub/bufio.h
-index 77eb8ee5672..0ff72d1033c 100644
+index 77eb8ee56..0ff72d103 100644
--- a/include/grub/bufio.h
+++ b/include/grub/bufio.h
@@ -23,6 +23,8 @@
@@ -1518,7 +1518,7 @@ index 77eb8ee5672..0ff72d1033c 100644
#endif /* ! GRUB_BUFIO_H */
diff --git a/include/grub/elfload.h b/include/grub/elfload.h
-index 9a7ae4ebb30..dbb609c9b20 100644
+index 9a7ae4ebb..dbb609c9b 100644
--- a/include/grub/elfload.h
+++ b/include/grub/elfload.h
@@ -42,7 +42,7 @@ typedef int (*grub_elf32_phdr_iterate_hook_t)
@@ -1531,7 +1531,7 @@ index 9a7ae4ebb30..dbb609c9b20 100644
grub_err_t grub_elf_close (grub_elf_t);
diff --git a/include/grub/file.h b/include/grub/file.h
-index 739488cbe59..5b47c5f91f9 100644
+index 739488cbe..5b47c5f91 100644
--- a/include/grub/file.h
+++ b/include/grub/file.h
@@ -25,6 +25,109 @@
@@ -1723,7 +1723,7 @@ index 739488cbe59..5b47c5f91f9 100644
grub_file_offset_close (grub_file_t file);
diff --git a/include/grub/machoload.h b/include/grub/machoload.h
-index 1eec118f15f..f1157f4105b 100644
+index 1eec118f1..f1157f410 100644
--- a/include/grub/machoload.h
+++ b/include/grub/machoload.h
@@ -49,7 +49,8 @@ struct grub_macho_file
diff --git a/SOURCES/0331-verifiers-Framework-core.patch b/SOURCES/0331-verifiers-Framework-core.patch
index b830048..e091336 100644
--- a/SOURCES/0331-verifiers-Framework-core.patch
+++ b/SOURCES/0331-verifiers-Framework-core.patch
@@ -27,7 +27,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
create mode 100644 include/grub/verify.h
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index c8a50b4fcfa..29c3bf6cd66 100644
+index c8a50b4fc..29c3bf6cd 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -921,6 +921,11 @@ module = {
@@ -44,7 +44,7 @@ index c8a50b4fcfa..29c3bf6cd66 100644
common = commands/hdparm.c;
diff --git a/grub-core/commands/verifiers.c b/grub-core/commands/verifiers.c
new file mode 100644
-index 00000000000..fde88318d4c
+index 000000000..fde88318d
--- /dev/null
+++ b/grub-core/commands/verifiers.c
@@ -0,0 +1,197 @@
@@ -246,7 +246,7 @@ index 00000000000..fde88318d4c
+ grub_file_filter_unregister (GRUB_FILE_FILTER_VERIFY);
+}
diff --git a/grub-core/commands/verify.c b/grub-core/commands/verify.c
-index f0dfeceebd4..29e74a64004 100644
+index f0dfeceeb..29e74a640 100644
--- a/grub-core/commands/verify.c
+++ b/grub-core/commands/verify.c
@@ -30,16 +30,10 @@
@@ -929,7 +929,7 @@ index f0dfeceebd4..29e74a64004 100644
grub_unregister_extcmd (cmd_trust);
grub_unregister_command (cmd_list);
diff --git a/include/grub/file.h b/include/grub/file.h
-index 5b47c5f91f9..19dda67f68b 100644
+index 5b47c5f91..19dda67f6 100644
--- a/include/grub/file.h
+++ b/include/grub/file.h
@@ -171,7 +171,7 @@ extern grub_disk_read_hook_t EXPORT_VAR(grub_file_progress_hook);
@@ -942,7 +942,7 @@ index 5b47c5f91f9..19dda67f68b 100644
GRUB_FILE_FILTER_XZIO,
GRUB_FILE_FILTER_LZOPIO,
diff --git a/include/grub/list.h b/include/grub/list.h
-index d170ff6da02..b13acb96243 100644
+index d170ff6da..b13acb962 100644
--- a/include/grub/list.h
+++ b/include/grub/list.h
@@ -35,6 +35,7 @@ void EXPORT_FUNC(grub_list_push) (grub_list_t *head, grub_list_t item);
@@ -955,7 +955,7 @@ index d170ff6da02..b13acb96243 100644
static inline void *
diff --git a/include/grub/verify.h b/include/grub/verify.h
new file mode 100644
-index 00000000000..298120f5776
+index 000000000..298120f57
--- /dev/null
+++ b/include/grub/verify.h
@@ -0,0 +1,65 @@
diff --git a/SOURCES/0332-verifiers-Add-possibility-to-verify-kernel-and-modul.patch b/SOURCES/0332-verifiers-Add-possibility-to-verify-kernel-and-modul.patch
index b6265b2..9868893 100644
--- a/SOURCES/0332-verifiers-Add-possibility-to-verify-kernel-and-modul.patch
+++ b/SOURCES/0332-verifiers-Add-possibility-to-verify-kernel-and-modul.patch
@@ -31,7 +31,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
18 files changed, 131 insertions(+), 35 deletions(-)
diff --git a/grub-core/commands/verifiers.c b/grub-core/commands/verifiers.c
-index fde88318d4c..59ea418a2d9 100644
+index fde88318d..59ea418a2 100644
--- a/grub-core/commands/verifiers.c
+++ b/grub-core/commands/verifiers.c
@@ -186,6 +186,20 @@ grub_verifiers_open (grub_file_t io, enum grub_file_type type)
@@ -56,7 +56,7 @@ index fde88318d4c..59ea418a2d9 100644
{
grub_file_filter_register (GRUB_FILE_FILTER_VERIFY, grub_verifiers_open);
diff --git a/grub-core/lib/cmdline.c b/grub-core/lib/cmdline.c
-index d5c12957cad..463c3c65c79 100644
+index d5c12957c..463c3c65c 100644
--- a/grub-core/lib/cmdline.c
+++ b/grub-core/lib/cmdline.c
@@ -75,8 +75,9 @@ unsigned int grub_loader_cmdline_size (int argc, char *argv[])
@@ -79,7 +79,7 @@ index d5c12957cad..463c3c65c79 100644
+ return grub_verify_string (orig, type);
}
diff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c
-index ea29d7a724a..beceda52030 100644
+index ea29d7a72..beceda520 100644
--- a/grub-core/loader/arm/linux.c
+++ b/grub-core/loader/arm/linux.c
@@ -28,6 +28,7 @@
@@ -105,7 +105,7 @@ index ea29d7a724a..beceda52030 100644
return GRUB_ERR_NONE;
diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index 7a076c13171..48ea66596ad 100644
+index 7a076c131..48ea66596 100644
--- a/grub-core/loader/arm64/linux.c
+++ b/grub-core/loader/arm64/linux.c
@@ -33,6 +33,7 @@
@@ -133,7 +133,7 @@ index 7a076c13171..48ea66596ad 100644
if (grub_errno == GRUB_ERR_NONE)
{
diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
-index 8306b415abd..45a71509956 100644
+index 8306b415a..45a715099 100644
--- a/grub-core/loader/i386/bsd.c
+++ b/grub-core/loader/i386/bsd.c
@@ -36,6 +36,7 @@
@@ -164,7 +164,7 @@ index 8306b415abd..45a71509956 100644
}
diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
-index aa2cbc4e7eb..ef8fcb9e1b6 100644
+index aa2cbc4e7..ef8fcb9e1 100644
--- a/grub-core/loader/i386/linux.c
+++ b/grub-core/loader/i386/linux.c
@@ -1039,11 +1039,17 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
@@ -191,7 +191,7 @@ index aa2cbc4e7eb..ef8fcb9e1b6 100644
len = prot_file_size;
grub_memcpy (prot_mode_mem, kernel + kernel_offset, len);
diff --git a/grub-core/loader/i386/multiboot_mbi.c b/grub-core/loader/i386/multiboot_mbi.c
-index 9d3466d6ace..525446b5687 100644
+index 9d3466d6a..525446b56 100644
--- a/grub-core/loader/i386/multiboot_mbi.c
+++ b/grub-core/loader/i386/multiboot_mbi.c
@@ -676,10 +676,8 @@ grub_multiboot_init_mbi (int argc, char *argv[])
@@ -232,7 +232,7 @@ index 9d3466d6ace..525446b5687 100644
if (modules_last)
modules_last->next = newmod;
diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
-index b5c28c6580e..f631225f59b 100644
+index b5c28c658..f631225f5 100644
--- a/grub-core/loader/i386/pc/linux.c
+++ b/grub-core/loader/i386/pc/linux.c
@@ -348,11 +348,14 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
@@ -256,7 +256,7 @@ index b5c28c6580e..f631225f59b 100644
if (grub_linux_is_bzimage)
grub_linux_prot_target = GRUB_LINUX_BZIMAGE_ADDR;
diff --git a/grub-core/loader/i386/pc/plan9.c b/grub-core/loader/i386/pc/plan9.c
-index 0351090daf8..37550155df7 100644
+index 0351090da..37550155d 100644
--- a/grub-core/loader/i386/pc/plan9.c
+++ b/grub-core/loader/i386/pc/plan9.c
@@ -33,6 +33,7 @@
@@ -292,7 +292,7 @@ index 0351090daf8..37550155df7 100644
{
diff --git a/grub-core/loader/i386/xen.c b/grub-core/loader/i386/xen.c
-index 82350d3a178..07a4837c532 100644
+index 82350d3a1..07a4837c5 100644
--- a/grub-core/loader/i386/xen.c
+++ b/grub-core/loader/i386/xen.c
@@ -41,6 +41,7 @@
@@ -324,7 +324,7 @@ index 82350d3a178..07a4837c532 100644
xen_state.module_info_page[xen_state.n_modules].cmdline =
xen_state.max_addr - xen_state.modules_target_start;
diff --git a/grub-core/loader/ia64/efi/linux.c b/grub-core/loader/ia64/efi/linux.c
-index 750330d4572..e325fe0ee83 100644
+index 750330d45..e325fe0ee 100644
--- a/grub-core/loader/ia64/efi/linux.c
+++ b/grub-core/loader/ia64/efi/linux.c
@@ -33,6 +33,7 @@
@@ -349,7 +349,7 @@ index 750330d4572..e325fe0ee83 100644
boot_param->command_line = (grub_uint64_t) cmdline;
boot_param->efi_systab = (grub_uint64_t) grub_efi_system_table;
diff --git a/grub-core/loader/mips/linux.c b/grub-core/loader/mips/linux.c
-index 10358854458..20135ce253d 100644
+index 103588544..20135ce25 100644
--- a/grub-core/loader/mips/linux.c
+++ b/grub-core/loader/mips/linux.c
@@ -327,6 +327,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
@@ -375,7 +375,7 @@ index 10358854458..20135ce253d 100644
rd_addr_arg_off = (grub_uint8_t *) linux_args - (grub_uint8_t *) playground;
linux_args += ALIGN_UP (sizeof ("rd_start=0xXXXXXXXXXXXXXXXX"), 4);
diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c
-index 3cfb47650a0..f64a857e394 100644
+index 3cfb47650..f64a857e3 100644
--- a/grub-core/loader/multiboot_mbi2.c
+++ b/grub-core/loader/multiboot_mbi2.c
@@ -1077,10 +1077,8 @@ grub_multiboot2_init_mbi (int argc, char *argv[])
@@ -401,7 +401,7 @@ index 3cfb47650a0..f64a857e394 100644
{
grub_free (newmod->cmdline);
diff --git a/grub-core/loader/powerpc/ieee1275/linux.c b/grub-core/loader/powerpc/ieee1275/linux.c
-index 6e814649f31..c114e7df4fb 100644
+index 6e814649f..c114e7df4 100644
--- a/grub-core/loader/powerpc/ieee1275/linux.c
+++ b/grub-core/loader/powerpc/ieee1275/linux.c
@@ -302,8 +302,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
@@ -417,7 +417,7 @@ index 6e814649f31..c114e7df4fb 100644
out:
diff --git a/grub-core/loader/sparc64/ieee1275/linux.c b/grub-core/loader/sparc64/ieee1275/linux.c
-index 67ef0488324..abe46faa012 100644
+index 67ef04883..abe46faa0 100644
--- a/grub-core/loader/sparc64/ieee1275/linux.c
+++ b/grub-core/loader/sparc64/ieee1275/linux.c
@@ -340,8 +340,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
@@ -433,7 +433,7 @@ index 67ef0488324..abe46faa012 100644
out:
if (elf)
diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c
-index 9f78abb05f9..5944dc5eafc 100644
+index 9f78abb05..5944dc5ea 100644
--- a/grub-core/loader/xnu.c
+++ b/grub-core/loader/xnu.c
@@ -35,6 +35,7 @@
@@ -467,7 +467,7 @@ index 9f78abb05f9..5944dc5eafc 100644
err = grub_efiemu_autocore ();
if (err)
diff --git a/include/grub/lib/cmdline.h b/include/grub/lib/cmdline.h
-index 1fe8d017971..cdca09b7a16 100644
+index 1fe8d0179..cdca09b7a 100644
--- a/include/grub/lib/cmdline.h
+++ b/include/grub/lib/cmdline.h
@@ -21,11 +21,12 @@
@@ -486,7 +486,7 @@ index 1fe8d017971..cdca09b7a16 100644
#endif /* ! GRUB_CMDLINE_HEADER */
diff --git a/include/grub/verify.h b/include/grub/verify.h
-index 298120f5776..9f892d8fedb 100644
+index 298120f57..9f892d8fe 100644
--- a/include/grub/verify.h
+++ b/include/grub/verify.h
@@ -25,6 +25,12 @@ enum grub_verify_flags
diff --git a/SOURCES/0333-verifiers-Add-possibility-to-defer-verification-to-o.patch b/SOURCES/0333-verifiers-Add-possibility-to-defer-verification-to-o.patch
index bddb30e..d8c5a6e 100644
--- a/SOURCES/0333-verifiers-Add-possibility-to-defer-verification-to-o.patch
+++ b/SOURCES/0333-verifiers-Add-possibility-to-defer-verification-to-o.patch
@@ -22,7 +22,7 @@ Reviewed-by: Ross Philipson <ross.philipson@oracle.com>
2 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/grub-core/commands/verifiers.c b/grub-core/commands/verifiers.c
-index 59ea418a2d9..c638d5f43e0 100644
+index 59ea418a2..c638d5f43 100644
--- a/grub-core/commands/verifiers.c
+++ b/grub-core/commands/verifiers.c
@@ -83,6 +83,7 @@ grub_verifiers_open (grub_file_t io, enum grub_file_type type)
@@ -75,7 +75,7 @@ index 59ea418a2d9..c638d5f43e0 100644
err = ver->write (context, verified->buf, ret->size);
if (err)
diff --git a/include/grub/verify.h b/include/grub/verify.h
-index 9f892d8fedb..79022b42258 100644
+index 9f892d8fe..79022b422 100644
--- a/include/grub/verify.h
+++ b/include/grub/verify.h
@@ -22,7 +22,9 @@
diff --git a/SOURCES/0334-verifiers-Rename-verify-module-to-pgp-module.patch b/SOURCES/0334-verifiers-Rename-verify-module-to-pgp-module.patch
index 40363f2..9fb13a8 100644
--- a/SOURCES/0334-verifiers-Rename-verify-module-to-pgp-module.patch
+++ b/SOURCES/0334-verifiers-Rename-verify-module-to-pgp-module.patch
@@ -16,7 +16,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
rename grub-core/commands/{verify.c => pgp.c} (100%)
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 29c3bf6cd66..809f11feaef 100644
+index 29c3bf6cd..809f11fea 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -915,8 +915,8 @@ module = {
diff --git a/SOURCES/0335-pgp-Fix-emu-build-and-tests-after-pgp-module-renamin.patch b/SOURCES/0335-pgp-Fix-emu-build-and-tests-after-pgp-module-renamin.patch
index 5813141..6199a40 100644
--- a/SOURCES/0335-pgp-Fix-emu-build-and-tests-after-pgp-module-renamin.patch
+++ b/SOURCES/0335-pgp-Fix-emu-build-and-tests-after-pgp-module-renamin.patch
@@ -19,7 +19,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/grub-core/commands/pgp.c b/grub-core/commands/pgp.c
-index 29e74a64004..5c913c2e2fe 100644
+index 29e74a640..5c913c2e2 100644
--- a/grub-core/commands/pgp.c
+++ b/grub-core/commands/pgp.c
@@ -950,7 +950,7 @@ struct grub_file_verifier grub_pubkey_verifier =
@@ -41,7 +41,7 @@ index 29e74a64004..5c913c2e2fe 100644
grub_verifier_unregister (&grub_pubkey_verifier);
grub_unregister_extcmd (cmd);
diff --git a/tests/file_filter_test.in b/tests/file_filter_test.in
-index bfb6382274e..ed6abcb5af4 100644
+index bfb638227..ed6abcb5a 100644
--- a/tests/file_filter_test.in
+++ b/tests/file_filter_test.in
@@ -19,7 +19,7 @@ grubshell=@builddir@/grub-shell
diff --git a/SOURCES/0336-include-grub-file.h-Add-device-tree-file-type.patch b/SOURCES/0336-include-grub-file.h-Add-device-tree-file-type.patch
index 04e16fc..d96521e 100644
--- a/SOURCES/0336-include-grub-file.h-Add-device-tree-file-type.patch
+++ b/SOURCES/0336-include-grub-file.h-Add-device-tree-file-type.patch
@@ -16,7 +16,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
1 file changed, 2 insertions(+)
diff --git a/include/grub/file.h b/include/grub/file.h
-index 19dda67f68b..9aae463557a 100644
+index 19dda67f6..9aae46355 100644
--- a/include/grub/file.h
+++ b/include/grub/file.h
@@ -69,6 +69,8 @@ enum grub_file_type
diff --git a/SOURCES/0337-grub-core-loader-efi-fdt.c-Fixup-grub_file_open-call.patch b/SOURCES/0337-grub-core-loader-efi-fdt.c-Fixup-grub_file_open-call.patch
index 73d1cda..257466c 100644
--- a/SOURCES/0337-grub-core-loader-efi-fdt.c-Fixup-grub_file_open-call.patch
+++ b/SOURCES/0337-grub-core-loader-efi-fdt.c-Fixup-grub_file_open-call.patch
@@ -14,7 +14,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/loader/efi/fdt.c b/grub-core/loader/efi/fdt.c
-index a9dbcfdfeaf..e3ee3ad79d6 100644
+index a9dbcfdfe..e3ee3ad79 100644
--- a/grub-core/loader/efi/fdt.c
+++ b/grub-core/loader/efi/fdt.c
@@ -125,7 +125,7 @@ grub_cmd_devicetree (grub_command_t cmd __attribute__ ((unused)),
diff --git a/SOURCES/0338-arm64-efi-Fix-breakage-caused-by-verifiers.patch b/SOURCES/0338-arm64-efi-Fix-breakage-caused-by-verifiers.patch
index debb2c6..78c7eac 100644
--- a/SOURCES/0338-arm64-efi-Fix-breakage-caused-by-verifiers.patch
+++ b/SOURCES/0338-arm64-efi-Fix-breakage-caused-by-verifiers.patch
@@ -16,7 +16,7 @@ Conflicts:
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index 48ea66596ad..864724dd4fa 100644
+index 48ea66596..864724dd4 100644
--- a/grub-core/loader/arm64/linux.c
+++ b/grub-core/loader/arm64/linux.c
@@ -338,6 +338,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
diff --git a/SOURCES/0339-arm-uboot-ia64-sparc64-Fix-up-grub_file_open-calls.patch b/SOURCES/0339-arm-uboot-ia64-sparc64-Fix-up-grub_file_open-calls.patch
index 8cd7685..9603b36 100644
--- a/SOURCES/0339-arm-uboot-ia64-sparc64-Fix-up-grub_file_open-calls.patch
+++ b/SOURCES/0339-arm-uboot-ia64-sparc64-Fix-up-grub_file_open-calls.patch
@@ -16,7 +16,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c
-index beceda52030..1e944a2b671 100644
+index beceda520..1e944a2b6 100644
--- a/grub-core/loader/arm/linux.c
+++ b/grub-core/loader/arm/linux.c
@@ -363,7 +363,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
@@ -47,7 +47,7 @@ index beceda52030..1e944a2b671 100644
return grub_errno;
diff --git a/grub-core/loader/ia64/efi/linux.c b/grub-core/loader/ia64/efi/linux.c
-index e325fe0ee83..2ad0b0c0407 100644
+index e325fe0ee..2ad0b0c04 100644
--- a/grub-core/loader/ia64/efi/linux.c
+++ b/grub-core/loader/ia64/efi/linux.c
@@ -502,7 +502,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
@@ -60,7 +60,7 @@ index e325fe0ee83..2ad0b0c0407 100644
goto fail;
diff --git a/grub-core/loader/sparc64/ieee1275/linux.c b/grub-core/loader/sparc64/ieee1275/linux.c
-index abe46faa012..bb47ee0cc64 100644
+index abe46faa0..bb47ee0cc 100644
--- a/grub-core/loader/sparc64/ieee1275/linux.c
+++ b/grub-core/loader/sparc64/ieee1275/linux.c
@@ -306,7 +306,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
diff --git a/SOURCES/0340-verifiers-fix-double-close-on-pgp-s-sig-file-descrip.patch b/SOURCES/0340-verifiers-fix-double-close-on-pgp-s-sig-file-descrip.patch
index 4704137..036aa1f 100644
--- a/SOURCES/0340-verifiers-fix-double-close-on-pgp-s-sig-file-descrip.patch
+++ b/SOURCES/0340-verifiers-fix-double-close-on-pgp-s-sig-file-descrip.patch
@@ -44,7 +44,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/grub-core/commands/pgp.c b/grub-core/commands/pgp.c
-index 5c913c2e2fe..d39846d8cfe 100644
+index 5c913c2e2..d39846d8c 100644
--- a/grub-core/commands/pgp.c
+++ b/grub-core/commands/pgp.c
@@ -495,13 +495,12 @@ grub_verify_signature_init (struct grub_pubkey_context *ctxt, grub_file_t sig)
@@ -132,7 +132,7 @@ index 5c913c2e2fe..d39846d8cfe 100644
}
*context = ctxt;
diff --git a/include/grub/pubkey.h b/include/grub/pubkey.h
-index 4a9d04b4305..fb8be9cbb73 100644
+index 4a9d04b43..fb8be9cbb 100644
--- a/include/grub/pubkey.h
+++ b/include/grub/pubkey.h
@@ -25,7 +25,7 @@ struct grub_public_key *
diff --git a/SOURCES/0341-verifiers-Xen-fallout-cleanup.patch b/SOURCES/0341-verifiers-Xen-fallout-cleanup.patch
index 7270f3e..92fd669 100644
--- a/SOURCES/0341-verifiers-Xen-fallout-cleanup.patch
+++ b/SOURCES/0341-verifiers-Xen-fallout-cleanup.patch
@@ -13,7 +13,7 @@ Reviewed-by: Ross Philipson <ross.philipson@oracle.com>
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/grub-core/loader/i386/xen.c b/grub-core/loader/i386/xen.c
-index 07a4837c532..071b530d744 100644
+index 07a4837c5..071b530d7 100644
--- a/grub-core/loader/i386/xen.c
+++ b/grub-core/loader/i386/xen.c
@@ -647,10 +647,10 @@ grub_cmd_xen (grub_command_t cmd __attribute__ ((unused)),
diff --git a/SOURCES/0342-verifiers-ARM-Xen-fallout-cleanup.patch b/SOURCES/0342-verifiers-ARM-Xen-fallout-cleanup.patch
index cc1bfea..8cedfab 100644
--- a/SOURCES/0342-verifiers-ARM-Xen-fallout-cleanup.patch
+++ b/SOURCES/0342-verifiers-ARM-Xen-fallout-cleanup.patch
@@ -19,7 +19,7 @@ Conflicts:
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/grub-core/loader/arm64/xen_boot.c b/grub-core/loader/arm64/xen_boot.c
-index f35b16caa92..318c833de57 100644
+index f35b16caa..318c833de 100644
--- a/grub-core/loader/arm64/xen_boot.c
+++ b/grub-core/loader/arm64/xen_boot.c
@@ -427,9 +427,10 @@ grub_cmd_xen_module (grub_command_t cmd __attribute__((unused)),
@@ -46,7 +46,7 @@ index f35b16caa92..318c833de57 100644
goto fail;
diff --git a/include/grub/file.h b/include/grub/file.h
-index 9aae463557a..cbbd294655b 100644
+index 9aae46355..cbbd29465 100644
--- a/include/grub/file.h
+++ b/include/grub/file.h
@@ -42,6 +42,11 @@ enum grub_file_type
diff --git a/SOURCES/0343-verifiers-IA-64-fallout-cleanup.patch b/SOURCES/0343-verifiers-IA-64-fallout-cleanup.patch
index 005a324..b810f79 100644
--- a/SOURCES/0343-verifiers-IA-64-fallout-cleanup.patch
+++ b/SOURCES/0343-verifiers-IA-64-fallout-cleanup.patch
@@ -13,7 +13,7 @@ Reviewed-by: Ross Philipson <ross.philipson@oracle.com>
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/grub-core/loader/ia64/efi/linux.c b/grub-core/loader/ia64/efi/linux.c
-index 2ad0b0c0407..cfeb2c145bb 100644
+index 2ad0b0c04..cfeb2c145 100644
--- a/grub-core/loader/ia64/efi/linux.c
+++ b/grub-core/loader/ia64/efi/linux.c
@@ -547,8 +547,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
diff --git a/SOURCES/0344-verifiers-PowerPC-fallout-cleanup.patch b/SOURCES/0344-verifiers-PowerPC-fallout-cleanup.patch
index 451e5f6..d625613 100644
--- a/SOURCES/0344-verifiers-PowerPC-fallout-cleanup.patch
+++ b/SOURCES/0344-verifiers-PowerPC-fallout-cleanup.patch
@@ -14,7 +14,7 @@ Reviewed-by: Ross Philipson <ross.philipson@oracle.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/grub-core/loader/powerpc/ieee1275/linux.c b/grub-core/loader/powerpc/ieee1275/linux.c
-index c114e7df4fb..818b2a86d1a 100644
+index c114e7df4..818b2a86d 100644
--- a/grub-core/loader/powerpc/ieee1275/linux.c
+++ b/grub-core/loader/powerpc/ieee1275/linux.c
@@ -270,7 +270,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
diff --git a/SOURCES/0345-verifiers-MIPS-fallout-cleanup.patch b/SOURCES/0345-verifiers-MIPS-fallout-cleanup.patch
index 9fe0c40..0c12255 100644
--- a/SOURCES/0345-verifiers-MIPS-fallout-cleanup.patch
+++ b/SOURCES/0345-verifiers-MIPS-fallout-cleanup.patch
@@ -13,7 +13,7 @@ Reviewed-by: Ross Philipson <ross.philipson@oracle.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/loader/mips/linux.c b/grub-core/loader/mips/linux.c
-index 20135ce253d..e4ed95921df 100644
+index 20135ce25..e4ed95921 100644
--- a/grub-core/loader/mips/linux.c
+++ b/grub-core/loader/mips/linux.c
@@ -314,7 +314,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
diff --git a/SOURCES/0346-verifiers-Fix-calling-uninitialized-function-pointer.patch b/SOURCES/0346-verifiers-Fix-calling-uninitialized-function-pointer.patch
index 19d383a..a85b1ca 100644
--- a/SOURCES/0346-verifiers-Fix-calling-uninitialized-function-pointer.patch
+++ b/SOURCES/0346-verifiers-Fix-calling-uninitialized-function-pointer.patch
@@ -26,7 +26,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/grub-core/commands/verifiers.c b/grub-core/commands/verifiers.c
-index c638d5f43e0..599d79b757e 100644
+index c638d5f43..599d79b75 100644
--- a/grub-core/commands/verifiers.c
+++ b/grub-core/commands/verifiers.c
@@ -196,7 +196,8 @@ grub_verifiers_open (grub_file_t io, enum grub_file_type type)
diff --git a/SOURCES/0347-rhel-extra-file-type-fixes.patch b/SOURCES/0347-rhel-extra-file-type-fixes.patch
index aa75443..7edbf2f 100644
--- a/SOURCES/0347-rhel-extra-file-type-fixes.patch
+++ b/SOURCES/0347-rhel-extra-file-type-fixes.patch
@@ -16,7 +16,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
6 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
-index 70ce5c7bf6f..795a9f9f178 100644
+index 70ce5c7bf..795a9f9f1 100644
--- a/grub-core/commands/blscfg.c
+++ b/grub-core/commands/blscfg.c
@@ -463,7 +463,7 @@ static int read_entry (
@@ -29,7 +29,7 @@ index 70ce5c7bf6f..795a9f9f178 100644
goto finish;
diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index 864724dd4fa..e1923cf7257 100644
+index 864724dd4..e1923cf72 100644
--- a/grub-core/loader/arm64/linux.c
+++ b/grub-core/loader/arm64/linux.c
@@ -31,6 +31,7 @@
@@ -41,7 +41,7 @@ index 864724dd4fa..e1923cf7257 100644
#include <grub/lib/cmdline.h>
#include <grub/verify.h>
diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index 361e503cb52..576f8c07eaf 100644
+index 361e503cb..576f8c07e 100644
--- a/grub-core/loader/i386/efi/linux.c
+++ b/grub-core/loader/i386/efi/linux.c
@@ -101,8 +101,8 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
@@ -75,7 +75,7 @@ index 361e503cb52..576f8c07eaf 100644
grub_dprintf ("linux", "cmdline:%s\n", linux_cmdline);
grub_dprintf ("linux", "setting lh->cmd_line_ptr\n");
diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index 0e72bbb9b39..1fd104aeaf2 100644
+index 0e72bbb9b..1fd104aea 100644
--- a/grub-core/net/net.c
+++ b/grub-core/net/net.c
@@ -1907,7 +1907,7 @@ grub_net_search_configfile (char *config)
@@ -88,7 +88,7 @@ index 0e72bbb9b39..1fd104aeaf2 100644
if (file)
{
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index cee71a4c2ab..49141039f8f 100644
+index cee71a4c2..49141039f 100644
--- a/grub-core/normal/main.c
+++ b/grub-core/normal/main.c
@@ -363,7 +363,7 @@ grub_try_normal (const char *variable)
@@ -101,7 +101,7 @@ index cee71a4c2ab..49141039f8f 100644
{
grub_file_close (file);
diff --git a/grub-core/osdep/generic/blocklist.c b/grub-core/osdep/generic/blocklist.c
-index 74024fd06f3..ab1f96da62d 100644
+index 74024fd06..ab1f96da6 100644
--- a/grub-core/osdep/generic/blocklist.c
+++ b/grub-core/osdep/generic/blocklist.c
@@ -60,7 +60,7 @@ grub_install_get_blocklist (grub_device_t root_dev,
diff --git a/SOURCES/0348-dl-Add-support-for-persistent-modules.patch b/SOURCES/0348-dl-Add-support-for-persistent-modules.patch
index e534415..82b76e4 100644
--- a/SOURCES/0348-dl-Add-support-for-persistent-modules.patch
+++ b/SOURCES/0348-dl-Add-support-for-persistent-modules.patch
@@ -19,7 +19,7 @@ Reviewed-by: Ross Philipson <ross.philipson@oracle.com>
2 files changed, 16 insertions(+)
diff --git a/grub-core/commands/minicmd.c b/grub-core/commands/minicmd.c
-index 46bf135e8f0..6d66b7c453a 100644
+index 46bf135e8..6d66b7c45 100644
--- a/grub-core/commands/minicmd.c
+++ b/grub-core/commands/minicmd.c
@@ -137,6 +137,9 @@ grub_mini_cmd_rmmod (struct grub_command *cmd __attribute__ ((unused)),
@@ -33,7 +33,7 @@ index 46bf135e8f0..6d66b7c453a 100644
grub_dl_unload (mod);
diff --git a/include/grub/dl.h b/include/grub/dl.h
-index 7b5bfb07ce6..f7cfe64823c 100644
+index 7b5bfb07c..f7cfe6482 100644
--- a/include/grub/dl.h
+++ b/include/grub/dl.h
@@ -177,6 +177,7 @@ struct grub_dl
diff --git a/SOURCES/0349-Add-suport-for-signing-grub-with-an-appended-signatu.patch b/SOURCES/0349-Add-suport-for-signing-grub-with-an-appended-signatu.patch
index 538e916..9804cca 100644
--- a/SOURCES/0349-Add-suport-for-signing-grub-with-an-appended-signatu.patch
+++ b/SOURCES/0349-Add-suport-for-signing-grub-with-an-appended-signatu.patch
@@ -52,7 +52,7 @@ Platform Reference (PAPR).
6 files changed, 75 insertions(+), 13 deletions(-)
diff --git a/util/grub-install-common.c b/util/grub-install-common.c
-index cf993c059ad..561e671ff34 100644
+index cf993c059..561e671ff 100644
--- a/util/grub-install-common.c
+++ b/util/grub-install-common.c
@@ -303,10 +303,12 @@ handle_install_list (struct install_list *il, const char *val,
@@ -106,7 +106,7 @@ index cf993c059ad..561e671ff34 100644
grub_install_pop_module ();
}
diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
-index 98d24cc06ea..65a015d8a04 100644
+index 98d24cc06..65a015d8a 100644
--- a/util/grub-mkimage.c
+++ b/util/grub-mkimage.c
@@ -82,6 +82,7 @@ static struct argp_option options[] = {
@@ -156,7 +156,7 @@ index 98d24cc06ea..65a015d8a04 100644
grub_util_file_sync (fp);
diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c
-index f9aa1a033b5..1bb5eb84c14 100644
+index f9aa1a033..1bb5eb84c 100644
--- a/util/grub-mkimagexx.c
+++ b/util/grub-mkimagexx.c
@@ -82,6 +82,15 @@ struct grub_ieee1275_note
@@ -227,7 +227,7 @@ index f9aa1a033b5..1bb5eb84c14 100644
char *str_start = (elf_img + sizeof (*ehdr) + phnum * sizeof (*phdr)
+ shnum * sizeof (*shdr));
diff --git a/util/mkimage.c b/util/mkimage.c
-index e22d82afa61..a81120f26be 100644
+index e22d82afa..a81120f26 100644
--- a/util/mkimage.c
+++ b/util/mkimage.c
@@ -777,7 +777,7 @@ grub_install_generate_image (const char *dir, const char *prefix,
@@ -256,7 +256,7 @@ index e22d82afa61..a81120f26be 100644
break;
}
diff --git a/include/grub/util/install.h b/include/grub/util/install.h
-index 0dba8b67f93..ba5e6a2ea8f 100644
+index 0dba8b67f..ba5e6a2ea 100644
--- a/include/grub/util/install.h
+++ b/include/grub/util/install.h
@@ -63,6 +63,9 @@
@@ -289,7 +289,7 @@ index 0dba8b67f93..ba5e6a2ea8f 100644
const struct grub_install_image_target_desc *
diff --git a/include/grub/util/mkimage.h b/include/grub/util/mkimage.h
-index b3a5ca132bc..cef7fffa7ae 100644
+index b3a5ca132..cef7fffa7 100644
--- a/include/grub/util/mkimage.h
+++ b/include/grub/util/mkimage.h
@@ -50,12 +50,12 @@ grub_mkimage_load_image64 (const char *kernel_path,
diff --git a/SOURCES/0350-docs-grub-Document-signing-grub-under-UEFI.patch b/SOURCES/0350-docs-grub-Document-signing-grub-under-UEFI.patch
index dee54ce..3b01e54 100644
--- a/SOURCES/0350-docs-grub-Document-signing-grub-under-UEFI.patch
+++ b/SOURCES/0350-docs-grub-Document-signing-grub-under-UEFI.patch
@@ -14,7 +14,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/docs/grub.texi b/docs/grub.texi
-index fa11cc0aff7..acace6c0737 100644
+index fa11cc0af..acace6c07 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -5610,6 +5610,7 @@ environment variables and commands are listed in the same order.
diff --git a/SOURCES/0351-docs-grub-Document-signing-grub-with-an-appended-sig.patch b/SOURCES/0351-docs-grub-Document-signing-grub-with-an-appended-sig.patch
index 6e65133..d3410d5 100644
--- a/SOURCES/0351-docs-grub-Document-signing-grub-with-an-appended-sig.patch
+++ b/SOURCES/0351-docs-grub-Document-signing-grub-with-an-appended-sig.patch
@@ -13,7 +13,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
1 file changed, 42 insertions(+)
diff --git a/docs/grub.texi b/docs/grub.texi
-index acace6c0737..61c92a1e03d 100644
+index acace6c07..61c92a1e0 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -5789,6 +5789,48 @@ On UEFI platforms, @file{core.img} is a PE binary. Therefore, it can be signed
diff --git a/SOURCES/0352-docs-grub-grub-install-is-no-longer-a-shell-script.patch b/SOURCES/0352-docs-grub-grub-install-is-no-longer-a-shell-script.patch
index 2e5823f..2322ea5 100644
--- a/SOURCES/0352-docs-grub-grub-install-is-no-longer-a-shell-script.patch
+++ b/SOURCES/0352-docs-grub-grub-install-is-no-longer-a-shell-script.patch
@@ -14,7 +14,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
1 file changed, 7 deletions(-)
diff --git a/docs/grub.texi b/docs/grub.texi
-index 61c92a1e03d..34517e67439 100644
+index 61c92a1e0..34517e674 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -695,13 +695,6 @@ floppy instead of exposing the USB drive as a hard disk (they call it
diff --git a/SOURCES/0353-docs-grub-pubkey-has-been-supported-for-some-time.patch b/SOURCES/0353-docs-grub-pubkey-has-been-supported-for-some-time.patch
index f8a2e9e..b2c9248 100644
--- a/SOURCES/0353-docs-grub-pubkey-has-been-supported-for-some-time.patch
+++ b/SOURCES/0353-docs-grub-pubkey-has-been-supported-for-some-time.patch
@@ -12,7 +12,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/docs/grub.texi b/docs/grub.texi
-index 34517e67439..a833364d5ff 100644
+index 34517e674..a833364d5 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -5695,15 +5695,9 @@ verified with a public key currently trusted by GRUB
diff --git a/SOURCES/0354-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch b/SOURCES/0354-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch
index 859472d..bc42873 100644
--- a/SOURCES/0354-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch
+++ b/SOURCES/0354-dl-provide-a-fake-grub_dl_set_persistent-for-the-emu.patch
@@ -16,7 +16,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
1 file changed, 11 insertions(+)
diff --git a/include/grub/dl.h b/include/grub/dl.h
-index f7cfe64823c..877821dcb04 100644
+index f7cfe6482..877821dcb 100644
--- a/include/grub/dl.h
+++ b/include/grub/dl.h
@@ -243,11 +243,22 @@ grub_dl_get (const char *name)
diff --git a/SOURCES/0355-verifiers-provide-unsafe-module-list.patch b/SOURCES/0355-verifiers-provide-unsafe-module-list.patch
index 5a6148f..1fa7301 100644
--- a/SOURCES/0355-verifiers-provide-unsafe-module-list.patch
+++ b/SOURCES/0355-verifiers-provide-unsafe-module-list.patch
@@ -17,7 +17,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
2 files changed, 59 insertions(+)
diff --git a/grub-core/commands/verifiers.c b/grub-core/commands/verifiers.c
-index 599d79b757e..f64343ac90b 100644
+index 599d79b75..f64343ac9 100644
--- a/grub-core/commands/verifiers.c
+++ b/grub-core/commands/verifiers.c
@@ -218,6 +218,52 @@ grub_verify_string (char *str, enum grub_verify_string_type type)
@@ -74,7 +74,7 @@ index 599d79b757e..f64343ac90b 100644
{
grub_file_filter_register (GRUB_FILE_FILTER_VERIFY, grub_verifiers_open);
diff --git a/include/grub/verify.h b/include/grub/verify.h
-index 79022b42258..60c13e7ea8e 100644
+index 79022b422..60c13e7ea 100644
--- a/include/grub/verify.h
+++ b/include/grub/verify.h
@@ -76,3 +76,16 @@ grub_verifier_unregister (struct grub_file_verifier *ver)
diff --git a/SOURCES/0356-pgp-factor-out-rsa_pad.patch b/SOURCES/0356-pgp-factor-out-rsa_pad.patch
index 79a73ec..6900cc5 100644
--- a/SOURCES/0356-pgp-factor-out-rsa_pad.patch
+++ b/SOURCES/0356-pgp-factor-out-rsa_pad.patch
@@ -27,7 +27,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
create mode 100644 include/grub/pkcs1_v15.h
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 809f11feaef..99615c07b94 100644
+index 809f11fea..99615c07b 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -2387,6 +2387,14 @@ module = {
@@ -46,7 +46,7 @@ index 809f11feaef..99615c07b94 100644
name = all_video;
common = lib/fake_module.c;
diff --git a/grub-core/commands/pgp.c b/grub-core/commands/pgp.c
-index d39846d8cfe..bb6543819f0 100644
+index d39846d8c..bb6543819 100644
--- a/grub-core/commands/pgp.c
+++ b/grub-core/commands/pgp.c
@@ -24,6 +24,7 @@
@@ -93,7 +93,7 @@ index d39846d8cfe..bb6543819f0 100644
struct grub_pubkey_context
diff --git a/grub-core/lib/pkcs1_v15.c b/grub-core/lib/pkcs1_v15.c
new file mode 100644
-index 00000000000..dbacd563d01
+index 000000000..dbacd563d
--- /dev/null
+++ b/grub-core/lib/pkcs1_v15.c
@@ -0,0 +1,59 @@
@@ -158,7 +158,7 @@ index 00000000000..dbacd563d01
+}
diff --git a/include/grub/pkcs1_v15.h b/include/grub/pkcs1_v15.h
new file mode 100644
-index 00000000000..5c338c84a15
+index 000000000..5c338c84a
--- /dev/null
+++ b/include/grub/pkcs1_v15.h
@@ -0,0 +1,27 @@
diff --git a/SOURCES/0357-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch b/SOURCES/0357-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch
index e8004d2..ba7101e 100644
--- a/SOURCES/0357-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch
+++ b/SOURCES/0357-crypto-move-storage-for-grub_crypto_pk_-to-crypto.c.patch
@@ -40,7 +40,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/grub-core/commands/pgp.c b/grub-core/commands/pgp.c
-index bb6543819f0..75de32c2a00 100644
+index bb6543819..75de32c2a 100644
--- a/grub-core/commands/pgp.c
+++ b/grub-core/commands/pgp.c
@@ -147,10 +147,6 @@ const char *hashes[] = {
@@ -55,7 +55,7 @@ index bb6543819f0..75de32c2a00 100644
dsa_pad (gcry_mpi_t *hmpi, grub_uint8_t *hval,
const gcry_md_spec_t *hash, struct grub_public_subkey *sk);
diff --git a/grub-core/lib/crypto.c b/grub-core/lib/crypto.c
-index e6c78d16d39..ff62fa30e1a 100644
+index e6c78d16d..ff62fa30e 100644
--- a/grub-core/lib/crypto.c
+++ b/grub-core/lib/crypto.c
@@ -121,6 +121,10 @@ grub_md_unregister (gcry_md_spec_t *cipher)
diff --git a/SOURCES/0358-posix_wrap-tweaks-in-preparation-for-libtasn1.patch b/SOURCES/0358-posix_wrap-tweaks-in-preparation-for-libtasn1.patch
index 2db2a84..7ff703e 100644
--- a/SOURCES/0358-posix_wrap-tweaks-in-preparation-for-libtasn1.patch
+++ b/SOURCES/0358-posix_wrap-tweaks-in-preparation-for-libtasn1.patch
@@ -23,7 +23,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
3 files changed, 10 insertions(+)
diff --git a/grub-core/lib/posix_wrap/limits.h b/grub-core/lib/posix_wrap/limits.h
-index 95529540398..474a923b074 100644
+index 955295403..474a923b0 100644
--- a/grub-core/lib/posix_wrap/limits.h
+++ b/grub-core/lib/posix_wrap/limits.h
@@ -31,5 +31,6 @@
@@ -34,7 +34,7 @@ index 95529540398..474a923b074 100644
#endif
diff --git a/grub-core/lib/posix_wrap/stdlib.h b/grub-core/lib/posix_wrap/stdlib.h
-index 7a8d385e973..4634db09f29 100644
+index 7a8d385e9..4634db09f 100644
--- a/grub-core/lib/posix_wrap/stdlib.h
+++ b/grub-core/lib/posix_wrap/stdlib.h
@@ -58,4 +58,12 @@ abs (int c)
@@ -51,7 +51,7 @@ index 7a8d385e973..4634db09f29 100644
+
#endif
diff --git a/grub-core/lib/posix_wrap/sys/types.h b/grub-core/lib/posix_wrap/sys/types.h
-index 854eb0122ef..f63412c8da0 100644
+index 854eb0122..f63412c8d 100644
--- a/grub-core/lib/posix_wrap/sys/types.h
+++ b/grub-core/lib/posix_wrap/sys/types.h
@@ -51,6 +51,7 @@ typedef grub_uint8_t byte;
diff --git a/SOURCES/0359-libtasn1-import-libtasn1-4.16.0.patch b/SOURCES/0359-libtasn1-import-libtasn1-4.16.0.patch
index 89552c8..7a7b05d 100644
--- a/SOURCES/0359-libtasn1-import-libtasn1-4.16.0.patch
+++ b/SOURCES/0359-libtasn1-import-libtasn1-4.16.0.patch
@@ -53,7 +53,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
diff --git a/grub-core/lib/libtasn1/lib/coding.c b/grub-core/lib/libtasn1/lib/coding.c
new file mode 100644
-index 00000000000..245ea64cf0a
+index 000000000..245ea64cf
--- /dev/null
+++ b/grub-core/lib/libtasn1/lib/coding.c
@@ -0,0 +1,1415 @@
@@ -1474,7 +1474,7 @@ index 00000000000..245ea64cf0a
+}
diff --git a/grub-core/lib/libtasn1/lib/decoding.c b/grub-core/lib/libtasn1/lib/decoding.c
new file mode 100644
-index 00000000000..ff04eb778cb
+index 000000000..ff04eb778
--- /dev/null
+++ b/grub-core/lib/libtasn1/lib/decoding.c
@@ -0,0 +1,2478 @@
@@ -3958,7 +3958,7 @@ index 00000000000..ff04eb778cb
+}
diff --git a/grub-core/lib/libtasn1/lib/element.c b/grub-core/lib/libtasn1/lib/element.c
new file mode 100644
-index 00000000000..997eb2725dc
+index 000000000..997eb2725
--- /dev/null
+++ b/grub-core/lib/libtasn1/lib/element.c
@@ -0,0 +1,1111 @@
@@ -5075,7 +5075,7 @@ index 00000000000..997eb2725dc
+}
diff --git a/grub-core/lib/libtasn1/lib/errors.c b/grub-core/lib/libtasn1/lib/errors.c
new file mode 100644
-index 00000000000..cee74daf795
+index 000000000..cee74daf7
--- /dev/null
+++ b/grub-core/lib/libtasn1/lib/errors.c
@@ -0,0 +1,100 @@
@@ -5181,7 +5181,7 @@ index 00000000000..cee74daf795
+}
diff --git a/grub-core/lib/libtasn1/lib/gstr.c b/grub-core/lib/libtasn1/lib/gstr.c
new file mode 100644
-index 00000000000..e91a3a151c0
+index 000000000..e91a3a151
--- /dev/null
+++ b/grub-core/lib/libtasn1/lib/gstr.c
@@ -0,0 +1,74 @@
@@ -5261,7 +5261,7 @@ index 00000000000..e91a3a151c0
+}
diff --git a/grub-core/lib/libtasn1/lib/parser_aux.c b/grub-core/lib/libtasn1/lib/parser_aux.c
new file mode 100644
-index 00000000000..d5dbbf8765d
+index 000000000..d5dbbf876
--- /dev/null
+++ b/grub-core/lib/libtasn1/lib/parser_aux.c
@@ -0,0 +1,1173 @@
@@ -6440,7 +6440,7 @@ index 00000000000..d5dbbf8765d
+}
diff --git a/grub-core/lib/libtasn1/lib/structure.c b/grub-core/lib/libtasn1/lib/structure.c
new file mode 100644
-index 00000000000..8189c56a4c9
+index 000000000..8189c56a4
--- /dev/null
+++ b/grub-core/lib/libtasn1/lib/structure.c
@@ -0,0 +1,1220 @@
@@ -7666,7 +7666,7 @@ index 00000000000..8189c56a4c9
+}
diff --git a/grub-core/lib/libtasn1/lib/element.h b/grub-core/lib/libtasn1/lib/element.h
new file mode 100644
-index 00000000000..440a33f4bb1
+index 000000000..440a33f4b
--- /dev/null
+++ b/grub-core/lib/libtasn1/lib/element.h
@@ -0,0 +1,40 @@
@@ -7712,7 +7712,7 @@ index 00000000000..440a33f4bb1
+#endif
diff --git a/grub-core/lib/libtasn1/lib/gstr.h b/grub-core/lib/libtasn1/lib/gstr.h
new file mode 100644
-index 00000000000..48229844ff3
+index 000000000..48229844f
--- /dev/null
+++ b/grub-core/lib/libtasn1/lib/gstr.h
@@ -0,0 +1,47 @@
@@ -7765,7 +7765,7 @@ index 00000000000..48229844ff3
+#endif /* GSTR_H */
diff --git a/grub-core/lib/libtasn1/lib/int.h b/grub-core/lib/libtasn1/lib/int.h
new file mode 100644
-index 00000000000..ea1625786c1
+index 000000000..ea1625786
--- /dev/null
+++ b/grub-core/lib/libtasn1/lib/int.h
@@ -0,0 +1,221 @@
@@ -7992,7 +7992,7 @@ index 00000000000..ea1625786c1
+#endif /* INT_H */
diff --git a/grub-core/lib/libtasn1/lib/parser_aux.h b/grub-core/lib/libtasn1/lib/parser_aux.h
new file mode 100644
-index 00000000000..598e684b355
+index 000000000..598e684b3
--- /dev/null
+++ b/grub-core/lib/libtasn1/lib/parser_aux.h
@@ -0,0 +1,172 @@
@@ -8170,7 +8170,7 @@ index 00000000000..598e684b355
+#endif
diff --git a/grub-core/lib/libtasn1/lib/structure.h b/grub-core/lib/libtasn1/lib/structure.h
new file mode 100644
-index 00000000000..99e685da07a
+index 000000000..99e685da0
--- /dev/null
+++ b/grub-core/lib/libtasn1/lib/structure.h
@@ -0,0 +1,45 @@
@@ -8221,7 +8221,7 @@ index 00000000000..99e685da07a
+#endif
diff --git a/include/grub/libtasn1.h b/include/grub/libtasn1.h
new file mode 100644
-index 00000000000..6fd7a30dc35
+index 000000000..6fd7a30dc
--- /dev/null
+++ b/include/grub/libtasn1.h
@@ -0,0 +1,588 @@
@@ -8815,7 +8815,7 @@ index 00000000000..6fd7a30dc35
+#endif /* LIBTASN1_H */
diff --git a/grub-core/lib/libtasn1/LICENSE b/grub-core/lib/libtasn1/LICENSE
new file mode 100644
-index 00000000000..e8b3628db9b
+index 000000000..e8b3628db
--- /dev/null
+++ b/grub-core/lib/libtasn1/LICENSE
@@ -0,0 +1,16 @@
@@ -8837,7 +8837,7 @@ index 00000000000..e8b3628db9b
+note that the range specifies every single year in that closed interval.
diff --git a/grub-core/lib/libtasn1/README.md b/grub-core/lib/libtasn1/README.md
new file mode 100644
-index 00000000000..50a8642296c
+index 000000000..50a864229
--- /dev/null
+++ b/grub-core/lib/libtasn1/README.md
@@ -0,0 +1,91 @@
diff --git a/SOURCES/0360-libtasn1-disable-code-not-needed-in-grub.patch b/SOURCES/0360-libtasn1-disable-code-not-needed-in-grub.patch
index 00f5588..082cdb9 100644
--- a/SOURCES/0360-libtasn1-disable-code-not-needed-in-grub.patch
+++ b/SOURCES/0360-libtasn1-disable-code-not-needed-in-grub.patch
@@ -25,7 +25,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
6 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/grub-core/lib/libtasn1/lib/coding.c b/grub-core/lib/libtasn1/lib/coding.c
-index 245ea64cf0a..52def598368 100644
+index 245ea64cf..52def5983 100644
--- a/grub-core/lib/libtasn1/lib/coding.c
+++ b/grub-core/lib/libtasn1/lib/coding.c
@@ -30,11 +30,11 @@
@@ -99,7 +99,7 @@ index 245ea64cf0a..52def598368 100644
+#endif
\ No newline at end of file
diff --git a/grub-core/lib/libtasn1/lib/decoding.c b/grub-core/lib/libtasn1/lib/decoding.c
-index ff04eb778cb..42f9a92b5d4 100644
+index ff04eb778..42f9a92b5 100644
--- a/grub-core/lib/libtasn1/lib/decoding.c
+++ b/grub-core/lib/libtasn1/lib/decoding.c
@@ -1613,6 +1613,7 @@ asn1_der_decoding (asn1_node * element, const void *ider, int ider_len,
@@ -119,7 +119,7 @@ index ff04eb778cb..42f9a92b5d4 100644
/**
* asn1_der_decoding_startEnd:
diff --git a/grub-core/lib/libtasn1/lib/element.c b/grub-core/lib/libtasn1/lib/element.c
-index 997eb2725dc..539008d8e94 100644
+index 997eb2725..539008d8e 100644
--- a/grub-core/lib/libtasn1/lib/element.c
+++ b/grub-core/lib/libtasn1/lib/element.c
@@ -191,7 +191,7 @@ _asn1_append_sequence_set (asn1_node node, struct node_tail_cache_st *pcache)
@@ -141,7 +141,7 @@ index 997eb2725dc..539008d8e94 100644
#define PUT_VALUE( ptr, ptr_size, data, data_size) \
*len = data_size; \
diff --git a/grub-core/lib/libtasn1/lib/errors.c b/grub-core/lib/libtasn1/lib/errors.c
-index cee74daf795..42785e8622b 100644
+index cee74daf7..42785e862 100644
--- a/grub-core/lib/libtasn1/lib/errors.c
+++ b/grub-core/lib/libtasn1/lib/errors.c
@@ -57,6 +57,8 @@ static const libtasn1_error_entry error_algorithms[] = {
@@ -162,7 +162,7 @@ index cee74daf795..42785e8622b 100644
/**
* asn1_strerror:
diff --git a/grub-core/lib/libtasn1/lib/structure.c b/grub-core/lib/libtasn1/lib/structure.c
-index 8189c56a4c9..fcfde01a393 100644
+index 8189c56a4..fcfde01a3 100644
--- a/grub-core/lib/libtasn1/lib/structure.c
+++ b/grub-core/lib/libtasn1/lib/structure.c
@@ -76,7 +76,7 @@ _asn1_find_left (asn1_node_const node)
@@ -218,7 +218,7 @@ index 8189c56a4c9..fcfde01a393 100644
/**
* asn1_dup_node:
diff --git a/include/grub/libtasn1.h b/include/grub/libtasn1.h
-index 6fd7a30dc35..785eda2ae3f 100644
+index 6fd7a30dc..785eda2ae 100644
--- a/include/grub/libtasn1.h
+++ b/include/grub/libtasn1.h
@@ -319,6 +319,8 @@ typedef struct asn1_data_node_st asn1_data_node_st;
diff --git a/SOURCES/0361-libtasn1-changes-for-grub-compatibility.patch b/SOURCES/0361-libtasn1-changes-for-grub-compatibility.patch
index 9b2275c..35ceb56 100644
--- a/SOURCES/0361-libtasn1-changes-for-grub-compatibility.patch
+++ b/SOURCES/0361-libtasn1-changes-for-grub-compatibility.patch
@@ -35,7 +35,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
6 files changed, 22 insertions(+), 33 deletions(-)
diff --git a/grub-core/lib/libtasn1/lib/decoding.c b/grub-core/lib/libtasn1/lib/decoding.c
-index 42f9a92b5d4..7856858b272 100644
+index 42f9a92b5..7856858b2 100644
--- a/grub-core/lib/libtasn1/lib/decoding.c
+++ b/grub-core/lib/libtasn1/lib/decoding.c
@@ -32,7 +32,8 @@
@@ -71,7 +71,7 @@ index 42f9a92b5d4..7856858b272 100644
result = asn1_create_element (definitions, name, &aux);
if (result == ASN1_SUCCESS)
diff --git a/grub-core/lib/libtasn1/lib/element.c b/grub-core/lib/libtasn1/lib/element.c
-index 539008d8e94..ed761ff56bd 100644
+index 539008d8e..ed761ff56 100644
--- a/grub-core/lib/libtasn1/lib/element.c
+++ b/grub-core/lib/libtasn1/lib/element.c
@@ -30,9 +30,10 @@
@@ -87,7 +87,7 @@ index 539008d8e94..ed761ff56bd 100644
_asn1_hierarchical_name (asn1_node_const node, char *name, int name_size)
{
diff --git a/grub-core/lib/libtasn1/lib/gstr.c b/grub-core/lib/libtasn1/lib/gstr.c
-index e91a3a151c0..e33875c2c7c 100644
+index e91a3a151..e33875c2c 100644
--- a/grub-core/lib/libtasn1/lib/gstr.c
+++ b/grub-core/lib/libtasn1/lib/gstr.c
@@ -36,13 +36,13 @@ _asn1_str_cat (char *dest, size_t dest_tot_size, const char *src)
@@ -107,7 +107,7 @@ index e91a3a151c0..e33875c2c7c 100644
}
}
diff --git a/grub-core/lib/libtasn1/lib/parser_aux.c b/grub-core/lib/libtasn1/lib/parser_aux.c
-index d5dbbf8765d..89c9be69dc2 100644
+index d5dbbf876..89c9be69d 100644
--- a/grub-core/lib/libtasn1/lib/parser_aux.c
+++ b/grub-core/lib/libtasn1/lib/parser_aux.c
@@ -26,7 +26,8 @@
@@ -139,7 +139,7 @@ index d5dbbf8765d..89c9be69dc2 100644
temp[start + count] = '0' + (char) r;
count++;
diff --git a/grub-core/lib/libtasn1/lib/int.h b/grub-core/lib/libtasn1/lib/int.h
-index ea1625786c1..4a568efee9c 100644
+index ea1625786..4a568efee 100644
--- a/grub-core/lib/libtasn1/lib/int.h
+++ b/grub-core/lib/libtasn1/lib/int.h
@@ -35,7 +35,7 @@
@@ -161,7 +161,7 @@ index ea1625786c1..4a568efee9c 100644
#if SIZEOF_UNSIGNED_LONG_INT == 8
# define _asn1_strtou64(n,e,b) strtoul((const char *) n, e, b)
diff --git a/include/grub/libtasn1.h b/include/grub/libtasn1.h
-index 785eda2ae3f..28dbf16c4e0 100644
+index 785eda2ae..28dbf16c4 100644
--- a/include/grub/libtasn1.h
+++ b/include/grub/libtasn1.h
@@ -38,29 +38,15 @@
diff --git a/SOURCES/0362-libtasn1-compile-into-asn1-module.patch b/SOURCES/0362-libtasn1-compile-into-asn1-module.patch
index 8fbb427..7aa35f5 100644
--- a/SOURCES/0362-libtasn1-compile-into-asn1-module.patch
+++ b/SOURCES/0362-libtasn1-compile-into-asn1-module.patch
@@ -14,7 +14,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
create mode 100644 grub-core/lib/libtasn1_wrap/wrap.c
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 99615c07b94..c2d922e6d48 100644
+index 99615c07b..c2d922e6d 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -2436,3 +2436,18 @@ module = {
@@ -38,7 +38,7 @@ index 99615c07b94..c2d922e6d48 100644
+};
diff --git a/grub-core/lib/libtasn1_wrap/wrap.c b/grub-core/lib/libtasn1_wrap/wrap.c
new file mode 100644
-index 00000000000..622ba942e33
+index 000000000..622ba942e
--- /dev/null
+++ b/grub-core/lib/libtasn1_wrap/wrap.c
@@ -0,0 +1,26 @@
diff --git a/SOURCES/0363-test_asn1-test-module-for-libtasn1.patch b/SOURCES/0363-test_asn1-test-module-for-libtasn1.patch
index d777fcd..416580d 100644
--- a/SOURCES/0363-test_asn1-test-module-for-libtasn1.patch
+++ b/SOURCES/0363-test_asn1-test-module-for-libtasn1.patch
@@ -51,7 +51,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
create mode 100644 tests/test_asn1.in
diff --git a/Makefile.util.def b/Makefile.util.def
-index 5062a0e50fa..3987d4cdacd 100644
+index 5062a0e50..3987d4cda 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -1275,6 +1275,12 @@ script = {
@@ -68,7 +68,7 @@ index 5062a0e50fa..3987d4cdacd 100644
testcase;
name = example_unit_test;
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index c2d922e6d48..fd1229c6328 100644
+index c2d922e6d..fd1229c63 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -2451,3 +2451,16 @@ module = {
@@ -90,7 +90,7 @@ index c2d922e6d48..fd1229c6328 100644
+};
diff --git a/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654.c b/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654.c
new file mode 100644
-index 00000000000..534e304521e
+index 000000000..534e30452
--- /dev/null
+++ b/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654.c
@@ -0,0 +1,61 @@
@@ -157,7 +157,7 @@ index 00000000000..534e304521e
+}
diff --git a/grub-core/lib/libtasn1_wrap/tests/Test_overflow.c b/grub-core/lib/libtasn1_wrap/tests/Test_overflow.c
new file mode 100644
-index 00000000000..f48aea0ef8b
+index 000000000..f48aea0ef
--- /dev/null
+++ b/grub-core/lib/libtasn1_wrap/tests/Test_overflow.c
@@ -0,0 +1,138 @@
@@ -301,7 +301,7 @@ index 00000000000..f48aea0ef8b
+}
diff --git a/grub-core/lib/libtasn1_wrap/tests/Test_simple.c b/grub-core/lib/libtasn1_wrap/tests/Test_simple.c
new file mode 100644
-index 00000000000..9f01006ddf4
+index 000000000..9f01006dd
--- /dev/null
+++ b/grub-core/lib/libtasn1_wrap/tests/Test_simple.c
@@ -0,0 +1,207 @@
@@ -514,7 +514,7 @@ index 00000000000..9f01006ddf4
+}
diff --git a/grub-core/lib/libtasn1_wrap/tests/Test_strings.c b/grub-core/lib/libtasn1_wrap/tests/Test_strings.c
new file mode 100644
-index 00000000000..dbe1474b204
+index 000000000..dbe1474b2
--- /dev/null
+++ b/grub-core/lib/libtasn1_wrap/tests/Test_strings.c
@@ -0,0 +1,150 @@
@@ -670,7 +670,7 @@ index 00000000000..dbe1474b204
+}
diff --git a/grub-core/lib/libtasn1_wrap/tests/object-id-decoding.c b/grub-core/lib/libtasn1_wrap/tests/object-id-decoding.c
new file mode 100644
-index 00000000000..d367bbfb5a7
+index 000000000..d367bbfb5
--- /dev/null
+++ b/grub-core/lib/libtasn1_wrap/tests/object-id-decoding.c
@@ -0,0 +1,116 @@
@@ -792,7 +792,7 @@ index 00000000000..d367bbfb5a7
+}
diff --git a/grub-core/lib/libtasn1_wrap/tests/object-id-encoding.c b/grub-core/lib/libtasn1_wrap/tests/object-id-encoding.c
new file mode 100644
-index 00000000000..3a83b58c59f
+index 000000000..3a83b58c5
--- /dev/null
+++ b/grub-core/lib/libtasn1_wrap/tests/object-id-encoding.c
@@ -0,0 +1,120 @@
@@ -918,7 +918,7 @@ index 00000000000..3a83b58c59f
+}
diff --git a/grub-core/lib/libtasn1_wrap/tests/octet-string.c b/grub-core/lib/libtasn1_wrap/tests/octet-string.c
new file mode 100644
-index 00000000000..d8a049e8df0
+index 000000000..d8a049e8d
--- /dev/null
+++ b/grub-core/lib/libtasn1_wrap/tests/octet-string.c
@@ -0,0 +1,211 @@
@@ -1135,7 +1135,7 @@ index 00000000000..d8a049e8df0
+}
diff --git a/grub-core/lib/libtasn1_wrap/tests/reproducers.c b/grub-core/lib/libtasn1_wrap/tests/reproducers.c
new file mode 100644
-index 00000000000..dc7268d4c6c
+index 000000000..dc7268d4c
--- /dev/null
+++ b/grub-core/lib/libtasn1_wrap/tests/reproducers.c
@@ -0,0 +1,81 @@
@@ -1222,7 +1222,7 @@ index 00000000000..dc7268d4c6c
+}
diff --git a/grub-core/lib/libtasn1_wrap/wrap_tests.c b/grub-core/lib/libtasn1_wrap/wrap_tests.c
new file mode 100644
-index 00000000000..75fcd21f0d5
+index 000000000..75fcd21f0
--- /dev/null
+++ b/grub-core/lib/libtasn1_wrap/wrap_tests.c
@@ -0,0 +1,75 @@
@@ -1303,7 +1303,7 @@ index 00000000000..75fcd21f0d5
+}
diff --git a/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654-1_asn1_tab.h b/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654-1_asn1_tab.h
new file mode 100644
-index 00000000000..1e7d3d64f55
+index 000000000..1e7d3d64f
--- /dev/null
+++ b/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654-1_asn1_tab.h
@@ -0,0 +1,32 @@
@@ -1341,7 +1341,7 @@ index 00000000000..1e7d3d64f55
+};
diff --git a/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654-2_asn1_tab.h b/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654-2_asn1_tab.h
new file mode 100644
-index 00000000000..e2561e5ec6d
+index 000000000..e2561e5ec
--- /dev/null
+++ b/grub-core/lib/libtasn1_wrap/tests/CVE-2018-1000654-2_asn1_tab.h
@@ -0,0 +1,36 @@
@@ -1383,7 +1383,7 @@ index 00000000000..e2561e5ec6d
+};
diff --git a/grub-core/lib/libtasn1_wrap/wrap_tests.h b/grub-core/lib/libtasn1_wrap/wrap_tests.h
new file mode 100644
-index 00000000000..555e56dd202
+index 000000000..555e56dd2
--- /dev/null
+++ b/grub-core/lib/libtasn1_wrap/wrap_tests.h
@@ -0,0 +1,38 @@
@@ -1426,10 +1426,10 @@ index 00000000000..555e56dd202
+
+#endif
diff --git a/.gitignore b/.gitignore
-index a999024652e..f8c5a51af4e 100644
+index 7aaae594d..146f4662a 100644
--- a/.gitignore
+++ b/.gitignore
-@@ -133,4 +133,5 @@ grub-*.tar.*
+@@ -131,4 +131,5 @@ grub-*.tar.*
/libgrub_a_init.c
/libgrub_a_init.lst
/stamp-h.in
@@ -1437,7 +1437,7 @@ index a999024652e..f8c5a51af4e 100644
/widthspec.h
diff --git a/tests/test_asn1.in b/tests/test_asn1.in
new file mode 100644
-index 00000000000..8173c5c270e
+index 000000000..8173c5c27
--- /dev/null
+++ b/tests/test_asn1.in
@@ -0,0 +1,12 @@
diff --git a/SOURCES/0364-grub-install-support-embedding-x509-certificates.patch b/SOURCES/0364-grub-install-support-embedding-x509-certificates.patch
index 3413d7e..fffe18e 100644
--- a/SOURCES/0364-grub-install-support-embedding-x509-certificates.patch
+++ b/SOURCES/0364-grub-install-support-embedding-x509-certificates.patch
@@ -20,7 +20,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
6 files changed, 81 insertions(+), 10 deletions(-)
diff --git a/grub-core/commands/pgp.c b/grub-core/commands/pgp.c
-index 75de32c2a00..55d354be0ae 100644
+index 75de32c2a..55d354be0 100644
--- a/grub-core/commands/pgp.c
+++ b/grub-core/commands/pgp.c
@@ -944,7 +944,7 @@ GRUB_MOD_INIT(pgp)
@@ -33,7 +33,7 @@ index 75de32c2a00..55d354be0ae 100644
pseudo_file.fs = &pseudo_fs;
diff --git a/util/grub-install-common.c b/util/grub-install-common.c
-index 561e671ff34..fa6b65347ea 100644
+index 561e671ff..fa6b65347 100644
--- a/util/grub-install-common.c
+++ b/util/grub-install-common.c
@@ -302,6 +302,8 @@ handle_install_list (struct install_list *il, const char *val,
@@ -95,7 +95,7 @@ index 561e671ff34..fa6b65347ea 100644
while (dc--)
grub_install_pop_module ();
diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
-index 65a015d8a04..394d2dc5fc9 100644
+index 65a015d8a..394d2dc5f 100644
--- a/util/grub-mkimage.c
+++ b/util/grub-mkimage.c
@@ -75,7 +75,8 @@ static struct argp_option options[] = {
@@ -142,7 +142,7 @@ index 65a015d8a04..394d2dc5fc9 100644
arguments.appsig_size,
arguments.comp, arguments.dtb);
diff --git a/util/mkimage.c b/util/mkimage.c
-index a81120f26be..2529de4bb78 100644
+index a81120f26..2529de4bb 100644
--- a/util/mkimage.c
+++ b/util/mkimage.c
@@ -774,8 +774,10 @@ grub_install_get_image_targets_string (void)
@@ -215,7 +215,7 @@ index a81120f26be..2529de4bb78 100644
{
struct grub_module_header *header;
diff --git a/include/grub/kernel.h b/include/grub/kernel.h
-index 9548d552aad..75a057d4666 100644
+index 9548d552a..75a057d46 100644
--- a/include/grub/kernel.h
+++ b/include/grub/kernel.h
@@ -28,7 +28,8 @@ enum
@@ -229,7 +229,7 @@ index 9548d552aad..75a057d4666 100644
};
diff --git a/include/grub/util/install.h b/include/grub/util/install.h
-index ba5e6a2ea8f..95059285bd4 100644
+index ba5e6a2ea..95059285b 100644
--- a/include/grub/util/install.h
+++ b/include/grub/util/install.h
@@ -63,6 +63,8 @@
diff --git a/SOURCES/0365-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch b/SOURCES/0365-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch
index 7b7d70c..a9ee5b4 100644
--- a/SOURCES/0365-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch
+++ b/SOURCES/0365-appended-signatures-import-GNUTLS-s-ASN.1-descriptio.patch
@@ -22,7 +22,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
diff --git a/grub-core/commands/appendedsig/gnutls_asn1_tab.c b/grub-core/commands/appendedsig/gnutls_asn1_tab.c
new file mode 100644
-index 00000000000..ddd1314e63b
+index 000000000..ddd1314e6
--- /dev/null
+++ b/grub-core/commands/appendedsig/gnutls_asn1_tab.c
@@ -0,0 +1,121 @@
@@ -149,7 +149,7 @@ index 00000000000..ddd1314e63b
+};
diff --git a/grub-core/commands/appendedsig/pkix_asn1_tab.c b/grub-core/commands/appendedsig/pkix_asn1_tab.c
new file mode 100644
-index 00000000000..adef69d95ce
+index 000000000..adef69d95
--- /dev/null
+++ b/grub-core/commands/appendedsig/pkix_asn1_tab.c
@@ -0,0 +1,484 @@
diff --git a/SOURCES/0366-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch b/SOURCES/0366-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch
index c638457..64b47ac 100644
--- a/SOURCES/0366-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch
+++ b/SOURCES/0366-appended-signatures-parse-PKCS-7-signedData-and-X.50.patch
@@ -29,7 +29,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
diff --git a/grub-core/commands/appendedsig/asn1util.c b/grub-core/commands/appendedsig/asn1util.c
new file mode 100644
-index 00000000000..eff095a9df2
+index 000000000..eff095a9d
--- /dev/null
+++ b/grub-core/commands/appendedsig/asn1util.c
@@ -0,0 +1,102 @@
@@ -137,7 +137,7 @@ index 00000000000..eff095a9df2
+}
diff --git a/grub-core/commands/appendedsig/pkcs7.c b/grub-core/commands/appendedsig/pkcs7.c
new file mode 100644
-index 00000000000..dc6afe203f7
+index 000000000..dc6afe203
--- /dev/null
+++ b/grub-core/commands/appendedsig/pkcs7.c
@@ -0,0 +1,305 @@
@@ -448,7 +448,7 @@ index 00000000000..dc6afe203f7
+}
diff --git a/grub-core/commands/appendedsig/x509.c b/grub-core/commands/appendedsig/x509.c
new file mode 100644
-index 00000000000..652e4f16870
+index 000000000..652e4f168
--- /dev/null
+++ b/grub-core/commands/appendedsig/x509.c
@@ -0,0 +1,972 @@
@@ -1426,7 +1426,7 @@ index 00000000000..652e4f16870
+}
diff --git a/grub-core/commands/appendedsig/appendedsig.h b/grub-core/commands/appendedsig/appendedsig.h
new file mode 100644
-index 00000000000..9792ef3901e
+index 000000000..9792ef390
--- /dev/null
+++ b/grub-core/commands/appendedsig/appendedsig.h
@@ -0,0 +1,110 @@
diff --git a/SOURCES/0367-appended-signatures-support-verifying-appended-signa.patch b/SOURCES/0367-appended-signatures-support-verifying-appended-signa.patch
index 52a057c..02f5afc 100644
--- a/SOURCES/0367-appended-signatures-support-verifying-appended-signa.patch
+++ b/SOURCES/0367-appended-signatures-support-verifying-appended-signa.patch
@@ -32,7 +32,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
create mode 100644 grub-core/commands/appendedsig/appendedsig.c
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index fd1229c6328..1cf6b60f82e 100644
+index fd1229c63..1cf6b60f8 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -921,6 +921,18 @@ module = {
@@ -56,7 +56,7 @@ index fd1229c6328..1cf6b60f82e 100644
common = commands/verifiers.c;
diff --git a/grub-core/commands/appendedsig/appendedsig.c b/grub-core/commands/appendedsig/appendedsig.c
new file mode 100644
-index 00000000000..5d8897be5c8
+index 000000000..5d8897be5
--- /dev/null
+++ b/grub-core/commands/appendedsig/appendedsig.c
@@ -0,0 +1,644 @@
@@ -705,7 +705,7 @@ index 00000000000..5d8897be5c8
+ grub_unregister_command (cmd_distrust);
+}
diff --git a/include/grub/file.h b/include/grub/file.h
-index cbbd294655b..2e337dbd68d 100644
+index cbbd29465..2e337dbd6 100644
--- a/include/grub/file.h
+++ b/include/grub/file.h
@@ -82,6 +82,8 @@ enum grub_file_type
diff --git a/SOURCES/0368-appended-signatures-verification-tests.patch b/SOURCES/0368-appended-signatures-verification-tests.patch
index db1aa9b..06e97d4 100644
--- a/SOURCES/0368-appended-signatures-verification-tests.patch
+++ b/SOURCES/0368-appended-signatures-verification-tests.patch
@@ -17,7 +17,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
create mode 100644 grub-core/tests/appended_signatures.h
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 1cf6b60f82e..8914083d13f 100644
+index 1cf6b60f8..8914083d1 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -2040,6 +2040,12 @@ module = {
@@ -35,7 +35,7 @@ index 1cf6b60f82e..8914083d13f 100644
common = tests/signature_test.c;
diff --git a/grub-core/tests/appended_signature_test.c b/grub-core/tests/appended_signature_test.c
new file mode 100644
-index 00000000000..88a485200d8
+index 000000000..88a485200
--- /dev/null
+++ b/grub-core/tests/appended_signature_test.c
@@ -0,0 +1,281 @@
@@ -321,7 +321,7 @@ index 00000000000..88a485200d8
+
+GRUB_FUNCTIONAL_TEST (appended_signature_test, appended_signature_test);
diff --git a/grub-core/tests/lib/functional_test.c b/grub-core/tests/lib/functional_test.c
-index 96781fb39b5..403fa5c789a 100644
+index 96781fb39..403fa5c78 100644
--- a/grub-core/tests/lib/functional_test.c
+++ b/grub-core/tests/lib/functional_test.c
@@ -73,6 +73,7 @@ grub_functional_all_tests (grub_extcmd_context_t ctxt __attribute__ ((unused)),
@@ -334,7 +334,7 @@ index 96781fb39b5..403fa5c789a 100644
grub_dl_load ("ctz_test");
diff --git a/grub-core/tests/appended_signatures.h b/grub-core/tests/appended_signatures.h
new file mode 100644
-index 00000000000..aa3dc6278e3
+index 000000000..aa3dc6278
--- /dev/null
+++ b/grub-core/tests/appended_signatures.h
@@ -0,0 +1,557 @@
diff --git a/SOURCES/0369-appended-signatures-documentation.patch b/SOURCES/0369-appended-signatures-documentation.patch
index 82f50de..7161b83 100644
--- a/SOURCES/0369-appended-signatures-documentation.patch
+++ b/SOURCES/0369-appended-signatures-documentation.patch
@@ -14,7 +14,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
1 file changed, 172 insertions(+), 13 deletions(-)
diff --git a/docs/grub.texi b/docs/grub.texi
-index a833364d5ff..97f0f47e082 100644
+index a833364d5..97f0f47e0 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -3160,6 +3160,7 @@ These variables have special meaning to GRUB.
diff --git a/SOURCES/0370-ieee1275-link-appended-signature-enforcement-to-ibm-.patch b/SOURCES/0370-ieee1275-link-appended-signature-enforcement-to-ibm-.patch
index 219d181..e3e8f31 100644
--- a/SOURCES/0370-ieee1275-link-appended-signature-enforcement-to-ibm-.patch
+++ b/SOURCES/0370-ieee1275-link-appended-signature-enforcement-to-ibm-.patch
@@ -16,7 +16,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
2 files changed, 60 insertions(+), 10 deletions(-)
diff --git a/grub-core/commands/appendedsig/appendedsig.c b/grub-core/commands/appendedsig/appendedsig.c
-index 5d8897be5c8..4ef2ec2893c 100644
+index 5d8897be5..4ef2ec289 100644
--- a/grub-core/commands/appendedsig/appendedsig.c
+++ b/grub-core/commands/appendedsig/appendedsig.c
@@ -95,10 +95,24 @@ static char *
@@ -92,7 +92,7 @@ index 5d8897be5c8..4ef2ec2893c 100644
cmd_trust =
grub_register_command ("trust_certificate", grub_cmd_trust,
diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
-index e731a57a47b..22dc3013d86 100644
+index e731a57a4..22dc3013d 100644
--- a/grub-core/kern/ieee1275/init.c
+++ b/grub-core/kern/ieee1275/init.c
@@ -268,6 +268,30 @@ grub_parse_cmdline (void)
diff --git a/SOURCES/0371-include-grub-verify.h-Add-include-guard.patch b/SOURCES/0371-include-grub-verify.h-Add-include-guard.patch
index d757ffd..b1d13f3 100644
--- a/SOURCES/0371-include-grub-verify.h-Add-include-guard.patch
+++ b/SOURCES/0371-include-grub-verify.h-Add-include-guard.patch
@@ -16,7 +16,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 5 insertions(+)
diff --git a/include/grub/verify.h b/include/grub/verify.h
-index 60c13e7ea8e..ace72d74663 100644
+index 60c13e7ea..ace72d746 100644
--- a/include/grub/verify.h
+++ b/include/grub/verify.h
@@ -16,6 +16,9 @@
diff --git a/SOURCES/0372-arm64-xen-Fix-too-few-arguments-to-function-grub_cre.patch b/SOURCES/0372-arm64-xen-Fix-too-few-arguments-to-function-grub_cre.patch
index e472215..4ce69e8 100644
--- a/SOURCES/0372-arm64-xen-Fix-too-few-arguments-to-function-grub_cre.patch
+++ b/SOURCES/0372-arm64-xen-Fix-too-few-arguments-to-function-grub_cre.patch
@@ -25,7 +25,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/grub-core/loader/arm64/xen_boot.c b/grub-core/loader/arm64/xen_boot.c
-index 318c833de57..1a337866f08 100644
+index 318c833de..1a337866f 100644
--- a/grub-core/loader/arm64/xen_boot.c
+++ b/grub-core/loader/arm64/xen_boot.c
@@ -367,7 +367,8 @@ xen_boot_binary_load (struct xen_boot_binary *binary, grub_file_t file,
diff --git a/SOURCES/0373-kern-Add-lockdown-support.patch b/SOURCES/0373-kern-Add-lockdown-support.patch
index b1d5013..8d05fc2 100644
--- a/SOURCES/0373-kern-Add-lockdown-support.patch
+++ b/SOURCES/0373-kern-Add-lockdown-support.patch
@@ -52,7 +52,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
create mode 100644 include/grub/lockdown.h
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 8914083d13f..02fbecd4b81 100644
+index 8914083d1..02fbecd4b 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -197,6 +197,7 @@ kernel = {
@@ -64,7 +64,7 @@ index 8914083d13f..02fbecd4b81 100644
efi = kern/efi/tpm.c;
i386_coreboot = kern/i386/pc/acpi.c;
diff --git a/grub-core/commands/extcmd.c b/grub-core/commands/extcmd.c
-index 69574e2b05b..90a5ca24a64 100644
+index 69574e2b0..90a5ca24a 100644
--- a/grub-core/commands/extcmd.c
+++ b/grub-core/commands/extcmd.c
@@ -19,6 +19,7 @@
@@ -105,7 +105,7 @@ index 69574e2b05b..90a5ca24a64 100644
grub_unregister_extcmd (grub_extcmd_t ext)
{
diff --git a/grub-core/kern/command.c b/grub-core/kern/command.c
-index acd72187992..4aabcd4b5f9 100644
+index acd721879..4aabcd4b5 100644
--- a/grub-core/kern/command.c
+++ b/grub-core/kern/command.c
@@ -17,6 +17,7 @@
@@ -148,7 +148,7 @@ index acd72187992..4aabcd4b5f9 100644
{
diff --git a/grub-core/kern/lockdown.c b/grub-core/kern/lockdown.c
new file mode 100644
-index 00000000000..f87ddaeb1ee
+index 000000000..f87ddaeb1
--- /dev/null
+++ b/grub-core/kern/lockdown.c
@@ -0,0 +1,93 @@
@@ -246,7 +246,7 @@ index 00000000000..f87ddaeb1ee
+ return lockdown;
+}
diff --git a/include/grub/command.h b/include/grub/command.h
-index eee4e847ee4..2a6f7f84697 100644
+index eee4e847e..2a6f7f846 100644
--- a/include/grub/command.h
+++ b/include/grub/command.h
@@ -86,6 +86,11 @@ EXPORT_FUNC(grub_register_command_prio) (const char *name,
@@ -262,7 +262,7 @@ index eee4e847ee4..2a6f7f84697 100644
static inline grub_command_t
diff --git a/include/grub/extcmd.h b/include/grub/extcmd.h
-index 19fe592669e..fe9248b8bb6 100644
+index 19fe59266..fe9248b8b 100644
--- a/include/grub/extcmd.h
+++ b/include/grub/extcmd.h
@@ -62,6 +62,13 @@ grub_extcmd_t EXPORT_FUNC(grub_register_extcmd) (const char *name,
@@ -281,7 +281,7 @@ index 19fe592669e..fe9248b8bb6 100644
grub_command_flags_t flags,
diff --git a/include/grub/lockdown.h b/include/grub/lockdown.h
new file mode 100644
-index 00000000000..40531fa823b
+index 000000000..40531fa82
--- /dev/null
+++ b/include/grub/lockdown.h
@@ -0,0 +1,44 @@
@@ -330,7 +330,7 @@ index 00000000000..40531fa823b
+#endif
+#endif /* ! GRUB_LOCKDOWN_H */
diff --git a/conf/Makefile.common b/conf/Makefile.common
-index b93879804c0..521cdda1f5a 100644
+index b93879804..521cdda1f 100644
--- a/conf/Makefile.common
+++ b/conf/Makefile.common
@@ -85,7 +85,9 @@ CPPFLAGS_PARTTOOL_LIST = -Dgrub_parttool_register=PARTTOOL_LIST_MARKER
@@ -344,7 +344,7 @@ index b93879804c0..521cdda1f5a 100644
CPPFLAGS_FDT_LIST := '-Dgrub_fdtbus_register(...)=FDT_DRIVER_LIST_MARKER(__VA_ARGS__)'
CPPFLAGS_MARKER = $(CPPFLAGS_FS_LIST) $(CPPFLAGS_VIDEO_LIST) \
diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi
-index 3ce827ab726..421dd410e50 100644
+index 3ce827ab7..421dd410e 100644
--- a/docs/grub-dev.texi
+++ b/docs/grub-dev.texi
@@ -84,6 +84,7 @@ This edition documents version @value{VERSION}.
@@ -389,7 +389,7 @@ index 3ce827ab726..421dd410e50 100644
@appendix Copying This Manual
diff --git a/docs/grub.texi b/docs/grub.texi
-index 97f0f47e082..f957535dbea 100644
+index 97f0f47e0..f957535db 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -5687,6 +5687,7 @@ environment variables and commands are listed in the same order.
@@ -415,7 +415,7 @@ index 97f0f47e082..f957535dbea 100644
@chapter Platform limitations
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
-index 4062652506d..a6f1b0dcd06 100644
+index 406265250..a6f1b0dcd 100644
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -82,6 +82,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/fs.h
diff --git a/SOURCES/0374-kern-lockdown-Set-a-variable-if-the-GRUB-is-locked-d.patch b/SOURCES/0374-kern-lockdown-Set-a-variable-if-the-GRUB-is-locked-d.patch
index cccd213..ab93b27 100644
--- a/SOURCES/0374-kern-lockdown-Set-a-variable-if-the-GRUB-is-locked-d.patch
+++ b/SOURCES/0374-kern-lockdown-Set-a-variable-if-the-GRUB-is-locked-d.patch
@@ -16,7 +16,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2 files changed, 7 insertions(+)
diff --git a/grub-core/kern/lockdown.c b/grub-core/kern/lockdown.c
-index f87ddaeb1ee..30cba7f5ea2 100644
+index f87ddaeb1..30cba7f5e 100644
--- a/grub-core/kern/lockdown.c
+++ b/grub-core/kern/lockdown.c
@@ -18,6 +18,7 @@
@@ -38,7 +38,7 @@ index f87ddaeb1ee..30cba7f5ea2 100644
int
diff --git a/docs/grub.texi b/docs/grub.texi
-index f957535dbea..755de88d7d8 100644
+index f957535db..755de88d7 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -5985,6 +5985,9 @@ The GRUB can be locked down when booted on a secure boot environment, for exampl
diff --git a/SOURCES/0375-efi-Lockdown-the-GRUB-when-the-UEFI-Secure-Boot-is-e.patch b/SOURCES/0375-efi-Lockdown-the-GRUB-when-the-UEFI-Secure-Boot-is-e.patch
index d1fb42c..b9a62d8 100644
--- a/SOURCES/0375-efi-Lockdown-the-GRUB-when-the-UEFI-Secure-Boot-is-e.patch
+++ b/SOURCES/0375-efi-Lockdown-the-GRUB-when-the-UEFI-Secure-Boot-is-e.patch
@@ -14,7 +14,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 19 insertions(+)
diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c
-index 79243b364a1..97bf36906a4 100644
+index 79243b364..97bf36906 100644
--- a/grub-core/kern/efi/init.c
+++ b/grub-core/kern/efi/init.c
@@ -20,6 +20,8 @@
diff --git a/SOURCES/0376-efi-Use-grub_is_lockdown-instead-of-hardcoding-a-dis.patch b/SOURCES/0376-efi-Use-grub_is_lockdown-instead-of-hardcoding-a-dis.patch
index a902271..fb274b2 100644
--- a/SOURCES/0376-efi-Use-grub_is_lockdown-instead-of-hardcoding-a-dis.patch
+++ b/SOURCES/0376-efi-Use-grub_is_lockdown-instead-of-hardcoding-a-dis.patch
@@ -22,7 +22,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2 files changed, 20 insertions(+), 32 deletions(-)
diff --git a/grub-core/commands/iorw.c b/grub-core/commands/iorw.c
-index 41a7f3f0466..584baec8f91 100644
+index 41a7f3f04..584baec8f 100644
--- a/grub-core/commands/iorw.c
+++ b/grub-core/commands/iorw.c
@@ -23,7 +23,7 @@
@@ -79,7 +79,7 @@ index 41a7f3f0466..584baec8f91 100644
grub_unregister_extcmd (cmd_read_word);
grub_unregister_extcmd (cmd_read_dword);
diff --git a/grub-core/commands/memrw.c b/grub-core/commands/memrw.c
-index 088cbe9e2bc..d401a6db0ef 100644
+index 088cbe9e2..d401a6db0 100644
--- a/grub-core/commands/memrw.c
+++ b/grub-core/commands/memrw.c
@@ -22,7 +22,7 @@
diff --git a/SOURCES/0377-acpi-Don-t-register-the-acpi-command-when-locked-dow.patch b/SOURCES/0377-acpi-Don-t-register-the-acpi-command-when-locked-dow.patch
index 603796c..3eb7fc9 100644
--- a/SOURCES/0377-acpi-Don-t-register-the-acpi-command-when-locked-dow.patch
+++ b/SOURCES/0377-acpi-Don-t-register-the-acpi-command-when-locked-dow.patch
@@ -22,7 +22,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/grub-core/commands/acpi.c b/grub-core/commands/acpi.c
-index 5a1499aa0e3..1215f2a62ef 100644
+index 5a1499aa0..1215f2a62 100644
--- a/grub-core/commands/acpi.c
+++ b/grub-core/commands/acpi.c
@@ -27,6 +27,7 @@
@@ -55,7 +55,7 @@ index 5a1499aa0e3..1215f2a62ef 100644
GRUB_MOD_FINI(acpi)
diff --git a/docs/grub.texi b/docs/grub.texi
-index 755de88d7d8..01acf672b80 100644
+index 755de88d7..01acf672b 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -4038,6 +4038,11 @@ Normally, this command will replace the Root System Description Pointer
diff --git a/SOURCES/0378-mmap-Don-t-register-cutmem-and-badram-commands-when-.patch b/SOURCES/0378-mmap-Don-t-register-cutmem-and-badram-commands-when-.patch
index 2781cd9..d1d5b07 100644
--- a/SOURCES/0378-mmap-Don-t-register-cutmem-and-badram-commands-when-.patch
+++ b/SOURCES/0378-mmap-Don-t-register-cutmem-and-badram-commands-when-.patch
@@ -19,7 +19,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/grub-core/mmap/mmap.c b/grub-core/mmap/mmap.c
-index 57b4e9a72a9..7ebf32e1e5e 100644
+index 57b4e9a72..7ebf32e1e 100644
--- a/grub-core/mmap/mmap.c
+++ b/grub-core/mmap/mmap.c
@@ -20,6 +20,7 @@
@@ -50,7 +50,7 @@ index 57b4e9a72a9..7ebf32e1e5e 100644
}
diff --git a/docs/grub.texi b/docs/grub.texi
-index 01acf672b80..f1675b6140c 100644
+index 01acf672b..f1675b614 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -4103,6 +4103,10 @@ this page is to be filtered. This syntax makes it easy to represent patterns
diff --git a/SOURCES/0379-commands-Restrict-commands-that-can-load-BIOS-or-DT-.patch b/SOURCES/0379-commands-Restrict-commands-that-can-load-BIOS-or-DT-.patch
index ae197cb..b615d0e 100644
--- a/SOURCES/0379-commands-Restrict-commands-that-can-load-BIOS-or-DT-.patch
+++ b/SOURCES/0379-commands-Restrict-commands-that-can-load-BIOS-or-DT-.patch
@@ -27,7 +27,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
4 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/grub-core/commands/efi/loadbios.c b/grub-core/commands/efi/loadbios.c
-index d41d521a4ae..5c7725f8bd8 100644
+index d41d521a4..5c7725f8b 100644
--- a/grub-core/commands/efi/loadbios.c
+++ b/grub-core/commands/efi/loadbios.c
@@ -205,14 +205,14 @@ static grub_command_t cmd_fakebios, cmd_loadbios;
@@ -53,7 +53,7 @@ index d41d521a4ae..5c7725f8bd8 100644
GRUB_MOD_FINI(loadbios)
diff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c
-index 1e944a2b671..653f2e07692 100644
+index 1e944a2b6..653f2e076 100644
--- a/grub-core/loader/arm/linux.c
+++ b/grub-core/loader/arm/linux.c
@@ -493,9 +493,9 @@ GRUB_MOD_INIT (linux)
@@ -70,7 +70,7 @@ index 1e944a2b671..653f2e07692 100644
current_fdt = (const void *) grub_arm_firmware_get_boot_data ();
machine_type = grub_arm_firmware_get_machine_type ();
diff --git a/grub-core/loader/efi/fdt.c b/grub-core/loader/efi/fdt.c
-index e3ee3ad79d6..64c560f5610 100644
+index e3ee3ad79..64c560f56 100644
--- a/grub-core/loader/efi/fdt.c
+++ b/grub-core/loader/efi/fdt.c
@@ -167,8 +167,8 @@ static grub_command_t cmd_devicetree;
@@ -85,7 +85,7 @@ index e3ee3ad79d6..64c560f5610 100644
GRUB_MOD_FINI (fdt)
diff --git a/docs/grub.texi b/docs/grub.texi
-index f1675b6140c..c55452307dc 100644
+index f1675b614..c55452307 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -4281,13 +4281,15 @@ hour, minute, and second unchanged.
diff --git a/SOURCES/0380-commands-setpci-Restrict-setpci-command-when-locked-.patch b/SOURCES/0380-commands-setpci-Restrict-setpci-command-when-locked-.patch
index 1bb09d4..ddb1827 100644
--- a/SOURCES/0380-commands-setpci-Restrict-setpci-command-when-locked-.patch
+++ b/SOURCES/0380-commands-setpci-Restrict-setpci-command-when-locked-.patch
@@ -13,7 +13,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/grub-core/commands/setpci.c b/grub-core/commands/setpci.c
-index d5bc97d60b2..fa2ba7d8919 100644
+index d5bc97d60..fa2ba7d89 100644
--- a/grub-core/commands/setpci.c
+++ b/grub-core/commands/setpci.c
@@ -329,10 +329,10 @@ static grub_extcmd_t cmd;
diff --git a/SOURCES/0381-commands-hdparm-Restrict-hdparm-command-when-locked-.patch b/SOURCES/0381-commands-hdparm-Restrict-hdparm-command-when-locked-.patch
index 04129ca..39d0b1a 100644
--- a/SOURCES/0381-commands-hdparm-Restrict-hdparm-command-when-locked-.patch
+++ b/SOURCES/0381-commands-hdparm-Restrict-hdparm-command-when-locked-.patch
@@ -13,7 +13,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/grub-core/commands/hdparm.c b/grub-core/commands/hdparm.c
-index d3fa9661e5f..2e2319e645a 100644
+index d3fa9661e..2e2319e64 100644
--- a/grub-core/commands/hdparm.c
+++ b/grub-core/commands/hdparm.c
@@ -436,9 +436,9 @@ static grub_extcmd_t cmd;
diff --git a/SOURCES/0382-gdb-Restrict-GDB-access-when-locked-down.patch b/SOURCES/0382-gdb-Restrict-GDB-access-when-locked-down.patch
index b392d22..8e345e1 100644
--- a/SOURCES/0382-gdb-Restrict-GDB-access-when-locked-down.patch
+++ b/SOURCES/0382-gdb-Restrict-GDB-access-when-locked-down.patch
@@ -14,7 +14,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 18 insertions(+), 14 deletions(-)
diff --git a/grub-core/gdb/gdb.c b/grub-core/gdb/gdb.c
-index 847a1e1e36f..1818cb6f8eb 100644
+index 847a1e1e3..1818cb6f8 100644
--- a/grub-core/gdb/gdb.c
+++ b/grub-core/gdb/gdb.c
@@ -75,20 +75,24 @@ static grub_command_t cmd, cmd_stop, cmd_break;
diff --git a/SOURCES/0383-loader-xnu-Don-t-allow-loading-extension-and-package.patch b/SOURCES/0383-loader-xnu-Don-t-allow-loading-extension-and-package.patch
index fe39c33..16658e0 100644
--- a/SOURCES/0383-loader-xnu-Don-t-allow-loading-extension-and-package.patch
+++ b/SOURCES/0383-loader-xnu-Don-t-allow-loading-extension-and-package.patch
@@ -14,7 +14,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 17 insertions(+), 14 deletions(-)
diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c
-index 5944dc5eafc..b33a384321c 100644
+index 5944dc5ea..b33a38432 100644
--- a/grub-core/loader/xnu.c
+++ b/grub-core/loader/xnu.c
@@ -1489,20 +1489,23 @@ GRUB_MOD_INIT(xnu)
diff --git a/SOURCES/0384-docs-Document-the-cutmem-command.patch b/SOURCES/0384-docs-Document-the-cutmem-command.patch
index fd37e8f..df8a765 100644
--- a/SOURCES/0384-docs-Document-the-cutmem-command.patch
+++ b/SOURCES/0384-docs-Document-the-cutmem-command.patch
@@ -14,7 +14,7 @@ Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 21 insertions(+)
diff --git a/docs/grub.texi b/docs/grub.texi
-index c55452307dc..314bbeb8471 100644
+index c55452307..314bbeb84 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -3942,6 +3942,7 @@ you forget a command, you can run the command @command{help}
diff --git a/SOURCES/0385-dl-Only-allow-unloading-modules-that-are-not-depende.patch b/SOURCES/0385-dl-Only-allow-unloading-modules-that-are-not-depende.patch
index b482bba..018c590 100644
--- a/SOURCES/0385-dl-Only-allow-unloading-modules-that-are-not-depende.patch
+++ b/SOURCES/0385-dl-Only-allow-unloading-modules-that-are-not-depende.patch
@@ -25,7 +25,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
3 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/grub-core/commands/minicmd.c b/grub-core/commands/minicmd.c
-index 6d66b7c453a..2bd3ac76f2d 100644
+index 6d66b7c45..2bd3ac76f 100644
--- a/grub-core/commands/minicmd.c
+++ b/grub-core/commands/minicmd.c
@@ -140,8 +140,11 @@ grub_mini_cmd_rmmod (struct grub_command *cmd __attribute__ ((unused)),
@@ -43,7 +43,7 @@ index 6d66b7c453a..2bd3ac76f2d 100644
return 0;
}
diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
-index d7a7c8f97b0..520126beab7 100644
+index d7a7c8f97..520126bea 100644
--- a/grub-core/kern/dl.c
+++ b/grub-core/kern/dl.c
@@ -621,6 +621,15 @@ grub_dl_unref (grub_dl_t mod)
@@ -63,7 +63,7 @@ index d7a7c8f97b0..520126beab7 100644
grub_dl_flush_cache (grub_dl_t mod)
{
diff --git a/include/grub/dl.h b/include/grub/dl.h
-index 877821dcb04..6a3e251b455 100644
+index 877821dcb..6a3e251b4 100644
--- a/include/grub/dl.h
+++ b/include/grub/dl.h
@@ -205,9 +205,11 @@ grub_dl_t EXPORT_FUNC(grub_dl_load) (const char *name);
diff --git a/SOURCES/0386-usb-Avoid-possible-out-of-bound-accesses-caused-by-m.patch b/SOURCES/0386-usb-Avoid-possible-out-of-bound-accesses-caused-by-m.patch
index 1b04633..7735ec6 100644
--- a/SOURCES/0386-usb-Avoid-possible-out-of-bound-accesses-caused-by-m.patch
+++ b/SOURCES/0386-usb-Avoid-possible-out-of-bound-accesses-caused-by-m.patch
@@ -20,7 +20,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/grub-core/bus/usb/usb.c b/grub-core/bus/usb/usb.c
-index 8da5e4c7491..7cb3cc230b2 100644
+index 8da5e4c74..7cb3cc230 100644
--- a/grub-core/bus/usb/usb.c
+++ b/grub-core/bus/usb/usb.c
@@ -75,6 +75,9 @@ grub_usb_controller_iterate (grub_usb_controller_iterate_hook_t hook,
@@ -69,7 +69,7 @@ index 8da5e4c7491..7cb3cc230b2 100644
return err;
diff --git a/include/grub/usb.h b/include/grub/usb.h
-index 512ae1dd0e6..6475c552fc6 100644
+index 512ae1dd0..6475c552f 100644
--- a/include/grub/usb.h
+++ b/include/grub/usb.h
@@ -23,6 +23,10 @@
diff --git a/SOURCES/0387-mmap-Fix-memory-leak-when-iterating-over-mapped-memo.patch b/SOURCES/0387-mmap-Fix-memory-leak-when-iterating-over-mapped-memo.patch
index 66e3744..7f52c07 100644
--- a/SOURCES/0387-mmap-Fix-memory-leak-when-iterating-over-mapped-memo.patch
+++ b/SOURCES/0387-mmap-Fix-memory-leak-when-iterating-over-mapped-memo.patch
@@ -15,7 +15,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 2 insertions(+)
diff --git a/grub-core/mmap/mmap.c b/grub-core/mmap/mmap.c
-index 7ebf32e1e5e..8bf235f3400 100644
+index 7ebf32e1e..8bf235f34 100644
--- a/grub-core/mmap/mmap.c
+++ b/grub-core/mmap/mmap.c
@@ -270,6 +270,7 @@ grub_mmap_iterate (grub_memory_hook_t hook, void *hook_data)
diff --git a/SOURCES/0388-net-net-Fix-possible-dereference-to-of-a-NULL-pointe.patch b/SOURCES/0388-net-net-Fix-possible-dereference-to-of-a-NULL-pointe.patch
index 0f50d98..c342bbf 100644
--- a/SOURCES/0388-net-net-Fix-possible-dereference-to-of-a-NULL-pointe.patch
+++ b/SOURCES/0388-net-net-Fix-possible-dereference-to-of-a-NULL-pointe.patch
@@ -15,7 +15,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index 1fd104aeaf2..a27c53eee1c 100644
+index 1fd104aea..a27c53eee 100644
--- a/grub-core/net/net.c
+++ b/grub-core/net/net.c
@@ -89,8 +89,13 @@ grub_net_link_layer_add_address (struct grub_net_card *card,
diff --git a/SOURCES/0389-net-tftp-Fix-dangling-memory-pointer.patch b/SOURCES/0389-net-tftp-Fix-dangling-memory-pointer.patch
index 193d893..609e2d5 100644
--- a/SOURCES/0389-net-tftp-Fix-dangling-memory-pointer.patch
+++ b/SOURCES/0389-net-tftp-Fix-dangling-memory-pointer.patch
@@ -17,7 +17,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 1 insertion(+)
diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
-index b9a4b607a3d..aa0424dcee3 100644
+index b9a4b607a..aa0424dce 100644
--- a/grub-core/net/tftp.c
+++ b/grub-core/net/tftp.c
@@ -444,6 +444,7 @@ tftp_close (struct grub_file *file)
diff --git a/SOURCES/0390-kern-parser-Fix-resource-leak-if-argc-0.patch b/SOURCES/0390-kern-parser-Fix-resource-leak-if-argc-0.patch
index 87d3140..1f48d2a 100644
--- a/SOURCES/0390-kern-parser-Fix-resource-leak-if-argc-0.patch
+++ b/SOURCES/0390-kern-parser-Fix-resource-leak-if-argc-0.patch
@@ -23,7 +23,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 5 insertions(+)
diff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c
-index 619db3122a0..d1cf061ad68 100644
+index 619db3122..d1cf061ad 100644
--- a/grub-core/kern/parser.c
+++ b/grub-core/kern/parser.c
@@ -146,6 +146,7 @@ grub_parser_split_cmdline (const char *cmdline,
diff --git a/SOURCES/0391-kern-efi-Fix-memory-leak-on-failure.patch b/SOURCES/0391-kern-efi-Fix-memory-leak-on-failure.patch
index 1aa52d6..2145cd4 100644
--- a/SOURCES/0391-kern-efi-Fix-memory-leak-on-failure.patch
+++ b/SOURCES/0391-kern-efi-Fix-memory-leak-on-failure.patch
@@ -14,7 +14,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 1 insertion(+)
diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index 5dfcf943322..4b95a400490 100644
+index 5dfcf9433..4b95a4004 100644
--- a/grub-core/kern/efi/efi.c
+++ b/grub-core/kern/efi/efi.c
@@ -400,6 +400,7 @@ grub_efi_get_filename (grub_efi_device_path_t *dp0)
diff --git a/SOURCES/0392-kern-efi-mm-Fix-possible-NULL-pointer-dereference.patch b/SOURCES/0392-kern-efi-mm-Fix-possible-NULL-pointer-dereference.patch
index 5fb25a3..70958ba 100644
--- a/SOURCES/0392-kern-efi-mm-Fix-possible-NULL-pointer-dereference.patch
+++ b/SOURCES/0392-kern-efi-mm-Fix-possible-NULL-pointer-dereference.patch
@@ -27,7 +27,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
-index 306924f73a4..2d9c9032b2a 100644
+index 306924f73..2d9c9032b 100644
--- a/grub-core/kern/efi/mm.c
+++ b/grub-core/kern/efi/mm.c
@@ -372,16 +372,25 @@ grub_efi_get_memory_map (grub_efi_uintn_t *memory_map_size,
diff --git a/SOURCES/0393-gnulib-regexec-Resolve-unused-variable.patch b/SOURCES/0393-gnulib-regexec-Resolve-unused-variable.patch
index 226abc8..63776c3 100644
--- a/SOURCES/0393-gnulib-regexec-Resolve-unused-variable.patch
+++ b/SOURCES/0393-gnulib-regexec-Resolve-unused-variable.patch
@@ -24,7 +24,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
create mode 100644 grub-core/gnulib-fix-unused-value.patch
diff --git a/grub-core/gnulib/regexec.c b/grub-core/gnulib/regexec.c
-index a7776f088f2..9264f262893 100644
+index a7776f088..9264f2628 100644
--- a/grub-core/gnulib/regexec.c
+++ b/grub-core/gnulib/regexec.c
@@ -879,7 +879,11 @@ re_search_internal (const regex_t *preg,
@@ -40,7 +40,7 @@ index a7776f088f2..9264f262893 100644
else
break; /* We found a match. */
diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
-index 5946ec24a65..b53fe6dfdcc 100644
+index 5946ec24a..b53fe6dfd 100644
--- a/conf/Makefile.extra-dist
+++ b/conf/Makefile.extra-dist
@@ -31,6 +31,7 @@ EXTRA_DIST += grub-core/genemuinit.sh
@@ -53,7 +53,7 @@ index 5946ec24a65..b53fe6dfdcc 100644
EXTRA_DIST += grub-core/gnulib-no-gets.diff
diff --git a/grub-core/gnulib-fix-unused-value.patch b/grub-core/gnulib-fix-unused-value.patch
new file mode 100644
-index 00000000000..452a8732922
+index 000000000..452a87329
--- /dev/null
+++ b/grub-core/gnulib-fix-unused-value.patch
@@ -0,0 +1,14 @@
diff --git a/SOURCES/0394-gnulib-regcomp-Fix-uninitialized-token-structure.patch b/SOURCES/0394-gnulib-regcomp-Fix-uninitialized-token-structure.patch
index b18be72..de86f37 100644
--- a/SOURCES/0394-gnulib-regcomp-Fix-uninitialized-token-structure.patch
+++ b/SOURCES/0394-gnulib-regcomp-Fix-uninitialized-token-structure.patch
@@ -21,7 +21,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
create mode 100644 grub-core/gnulib-fix-uninit-structure.patch
diff --git a/grub-core/gnulib/regcomp.c b/grub-core/gnulib/regcomp.c
-index 596e0cf3ef7..de9f622088f 100644
+index 596e0cf3e..de9f62208 100644
--- a/grub-core/gnulib/regcomp.c
+++ b/grub-core/gnulib/regcomp.c
@@ -3641,7 +3641,7 @@ build_charclass_op (re_dfa_t *dfa, RE_TRANSLATE_TYPE trans,
@@ -34,7 +34,7 @@ index 596e0cf3ef7..de9f622088f 100644
sbcset = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1);
diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
-index b53fe6dfdcc..883baba56d5 100644
+index b53fe6dfd..883baba56 100644
--- a/conf/Makefile.extra-dist
+++ b/conf/Makefile.extra-dist
@@ -31,6 +31,7 @@ EXTRA_DIST += grub-core/genemuinit.sh
@@ -47,7 +47,7 @@ index b53fe6dfdcc..883baba56d5 100644
EXTRA_DIST += grub-core/gnulib-no-abort.diff
diff --git a/grub-core/gnulib-fix-uninit-structure.patch b/grub-core/gnulib-fix-uninit-structure.patch
new file mode 100644
-index 00000000000..7b4d9f67af4
+index 000000000..7b4d9f67a
--- /dev/null
+++ b/grub-core/gnulib-fix-uninit-structure.patch
@@ -0,0 +1,11 @@
diff --git a/SOURCES/0395-gnulib-argp-help-Fix-dereference-of-a-possibly-NULL-.patch b/SOURCES/0395-gnulib-argp-help-Fix-dereference-of-a-possibly-NULL-.patch
index 97f127c..ecb4373 100644
--- a/SOURCES/0395-gnulib-argp-help-Fix-dereference-of-a-possibly-NULL-.patch
+++ b/SOURCES/0395-gnulib-argp-help-Fix-dereference-of-a-possibly-NULL-.patch
@@ -19,7 +19,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
create mode 100644 grub-core/gnulib-fix-null-state-deref.patch
diff --git a/grub-core/gnulib/argp-help.c b/grub-core/gnulib/argp-help.c
-index b9be63f40d2..8af8be07341 100644
+index b9be63f40..8af8be073 100644
--- a/grub-core/gnulib/argp-help.c
+++ b/grub-core/gnulib/argp-help.c
@@ -145,7 +145,8 @@ validate_uparams (const struct argp_state *state, struct uparams *upptr)
@@ -33,7 +33,7 @@ index b9be63f40d2..8af8be07341 100644
ARGP_HELP_FMT: %s value is less than or equal to %s"),
"rmargin", up->name);
diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
-index 883baba56d5..06606de8d19 100644
+index 883baba56..06606de8d 100644
--- a/conf/Makefile.extra-dist
+++ b/conf/Makefile.extra-dist
@@ -31,6 +31,7 @@ EXTRA_DIST += grub-core/genemuinit.sh
@@ -46,7 +46,7 @@ index 883baba56d5..06606de8d19 100644
EXTRA_DIST += grub-core/gnulib-fix-width.diff
diff --git a/grub-core/gnulib-fix-null-state-deref.patch b/grub-core/gnulib-fix-null-state-deref.patch
new file mode 100644
-index 00000000000..813ec09c8a1
+index 000000000..813ec09c8
--- /dev/null
+++ b/grub-core/gnulib-fix-null-state-deref.patch
@@ -0,0 +1,12 @@
diff --git a/SOURCES/0396-gnulib-regexec-Fix-possible-null-dereference.patch b/SOURCES/0396-gnulib-regexec-Fix-possible-null-dereference.patch
index 78ae2b9..f5fcaaa 100644
--- a/SOURCES/0396-gnulib-regexec-Fix-possible-null-dereference.patch
+++ b/SOURCES/0396-gnulib-regexec-Fix-possible-null-dereference.patch
@@ -20,7 +20,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
create mode 100644 grub-core/gnulib-fix-regexec-null-deref.patch
diff --git a/grub-core/gnulib/regexec.c b/grub-core/gnulib/regexec.c
-index 9264f262893..fdacff12ce3 100644
+index 9264f2628..fdacff12c 100644
--- a/grub-core/gnulib/regexec.c
+++ b/grub-core/gnulib/regexec.c
@@ -1754,6 +1754,9 @@ clean_state_log_if_needed (re_match_context_t *mctx, Idx next_state_log_idx)
@@ -34,7 +34,7 @@ index 9264f262893..fdacff12ce3 100644
&& mctx->input.bufs_len < mctx->input.len)
|| (next_state_log_idx >= mctx->input.valid_len
diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
-index 06606de8d19..edbe7846eb1 100644
+index 06606de8d..edbe7846e 100644
--- a/conf/Makefile.extra-dist
+++ b/conf/Makefile.extra-dist
@@ -32,6 +32,7 @@ EXTRA_DIST += grub-core/genemuinitheader.sh
@@ -47,7 +47,7 @@ index 06606de8d19..edbe7846eb1 100644
EXTRA_DIST += grub-core/gnulib-fix-width.diff
diff --git a/grub-core/gnulib-fix-regexec-null-deref.patch b/grub-core/gnulib-fix-regexec-null-deref.patch
new file mode 100644
-index 00000000000..db6dac9c9e3
+index 000000000..db6dac9c9
--- /dev/null
+++ b/grub-core/gnulib-fix-regexec-null-deref.patch
@@ -0,0 +1,12 @@
diff --git a/SOURCES/0397-gnulib-regcomp-Fix-uninitialized-re_token.patch b/SOURCES/0397-gnulib-regcomp-Fix-uninitialized-re_token.patch
index 342a020..8324b57 100644
--- a/SOURCES/0397-gnulib-regcomp-Fix-uninitialized-re_token.patch
+++ b/SOURCES/0397-gnulib-regcomp-Fix-uninitialized-re_token.patch
@@ -19,7 +19,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
create mode 100644 grub-core/gnulib-fix-regcomp-uninit-token.patch
diff --git a/grub-core/gnulib/regcomp.c b/grub-core/gnulib/regcomp.c
-index de9f622088f..6d0830ac691 100644
+index de9f62208..6d0830ac6 100644
--- a/grub-core/gnulib/regcomp.c
+++ b/grub-core/gnulib/regcomp.c
@@ -3790,8 +3790,7 @@ static bin_tree_t *
@@ -33,7 +33,7 @@ index de9f622088f..6d0830ac691 100644
}
diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
-index edbe7846eb1..ee276a87764 100644
+index edbe7846e..ee276a877 100644
--- a/conf/Makefile.extra-dist
+++ b/conf/Makefile.extra-dist
@@ -32,6 +32,7 @@ EXTRA_DIST += grub-core/genemuinitheader.sh
@@ -46,7 +46,7 @@ index edbe7846eb1..ee276a87764 100644
EXTRA_DIST += grub-core/gnulib-fix-unused-value.patch
diff --git a/grub-core/gnulib-fix-regcomp-uninit-token.patch b/grub-core/gnulib-fix-regcomp-uninit-token.patch
new file mode 100644
-index 00000000000..d615745221b
+index 000000000..d61574522
--- /dev/null
+++ b/grub-core/gnulib-fix-regcomp-uninit-token.patch
@@ -0,0 +1,12 @@
diff --git a/SOURCES/0398-io-lzopio-Resolve-unnecessary-self-assignment-errors.patch b/SOURCES/0398-io-lzopio-Resolve-unnecessary-self-assignment-errors.patch
index d7affbd..7a5fc9b 100644
--- a/SOURCES/0398-io-lzopio-Resolve-unnecessary-self-assignment-errors.patch
+++ b/SOURCES/0398-io-lzopio-Resolve-unnecessary-self-assignment-errors.patch
@@ -15,7 +15,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 4 deletions(-)
diff --git a/grub-core/io/lzopio.c b/grub-core/io/lzopio.c
-index 84edf6dd2dc..6bf14daf474 100644
+index 84edf6dd2..6bf14daf4 100644
--- a/grub-core/io/lzopio.c
+++ b/grub-core/io/lzopio.c
@@ -125,8 +125,6 @@ read_block_header (struct grub_lzopio *lzopio)
diff --git a/SOURCES/0399-kern-partition-Check-for-NULL-before-dereferencing-i.patch b/SOURCES/0399-kern-partition-Check-for-NULL-before-dereferencing-i.patch
index 35c4c01..eb1bca8 100644
--- a/SOURCES/0399-kern-partition-Check-for-NULL-before-dereferencing-i.patch
+++ b/SOURCES/0399-kern-partition-Check-for-NULL-before-dereferencing-i.patch
@@ -19,7 +19,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/grub-core/kern/partition.c b/grub-core/kern/partition.c
-index 2c401b866c4..3068c4dcac0 100644
+index 2c401b866..3068c4dca 100644
--- a/grub-core/kern/partition.c
+++ b/grub-core/kern/partition.c
@@ -109,11 +109,14 @@ grub_partition_map_probe (const grub_partition_map_t partmap,
diff --git a/SOURCES/0400-disk-ldm-Make-sure-comp-data-is-freed-before-exiting.patch b/SOURCES/0400-disk-ldm-Make-sure-comp-data-is-freed-before-exiting.patch
index 7d4ea0e..ef22f3b 100644
--- a/SOURCES/0400-disk-ldm-Make-sure-comp-data-is-freed-before-exiting.patch
+++ b/SOURCES/0400-disk-ldm-Make-sure-comp-data-is-freed-before-exiting.patch
@@ -17,7 +17,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 44 insertions(+), 7 deletions(-)
diff --git a/grub-core/disk/ldm.c b/grub-core/disk/ldm.c
-index 58f8a53e1ab..428415fac24 100644
+index 58f8a53e1..428415fac 100644
--- a/grub-core/disk/ldm.c
+++ b/grub-core/disk/ldm.c
@@ -554,7 +554,11 @@ make_vg (grub_disk_t disk,
diff --git a/SOURCES/0401-disk-ldm-If-failed-then-free-vg-variable-too.patch b/SOURCES/0401-disk-ldm-If-failed-then-free-vg-variable-too.patch
index 6b8903a..def9a62 100644
--- a/SOURCES/0401-disk-ldm-If-failed-then-free-vg-variable-too.patch
+++ b/SOURCES/0401-disk-ldm-If-failed-then-free-vg-variable-too.patch
@@ -12,7 +12,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 1 insertion(+)
diff --git a/grub-core/disk/ldm.c b/grub-core/disk/ldm.c
-index 428415fac24..54713f45a12 100644
+index 428415fac..54713f45a 100644
--- a/grub-core/disk/ldm.c
+++ b/grub-core/disk/ldm.c
@@ -199,6 +199,7 @@ make_vg (grub_disk_t disk,
diff --git a/SOURCES/0402-disk-ldm-Fix-memory-leak-on-uninserted-lv-references.patch b/SOURCES/0402-disk-ldm-Fix-memory-leak-on-uninserted-lv-references.patch
index 3b0add6..5d67655 100644
--- a/SOURCES/0402-disk-ldm-Fix-memory-leak-on-uninserted-lv-references.patch
+++ b/SOURCES/0402-disk-ldm-Fix-memory-leak-on-uninserted-lv-references.patch
@@ -18,7 +18,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/grub-core/disk/ldm.c b/grub-core/disk/ldm.c
-index 54713f45a12..e82e9899f96 100644
+index 54713f45a..e82e9899f 100644
--- a/grub-core/disk/ldm.c
+++ b/grub-core/disk/ldm.c
@@ -321,7 +321,10 @@ make_vg (grub_disk_t disk,
diff --git a/SOURCES/0403-disk-cryptodisk-Fix-potential-integer-overflow.patch b/SOURCES/0403-disk-cryptodisk-Fix-potential-integer-overflow.patch
index 2470dc5..dfe8e1d 100644
--- a/SOURCES/0403-disk-cryptodisk-Fix-potential-integer-overflow.patch
+++ b/SOURCES/0403-disk-cryptodisk-Fix-potential-integer-overflow.patch
@@ -16,7 +16,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c
-index bd60a66b384..78a902515e9 100644
+index bd60a66b3..78a902515 100644
--- a/grub-core/disk/cryptodisk.c
+++ b/grub-core/disk/cryptodisk.c
@@ -311,10 +311,10 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *dev,
diff --git a/SOURCES/0404-hfsplus-Check-that-the-volume-name-length-is-valid.patch b/SOURCES/0404-hfsplus-Check-that-the-volume-name-length-is-valid.patch
index c32f6e8..e77307c 100644
--- a/SOURCES/0404-hfsplus-Check-that-the-volume-name-length-is-valid.patch
+++ b/SOURCES/0404-hfsplus-Check-that-the-volume-name-length-is-valid.patch
@@ -19,7 +19,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 9 insertions(+)
diff --git a/grub-core/fs/hfsplus.c b/grub-core/fs/hfsplus.c
-index e06bcbb9ba3..03a33ea2477 100644
+index e06bcbb9b..03a33ea24 100644
--- a/grub-core/fs/hfsplus.c
+++ b/grub-core/fs/hfsplus.c
@@ -1012,6 +1012,15 @@ grub_hfsplus_label (grub_device_t device, char **label)
diff --git a/SOURCES/0405-zfs-Fix-possible-negative-shift-operation.patch b/SOURCES/0405-zfs-Fix-possible-negative-shift-operation.patch
index dd9d90f..d265ad3 100644
--- a/SOURCES/0405-zfs-Fix-possible-negative-shift-operation.patch
+++ b/SOURCES/0405-zfs-Fix-possible-negative-shift-operation.patch
@@ -22,7 +22,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 5 insertions(+)
diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c
-index c6204367e78..3dfde080750 100644
+index c6204367e..3dfde0807 100644
--- a/grub-core/fs/zfs/zfs.c
+++ b/grub-core/fs/zfs/zfs.c
@@ -2667,6 +2667,11 @@ dnode_get (dnode_end_t * mdn, grub_uint64_t objnum, grub_uint8_t type,
diff --git a/SOURCES/0406-zfs-Fix-resource-leaks-while-constructing-path.patch b/SOURCES/0406-zfs-Fix-resource-leaks-while-constructing-path.patch
index 3c37522..02f2e78 100644
--- a/SOURCES/0406-zfs-Fix-resource-leaks-while-constructing-path.patch
+++ b/SOURCES/0406-zfs-Fix-resource-leaks-while-constructing-path.patch
@@ -28,7 +28,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 21 insertions(+), 9 deletions(-)
diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c
-index 3dfde080750..44d8bde6b33 100644
+index 3dfde0807..44d8bde6b 100644
--- a/grub-core/fs/zfs/zfs.c
+++ b/grub-core/fs/zfs/zfs.c
@@ -2836,8 +2836,8 @@ dnode_get_path (struct subvolume *subvol, const char *path_in, dnode_end_t *dn,
diff --git a/SOURCES/0407-zfs-Fix-possible-integer-overflows.patch b/SOURCES/0407-zfs-Fix-possible-integer-overflows.patch
index 1017056..9938833 100644
--- a/SOURCES/0407-zfs-Fix-possible-integer-overflows.patch
+++ b/SOURCES/0407-zfs-Fix-possible-integer-overflows.patch
@@ -19,7 +19,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c
-index 44d8bde6b33..0d8c08eec92 100644
+index 44d8bde6b..0d8c08eec 100644
--- a/grub-core/fs/zfs/zfs.c
+++ b/grub-core/fs/zfs/zfs.c
@@ -564,7 +564,7 @@ find_bestub (uberblock_phys_t * ub_array,
diff --git a/SOURCES/0408-zfsinfo-Correct-a-check-for-error-allocating-memory.patch b/SOURCES/0408-zfsinfo-Correct-a-check-for-error-allocating-memory.patch
index 4951204..baa2aee 100644
--- a/SOURCES/0408-zfsinfo-Correct-a-check-for-error-allocating-memory.patch
+++ b/SOURCES/0408-zfsinfo-Correct-a-check-for-error-allocating-memory.patch
@@ -16,7 +16,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/grub-core/fs/zfs/zfsinfo.c b/grub-core/fs/zfs/zfsinfo.c
-index c8a28acf52b..bf2918018e7 100644
+index c8a28acf5..bf2918018 100644
--- a/grub-core/fs/zfs/zfsinfo.c
+++ b/grub-core/fs/zfs/zfsinfo.c
@@ -358,8 +358,8 @@ grub_cmd_zfs_bootfs (grub_command_t cmd __attribute__ ((unused)), int argc,
diff --git a/SOURCES/0409-affs-Fix-memory-leaks.patch b/SOURCES/0409-affs-Fix-memory-leaks.patch
index 57c42a0..128915c 100644
--- a/SOURCES/0409-affs-Fix-memory-leaks.patch
+++ b/SOURCES/0409-affs-Fix-memory-leaks.patch
@@ -25,7 +25,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/grub-core/fs/affs.c b/grub-core/fs/affs.c
-index 91073795f90..e4615c74381 100644
+index 91073795f..e4615c743 100644
--- a/grub-core/fs/affs.c
+++ b/grub-core/fs/affs.c
@@ -400,12 +400,12 @@ grub_affs_iterate_dir (grub_fshelp_node_t dir,
diff --git a/SOURCES/0410-libgcrypt-mpi-Fix-possible-unintended-sign-extension.patch b/SOURCES/0410-libgcrypt-mpi-Fix-possible-unintended-sign-extension.patch
index c9f3a35..3f31fc5 100644
--- a/SOURCES/0410-libgcrypt-mpi-Fix-possible-unintended-sign-extension.patch
+++ b/SOURCES/0410-libgcrypt-mpi-Fix-possible-unintended-sign-extension.patch
@@ -18,7 +18,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/lib/libgcrypt/mpi/mpicoder.c b/grub-core/lib/libgcrypt/mpi/mpicoder.c
-index a3435ed142a..7ecad27b23a 100644
+index a3435ed14..7ecad27b2 100644
--- a/grub-core/lib/libgcrypt/mpi/mpicoder.c
+++ b/grub-core/lib/libgcrypt/mpi/mpicoder.c
@@ -458,7 +458,7 @@ gcry_mpi_scan (struct gcry_mpi **ret_mpi, enum gcry_mpi_format format,
diff --git a/SOURCES/0411-libgcrypt-mpi-Fix-possible-NULL-dereference.patch b/SOURCES/0411-libgcrypt-mpi-Fix-possible-NULL-dereference.patch
index 89257f5..e9b67e6 100644
--- a/SOURCES/0411-libgcrypt-mpi-Fix-possible-NULL-dereference.patch
+++ b/SOURCES/0411-libgcrypt-mpi-Fix-possible-NULL-dereference.patch
@@ -15,7 +15,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 3 insertions(+)
diff --git a/grub-core/lib/libgcrypt/mpi/mpicoder.c b/grub-core/lib/libgcrypt/mpi/mpicoder.c
-index 7ecad27b23a..6fe38916532 100644
+index 7ecad27b2..6fe389165 100644
--- a/grub-core/lib/libgcrypt/mpi/mpicoder.c
+++ b/grub-core/lib/libgcrypt/mpi/mpicoder.c
@@ -379,6 +379,9 @@ gcry_mpi_scan (struct gcry_mpi **ret_mpi, enum gcry_mpi_format format,
diff --git a/SOURCES/0412-syslinux-Fix-memory-leak-while-parsing.patch b/SOURCES/0412-syslinux-Fix-memory-leak-while-parsing.patch
index f85cc51..d308ee4 100644
--- a/SOURCES/0412-syslinux-Fix-memory-leak-while-parsing.patch
+++ b/SOURCES/0412-syslinux-Fix-memory-leak-while-parsing.patch
@@ -15,7 +15,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/grub-core/lib/syslinux_parse.c b/grub-core/lib/syslinux_parse.c
-index 83e7bdb9161..f477feff1c3 100644
+index 83e7bdb91..f477feff1 100644
--- a/grub-core/lib/syslinux_parse.c
+++ b/grub-core/lib/syslinux_parse.c
@@ -737,7 +737,10 @@ syslinux_parse_real (struct syslinux_menu *menu)
diff --git a/SOURCES/0413-normal-completion-Fix-leaking-of-memory-when-process.patch b/SOURCES/0413-normal-completion-Fix-leaking-of-memory-when-process.patch
index 984c608..d3491ec 100644
--- a/SOURCES/0413-normal-completion-Fix-leaking-of-memory-when-process.patch
+++ b/SOURCES/0413-normal-completion-Fix-leaking-of-memory-when-process.patch
@@ -20,7 +20,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/grub-core/normal/completion.c b/grub-core/normal/completion.c
-index 93aa0d8eda8..5036bcf2d98 100644
+index 93aa0d8ed..5036bcf2d 100644
--- a/grub-core/normal/completion.c
+++ b/grub-core/normal/completion.c
@@ -401,8 +401,8 @@ char *
diff --git a/SOURCES/0414-commands-hashsum-Fix-a-memory-leak.patch b/SOURCES/0414-commands-hashsum-Fix-a-memory-leak.patch
index 3508882..eb165a8 100644
--- a/SOURCES/0414-commands-hashsum-Fix-a-memory-leak.patch
+++ b/SOURCES/0414-commands-hashsum-Fix-a-memory-leak.patch
@@ -16,7 +16,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/grub-core/commands/hashsum.c b/grub-core/commands/hashsum.c
-index 456ba908b6f..b8a22b0c8bb 100644
+index 456ba908b..b8a22b0c8 100644
--- a/grub-core/commands/hashsum.c
+++ b/grub-core/commands/hashsum.c
@@ -128,11 +128,17 @@ check_list (const gcry_md_spec_t *hash, const char *hashfilename,
diff --git a/SOURCES/0415-video-efi_gop-Remove-unnecessary-return-value-of-gru.patch b/SOURCES/0415-video-efi_gop-Remove-unnecessary-return-value-of-gru.patch
index fce5f99..9bd5250 100644
--- a/SOURCES/0415-video-efi_gop-Remove-unnecessary-return-value-of-gru.patch
+++ b/SOURCES/0415-video-efi_gop-Remove-unnecessary-return-value-of-gru.patch
@@ -19,7 +19,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 6 insertions(+), 19 deletions(-)
diff --git a/grub-core/video/efi_gop.c b/grub-core/video/efi_gop.c
-index c9e40e8d4e9..9fcc41ac03c 100644
+index c9e40e8d4..9fcc41ac0 100644
--- a/grub-core/video/efi_gop.c
+++ b/grub-core/video/efi_gop.c
@@ -229,7 +229,7 @@ grub_video_gop_fill_real_mode_info (unsigned mode,
diff --git a/SOURCES/0416-video-fb-fbfill-Fix-potential-integer-overflow.patch b/SOURCES/0416-video-fb-fbfill-Fix-potential-integer-overflow.patch
index 895fd9d..5c4b778 100644
--- a/SOURCES/0416-video-fb-fbfill-Fix-potential-integer-overflow.patch
+++ b/SOURCES/0416-video-fb-fbfill-Fix-potential-integer-overflow.patch
@@ -18,7 +18,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/grub-core/video/fb/fbfill.c b/grub-core/video/fb/fbfill.c
-index 11816d07a0b..a37acd1e293 100644
+index 11816d07a..a37acd1e2 100644
--- a/grub-core/video/fb/fbfill.c
+++ b/grub-core/video/fb/fbfill.c
@@ -31,6 +31,7 @@
diff --git a/SOURCES/0417-video-fb-video_fb-Fix-multiple-integer-overflows.patch b/SOURCES/0417-video-fb-video_fb-Fix-multiple-integer-overflows.patch
index fa61935..d317b06 100644
--- a/SOURCES/0417-video-fb-video_fb-Fix-multiple-integer-overflows.patch
+++ b/SOURCES/0417-video-fb-video_fb-Fix-multiple-integer-overflows.patch
@@ -16,7 +16,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 36 insertions(+), 16 deletions(-)
diff --git a/grub-core/video/fb/video_fb.c b/grub-core/video/fb/video_fb.c
-index 1a602c8b251..1c9a138dcdc 100644
+index 1a602c8b2..1c9a138dc 100644
--- a/grub-core/video/fb/video_fb.c
+++ b/grub-core/video/fb/video_fb.c
@@ -25,6 +25,7 @@
diff --git a/SOURCES/0418-video-fb-video_fb-Fix-possible-integer-overflow.patch b/SOURCES/0418-video-fb-video_fb-Fix-possible-integer-overflow.patch
index ce9204f..5846285 100644
--- a/SOURCES/0418-video-fb-video_fb-Fix-possible-integer-overflow.patch
+++ b/SOURCES/0418-video-fb-video_fb-Fix-possible-integer-overflow.patch
@@ -16,7 +16,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/grub-core/video/fb/video_fb.c b/grub-core/video/fb/video_fb.c
-index 1c9a138dcdc..ae6b89f9aea 100644
+index 1c9a138dc..ae6b89f9a 100644
--- a/grub-core/video/fb/video_fb.c
+++ b/grub-core/video/fb/video_fb.c
@@ -1537,7 +1537,13 @@ doublebuf_pageflipping_init (struct grub_video_mode_info *mode_info,
diff --git a/SOURCES/0419-video-readers-jpeg-Test-for-an-invalid-next-marker-r.patch b/SOURCES/0419-video-readers-jpeg-Test-for-an-invalid-next-marker-r.patch
index f9a514a..771205d 100644
--- a/SOURCES/0419-video-readers-jpeg-Test-for-an-invalid-next-marker-r.patch
+++ b/SOURCES/0419-video-readers-jpeg-Test-for-an-invalid-next-marker-r.patch
@@ -17,7 +17,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 6 insertions(+)
diff --git a/grub-core/video/readers/jpeg.c b/grub-core/video/readers/jpeg.c
-index 31359a4c9c8..0b6ce3cee64 100644
+index 31359a4c9..0b6ce3cee 100644
--- a/grub-core/video/readers/jpeg.c
+++ b/grub-core/video/readers/jpeg.c
@@ -253,6 +253,12 @@ grub_jpeg_decode_quan_table (struct grub_jpeg_data *data)
diff --git a/SOURCES/0420-gfxmenu-gui_list-Remove-code-that-coverity-is-flaggi.patch b/SOURCES/0420-gfxmenu-gui_list-Remove-code-that-coverity-is-flaggi.patch
index c9caf70..e79397c 100644
--- a/SOURCES/0420-gfxmenu-gui_list-Remove-code-that-coverity-is-flaggi.patch
+++ b/SOURCES/0420-gfxmenu-gui_list-Remove-code-that-coverity-is-flaggi.patch
@@ -17,7 +17,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/gfxmenu/gui_list.c b/grub-core/gfxmenu/gui_list.c
-index 01477cdf2b3..df334a6c56f 100644
+index 01477cdf2..df334a6c5 100644
--- a/grub-core/gfxmenu/gui_list.c
+++ b/grub-core/gfxmenu/gui_list.c
@@ -771,7 +771,7 @@ list_set_property (void *vself, const char *name, const char *value)
diff --git a/SOURCES/0421-loader-bsd-Check-for-NULL-arg-up-front.patch b/SOURCES/0421-loader-bsd-Check-for-NULL-arg-up-front.patch
index f4c63b3..fd589d4 100644
--- a/SOURCES/0421-loader-bsd-Check-for-NULL-arg-up-front.patch
+++ b/SOURCES/0421-loader-bsd-Check-for-NULL-arg-up-front.patch
@@ -21,7 +21,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
-index 45a71509956..b5ab848ee44 100644
+index 45a715099..b5ab848ee 100644
--- a/grub-core/loader/i386/bsd.c
+++ b/grub-core/loader/i386/bsd.c
@@ -1606,7 +1606,7 @@ grub_cmd_openbsd (grub_extcmd_context_t ctxt, int argc, char *argv[])
diff --git a/SOURCES/0422-loader-xnu-Fix-memory-leak.patch b/SOURCES/0422-loader-xnu-Fix-memory-leak.patch
index 76d9711..6021137 100644
--- a/SOURCES/0422-loader-xnu-Fix-memory-leak.patch
+++ b/SOURCES/0422-loader-xnu-Fix-memory-leak.patch
@@ -19,7 +19,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c
-index b33a384321c..16bfa7cec72 100644
+index b33a38432..16bfa7cec 100644
--- a/grub-core/loader/xnu.c
+++ b/grub-core/loader/xnu.c
@@ -1392,9 +1392,9 @@ grub_xnu_fill_devicetree (void)
diff --git a/SOURCES/0423-loader-xnu-Free-driverkey-data-when-an-error-is-dete.patch b/SOURCES/0423-loader-xnu-Free-driverkey-data-when-an-error-is-dete.patch
index d4c945c..462c0d2 100644
--- a/SOURCES/0423-loader-xnu-Free-driverkey-data-when-an-error-is-dete.patch
+++ b/SOURCES/0423-loader-xnu-Free-driverkey-data-when-an-error-is-dete.patch
@@ -15,7 +15,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c
-index 16bfa7cec72..af885a648c6 100644
+index 16bfa7cec..af885a648 100644
--- a/grub-core/loader/xnu.c
+++ b/grub-core/loader/xnu.c
@@ -228,26 +228,33 @@ grub_xnu_writetree_toheap (grub_addr_t *target, grub_size_t *size)
diff --git a/SOURCES/0424-loader-xnu-Check-if-pointer-is-NULL-before-using-it.patch b/SOURCES/0424-loader-xnu-Check-if-pointer-is-NULL-before-using-it.patch
index ba24db2..a194b7f 100644
--- a/SOURCES/0424-loader-xnu-Check-if-pointer-is-NULL-before-using-it.patch
+++ b/SOURCES/0424-loader-xnu-Check-if-pointer-is-NULL-before-using-it.patch
@@ -12,7 +12,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c
-index af885a648c6..49641b8bbc2 100644
+index af885a648..49641b8bb 100644
--- a/grub-core/loader/xnu.c
+++ b/grub-core/loader/xnu.c
@@ -671,6 +671,9 @@ grub_xnu_load_driver (char *infoplistname, grub_file_t binaryfile,
diff --git a/SOURCES/0425-util-grub-editenv-Fix-incorrect-casting-of-a-signed-.patch b/SOURCES/0425-util-grub-editenv-Fix-incorrect-casting-of-a-signed-.patch
index c90ca09..96d9e84 100644
--- a/SOURCES/0425-util-grub-editenv-Fix-incorrect-casting-of-a-signed-.patch
+++ b/SOURCES/0425-util-grub-editenv-Fix-incorrect-casting-of-a-signed-.patch
@@ -16,7 +16,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/util/grub-editenv.c b/util/grub-editenv.c
-index 2918bb71cfe..e9011e0fbde 100644
+index 2918bb71c..e9011e0fb 100644
--- a/util/grub-editenv.c
+++ b/util/grub-editenv.c
@@ -128,6 +128,7 @@ open_envblk_file (const char *name)
diff --git a/SOURCES/0426-util-glue-efi-Fix-incorrect-use-of-a-possibly-negati.patch b/SOURCES/0426-util-glue-efi-Fix-incorrect-use-of-a-possibly-negati.patch
index ad3a0d6..958246c 100644
--- a/SOURCES/0426-util-glue-efi-Fix-incorrect-use-of-a-possibly-negati.patch
+++ b/SOURCES/0426-util-glue-efi-Fix-incorrect-use-of-a-possibly-negati.patch
@@ -16,7 +16,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/util/glue-efi.c b/util/glue-efi.c
-index 68f53168b58..de0fa6d33d5 100644
+index 68f53168b..de0fa6d33 100644
--- a/util/glue-efi.c
+++ b/util/glue-efi.c
@@ -39,13 +39,23 @@ write_fat (FILE *in32, FILE *in64, FILE *out, const char *out_filename,
diff --git a/SOURCES/0427-script-execute-Fix-NULL-dereference-in-grub_script_e.patch b/SOURCES/0427-script-execute-Fix-NULL-dereference-in-grub_script_e.patch
index 88c7951..5c30501 100644
--- a/SOURCES/0427-script-execute-Fix-NULL-dereference-in-grub_script_e.patch
+++ b/SOURCES/0427-script-execute-Fix-NULL-dereference-in-grub_script_e.patch
@@ -11,7 +11,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
-index a1aadb9ee05..2e47c046741 100644
+index a1aadb9ee..2e47c0467 100644
--- a/grub-core/script/execute.c
+++ b/grub-core/script/execute.c
@@ -978,7 +978,7 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
diff --git a/SOURCES/0428-commands-ls-Require-device_name-is-not-NULL-before-p.patch b/SOURCES/0428-commands-ls-Require-device_name-is-not-NULL-before-p.patch
index b916cb1..4e5aa42 100644
--- a/SOURCES/0428-commands-ls-Require-device_name-is-not-NULL-before-p.patch
+++ b/SOURCES/0428-commands-ls-Require-device_name-is-not-NULL-before-p.patch
@@ -16,7 +16,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/commands/ls.c b/grub-core/commands/ls.c
-index 2cdb2acc552..d4dcffd3168 100644
+index 2cdb2acc5..d4dcffd31 100644
--- a/grub-core/commands/ls.c
+++ b/grub-core/commands/ls.c
@@ -196,7 +196,7 @@ grub_ls_list_files (char *dirname, int longlist, int all, int human)
diff --git a/SOURCES/0429-script-execute-Avoid-crash-when-using-outside-a-func.patch b/SOURCES/0429-script-execute-Avoid-crash-when-using-outside-a-func.patch
index 08fa625..c99388a 100644
--- a/SOURCES/0429-script-execute-Avoid-crash-when-using-outside-a-func.patch
+++ b/SOURCES/0429-script-execute-Avoid-crash-when-using-outside-a-func.patch
@@ -20,7 +20,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
-index 2e47c046741..17f4dcab2c6 100644
+index 2e47c0467..17f4dcab2 100644
--- a/grub-core/script/execute.c
+++ b/grub-core/script/execute.c
@@ -519,7 +519,7 @@ gettext_putvar (const char *str, grub_size_t len,
diff --git a/SOURCES/0430-lib-arg-Block-repeated-short-options-that-require-an.patch b/SOURCES/0430-lib-arg-Block-repeated-short-options-that-require-an.patch
index 63cf2af..977a461 100644
--- a/SOURCES/0430-lib-arg-Block-repeated-short-options-that-require-an.patch
+++ b/SOURCES/0430-lib-arg-Block-repeated-short-options-that-require-an.patch
@@ -26,7 +26,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 13 insertions(+)
diff --git a/grub-core/lib/arg.c b/grub-core/lib/arg.c
-index 3288609a5e1..537c5e94b83 100644
+index 3288609a5..537c5e94b 100644
--- a/grub-core/lib/arg.c
+++ b/grub-core/lib/arg.c
@@ -299,6 +299,19 @@ grub_arg_parse (grub_extcmd_t cmd, int argc, char **argv,
diff --git a/SOURCES/0431-script-execute-Don-t-crash-on-a-for-loop-with-no-ite.patch b/SOURCES/0431-script-execute-Don-t-crash-on-a-for-loop-with-no-ite.patch
index 4e61d40..0ad1065 100644
--- a/SOURCES/0431-script-execute-Don-t-crash-on-a-for-loop-with-no-ite.patch
+++ b/SOURCES/0431-script-execute-Don-t-crash-on-a-for-loop-with-no-ite.patch
@@ -21,7 +21,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 3 insertions(+)
diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
-index 17f4dcab2c6..266d99ed337 100644
+index 17f4dcab2..266d99ed3 100644
--- a/grub-core/script/execute.c
+++ b/grub-core/script/execute.c
@@ -658,6 +658,9 @@ grub_script_arglist_to_argv (struct grub_script_arglist *arglist,
diff --git a/SOURCES/0432-commands-menuentry-Fix-quoting-in-setparams_prefix.patch b/SOURCES/0432-commands-menuentry-Fix-quoting-in-setparams_prefix.patch
index 523dfb1..d2d1bf4 100644
--- a/SOURCES/0432-commands-menuentry-Fix-quoting-in-setparams_prefix.patch
+++ b/SOURCES/0432-commands-menuentry-Fix-quoting-in-setparams_prefix.patch
@@ -29,7 +29,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c
-index 4b5fcf2ce9a..7a533b9741b 100644
+index 4b5fcf2ce..7a533b974 100644
--- a/grub-core/commands/menuentry.c
+++ b/grub-core/commands/menuentry.c
@@ -239,7 +239,7 @@ setparams_prefix (int argc, char **args)
diff --git a/SOURCES/0433-kern-misc-Always-set-end-in-grub_strtoull.patch b/SOURCES/0433-kern-misc-Always-set-end-in-grub_strtoull.patch
index 8bcb715..1a950f9 100644
--- a/SOURCES/0433-kern-misc-Always-set-end-in-grub_strtoull.patch
+++ b/SOURCES/0433-kern-misc-Always-set-end-in-grub_strtoull.patch
@@ -16,7 +16,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 8 insertions(+)
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index 97378c48b22..475f3e0ef05 100644
+index 97378c48b..475f3e0ef 100644
--- a/grub-core/kern/misc.c
+++ b/grub-core/kern/misc.c
@@ -485,6 +485,10 @@ grub_strtoull (const char *str, const char ** const end, int base)
diff --git a/SOURCES/0434-video-readers-jpeg-Catch-files-with-unsupported-quan.patch b/SOURCES/0434-video-readers-jpeg-Catch-files-with-unsupported-quan.patch
index 23e9f3e..afc7125 100644
--- a/SOURCES/0434-video-readers-jpeg-Catch-files-with-unsupported-quan.patch
+++ b/SOURCES/0434-video-readers-jpeg-Catch-files-with-unsupported-quan.patch
@@ -21,7 +21,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 8 insertions(+)
diff --git a/grub-core/video/readers/jpeg.c b/grub-core/video/readers/jpeg.c
-index 0b6ce3cee64..23f919aa070 100644
+index 0b6ce3cee..23f919aa0 100644
--- a/grub-core/video/readers/jpeg.c
+++ b/grub-core/video/readers/jpeg.c
@@ -333,7 +333,11 @@ grub_jpeg_decode_sof (struct grub_jpeg_data *data)
diff --git a/SOURCES/0435-video-readers-jpeg-Catch-OOB-reads-writes-in-grub_jp.patch b/SOURCES/0435-video-readers-jpeg-Catch-OOB-reads-writes-in-grub_jp.patch
index 9cd6519..ee9f1f5 100644
--- a/SOURCES/0435-video-readers-jpeg-Catch-OOB-reads-writes-in-grub_jp.patch
+++ b/SOURCES/0435-video-readers-jpeg-Catch-OOB-reads-writes-in-grub_jp.patch
@@ -24,7 +24,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 8 insertions(+)
diff --git a/grub-core/video/readers/jpeg.c b/grub-core/video/readers/jpeg.c
-index 23f919aa070..e5148120f69 100644
+index 23f919aa0..e5148120f 100644
--- a/grub-core/video/readers/jpeg.c
+++ b/grub-core/video/readers/jpeg.c
@@ -526,6 +526,14 @@ grub_jpeg_decode_du (struct grub_jpeg_data *data, int id, jpeg_data_unit_t du)
diff --git a/SOURCES/0436-video-readers-jpeg-Don-t-decode-data-before-start-of.patch b/SOURCES/0436-video-readers-jpeg-Don-t-decode-data-before-start-of.patch
index 8fc6b13..0871ada 100644
--- a/SOURCES/0436-video-readers-jpeg-Don-t-decode-data-before-start-of.patch
+++ b/SOURCES/0436-video-readers-jpeg-Don-t-decode-data-before-start-of.patch
@@ -20,7 +20,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 4 insertions(+)
diff --git a/grub-core/video/readers/jpeg.c b/grub-core/video/readers/jpeg.c
-index e5148120f69..e31602f766a 100644
+index e5148120f..e31602f76 100644
--- a/grub-core/video/readers/jpeg.c
+++ b/grub-core/video/readers/jpeg.c
@@ -646,6 +646,10 @@ grub_jpeg_decode_data (struct grub_jpeg_data *data)
diff --git a/SOURCES/0437-term-gfxterm-Don-t-set-up-a-font-with-glyphs-that-ar.patch b/SOURCES/0437-term-gfxterm-Don-t-set-up-a-font-with-glyphs-that-ar.patch
index 533481d..f0b6e33 100644
--- a/SOURCES/0437-term-gfxterm-Don-t-set-up-a-font-with-glyphs-that-ar.patch
+++ b/SOURCES/0437-term-gfxterm-Don-t-set-up-a-font-with-glyphs-that-ar.patch
@@ -27,7 +27,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 9 insertions(+)
diff --git a/grub-core/term/gfxterm.c b/grub-core/term/gfxterm.c
-index af7c090a3e7..b40fcce9151 100644
+index af7c090a3..b40fcce91 100644
--- a/grub-core/term/gfxterm.c
+++ b/grub-core/term/gfxterm.c
@@ -232,6 +232,15 @@ grub_virtual_screen_setup (unsigned int x, unsigned int y,
diff --git a/SOURCES/0438-fs-fshelp-Catch-impermissibly-large-block-sizes-in-r.patch b/SOURCES/0438-fs-fshelp-Catch-impermissibly-large-block-sizes-in-r.patch
index 67c4b55..c619e80 100644
--- a/SOURCES/0438-fs-fshelp-Catch-impermissibly-large-block-sizes-in-r.patch
+++ b/SOURCES/0438-fs-fshelp-Catch-impermissibly-large-block-sizes-in-r.patch
@@ -19,7 +19,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 12 insertions(+)
diff --git a/grub-core/fs/fshelp.c b/grub-core/fs/fshelp.c
-index 4c902adf381..a2d0d297a52 100644
+index 4c902adf3..a2d0d297a 100644
--- a/grub-core/fs/fshelp.c
+++ b/grub-core/fs/fshelp.c
@@ -362,6 +362,18 @@ grub_fshelp_read_file (grub_disk_t disk, grub_fshelp_node_t node,
diff --git a/SOURCES/0439-fs-hfsplus-Don-t-fetch-a-key-beyond-the-end-of-the-n.patch b/SOURCES/0439-fs-hfsplus-Don-t-fetch-a-key-beyond-the-end-of-the-n.patch
index 6d15b85..782ee40 100644
--- a/SOURCES/0439-fs-hfsplus-Don-t-fetch-a-key-beyond-the-end-of-the-n.patch
+++ b/SOURCES/0439-fs-hfsplus-Don-t-fetch-a-key-beyond-the-end-of-the-n.patch
@@ -13,7 +13,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 4 insertions(+)
diff --git a/grub-core/fs/hfsplus.c b/grub-core/fs/hfsplus.c
-index 03a33ea2477..423f4b956ba 100644
+index 03a33ea24..423f4b956 100644
--- a/grub-core/fs/hfsplus.c
+++ b/grub-core/fs/hfsplus.c
@@ -635,6 +635,10 @@ grub_hfsplus_btree_search (struct grub_hfsplus_btree *btree,
diff --git a/SOURCES/0440-fs-hfsplus-Don-t-use-uninitialized-data-on-corrupt-f.patch b/SOURCES/0440-fs-hfsplus-Don-t-use-uninitialized-data-on-corrupt-f.patch
index 6418541..612254b 100644
--- a/SOURCES/0440-fs-hfsplus-Don-t-use-uninitialized-data-on-corrupt-f.patch
+++ b/SOURCES/0440-fs-hfsplus-Don-t-use-uninitialized-data-on-corrupt-f.patch
@@ -51,7 +51,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2 files changed, 16 insertions(+)
diff --git a/grub-core/fs/hfsplus.c b/grub-core/fs/hfsplus.c
-index 423f4b956ba..8c0c804735d 100644
+index 423f4b956..8c0c80473 100644
--- a/grub-core/fs/hfsplus.c
+++ b/grub-core/fs/hfsplus.c
@@ -177,6 +177,17 @@ grub_hfsplus_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock)
@@ -90,7 +90,7 @@ index 423f4b956ba..8c0c804735d 100644
sizeof (struct grub_hfsplus_btnode),
sizeof (header), (char *) &header) <= 0)
diff --git a/include/grub/hfsplus.h b/include/grub/hfsplus.h
-index 117740ae269..e14dd31ff54 100644
+index 117740ae2..e14dd31ff 100644
--- a/include/grub/hfsplus.h
+++ b/include/grub/hfsplus.h
@@ -113,6 +113,8 @@ struct grub_hfsplus_data
diff --git a/SOURCES/0441-fs-hfs-Disable-under-lockdown.patch b/SOURCES/0441-fs-hfs-Disable-under-lockdown.patch
index e2971f0..49f3f97 100644
--- a/SOURCES/0441-fs-hfs-Disable-under-lockdown.patch
+++ b/SOURCES/0441-fs-hfs-Disable-under-lockdown.patch
@@ -14,7 +14,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/grub-core/fs/hfs.c b/grub-core/fs/hfs.c
-index 3fd4eec202c..49d1831c808 100644
+index 3fd4eec20..49d1831c8 100644
--- a/grub-core/fs/hfs.c
+++ b/grub-core/fs/hfs.c
@@ -30,6 +30,7 @@
diff --git a/SOURCES/0442-fs-sfs-Fix-over-read-of-root-object-name.patch b/SOURCES/0442-fs-sfs-Fix-over-read-of-root-object-name.patch
index dddbe7f..35fe7cb 100644
--- a/SOURCES/0442-fs-sfs-Fix-over-read-of-root-object-name.patch
+++ b/SOURCES/0442-fs-sfs-Fix-over-read-of-root-object-name.patch
@@ -18,7 +18,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/grub-core/fs/sfs.c b/grub-core/fs/sfs.c
-index 3ddc6b5e287..61d6c303cb3 100644
+index 3ddc6b5e2..61d6c303c 100644
--- a/grub-core/fs/sfs.c
+++ b/grub-core/fs/sfs.c
@@ -373,6 +373,7 @@ grub_sfs_mount (grub_disk_t disk)
diff --git a/SOURCES/0443-fs-jfs-Do-not-move-to-leaf-level-if-name-length-is-n.patch b/SOURCES/0443-fs-jfs-Do-not-move-to-leaf-level-if-name-length-is-n.patch
index 7c75a3b..8c3ebf3 100644
--- a/SOURCES/0443-fs-jfs-Do-not-move-to-leaf-level-if-name-length-is-n.patch
+++ b/SOURCES/0443-fs-jfs-Do-not-move-to-leaf-level-if-name-length-is-n.patch
@@ -16,7 +16,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/fs/jfs.c b/grub-core/fs/jfs.c
-index aab3e8c7b7d..1819899bdec 100644
+index aab3e8c7b..1819899bd 100644
--- a/grub-core/fs/jfs.c
+++ b/grub-core/fs/jfs.c
@@ -563,7 +563,7 @@ grub_jfs_getent (struct grub_jfs_diropen *diro)
diff --git a/SOURCES/0444-fs-jfs-Limit-the-extents-that-getblk-can-consider.patch b/SOURCES/0444-fs-jfs-Limit-the-extents-that-getblk-can-consider.patch
index 91ab8db..e84d344 100644
--- a/SOURCES/0444-fs-jfs-Limit-the-extents-that-getblk-can-consider.patch
+++ b/SOURCES/0444-fs-jfs-Limit-the-extents-that-getblk-can-consider.patch
@@ -18,7 +18,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/grub-core/fs/jfs.c b/grub-core/fs/jfs.c
-index 1819899bdec..6e81f37da6c 100644
+index 1819899bd..6e81f37da 100644
--- a/grub-core/fs/jfs.c
+++ b/grub-core/fs/jfs.c
@@ -261,13 +261,15 @@ static grub_err_t grub_jfs_lookup_symlink (struct grub_jfs_data *data, grub_uint
diff --git a/SOURCES/0445-fs-jfs-Catch-infinite-recursion.patch b/SOURCES/0445-fs-jfs-Catch-infinite-recursion.patch
index dee5914..9201242 100644
--- a/SOURCES/0445-fs-jfs-Catch-infinite-recursion.patch
+++ b/SOURCES/0445-fs-jfs-Catch-infinite-recursion.patch
@@ -19,7 +19,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/grub-core/fs/jfs.c b/grub-core/fs/jfs.c
-index 6e81f37da6c..20d966abfc0 100644
+index 6e81f37da..20d966abf 100644
--- a/grub-core/fs/jfs.c
+++ b/grub-core/fs/jfs.c
@@ -304,7 +304,16 @@ getblk (struct grub_jfs_treehead *treehead,
diff --git a/SOURCES/0446-fs-nilfs2-Reject-too-large-keys.patch b/SOURCES/0446-fs-nilfs2-Reject-too-large-keys.patch
index 76c864f..af50c32 100644
--- a/SOURCES/0446-fs-nilfs2-Reject-too-large-keys.patch
+++ b/SOURCES/0446-fs-nilfs2-Reject-too-large-keys.patch
@@ -16,7 +16,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/grub-core/fs/nilfs2.c b/grub-core/fs/nilfs2.c
-index 598a2a55baf..61e8af9ff7b 100644
+index 598a2a55b..61e8af9ff 100644
--- a/grub-core/fs/nilfs2.c
+++ b/grub-core/fs/nilfs2.c
@@ -569,6 +569,11 @@ grub_nilfs2_btree_lookup (struct grub_nilfs2_data *data,
diff --git a/SOURCES/0447-fs-nilfs2-Don-t-search-children-if-provided-number-i.patch b/SOURCES/0447-fs-nilfs2-Don-t-search-children-if-provided-number-i.patch
index a46141a..abda89b 100644
--- a/SOURCES/0447-fs-nilfs2-Don-t-search-children-if-provided-number-i.patch
+++ b/SOURCES/0447-fs-nilfs2-Don-t-search-children-if-provided-number-i.patch
@@ -18,7 +18,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 23 insertions(+), 15 deletions(-)
diff --git a/grub-core/fs/nilfs2.c b/grub-core/fs/nilfs2.c
-index 61e8af9ff7b..054ad3dc18a 100644
+index 61e8af9ff..054ad3dc1 100644
--- a/grub-core/fs/nilfs2.c
+++ b/grub-core/fs/nilfs2.c
@@ -416,14 +416,34 @@ grub_nilfs2_btree_node_get_key (struct grub_nilfs2_btree_node *node,
diff --git a/SOURCES/0448-fs-nilfs2-Properly-bail-on-errors-in-grub_nilfs2_btr.patch b/SOURCES/0448-fs-nilfs2-Properly-bail-on-errors-in-grub_nilfs2_btr.patch
index 4f90e76..988bfa3 100644
--- a/SOURCES/0448-fs-nilfs2-Properly-bail-on-errors-in-grub_nilfs2_btr.patch
+++ b/SOURCES/0448-fs-nilfs2-Properly-bail-on-errors-in-grub_nilfs2_btr.patch
@@ -17,7 +17,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/grub-core/fs/nilfs2.c b/grub-core/fs/nilfs2.c
-index 054ad3dc18a..c4c4610bec0 100644
+index 054ad3dc1..c4c4610be 100644
--- a/grub-core/fs/nilfs2.c
+++ b/grub-core/fs/nilfs2.c
@@ -433,7 +433,7 @@ grub_nilfs2_btree_node_lookup (struct grub_nilfs2_data *data,
diff --git a/SOURCES/0449-io-gzio-Bail-if-gzio-tl-td-is-NULL.patch b/SOURCES/0449-io-gzio-Bail-if-gzio-tl-td-is-NULL.patch
index d50a182..df88627 100644
--- a/SOURCES/0449-io-gzio-Bail-if-gzio-tl-td-is-NULL.patch
+++ b/SOURCES/0449-io-gzio-Bail-if-gzio-tl-td-is-NULL.patch
@@ -17,7 +17,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 20 insertions(+)
diff --git a/grub-core/io/gzio.c b/grub-core/io/gzio.c
-index 2ecf076dd5e..6e9b9c9361a 100644
+index 2ecf076dd..6e9b9c936 100644
--- a/grub-core/io/gzio.c
+++ b/grub-core/io/gzio.c
@@ -669,6 +669,13 @@ inflate_codes_in_window (grub_gzio_t gzio)
diff --git a/SOURCES/0450-io-gzio-Add-init_dynamic_block-clean-up-if-unpacking.patch b/SOURCES/0450-io-gzio-Add-init_dynamic_block-clean-up-if-unpacking.patch
index 9e33dee..ed7937a 100644
--- a/SOURCES/0450-io-gzio-Add-init_dynamic_block-clean-up-if-unpacking.patch
+++ b/SOURCES/0450-io-gzio-Add-init_dynamic_block-clean-up-if-unpacking.patch
@@ -18,7 +18,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/grub-core/io/gzio.c b/grub-core/io/gzio.c
-index 6e9b9c9361a..97b34f88574 100644
+index 6e9b9c936..97b34f885 100644
--- a/grub-core/io/gzio.c
+++ b/grub-core/io/gzio.c
@@ -953,7 +953,7 @@ init_dynamic_block (grub_gzio_t gzio)
diff --git a/SOURCES/0451-io-gzio-Catch-missing-values-in-huft_build-and-bail.patch b/SOURCES/0451-io-gzio-Catch-missing-values-in-huft_build-and-bail.patch
index 1d1c372..ccbdc47 100644
--- a/SOURCES/0451-io-gzio-Catch-missing-values-in-huft_build-and-bail.patch
+++ b/SOURCES/0451-io-gzio-Catch-missing-values-in-huft_build-and-bail.patch
@@ -20,7 +20,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/grub-core/io/gzio.c b/grub-core/io/gzio.c
-index 97b34f88574..f85dbae237d 100644
+index 97b34f885..f85dbae23 100644
--- a/grub-core/io/gzio.c
+++ b/grub-core/io/gzio.c
@@ -507,6 +507,7 @@ huft_build (unsigned *b, /* code lengths in bits (all assumed <= BMAX) */
diff --git a/SOURCES/0452-io-gzio-Zero-gzio-tl-td-in-init_dynamic_block-if-huf.patch b/SOURCES/0452-io-gzio-Zero-gzio-tl-td-in-init_dynamic_block-if-huf.patch
index c75f528..c566af6 100644
--- a/SOURCES/0452-io-gzio-Zero-gzio-tl-td-in-init_dynamic_block-if-huf.patch
+++ b/SOURCES/0452-io-gzio-Zero-gzio-tl-td-in-init_dynamic_block-if-huf.patch
@@ -17,7 +17,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 2 insertions(+)
diff --git a/grub-core/io/gzio.c b/grub-core/io/gzio.c
-index f85dbae237d..e9f332fbcd9 100644
+index f85dbae23..e9f332fbc 100644
--- a/grub-core/io/gzio.c
+++ b/grub-core/io/gzio.c
@@ -1010,6 +1010,7 @@ init_dynamic_block (grub_gzio_t gzio)
diff --git a/SOURCES/0453-disk-lvm-Don-t-go-beyond-the-end-of-the-data-we-read.patch b/SOURCES/0453-disk-lvm-Don-t-go-beyond-the-end-of-the-data-we-read.patch
index 3a8cb85..c09e1aa 100644
--- a/SOURCES/0453-disk-lvm-Don-t-go-beyond-the-end-of-the-data-we-read.patch
+++ b/SOURCES/0453-disk-lvm-Don-t-go-beyond-the-end-of-the-data-we-read.patch
@@ -19,7 +19,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 14 insertions(+)
diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c
-index 4fbb3eac0ea..0f466040a55 100644
+index 4fbb3eac0..0f466040a 100644
--- a/grub-core/disk/lvm.c
+++ b/grub-core/disk/lvm.c
@@ -142,6 +142,20 @@ grub_lvm_detect (grub_disk_t disk,
diff --git a/SOURCES/0454-disk-lvm-Don-t-blast-past-the-end-of-the-circular-me.patch b/SOURCES/0454-disk-lvm-Don-t-blast-past-the-end-of-the-circular-me.patch
index 8793efc..bfe893d 100644
--- a/SOURCES/0454-disk-lvm-Don-t-blast-past-the-end-of-the-circular-me.patch
+++ b/SOURCES/0454-disk-lvm-Don-t-blast-past-the-end-of-the-circular-me.patch
@@ -17,7 +17,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 10 insertions(+)
diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c
-index 0f466040a55..ec3545e164b 100644
+index 0f466040a..ec3545e16 100644
--- a/grub-core/disk/lvm.c
+++ b/grub-core/disk/lvm.c
@@ -215,6 +215,16 @@ grub_lvm_detect (grub_disk_t disk,
diff --git a/SOURCES/0455-disk-lvm-Bail-on-missing-PV-list.patch b/SOURCES/0455-disk-lvm-Bail-on-missing-PV-list.patch
index 621266b..8fc2573 100644
--- a/SOURCES/0455-disk-lvm-Bail-on-missing-PV-list.patch
+++ b/SOURCES/0455-disk-lvm-Bail-on-missing-PV-list.patch
@@ -17,7 +17,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 2 insertions(+)
diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c
-index ec3545e164b..1e80137c452 100644
+index ec3545e16..1e80137c4 100644
--- a/grub-core/disk/lvm.c
+++ b/grub-core/disk/lvm.c
@@ -371,6 +371,8 @@ error_parsing_metadata:
diff --git a/SOURCES/0456-disk-lvm-Do-not-crash-if-an-expected-string-is-not-f.patch b/SOURCES/0456-disk-lvm-Do-not-crash-if-an-expected-string-is-not-f.patch
index 2ca0659..a62c44e 100644
--- a/SOURCES/0456-disk-lvm-Do-not-crash-if-an-expected-string-is-not-f.patch
+++ b/SOURCES/0456-disk-lvm-Do-not-crash-if-an-expected-string-is-not-f.patch
@@ -17,7 +17,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c
-index 1e80137c452..03587e744dc 100644
+index 1e80137c4..03587e744 100644
--- a/grub-core/disk/lvm.c
+++ b/grub-core/disk/lvm.c
@@ -541,7 +541,16 @@ error_parsing_metadata:
diff --git a/SOURCES/0457-disk-lvm-Do-not-overread-metadata.patch b/SOURCES/0457-disk-lvm-Do-not-overread-metadata.patch
index 2138f6c..631e1a3 100644
--- a/SOURCES/0457-disk-lvm-Do-not-overread-metadata.patch
+++ b/SOURCES/0457-disk-lvm-Do-not-overread-metadata.patch
@@ -13,7 +13,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 25 insertions(+), 6 deletions(-)
diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c
-index 03587e744dc..267be7b9536 100644
+index 03587e744..267be7b95 100644
--- a/grub-core/disk/lvm.c
+++ b/grub-core/disk/lvm.c
@@ -314,17 +314,23 @@ error_parsing_metadata:
diff --git a/SOURCES/0458-disk-lvm-Sanitize-rlocn-offset-to-prevent-wild-read.patch b/SOURCES/0458-disk-lvm-Sanitize-rlocn-offset-to-prevent-wild-read.patch
index 412873f..4dd753d 100644
--- a/SOURCES/0458-disk-lvm-Sanitize-rlocn-offset-to-prevent-wild-read.patch
+++ b/SOURCES/0458-disk-lvm-Sanitize-rlocn-offset-to-prevent-wild-read.patch
@@ -17,7 +17,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 8 insertions(+)
diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c
-index 267be7b9536..9eda28d852c 100644
+index 267be7b95..9eda28d85 100644
--- a/grub-core/disk/lvm.c
+++ b/grub-core/disk/lvm.c
@@ -212,6 +212,14 @@ grub_lvm_detect (grub_disk_t disk,
diff --git a/SOURCES/0459-disk-lvm-Do-not-allow-a-LV-to-be-it-s-own-segment-s-.patch b/SOURCES/0459-disk-lvm-Do-not-allow-a-LV-to-be-it-s-own-segment-s-.patch
index 99e32f2..2762f38 100644
--- a/SOURCES/0459-disk-lvm-Do-not-allow-a-LV-to-be-it-s-own-segment-s-.patch
+++ b/SOURCES/0459-disk-lvm-Do-not-allow-a-LV-to-be-it-s-own-segment-s-.patch
@@ -13,7 +13,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c
-index 9eda28d852c..7e86bb7df4f 100644
+index 9eda28d85..7e86bb7df 100644
--- a/grub-core/disk/lvm.c
+++ b/grub-core/disk/lvm.c
@@ -840,9 +840,13 @@ error_parsing_metadata:
diff --git a/SOURCES/0460-kern-parser-Fix-a-memory-leak.patch b/SOURCES/0460-kern-parser-Fix-a-memory-leak.patch
index 42d42b3..4d63c5c 100644
--- a/SOURCES/0460-kern-parser-Fix-a-memory-leak.patch
+++ b/SOURCES/0460-kern-parser-Fix-a-memory-leak.patch
@@ -14,7 +14,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c
-index d1cf061ad68..39e4df65b86 100644
+index d1cf061ad..39e4df65b 100644
--- a/grub-core/kern/parser.c
+++ b/grub-core/kern/parser.c
@@ -140,6 +140,7 @@ grub_parser_split_cmdline (const char *cmdline,
diff --git a/SOURCES/0461-kern-parser-Introduce-process_char-helper.patch b/SOURCES/0461-kern-parser-Introduce-process_char-helper.patch
index c67dc9e..f4a11e3 100644
--- a/SOURCES/0461-kern-parser-Introduce-process_char-helper.patch
+++ b/SOURCES/0461-kern-parser-Introduce-process_char-helper.patch
@@ -14,7 +14,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 46 insertions(+), 28 deletions(-)
diff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c
-index 39e4df65b86..0d3582bd874 100644
+index 39e4df65b..0d3582bd8 100644
--- a/grub-core/kern/parser.c
+++ b/grub-core/kern/parser.c
@@ -1,7 +1,7 @@
diff --git a/SOURCES/0462-kern-parser-Introduce-terminate_arg-helper.patch b/SOURCES/0462-kern-parser-Introduce-terminate_arg-helper.patch
index 4192ec5..d66dfc3 100644
--- a/SOURCES/0462-kern-parser-Introduce-terminate_arg-helper.patch
+++ b/SOURCES/0462-kern-parser-Introduce-terminate_arg-helper.patch
@@ -13,7 +13,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c
-index 0d3582bd874..572c67089f3 100644
+index 0d3582bd8..572c67089 100644
--- a/grub-core/kern/parser.c
+++ b/grub-core/kern/parser.c
@@ -129,6 +129,16 @@ add_var (char *varname, char **bp, char **vp,
diff --git a/SOURCES/0463-kern-parser-Refactor-grub_parser_split_cmdline-clean.patch b/SOURCES/0463-kern-parser-Refactor-grub_parser_split_cmdline-clean.patch
index c6a0c49..1117cd2 100644
--- a/SOURCES/0463-kern-parser-Refactor-grub_parser_split_cmdline-clean.patch
+++ b/SOURCES/0463-kern-parser-Refactor-grub_parser_split_cmdline-clean.patch
@@ -14,7 +14,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 20 insertions(+), 15 deletions(-)
diff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c
-index 572c67089f3..e010eaa1fa1 100644
+index 572c67089..e010eaa1f 100644
--- a/grub-core/kern/parser.c
+++ b/grub-core/kern/parser.c
@@ -221,19 +221,13 @@ grub_parser_split_cmdline (const char *cmdline,
diff --git a/SOURCES/0464-kern-buffer-Add-variable-sized-heap-buffer.patch b/SOURCES/0464-kern-buffer-Add-variable-sized-heap-buffer.patch
index 0c46876..5ebe79b 100644
--- a/SOURCES/0464-kern-buffer-Add-variable-sized-heap-buffer.patch
+++ b/SOURCES/0464-kern-buffer-Add-variable-sized-heap-buffer.patch
@@ -18,7 +18,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
create mode 100644 include/grub/buffer.h
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 02fbecd4b81..612df2e9c40 100644
+index 02fbecd4b..612df2e9c 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -112,6 +112,7 @@ kernel = {
@@ -31,7 +31,7 @@ index 02fbecd4b81..612df2e9c40 100644
common = kern/device.c;
diff --git a/grub-core/kern/buffer.c b/grub-core/kern/buffer.c
new file mode 100644
-index 00000000000..9f5f8b86705
+index 000000000..9f5f8b867
--- /dev/null
+++ b/grub-core/kern/buffer.c
@@ -0,0 +1,117 @@
@@ -154,7 +154,7 @@ index 00000000000..9f5f8b86705
+}
diff --git a/include/grub/buffer.h b/include/grub/buffer.h
new file mode 100644
-index 00000000000..f4b10cf2810
+index 000000000..f4b10cf28
--- /dev/null
+++ b/include/grub/buffer.h
@@ -0,0 +1,144 @@
diff --git a/SOURCES/0465-kern-parser-Fix-a-stack-buffer-overflow.patch b/SOURCES/0465-kern-parser-Fix-a-stack-buffer-overflow.patch
index 7a30d03..49a5a40 100644
--- a/SOURCES/0465-kern-parser-Fix-a-stack-buffer-overflow.patch
+++ b/SOURCES/0465-kern-parser-Fix-a-stack-buffer-overflow.patch
@@ -22,7 +22,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 67 insertions(+), 43 deletions(-)
diff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c
-index e010eaa1fa1..6ab7aa427cc 100644
+index e010eaa1f..6ab7aa427 100644
--- a/grub-core/kern/parser.c
+++ b/grub-core/kern/parser.c
@@ -18,6 +18,7 @@
diff --git a/SOURCES/0466-kern-efi-Add-initial-stack-protector-implementation.patch b/SOURCES/0466-kern-efi-Add-initial-stack-protector-implementation.patch
index 8da130b..717752d 100644
--- a/SOURCES/0466-kern-efi-Add-initial-stack-protector-implementation.patch
+++ b/SOURCES/0466-kern-efi-Add-initial-stack-protector-implementation.patch
@@ -21,7 +21,7 @@ Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
create mode 100644 include/grub/stack_protector.h
diff --git a/configure.ac b/configure.ac
-index 0059b938a3a..f59a7b86c51 100644
+index 0059b938a..f59a7b86c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1330,12 +1330,41 @@ fi]
@@ -83,7 +83,7 @@ index 0059b938a3a..f59a7b86c51 100644
echo "*******************************************************"
]
diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c
-index 97bf36906a4..501608f743e 100644
+index 97bf36906..501608f74 100644
--- a/grub-core/kern/efi/init.c
+++ b/grub-core/kern/efi/init.c
@@ -28,6 +28,58 @@
@@ -155,7 +155,7 @@ index 97bf36906a4..501608f743e 100644
grub_efi_mm_init ();
diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index a092fddb629..37e7b162874 100644
+index a092fddb6..37e7b1628 100644
--- a/include/grub/efi/api.h
+++ b/include/grub/efi/api.h
@@ -344,6 +344,11 @@
@@ -193,7 +193,7 @@ index a092fddb629..37e7b162874 100644
diff --git a/include/grub/stack_protector.h b/include/grub/stack_protector.h
new file mode 100644
-index 00000000000..c88dc00b5f9
+index 000000000..c88dc00b5
--- /dev/null
+++ b/include/grub/stack_protector.h
@@ -0,0 +1,30 @@
@@ -228,7 +228,7 @@ index 00000000000..c88dc00b5f9
+
+#endif /* GRUB_STACK_PROTECTOR_H */
diff --git a/acinclude.m4 b/acinclude.m4
-index 242e829ff23..21238fcfd03 100644
+index 242e829ff..21238fcfd 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -324,9 +324,9 @@ fi
@@ -285,7 +285,7 @@ index 242e829ff23..21238fcfd03 100644
dnl Check if the C compiler supports `-mstack-arg-probe' (Cygwin).
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
-index a6f1b0dcd06..308ad8850c9 100644
+index a6f1b0dcd..308ad8850 100644
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -92,6 +92,7 @@ endif
diff --git a/SOURCES/0467-util-mkimage-Remove-unused-code-to-add-BSS-section.patch b/SOURCES/0467-util-mkimage-Remove-unused-code-to-add-BSS-section.patch
index 6447426..c312809 100644
--- a/SOURCES/0467-util-mkimage-Remove-unused-code-to-add-BSS-section.patch
+++ b/SOURCES/0467-util-mkimage-Remove-unused-code-to-add-BSS-section.patch
@@ -14,7 +14,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 17 deletions(-)
diff --git a/util/mkimage.c b/util/mkimage.c
-index 2529de4bb78..64f4f139832 100644
+index 2529de4bb..64f4f1398 100644
--- a/util/mkimage.c
+++ b/util/mkimage.c
@@ -1292,7 +1292,6 @@ grub_install_generate_image (const char *dir, const char *prefix,
diff --git a/SOURCES/0468-util-mkimage-Use-grub_host_to_target32-instead-of-gr.patch b/SOURCES/0468-util-mkimage-Use-grub_host_to_target32-instead-of-gr.patch
index 0043fd0..e634289 100644
--- a/SOURCES/0468-util-mkimage-Use-grub_host_to_target32-instead-of-gr.patch
+++ b/SOURCES/0468-util-mkimage-Use-grub_host_to_target32-instead-of-gr.patch
@@ -16,7 +16,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/util/mkimage.c b/util/mkimage.c
-index 64f4f139832..601521d34cf 100644
+index 64f4f1398..601521d34 100644
--- a/util/mkimage.c
+++ b/util/mkimage.c
@@ -1290,10 +1290,10 @@ grub_install_generate_image (const char *dir, const char *prefix,
diff --git a/SOURCES/0469-util-mkimage-Always-use-grub_host_to_target32-to-ini.patch b/SOURCES/0469-util-mkimage-Always-use-grub_host_to_target32-to-ini.patch
index cef0a35..0690182 100644
--- a/SOURCES/0469-util-mkimage-Always-use-grub_host_to_target32-to-ini.patch
+++ b/SOURCES/0469-util-mkimage-Always-use-grub_host_to_target32-to-ini.patch
@@ -15,7 +15,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/util/mkimage.c b/util/mkimage.c
-index 601521d34cf..d2876cdb5fb 100644
+index 601521d34..d2876cdb5 100644
--- a/util/mkimage.c
+++ b/util/mkimage.c
@@ -1339,10 +1339,10 @@ grub_install_generate_image (const char *dir, const char *prefix,
diff --git a/SOURCES/0470-util-mkimage-Unify-more-of-the-PE32-and-PE32-header-.patch b/SOURCES/0470-util-mkimage-Unify-more-of-the-PE32-and-PE32-header-.patch
index e8e286a..23f300a 100644
--- a/SOURCES/0470-util-mkimage-Unify-more-of-the-PE32-and-PE32-header-.patch
+++ b/SOURCES/0470-util-mkimage-Unify-more-of-the-PE32-and-PE32-header-.patch
@@ -18,7 +18,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 51 insertions(+), 60 deletions(-)
diff --git a/util/mkimage.c b/util/mkimage.c
-index d2876cdb5fb..ff5462c98c1 100644
+index d2876cdb5..ff5462c98 100644
--- a/util/mkimage.c
+++ b/util/mkimage.c
@@ -771,6 +771,21 @@ grub_install_get_image_targets_string (void)
diff --git a/SOURCES/0471-util-mkimage-Reorder-PE-optional-header-fields-set-u.patch b/SOURCES/0471-util-mkimage-Reorder-PE-optional-header-fields-set-u.patch
index 95a3c7d..74cf415 100644
--- a/SOURCES/0471-util-mkimage-Reorder-PE-optional-header-fields-set-u.patch
+++ b/SOURCES/0471-util-mkimage-Reorder-PE-optional-header-fields-set-u.patch
@@ -14,7 +14,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/util/mkimage.c b/util/mkimage.c
-index ff5462c98c1..e73a5864b22 100644
+index ff5462c98..e73a5864b 100644
--- a/util/mkimage.c
+++ b/util/mkimage.c
@@ -1320,16 +1320,12 @@ grub_install_generate_image (const char *dir, const char *prefix,
diff --git a/SOURCES/0472-util-mkimage-Improve-data_size-value-calculation.patch b/SOURCES/0472-util-mkimage-Improve-data_size-value-calculation.patch
index 31428ef..555092f 100644
--- a/SOURCES/0472-util-mkimage-Improve-data_size-value-calculation.patch
+++ b/SOURCES/0472-util-mkimage-Improve-data_size-value-calculation.patch
@@ -21,7 +21,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/util/mkimage.c b/util/mkimage.c
-index e73a5864b22..f22b398d973 100644
+index e73a5864b..f22b398d9 100644
--- a/util/mkimage.c
+++ b/util/mkimage.c
@@ -1248,6 +1248,7 @@ grub_install_generate_image (const char *dir, const char *prefix,
diff --git a/SOURCES/0473-util-mkimage-Refactor-section-setup-to-use-a-helper.patch b/SOURCES/0473-util-mkimage-Refactor-section-setup-to-use-a-helper.patch
index 41d3f2f..61c0b54 100644
--- a/SOURCES/0473-util-mkimage-Refactor-section-setup-to-use-a-helper.patch
+++ b/SOURCES/0473-util-mkimage-Refactor-section-setup-to-use-a-helper.patch
@@ -14,7 +14,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 76 insertions(+), 65 deletions(-)
diff --git a/util/mkimage.c b/util/mkimage.c
-index f22b398d973..0f5ae2a76f2 100644
+index f22b398d9..0f5ae2a76 100644
--- a/util/mkimage.c
+++ b/util/mkimage.c
@@ -771,6 +771,38 @@ grub_install_get_image_targets_string (void)
diff --git a/SOURCES/0474-util-mkimage-Add-an-option-to-import-SBAT-metadata-i.patch b/SOURCES/0474-util-mkimage-Add-an-option-to-import-SBAT-metadata-i.patch
index 7044e57..261addd 100644
--- a/SOURCES/0474-util-mkimage-Add-an-option-to-import-SBAT-metadata-i.patch
+++ b/SOURCES/0474-util-mkimage-Add-an-option-to-import-SBAT-metadata-i.patch
@@ -21,7 +21,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
6 files changed, 73 insertions(+), 10 deletions(-)
diff --git a/util/grub-install-common.c b/util/grub-install-common.c
-index fa6b65347ea..fde4ca7fc8c 100644
+index fa6b65347..fde4ca7fc 100644
--- a/util/grub-install-common.c
+++ b/util/grub-install-common.c
@@ -537,7 +537,7 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix,
@@ -34,7 +34,7 @@ index fa6b65347ea..fde4ca7fc8c 100644
grub_install_pop_module ();
}
diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
-index 394d2dc5fc9..17a86261ffc 100644
+index 394d2dc5f..17a86261f 100644
--- a/util/grub-mkimage.c
+++ b/util/grub-mkimage.c
@@ -82,6 +82,7 @@ static struct argp_option options[] = {
@@ -87,7 +87,7 @@ index 394d2dc5fc9..17a86261ffc 100644
return 0;
}
diff --git a/util/mkimage.c b/util/mkimage.c
-index 0f5ae2a76f2..16418e245d3 100644
+index 0f5ae2a76..16418e245 100644
--- a/util/mkimage.c
+++ b/util/mkimage.c
@@ -826,12 +826,13 @@ grub_install_generate_image (const char *dir, const char *prefix,
@@ -196,7 +196,7 @@ index 0f5ae2a76f2..16418e245d3 100644
PE_OHDR (o32, o64, base_relocation_table.rva) = grub_host_to_target32 (vma);
PE_OHDR (o32, o64, base_relocation_table.size) = grub_host_to_target32 (scn_size);
diff --git a/include/grub/util/install.h b/include/grub/util/install.h
-index 95059285bd4..dad17561c4f 100644
+index 95059285b..dad17561c 100644
--- a/include/grub/util/install.h
+++ b/include/grub/util/install.h
@@ -187,7 +187,8 @@ grub_install_generate_image (const char *dir, const char *prefix,
@@ -210,7 +210,7 @@ index 95059285bd4..dad17561c4f 100644
const struct grub_install_image_target_desc *
grub_install_get_image_target (const char *arg);
diff --git a/include/grub/util/mkimage.h b/include/grub/util/mkimage.h
-index cef7fffa7ae..f48d544c28a 100644
+index cef7fffa7..f48d544c2 100644
--- a/include/grub/util/mkimage.h
+++ b/include/grub/util/mkimage.h
@@ -24,6 +24,7 @@ struct grub_mkimage_layout
@@ -222,7 +222,7 @@ index cef7fffa7ae..f48d544c28a 100644
void *reloc_section;
size_t reloc_size;
diff --git a/docs/grub.texi b/docs/grub.texi
-index 314bbeb8471..52e6e5763b8 100644
+index 314bbeb84..52e6e5763 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -5719,6 +5719,7 @@ environment variables and commands are listed in the same order.
diff --git a/SOURCES/0475-kern-misc-Split-parse_printf_args-into-format-parsin.patch b/SOURCES/0475-kern-misc-Split-parse_printf_args-into-format-parsin.patch
index 7ff44dd..131250a 100644
--- a/SOURCES/0475-kern-misc-Split-parse_printf_args-into-format-parsin.patch
+++ b/SOURCES/0475-kern-misc-Split-parse_printf_args-into-format-parsin.patch
@@ -16,7 +16,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index 475f3e0ef05..ebfcc95f01d 100644
+index 475f3e0ef..ebfcc95f0 100644
--- a/grub-core/kern/misc.c
+++ b/grub-core/kern/misc.c
@@ -711,8 +711,7 @@ grub_lltoa (char *str, int c, unsigned long long n)
diff --git a/SOURCES/0476-kern-misc-Add-STRING-type-for-internal-printf-format.patch b/SOURCES/0476-kern-misc-Add-STRING-type-for-internal-printf-format.patch
index 8e6e474..f649799 100644
--- a/SOURCES/0476-kern-misc-Add-STRING-type-for-internal-printf-format.patch
+++ b/SOURCES/0476-kern-misc-Add-STRING-type-for-internal-printf-format.patch
@@ -20,7 +20,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index ebfcc95f01d..07456faa2a7 100644
+index ebfcc95f0..07456faa2 100644
--- a/grub-core/kern/misc.c
+++ b/grub-core/kern/misc.c
@@ -37,7 +37,8 @@ union printf_arg
diff --git a/SOURCES/0477-kern-misc-Add-function-to-check-printf-format-agains.patch b/SOURCES/0477-kern-misc-Add-function-to-check-printf-format-agains.patch
index 0dacf63..2105439 100644
--- a/SOURCES/0477-kern-misc-Add-function-to-check-printf-format-agains.patch
+++ b/SOURCES/0477-kern-misc-Add-function-to-check-printf-format-agains.patch
@@ -49,7 +49,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2 files changed, 94 insertions(+), 4 deletions(-)
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index 07456faa2a7..859d71659a2 100644
+index 07456faa2..859d71659 100644
--- a/grub-core/kern/misc.c
+++ b/grub-core/kern/misc.c
@@ -711,8 +711,26 @@ grub_lltoa (char *str, int c, unsigned long long n)
@@ -187,7 +187,7 @@ index 07456faa2a7..859d71659a2 100644
static inline void __attribute__ ((noreturn))
grub_abort (void)
diff --git a/include/grub/misc.h b/include/grub/misc.h
-index 6ca03c4d692..6be6a88f652 100644
+index 6ca03c4d6..6be6a88f6 100644
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -488,6 +488,22 @@ grub_error_load (const struct grub_error_saved *save)
diff --git a/SOURCES/0478-gfxmenu-gui-Check-printf-format-in-the-gui_progress_.patch b/SOURCES/0478-gfxmenu-gui-Check-printf-format-in-the-gui_progress_.patch
index f1c4e5a..489c131 100644
--- a/SOURCES/0478-gfxmenu-gui-Check-printf-format-in-the-gui_progress_.patch
+++ b/SOURCES/0478-gfxmenu-gui-Check-printf-format-in-the-gui_progress_.patch
@@ -28,7 +28,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
2 files changed, 7 insertions(+)
diff --git a/grub-core/gfxmenu/gui_label.c b/grub-core/gfxmenu/gui_label.c
-index a4c817891ee..1c190542a2b 100644
+index a4c817891..1c190542a 100644
--- a/grub-core/gfxmenu/gui_label.c
+++ b/grub-core/gfxmenu/gui_label.c
@@ -193,6 +193,10 @@ label_set_property (void *vself, const char *name, const char *value)
@@ -43,7 +43,7 @@ index a4c817891ee..1c190542a2b 100644
self->text = grub_xasprintf (value, self->value);
}
diff --git a/grub-core/gfxmenu/gui_progress_bar.c b/grub-core/gfxmenu/gui_progress_bar.c
-index b128f08668e..ace85a12569 100644
+index b128f0866..ace85a125 100644
--- a/grub-core/gfxmenu/gui_progress_bar.c
+++ b/grub-core/gfxmenu/gui_progress_bar.c
@@ -348,6 +348,9 @@ progress_bar_set_property (void *vself, const char *name, const char *value)
diff --git a/SOURCES/0479-kern-mm-Fix-grub_debug_calloc-compilation-error.patch b/SOURCES/0479-kern-mm-Fix-grub_debug_calloc-compilation-error.patch
index 619d6d5..1c0b46b 100644
--- a/SOURCES/0479-kern-mm-Fix-grub_debug_calloc-compilation-error.patch
+++ b/SOURCES/0479-kern-mm-Fix-grub_debug_calloc-compilation-error.patch
@@ -15,7 +15,7 @@ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/grub-core/kern/mm.c b/grub-core/kern/mm.c
-index 80d0720d005..d8c8377578b 100644
+index 80d0720d0..d8c837757 100644
--- a/grub-core/kern/mm.c
+++ b/grub-core/kern/mm.c
@@ -594,7 +594,7 @@ grub_debug_calloc (const char *file, int line, grub_size_t nmemb, grub_size_t si
diff --git a/SOURCES/0480-efi-net-Fix-malformed-device-path-arithmetic-errors-.patch b/SOURCES/0480-efi-net-Fix-malformed-device-path-arithmetic-errors-.patch
index 054a810..bd30e11 100644
--- a/SOURCES/0480-efi-net-Fix-malformed-device-path-arithmetic-errors-.patch
+++ b/SOURCES/0480-efi-net-Fix-malformed-device-path-arithmetic-errors-.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] efi/net: Fix malformed device path arithmetic errors in efi
1 file changed, 20 insertions(+), 6 deletions(-)
diff --git a/grub-core/net/efi/net.c b/grub-core/net/efi/net.c
-index 3ae1fbbe3c8..a58c24f6364 100644
+index 3ae1fbbe3..a58c24f63 100644
--- a/grub-core/net/efi/net.c
+++ b/grub-core/net/efi/net.c
@@ -1318,11 +1318,18 @@ grub_efi_net_boot_from_https (void)
diff --git a/SOURCES/0481-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch b/SOURCES/0481-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch
index d24a587..a372d62 100644
--- a/SOURCES/0481-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch
+++ b/SOURCES/0481-ieee1275-drop-HEAP_MAX_ADDR-HEAP_MIN_SIZE.patch
@@ -32,7 +32,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
1 file changed, 17 deletions(-)
diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
-index 22dc3013d86..ee97d761d1e 100644
+index 22dc3013d..ee97d761d 100644
--- a/grub-core/kern/ieee1275/init.c
+++ b/grub-core/kern/ieee1275/init.c
@@ -42,9 +42,6 @@
diff --git a/SOURCES/0482-ieee1275-claim-more-memory.patch b/SOURCES/0482-ieee1275-claim-more-memory.patch
index 3499290..07184e9 100644
--- a/SOURCES/0482-ieee1275-claim-more-memory.patch
+++ b/SOURCES/0482-ieee1275-claim-more-memory.patch
@@ -86,7 +86,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
2 files changed, 69 insertions(+), 18 deletions(-)
diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
-index ee97d761d1e..a6e169bd003 100644
+index ee97d761d..a6e169bd0 100644
--- a/grub-core/kern/ieee1275/init.c
+++ b/grub-core/kern/ieee1275/init.c
@@ -42,11 +42,12 @@
@@ -227,7 +227,7 @@ index ee97d761d1e..a6e169bd003 100644
#endif
diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi
-index 421dd410e50..03d53498c51 100644
+index 421dd410e..03d53498c 100644
--- a/docs/grub-dev.texi
+++ b/docs/grub-dev.texi
@@ -930,7 +930,9 @@ space is limited to 4GiB. GRUB allocates pages from EFI for its heap, at most
diff --git a/SOURCES/0483-ieee1275-request-memory-with-ibm-client-architecture.patch b/SOURCES/0483-ieee1275-request-memory-with-ibm-client-architecture.patch
index 9f4e2b7..0a5d46e 100644
--- a/SOURCES/0483-ieee1275-request-memory-with-ibm-client-architecture.patch
+++ b/SOURCES/0483-ieee1275-request-memory-with-ibm-client-architecture.patch
@@ -69,7 +69,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
3 files changed, 152 insertions(+), 3 deletions(-)
diff --git a/grub-core/kern/ieee1275/cmain.c b/grub-core/kern/ieee1275/cmain.c
-index 3e14f539368..9d5156462c1 100644
+index 3e14f5393..9d5156462 100644
--- a/grub-core/kern/ieee1275/cmain.c
+++ b/grub-core/kern/ieee1275/cmain.c
@@ -124,6 +124,9 @@ grub_ieee1275_find_options (void)
@@ -83,7 +83,7 @@ index 3e14f539368..9d5156462c1 100644
if (is_smartfirmware)
diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
-index a6e169bd003..adf4bd5a88b 100644
+index a6e169bd0..adf4bd5a8 100644
--- a/grub-core/kern/ieee1275/init.c
+++ b/grub-core/kern/ieee1275/init.c
@@ -238,6 +238,135 @@ heap_init (grub_uint64_t addr, grub_uint64_t len, grub_memory_type_t type,
@@ -248,7 +248,7 @@ index a6e169bd003..adf4bd5a88b 100644
total = total / 4;
diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h
-index ca08bd96681..131808d6197 100644
+index ca08bd966..131808d61 100644
--- a/include/grub/ieee1275/ieee1275.h
+++ b/include/grub/ieee1275/ieee1275.h
@@ -147,7 +147,13 @@ enum grub_ieee1275_flag
diff --git a/SOURCES/0484-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch b/SOURCES/0484-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch
index f65f498..7d9f34c 100644
--- a/SOURCES/0484-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch
+++ b/SOURCES/0484-appendedsig-x509-Also-handle-the-Extended-Key-Usage-.patch
@@ -23,7 +23,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
3 files changed, 201 insertions(+), 3 deletions(-)
diff --git a/grub-core/commands/appendedsig/x509.c b/grub-core/commands/appendedsig/x509.c
-index 652e4f16870..34a2070a7c9 100644
+index 652e4f168..34a2070a7 100644
--- a/grub-core/commands/appendedsig/x509.c
+++ b/grub-core/commands/appendedsig/x509.c
@@ -47,6 +47,12 @@ const char *keyUsage_oid = "2.5.29.15";
@@ -156,7 +156,7 @@ index 652e4f16870..34a2070a7c9 100644
cleanup_value:
diff --git a/grub-core/tests/appended_signature_test.c b/grub-core/tests/appended_signature_test.c
-index 88a485200d8..dbba0616621 100644
+index 88a485200..dbba06166 100644
--- a/grub-core/tests/appended_signature_test.c
+++ b/grub-core/tests/appended_signature_test.c
@@ -111,6 +111,22 @@ static struct grub_procfs_entry certificate_printable_der_entry = {
@@ -225,7 +225,7 @@ index 88a485200d8..dbba0616621 100644
GRUB_FUNCTIONAL_TEST (appended_signature_test, appended_signature_test);
diff --git a/grub-core/tests/appended_signatures.h b/grub-core/tests/appended_signatures.h
-index aa3dc6278e3..2e5ebd7d8bd 100644
+index aa3dc6278..2e5ebd7d8 100644
--- a/grub-core/tests/appended_signatures.h
+++ b/grub-core/tests/appended_signatures.h
@@ -555,3 +555,84 @@ unsigned char certificate_printable_der[] = {
diff --git a/SOURCES/0485-ieee1275-ofdisk-retry-on-open-failure.patch b/SOURCES/0485-ieee1275-ofdisk-retry-on-open-failure.patch
index 93ad912..f81e315 100644
--- a/SOURCES/0485-ieee1275-ofdisk-retry-on-open-failure.patch
+++ b/SOURCES/0485-ieee1275-ofdisk-retry-on-open-failure.patch
@@ -16,7 +16,7 @@ Signed-off-by: Diego Domingos <diegodo@br.ibm.com>
2 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/grub-core/disk/ieee1275/ofdisk.c b/grub-core/disk/ieee1275/ofdisk.c
-index f3a6ecd797f..98325ca982f 100644
+index f3a6ecd79..98325ca98 100644
--- a/grub-core/disk/ieee1275/ofdisk.c
+++ b/grub-core/disk/ieee1275/ofdisk.c
@@ -225,7 +225,9 @@ dev_iterate (const struct grub_ieee1275_devalias *alias)
@@ -85,7 +85,7 @@ index f3a6ecd797f..98325ca982f 100644
}
diff --git a/include/grub/ieee1275/ofdisk.h b/include/grub/ieee1275/ofdisk.h
-index 2f69e3f191d..7d2d5409305 100644
+index 2f69e3f19..7d2d54093 100644
--- a/include/grub/ieee1275/ofdisk.h
+++ b/include/grub/ieee1275/ofdisk.h
@@ -22,4 +22,12 @@
diff --git a/SOURCES/0486-normal-main-Discover-the-device-to-read-the-config-f.patch b/SOURCES/0486-normal-main-Discover-the-device-to-read-the-config-f.patch
index 0395ae5..e04693a 100644
--- a/SOURCES/0486-normal-main-Discover-the-device-to-read-the-config-f.patch
+++ b/SOURCES/0486-normal-main-Discover-the-device-to-read-the-config-f.patch
@@ -28,7 +28,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 51 insertions(+), 7 deletions(-)
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 49141039f8f..93f33c16732 100644
+index 49141039f..93f33c167 100644
--- a/grub-core/normal/main.c
+++ b/grub-core/normal/main.c
@@ -333,16 +333,11 @@ grub_enter_normal_mode (const char *config)
diff --git a/SOURCES/0487-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch b/SOURCES/0487-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch
index a1092c5..e29fdf1 100644
--- a/SOURCES/0487-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch
+++ b/SOURCES/0487-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch
@@ -23,7 +23,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
1 file changed, 33 insertions(+), 5 deletions(-)
diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
-index 9bf6a8b231a..25dbcfef1f6 100644
+index 9bf6a8b23..25dbcfef1 100644
--- a/grub-core/kern/main.c
+++ b/grub-core/kern/main.c
@@ -215,13 +215,41 @@ grub_set_prefix_and_root (void)
diff --git a/SOURCES/0488-powerpc-fix-prefix-signed-grub-special-case-for-Powe.patch b/SOURCES/0488-powerpc-fix-prefix-signed-grub-special-case-for-Powe.patch
index 415c702..66bdc31 100644
--- a/SOURCES/0488-powerpc-fix-prefix-signed-grub-special-case-for-Powe.patch
+++ b/SOURCES/0488-powerpc-fix-prefix-signed-grub-special-case-for-Powe.patch
@@ -15,7 +15,7 @@ Signed-off-by: Daniel Axtens <dja@axtens.net>
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
-index 25dbcfef1f6..40a709117f1 100644
+index 25dbcfef1..40a709117 100644
--- a/grub-core/kern/main.c
+++ b/grub-core/kern/main.c
@@ -235,9 +235,20 @@ grub_set_prefix_and_root (void)
diff --git a/SOURCES/0489-grub-mkconfig-restore-umask-for-grub.cfg.patch b/SOURCES/0489-grub-mkconfig-restore-umask-for-grub.cfg.patch
new file mode 100644
index 0000000..96e42df
--- /dev/null
+++ b/SOURCES/0489-grub-mkconfig-restore-umask-for-grub.cfg.patch
@@ -0,0 +1,43 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Michael Chang via Grub-devel <grub-devel@gnu.org>
+Date: Fri, 3 Dec 2021 16:13:28 +0800
+Subject: [PATCH] grub-mkconfig: restore umask for grub.cfg
+
+Since commit:
+
+ ab2e53c8a grub-mkconfig: Honor a symlink when generating configuration
+by grub-mkconfig
+
+has inadvertently discarded umask for creating grub.cfg in the process
+of grub-mkconfig. The resulting wrong permission (0644) would allow
+unprivileged users to read grub's configuration file content. This
+presents a low confidentiality risk as grub.cfg may contain non-secured
+plain-text passwords.
+
+This patch restores the missing umask and set the file mode of creation
+to 0600 preventing unprivileged access.
+
+Fixes: CVE-2021-3981
+
+Signed-off-by: Michael Chang <mchang@suse.com>
+(cherry picked from commit 2acad06610da1488bfa387f56a847119ab758766)
+(cherry picked from commit 583bc3a468c9782696b2703e1098590f6f820add)
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
+---
+ util/grub-mkconfig.in | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
+index 5e643e169..a1c00776d 100644
+--- a/util/grub-mkconfig.in
++++ b/util/grub-mkconfig.in
+@@ -317,7 +317,9 @@ and /etc/grub.d/* files or please file a bug report with
+ exit 1
+ else
+ # none of the children aborted with error, install the new grub.cfg
++ oldumask=$(umask); umask 077
+ cat ${grub_cfg}.new > ${grub_cfg}
++ umask $oldumask
+ rm -f ${grub_cfg}.new
+ fi
+ fi
diff --git a/SOURCES/0490-efinet-Add-DHCP-proxy-support.patch b/SOURCES/0490-efinet-Add-DHCP-proxy-support.patch
new file mode 100644
index 0000000..054d975
--- /dev/null
+++ b/SOURCES/0490-efinet-Add-DHCP-proxy-support.patch
@@ -0,0 +1,53 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Ian Page Hands <iphands@gmail.com>
+Date: Tue, 8 Jun 2021 13:48:56 -0400
+Subject: [PATCH] efinet: Add DHCP proxy support
+
+If a proxyDHCP configuration is used, the server name, server IP and boot
+file values should be taken from the DHCP proxy offer instead of the DHCP
+server ack packet. Currently that case is not handled, add support for it.
+
+(cherry picked from commit 9cd94b23fe366b87ef25c13c95a531325af9016f)
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
+---
+ grub-core/net/drivers/efi/efinet.c | 25 +++++++++++++++++++++++--
+ 1 file changed, 23 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
+index df7760ad2..25809050b 100644
+--- a/grub-core/net/drivers/efi/efinet.c
++++ b/grub-core/net/drivers/efi/efinet.c
+@@ -850,10 +850,31 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
+ else
+ {
+ grub_dprintf ("efinet", "using ipv4 and dhcp\n");
++
++ struct grub_net_bootp_packet *dhcp_ack = &pxe_mode->dhcp_ack;
++
++ if (pxe_mode->proxy_offer_received)
++ {
++ grub_dprintf ("efinet", "proxy offer receive");
++ struct grub_net_bootp_packet *proxy_offer = &pxe_mode->proxy_offer;
++
++ if (proxy_offer && dhcp_ack->boot_file[0] == '\0')
++ {
++ grub_dprintf ("efinet", "setting values from proxy offer");
++ /* Here we got a proxy offer and the dhcp_ack has a nil boot_file
++ * Copy the proxy DHCP offer details into the bootp_packet we are
++ * sending forward as they are the deatils we need.
++ */
++ *dhcp_ack->server_name = *proxy_offer->server_name;
++ *dhcp_ack->boot_file = *proxy_offer->boot_file;
++ dhcp_ack->server_ip = proxy_offer->server_ip;
++ }
++ }
++
+ grub_net_configure_by_dhcp_ack (card->name, card, 0,
+ (struct grub_net_bootp_packet *)
+- packet_buf,
+- packet_bufsz,
++ &pxe_mode->dhcp_ack,
++ sizeof (pxe_mode->dhcp_ack),
+ 1, device, path);
+ grub_dprintf ("efinet", "device: `%s' path: `%s'\n", *device, *path);
+ }
diff --git a/SOURCES/0491-at_keyboard-Fix-unreliable-key-presses.patch b/SOURCES/0491-at_keyboard-Fix-unreliable-key-presses.patch
new file mode 100644
index 0000000..536b370
--- /dev/null
+++ b/SOURCES/0491-at_keyboard-Fix-unreliable-key-presses.patch
@@ -0,0 +1,49 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Michael Bideau <mica.devel@gmail.com>
+Date: Wed, 2 Oct 2019 23:48:10 +0200
+Subject: [PATCH] at_keyboard: Fix unreliable key presses
+
+This patch fixes an issue that prevented the at_keyboard module to work
+(for me). The cause was a bad/wrong return value in the
+grub_at_keyboard_getkey() function in grub-core/term/at_keyboard.c file
+at line 237. My symptoms were to have an unresponsive keyboard. Keys
+needed to be pressed 10x and more to effectively be printed sometimes
+generating multiple key presses (after 1 or 2 sec of no printing). It
+was very problematic when typing passphrase in early stage (with
+GRUB_ENABLE_CRYPTODISK). When switched to "console" terminal input
+keyboard worked perfectly. It also worked great with the GRUB 2.02
+packaged by Debian (2.02+dfsg1-20). It was not an output issue but an
+input one.
+
+I've managed to analyze the issue and found that it came from the commit
+216950a4e (at_keyboard: Split protocol from controller code.). Three
+lines where moved from the fetch_key() function in
+grub-core/term/at_keyboard.c file to the beginning of
+grub_at_keyboard_getkey() function (same file). However, returning -1
+made sense when it happened in fetch_key() function but not anymore in
+grub_at_keyboard_getkey() function which should return GRUB_TERM_NO_KEY.
+I think it was just an incomplete cut-paste missing a small manual
+correction. Let's fix it.
+
+Note: Commit message updated by Daniel Kiper.
+
+Signed-off-by: Michael Bideau <mica.devel@gmail.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+(cherry picked from commit 33203ca3484717712b54e199c46ae8a818374284)
+---
+ grub-core/term/at_keyboard.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/term/at_keyboard.c b/grub-core/term/at_keyboard.c
+index c805cccbd..dac0f946f 100644
+--- a/grub-core/term/at_keyboard.c
++++ b/grub-core/term/at_keyboard.c
+@@ -318,7 +318,7 @@ grub_at_keyboard_getkey (struct grub_term_input *term __attribute__ ((unused)))
+ return GRUB_TERM_NO_KEY;
+
+ if (! KEYBOARD_ISREADY (grub_inb (KEYBOARD_REG_STATUS)))
+- return -1;
++ return GRUB_TERM_NO_KEY;
+ at_key = grub_inb (KEYBOARD_REG_DATA);
+ old_led = ps2_state.led_status;
+
diff --git a/SOURCES/0492-commands-search-Fix-bug-stopping-iteration-when-no-f.patch b/SOURCES/0492-commands-search-Fix-bug-stopping-iteration-when-no-f.patch
new file mode 100644
index 0000000..323564d
--- /dev/null
+++ b/SOURCES/0492-commands-search-Fix-bug-stopping-iteration-when-no-f.patch
@@ -0,0 +1,35 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Renaud=20M=C3=A9trich?= <rmetrich@redhat.com>
+Date: Tue, 8 Feb 2022 08:39:10 +0100
+Subject: [PATCH] commands/search: Fix bug stopping iteration when --no-floppy
+ is used
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When using --no-floppy and a floppy was encountered, iterate_device()
+was returning 1, causing the iteration to stop instead of continuing.
+
+Signed-off-by: Renaud Métrich <rmetrich@redhat.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+(cherry picked from commit 68ba54c2298604146be83cae144dafd1cfd1fe2d)
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
+(cherry picked from commit 7ada55e3fcd16e00773d3918955b2b945b7f063a)
+(cherry picked from commit 44a58e304fd06155a56b650927728af01bbc647d)
+---
+ grub-core/commands/search.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/grub-core/commands/search.c b/grub-core/commands/search.c
+index ddda6e7c5..d3180bf66 100644
+--- a/grub-core/commands/search.c
++++ b/grub-core/commands/search.c
+@@ -64,7 +64,7 @@ iterate_device (const char *name, void *data)
+ /* Skip floppy drives when requested. */
+ if (ctx->no_floppy &&
+ name[0] == 'f' && name[1] == 'd' && name[2] >= '0' && name[2] <= '9')
+- return 1;
++ return 0;
+
+ #ifdef DO_SEARCH_FS_UUID
+ #define compare_fn grub_strcasecmp
diff --git a/SOURCES/0493-search-new-efidisk-only-option-on-EFI-systems.patch b/SOURCES/0493-search-new-efidisk-only-option-on-EFI-systems.patch
new file mode 100644
index 0000000..c5832bf
--- /dev/null
+++ b/SOURCES/0493-search-new-efidisk-only-option-on-EFI-systems.patch
@@ -0,0 +1,170 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Renaud=20M=C3=A9trich?= <rmetrich@redhat.com>
+Date: Tue, 8 Feb 2022 08:39:11 +0100
+Subject: [PATCH] search: new --efidisk-only option on EFI systems
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When using 'search' on EFI systems, we sometimes want to exclude devices
+that are not EFI disks (e.g. md, lvm).
+This is typically used when wanting to chainload when having a software
+raid (md) for EFI partition:
+with no option, 'search --file /EFI/redhat/shimx64.efi' sets root envvar
+to 'md/boot_efi' which cannot be used for chainloading since there is no
+effective EFI device behind.
+
+This commit also refactors handling of --no-floppy option.
+
+Signed-off-by: Renaud Métrich <rmetrich@redhat.com>
+[rharwood: apply rmetrich's flags initialization fix]
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
+(cherry picked from commit fdd8396f4fa750bbbabd4298f2593942f2b84710)
+(cherry picked from commit bea473b58726705bb83a3db88f52d46fdcc6150e)
+---
+ grub-core/commands/search.c | 27 +++++++++++++++++++++++----
+ grub-core/commands/search_wrap.c | 18 ++++++++++++------
+ include/grub/search.h | 15 ++++++++++++---
+ 3 files changed, 47 insertions(+), 13 deletions(-)
+
+diff --git a/grub-core/commands/search.c b/grub-core/commands/search.c
+index d3180bf66..2036a756b 100644
+--- a/grub-core/commands/search.c
++++ b/grub-core/commands/search.c
+@@ -47,7 +47,7 @@ struct search_ctx
+ {
+ const char *key;
+ const char *var;
+- int no_floppy;
++ enum search_flags flags;
+ char **hints;
+ unsigned nhints;
+ int count;
+@@ -62,10 +62,29 @@ iterate_device (const char *name, void *data)
+ int found = 0;
+
+ /* Skip floppy drives when requested. */
+- if (ctx->no_floppy &&
++ if (ctx->flags & SEARCH_FLAGS_NO_FLOPPY &&
+ name[0] == 'f' && name[1] == 'd' && name[2] >= '0' && name[2] <= '9')
+ return 0;
+
++ /* Limit to EFI disks when requested. */
++ if (ctx->flags & SEARCH_FLAGS_EFIDISK_ONLY)
++ {
++ grub_device_t dev;
++ dev = grub_device_open (name);
++ if (! dev)
++ {
++ grub_errno = GRUB_ERR_NONE;
++ return 0;
++ }
++ if (! dev->disk || dev->disk->dev->id != GRUB_DISK_DEVICE_EFIDISK_ID)
++ {
++ grub_device_close (dev);
++ grub_errno = GRUB_ERR_NONE;
++ return 0;
++ }
++ grub_device_close (dev);
++ }
++
+ #ifdef DO_SEARCH_FS_UUID
+ #define compare_fn grub_strcasecmp
+ #else
+@@ -261,13 +280,13 @@ try (struct search_ctx *ctx)
+ }
+
+ void
+-FUNC_NAME (const char *key, const char *var, int no_floppy,
++FUNC_NAME (const char *key, const char *var, enum search_flags flags,
+ char **hints, unsigned nhints)
+ {
+ struct search_ctx ctx = {
+ .key = key,
+ .var = var,
+- .no_floppy = no_floppy,
++ .flags = flags,
+ .hints = hints,
+ .nhints = nhints,
+ .count = 0,
+diff --git a/grub-core/commands/search_wrap.c b/grub-core/commands/search_wrap.c
+index 47fc8eb99..0b62acf85 100644
+--- a/grub-core/commands/search_wrap.c
++++ b/grub-core/commands/search_wrap.c
+@@ -40,6 +40,7 @@ static const struct grub_arg_option options[] =
+ N_("Set a variable to the first device found."), N_("VARNAME"),
+ ARG_TYPE_STRING},
+ {"no-floppy", 'n', 0, N_("Do not probe any floppy drive."), 0, 0},
++ {"efidisk-only", 0, 0, N_("Only probe EFI disks."), 0, 0},
+ {"hint", 'h', GRUB_ARG_OPTION_REPEATABLE,
+ N_("First try the device HINT. If HINT ends in comma, "
+ "also try subpartitions"), N_("HINT"), ARG_TYPE_STRING},
+@@ -73,6 +74,7 @@ enum options
+ SEARCH_FS_UUID,
+ SEARCH_SET,
+ SEARCH_NO_FLOPPY,
++ SEARCH_EFIDISK_ONLY,
+ SEARCH_HINT,
+ SEARCH_HINT_IEEE1275,
+ SEARCH_HINT_BIOS,
+@@ -89,6 +91,7 @@ grub_cmd_search (grub_extcmd_context_t ctxt, int argc, char **args)
+ const char *id = 0;
+ int i = 0, j = 0, nhints = 0;
+ char **hints = NULL;
++ enum search_flags flags = 0;
+
+ if (state[SEARCH_HINT].set)
+ for (i = 0; state[SEARCH_HINT].args[i]; i++)
+@@ -180,15 +183,18 @@ grub_cmd_search (grub_extcmd_context_t ctxt, int argc, char **args)
+ goto out;
+ }
+
++ if (state[SEARCH_NO_FLOPPY].set)
++ flags |= SEARCH_FLAGS_NO_FLOPPY;
++
++ if (state[SEARCH_EFIDISK_ONLY].set)
++ flags |= SEARCH_FLAGS_EFIDISK_ONLY;
++
+ if (state[SEARCH_LABEL].set)
+- grub_search_label (id, var, state[SEARCH_NO_FLOPPY].set,
+- hints, nhints);
++ grub_search_label (id, var, flags, hints, nhints);
+ else if (state[SEARCH_FS_UUID].set)
+- grub_search_fs_uuid (id, var, state[SEARCH_NO_FLOPPY].set,
+- hints, nhints);
++ grub_search_fs_uuid (id, var, flags, hints, nhints);
+ else if (state[SEARCH_FILE].set)
+- grub_search_fs_file (id, var, state[SEARCH_NO_FLOPPY].set,
+- hints, nhints);
++ grub_search_fs_file (id, var, flags, hints, nhints);
+ else
+ grub_error (GRUB_ERR_INVALID_COMMAND, "unspecified search type");
+
+diff --git a/include/grub/search.h b/include/grub/search.h
+index d80347df3..4190aeb2c 100644
+--- a/include/grub/search.h
++++ b/include/grub/search.h
+@@ -19,11 +19,20 @@
+ #ifndef GRUB_SEARCH_HEADER
+ #define GRUB_SEARCH_HEADER 1
+
+-void grub_search_fs_file (const char *key, const char *var, int no_floppy,
++enum search_flags
++ {
++ SEARCH_FLAGS_NO_FLOPPY = 1,
++ SEARCH_FLAGS_EFIDISK_ONLY = 2
++ };
++
++void grub_search_fs_file (const char *key, const char *var,
++ enum search_flags flags,
+ char **hints, unsigned nhints);
+-void grub_search_fs_uuid (const char *key, const char *var, int no_floppy,
++void grub_search_fs_uuid (const char *key, const char *var,
++ enum search_flags flags,
+ char **hints, unsigned nhints);
+-void grub_search_label (const char *key, const char *var, int no_floppy,
++void grub_search_label (const char *key, const char *var,
++ enum search_flags flags,
+ char **hints, unsigned nhints);
+
+ #endif
diff --git a/SOURCES/0494-efi-new-connectefi-command.patch b/SOURCES/0494-efi-new-connectefi-command.patch
new file mode 100644
index 0000000..de905f7
--- /dev/null
+++ b/SOURCES/0494-efi-new-connectefi-command.patch
@@ -0,0 +1,397 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Renaud=20M=C3=A9trich?= <rmetrich@redhat.com>
+Date: Tue, 15 Feb 2022 14:05:22 +0100
+Subject: [PATCH] efi: new 'connectefi' command
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When efi.quickboot is enabled on VMWare (which is the default for
+hardware release 16 and later), it may happen that not all EFI devices
+are connected. Due to this, browsing the devices in make_devices() just
+fails to find devices, in particular disks or partitions for a given
+disk.
+This typically happens when network booting, then trying to chainload to
+local disk (this is used in deployment tools such as Red Hat Satellite),
+which is done through using the following grub.cfg snippet:
+-------- 8< ---------------- 8< ---------------- 8< --------
+unset prefix
+search --file --set=prefix /EFI/redhat/grubx64.efi
+if [ -n "$prefix" ]; then
+ chainloader ($prefix)/EFI/redhat/grubx64/efi
+...
+-------- 8< ---------------- 8< ---------------- 8< --------
+
+With efi.quickboot, none of the devices are connected, causing "search"
+to fail. Sometimes devices are connected but not the partition of the
+disk matching $prefix, causing partition to not be found by
+"chainloader".
+
+This patch introduces a new "connectefi pciroot|scsi" command which
+recursively connects all EFI devices starting from a given controller
+type:
+- if 'pciroot' is specified, recursion is performed for all PCI root
+ handles
+- if 'scsi' is specified, recursion is performed for all SCSI I/O
+ handles (recommended usage to avoid connecting unwanted handles which
+ may impact Grub performances)
+
+Typical grub.cfg snippet would then be:
+-------- 8< ---------------- 8< ---------------- 8< --------
+connectefi scsi
+unset prefix
+search --file --set=prefix /EFI/redhat/grubx64.efi
+if [ -n "$prefix" ]; then
+ chainloader ($prefix)/EFI/redhat/grubx64/efi
+...
+-------- 8< ---------------- 8< ---------------- 8< --------
+
+The code is easily extensible to handle other arguments in the future if
+needed.
+
+Signed-off-by: Renaud Métrich <rmetrich@redhat.com>
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
+(cherry picked from commit cc972c27314c841f80ab0fe8318fae06f078c680)
+(cherry picked from commit 84b0c3f965a3918be64ca850139bea7c32d23ae9)
+---
+ grub-core/Makefile.core.def | 6 ++
+ grub-core/commands/efi/connectefi.c | 205 ++++++++++++++++++++++++++++++++++++
+ grub-core/commands/efi/lsefi.c | 1 +
+ grub-core/disk/efi/efidisk.c | 13 +++
+ grub-core/kern/efi/efi.c | 13 +++
+ include/grub/efi/disk.h | 2 +
+ include/grub/efi/efi.h | 5 +
+ NEWS | 2 +-
+ 8 files changed, 246 insertions(+), 1 deletion(-)
+ create mode 100644 grub-core/commands/efi/connectefi.c
+
+diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
+index 612df2e9c..ef06f8c95 100644
+--- a/grub-core/Makefile.core.def
++++ b/grub-core/Makefile.core.def
+@@ -779,6 +779,12 @@ module = {
+ enable = efi;
+ };
+
++module = {
++ name = connectefi;
++ common = commands/efi/connectefi.c;
++ enable = efi;
++};
++
+ module = {
+ name = blocklist;
+ common = commands/blocklist.c;
+diff --git a/grub-core/commands/efi/connectefi.c b/grub-core/commands/efi/connectefi.c
+new file mode 100644
+index 000000000..8ab75bd51
+--- /dev/null
++++ b/grub-core/commands/efi/connectefi.c
+@@ -0,0 +1,205 @@
++/*
++ * GRUB -- GRand Unified Bootloader
++ * Copyright (C) 2022 Free Software Foundation, Inc.
++ *
++ * GRUB is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation, either version 3 of the License, or
++ * (at your option) any later version.
++ *
++ * GRUB is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
++ */
++#include <grub/types.h>
++#include <grub/mm.h>
++#include <grub/misc.h>
++#include <grub/efi/api.h>
++#include <grub/efi/pci.h>
++#include <grub/efi/efi.h>
++#include <grub/command.h>
++#include <grub/err.h>
++#include <grub/i18n.h>
++
++GRUB_MOD_LICENSE ("GPLv3+");
++
++typedef struct handle_list
++{
++ grub_efi_handle_t handle;
++ struct handle_list *next;
++} handle_list_t;
++
++static handle_list_t *already_handled = NULL;
++
++static grub_err_t
++add_handle (grub_efi_handle_t handle)
++{
++ handle_list_t *e;
++ e = grub_malloc (sizeof (*e));
++ if (! e)
++ return grub_errno;
++ e->handle = handle;
++ e->next = already_handled;
++ already_handled = e;
++ return GRUB_ERR_NONE;
++}
++
++static int
++is_in_list (grub_efi_handle_t handle)
++{
++ handle_list_t *e;
++ for (e = already_handled; e != NULL; e = e->next)
++ if (e->handle == handle)
++ return 1;
++ return 0;
++}
++
++static void
++free_handle_list (void)
++{
++ handle_list_t *e;
++ while ((e = already_handled) != NULL)
++ {
++ already_handled = already_handled->next;
++ grub_free (e);
++ }
++}
++
++typedef enum searched_item_flag
++{
++ SEARCHED_ITEM_FLAG_LOOP = 1,
++ SEARCHED_ITEM_FLAG_RECURSIVE = 2
++} searched_item_flags;
++
++typedef struct searched_item
++{
++ grub_efi_guid_t guid;
++ const char *name;
++ searched_item_flags flags;
++} searched_items;
++
++static grub_err_t
++grub_cmd_connectefi (grub_command_t cmd __attribute__ ((unused)),
++ int argc, char **args)
++{
++ unsigned s;
++ searched_items pciroot_items[] =
++ {
++ { GRUB_EFI_PCI_ROOT_IO_GUID, "PCI root", SEARCHED_ITEM_FLAG_RECURSIVE }
++ };
++ searched_items scsi_items[] =
++ {
++ { GRUB_EFI_PCI_ROOT_IO_GUID, "PCI root", 0 },
++ { GRUB_EFI_PCI_IO_GUID, "PCI", SEARCHED_ITEM_FLAG_LOOP },
++ { GRUB_EFI_SCSI_IO_PROTOCOL_GUID, "SCSI I/O", SEARCHED_ITEM_FLAG_RECURSIVE }
++ };
++ searched_items *items = NULL;
++ unsigned nitems = 0;
++ grub_err_t grub_err = GRUB_ERR_NONE;
++ unsigned total_connected = 0;
++
++ if (argc != 1)
++ return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("one argument expected"));
++
++ if (grub_strcmp(args[0], N_("pciroot")) == 0)
++ {
++ items = pciroot_items;
++ nitems = ARRAY_SIZE (pciroot_items);
++ }
++ else if (grub_strcmp(args[0], N_("scsi")) == 0)
++ {
++ items = scsi_items;
++ nitems = ARRAY_SIZE (scsi_items);
++ }
++ else
++ return grub_error (GRUB_ERR_BAD_ARGUMENT,
++ N_("unexpected argument `%s'"), args[0]);
++
++ for (s = 0; s < nitems; s++)
++ {
++ grub_efi_handle_t *handles;
++ grub_efi_uintn_t num_handles;
++ unsigned i, connected = 0, loop = 0;
++
++loop:
++ loop++;
++ grub_dprintf ("efi", "step '%s' loop %d:\n", items[s].name, loop);
++
++ handles = grub_efi_locate_handle (GRUB_EFI_BY_PROTOCOL,
++ &items[s].guid, 0, &num_handles);
++
++ if (!handles)
++ continue;
++
++ for (i = 0; i < num_handles; i++)
++ {
++ grub_efi_handle_t handle = handles[i];
++ grub_efi_status_t status;
++ unsigned j;
++
++ /* Skip already handled handles */
++ if (is_in_list (handle))
++ {
++ grub_dprintf ("efi", " handle %p: already processed\n",
++ handle);
++ continue;
++ }
++
++ status = grub_efi_connect_controller(handle, NULL, NULL,
++ items[s].flags & SEARCHED_ITEM_FLAG_RECURSIVE ? 1 : 0);
++ if (status == GRUB_EFI_SUCCESS)
++ {
++ connected++;
++ total_connected++;
++ grub_dprintf ("efi", " handle %p: connected\n", handle);
++ }
++ else
++ grub_dprintf ("efi", " handle %p: failed to connect (%d)\n",
++ handle, (grub_efi_int8_t) status);
++
++ if ((grub_err = add_handle (handle)) != GRUB_ERR_NONE)
++ break; /* fatal */
++ }
++
++ grub_free (handles);
++ if (grub_err != GRUB_ERR_NONE)
++ break; /* fatal */
++
++ if (items[s].flags & SEARCHED_ITEM_FLAG_LOOP && connected)
++ {
++ connected = 0;
++ goto loop;
++ }
++
++ free_handle_list ();
++ }
++
++ free_handle_list ();
++
++ if (total_connected)
++ grub_efidisk_reenumerate_disks ();
++
++ return grub_err;
++}
++
++static grub_command_t cmd;
++
++GRUB_MOD_INIT(connectefi)
++{
++ cmd = grub_register_command ("connectefi", grub_cmd_connectefi,
++ N_("pciroot|scsi"),
++ N_("Connect EFI handles."
++ " If 'pciroot' is specified, connect PCI"
++ " root EFI handles recursively."
++ " If 'scsi' is specified, connect SCSI"
++ " I/O EFI handles recursively."));
++}
++
++GRUB_MOD_FINI(connectefi)
++{
++ grub_unregister_command (cmd);
++}
+diff --git a/grub-core/commands/efi/lsefi.c b/grub-core/commands/efi/lsefi.c
+index d1ce99af4..f2d2430e6 100644
+--- a/grub-core/commands/efi/lsefi.c
++++ b/grub-core/commands/efi/lsefi.c
+@@ -19,6 +19,7 @@
+ #include <grub/mm.h>
+ #include <grub/misc.h>
+ #include <grub/efi/api.h>
++#include <grub/efi/disk.h>
+ #include <grub/efi/edid.h>
+ #include <grub/efi/pci.h>
+ #include <grub/efi/efi.h>
+diff --git a/grub-core/disk/efi/efidisk.c b/grub-core/disk/efi/efidisk.c
+index 5d2400f66..720a23fcc 100644
+--- a/grub-core/disk/efi/efidisk.c
++++ b/grub-core/disk/efi/efidisk.c
+@@ -390,6 +390,19 @@ enumerate_disks (void)
+ free_devices (devices);
+ }
+
++void
++grub_efidisk_reenumerate_disks (void)
++{
++ free_devices (fd_devices);
++ free_devices (hd_devices);
++ free_devices (cd_devices);
++ fd_devices = 0;
++ hd_devices = 0;
++ cd_devices = 0;
++
++ enumerate_disks ();
++}
++
+ static int
+ grub_efidisk_iterate (grub_disk_dev_iterate_hook_t hook, void *hook_data,
+ grub_disk_pull_t pull)
+diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
+index 4b95a4004..286395645 100644
+--- a/grub-core/kern/efi/efi.c
++++ b/grub-core/kern/efi/efi.c
+@@ -95,6 +95,19 @@ grub_efi_locate_handle (grub_efi_locate_search_type_t search_type,
+ return buffer;
+ }
+
++grub_efi_status_t
++grub_efi_connect_controller (grub_efi_handle_t controller_handle,
++ grub_efi_handle_t *driver_image_handle,
++ grub_efi_device_path_protocol_t *remaining_device_path,
++ grub_efi_boolean_t recursive)
++{
++ grub_efi_boot_services_t *b;
++
++ b = grub_efi_system_table->boot_services;
++ return efi_call_4 (b->connect_controller, controller_handle,
++ driver_image_handle, remaining_device_path, recursive);
++}
++
+ void *
+ grub_efi_open_protocol (grub_efi_handle_t handle,
+ grub_efi_guid_t *protocol,
+diff --git a/include/grub/efi/disk.h b/include/grub/efi/disk.h
+index 254475c84..6845c2f1f 100644
+--- a/include/grub/efi/disk.h
++++ b/include/grub/efi/disk.h
+@@ -27,6 +27,8 @@ grub_efi_handle_t
+ EXPORT_FUNC(grub_efidisk_get_device_handle) (grub_disk_t disk);
+ char *EXPORT_FUNC(grub_efidisk_get_device_name) (grub_efi_handle_t *handle);
+
++void EXPORT_FUNC(grub_efidisk_reenumerate_disks) (void);
++
+ void grub_efidisk_init (void);
+ void grub_efidisk_fini (void);
+
+diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
+index 570a69361..4411ffa16 100644
+--- a/include/grub/efi/efi.h
++++ b/include/grub/efi/efi.h
+@@ -36,6 +36,11 @@ EXPORT_FUNC(grub_efi_locate_handle) (grub_efi_locate_search_type_t search_type,
+ grub_efi_guid_t *protocol,
+ void *search_key,
+ grub_efi_uintn_t *num_handles);
++grub_efi_status_t
++EXPORT_FUNC(grub_efi_connect_controller) (grub_efi_handle_t controller_handle,
++ grub_efi_handle_t *driver_image_handle,
++ grub_efi_device_path_protocol_t *remaining_device_path,
++ grub_efi_boolean_t recursive);
+ void *EXPORT_FUNC(grub_efi_open_protocol) (grub_efi_handle_t handle,
+ grub_efi_guid_t *protocol,
+ grub_efi_uint32_t attributes);
+diff --git a/NEWS b/NEWS
+index 2ebd54e78..b04041507 100644
+--- a/NEWS
++++ b/NEWS
+@@ -66,7 +66,7 @@ New in 2.02:
+ * Prefer pmtimer for TSC calibration.
+
+ * New/improved platform support:
+- * New `efifwsetup' and `lsefi' commands on EFI platforms.
++ * New `efifwsetup', `lsefi' and `connectefi` commands on EFI platforms.
+ * New `cmosdump' and `cmosset' commands on platforms with CMOS support.
+ * New command `pcidump' for PCI platforms.
+ * Improve opcode parsing in ACPI halt implementation.
diff --git a/SOURCES/0495-Try-to-pick-better-locations-for-kernel-and-initrd.patch b/SOURCES/0495-Try-to-pick-better-locations-for-kernel-and-initrd.patch
new file mode 100644
index 0000000..2d48c02
--- /dev/null
+++ b/SOURCES/0495-Try-to-pick-better-locations-for-kernel-and-initrd.patch
@@ -0,0 +1,203 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Thu, 11 Jul 2019 17:17:02 +0200
+Subject: [PATCH] Try to pick better locations for kernel and initrd
+
+- Don't limit allocations on 64-bit platforms to < 0x[37f]fffffff if
+ we're using the "large" code model ; use __UINTPTR_MAX__.
+- Get the comparison right to check the address we've allocated.
+- Fix the allocation for the command line as well.
+
+*But*, when we did this some systems started failing badly; coudln't
+parse partition tables, etc. What's going on here is the disk controller
+is silently failing DMAs to addresses above 4GB, so we're trying to parse
+uninitialized (or HW zeroed) ram when looking for the partition table,
+etc.
+
+So to limit this, we make grub_malloc() pick addresses below 4GB on
+x86_64, but the direct EFI page allocation functions can get addresses
+above that.
+
+Additionally, we now try to locate kernel+initrd+cmdline+etc below
+0x7fffffff, and if they're too big to fit any memory window there, then
+we try a higher address.
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+(cherry picked from commit 9035d4f9ea2f26a9d4412a0918d597ceb5365442)
+
+Conflicts:
+ grub-core/loader/i386/efi/linux.c
+ Context diffs in includes.
+
+Signed-off-by: Lenny Szubowicz <lszubowi@redhat.com>
+---
+ grub-core/kern/efi/mm.c | 8 ++++----
+ grub-core/loader/i386/efi/linux.c | 24 +++++++++++++++++-------
+ include/grub/arm/efi/memory.h | 1 +
+ include/grub/arm64/efi/memory.h | 1 +
+ include/grub/i386/efi/memory.h | 1 +
+ include/grub/ia64/efi/memory.h | 1 +
+ include/grub/x86_64/efi/memory.h | 4 +++-
+ 7 files changed, 28 insertions(+), 12 deletions(-)
+
+diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
+index 2d9c9032b..9e76f23e5 100644
+--- a/grub-core/kern/efi/mm.c
++++ b/grub-core/kern/efi/mm.c
+@@ -122,7 +122,7 @@ grub_efi_allocate_pages_max (grub_efi_physical_address_t max,
+ grub_efi_boot_services_t *b;
+ grub_efi_physical_address_t address = max;
+
+- if (max > 0xffffffff)
++ if (max > GRUB_EFI_MAX_USABLE_ADDRESS)
+ return 0;
+
+ b = grub_efi_system_table->boot_services;
+@@ -472,7 +472,7 @@ filter_memory_map (grub_efi_memory_descriptor_t *memory_map,
+ {
+ if (desc->type == GRUB_EFI_CONVENTIONAL_MEMORY
+ #if 1
+- && desc->physical_start <= GRUB_EFI_MAX_USABLE_ADDRESS
++ && desc->physical_start <= GRUB_EFI_MAX_ALLOCATION_ADDRESS
+ #endif
+ && desc->physical_start + PAGES_TO_BYTES (desc->num_pages) > 0x100000
+ && desc->num_pages != 0)
+@@ -490,9 +490,9 @@ filter_memory_map (grub_efi_memory_descriptor_t *memory_map,
+ #if 1
+ if (BYTES_TO_PAGES (filtered_desc->physical_start)
+ + filtered_desc->num_pages
+- > BYTES_TO_PAGES_DOWN (GRUB_EFI_MAX_USABLE_ADDRESS))
++ > BYTES_TO_PAGES_DOWN (GRUB_EFI_MAX_ALLOCATION_ADDRESS))
+ filtered_desc->num_pages
+- = (BYTES_TO_PAGES_DOWN (GRUB_EFI_MAX_USABLE_ADDRESS)
++ = (BYTES_TO_PAGES_DOWN (GRUB_EFI_MAX_ALLOCATION_ADDRESS)
+ - BYTES_TO_PAGES (filtered_desc->physical_start));
+ #endif
+
+diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
+index 576f8c07e..c5fdf522b 100644
+--- a/grub-core/loader/i386/efi/linux.c
++++ b/grub-core/loader/i386/efi/linux.c
+@@ -27,6 +27,7 @@
+ #include <grub/lib/cmdline.h>
+ #include <grub/efi/efi.h>
+ #include <grub/efi/linux.h>
++#include <grub/cpu/efi/memory.h>
+ #include <grub/tpm.h>
+ #include <grub/safemath.h>
+
+@@ -113,7 +114,9 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+ }
+ }
+
+- initrd_mem = grub_efi_allocate_pages_max (0x3fffffff, BYTES_TO_PAGES(size));
++ initrd_mem = grub_efi_allocate_pages_max (GRUB_EFI_MAX_ALLOCATION_ADDRESS, BYTES_TO_PAGES(size));
++ if (!initrd_mem)
++ initrd_mem = grub_efi_allocate_pages_max (GRUB_EFI_MAX_USABLE_ADDRESS, BYTES_TO_PAGES(size));
+ if (!initrd_mem)
+ {
+ grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("can't allocate initrd"));
+@@ -217,8 +220,11 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+ }
+ }
+
+- params = grub_efi_allocate_pages_max (0x3fffffff,
++ params = grub_efi_allocate_pages_max (GRUB_EFI_MAX_ALLOCATION_ADDRESS,
+ BYTES_TO_PAGES(sizeof(*params)));
++ if (!params)
++ params = grub_efi_allocate_pages_max (GRUB_EFI_MAX_USABLE_ADDRESS,
++ BYTES_TO_PAGES(sizeof(*params)));
+ if (! params)
+ {
+ grub_error (GRUB_ERR_OUT_OF_MEMORY, "cannot allocate kernel parameters");
+@@ -288,8 +294,11 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+ #endif
+
+ grub_dprintf ("linux", "setting up cmdline\n");
+- linux_cmdline = grub_efi_allocate_pages_max(0x3fffffff,
+- BYTES_TO_PAGES(lh->cmdline_size + 1));
++ linux_cmdline = grub_efi_allocate_pages_max(GRUB_EFI_MAX_ALLOCATION_ADDRESS,
++ BYTES_TO_PAGES(lh->cmdline_size + 1));
++ if (!linux_cmdline)
++ linux_cmdline = grub_efi_allocate_pages_max(GRUB_EFI_MAX_USABLE_ADDRESS,
++ BYTES_TO_PAGES(lh->cmdline_size + 1));
+ if (!linux_cmdline)
+ {
+ grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("can't allocate cmdline"));
+@@ -316,11 +325,12 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+
+ kernel_mem = grub_efi_allocate_pages_max(lh->pref_address,
+ BYTES_TO_PAGES(lh->init_size));
+-
+ if (!kernel_mem)
+- kernel_mem = grub_efi_allocate_pages_max(0x3fffffff,
++ kernel_mem = grub_efi_allocate_pages_max(GRUB_EFI_MAX_ALLOCATION_ADDRESS,
++ BYTES_TO_PAGES(lh->init_size));
++ if (!kernel_mem)
++ kernel_mem = grub_efi_allocate_pages_max(GRUB_EFI_MAX_USABLE_ADDRESS,
+ BYTES_TO_PAGES(lh->init_size));
+-
+ if (!kernel_mem)
+ {
+ grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("can't allocate kernel"));
+diff --git a/include/grub/arm/efi/memory.h b/include/grub/arm/efi/memory.h
+index 2c64918e3..a4c2ec835 100644
+--- a/include/grub/arm/efi/memory.h
++++ b/include/grub/arm/efi/memory.h
+@@ -2,5 +2,6 @@
+ #include <grub/efi/memory.h>
+
+ #define GRUB_EFI_MAX_USABLE_ADDRESS 0xffffffff
++#define GRUB_EFI_MAX_ALLOCATION_ADDRESS GRUB_EFI_MAX_USABLE_ADDRESS
+
+ #endif /* ! GRUB_MEMORY_CPU_HEADER */
+diff --git a/include/grub/arm64/efi/memory.h b/include/grub/arm64/efi/memory.h
+index c6cb32417..acb61dca4 100644
+--- a/include/grub/arm64/efi/memory.h
++++ b/include/grub/arm64/efi/memory.h
+@@ -2,5 +2,6 @@
+ #include <grub/efi/memory.h>
+
+ #define GRUB_EFI_MAX_USABLE_ADDRESS 0xffffffffffffULL
++#define GRUB_EFI_MAX_ALLOCATION_ADDRESS GRUB_EFI_MAX_USABLE_ADDRESS
+
+ #endif /* ! GRUB_MEMORY_CPU_HEADER */
+diff --git a/include/grub/i386/efi/memory.h b/include/grub/i386/efi/memory.h
+index 2c64918e3..a4c2ec835 100644
+--- a/include/grub/i386/efi/memory.h
++++ b/include/grub/i386/efi/memory.h
+@@ -2,5 +2,6 @@
+ #include <grub/efi/memory.h>
+
+ #define GRUB_EFI_MAX_USABLE_ADDRESS 0xffffffff
++#define GRUB_EFI_MAX_ALLOCATION_ADDRESS GRUB_EFI_MAX_USABLE_ADDRESS
+
+ #endif /* ! GRUB_MEMORY_CPU_HEADER */
+diff --git a/include/grub/ia64/efi/memory.h b/include/grub/ia64/efi/memory.h
+index 2c64918e3..a4c2ec835 100644
+--- a/include/grub/ia64/efi/memory.h
++++ b/include/grub/ia64/efi/memory.h
+@@ -2,5 +2,6 @@
+ #include <grub/efi/memory.h>
+
+ #define GRUB_EFI_MAX_USABLE_ADDRESS 0xffffffff
++#define GRUB_EFI_MAX_ALLOCATION_ADDRESS GRUB_EFI_MAX_USABLE_ADDRESS
+
+ #endif /* ! GRUB_MEMORY_CPU_HEADER */
+diff --git a/include/grub/x86_64/efi/memory.h b/include/grub/x86_64/efi/memory.h
+index 46e9145a3..e81cfb322 100644
+--- a/include/grub/x86_64/efi/memory.h
++++ b/include/grub/x86_64/efi/memory.h
+@@ -2,9 +2,11 @@
+ #include <grub/efi/memory.h>
+
+ #if defined (__code_model_large__)
+-#define GRUB_EFI_MAX_USABLE_ADDRESS 0xffffffff
++#define GRUB_EFI_MAX_USABLE_ADDRESS __UINTPTR_MAX__
++#define GRUB_EFI_MAX_ALLOCATION_ADDRESS 0x7fffffff
+ #else
+ #define GRUB_EFI_MAX_USABLE_ADDRESS 0x7fffffff
++#define GRUB_EFI_MAX_ALLOCATION_ADDRESS GRUB_EFI_MAX_USABLE_ADDRESS
+ #endif
+
+ #endif /* ! GRUB_MEMORY_CPU_HEADER */
diff --git a/SOURCES/0496-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch b/SOURCES/0496-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch
new file mode 100644
index 0000000..5483204
--- /dev/null
+++ b/SOURCES/0496-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch
@@ -0,0 +1,109 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Fri, 12 Jul 2019 09:53:32 +0200
+Subject: [PATCH] x86-efi: Use bounce buffers for reading to addresses > 4GB
+
+Lots of machines apparently can't DMA correctly above 4GB during UEFI,
+so use bounce buffers for the initramfs read.
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+(cherry picked from commit 7765a790dee00f2e0d414cf3a3d016c493cf0d9b)
+
+Conflicts:
+ grub-core/loader/i386/efi/linux.c
+ git cherry-pick thought delete of prior def of MIN was a
+ conflict.
+
+Signed-off-by: Lenny Szubowicz <lszubowi@redhat.com>
+---
+ grub-core/loader/i386/efi/linux.c | 52 +++++++++++++++++++++++++++++++++------
+ 1 file changed, 45 insertions(+), 7 deletions(-)
+
+diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
+index c5fdf522b..73cd838e9 100644
+--- a/grub-core/loader/i386/efi/linux.c
++++ b/grub-core/loader/i386/efi/linux.c
+@@ -37,11 +37,16 @@ static grub_dl_t my_mod;
+ static int loaded;
+ static void *kernel_mem;
+ static grub_uint64_t kernel_size;
+-static grub_uint8_t *initrd_mem;
++static void *initrd_mem;
+ static grub_uint32_t handover_offset;
+ struct linux_kernel_params *params;
+ static char *linux_cmdline;
+
++#define MIN(a, b) \
++ ({ typeof (a) _a = (a); \
++ typeof (b) _b = (b); \
++ _a < _b ? _a : _b; })
++
+ #define BYTES_TO_PAGES(bytes) (((bytes) + 0xfff) >> 12)
+
+ static grub_err_t
+@@ -75,6 +80,44 @@ grub_linuxefi_unload (void)
+ return GRUB_ERR_NONE;
+ }
+
++#define BOUNCE_BUFFER_MAX 0x10000000ull
++
++static grub_ssize_t
++read(grub_file_t file, grub_uint8_t *bufp, grub_size_t len)
++{
++ grub_ssize_t bufpos = 0;
++ static grub_size_t bbufsz = 0;
++ static char *bbuf = NULL;
++
++ if (bbufsz == 0)
++ bbufsz = MIN(BOUNCE_BUFFER_MAX, len);
++
++ while (!bbuf && bbufsz)
++ {
++ bbuf = grub_malloc(bbufsz);
++ if (!bbuf)
++ bbufsz >>= 1;
++ }
++ if (!bbuf)
++ grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("cannot allocate bounce buffer"));
++
++ while (bufpos < (long long)len)
++ {
++ grub_ssize_t sz;
++
++ sz = grub_file_read (file, bbuf, MIN(bbufsz, len - bufpos));
++ if (sz < 0)
++ return sz;
++ if (sz == 0)
++ break;
++
++ grub_memcpy(bufp + bufpos, bbuf, sz);
++ bufpos += sz;
++ }
++
++ return bufpos;
++}
++
+ static grub_err_t
+ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+ int argc, char *argv[])
+@@ -133,7 +176,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+ for (i = 0; i < nfiles; i++)
+ {
+ grub_ssize_t cursize = grub_file_size (files[i]);
+- if (grub_file_read (files[i], ptr, cursize) != cursize)
++ if (read (files[i], ptr, cursize) != cursize)
+ {
+ if (!grub_errno)
+ grub_error (GRUB_ERR_FILE_READ_ERROR, N_("premature end of file %s"),
+@@ -161,11 +204,6 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+ return grub_errno;
+ }
+
+-#define MIN(a, b) \
+- ({ typeof (a) _a = (a); \
+- typeof (b) _b = (b); \
+- _a < _b ? _a : _b; })
+-
+ static grub_err_t
+ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+ int argc, char *argv[])
diff --git a/SOURCES/0497-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch b/SOURCES/0497-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch
new file mode 100644
index 0000000..4616842
--- /dev/null
+++ b/SOURCES/0497-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch
@@ -0,0 +1,134 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Thu, 13 Sep 2018 14:42:34 -0400
+Subject: [PATCH] x86-efi: Re-arrange grub_cmd_linux() a little bit.
+
+This just helps the next patch be easier to read.
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+(cherry picked from commit 486cdd48889b30b03143c393e59a75ea040b5c40)
+---
+ grub-core/loader/i386/efi/linux.c | 75 +++++++++++++++++++++------------------
+ 1 file changed, 41 insertions(+), 34 deletions(-)
+
+diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
+index 73cd838e9..c9650561f 100644
+--- a/grub-core/loader/i386/efi/linux.c
++++ b/grub-core/loader/i386/efi/linux.c
+@@ -258,32 +258,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+ }
+ }
+
+- params = grub_efi_allocate_pages_max (GRUB_EFI_MAX_ALLOCATION_ADDRESS,
+- BYTES_TO_PAGES(sizeof(*params)));
+- if (!params)
+- params = grub_efi_allocate_pages_max (GRUB_EFI_MAX_USABLE_ADDRESS,
+- BYTES_TO_PAGES(sizeof(*params)));
+- if (! params)
+- {
+- grub_error (GRUB_ERR_OUT_OF_MEMORY, "cannot allocate kernel parameters");
+- goto fail;
+- }
++ lh = (struct linux_i386_kernel_header *)kernel;
++ grub_dprintf ("linux", "original lh is at %p\n", kernel);
+
+- grub_dprintf ("linux", "params = %p\n", params);
+-
+- grub_memset (params, 0, sizeof(*params));
+-
+- setup_header_end_offset = *((grub_uint8_t *)kernel + 0x201);
+- grub_dprintf ("linux", "copying %lu bytes from %p to %p\n",
+- MIN((grub_size_t)0x202+setup_header_end_offset,
+- sizeof (*params)) - 0x1f1,
+- (grub_uint8_t *)kernel + 0x1f1,
+- (grub_uint8_t *)params + 0x1f1);
+- grub_memcpy ((grub_uint8_t *)params + 0x1f1,
+- (grub_uint8_t *)kernel + 0x1f1,
+- MIN((grub_size_t)0x202+setup_header_end_offset,sizeof (*params)) - 0x1f1);
+- lh = (struct linux_i386_kernel_header *)params;
+- grub_dprintf ("linux", "lh is at %p\n", lh);
+ grub_dprintf ("linux", "checking lh->boot_flag\n");
+ if (lh->boot_flag != grub_cpu_to_le16 (0xaa55))
+ {
+@@ -331,6 +308,34 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+ }
+ #endif
+
++ params = grub_efi_allocate_pages_max (GRUB_EFI_MAX_ALLOCATION_ADDRESS,
++ BYTES_TO_PAGES(sizeof(*params)));
++ if (!params)
++ params = grub_efi_allocate_pages_max (GRUB_EFI_MAX_USABLE_ADDRESS,
++ BYTES_TO_PAGES(sizeof(*params)));
++ if (! params)
++ {
++ grub_error (GRUB_ERR_OUT_OF_MEMORY, "cannot allocate kernel parameters");
++ goto fail;
++ }
++
++ grub_dprintf ("linux", "params = %p\n", params);
++
++ grub_memset (params, 0, sizeof(*params));
++
++ setup_header_end_offset = *((grub_uint8_t *)kernel + 0x201);
++ grub_dprintf ("linux", "copying %lu bytes from %p to %p\n",
++ MIN((grub_size_t)0x202+setup_header_end_offset,
++ sizeof (*params)) - 0x1f1,
++ (grub_uint8_t *)kernel + 0x1f1,
++ (grub_uint8_t *)params + 0x1f1);
++ grub_memcpy ((grub_uint8_t *)params + 0x1f1,
++ (grub_uint8_t *)kernel + 0x1f1,
++ MIN((grub_size_t)0x202+setup_header_end_offset,sizeof (*params)) - 0x1f1);
++
++ lh = (struct linux_i386_kernel_header *)params;
++ grub_dprintf ("linux", "new lh is at %p\n", lh);
++
+ grub_dprintf ("linux", "setting up cmdline\n");
+ linux_cmdline = grub_efi_allocate_pages_max(GRUB_EFI_MAX_ALLOCATION_ADDRESS,
+ BYTES_TO_PAGES(lh->cmdline_size + 1));
+@@ -356,8 +361,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+ grub_dprintf ("linux", "setting lh->cmd_line_ptr\n");
+ lh->cmd_line_ptr = (grub_uint32_t)(grub_addr_t)linux_cmdline;
+
+- grub_dprintf ("linux", "computing handover offset\n");
+ handover_offset = lh->handover_offset;
++ grub_dprintf("linux", "handover_offset: %08x\n", handover_offset);
+
+ start = (lh->setup_sects + 1) * 512;
+
+@@ -374,26 +379,28 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+ grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("can't allocate kernel"));
+ goto fail;
+ }
+-
+- grub_dprintf ("linux", "kernel_mem = %lx\n", (unsigned long) kernel_mem);
++ grub_dprintf("linux", "kernel_mem = %p\n", kernel_mem);
+
+ grub_loader_set (grub_linuxefi_boot, grub_linuxefi_unload, 0);
+- loaded=1;
++
++ loaded = 1;
++
+ grub_dprintf ("linux", "setting lh->code32_start to %p\n", kernel_mem);
+ lh->code32_start = (grub_uint32_t)(grub_addr_t) kernel_mem;
+
+ grub_memcpy (kernel_mem, (char *)kernel + start, filelen - start);
+
+- grub_dprintf ("linux", "setting lh->type_of_loader\n");
+ lh->type_of_loader = 0x6;
++ grub_dprintf ("linux", "setting lh->type_of_loader = 0x%02x\n",
++ lh->type_of_loader);
+
+- grub_dprintf ("linux", "setting lh->ext_loader_{type,ver}\n");
+ params->ext_loader_type = 0;
+ params->ext_loader_ver = 2;
+- grub_dprintf("linux", "kernel_mem: %p handover_offset: %08x\n",
+- kernel_mem, handover_offset);
++ grub_dprintf ("linux",
++ "setting lh->ext_loader_{type,ver} = {0x%02x,0x%02x}\n",
++ params->ext_loader_type, params->ext_loader_ver);
+
+- fail:
++fail:
+ if (file)
+ grub_file_close (file);
+
diff --git a/SOURCES/0498-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch b/SOURCES/0498-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch
new file mode 100644
index 0000000..8c3b1e6
--- /dev/null
+++ b/SOURCES/0498-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch
@@ -0,0 +1,259 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Wed, 12 Sep 2018 16:03:55 -0400
+Subject: [PATCH] x86-efi: Make our own allocator for kernel stuff
+
+This helps enable allocations above 4GB.
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+(cherry picked from commit cfea4ae780f8860d472cd2d5a9765ec2fe2adc83)
+---
+ grub-core/loader/i386/efi/linux.c | 167 +++++++++++++++++++++-----------------
+ 1 file changed, 94 insertions(+), 73 deletions(-)
+
+diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
+index c9650561f..5eed2014c 100644
+--- a/grub-core/loader/i386/efi/linux.c
++++ b/grub-core/loader/i386/efi/linux.c
+@@ -49,6 +49,65 @@ static char *linux_cmdline;
+
+ #define BYTES_TO_PAGES(bytes) (((bytes) + 0xfff) >> 12)
+
++struct allocation_choice {
++ grub_efi_physical_address_t addr;
++ grub_efi_allocate_type_t alloc_type;
++};
++
++static struct allocation_choice max_addresses[] =
++ {
++ { GRUB_EFI_MAX_ALLOCATION_ADDRESS, GRUB_EFI_ALLOCATE_MAX_ADDRESS },
++ { GRUB_EFI_MAX_ALLOCATION_ADDRESS, GRUB_EFI_ALLOCATE_MAX_ADDRESS },
++ { GRUB_EFI_MAX_ALLOCATION_ADDRESS, GRUB_EFI_ALLOCATE_MAX_ADDRESS },
++ { 0, 0 }
++ };
++
++static inline void
++kernel_free(void *addr, grub_efi_uintn_t size)
++{
++ if (addr && size)
++ grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)addr,
++ BYTES_TO_PAGES(size));
++}
++
++static void *
++kernel_alloc(grub_efi_uintn_t size, const char * const errmsg)
++{
++ void *addr = 0;
++ unsigned int i;
++ grub_efi_physical_address_t prev_max = 0;
++
++ for (i = 0; max_addresses[i].addr != 0 && addr == 0; i++)
++ {
++ grub_uint64_t max = max_addresses[i].addr;
++ grub_efi_uintn_t pages;
++
++ if (max == prev_max)
++ continue;
++
++ pages = BYTES_TO_PAGES(size);
++ grub_dprintf ("linux", "Trying to allocate %lu pages from %p\n",
++ pages, (void *)max);
++
++ prev_max = max;
++ addr = grub_efi_allocate_pages_real (max, pages,
++ max_addresses[i].alloc_type,
++ GRUB_EFI_LOADER_DATA);
++ if (addr)
++ grub_dprintf ("linux", "Allocated at %p\n", addr);
++ }
++
++ while (grub_error_pop ())
++ {
++ ;
++ }
++
++ if (addr == NULL)
++ grub_error (GRUB_ERR_OUT_OF_MEMORY, "%s", errmsg);
++
++ return addr;
++}
++
+ static grub_err_t
+ grub_linuxefi_boot (void)
+ {
+@@ -64,19 +123,12 @@ grub_linuxefi_unload (void)
+ {
+ grub_dl_unref (my_mod);
+ loaded = 0;
+- if (initrd_mem)
+- grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)initrd_mem,
+- BYTES_TO_PAGES(params->ramdisk_size));
+- if (linux_cmdline)
+- grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)
+- linux_cmdline,
+- BYTES_TO_PAGES(params->cmdline_size + 1));
+- if (kernel_mem)
+- grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)kernel_mem,
+- BYTES_TO_PAGES(kernel_size));
+- if (params)
+- grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)params,
+- BYTES_TO_PAGES(16384));
++
++ kernel_free(initrd_mem, params->ramdisk_size);
++ kernel_free(linux_cmdline, params->cmdline_size + 1);
++ kernel_free(kernel_mem, kernel_size);
++ kernel_free(params, sizeof(*params));
++
+ return GRUB_ERR_NONE;
+ }
+
+@@ -157,19 +209,13 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+ }
+ }
+
+- initrd_mem = grub_efi_allocate_pages_max (GRUB_EFI_MAX_ALLOCATION_ADDRESS, BYTES_TO_PAGES(size));
+- if (!initrd_mem)
+- initrd_mem = grub_efi_allocate_pages_max (GRUB_EFI_MAX_USABLE_ADDRESS, BYTES_TO_PAGES(size));
+- if (!initrd_mem)
+- {
+- grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("can't allocate initrd"));
+- goto fail;
+- }
+-
+- grub_dprintf ("linux", "initrd_mem = %lx\n", (unsigned long) initrd_mem);
++ initrd_mem = kernel_alloc(size, N_("can't allocate initrd"));
++ if (initrd_mem == NULL)
++ goto fail;
++ grub_dprintf ("linux", "initrd_mem = %p\n", initrd_mem);
+
+ params->ramdisk_size = size;
+- params->ramdisk_image = (grub_uint32_t)(grub_addr_t) initrd_mem;
++ params->ramdisk_image = initrd_mem;
+
+ ptr = initrd_mem;
+
+@@ -230,7 +276,6 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+ filelen = grub_file_size (file);
+
+ kernel = grub_malloc(filelen);
+-
+ if (!kernel)
+ {
+ grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("cannot allocate kernel buffer"));
+@@ -289,7 +334,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+ goto fail;
+ }
+
+-#if defined(__x86_64__) || defined(__aarch64__)
++#if defined(__x86_64__)
+ grub_dprintf ("linux", "checking lh->xloadflags\n");
+ if (!(lh->xloadflags & LINUX_XLF_KERNEL_64))
+ {
+@@ -308,17 +353,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+ }
+ #endif
+
+- params = grub_efi_allocate_pages_max (GRUB_EFI_MAX_ALLOCATION_ADDRESS,
+- BYTES_TO_PAGES(sizeof(*params)));
++ params = kernel_alloc (sizeof(*params), "cannot allocate kernel parameters");
+ if (!params)
+- params = grub_efi_allocate_pages_max (GRUB_EFI_MAX_USABLE_ADDRESS,
+- BYTES_TO_PAGES(sizeof(*params)));
+- if (! params)
+- {
+- grub_error (GRUB_ERR_OUT_OF_MEMORY, "cannot allocate kernel parameters");
+- goto fail;
+- }
+-
++ goto fail;
+ grub_dprintf ("linux", "params = %p\n", params);
+
+ grub_memset (params, 0, sizeof(*params));
+@@ -337,19 +374,10 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+ grub_dprintf ("linux", "new lh is at %p\n", lh);
+
+ grub_dprintf ("linux", "setting up cmdline\n");
+- linux_cmdline = grub_efi_allocate_pages_max(GRUB_EFI_MAX_ALLOCATION_ADDRESS,
+- BYTES_TO_PAGES(lh->cmdline_size + 1));
++ linux_cmdline = kernel_alloc (lh->cmdline_size + 1, N_("can't allocate cmdline"));
+ if (!linux_cmdline)
+- linux_cmdline = grub_efi_allocate_pages_max(GRUB_EFI_MAX_USABLE_ADDRESS,
+- BYTES_TO_PAGES(lh->cmdline_size + 1));
+- if (!linux_cmdline)
+- {
+- grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("can't allocate cmdline"));
+- goto fail;
+- }
+-
+- grub_dprintf ("linux", "linux_cmdline = %lx\n",
+- (unsigned long)linux_cmdline);
++ goto fail;
++ grub_dprintf ("linux", "linux_cmdline = %p\n", linux_cmdline);
+
+ grub_memcpy (linux_cmdline, LINUX_IMAGE, sizeof (LINUX_IMAGE));
+ grub_create_loader_cmdline (argc, argv,
+@@ -358,27 +386,24 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+ GRUB_VERIFY_KERNEL_CMDLINE);
+
+ grub_dprintf ("linux", "cmdline:%s\n", linux_cmdline);
+- grub_dprintf ("linux", "setting lh->cmd_line_ptr\n");
+- lh->cmd_line_ptr = (grub_uint32_t)(grub_addr_t)linux_cmdline;
++ grub_dprintf ("linux", "setting lh->cmd_line_ptr to 0x%08x\n",
++ linux_cmdline);
++ lh->cmd_line_ptr = linux_cmdline;
+
+ handover_offset = lh->handover_offset;
+- grub_dprintf("linux", "handover_offset: %08x\n", handover_offset);
++ grub_dprintf("linux", "handover_offset: 0x%08x\n", handover_offset);
+
+ start = (lh->setup_sects + 1) * 512;
+
+- kernel_mem = grub_efi_allocate_pages_max(lh->pref_address,
+- BYTES_TO_PAGES(lh->init_size));
+- if (!kernel_mem)
+- kernel_mem = grub_efi_allocate_pages_max(GRUB_EFI_MAX_ALLOCATION_ADDRESS,
+- BYTES_TO_PAGES(lh->init_size));
+- if (!kernel_mem)
+- kernel_mem = grub_efi_allocate_pages_max(GRUB_EFI_MAX_USABLE_ADDRESS,
+- BYTES_TO_PAGES(lh->init_size));
+- if (!kernel_mem)
++ grub_dprintf ("linux", "lh->pref_address: %p\n", (void *)(grub_addr_t)lh->pref_address);
++ if (lh->pref_address < (grub_uint64_t)GRUB_EFI_MAX_ALLOCATION_ADDRESS)
+ {
+- grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("can't allocate kernel"));
+- goto fail;
++ max_addresses[0].addr = lh->pref_address;
++ max_addresses[0].alloc_type = GRUB_EFI_ALLOCATE_ADDRESS;
+ }
++ kernel_mem = kernel_alloc (lh->init_size, N_("can't allocate kernel"));
++ if (!kernel_mem)
++ goto fail;
+ grub_dprintf("linux", "kernel_mem = %p\n", kernel_mem);
+
+ grub_loader_set (grub_linuxefi_boot, grub_linuxefi_unload, 0);
+@@ -413,18 +438,14 @@ fail:
+ loaded = 0;
+ }
+
+- if (linux_cmdline && lh && !loaded)
+- grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)
+- linux_cmdline,
+- BYTES_TO_PAGES(lh->cmdline_size + 1));
++ if (!loaded)
++ {
++ if (lh)
++ kernel_free (linux_cmdline, lh->cmdline_size + 1);
+
+- if (kernel_mem && !loaded)
+- grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)kernel_mem,
+- BYTES_TO_PAGES(kernel_size));
+-
+- if (params && !loaded)
+- grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)params,
+- BYTES_TO_PAGES(16384));
++ kernel_free (kernel_mem, kernel_size);
++ kernel_free (params, sizeof(*params));
++ }
+
+ return grub_errno;
+ }
diff --git a/SOURCES/0499-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch b/SOURCES/0499-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch
new file mode 100644
index 0000000..133fce1
--- /dev/null
+++ b/SOURCES/0499-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch
@@ -0,0 +1,172 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Wed, 12 Sep 2018 16:12:27 -0400
+Subject: [PATCH] x86-efi: Allow initrd+params+cmdline allocations above 4GB.
+
+This enables everything except the kernel itself to be above 4GB.
+Putting the kernel up there still doesn't work, because of the way
+params->code32_start is used.
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+(cherry picked from commit 2b636967018431b046b625ad4753c8de51f7f6b2)
+---
+ grub-core/loader/i386/efi/linux.c | 67 +++++++++++++++++++++++++++++++++++----
+ include/grub/i386/linux.h | 6 +++-
+ 2 files changed, 65 insertions(+), 8 deletions(-)
+
+diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
+index 5eed2014c..e9d2c85b3 100644
+--- a/grub-core/loader/i386/efi/linux.c
++++ b/grub-core/loader/i386/efi/linux.c
+@@ -54,13 +54,22 @@ struct allocation_choice {
+ grub_efi_allocate_type_t alloc_type;
+ };
+
+-static struct allocation_choice max_addresses[] =
++static struct allocation_choice max_addresses[4] =
+ {
++ /* the kernel overrides this one with pref_address and
++ * GRUB_EFI_ALLOCATE_ADDRESS */
+ { GRUB_EFI_MAX_ALLOCATION_ADDRESS, GRUB_EFI_ALLOCATE_MAX_ADDRESS },
++ /* this one is always below 4GB, which we still *prefer* even if the flag
++ * is set. */
+ { GRUB_EFI_MAX_ALLOCATION_ADDRESS, GRUB_EFI_ALLOCATE_MAX_ADDRESS },
++ /* If the flag in params is set, this one gets changed to be above 4GB. */
+ { GRUB_EFI_MAX_ALLOCATION_ADDRESS, GRUB_EFI_ALLOCATE_MAX_ADDRESS },
+ { 0, 0 }
+ };
++static struct allocation_choice saved_addresses[4];
++
++#define save_addresses() grub_memcpy(saved_addresses, max_addresses, sizeof(max_addresses))
++#define restore_addresses() grub_memcpy(max_addresses, saved_addresses, sizeof(max_addresses))
+
+ static inline void
+ kernel_free(void *addr, grub_efi_uintn_t size)
+@@ -82,6 +91,11 @@ kernel_alloc(grub_efi_uintn_t size, const char * const errmsg)
+ grub_uint64_t max = max_addresses[i].addr;
+ grub_efi_uintn_t pages;
+
++ /*
++ * When we're *not* loading the kernel, or >4GB allocations aren't
++ * supported, these entries are basically all the same, so don't re-try
++ * the same parameters.
++ */
+ if (max == prev_max)
+ continue;
+
+@@ -170,6 +184,9 @@ read(grub_file_t file, grub_uint8_t *bufp, grub_size_t len)
+ return bufpos;
+ }
+
++#define LOW_U32(val) ((grub_uint32_t)(((grub_addr_t)(val)) & 0xffffffffull))
++#define HIGH_U32(val) ((grub_uint32_t)(((grub_addr_t)(val) >> 32) & 0xffffffffull))
++
+ static grub_err_t
+ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+ int argc, char *argv[])
+@@ -214,8 +231,12 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+ goto fail;
+ grub_dprintf ("linux", "initrd_mem = %p\n", initrd_mem);
+
+- params->ramdisk_size = size;
+- params->ramdisk_image = initrd_mem;
++ params->ramdisk_size = LOW_U32(size);
++ params->ramdisk_image = LOW_U32(initrd_mem);
++#if defined(__x86_64__)
++ params->ext_ramdisk_size = HIGH_U32(size);
++ params->ext_ramdisk_image = HIGH_U32(initrd_mem);
++#endif
+
+ ptr = initrd_mem;
+
+@@ -353,6 +374,18 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+ }
+ #endif
+
++#if defined(__x86_64__)
++ if (lh->xloadflags & LINUX_XLF_CAN_BE_LOADED_ABOVE_4G)
++ {
++ grub_dprintf ("linux", "Loading kernel above 4GB is supported; enabling.\n");
++ max_addresses[2].addr = GRUB_EFI_MAX_USABLE_ADDRESS;
++ }
++ else
++ {
++ grub_dprintf ("linux", "Loading kernel above 4GB is not supported\n");
++ }
++#endif
++
+ params = kernel_alloc (sizeof(*params), "cannot allocate kernel parameters");
+ if (!params)
+ goto fail;
+@@ -387,21 +420,40 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+
+ grub_dprintf ("linux", "cmdline:%s\n", linux_cmdline);
+ grub_dprintf ("linux", "setting lh->cmd_line_ptr to 0x%08x\n",
+- linux_cmdline);
+- lh->cmd_line_ptr = linux_cmdline;
++ LOW_U32(linux_cmdline));
++ lh->cmd_line_ptr = LOW_U32(linux_cmdline);
++#if defined(__x86_64__)
++ if ((grub_efi_uintn_t)linux_cmdline > 0xffffffffull)
++ {
++ grub_dprintf ("linux", "setting params->ext_cmd_line_ptr to 0x%08x\n",
++ HIGH_U32(linux_cmdline));
++ params->ext_cmd_line_ptr = HIGH_U32(linux_cmdline);
++ }
++#endif
+
+ handover_offset = lh->handover_offset;
+ grub_dprintf("linux", "handover_offset: 0x%08x\n", handover_offset);
+
+ start = (lh->setup_sects + 1) * 512;
+
++ /*
++ * AFAICS >4GB for kernel *cannot* work because of params->code32_start being
++ * 32-bit and getting called unconditionally in head_64.S from either entry
++ * point.
++ *
++ * so nerf that out here...
++ */
++ save_addresses();
+ grub_dprintf ("linux", "lh->pref_address: %p\n", (void *)(grub_addr_t)lh->pref_address);
+ if (lh->pref_address < (grub_uint64_t)GRUB_EFI_MAX_ALLOCATION_ADDRESS)
+ {
+ max_addresses[0].addr = lh->pref_address;
+ max_addresses[0].alloc_type = GRUB_EFI_ALLOCATE_ADDRESS;
+ }
++ max_addresses[1].addr = GRUB_EFI_MAX_ALLOCATION_ADDRESS;
++ max_addresses[2].addr = GRUB_EFI_MAX_ALLOCATION_ADDRESS;
+ kernel_mem = kernel_alloc (lh->init_size, N_("can't allocate kernel"));
++ restore_addresses();
+ if (!kernel_mem)
+ goto fail;
+ grub_dprintf("linux", "kernel_mem = %p\n", kernel_mem);
+@@ -410,8 +462,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+
+ loaded = 1;
+
+- grub_dprintf ("linux", "setting lh->code32_start to %p\n", kernel_mem);
+- lh->code32_start = (grub_uint32_t)(grub_addr_t) kernel_mem;
++ grub_dprintf ("linux", "setting lh->code32_start to 0x%08x\n",
++ LOW_U32(kernel_mem));
++ lh->code32_start = LOW_U32(kernel_mem);
+
+ grub_memcpy (kernel_mem, (char *)kernel + start, filelen - start);
+
+diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h
+index 8474a857e..a4b37dcce 100644
+--- a/include/grub/i386/linux.h
++++ b/include/grub/i386/linux.h
+@@ -230,7 +230,11 @@ struct linux_kernel_params
+ grub_uint32_t ofw_cif_handler; /* b8 */
+ grub_uint32_t ofw_idt; /* bc */
+
+- grub_uint8_t padding7[0x1b8 - 0xc0];
++ grub_uint32_t ext_ramdisk_image; /* 0xc0 */
++ grub_uint32_t ext_ramdisk_size; /* 0xc4 */
++ grub_uint32_t ext_cmd_line_ptr; /* 0xc8 */
++
++ grub_uint8_t padding7[0x1b8 - 0xcc];
+
+ union
+ {
diff --git a/SOURCES/0500-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch b/SOURCES/0500-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch
new file mode 100644
index 0000000..aaadaa2
--- /dev/null
+++ b/SOURCES/0500-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch
@@ -0,0 +1,41 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Javier Martinez Canillas <javierm@redhat.com>
+Date: Tue, 26 May 2020 16:59:28 +0200
+Subject: [PATCH] x86-efi: Reduce maximum bounce buffer size to 16 MiB
+
+The EFI linux loader allocates a bounce buffer to copy the initrd since in
+some machines doing DMA on addresses above 4GB is not possible during EFI.
+
+But the verifiers framework also allocates a buffer to copy the initrd in
+its grub_file_open() handler. It does this since the data to verify has to
+be passed as a single chunk to modules that use the verifiers framework.
+
+If the initrd image size is big there may not be enough memory in the heap
+to allocate two buffers of that size. This causes an allocation failure in
+the verifiers framework and leads to the initrd not being read.
+
+To prevent these allocation failures, let's reduce the maximum size of the
+bounce buffer used in the EFI loader. Since the data read can be copied to
+the actual initrd address in multilple chunks.
+
+Resolves: rhbz#1838633
+
+Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
+(cherry picked from commit 1c0d2ebdddf69962395f0fa4578446654512f3c4)
+---
+ grub-core/loader/i386/efi/linux.c | 2 +-
+ 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 e9d2c85b3..a043df891 100644
+--- a/grub-core/loader/i386/efi/linux.c
++++ b/grub-core/loader/i386/efi/linux.c
+@@ -146,7 +146,7 @@ grub_linuxefi_unload (void)
+ return GRUB_ERR_NONE;
+ }
+
+-#define BOUNCE_BUFFER_MAX 0x10000000ull
++#define BOUNCE_BUFFER_MAX 0x1000000ull
+
+ static grub_ssize_t
+ read(grub_file_t file, grub_uint8_t *bufp, grub_size_t len)
diff --git a/SOURCES/99-grub-mkconfig.install b/SOURCES/99-grub-mkconfig.install
index e370899..b14fc82 100644
--- a/SOURCES/99-grub-mkconfig.install
+++ b/SOURCES/99-grub-mkconfig.install
@@ -6,13 +6,14 @@ fi
ARCH=$(uname -m)
-# Is only needed for ppc64* since we can't assume a BLS capable bootloader there
-if [[ $ARCH != "ppc64" && $ARCH != "ppc64le" ]]; then
+[[ -f /etc/default/grub ]] && . /etc/default/grub
+
+# Can't assume a BLS capable bootloader on ppc64
+if [[ x$GRUB_ENABLE_BLSCFG != xfalse &&
+ $ARCH != "ppc64" && $ARCH != "ppc64le" ]]; then
exit 0
fi
-[[ -f /etc/default/grub ]] && . /etc/default/grub
-
COMMAND="$1"
case "$COMMAND" in
diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros
index 2eb014a..f65c00d 100644
--- a/SOURCES/grub.macros
+++ b/SOURCES/grub.macros
@@ -111,7 +111,7 @@
%ifarch %{efi_arch}
-%global efi_modules " efi_netfs efifwsetup efinet lsefi lsefimmap "
+%global efi_modules " efi_netfs efifwsetup efinet lsefi lsefimmap connectefi "
%endif
%ifarch x86_64 %{ix86}
diff --git a/SOURCES/grub.patches b/SOURCES/grub.patches
index ad83e09..9cd50b1 100644
--- a/SOURCES/grub.patches
+++ b/SOURCES/grub.patches
@@ -486,3 +486,15 @@ Patch0485: 0485-ieee1275-ofdisk-retry-on-open-failure.patch
Patch0486: 0486-normal-main-Discover-the-device-to-read-the-config-f.patch
Patch0487: 0487-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch
Patch0488: 0488-powerpc-fix-prefix-signed-grub-special-case-for-Powe.patch
+Patch0489: 0489-grub-mkconfig-restore-umask-for-grub.cfg.patch
+Patch0490: 0490-efinet-Add-DHCP-proxy-support.patch
+Patch0491: 0491-at_keyboard-Fix-unreliable-key-presses.patch
+Patch0492: 0492-commands-search-Fix-bug-stopping-iteration-when-no-f.patch
+Patch0493: 0493-search-new-efidisk-only-option-on-EFI-systems.patch
+Patch0494: 0494-efi-new-connectefi-command.patch
+Patch0495: 0495-Try-to-pick-better-locations-for-kernel-and-initrd.patch
+Patch0496: 0496-x86-efi-Use-bounce-buffers-for-reading-to-addresses-.patch
+Patch0497: 0497-x86-efi-Re-arrange-grub_cmd_linux-a-little-bit.patch
+Patch0498: 0498-x86-efi-Make-our-own-allocator-for-kernel-stuff.patch
+Patch0499: 0499-x86-efi-Allow-initrd-params-cmdline-allocations-abov.patch
+Patch0500: 0500-x86-efi-Reduce-maximum-bounce-buffer-size-to-16-MiB.patch
diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec
index ad881db..a57ac93 100644
--- a/SPECS/grub2.spec
+++ b/SPECS/grub2.spec
@@ -7,7 +7,7 @@
Name: grub2
Epoch: 1
Version: 2.02
-Release: 106%{?dist}
+Release: 123%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more
Group: System Environment/Base
License: GPLv3+
@@ -232,18 +232,6 @@ rm -vf ${RPM_BUILD_ROOT}/%{_sbindir}/%{name}-macbless
%find_lang grub
-# Make selinux happy with exec stack binaries.
-mkdir ${RPM_BUILD_ROOT}%{_sysconfdir}/prelink.conf.d/
-cat << EOF > ${RPM_BUILD_ROOT}%{_sysconfdir}/prelink.conf.d/grub2.conf
-# these have execstack, and break under selinux
--b /usr/bin/grub2-script-check
--b /usr/bin/grub2-mkrelpath
--b /usr/bin/grub2-fstest
--b /usr/sbin/grub2-bios-setup
--b /usr/sbin/grub2-probe
--b /usr/sbin/grub2-sparc64-setup
-EOF
-
# Install kernel-install scripts
install -d -m 0755 %{buildroot}%{_prefix}/lib/kernel/install.d/
install -D -m 0755 -t %{buildroot}%{_prefix}/lib/kernel/install.d/ %{SOURCE9}
@@ -385,7 +373,6 @@ fi
%doc docs/font_char_metrics.png
%files tools-minimal
-%{_sysconfdir}/prelink.conf.d/grub2.conf
%{_sbindir}/%{name}-get-kernel-settings
%attr(4755, root, root) %{_sbindir}/%{name}-set-bootflag
%{_sbindir}/%{name}-set-default
@@ -523,8 +510,74 @@ fi
%endif
%changelog
-* Tue Nov 09 2021 CentOS Sources <bugs@centos.org> - 2.02-106.el8.centos
-- Apply debranding changes
+* Mon Mar 28 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-123
+- Bump for signing
+- Resolves: #2061252
+
+* Wed Mar 09 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-122
+- Fix initialization on efidisk patch
+- Resolves: #2061252
+
+* Tue Mar 08 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-121
+- Backport support for loading initrd above 4GB
+- Resolves: #2048433
+
+* Mon Feb 28 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-120
+- Bump signing
+- Resolves: #2032294
+
+* Mon Feb 28 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-119
+- Enable connectefi module
+- Resolves: #2032294
+
+* Fri Feb 25 2022 Robbie Harwood <rharwood@redhat.com> - 2.02-118
+- Fix check on blscfg conditional (mlewando)
+- Resolves: #1899903
+
+* Thu Feb 24 2022 Robbie Harwood <rharwood@redhat.com> - 2.02-117
+- Once more, for signing
+- Resolves: #2048904
+
+* Thu Feb 24 2022 Robbie Harwood <rharwood@redhat.com> - 2.02-116
+- Add efidisk/connectefi patches
+- Resolves: #2048904
+- Resolves: #2032294
+
+* Fri Feb 18 2022 Robbie Harwood <rharwood@redhat.com> - 2.02-115
+- Re-arm GRUB_ENABLE_BLSCFG=false
+- Resolves: #1899903
+
+* Mon Feb 14 2022 Robbie Harwood <rharwood@redhat.com> - 2.02-114
+- Fix behavior of GRUB_TERMINAL_INPUT=at_keyboard
+- Resolves: #2020927
+
+* Wed Feb 09 2022 Robbie Harwood <rharwood@redhat.com> - 2.02-113
+- Bump to fix target
+- Resolves: #1809246
+
+* Wed Feb 09 2022 Robbie Harwood <rharwood@redhat.com> - 2.02-112
+- Fix DHCP proxy efi booting
+- Resolves: #1809246
+
+* Mon Feb 07 2022 Robbie Harwood <rharwood@redhat.com> - 2.02-111
+- Bump to fix target
+- Resolves: #1914575
+
+* Mon Feb 07 2022 Robbie Harwood <rharwood@redhat.com> - 2.02-110
+- Don't run grub-boot-success.timer in a nspawn container
+- Resolves: #1914575
+
+* Mon Feb 07 2022 Robbie Harwood <rharwood@redhat.com> - 2.02-109
+- Drop prelink snippet
+- Resolves: #2016269
+
+* Wed Feb 02 2022 Robbie Harwood <rharwood@redhat.com> - 2.02-108
+- Bump version to fix build target
+- Resolves: #2030359
+
+* Wed Feb 02 2022 Robbie Harwood <rharwood@redhat.com> - 2.02-107
+- CVE-2021-3981 (Incorrect read permission in grub.cfg)
+- Resolves: #2030359
* Thu Aug 19 2021 Javier Martinez Canillas <javierm@redhat.com> - 2.02-106
- Fix device discoverability on PowerVM when the prefix is not set (dja)