From 744e68e7be7dab6c685e7be1504a7d0a41af07c8 Mon Sep 17 00:00:00 2001
From: Martijn Dekker <martijn@inlv.org>
Date: Fri, 8 Jan 2021 11:47:05 +0000
Subject: [PATCH] rm obsolete /usr/5bin paths (Solaris patch 130-CR7019368)

This change is pulled from here:
https://github.com/oracle/solaris-userland/blob/master/components/ksh93/patches/130-CR7019368.patch
---
 src/cmd/INIT/regress.sh       | 2 +-
 src/lib/libast/comp/mkdir.c   | 2 +-
 src/lib/libast/comp/rmdir.c   | 2 +-
 src/lib/libast/port/astconf.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/cmd/INIT/regress.sh b/src/cmd/INIT/regress.sh
index b9db5cbafd5a..8b3106523116 100644
--- a/src/cmd/INIT/regress.sh
+++ b/src/cmd/INIT/regress.sh
@@ -1379,7 +1379,7 @@ esac
 export COLUMNS=80
 SOURCE=$PWD
 PATH=$SOURCE:${PATH#?(.):}
-PATH=${PATH%%:?(.)}:/usr/5bin:/bin:/usr/bin
+PATH=${PATH%%:?(.)}:/bin:/usr/bin
 UNIT=$1
 shift
 if	[[ -f $UNIT && ! -x $UNIT ]]
diff --git a/src/lib/libast/comp/mkdir.c b/src/lib/libast/comp/mkdir.c
index 37e8e51cfd76..4a74d680b91a 100644
--- a/src/lib/libast/comp/mkdir.c
+++ b/src/lib/libast/comp/mkdir.c
@@ -39,7 +39,7 @@ mkdir(const char* path, mode_t mode)
 	register int	n;
 	char*		av[3];
 
-	static char*	cmd[] = { "/bin/mkdir", "/usr/5bin/mkdir", 0 };
+	static char*	cmd[] = { "/bin/mkdir", 0 };
 
 
 	n = errno;
diff --git a/src/lib/libast/comp/rmdir.c b/src/lib/libast/comp/rmdir.c
index 9b3270d75956..b27e60dee06f 100644
--- a/src/lib/libast/comp/rmdir.c
+++ b/src/lib/libast/comp/rmdir.c
@@ -39,7 +39,7 @@ rmdir(const char* path)
 	struct stat	st;
 	char*		av[3];
 
-	static char*	cmd[] = { "/bin/rmdir", "/usr/5bin/rmdir", 0 };
+	static char*	cmd[] = { "/bin/rmdir", 0 };
 
 	if (stat(path, &st) < 0) return(-1);
 	if (!S_ISDIR(st.st_mode))
diff --git a/src/lib/libast/port/astconf.c b/src/lib/libast/port/astconf.c
index 7dd357c75958..df4f5c8f8de8 100644
--- a/src/lib/libast/port/astconf.c
+++ b/src/lib/libast/port/astconf.c
@@ -569,7 +569,7 @@ initialize(register Feature_t* fp, const char* path, const char* command, const
 						}
 						if (fp->op == OP_universe)
 						{
-							if (strneq(p, "xpg", 3) || strneq(p, "5bin", 4))
+							if (strneq(p, "xpg", 3))
 							{
 								ok = 1;
 								break;