From 8e8ff5f6f6c3a649bf9c5d383075fd9af9a6120a Mon Sep 17 00:00:00 2001
From: Martijn Dekker <martijn@inlv.org>
Date: Mon, 18 Jan 2021 06:11:45 +0000
Subject: [PATCH] Disable SHOPT_PFSH in feature test (re: f089d799)

src/cmd/ksh93/features/options:
- To make sure SHOPT_PFSH stays disabled on Solaris, we
  also need to stop this feature test from re-enabling it.
---
 src/cmd/ksh93/features/options | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/cmd/ksh93/features/options b/src/cmd/ksh93/features/options
index 8c1fcf562c66..f8eaceddcff6 100644
--- a/src/cmd/ksh93/features/options
+++ b/src/cmd/ksh93/features/options
@@ -29,8 +29,11 @@ tst	cross{
 	case  `echo a | tr a '\012' | wc -l` in
 	*1*)	option MULTIBYTE 0 ;;
 	esac
-	test -x /bin/pfexec -o -x /usr/bin/pfexec
-	option PFSH $?
+
+	# deprecated: Solaris disabled SHOPT_PFSH in its build
+	#test -x /bin/pfexec -o -x /usr/bin/pfexec
+	#option PFSH $?
+
 	/bin/test ! -l . 2> /dev/null
 	option TEST_L $?
 	test -f /etc/ksh.kshrc -o -f /etc/bash.bashrc &&