From 85b57722c67965aa288288ad897265bd55c15e37 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 26 Dec 2021 18:52:23 +0000
Subject: [PATCH] core/grub to 2.06-3

---
 core/grub/PKGBUILD     | 14 ++++++++++----
 core/grub/grub.default |  6 ++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/core/grub/PKGBUILD b/core/grub/PKGBUILD
index e2ecf655d..c031945f8 100644
--- a/core/grub/PKGBUILD
+++ b/core/grub/PKGBUILD
@@ -30,10 +30,10 @@ pkgdesc='GNU GRand Unified Bootloader (2)'
 epoch=2
 _tag='53c5000739db114c229fe69ec3d4b76b92441098' # git rev-parse grub-${_pkgver}
 _gnulib_commit='be584c56eb1311606e5ea1a36363b97bddb6eed3'
-_unifont_ver='13.0.06'
+_unifont_ver='14.0.01'
 _pkgver=2.06
 pkgver=${_pkgver/-/}
-pkgrel=2
+pkgrel=3
 url='https://www.gnu.org/software/grub/'
 arch=('x86_64')
 license=('GPL3')
@@ -76,11 +76,11 @@ source=("git+https://git.savannah.gnu.org/git/grub.git#tag=${_tag}?signed"
 
 sha256sums=('SKIP'
             'SKIP'
-            'b7668a5d498972dc4981250c49f83601babce797be19b4fdd0f2f1c6cfbd0fc5'
+            '391d194f6307fcd0915daafd360509a734e26f3e4013e63d47deb2530d59e66e'
             'SKIP'
             '5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab'
             '8488aec30a93e8fe66c23ef8c23aefda39c38389530e9e73ba3fbcc8315d244d'
-            '791fadf182edf8d5bee4b45c008b08adce9689a9624971136527891a8f67d206')
+            'c17bf255a41103f6b71a1710afc7e9addaebc578bcf51a48845e227b2f651682')
 
 _backports=(
 	# fs/xfs: Fix unreadable filesystem with v4 superblock
@@ -269,6 +269,12 @@ _package_grub-efi() {
 	rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.module || true
 	rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.image || true
 	rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true
+
+	_sbat_file="${pkgdir}/usr/share/grub/sbat.csv"
+	touch "${_sbat_file}"
+	echo "sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md" >> "${_sbat_file}"
+	echo "grub,1,Free Software Foundation,grub,${_pkgver},https//www.gnu.org/software/grub/" >> "${_sbat_file}"
+	echo "grub.arch,1,Arch Linux,grub,${_pkgver},https://archlinux.org/packages/core/x86_64/grub/" >> "${_sbat_file}"
 }
 
 _package_grub-emu() {
diff --git a/core/grub/grub.default b/core/grub/grub.default
index 6fd21c7fd..ba1076eff 100644
--- a/core/grub/grub.default
+++ b/core/grub/grub.default
@@ -55,3 +55,9 @@ GRUB_DISABLE_RECOVERY=true
 
 # Uncomment to disable submenus in boot menu
 #GRUB_DISABLE_SUBMENU=y
+
+# Probing for other operating systems is disabled for security reasons. Read
+# documentation on GRUB_DISABLE_OS_PROBER, if still want to enable this
+# functionality install os-prober and uncomment to detect and include other
+# operating systems.
+#GRUB_DISABLE_OS_PROBER=false