diff options
Diffstat (limited to 'app-shells/mksh')
| -rw-r--r-- | app-shells/mksh/Manifest | 3 | ||||
| -rw-r--r-- | app-shells/mksh/files/mksh-59c-fgrep.patch | 60 | ||||
| -rw-r--r-- | app-shells/mksh/mksh-59c.ebuild | 6 |
3 files changed, 67 insertions, 2 deletions
diff --git a/app-shells/mksh/Manifest b/app-shells/mksh/Manifest index 028b814258cf..adcf5c449ef9 100644 --- a/app-shells/mksh/Manifest +++ b/app-shells/mksh/Manifest @@ -1,4 +1,5 @@ +AUX mksh-59c-fgrep.patch 1851 BLAKE2B ba5df8d147b023f1943aba977d37d90158cec61cfca148296d4cdb69c6174d648734ab41ac48cf8b33f5fb4d44836b21fa4956a421e5d2e6fa51724b1978717f SHA512 47d601708708b6e09735b8e13b29f792ecaf92276074f764e78d3cfe00fe509cbaa54e5081e87f653c168aba172157b72033e7cde526409e6fca454aeeaf01a9 DIST mksh-R59c.tgz 442736 BLAKE2B 4e1b6e6fc69b27d01e262a5622191515fa71d29e81a3f10fb60458542506874b49f60f9af1e28c1cd266c63c91e3287579ab6bda00c39b7388445b19c969fa22 SHA512 f56b6956f9e1dd88ddce2294301a5eb698050d9d4f49286fdcd8f9df8554eabbcc71d37e2bf3eb7234e3968a17231cc6de8aa7efbf17768834a90b14e8cdf340 -EBUILD mksh-59c.ebuild 1997 BLAKE2B 4e01871df364e2e4eac92916dd4fd57602cb4e095c755b1c9ff90b1f1c26685087dd1abb48a1ecebf383876c8f25355890068cf11db9419d1137047e081ea32b SHA512 aac624dcc5e4f2084feb44870dace89113b62632048af84555f0c2579aa5904b8e8f429bc9c59b44055ccb394b5fc3d4ca48be0ce172be22ee1713b5edaaadaf +EBUILD mksh-59c.ebuild 2046 BLAKE2B d3d6a09ec61816af189a284065fd7526bea07417fa1a594f3e7ab61daf8ce0d9a981280c7f3d5839704da3e9092ef4eabd0c34ddedaecf12bb18e6d972363c2d SHA512 c40bab3a23b8a6de0a2f142d9c9d779960c17ebd9cb06db2325e11c297fdcc15fee58074a2d13156efa14729cd7488393a420f6cc594311fdc47dbad47b12a4c EBUILD mksh-9999.ebuild 1998 BLAKE2B e2586d58783170f2bfdf5a717d52af6a684d6702bf65edc33bdee46db1cbbb274b26c1b06c3633922ac3250a44bb9452b33d4f95475c30dcff2054f6e2eedf15 SHA512 882937fe1f85031ec93ff8b6fdb6f1dc609e548af8733de2e1d3d7fd879476f910bec7003cb37057cb15c65838c1903fd6db40ae50a4c9802bea49654cb33c57 MISC metadata.xml 596 BLAKE2B c65d930e2a67da2a937dfadc2364d5f55807097faec84aa631fed278ee6551f59e2b485a879de1d966987cd2fac8fcf6185ebe18ba004e80d08a19709d2e3521 SHA512 c4f170e1dd27bc9bb305f75c34d23f057be4a48da522b12044b8b4bd3070af1140d0d2268f41d890078896176630523e29fb5ce7b50ab548b04e4f69d1633384 diff --git a/app-shells/mksh/files/mksh-59c-fgrep.patch b/app-shells/mksh/files/mksh-59c-fgrep.patch new file mode 100644 index 000000000000..c27bf893934c --- /dev/null +++ b/app-shells/mksh/files/mksh-59c-fgrep.patch @@ -0,0 +1,60 @@ +From 94229c3fdb6bb3afcc6fbecf4b2e521a9d485dd1 Mon Sep 17 00:00:00 2001 +From: tg <tg@mirbsd.org> +Date: Tue, 27 Jul 2021 19:17:14 +0000 +Subject: [PATCH] =?UTF-8?q?we=20may=20have=20neither=20fgrep=20nor=20grep?= + =?UTF-8?q?=20-F=20(scosysv=20has=20only=20the=20former=E2=80=A6)?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + Build.sh | 6 +++--- + check.t | 8 ++++---- + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/Build.sh b/Build.sh +index dc98dfa2..08d368d2 100644 +--- a/Build.sh ++++ b/Build.sh +@@ -1413,7 +1413,7 @@ tcc) + ;; + tendra) + vv '|' "$CC $CFLAGS $CPPFLAGS $LDFLAGS $NOWARN $LIBS -V 2>&1 | \ +- grep -F -i -e version -e release" ++ grep -i -e version -e release" + ;; + ucode) + vv '|' "$CC $CFLAGS $CPPFLAGS $LDFLAGS $NOWARN $LIBS -V" +@@ -2688,7 +2688,7 @@ cat >test.sh <<-EOF + args[\${#args[*]}]=\$TMPDIR + fi + print Testing mksh for conformance: +- grep -F -e 'KSH R' -e Mir''OS: "\$sflag" | sed '/KSH/s/^./& /' ++ grep -e 'KSH R' -e Mir''OS: "\$sflag" | sed '/KSH/s/^./& /' + print "This shell is actually:\\n\\t\$KSH_VERSION" + print 'test.sh built for mksh $dstversion' + cstr='\$os = defined \$^O ? \$^O : "unknown";' +diff --git a/check.t b/check.t +index 0d9d50c4..bfe116f0 100644 +--- a/check.t ++++ b/check.t +@@ -6726,7 +6726,7 @@ stdin: + echo FNORD-7 + typeset - + echo FNORD-8 +- } | fgrep FNORD ++ } | grep FNORD + fnord=(42 23) + typeset -p fnord + echo FNORD-9 +@@ -8723,8 +8723,8 @@ stdin: + (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 PIPESTATUS ++ echo 8 $(set | grep PIPESTATUS) . + expected-stdout: + 1 0 . + 2 0 . diff --git a/app-shells/mksh/mksh-59c.ebuild b/app-shells/mksh/mksh-59c.ebuild index 2921a6d7f5c8..4dff407f5308 100644 --- a/app-shells/mksh/mksh-59c.ebuild +++ b/app-shells/mksh/mksh-59c.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -39,6 +39,10 @@ DEPEND=" ) " +PATCHES=( + "${FILESDIR}/mksh-59c-fgrep.patch" +) + src_prepare() { default if use lksh; then |