GRUB: Bump to rev a68a7dece, 23 June 2025

NOTE: gfxterm_menu module removed, because of this change by upstream: commit ca2a91f43bf6e1df23a07c295534f871ddf2d401 Author: Glenn Washburn <development@efficientek.com> Date: Mon May 5 16:11:36 2025 -0500 tests: Disable gfxterm_menu and cmdline_cat tests This brings in the following changes from upstream: * a68a7dece loader/i386/pc/linux: Fix resource leak * de80acf36 loader/efi/linux: Unload previous Linux kernel/initrd before updating kernel size * 249db11d8 loader/efi/linux: Correctly terminate load_options member * f3b339af1 loader/efi/linux: Use sizeof() instead of constant * c2b2e0dcf loader/efi/linux: Use proper type for len variable * de4e8e2aa loader/efi/linux: Do not pass excessive size for source string * 8c8f96664 loader/efi/linux: Remove useless assignment * 8ebf155af include/grub/charset.h: Update documentation * 2f2ed28d5 Revert "lzma: Make sure we don't dereference past array" * 2539ede82 tests/util/grub-shell: Correct netboot and file_filter test failure * 8c2d4e64f normal/charset: Fix underflow and overflow in loop init * ba8eadde6 dl: Provide a fake grub_dl_set_persistent() and grub_dl_is_persistent() for the emu target * 409e72ced util/grub-protect: Correct uninit "err" variable * 5eca564b1 gnulib: Bring back the fix for resolving unused variable issue * ac1512b87 gnulib: Add patch to allow GRUB w/GCC-15 compile * db506b3b8 gnulib/regexec: Fix resource leak * bba7dd736 gnulib/regcomp: Fix resource leak * 91cb7ff6b tests/tpm2_key_protector_test: Add tests for SHA-384 PCR bank * 451e227e5 tpm2_key_protector: Dump the PCR bank for key unsealing * 11caacdb2 util/grub-protect: Fix the hash algorithm of PCR digest * ce23919ca build: Add new header files to dist to allow building from tar * e3b15bafd build: Remove extra_deps.lst from EXTRA_DIST * 40e261b89 lib/LzmaEnc: Validate "len" before subtracting * 86e8f2c4b osdep/unix/hostdisk: Fix signed integer overflow * 438f05581 disk/luks2: Add attempting to decrypt message to align with luks and geli modules * 20e6d0c4a osdep/linux/getroot: Detect DDF container similar to IMSM * b71bc0f8b fs/fshelp: Avoid possible NULL pointer deference * 272ff81cb fs/ntfs: Correct possible infinite loops/hangs * 8c95307a0 fs/ntfs: Correct possible access violations * 06914b614 fs/ntfs: Correct attribute vs attribute list validation * 0e1762c8a fs/ntfs: Correct regression with run list calculation * be303f8c1 lib/envblk: Ignore empty new lines while parsing env files * 34bd00ee2 fs/zfs: Fix another memory leak in ZFS code * ca2a91f43 tests: Disable gfxterm_menu and cmdline_cat tests Signed-off-by: Leah Rowe <leah@libreboot.org>
2026-07-17 18:34:57 +02:00 · 2025-07-06 15:48:02 +01:00
parent 5b2661a485
commit 81dc1a7f89
61 changed files with 136 additions and 139 deletions
@@ -1,7 +1,7 @@
-From 8ccafb60665bba3759248b13d2d1683818aaf4ee Mon Sep 17 00:00:00 2001
+From dae0cfdbb484eb3576300ad9c4d2c362f4e8fa64 Mon Sep 17 00:00:00 2001
 From: Leah Rowe <leah@libreboot.org>
 Date: Sun, 31 Oct 2021 03:47:05 +0000
-Subject: [PATCH 01/13] mitigate grub's missing characters for borders/arrow
+Subject: [PATCH 01/14] mitigate grub's missing characters for borders/arrow
 characters

 This cleans up the display on the main screen in GRUB.
@@ -1,14 +1,14 @@
-From 3fb09986e62a9945862456d5f1d63a6ccba2c861 Mon Sep 17 00:00:00 2001
+From 25ae072be49c23abffff657085c16ac3780b8cda Mon Sep 17 00:00:00 2001
 From: Leah Rowe <leah@libreboot.org>
 Date: Sat, 19 Nov 2022 16:30:24 +0000
-Subject: [PATCH 02/13] say the name libreboot, in the grub menu
+Subject: [PATCH 02/14] say the name libreboot, in the grub menu

 ---
 grub-core/normal/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 04d058f55..b1cc8f236 100644
