From b02052f621cf82906fa2fcb6265b9f05d2c01fb9 Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@hotmail.com>
Date: Sun, 24 Dec 2023 16:36:07 +0300
Subject: [PATCH] grub2 rebuild

---
 .../0001-Fix-fgrep-grep-F-warnings.patch      | 96 +++++++++++++++++++
 system/boot/grub2/pspec.xml                   | 11 ++-
 2 files changed, 106 insertions(+), 1 deletion(-)
 create mode 100644 system/boot/grub2/files/mageia/0001-Fix-fgrep-grep-F-warnings.patch

diff --git a/system/boot/grub2/files/mageia/0001-Fix-fgrep-grep-F-warnings.patch b/system/boot/grub2/files/mageia/0001-Fix-fgrep-grep-F-warnings.patch
new file mode 100644
index 00000000..9201092a
--- /dev/null
+++ b/system/boot/grub2/files/mageia/0001-Fix-fgrep-grep-F-warnings.patch
@@ -0,0 +1,96 @@
+From bdfef59dea2964f285487262cb1c1507a82d509f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Giuseppe=20Ghib=C3=B2?= <ghibo@mageia.org>
+Date: Wed, 19 Oct 2022 10:08:19 +0200
+Subject: [PATCH] Fix fgrep/grep -F warnings
+
+---
+ grub-core/lib/libgcrypt/src/libgcrypt-config.in | 4 ++--
+ util/grub.d/10_hurd.in                          | 2 +-
+ util/grub.d/10_kfreebsd.in                      | 2 +-
+ util/grub.d/10_linux.in                         | 2 +-
+ util/grub.d/20_linux_xen.in                     | 4 ++--
+ 5 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/grub-core/lib/libgcrypt/src/libgcrypt-config.in b/grub-core/lib/libgcrypt/src/libgcrypt-config.in
+index c052638..84f3b26 100644
+--- a/grub-core/lib/libgcrypt/src/libgcrypt-config.in
++++ b/grub-core/lib/libgcrypt/src/libgcrypt-config.in
+@@ -142,7 +142,7 @@ if test "$echo_cflags" = "yes"; then
+ 
+     tmp=""
+     for i in $includes $cflags_final; do
+-       if echo "$tmp" | fgrep -v -- "$i" >/dev/null; then
++       if echo "$tmp" | grep -F -v -- "$i" >/dev/null; then
+            tmp="$tmp $i"
+        fi
+     done
+@@ -163,7 +163,7 @@ if test "$echo_libs" = "yes"; then
+ 
+     tmp=""
+     for i in $libdirs $libs_final; do
+-       if echo "$tmp" | fgrep -v -- "$i" >/dev/null; then
++       if echo "$tmp" | grep -F -v -- "$i" >/dev/null; then
+            tmp="$tmp $i"
+        fi
+     done
+diff --git a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in
+index 3663d36..c566821 100644
+--- a/util/grub.d/10_hurd.in
++++ b/util/grub.d/10_hurd.in
+@@ -176,7 +176,7 @@ while [ "x$kernels" != "x" ] ; do
+   hurd_entry "$kernel" advanced
+   hurd_entry "$kernel" recovery
+ 
+-  kernels=`echo $kernels | tr ' ' '\n' | fgrep -vx "$kernel" | tr '\n' ' '`
++  kernels=`echo $kernels | tr ' ' '\n' | grep -F -vx "$kernel" | tr '\n' ' '`
+ done
+ 
+ # If at least one kernel was found, then we need to
+diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
+index 199b20e..0ed082f 100644
+--- a/util/grub.d/10_kfreebsd.in
++++ b/util/grub.d/10_kfreebsd.in
+@@ -239,7 +239,7 @@ while [ "x$list" != "x" ] ; do
+     kfreebsd_entry "${OS}" "${version}" recovery "-s"
+   fi
+ 
+-  list=`echo $list | tr ' ' '\n' | fgrep -vx "$kfreebsd" | tr '\n' ' '`
++  list=`echo $list | tr ' ' '\n' | grep -F -vx "$kfreebsd" | tr '\n' ' '`
+ done
+ 
+ # If at least one kernel was found, then we need to
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index b9623a3..d97655c 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -343,7 +343,7 @@ while [ "x$list" != "x" ] ; do
+                 "failsafe ${GRUB_CMDLINE_LINUX}"
+   fi
+ 
+-  list=`echo $list | tr ' ' '\n' | fgrep -vx "$linux" | tr '\n' ' '`
++  list=`echo $list | tr ' ' '\n' | grep -F -vx "$linux" | tr '\n' ' '`
+ done
+ 
+ # If at least one kernel was found, then we need to
+diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
+index c23b064..b8238f7 100644
+--- a/util/grub.d/20_linux_xen.in
++++ b/util/grub.d/20_linux_xen.in
+@@ -355,12 +355,12 @@ while [ "x${xen_list}" != "x" ] ; do
+ 		"single ${GRUB_CMDLINE_LINUX}" "${GRUB_CMDLINE_XEN}"
+ 	fi
+ 
+-	list=`echo $list | tr ' ' '\n' | fgrep -vx "$linux" | tr '\n' ' '`
++	list=`echo $list | tr ' ' '\n' | grep -F -vx "$linux" | tr '\n' ' '`
+     done
+     if [ x"$is_top_level" != xtrue ]; then
+ 	echo '	}'
+     fi
+-    xen_list=`echo $xen_list | tr ' ' '\n' | fgrep -vx "$current_xen" | tr '\n' ' '`
++    xen_list=`echo $xen_list | tr ' ' '\n' | grep -F -vx "$current_xen" | tr '\n' ' '`
+ done
+ 
+ # If at least one kernel was found, then we need to
+-- 
+2.38.0
+
diff --git a/system/boot/grub2/pspec.xml b/system/boot/grub2/pspec.xml
index 432681ac..8a46406e 100644
--- a/system/boot/grub2/pspec.xml
+++ b/system/boot/grub2/pspec.xml
@@ -14,7 +14,7 @@
         <Description>GNU GRUB (short for GNU GRand Unified Bootloader) is a boot loader package from the GNU Project.</Description>
         <Archive sha1sum="c9f93f1e195ec7a5a21d36a13b469788c0b29f0f" type="tarxz">https://ftp.gnu.org/gnu/grub/grub-2.06.tar.xz</Archive>
 <!--         <Archive sha1sum="4ec712aced1c2b4cb6cd1cbd83fc2154249d6977" type="tarxz" target="grub-2.06/grub-extras">https://sourceforge.net/projects/pisilinux/files/source/grub2_extras_915resolution_r10.tar.xz</Archive> -->
