--- a/components/trousers/trousers.p5m Fri Jan 23 17:31:40 2015 -0800
+++ b/components/trousers/trousers.p5m Tue Feb 03 19:24:25 2015 -0800
@@ -18,31 +18,26 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri \
value=pkg:/library/security/trousers@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary \
- value="TrouSerS TCG software to access a TPM device"
+set name=pkg.summary value="TrouSerS TCG software to access a TPM device"
set name=pkg.description \
value="The TrouSerS library provides a software stack from the Trusted Computer Group (TCG) that accesses a Trusted Platform Module (TPM) hardware device."
set name=com.oracle.info.description value="the TrouSerS library"
set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification \
- value=org.opensolaris.category.2008:System/Security
+set name=info.classification value=org.opensolaris.category.2008:System/Security
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2008/725
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=org.opensolaris.arc-caseid \
- value=PSARC/2008/725
-dir path=var/tpm/pkcs11 group=sys mode=1777 owner=root
-dir path=var/tpm/system group=sys mode=0700 owner=root
-dir path=var/tpm/userps group=sys mode=1777 owner=root
file auth_attr path=etc/security/auth_attr.d/trousers
file prof_attr path=etc/security/prof_attr.d/trousers
-file etc/tcsd.conf path=etc/security/tcsd.conf mode=0644 preserve=true original_name=SUNWtss-root:etc/security/tcsd.conf
+file etc/tcsd.conf path=etc/security/tcsd.conf mode=0644 \
+ original_name=SUNWtss-root:etc/security/tcsd.conf preserve=true
file tcsd.xml path=lib/svc/manifest/application/security/tcsd.xml
file tcsd.sh path=lib/svc/method/tcsd.sh mode=555
file path=usr/include/trousers/trousers.h
@@ -70,12 +65,16 @@
file path=usr/include/tss/tss_error_basics.h
file path=usr/include/tss/tss_structs.h
file path=usr/include/tss/tss_typedef.h
+link path=usr/lib/$(MACH64)/libtspi.so target=libtspi.so.1.1.3
+link path=usr/lib/$(MACH64)/libtspi.so.1 target=libtspi.so.1.1.3
file path=usr/lib/$(MACH64)/libtspi.so.1.1.3
file path=usr/lib/$(MACH64)/llib-ltspi.ln
+link path=usr/lib/libtspi.so target=libtspi.so.1.1.3
+link path=usr/lib/libtspi.so.1 target=libtspi.so.1.1.3
file path=usr/lib/libtspi.so.1.1.3
file path=usr/lib/llib-ltspi
file path=usr/lib/llib-ltspi.ln
-file path=usr/lib/tcsd mode=555 owner=root
+file path=usr/lib/tcsd owner=root mode=555
file path=usr/share/man/man3/Tspi_ChangeAuth.3
file path=usr/share/man/man3/Tspi_ChangeAuthAsym.3
file path=usr/share/man/man3/Tspi_Context_Close.3
@@ -166,17 +165,18 @@
file path=usr/share/man/man3/Tspi_TPM_TakeOwnership.3
file path=usr/share/man/man5/tcsd.conf.5
file path=usr/share/man/man8/tcsd.8
-file dist/system.data.auth path=var/tpm/system/system.data.auth mode=0400 owner=root group=sys
-file dist/system.data.noauth path=var/tpm/system/system.data.noauth mode=0400 owner=root group=sys
-license trousers.license license=CPL
+dir path=var/tpm/pkcs11 owner=root group=sys mode=1777
+dir path=var/tpm/system owner=root group=sys mode=0700
link path=var/tpm/system/system.data target=system.data.auth
-link path=usr/lib/$(MACH64)/libtspi.so target=libtspi.so.1.1.3
-link path=usr/lib/$(MACH64)/libtspi.so.1 target=libtspi.so.1.1.3
-link path=usr/lib/libtspi.so target=libtspi.so.1.1.3
-link path=usr/lib/libtspi.so.1 target=libtspi.so.1.1.3
+file dist/system.data.auth path=var/tpm/system/system.data.auth owner=root \
+ group=sys mode=0400
+file dist/system.data.noauth path=var/tpm/system/system.data.noauth owner=root \
+ group=sys mode=0400
+dir path=var/tpm/userps owner=root group=sys mode=1777
+license trousers.license license=CPL
#
# libtspi requires 646%UTF-16LE.so and UTF-16LE%646.so, which are in
# package utf-8. This is for function Trspi_Native_To_UNICODE() which calls
# iconv_open() to dynamically load these libraries
#
-depend fmri=pkg:/system/library/iconv/utf-8 type=require
+depend type=require fmri=pkg:/system/library/iconv/utf-8