From 44b0fed6a2dafab3ccce48a145d2e55722ae8fe5 Mon Sep 17 00:00:00 2001
From: Zach van Rijn <me@zv.io>
Date: Wed, 10 May 2023 10:51:41 -0700
Subject: user/grub: add patch for deprecated fgrep usage. fixes #1027.

---
 user/grub/APKBUILD                         |  4 +-
 user/grub/fix-deprecated-fgrep-usage.patch | 75 ++++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 user/grub/fix-deprecated-fgrep-usage.patch

(limited to 'user')

diff --git a/user/grub/APKBUILD b/user/grub/APKBUILD
index 66488715d..187dc3524 100644
--- a/user/grub/APKBUILD
+++ b/user/grub/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=grub
 pkgver=2.04
-pkgrel=4
+pkgrel=5
 pkgdesc="Bootloader with support for Linux, Multiboot and more"
 url="https://www.gnu.org/software/grub/"
 arch="all !s390x"
@@ -36,6 +36,7 @@ source="https://ftp.gnu.org/gnu/grub/grub-$pkgver.tar.xz
 	adelie-branding.patch
 	fix-gcc-no-pie-specs.patch
 	grub2-accept-empty-module.patch
+	fix-deprecated-fgrep-usage.patch
 	grub-xen-host_grub.cfg
 	default-grub
 	update-grub
@@ -184,6 +185,7 @@ sha512sums="9c15c42d0cf5d61446b752194e3b628bb04be0fe6ea0240ab62b3d75378471274484
 4a6c909a1150b057fb0563f7a0646db33e16f84d6a8c443ef7db4003efd56c211a52f87699c5c95a6ccde65f6db46a8711a5b784f38479db804938dfe3115439  adelie-branding.patch
 f2a7d9ab6c445f4e402e790db56378cecd6631b5c367451aa6ce5c01cd95b95c83c3dd24d6d4b857f8f42601eba82c855607513eb6ce5b2af6bd6c71f046e288  fix-gcc-no-pie-specs.patch
 6e001762f7f562f2fafed56118079122e7602c731c70723241276f523e0882a3930d720fd847143d379ffd85626d2d7d3fa914590c0de1f0903a293695e71c41  grub2-accept-empty-module.patch
+bca0f23e73bfa09108bbf7b8ee12635051122e0a1f0db7d8a7d53727ba7d8f45b76a70a04c070e900109cd2baf97fcaf01a07208d45597ed1c390d5cf63ba9cd  fix-deprecated-fgrep-usage.patch
 4e7394e0fff6772c89683039ccf81099ebbfe4f498e6df408977a1488fd59389b6e19afdbf0860ec271e2b2aea0df7216243dcc8235d1ca3af0e7f4d0a9d60a4  grub-xen-host_grub.cfg
 1cb675fa0af9a1fd8d1a868e3e9de3bfef7eada66c5df0cfef23eca33e93e676eed6e1f67c679690f3e581565b350a9f3ba01aa9b89de66c970ea61ca21bcd65  default-grub
 8e5f1cf91da9fd956695438509bb26e45f38170ca90d99a996e859053d72c82b7e4b02cb8979f047fc53498036f47b5400bf54687c390793995a05ded4216d55  update-grub
diff --git a/user/grub/fix-deprecated-fgrep-usage.patch b/user/grub/fix-deprecated-fgrep-usage.patch
new file mode 100644
index 000000000..a37ce9912
--- /dev/null
+++ b/user/grub/fix-deprecated-fgrep-usage.patch
@@ -0,0 +1,75 @@
+diff -ur a/grub-core/lib/libgcrypt/src/libgcrypt-config.in b/grub-core/lib/libgcrypt/src/libgcrypt-config.in
+--- a/grub-core/lib/libgcrypt/src/libgcrypt-config.in	2023-05-10 17:44:15.293941096 +0000
++++ b/grub-core/lib/libgcrypt/src/libgcrypt-config.in	2023-05-10 17:44:42.164950456 +0000
+@@ -142,7 +142,7 @@
+ 
+     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 @@
+ 
+     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 -ur a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in
+--- a/util/grub.d/10_hurd.in	2023-05-10 17:44:15.453935199 +0000
++++ b/util/grub.d/10_hurd.in	2023-05-10 17:44:42.088953259 +0000
+@@ -168,7 +168,7 @@
+   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 -ur a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
+--- a/util/grub.d/10_kfreebsd.in	2023-05-10 17:44:15.453935199 +0000
++++ b/util/grub.d/10_kfreebsd.in	2023-05-10 17:44:42.164950456 +0000
+@@ -231,7 +231,7 @@
+     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 -ur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+--- a/util/grub.d/10_linux.in	2023-05-10 17:44:15.453935199 +0000
++++ b/util/grub.d/10_linux.in	2023-05-10 17:44:42.160950604 +0000
+@@ -282,7 +282,7 @@
+                 "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 -ur a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
+--- a/util/grub.d/20_linux_xen.in	2023-05-10 17:44:15.453935199 +0000
++++ b/util/grub.d/20_linux_xen.in	2023-05-10 17:44:42.156950751 +0000
+@@ -310,12 +310,12 @@
+ 		"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
-- 
cgit v1.2.3-60-g2f50