PSARC 2010/067 Interim modernization updates

6915312 ON should be able to build IPS packages natively
6281004 docbook.dtd is obsolete and unused
6490919 strange file in onnv-gate
6878498 update tools proto ${ROOT} to include ${MACH} and make nightly.sh copy it into parent repository
6888427 SVM packages should drop legacy objects
6893530 Some header files can be opened up
6903324 sharemgr should either use isaexec or not build 64-bit commands
6920651 mktpl will inadvertently reuse stale license files for empty license lists
6920674 svvs kmods should not be built during an open build
Portions contributed by Rich Lowe <richlowe@richlowe.net>

--HG--
rename : usr/src/cmd/oamuser/user/stdprofile => usr/src/cmd/nsadmin/dot-profile.sh
rename : usr/src/cmd/nsadmin/profile => usr/src/cmd/nsadmin/etc-profile.sh
rename : usr/src/pkgdefs/common_files/i.manifest => usr/src/cmd/svc/common/i.manifest
rename : usr/src/pkgdefs/common_files/r.manifest => usr/src/cmd/svc/common/r.manifest
rename : usr/src/lib/brand/native/Makefile => usr/src/lib/brand/ipkg/Makefile
rename : usr/src/lib/brand/native/zone/Makefile => usr/src/lib/brand/ipkg/zone/Makefile
rename : usr/src/lib/brand/native/zone/SUNWblank.xml => usr/src/lib/brand/ipkg/zone/SUNWblank.xml
rename : usr/src/lib/brand/native/zone/SUNWdefault.xml => usr/src/lib/brand/ipkg/zone/SUNWdefault.xml
rename : usr/src/lib/brand/native/zone/config.xml => usr/src/lib/brand/ipkg/zone/config.xml
rename : usr/src/lib/brand/native/zone/platform.xml => usr/src/lib/brand/ipkg/zone/platform.xml
rename : usr/src/lib/brand/native/Makefile => usr/src/lib/brand/labeled/Makefile
rename : usr/src/lib/brand/native/zone/Makefile => usr/src/lib/brand/labeled/zone/Makefile
rename : usr/src/lib/brand/native/zone/config.xml => usr/src/lib/brand/labeled/zone/config.xml
rename : usr/src/lib/brand/native/zone/platform.xml => usr/src/lib/brand/labeled/zone/platform.xml
rename : usr/src/lib/brand/native/zone/common.ksh => usr/src/lib/brand/shared/common.ksh
rename : usr/src/lib/brand/native/zone/query.ksh => usr/src/lib/brand/shared/query.ksh
rename : usr/src/lib/brand/native/zone/uninstall.ksh => usr/src/lib/brand/shared/uninstall.ksh
rename : usr/src/pkgdefs/common_files/i.rbac => usr/src/lib/libsecdb/common/i.rbac
rename : usr/src/pkgdefs/common_files/r.rbac => usr/src/lib/libsecdb/common/r.rbac
rename : usr/src/pkgdefs/license_files/cr_ATT => usr/src/pkg/license_files/cr_ATT
rename : usr/src/pkgdefs/SUNWfipe/cr_Intel => usr/src/pkg/license_files/cr_Intel.SUNWfipe
rename : usr/src/pkgdefs/SUNWintgige/cr_Intel => usr/src/pkg/license_files/cr_Intel.SUNWintgige
rename : usr/src/pkgdefs/license_files/cr_Sun => usr/src/pkg/license_files/cr_Sun
rename : usr/src/pkgdefs/SUNWgrub/grubcredits => usr/src/pkg/license_files/grubcredits
rename : usr/src/pkgdefs/SUNWcsl/lic_AMD => usr/src/pkg/license_files/lic_AMD
rename : usr/src/pkgdefs/license_files/lic_CDDL => usr/src/pkg/license_files/lic_CDDL
rename : usr/src/pkgdefs/SUNWemlxs/lic_Emulex => usr/src/pkg/license_files/lic_Emulex
rename : usr/src/pkgdefs/license_files/lic_GPLv2 => usr/src/pkg/license_files/lic_GPLv2
rename : usr/src/pkgdefs/CPQary3/lic_HP => usr/src/pkg/license_files/lic_HP
rename : usr/src/tools/opensolaris/BINARYLICENSE.txt => usr/src/pkg/license_files/lic_OSBL
rename : usr/src/pkgdefs/license_files/lic_OSBL_preamble => usr/src/pkg/license_files/lic_OSBL_preamble
rename : usr/src/pkgdefs/SUNWqlc/lic_Qlogic => usr/src/pkg/license_files/lic_Qlogic
rename : usr/src/pkgdefs/SUNWhwdata/LICENSE => usr/src/pkg/license_files/lic_SUNWhwdata
rename : usr/src/pkgdefs/SUNWroute/copyright.in => usr/src/pkg/license_files/lic_SUNWroute
rename : usr/src/pkgdefs/SUNWgss/gss_license => usr/src/pkg/license_files/lic_gss
rename : usr/src/pkgdefs/license_files/license_in_headers => usr/src/pkg/license_files/license_in_headers
rename : usr/src/uts/intel/os/solaris.xpm.gz => usr/src/uts/intel/os/solaris.xpm

