From 0398e47d4a88e30a28d7b534566d380b39d052ac Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 10 Dec 2022 00:55:56 +0000
Subject: [PATCH] core/grub to 2.06.r403.g7259d55ff-1

---
 core/grub/0003-fix-f2fs.patch | 13 +++++++++++++
 core/grub/PKGBUILD            |  9 +++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 core/grub/0003-fix-f2fs.patch

diff --git a/core/grub/0003-fix-f2fs.patch b/core/grub/0003-fix-f2fs.patch
new file mode 100644
index 000000000..0d1d744a3
--- /dev/null
+++ b/core/grub/0003-fix-f2fs.patch
@@ -0,0 +1,13 @@
+diff --git a/grub-core/fs/f2fs.c b/grub-core/fs/f2fs.c
+index df6beb544cbd..855e24618c2b 100644
+--- a/grub-core/fs/f2fs.c
++++ b/grub-core/fs/f2fs.c
+@@ -650,7 +650,7 @@ get_blkaddr_from_nat_journal (struct grub_f2fs_data *data, grub_uint32_t nid,
+   grub_uint16_t n = grub_le_to_cpu16 (data->nat_j.n_nats);
+   grub_uint16_t i;
+ 
+-  if (n >= NAT_JOURNAL_ENTRIES)
++  if (n > NAT_JOURNAL_ENTRIES)
+     return grub_error (GRUB_ERR_BAD_FS,
+                        "invalid number of nat journal entries");
+
diff --git a/core/grub/PKGBUILD b/core/grub/PKGBUILD
index a5b612e73..6370d8c60 100644
--- a/core/grub/PKGBUILD
+++ b/core/grub/PKGBUILD
@@ -29,8 +29,8 @@ _GRUB_EMU_BUILD="0"
 pkgname='grub'
 pkgdesc='GNU GRand Unified Bootloader (2)'
 epoch=2
-_commit='1514678888595ef41a968a0c69b7ff769edd1e9c'
-_pkgver=2.06.r380.g151467888
+_commit='7259d55ffcf124e32eafb61aa381f9856e98a708'
+_pkgver=2.06.r403.g7259d55ff
 _unifont_ver='14.0.04'
 pkgver=${_pkgver/-/}
 pkgrel=1
@@ -73,6 +73,7 @@ source=("git+https://git.savannah.gnu.org/git/grub.git#commit=${_commit}"
         "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-fix-f2fs.patch'
         '0004-10_linux-add-archlinuxarm-s-default-kernel-path.patch'
         'grub.default'
         'sbat.csv')
@@ -83,6 +84,7 @@ sha256sums=('SKIP'
             'SKIP'
             '5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab'
             '8488aec30a93e8fe66c23ef8c23aefda39c38389530e9e73ba3fbcc8315d244d'
+            'b783ec919b22e628d3db91ede4571272ffa833d20ab42eccace15258a884c26b'
             'bfa56cc7cb2e1650fcd19ecfe5b8d2d0aa7bbc4266a0a5fb1e5d4f60e4a7fa56'
             '7df3f5cb5df7d2dfb17f4c9b5c5dedc9519ddce6f8d2c6cd43d1be17cecb65cb'
             '98b23d41e223bdc0a6e20bdcb3aa77e642f29b64081b1fd2f575314172fc89df')
@@ -141,6 +143,9 @@ prepare() {
 	echo "Patch to detect of Arch Linux initramfs images by grub-mkconfig..."
 	patch -Np1 -i "${srcdir}/0002-10_linux-detect-archlinux-initramfs.patch"
 
+	echo "Patch to fix f2fs..."
+	patch -Np1 -i "${srcdir}/0003-fix-f2fs.patch"
+
 	echo "Patch to detect of Arch Linux ARM kernel images by grub-mkconfig..."
 	patch -Np1 -i "${srcdir}/0004-10_linux-add-archlinuxarm-s-default-kernel-path.patch"