[PATCH 01/20] Use GRUB 2.12

[Leah Rowe]

From: Leah Rowe <leah@libreboot.org>

GRUB 2.12 brings many improvements including, but not limited to,
detached LUKS keyfile support, and numerous fixes for file system
behaviour, compared to GRUB 2.06.

GRUB 2.12 also improves memory allocation in GRUB, making it less
likely to run out of memory when a lot of memory is used, like when
running memory-hungry modules or having a very large memdisk. This
last improvement is beneficial for Argon2 KDF, which will be sent
next in a follow-up patch.

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 ...tigate-grub-s-missing-characters-for-borders-arrow.patch | 4 ++--
 .../0003-say-the-name-gnuboot-in-the-grub-menu.patch        | 6 +++---
 resources/packages/grub/download                            | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git 
a/resources/grub/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch
 
b/resources/grub/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch
index 0f97666..183f5a9 100644
--- 
a/resources/grub/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch
+++ 
b/resources/grub/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch
@@ -1,4 +1,4 @@
-From 2ca3c327501c482ba34af977cd1a7ccac20a35bf Mon Sep 17 00:00:00 2001
+From ce13539fe2103abbd991814d995e06cf96e485f7 Mon Sep 17 00:00:00 2001
 From: Leah Rowe <leah@libreboot.org>
 Date: Sun, 31 Oct 2021 03:47:05 +0000
 Subject: [PATCH 1/3] mitigate grub's missing characters for borders/arrow
@@ -12,7 +12,7 @@ Just don't draw a border, at all.
  1 file changed, 2 insertions(+), 47 deletions(-)
 
 diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index 18240e76c..4d6282b43 100644
+index b1321eb26..e76094dfd 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/resources/grub/patches/0003-say-the-name-gnuboot-in-the-grub-menu.patch 
b/resources/grub/patches/0003-say-the-name-gnuboot-in-the-grub-menu.patch
index 4e6c6c4..d32a7d0 100644
--- a/resources/grub/patches/0003-say-the-name-gnuboot-in-the-grub-menu.patch
+++ b/resources/grub/patches/0003-say-the-name-gnuboot-in-the-grub-menu.patch
@@ -8,18 +8,18 @@ Subject: [PATCH 3/3] say the name gnuboot, in the grub menu
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index c4ebe9e22..3b7a4fc58 100644
+index bd4431000..31308e16a 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,
-  
+ 
    grub_term_cls (term);
  
 -  msg_formatted = grub_xasprintf (_("GNU GRUB  version %s"), PACKAGE_VERSION);
 +  msg_formatted = grub_xasprintf (_("GNUBoot firmware, based on coreboot.    
https://gnu.org/software/gnuboot/";));
    if (!msg_formatted)
      return;
-  
+ 
 -- 
 2.25.1
 
diff --git a/resources/packages/grub/download b/resources/packages/grub/download
index 97bae1e..e06c3e4 100755
--- a/resources/packages/grub/download
+++ b/resources/packages/grub/download
@@ -60,7 +60,7 @@ fi
 # modifications are required
 cd "grub/"
 # reset to known revision
-git reset --hard 50aace6bdb918150ba47e3c16146dcca271c134a
+git reset --hard b835601c7639ed1890f2d3db91900a8506011a8e
 for grubpatch in ../resources/grub/patches/*; do
        git am "${grubpatch}"
 done
@@ -70,7 +70,7 @@ cd gnulib/
 
 # NOTE: when updating this, make sure it's the version specified
 # in bootstrap.conf on that version of GRUB, as specified above
-git reset --hard d271f868a8df9bbec29049d01e056481b7a1a263
+git reset --hard 9f48fb992a3d7e96610c4ce8be969cff2d61a01b
 rm -Rf .git*
 )
 
-- 
2.39.2