4 files changed, 106 insertions, 3 deletions

diff --git a/usr/src/cmd/Adm/Makefile b/usr/src/cmd/Adm/Makefile
index ff765ae0c3..dbd4539bdf 100644
--- a/usr/src/cmd/Adm/Makefile
+++ b/usr/src/cmd/Adm/Makefile
@@ -19,13 +19,13 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
 CRON_ENT= adm root sys
 CRON_LIB= .proto at.deny cron.deny queuedefs
-ETC_SCRIPT= group project ttysrch
+ETC_SCRIPT= group project ttysrch mailcap mime.types
 ZI_SPECIAL= zones-index
 SUBDIRS= sun
 
diff --git a/usr/src/cmd/Adm/mailcap b/usr/src/cmd/Adm/mailcap
new file mode 100644
index 0000000000..eaab2d3ce4
--- /dev/null
+++ b/usr/src/cmd/Adm/mailcap
@@ -0,0 +1,55 @@
+
+# Java Web Start
+application/x-java-jnlp-file; /usr/bin/javaws %s
+# OpenOffice.org
+application/vnd.oasis.opendocument.text; /usr/bin/soffice -view %s
+application/vnd.oasis.opendocument.text-template; /usr/bin/soffice -view %s
+application/vnd.oasis.opendocument.text-web; /usr/bin/soffice -view %s
+application/vnd.oasis.opendocument.text-master; /usr/bin/soffice -view %s
+application/vnd.sun.xml.writer; /usr/bin/soffice -view %s
+application/vnd.sun.xml.writer.template; /usr/bin/soffice -view %s
+application/vnd.sun.xml.writer.global; /usr/bin/soffice -view %s
+application/vnd.stardivision.writer; /usr/bin/soffice -view %s
+application/vnd.stardivision.writer-global; /usr/bin/soffice -view %s
+application/x-starwriter; /usr/bin/soffice -view %s
+application/vnd.oasis.opendocument.formula; /usr/bin/soffice -view %s
+application/vnd.sun.xml.math; /usr/bin/soffice -view %s
+application/vnd.stardivision.math; /usr/bin/soffice -view %s
+application/x-starmath; /usr/bin/soffice -view %s
+application/msword; /usr/bin/soffice -view %s
+application/vnd.oasis.opendocument.spreadsheet; /usr/bin/soffice -view %s
+application/vnd.oasis.opendocument.spreadsheet-template; /usr/bin/soffice -view %s
+application/vnd.sun.xml.calc; /usr/bin/soffice -view %s
+application/vnd.sun.xml.calc.template; /usr/bin/soffice -view %s
+application/vnd.stardivision.calc; /usr/bin/soffice -view %s
+application/x-starcalc; /usr/bin/soffice -view %s
+application/vnd.stardivision.chart; /usr/bin/soffice -view %s
+application/x-starchart; /usr/bin/soffice -view %s
+application/excel; /usr/bin/soffice -view %s
+application/msexcel; /usr/bin/soffice -view %s
+application/vnd.ms-excel; /usr/bin/soffice -view %s
+application/x-msexcel; /usr/bin/soffice -view %s
+application/vnd.oasis.opendocument.presentation; /usr/bin/soffice -view %s
+application/vnd.oasis.opendocument.presentation-template; /usr/bin/soffice -view %s
+application/vnd.sun.xml.impress; /usr/bin/soffice -view %s
+application/vnd.sun.xml.impress.template; /usr/bin/soffice -view %s
+application/vnd.stardivision.impress; /usr/bin/soffice -view %s
+application/x-starimpress; /usr/bin/soffice -view %s
+application/powerpoint; /usr/bin/soffice -view %s
+application/mspowerpoint; /usr/bin/soffice -view %s
+application/vnd.ms-powerpoint; /usr/bin/soffice -view %s
+application/x-mspowerpoint; /usr/bin/soffice -view %s
+application/vnd.oasis.opendocument.graphics; /usr/bin/soffice -view %s
+application/vnd.oasis.opendocument.graphics-template; /usr/bin/soffice -view %s
+application/vnd.sun.xml.draw; /usr/bin/soffice -view %s
+application/vnd.sun.xml.draw.template; /usr/bin/soffice -view %s
+application/vnd.stardivision.draw; /usr/bin/soffice -view %s
+application/x-stardraw; /usr/bin/soffice -view %s
+application/vnd.sun.xml.base; /usr/bin/soffice -view %s
+application/vnd.oasis.opendocument.database; /usr/bin/soffice -view %s
+application/vnd.writerperfect; /usr/bin/soffice -view %s
+application/wordperfect5.1; /usr/bin/soffice -view %s
+application/x-wordperfect; /usr/bin/soffice -view %s
+application/wordperfect; /usr/bin/soffice -view %s
+application/wpwin; /usr/bin/soffice -view %s
+application/vnd.openofficeorg.extension; /usr/bin/soffice %s
diff --git a/usr/src/cmd/Adm/mime.types b/usr/src/cmd/Adm/mime.types
new file mode 100644
index 0000000000..9eb0db828d
--- /dev/null
+++ b/usr/src/cmd/Adm/mime.types
@@ -0,0 +1,48 @@
+#--Netscape Communications Corporation MIME Information
+#Do not delete the above line. It is used to identify the file type.
+#mime types added by Netscape Helper
+type=application/x-java-jnlp-file desc="Java Web Start" exts="jnlp"
+application/vnd.oasis.opendocument.text odt
+application/vnd.oasis.opendocument.text-template ott
+application/vnd.oasis.opendocument.text-web oth
+application/vnd.oasis.opendocument.text-master odm
+application/vnd.oasis.opendocument.graphics odg
+application/vnd.oasis.opendocument.graphics-template otg
+application/vnd.oasis.opendocument.presentation odp
+application/vnd.oasis.opendocument.presentation-template otp
+application/vnd.oasis.opendocument.spreadsheet ods
+application/vnd.oasis.opendocument.spreadsheet-template ots
+application/vnd.oasis.opendocument.chart odc
+application/vnd.oasis.opendocument.formula odf
+application/vnd.oasis.opendocument.image odi
+application/vnd.sun.xml.writer sxw
+application/vnd.sun.xml.writer.template stw
+application/vnd.sun.xml.writer.global sxg
+application/vnd.stardivision.writer sdw vor
+application/vnd.stardivision.writer-global sgl
+application/vnd.sun.xml.calc sxc
+application/vnd.sun.xml.calc.template stc
+application/vnd.stardivision.calc sdc
+application/vnd.stardivision.chart sds
+application/vnd.sun.xml.impress sxi
+application/vnd.sun.xml.impress.template sti
+application/vnd.stardivision.impress sdd sdp
+application/vnd.sun.xml.draw sxd
+application/vnd.sun.xml.draw.template std
+application/vnd.stardivision.draw sda
+application/vnd.sun.xml.math sxm
+application/vnd.stardivision.math smf
+application/vnd.sun.xml.base odb
+application/vnd.openofficeorg.extension oxt
+application/vnd.openxmlformats-officedocument.wordprocessingml.document docx
+application/vnd.ms-word.document.macroenabled.12 docm
+application/vnd.openxmlformats-officedocument.wordprocessingml.template dotx
+application/vnd.ms-word.template.macroenabled.12 dotm
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet xlsx
+application/vnd.ms-excel.sheet.macroenabled.12 xlsm
+application/vnd.openxmlformats-officedocument.spreadsheetml.template xltx
+application/vnd.ms-excel.template.macroenabled.12 xltm
+application/vnd.openxmlformats-officedocument.presentationml.presentation pptx
+application/vnd.ms-powerpoint.presentation.macroenabled.12 pptm
+application/vnd.openxmlformats-officedocument.presentationml.template potx
+application/vnd.ms-powerpoint.template.macroenabled.12 potm
diff --git a/usr/src/cmd/Adm/sun/passwd b/usr/src/cmd/Adm/sun/passwd
index 89c1ebdc08..a804965217 100644
--- a/usr/src/cmd/Adm/sun/passwd
+++ b/usr/src/cmd/Adm/sun/passwd
@@ -1,4 +1,4 @@
-root:x:0:0:Super-User:/root:/sbin/sh
+root:x:0:0:Super-User:/root:/usr/bin/bash
 daemon:x:1:1::/:
 bin:x:2:2::/usr/bin:
 sys:x:3:3::/: