From 76d830734ceaf18289a4e85601700a43f802faad Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Mon, 28 Mar 2022 22:57:08 +0000
Subject: [PATCH] core/grub to 2.06-5

---
 core/grub/PKGBUILD | 24 ++++++++++++------------
 core/grub/sbat.csv |  3 +++
 2 files changed, 15 insertions(+), 12 deletions(-)
 create mode 100644 core/grub/sbat.csv

diff --git a/core/grub/PKGBUILD b/core/grub/PKGBUILD
index 42f26eee8..5b06f2f27 100644
--- a/core/grub/PKGBUILD
+++ b/core/grub/PKGBUILD
@@ -29,11 +29,10 @@ pkgname='grub'
 pkgdesc='GNU GRand Unified Bootloader (2)'
 epoch=2
 _tag='53c5000739db114c229fe69ec3d4b76b92441098' # git rev-parse grub-${_pkgver}
-_gnulib_commit='be584c56eb1311606e5ea1a36363b97bddb6eed3'
-_unifont_ver='14.0.01'
+_unifont_ver='14.0.02'
 _pkgver=2.06
 pkgver=${_pkgver/-/}
-pkgrel=4.1
+pkgrel=5
 url='https://www.gnu.org/software/grub/'
 arch=('x86_64')
 license=('GPL3')
@@ -69,25 +68,30 @@ validpgpkeys=('E53D497F3FA42AD8C9B4D1E835A93B74E82E4209'  # Vladimir 'phcoder' S
               '95D2E9AB8740D8046387FD151A09227B1F435A33') # Paul Hardy <unifoundry@unifoundry.com>
 
 source=("git+https://git.savannah.gnu.org/git/grub.git#tag=${_tag}?signed"
-        "git+https://git.savannah.gnu.org/git/gnulib.git#commit=${_gnulib_commit}"
+        'git+https://git.savannah.gnu.org/git/gnulib.git'
         "https://ftp.gnu.org/gnu/unifont/unifont-${_unifont_ver}/unifont-${_unifont_ver}.bdf.gz"{,.sig}
         '0001-00_header-add-GRUB_COLOR_-variables.patch'
         '0002-10_linux-detect-archlinux-initramfs.patch'
         '0003-10_linux-add-archlinuxarm-s-default-kernel-path.patch'
-        'grub.default')
+        'grub.default'
+        'sbat.csv')
 
 sha256sums=('SKIP'
             'SKIP'
-            '391d194f6307fcd0915daafd360509a734e26f3e4013e63d47deb2530d59e66e'
+            '5b314364d23143755a4b11b641a953c07837f48fefcc7454318e334265e4974b'
             'SKIP'
             '5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab'
             '8488aec30a93e8fe66c23ef8c23aefda39c38389530e9e73ba3fbcc8315d244d'
             'bfa56cc7cb2e1650fcd19ecfe5b8d2d0aa7bbc4266a0a5fb1e5d4f60e4a7fa56'
-            'c17bf255a41103f6b71a1710afc7e9addaebc578bcf51a48845e227b2f651682')
+            'c17bf255a41103f6b71a1710afc7e9addaebc578bcf51a48845e227b2f651682'
+            '98b23d41e223bdc0a6e20bdcb3aa77e642f29b64081b1fd2f575314172fc89df')
 
 _backports=(
 	# fs/xfs: Fix unreadable filesystem with v4 superblock
 	'a4b495520e4dc41a896a8b916a64eda9970c50ea'
+
+	# fs/btrfs: Use full btrfs bootloader area
+	'b0f06a81c6f31b6fa20be67a96b6683bba8210c9'
 )
 
 _configure_options=(
@@ -276,11 +280,7 @@ _package_grub-efi() {
 	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}"
+	sed -e "s/%PKGVER%/${pkgver}/" < "${srcdir}/sbat.csv" > "${pkgdir}/usr/share/grub/sbat.csv"
 }
 
 _package_grub-emu() {
diff --git a/core/grub/sbat.csv b/core/grub/sbat.csv
new file mode 100644
index 000000000..c170e07c4
--- /dev/null
+++ b/core/grub/sbat.csv
@@ -0,0 +1,3 @@
+sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
+grub,1,Free Software Foundation,grub,%PKGVER%,https//www.gnu.org/software/grub/
+grub.arch,1,Arch Linux,grub,%PKGVER%,https://archlinux.org/packages/core/x86_64/grub/