From eef60aa96288e762fb25679be14553770b345869 Mon Sep 17 00:00:00 2001
From: Joe Bo Run <joborun@disroot.org>
Date: Sat, 10 Dec 2022 10:57:32 +0200
Subject: [PATCH] upg grub

---
 grub/0003-fix-f2fs.patch | 13 +++++++++++++
 grub/PKGBUILD            | 24 +++++++++++++-----------
 grub/PKGBUILD-arch       |  9 +++++++--
 grub/time                |  7 ++++---
 linux-lts/PKGBUILD       | 15 ++++++++++-----
 5 files changed, 47 insertions(+), 21 deletions(-)
 create mode 100644 grub/0003-fix-f2fs.patch

diff --git a/grub/0003-fix-f2fs.patch b/grub/0003-fix-f2fs.patch
new file mode 100644
index 0000000..0d1d744
--- /dev/null
+++ b/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/grub/PKGBUILD b/grub/PKGBUILD
index 52617c5..6196c2c 100644
--- a/grub/PKGBUILD
+++ b/grub/PKGBUILD
@@ -20,8 +20,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='15.0.01'
 pkgver=${_pkgver/-/}
 pkgrel=01
@@ -59,6 +59,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'
         'grub.default'
         'grub.default.run'
         'grub.default.66'