-        <Archive sha1sum="6c2e7a8bcec9489ba2987c4618252fa0574c8fef" type="gz">https://ftp.gnu.org/gnu/unifont/unifont-15.1.01/unifont-15.1.01.bdf.gz</Archive>
+        <Archive sha1sum="a1c085e822be3506371cef9e5bda3cb07551aa05" type="gz">https://ftp.gnu.org/gnu/unifont/unifont-15.1.04/unifont-15.1.04.bdf.gz</Archive>
 <!--         <Archive sha1sum="30797ba7a86fc32213b9ae994c9fa45f37d01170" type="gz">http://ftp.gnu.org/gnu/unifont/unifont-6.3.20131217/unifont-6.3.20131217.bdf.gz</Archive> -->
         <Archive sha1sum="69a15f2195b345bc1028e5d5769e4564b013ca68" type="targz" target="grub-2.06/themes">https://github.com/erkanisik1/Pisilinux2.3.4-Grub2-Themes/archive/refs/tags/1.0.tar.gz</Archive>
         <BuildDependencies>
@@ -44,6 +44,8 @@
             <Package>grub</Package>
         </Replaces>
         <Patches>
+            <Patch level="1">mageia/0001-Fix-fgrep-grep-F-warnings.patch</Patch>
+
             <Patch level="1">gfxpayload.patch</Patch>
             <Patch level="1">grub-2.02_beta2-KERNEL_GLOBS.patch</Patch>
             <Patch level="1">grub-mkconfig.patch</Patch>
@@ -111,6 +113,13 @@
     </Package>
 
     <History>
+        <Update release="28">
+            <Date>2023-12-24</Date>
+            <Version>2.06</Version>
+            <Comment>Rebuild</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="27">
             <Date>2023-09-12</Date>
             <Version>2.06</Version>