347 convert xpg4/sh and ilk to use ksh93

Reviewed by: richlowe@richlowe.net
Reviewed by: johnsonnenschein@gmail.com
Reviewed by: guido+illumos.org@berhoerster.name
Reviewed by: gwr@nexenta.com
Approved by: gwr@nexenta.com

5 files changed, 64 insertions, 20 deletions

diff --git a/exception_lists/closed-bins b/exception_lists/closed-bins
index a90fc23905..bdb34fb9ce 100644
--- a/exception_lists/closed-bins
+++ b/exception_lists/closed-bins
@@ -40,6 +40,24 @@
 ./usr/bin/printf
 ./usr/bin/tr
 ./usr/bin/tail
+./usr/xpg4/bin/alias
+./usr/xpg4/bin/bg
+./usr/xpg4/bin/cd
+./usr/xpg4/bin/command
+./usr/xpg4/bin/fc
+./usr/xpg4/bin/fg
+./usr/xpg4/bin/getopts
+./usr/xpg4/bin/hash
+./usr/xpg4/bin/jobs
+./usr/xpg4/bin/kill
+./usr/xpg4/bin/read
+./usr/xpg4/bin/sh
 ./usr/xpg4/bin/tail
+./usr/xpg4/bin/test
 ./usr/xpg4/bin/tr
+./usr/xpg4/bin/type
+./usr/xpg4/bin/ulimit
+./usr/xpg4/bin/umask
+./usr/xpg4/bin/unalias
+./usr/xpg4/bin/wait
 ./usr/xpg6/bin/tr
diff --git a/exception_lists/copyright b/exception_lists/copyright
index cca987f762..af88ad2ef0 100644
--- a/exception_lists/copyright
+++ b/exception_lists/copyright
@@ -23,6 +23,7 @@
 #
 
 syntax: glob
+exception_lists/closed-bins
 exception_lists/cstyle
 exception_lists/hdrchk
 usr/src/cmd/krb5/kadmin/cli/kadmin_ct.c
diff --git a/usr/src/cmd/ksh/builtins/Makefile b/usr/src/cmd/ksh/builtins/Makefile
index 69a86bbaae..bdf1665d8f 100644
--- a/usr/src/cmd/ksh/builtins/Makefile
+++ b/usr/src/cmd/ksh/builtins/Makefile
@@ -24,7 +24,9 @@
 # Use is subject to license terms.
 #
 
-SHELL=/usr/bin/ksh93
+#
+# Copyright 2010 Nexenta Systems, Inc.  All rights reserved.
+#
 
 PROG= alias
 ALIASPROG= \
@@ -59,10 +61,28 @@ ALIASPROG= \
 	wait \
 	wc
 
+XPG4ALIASPROG= \
+	bg \
+	cd \
+	command \
+	fc \
+	fg \
+	getopts \
+	hash \
+	jobs \
+	kill \
+	read \
+	test \
+	type \
+	ulimit \
+	umask \
+	unalias \
+	wait
+
 include ../../Makefile.cmd
 $(SPARC_BLD)include ../../Makefile.cmd.64
 
-ROOTALIASPROG= $(ALIASPROG:%=$(ROOTBIN)/%)
+ROOTALIASPROG= $(ALIASPROG:%=$(ROOTBIN)/%) $(XPG4ALIASPROG:%=$(ROOTXPG4BIN)/%)
 
 FILEMODE= 555
 
@@ -73,6 +93,9 @@ all: $(PROG)
 $(ROOTBIN)/%: $(ROOTBIN)/alias
 	$(INS.link)
 
+$(ROOTXPG4BIN)/%: $(ROOTBIN)/alias
+	$(INS.link)
+
 .KEEP_STATE:
 
 # Set common AST build flags (e.g., needed to support the math stuff).
diff --git a/usr/src/pkg/manifests/SUNWcs.mf b/usr/src/pkg/manifests/SUNWcs.mf
index 27944b3c75..f0682b869e 100644
--- a/usr/src/pkg/manifests/SUNWcs.mf
+++ b/usr/src/pkg/manifests/SUNWcs.mf
@@ -21,6 +21,8 @@
 
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 
+# Copyright 2010 Nexenta Systems, Inc.  All rights reserved.
+
 set name=pkg.fmri value=pkg:/SUNWcs@$(PKGVERS)
 set name=pkg.description \
     value="core software for a specific instruction-set architecture"
@@ -2005,7 +2007,6 @@ file path=usr/share/lib/zoneinfo/src/systemv
 file path=usr/share/lib/zoneinfo/tab/continent.tab
 file path=usr/share/lib/zoneinfo/tab/country.tab
 file path=usr/share/lib/zoneinfo/tab/zone_sun.tab
-file path=usr/xpg4/bin/sh mode=0555
 file path=var/adm/aculog mode=0600 owner=uucp preserve=true
 file path=var/adm/spellhist mode=0666 preserve=true
 file path=var/adm/utmpx preserve=true
@@ -2532,7 +2533,25 @@ hardlink path=usr/share/lib/zoneinfo/W-SU \
     target=../../../../usr/share/lib/zoneinfo/Europe/Moscow
 hardlink path=usr/share/lib/zoneinfo/Zulu \
     target=../../../../usr/share/lib/zoneinfo/Etc/UTC