+index 96abfda2f..d806db9c4 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
@@ -209,7 +209,7 @@ grub_normal_init_page (struct grub_term_output *term,
@@ -1,7 +1,7 @@
-From dc790ff2ba2702ee863c9d16e05cf843a152f3d4 Mon Sep 17 00:00:00 2001
+From e9969b4ee38e3d9fda1fdff02e127830d7fdf2ec Mon Sep 17 00:00:00 2001
 From: Ax333l <main@axelen.xyz>
 Date: Thu, 17 Aug 2023 00:00:00 +0000
-Subject: [PATCH 03/13] Add CC0 license
+Subject: [PATCH 03/14] Add CC0 license

 Signed-off-by: Nicholas Johnson <nick@nicholasjohnson.ch>
 ---
@@ -1,7 +1,7 @@
-From 298eaaca770545e19dfacd47511c2081c1fece08 Mon Sep 17 00:00:00 2001
+From 421a44b2f8211fa46ea523fc0feeaba9940af0e7 Mon Sep 17 00:00:00 2001
 From: Ax333l <main@axelen.xyz>
 Date: Thu, 17 Aug 2023 00:00:00 +0000
-Subject: [PATCH 04/13] Define GRUB_UINT32_MAX
+Subject: [PATCH 04/14] Define GRUB_UINT32_MAX

 Signed-off-by: Nicholas Johnson <nick@nicholasjohnson.ch>
 ---
@@ -1,7 +1,7 @@
-From 378aa081ac1211d0bf4043eeb0bb7d4aa534043f Mon Sep 17 00:00:00 2001
+From a31496a4fb9dc85dfbfc3442898aca4b64716986 Mon Sep 17 00:00:00 2001
 From: Ax333l <main@axelen.xyz>
 Date: Thu, 17 Aug 2023 00:00:00 +0000
-Subject: [PATCH 05/13] Add Argon2 algorithm
+Subject: [PATCH 05/14] Add Argon2 algorithm

 Signed-off-by: Nicholas Johnson <nick@nicholasjohnson.ch>
 ---
@@ -111,7 +111,7 @@ index f4367f895..9d96cedf9 100644
 @section Gnulib
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index f70e02e69..f5f9b040c 100644
+index 24e8c8437..0ee65d54d 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
@@ -1219,6 +1219,14 @@ module = {
@@ -1,7 +1,7 @@
-From febaf431d235f07b97f07f935611dc168b0b35bb Mon Sep 17 00:00:00 2001
+From 594a7011d551af530bbbdf5e39b941811a0b7811 Mon Sep 17 00:00:00 2001
 From: Ax333l <main@axelen.xyz>
 Date: Thu, 17 Aug 2023 00:00:00 +0000
-Subject: [PATCH 06/13] Error on missing Argon2id parameters
+Subject: [PATCH 06/14] Error on missing Argon2id parameters

 Signed-off-by: Nicholas Johnson <nick@nicholasjohnson.ch>
 ---
@@ -9,7 +9,7 @@ Signed-off-by: Nicholas Johnson <nick@nicholasjohnson.ch>
 1 file changed, 8 insertions(+), 5 deletions(-)

 diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c
-index 8036d76ff..efae8ac65 100644
+index b17cd2115..bbd8f5579 100644
 --- a/grub-core/disk/luks2.c
 +++ b/grub-core/disk/luks2.c
@@ -39,6 +39,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
@@ -1,7 +1,7 @@
-From 12d3e4dfff3f92daf2f3f73cc0797425f7bb9df6 Mon Sep 17 00:00:00 2001
+From 6a757a3cdf22e840162bb222a87446a32d9b94a2 Mon Sep 17 00:00:00 2001
 From: Ax333l <main@axelen.xyz>
 Date: Thu, 17 Aug 2023 00:00:00 +0000
-Subject: [PATCH 07/13] Compile with Argon2id support
+Subject: [PATCH 07/14] Compile with Argon2id support

 Signed-off-by: Nicholas Johnson <nick@nicholasjohnson.ch>
 ---
@@ -35,7 +35,7 @@ index 038253b37..2f19569c9 100644
   common = grub-core/disk/luks.c;
   common = grub-core/disk/luks2.c;
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index f5f9b040c..f1f38d8d3 100644
+index 0ee65d54d..cd29a9df8 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
@@ -1242,7 +1242,7 @@ module = {
@@ -48,7 +48,7 @@ index f5f9b040c..f1f38d8d3 100644
 
 module = {
 diff --git a/grub-core/disk/luks2.c b/grub-core/disk/luks2.c
-index efae8ac65..2e742f5be 100644
+index bbd8f5579..02cd615d9 100644
 --- a/grub-core/disk/luks2.c
 +++ b/grub-core/disk/luks2.c
@@ -28,6 +28,7 @@
@@ -1,7 +1,7 @@
-From 8e639e9558c98019566743cc5723e641b1726d15 Mon Sep 17 00:00:00 2001
+From 4e4ded3f127f5567bdb41de7b671bd9b2a478125 Mon Sep 17 00:00:00 2001
 From: Ax333l <main@axelen.xyz>
 Date: Thu, 17 Aug 2023 00:00:00 +0000
-Subject: [PATCH 08/13] Make grub-install work with Argon2
+Subject: [PATCH 08/14] Make grub-install work with Argon2

 Signed-off-by: Nicholas Johnson <nick@nicholasjohnson.ch>
 ---
@@ -1,7 +1,7 @@
-From 8a098ee241040ccfdf03636f558ef6a3b431bb90 Mon Sep 17 00:00:00 2001
+From fc815438e70cbb13166ab6711b6f6460521b1fd4 Mon Sep 17 00:00:00 2001
 From: Leah Rowe <leah@libreboot.org>
 Date: Mon, 30 Oct 2023 22:19:21 +0000
-Subject: [PATCH 09/13] at_keyboard coreboot: force scancodes2+translate
+Subject: [PATCH 09/14] at_keyboard coreboot: force scancodes2+translate

 Scan code set 2 with translation should be assumed in
 every case, as the default starting position.
@@ -1,7 +1,7 @@
-From d86b69fa2c0d73440e5b990d8ab4b66c5c23fa46 Mon Sep 17 00:00:00 2001
+From defb7ad35579c321d32b81af7ddd6fecf34cb618 Mon Sep 17 00:00:00 2001
 From: Leah Rowe <leah@libreboot.org>
 Date: Tue, 31 Oct 2023 10:33:28 +0000
-Subject: [PATCH 10/13] keylayouts: don't print "Unknown key" message
+Subject: [PATCH 10/14] keylayouts: don't print "Unknown key" message

 on keyboards with stuck keys, this results in GRUB just
 spewing it repeatedly, preventing use of GRUB.
@@ -1,7 +1,7 @@
-From 3726c1e12b8896e4a77cc7a2b490e933dc2c08da Mon Sep 17 00:00:00 2001
+From d0345db429be8089145e0c072db9ac8db0b644bd Mon Sep 17 00:00:00 2001
 From: Leah Rowe <leah@libreboot.org>
 Date: Sun, 5 Nov 2023 16:14:58 +0000
-Subject: [PATCH 11/13] don't print missing prefix errors on the screen
+Subject: [PATCH 11/14] don't print missing prefix errors on the screen

 we do actually set the prefix. this patch modifies
 grub to still set grub_errno and return accordingly,
@@ -1,7 +1,7 @@
-From c86a635609a4623baa9312f5c1bebfd51f5883a1 Mon Sep 17 00:00:00 2001
+From 2fe963570ac19e3390a792ca2c195112d4efdc24 Mon Sep 17 00:00:00 2001
 From: Leah Rowe <leah@libreboot.org>
 Date: Sun, 5 Nov 2023 16:36:22 +0000
-Subject: [PATCH 12/13] don't print error if module not found
+Subject: [PATCH 12/14] don't print error if module not found

 still set grub_errno accordingly, and otherwise
 behave the same. in libreboot, we remove a lot of
@@ -1,7 +1,7 @@
-From 715ba566042aa140cbeb06836c558460ef6f446f Mon Sep 17 00:00:00 2001
+From 5a1dd3c19307859aac7d1a22a7a0c0c7ffb09ddb Mon Sep 17 00:00:00 2001
 From: Leah Rowe <leah@libreboot.org>
 Date: Sun, 5 Nov 2023 17:25:20 +0000
-Subject: [PATCH 13/13] don't print empty error messages
+Subject: [PATCH 13/14] don't print empty error messages

 this is part two of the quest to kill the prefix
 error message. after i disabled prefix-related
@@ -1,7 +1,7 @@
-From d675307bfcac2f9e05ed119c5b5af3de48e56fb9 Mon Sep 17 00:00:00 2001
+From 818f1b19f32e355cc2a0ebe29eee2a2bac7bcb3f Mon Sep 17 00:00:00 2001
 From: Paul Menzel <pmenzel@molgen.mpg.de>
 Date: Mon, 17 May 2021 10:24:36 +0200
-Subject: [PATCH] kern/coreboot/mmap: Map to reserved
+Subject: [PATCH 14/14] kern/coreboot/mmap: Map to reserved

 https://git.savannah.gnu.org/cgit/grub.git/commit/?id=6de9ee86bf9ae50967413e6a73b5dfd13e5ffb50

@@ -33,5 +33,5 @@ index caf8f7cef..2fc316e8d 100644
 	return 1;
     }
 -- 
-2.31.1
+2.39.5

@@ -1,4 +1,4 @@
 # SPDX-License-Identifier: GPL-3.0-or-later

 tree="default"
-rev="73d1c959ea3417e9309ba8c6102d7d6dc7c94259"
+rev="a68a7dece464c35b1c8d20b98502b6881b103911"