From 8c7e0d75f52793b2a9e8e00ce630ba73ab64446d Mon Sep 17 00:00:00 2001
From: Zach van Rijn <me@zv.io>
Date: Fri, 7 Apr 2023 15:30:09 +0000
Subject: user/mksh: add patch for deprecated fgrep usage. fixes #980.

---
 user/mksh/APKBUILD                   |  7 +++++--
 user/mksh/fix-deprecated-fgrep.patch | 22 ++++++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 user/mksh/fix-deprecated-fgrep.patch

(limited to 'user')

diff --git a/user/mksh/APKBUILD b/user/mksh/APKBUILD
index 8c0e47752..596380611 100644
--- a/user/mksh/APKBUILD
+++ b/user/mksh/APKBUILD
@@ -12,7 +12,9 @@ checkdepends="ed perl"
 makedepends=""
 subpackages="$pkgname-doc"
 install="mksh.post-install mksh.post-upgrade mksh.pre-deinstall"
-source="http://www.mirbsd.org/MirOS/dist/mir/${pkgname}/${pkgname}-R${pkgver}.tgz"
+source="https://www.mirbsd.org/MirOS/dist/mir/${pkgname}/${pkgname}-R${pkgver}.tgz
+	fix-deprecated-fgrep.patch
+	"
 builddir="$srcdir"/$pkgname
 
 build() {
@@ -51,4 +53,5 @@ package() {
 	install -m 644 FAQ.htm    "$pkgdir"/usr/share/doc/mksh/
 }
 
-sha512sums="f56b6956f9e1dd88ddce2294301a5eb698050d9d4f49286fdcd8f9df8554eabbcc71d37e2bf3eb7234e3968a17231cc6de8aa7efbf17768834a90b14e8cdf340  mksh-R59c.tgz"
+sha512sums="f56b6956f9e1dd88ddce2294301a5eb698050d9d4f49286fdcd8f9df8554eabbcc71d37e2bf3eb7234e3968a17231cc6de8aa7efbf17768834a90b14e8cdf340  mksh-R59c.tgz
+46210a286add06ac46adbc57c2150eb98ae67af7f79c509e0d11443cb33ce6617c1fa587179bb1955a832549515e8b1def1e32784caf91b54f7d5cfee1b43970  fix-deprecated-fgrep.patch"
diff --git a/user/mksh/fix-deprecated-fgrep.patch b/user/mksh/fix-deprecated-fgrep.patch
new file mode 100644
index 000000000..03f701f78
--- /dev/null
+++ b/user/mksh/fix-deprecated-fgrep.patch
@@ -0,0 +1,22 @@
+--- a/check.t
++++ b/check.t
+@@ -6728,7 +6728,7 @@
+ 		echo FNORD-7
+ 		typeset -
+ 		echo FNORD-8
+-	} | fgrep FNORD
++	} | grep -F FNORD
+ 	fnord=(42 23)
+ 	typeset -p fnord
+ 	echo FNORD-9
+@@ -8641,8 +8641,8 @@
+ 	(echo x; exit 12) | (cat; exit 23) | (cat; exit 42)
+ 	echo 5 $? , $PIPESTATUS , ${PIPESTATUS[0]} , ${PIPESTATUS[1]} , ${PIPESTATUS[2]} , ${PIPESTATUS[3]} .
+ 	echo 6 ${PIPESTATUS[0]} .
+-	set | fgrep PIPESTATUS
+-	echo 8 $(set | fgrep PIPESTATUS) .
++	set | grep -F PIPESTATUS
++	echo 8 $(set | grep -F PIPESTATUS) .
+ expected-stdout:
+ 	1 0 .
+ 	2 0 .
-- 
cgit v1.2.3-60-g2f50