+hardlink path=usr/xpg4/bin/alias target=../../bin/alias
+hardlink path=usr/xpg4/bin/bg target=../../bin/alias
+hardlink path=usr/xpg4/bin/cd target=../../bin/alias
+hardlink path=usr/xpg4/bin/command target=../../bin/alias
+hardlink path=usr/xpg4/bin/fc target=../../bin/alias
+hardlink path=usr/xpg4/bin/fg target=../../bin/alias
+hardlink path=usr/xpg4/bin/getopts target=../../bin/alias
+hardlink path=usr/xpg4/bin/hash target=../../bin/alias
+hardlink path=usr/xpg4/bin/jobs target=../../bin/alias
+hardlink path=usr/xpg4/bin/kill target=../../bin/alias
 hardlink path=usr/xpg4/bin/pfsh target=../../bin/pfexec
+hardlink path=usr/xpg4/bin/read target=../../bin/alias
+hardlink path=usr/xpg4/bin/sh target=../../bin/ksh93
+hardlink path=usr/xpg4/bin/test target=../../bin/alias
+hardlink path=usr/xpg4/bin/type target=../../bin/alias
+hardlink path=usr/xpg4/bin/ulimit target=../../bin/alias
+hardlink path=usr/xpg4/bin/umask target=../../bin/alias
+hardlink path=usr/xpg4/bin/unalias target=../../bin/alias
+hardlink path=usr/xpg4/bin/wait target=../../bin/alias
 legacy pkg=SUNWcsr \
     desc="core software for a specific instruction-set architecture" \
     name="Core Solaris, (Root)"
diff --git a/usr/src/pkg/manifests/system-xopen-xcu4.mf b/usr/src/pkg/manifests/system-xopen-xcu4.mf
index bf73d7e0a2..46d55d0dc1 100644
--- a/usr/src/pkg/manifests/system-xopen-xcu4.mf
+++ b/usr/src/pkg/manifests/system-xopen-xcu4.mf
@@ -33,7 +33,6 @@ set name=variant.arch value=$(ARCH)
 dir path=usr group=sys
 dir path=usr/xpg4
 dir path=usr/xpg4/bin
-file path=usr/xpg4/bin/alias mode=0555
 file path=usr/xpg4/bin/ar mode=0555
 file path=usr/xpg4/bin/at group=sys mode=4755
 file path=usr/xpg4/bin/awk mode=0555
@@ -71,30 +70,14 @@ file path=usr/xpg4/bin/sed mode=0555
 file path=usr/xpg4/bin/sort mode=0555
 file path=usr/xpg4/bin/stty mode=0555
 file path=usr/xpg4/bin/who mode=0555
-hardlink path=usr/xpg4/bin/bg target=../../../usr/xpg4/bin/alias
-hardlink path=usr/xpg4/bin/cd target=../../../usr/xpg4/bin/alias
-hardlink path=usr/xpg4/bin/command target=../../../usr/xpg4/bin/alias
 hardlink path=usr/xpg4/bin/egrep target=../../../usr/xpg4/bin/grep
 hardlink path=usr/xpg4/bin/ex target=../../../usr/xpg4/bin/edit
-hardlink path=usr/xpg4/bin/fc target=../../../usr/xpg4/bin/alias
-hardlink path=usr/xpg4/bin/fg target=../../../usr/xpg4/bin/alias
 hardlink path=usr/xpg4/bin/fgrep target=../../../usr/xpg4/bin/grep
-hardlink path=usr/xpg4/bin/getopts target=../../../usr/xpg4/bin/alias
-hardlink path=usr/xpg4/bin/hash target=../../../usr/xpg4/bin/alias
-hardlink path=usr/xpg4/bin/jobs target=../../../usr/xpg4/bin/alias
-hardlink path=usr/xpg4/bin/kill target=../../../usr/xpg4/bin/alias
 hardlink path=usr/xpg4/bin/ln target=../../../usr/xpg4/bin/cp
 hardlink path=usr/xpg4/bin/mv target=../../../usr/xpg4/bin/cp
-hardlink path=usr/xpg4/bin/read target=../../../usr/xpg4/bin/alias
-hardlink path=usr/xpg4/bin/test target=../../../usr/xpg4/bin/alias
-hardlink path=usr/xpg4/bin/type target=../../../usr/xpg4/bin/alias
-hardlink path=usr/xpg4/bin/ulimit target=../../../usr/xpg4/bin/alias
-hardlink path=usr/xpg4/bin/umask target=../../../usr/xpg4/bin/alias
-hardlink path=usr/xpg4/bin/unalias target=../../../usr/xpg4/bin/alias
 hardlink path=usr/xpg4/bin/vedit target=../../../usr/xpg4/bin/edit
 hardlink path=usr/xpg4/bin/vi target=../../../usr/xpg4/bin/edit
 hardlink path=usr/xpg4/bin/view target=../../../usr/xpg4/bin/edit
-hardlink path=usr/xpg4/bin/wait target=../../../usr/xpg4/bin/alias
 legacy pkg=SUNWxcu4 \
     desc="utilities providing conformance with XCU4 specifications" \
     name="XCU4 Utilities"