main/grub: fix fgrep warning

This commit is contained in:
Natanael Copa 2023-12-05 16:09:24 +01:00
parent a87b589869
commit cfa0dd82bc
2 changed files with 61 additions and 1 deletions

View File

@ -2,7 +2,7 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=grub
pkgver=2.06
pkgrel=16
pkgrel=17
pkgdesc="Bootloader with support for Linux, Multiboot and more"
url="https://www.gnu.org/software/grub/"
arch="all !s390x"
@ -71,6 +71,7 @@ source="https://ftp.gnu.org/gnu/grub/grub-$pkgver.tar.xz
fix-riscv64.patch
fix-xfs-1.patch
fix-xfs-2.patch
grep-F.patch
CVE-2021-3697-1.patch
CVE-2021-3697-2.patch
CVE-2021-3697-3.patch
@ -322,6 +323,7 @@ d4e311ed2a849d9424eb215b55e217e7c0db80b54c7dc67679eb1ec81892e4dff77d4e837abbd171
e2a968890fb54f5a070e1de0a30ae6f0a71952ce5f607bfc43798852398142e342e1477b2b51d74f06ad83f49c35f3c81f6c8c9f9d012bc4a327c266a520124f fix-riscv64.patch
ab487cb3f074e04d7bfcbb3bbd76109b3180ba1906baf6d25339496d1e9376673c924b9d11c60f0f8084bf85d5a766f5a5454ae736b75d433731a6100cfd5716 fix-xfs-1.patch
cfe20d2153375138ca4af2de2e2d076c410d3ecb0d5d8532e9a67a6387705e37013a56ea217df4d4756fff7120467d0f8b5ce60e72a367b4115b8285fb8e07f6 fix-xfs-2.patch
92aef47138e0ac344eb6e853cff45e811598000f04edf3eb06d1b904c8b73f7c63de4de9044a780e8d047cfbe05c1a508626e6dfc870448f5ec36ca8fbf68666 grep-F.patch
1ef0c87ab121a71453f9f34725ee33d21dfcc0918662a7483afc8213d773c7b663c6950c2120d54184ac833e8cb51312b1edc42d7649ec37529069d31c692a72 CVE-2021-3697-1.patch
0fd9e41fabd96ef119b9c24d7f380ad62060d7e3ebb58b832341adb4c682d2b10b2b5e36edc670460fe61e9355460b3af5a32a6c9d91f7fc9c9a2d53f52a15da CVE-2021-3697-2.patch
bf9a07f739d2fabd133cdfd360d96f7960b940421130597dadf596bacf0489c64d229b5079ef7bc930e9d6a5c4ad823906340a1d608c4b37571235b976485829 CVE-2021-3697-3.patch

58
main/grub/grep-F.patch Normal file
View File

@ -0,0 +1,58 @@
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 76e006b..a471c5f 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -296,7 +296,7 @@ while [ "x$list" != "x" ] ; do
"single ${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 69c76a8..8ae48e7 100644
--- a/util/grub.d/20_linux_xen.in
+++ b/util/grub.d/20_linux_xen.in
@@ -349,12 +349,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