@@ -119,8 +120,8 @@ prepare() {
 
 	patch -Np1 -i "${srcdir}/0002-10_linux-detect-archlinux-initramfs.patch"
 
-#	echo "Patch to increase default heap size..."
-#	patch -Np1 -i "${srcdir}/0003-kern-efi-mm-increase-default-heap-size.patch"
+	echo "Patch to fix f2fs..."
+	patch -Np1 -i "${srcdir}/0003-fix-f2fs.patch"
 
 	echo "Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme..."
 	sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "configure.ac"
@@ -325,13 +326,14 @@ validpgpkeys=('E53D497F3FA42AD8C9B4D1E835A93B74E82E4209'  # Vladimir 'phcoder' S
 
 sha256sums=(SKIP
 	SKIP
-	1fddba900a36b8a067bf2177b05c4a2482a0f7ca1545cf531c03509f47ce1590 # unifont-15.0.01.bdf.gz
-	7d2bfe94e8365d4178b849d6c12c40794e7af84ed6eebd878ac480f547fd38d0 # unifont-15.0.01.bdf.gz.sig
-	5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab # 0001-00_header-add-GRUB_COLOR_-variables.patch
-	8488aec30a93e8fe66c23ef8c23aefda39c38389530e9e73ba3fbcc8315d244d # 0002-10_linux-detect-archlinux-initramfs.patch
-	83f99850b6c751d0a7bd3e6b9f1808a0c05962cdd1cd8f57cbbd63f1a3379c96 # grub.default
-	83f99850b6c751d0a7bd3e6b9f1808a0c05962cdd1cd8f57cbbd63f1a3379c96 # grub.default.run
-	adad61d98de32e241a1cf55a166699de449533fa16e15e97a326515f80639ef7 # grub.default.66
+	1fddba900a36b8a067bf2177b05c4a2482a0f7ca1545cf531c03509f47ce1590  # unifont-15.0.01.bdf.gz
+	7d2bfe94e8365d4178b849d6c12c40794e7af84ed6eebd878ac480f547fd38d0  # unifont-15.0.01.bdf.gz.sig
+	5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab  # 0001-00_header-add-GRUB_COLOR_-variables.patch
+	8488aec30a93e8fe66c23ef8c23aefda39c38389530e9e73ba3fbcc8315d244d  # 0002-10_linux-detect-archlinux-initramfs.patch
+	b783ec919b22e628d3db91ede4571272ffa833d20ab42eccace15258a884c26b  # 0003-fix-f2fs.patch
+	83f99850b6c751d0a7bd3e6b9f1808a0c05962cdd1cd8f57cbbd63f1a3379c96  # grub.default
+	83f99850b6c751d0a7bd3e6b9f1808a0c05962cdd1cd8f57cbbd63f1a3379c96  # grub.default.run
+	adad61d98de32e241a1cf55a166699de449533fa16e15e97a326515f80639ef7  # grub.default.66
 	98b23d41e223bdc0a6e20bdcb3aa77e642f29b64081b1fd2f575314172fc89df) # sbat.csv
 
 
diff --git a/grub/PKGBUILD-arch b/grub/PKGBUILD-arch
index 5b6f10e..69f3b2c 100644
--- a/grub/PKGBUILD-arch
+++ b/grub/PKGBUILD-arch
@@ -18,8 +18,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='15.0.01'
 pkgver=${_pkgver/-/}
 pkgrel=1
@@ -62,6 +62,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'
         'grub.default'
         'sbat.csv')
 
@@ -71,6 +72,7 @@ sha256sums=('SKIP'
             'SKIP'
             '5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab'
             '8488aec30a93e8fe66c23ef8c23aefda39c38389530e9e73ba3fbcc8315d244d'
+            'b783ec919b22e628d3db91ede4571272ffa833d20ab42eccace15258a884c26b'
             '7df3f5cb5df7d2dfb17f4c9b5c5dedc9519ddce6f8d2c6cd43d1be17cecb65cb'
             '98b23d41e223bdc0a6e20bdcb3aa77e642f29b64081b1fd2f575314172fc89df')
 
@@ -128,6 +130,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 "Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme..."
 	sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "configure.ac"
 
diff --git a/grub/time b/grub/time
index 618e9aa..61e754a 100644
--- a/grub/time
+++ b/grub/time
@@ -1,5 +1,6 @@
 
-real	8m0.553s
-user	7m13.665s
-sys	0m45.978s
 
+real	9m11.244s
+user	8m25.139s
+sys	0m54.002s
+ 
diff --git a/linux-lts/PKGBUILD b/linux-lts/PKGBUILD
index 1538399..d8ef9ed 100644
--- a/linux-lts/PKGBUILD
+++ b/linux-lts/PKGBUILD
@@ -43,9 +43,10 @@ prepare() {
     patch -Np1 < "../$src"
   done
 
-  echo "Setting joborunlinux config..."
+  echo "Setting joborun config..."
   cp ../config .config
   make olddefconfig
+  diff -u ../config .config || :
 
   make -s kernelrelease > version
   echo "Prepared $pkgbase version $(<version)"
@@ -62,8 +63,8 @@ _package() {
   depends=(coreutils kmod initramfs)
   optdepends=('wireless-regdb: to set the correct wireless channels of your country'
               'linux-firmware: firmware images needed for some devices')
-  provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE)
-  replaces=(wireguard-lts)
+  provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE)
+  replaces=(virtualbox-guest-modules-lts wireguard-lts)
 
   cd $_srcname
   local kernver="$(<version)"
@@ -78,7 +79,8 @@ _package() {
   echo "$pkgbase" | install -Dm644 /dev/stdin "$modulesdir/pkgbase"
 
   echo "Installing modules..."
-  make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 DEPMOD=/doesnt/exist modules_install  # Suppress depmod
+  make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 \
+    DEPMOD=/doesnt/exist modules_install  # Suppress depmod
 
   # remove build and source links
   rm "$modulesdir"/{source,build}
@@ -98,11 +100,14 @@ _package-headers() {
   install -Dt "$builddir/arch/x86" -m644 arch/x86/Makefile
   cp -t "$builddir" -a scripts
 
+  # required when STACK_VALIDATION is enabled
   # add objtool for external module building and enabled VALIDATION_STACK option
   install -Dt "$builddir/tools/objtool" tools/objtool/objtool
 
   # add xfs and shmem for aufs building
   mkdir -p "$builddir"/{fs/xfs,mm}
+#  # required when DEBUG_INFO_BTF_MODULES is enabled
+  install -Dt "$builddir/tools/bpf/resolve_btfids" tools/bpf/resolve_btfids/resolve_btfids
 
   echo "Installing headers..."
   cp -t "$builddir" -a include
@@ -146,7 +151,7 @@ _package-headers() {
   echo "Stripping build tools..."
   local file
   while read -rd '' file; do
-    case "$(file -bi "$file")" in
+    case "$(file -Sib "$file")" in
       application/x-sharedlib\;*)      # Libraries (.so)
         strip -v $STRIP_SHARED "$file" ;;
       application/x-archive\;*)        # Libraries (.a)