From f0055016d2c9c3e9fd4604407a0ec845bd2d80e6 Mon Sep 17 00:00:00 2001
From: Owen Rafferty <owen@owenrafferty.com>
Date: Mon, 5 Feb 2024 00:32:19 -0600
Subject: [PATCH] grub: 2.12

---
 core/grub/build                   |  5 +++++
 core/grub/checksums               |  5 +++--
 core/grub/patches/no-asorti.patch | 15 +++++++++++++++
 core/grub/sources                 |  5 +++--
 core/grub/version                 |  2 +-
 5 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 core/grub/patches/no-asorti.patch

diff --git a/core/grub/build b/core/grub/build
index 6a7c7501..9494654f 100755
--- a/core/grub/build
+++ b/core/grub/build
@@ -38,6 +38,11 @@ pkg_dir=$1
 build_grub() (
     cd "grub-${1##*=}"
 
+    patch -p1 < ../no-asorti.patch
+
+    # This file is missing from the release tarball.
+    touch grub-core/extra_deps.lst
+
     ./configure \
         HELP2MAN="$OLDPWD/help2man" \
         --prefix=/usr \
diff --git a/core/grub/checksums b/core/grub/checksums
index 843073bf..74128541 100644
--- a/core/grub/checksums
+++ b/core/grub/checksums
@@ -1,4 +1,5 @@
-449064120cdba3186d710a72ac6e510bcf769fb469b2c2ffb3537744bf6299e843
-449064120cdba3186d710a72ac6e510bcf769fb469b2c2ffb3537744bf6299e843
+13c48453f9becf4a6e49618749dc7cb83a2c4a0d7600eeeadc6c7c2772c0b87784
+13c48453f9becf4a6e49618749dc7cb83a2c4a0d7600eeeadc6c7c2772c0b87784
 6b8d0bf948e008f080a376d3822cdafd8ffda71eb78a1723fb133326ff7aed5c3f
 ff52fa06400af24ab316f693bade1a38751e46fcc6232cad97ea022a92a695db14
+711c4a6f87f114d950e76ee178dd99c88e8532c2a678d3061686f617f0cfb5828b
diff --git a/core/grub/patches/no-asorti.patch b/core/grub/patches/no-asorti.patch
new file mode 100644
index 00000000..90834ab4
--- /dev/null
+++ b/core/grub/patches/no-asorti.patch
@@ -0,0 +1,15 @@
+diff --git a/grub-core/genmoddep.awk b/grub-core/genmoddep.awk
+index cc987a5..5e9f942 100644
+--- a/grub-core/genmoddep.awk
++++ b/grub-core/genmoddep.awk
+@@ -63,9 +63,7 @@ END {
+     }
+     modlist = ""
+     depcount[mod] = 0
+-    n = asorti(uniqmods, w)
+-    for (i = 1; i <= n; i++) {
+-      depmod = w[i]
++    for (depmod in uniqmods) {
+       modlist = modlist " " depmod;
+       inverse_dependencies[depmod] = inverse_dependencies[depmod] " " mod
+       depcount[mod]++
diff --git a/core/grub/sources b/core/grub/sources
index 65a0535d..c942143c 100644
--- a/core/grub/sources
+++ b/core/grub/sources
@@ -1,4 +1,5 @@
-https://ftp.gnu.org/gnu/grub/grub-2.06.tar.xz grub-pc
-https://ftp.gnu.org/gnu/grub/grub-2.06.tar.xz grub-efi
+https://ftp.gnu.org/gnu/grub/grub-2.12.tar.xz grub-pc
+https://ftp.gnu.org/gnu/grub/grub-2.12.tar.xz grub-efi
 files/grub.default
 files/help2man
+patches/no-asorti.patch
diff --git a/core/grub/version b/core/grub/version
index 56b20f9b..469c7916 100644
--- a/core/grub/version
+++ b/core/grub/version
@@ -1 +1 @@
-2.06 1
+2.12 1