6931042 pkgfmt's check mode should be built into hg nits and nightly
authorMark J. Nelson <Mark.J.Nelson@Oracle.COM>
Mon, 02 Aug 2010 16:32:07 -0600
changeset 13006 659c850dd2a2
parent 13005 c7857ae656c6
child 13007 f69f91784e5c
6931042 pkgfmt's check mode should be built into hg nits and nightly
usr/src/pkg/Makefile
usr/src/pkg/manifests/SUNWcs.mf
usr/src/pkg/manifests/consolidation-osnet-osnet-message-files.mf
usr/src/pkg/manifests/crypto-ca-certificates.mf
usr/src/pkg/manifests/developer-debug-mdb.mf
usr/src/pkg/manifests/developer-linker.mf
usr/src/pkg/manifests/developer-opensolaris-osnet.mf
usr/src/pkg/manifests/driver-network-ofk.mf
usr/src/pkg/manifests/driver-network-rdsv3.mf
usr/src/pkg/manifests/runtime-perl-510-module-sun-solaris.mf
usr/src/pkg/manifests/service-fault-management.mf
usr/src/pkg/manifests/source-demo-system.mf
usr/src/pkg/manifests/system-file-system-zfs.mf
usr/src/pkg/manifests/system-header.mf
usr/src/pkg/manifests/system-kernel-platform.mf
usr/src/pkg/manifests/system-library-platform.mf
usr/src/pkg/manifests/system-library-security-crypto-pkcs11_kms.mf
usr/src/pkg/manifests/system-library.mf
--- a/usr/src/pkg/Makefile	Mon Aug 02 15:21:03 2010 -0600
+++ b/usr/src/pkg/Makefile	Mon Aug 02 16:32:07 2010 -0600
@@ -538,6 +538,7 @@
 
 $(PDIR)/%.mog: manifests/%.mf
 	@print "Processing manifest $(<F)"
+	@pkgfmt -c $<
 	$(PKGDEBUG)$(RM) $(@) $(@:%.mog=%) $(@:%.mog=%.nodepend) \
 		$(PDIR)/$(@F:%.mog=%).metadata.* $(@).vars
 	$(PKGDEBUG)$(PKGMOGRIFY) $(PKGMOG_VERBOSE) $(PM_INC:%= -I %) \
--- a/usr/src/pkg/manifests/SUNWcs.mf	Mon Aug 02 15:21:03 2010 -0600
+++ b/usr/src/pkg/manifests/SUNWcs.mf	Mon Aug 02 16:32:07 2010 -0600
@@ -1258,6 +1258,7 @@
 file path=usr/lib/makekey mode=0555
 file path=usr/lib/more.help
 file path=usr/lib/newsyslog group=sys mode=0555
+file path=usr/lib/passmgmt group=sys mode=0555
 file path=usr/lib/pci/pcidr mode=0555
 file path=usr/lib/pci/pcidr_plugin.so
 file path=usr/lib/pfexecd mode=0555
@@ -1408,7 +1409,6 @@
 file path=usr/sbin/nscd mode=0555
 file path=usr/sbin/nwamadm mode=0555
 file path=usr/sbin/nwamcfg mode=0555
-file path=usr/lib/passmgmt group=sys mode=0555
 file path=usr/sbin/pmadm group=sys mode=0555
 file path=usr/sbin/praudit mode=0555
 $(i386_ONLY)file path=usr/sbin/prtdiag group=sys mode=2755
@@ -1443,8 +1443,8 @@
 file path=usr/sbin/syseventadm group=sys mode=0555
 file path=usr/sbin/syslogd group=sys mode=0555
 file path=usr/sbin/tar mode=0555
+file path=usr/sbin/traceroute mode=4555
 file path=usr/sbin/trapstat mode=0555
-file path=usr/sbin/traceroute mode=4555
 file path=usr/sbin/ttyadm group=sys mode=0755
 $(i386_ONLY)file path=usr/sbin/ucodeadm mode=0555
 file path=usr/sbin/umountall group=sys mode=0555
--- a/usr/src/pkg/manifests/consolidation-osnet-osnet-message-files.mf	Mon Aug 02 15:21:03 2010 -0600
+++ b/usr/src/pkg/manifests/consolidation-osnet-osnet-message-files.mf	Mon Aug 02 16:32:07 2010 -0600
@@ -305,8 +305,8 @@
 file path=usr/lib/locale/C/LC_MESSAGES/SCA1000.po
 file path=usr/lib/locale/C/LC_MESSAGES/SCA500.po
 file path=usr/lib/locale/C/LC_MESSAGES/SCF.po
+file path=usr/lib/locale/C/LC_MESSAGES/SENSOR.po
 file path=usr/lib/locale/C/LC_MESSAGES/SMF.po
-file path=usr/lib/locale/C/LC_MESSAGES/SENSOR.po
 file path=usr/lib/locale/C/LC_MESSAGES/STORAGE.po
 file path=usr/lib/locale/C/LC_MESSAGES/SUN4.po
 file path=usr/lib/locale/C/LC_MESSAGES/SUN4U.po
--- a/usr/src/pkg/manifests/crypto-ca-certificates.mf	Mon Aug 02 15:21:03 2010 -0600
+++ b/usr/src/pkg/manifests/crypto-ca-certificates.mf	Mon Aug 02 16:32:07 2010 -0600
@@ -24,8 +24,10 @@
 #
 
 set name=pkg.fmri value=pkg:/crypto/ca-certificates@$(PKGVERS)
-set name=pkg.description value="System X.509 Certifiate Trust Anchors for Public Certificate Authorities"
-set name=pkg.summary value="System X.509 Certifiate Trust Anchors for Public Certificate Authorities"
+set name=pkg.description \
+    value="System X.509 Certifiate Trust Anchors for Public Certificate Authorities"
+set name=pkg.summary \
+    value="System X.509 Certifiate Trust Anchors for Public Certificate Authorities"
 set name=info.classification \
     value=org.opensolaris.category.2010:System/Security
 set name=variant.arch value=$(ARCH)
@@ -35,34 +37,35 @@
 dir path=etc/certs/CA group=sys
 dir path=etc/openssl group=sys
 dir path=etc/openssl/certs group=sys
-
 file path=etc/certs/CA/ABAecom_sub.,_Am._Bankers_Assn._Root_CA.pem group=sys
+file path=etc/certs/CA/AOL_Time_Warner_Root_Certification_Authority_1.pem \
+    group=sys
+file path=etc/certs/CA/AOL_Time_Warner_Root_Certification_Authority_2.pem \
+    group=sys
 file path=etc/certs/CA/AddTrust_External_Root.pem group=sys
 file path=etc/certs/CA/AddTrust_Low-Value_Services_Root.pem group=sys
 file path=etc/certs/CA/AddTrust_Public_Services_Root.pem group=sys
 file path=etc/certs/CA/AddTrust_Qualified_Certificates_Root.pem group=sys
-file path=etc/certs/CA/America_Online_Root_Certification_Authority_1.pem group=sys
-file path=etc/certs/CA/America_Online_Root_Certification_Authority_2.pem group=sys
-file path=etc/certs/CA/AOL_Time_Warner_Root_Certification_Authority_1.pem group=sys
-file path=etc/certs/CA/AOL_Time_Warner_Root_Certification_Authority_2.pem group=sys
+file path=etc/certs/CA/America_Online_Root_Certification_Authority_1.pem \
+    group=sys
+file path=etc/certs/CA/America_Online_Root_Certification_Authority_2.pem \
+    group=sys
 file path=etc/certs/CA/Baltimore_CyberTrust_Root.pem group=sys
-file path=etc/certs/CA/beTRUSTed_Root_CA-Baltimore_Implementation.pem group=sys
-file path=etc/certs/CA/beTRUSTed_Root_CA_-_Entrust_Implementation.pem group=sys
-file path=etc/certs/CA/beTRUSTed_Root_CA.pem group=sys
-file path=etc/certs/CA/beTRUSTed_Root_CA_-_RSA_Implementation.pem group=sys
+file path=etc/certs/CA/COMODO_Certification_Authority.pem group=sys
+file path=etc/certs/CA/COMODO_ECC_Certification_Authority.pem group=sys
 file path=etc/certs/CA/Camerfirma_Chambers_of_Commerce_Root.pem group=sys
 file path=etc/certs/CA/Camerfirma_Global_Chambersign_Root.pem group=sys
 file path=etc/certs/CA/Certigna.pem group=sys
 file path=etc/certs/CA/Certplus_Class_2_Primary_CA.pem group=sys
 file path=etc/certs/CA/Certum_Root_CA.pem group=sys
+file path=etc/certs/CA/ComSign_CA.pem group=sys
+file path=etc/certs/CA/ComSign_Secured_CA.pem group=sys
 file path=etc/certs/CA/Comodo_AAA_Services_root.pem group=sys
-file path=etc/certs/CA/COMODO_Certification_Authority.pem group=sys
-file path=etc/certs/CA/COMODO_ECC_Certification_Authority.pem group=sys
 file path=etc/certs/CA/Comodo_Secure_Services_root.pem group=sys
 file path=etc/certs/CA/Comodo_Trusted_Services_root.pem group=sys
-file path=etc/certs/CA/ComSign_CA.pem group=sys
-file path=etc/certs/CA/ComSign_Secured_CA.pem group=sys
 file path=etc/certs/CA/Cybertrust_Global_Root.pem group=sys
+file path=etc/certs/CA/DST_ACES_CA_X6.pem group=sys
+file path=etc/certs/CA/DST_Root_CA_X3.pem group=sys
 file path=etc/certs/CA/Deutsche_Telekom_Root_CA_2.pem group=sys
 file path=etc/certs/CA/DigiCert_Assured_ID_Root_CA.pem group=sys
 file path=etc/certs/CA/DigiCert_Global_Root_CA.pem group=sys
@@ -72,36 +75,33 @@
 file path=etc/certs/CA/Digital_Signature_Trust_Co._Global_CA_2.pem group=sys
 file path=etc/certs/CA/Digital_Signature_Trust_Co._Global_CA_3.pem group=sys
 file path=etc/certs/CA/Digital_Signature_Trust_Co._Global_CA_4.pem group=sys
-file path=etc/certs/CA/DST_ACES_CA_X6.pem group=sys
-file path=etc/certs/CA/DST_Root_CA_X3.pem group=sys
 file path=etc/certs/CA/Entrust.net_Global_Secure_Personal_CA.pem group=sys
 file path=etc/certs/CA/Entrust.net_Global_Secure_Server_CA.pem group=sys
 file path=etc/certs/CA/Entrust.net_Premium_2048_Secure_Server_CA.pem group=sys
 file path=etc/certs/CA/Entrust.net_Secure_Personal_CA.pem group=sys
 file path=etc/certs/CA/Entrust.net_Secure_Server_CA.pem group=sys
 file path=etc/certs/CA/Entrust_Root_Certification_Authority.pem group=sys
-file path=etc/certs/CA/ePKI_Root_Certification_Authority.pem group=sys
 file path=etc/certs/CA/Equifax_Secure_CA.pem group=sys
+file path=etc/certs/CA/Equifax_Secure_Global_eBusiness_CA.pem group=sys
 file path=etc/certs/CA/Equifax_Secure_eBusiness_CA_1.pem group=sys
 file path=etc/certs/CA/Equifax_Secure_eBusiness_CA_2.pem group=sys
-file path=etc/certs/CA/Equifax_Secure_Global_eBusiness_CA.pem group=sys
 file path=etc/certs/CA/Firmaprofesional_Root_CA.pem group=sys
-file path=etc/certs/CA/GeoTrust_Global_CA_2.pem group=sys
+file path=etc/certs/CA/GTE_CyberTrust_Global_Root.pem group=sys
+file path=etc/certs/CA/GTE_CyberTrust_Root_CA.pem group=sys
 file path=etc/certs/CA/GeoTrust_Global_CA.pem group=sys
+file path=etc/certs/CA/GeoTrust_Global_CA_2.pem group=sys
 file path=etc/certs/CA/GeoTrust_Primary_Certification_Authority.pem group=sys
+file path=etc/certs/CA/GeoTrust_Universal_CA.pem group=sys
 file path=etc/certs/CA/GeoTrust_Universal_CA_2.pem group=sys
-file path=etc/certs/CA/GeoTrust_Universal_CA.pem group=sys
 file path=etc/certs/CA/GlobalSign_Root_CA.pem group=sys
 file path=etc/certs/CA/GlobalSign_Root_CA_-_R2.pem group=sys
 file path=etc/certs/CA/Go_Daddy_Class_2_CA.pem group=sys
-file path=etc/certs/CA/GTE_CyberTrust_Global_Root.pem group=sys
-file path=etc/certs/CA/GTE_CyberTrust_Root_CA.pem group=sys
 file path=etc/certs/CA/IGC_A.pem group=sys
-file path=etc/certs/CA/IPS_Chained_CAs_root.pem group=sys
 file path=etc/certs/CA/IPS_CLASE1_root.pem group=sys
 file path=etc/certs/CA/IPS_CLASE3_root.pem group=sys
 file path=etc/certs/CA/IPS_CLASEA1_root.pem group=sys
 file path=etc/certs/CA/IPS_CLASEA3_root.pem group=sys
+file path=etc/certs/CA/IPS_Chained_CAs_root.pem group=sys
 file path=etc/certs/CA/IPS_Servidores_root.pem group=sys
 file path=etc/certs/CA/IPS_Timestamping_root.pem group=sys
 file path=etc/certs/CA/MD5_Collisions_Forged_Rogue_CA_25c3.pem group=sys
@@ -112,14 +112,17 @@
 file path=etc/certs/CA/NetLock_Qualified_Class_QA_Root.pem group=sys
 file path=etc/certs/CA/Network_Solutions_Certificate_Authority.pem group=sys
 file path=etc/certs/CA/OISTE_WISeKey_Global_Root_GA_CA.pem group=sys
+file path=etc/certs/CA/QuoVadis_Root_CA.pem group=sys
 file path=etc/certs/CA/QuoVadis_Root_CA_2.pem group=sys
 file path=etc/certs/CA/QuoVadis_Root_CA_3.pem group=sys
-file path=etc/certs/CA/QuoVadis_Root_CA.pem group=sys
 file path=etc/certs/CA/RSA_Root_Certificate_1.pem group=sys
 file path=etc/certs/CA/RSA_Security_1024_v3.pem group=sys
 file path=etc/certs/CA/RSA_Security_2048_v3.pem group=sys
+file \
+    path=etc/certs/CA/S-TRUST_Authentication_and_Encryption_Root_CA_2005_PN.pem \
+    group=sys
+file path=etc/certs/CA/SecureTrust_CA.pem group=sys
 file path=etc/certs/CA/Secure_Global_CA.pem group=sys
-file path=etc/certs/CA/SecureTrust_CA.pem group=sys
 file path=etc/certs/CA/Security_Communication_EV_RootCA1.pem group=sys
 file path=etc/certs/CA/Security_Communication_Root_CA.pem group=sys
 file path=etc/certs/CA/Sonera_Class_1_Root_CA.pem group=sys
@@ -128,195 +131,361 @@
 file path=etc/certs/CA/Starfield_Class_2_CA.pem group=sys
 file path=etc/certs/CA/StartCom_Certification_Authority.pem group=sys
 file path=etc/certs/CA/StartCom_Ltd..pem group=sys
-file path=etc/certs/CA/S-TRUST_Authentication_and_Encryption_Root_CA_2005_PN.pem group=sys
-file path=etc/certs/CA/Swisscom_Root_CA_1.pem group=sys
 file path=etc/certs/CA/SwissSign_Gold_CA_-_G2.pem group=sys
 file path=etc/certs/CA/SwissSign_Platinum_CA_-_G2.pem group=sys
 file path=etc/certs/CA/SwissSign_Silver_CA_-_G2.pem group=sys
-file path=etc/certs/CA/Taiwan_GRCA.pem group=sys
+file path=etc/certs/CA/Swisscom_Root_CA_1.pem group=sys
+file path=etc/certs/CA/TC_TrustCenter,_Germany,_Class_2_CA.pem group=sys
+file path=etc/certs/CA/TC_TrustCenter,_Germany,_Class_3_CA.pem group=sys
 file path=etc/certs/CA/TC_TrustCenter_Class_2_CA_II.pem group=sys
 file path=etc/certs/CA/TC_TrustCenter_Class_3_CA_II.pem group=sys
-file path=etc/certs/CA/TC_TrustCenter,_Germany,_Class_2_CA.pem group=sys
-file path=etc/certs/CA/TC_TrustCenter,_Germany,_Class_3_CA.pem group=sys
 file path=etc/certs/CA/TC_TrustCenter_Universal_CA_I.pem group=sys
 file path=etc/certs/CA/TDC_Internet_Root_CA.pem group=sys
 file path=etc/certs/CA/TDC_OCES_Root_CA.pem group=sys
+file path=etc/certs/CA/TURKTRUST_Certificate_Services_Provider_Root_1.pem \
+    group=sys
+file path=etc/certs/CA/TURKTRUST_Certificate_Services_Provider_Root_2.pem \
+    group=sys
+file path=etc/certs/CA/Taiwan_GRCA.pem group=sys
 file path=etc/certs/CA/Thawte_Personal_Basic_CA.pem group=sys
 file path=etc/certs/CA/Thawte_Personal_Freemail_CA.pem group=sys
 file path=etc/certs/CA/Thawte_Personal_Premium_CA.pem group=sys
 file path=etc/certs/CA/Thawte_Premium_Server_CA.pem group=sys
-file path=etc/certs/CA/thawte_Primary_Root_CA.pem group=sys
 file path=etc/certs/CA/Thawte_Server_CA.pem group=sys
 file path=etc/certs/CA/Thawte_Time_Stamping_CA.pem group=sys
-file path=etc/certs/CA/TURKTRUST_Certificate_Services_Provider_Root_1.pem group=sys
-file path=etc/certs/CA/TURKTRUST_Certificate_Services_Provider_Root_2.pem group=sys
+file path=etc/certs/CA/UTN-USER_First-Network_Applications.pem group=sys
 file path=etc/certs/CA/UTN_DATACorp_SGC_Root_CA.pem group=sys
 file path=etc/certs/CA/UTN_USERFirst_Email_Root_CA.pem group=sys
 file path=etc/certs/CA/UTN_USERFirst_Hardware_Root_CA.pem group=sys
-file path=etc/certs/CA/UTN-USER_First-Network_Applications.pem group=sys
 file path=etc/certs/CA/UTN_USERFirst_Object_Root_CA.pem group=sys
 file path=etc/certs/CA/ValiCert_Class_1_VA.pem group=sys
 file path=etc/certs/CA/ValiCert_Class_2_VA.pem group=sys
-file path=etc/certs/CA/Verisign_Class_1_Public_Primary_Certification_Authority_-_G2.pem group=sys
-file path=etc/certs/CA/Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem group=sys
-file path=etc/certs/CA/Verisign_Class_1_Public_Primary_Certification_Authority.pem group=sys
-file path=etc/certs/CA/Verisign_Class_2_Public_Primary_Certification_Authority_-_G2.pem group=sys
-file path=etc/certs/CA/Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem group=sys
-file path=etc/certs/CA/Verisign_Class_2_Public_Primary_Certification_Authority.pem group=sys
-file path=etc/certs/CA/Verisign_Class_3_Public_Primary_Certification_Authority_-_G2.pem group=sys
-file path=etc/certs/CA/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem group=sys
-file path=etc/certs/CA/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem group=sys
-file path=etc/certs/CA/Verisign_Class_3_Public_Primary_Certification_Authority.pem group=sys
-file path=etc/certs/CA/Verisign_Class_4_Public_Primary_Certification_Authority_-_G2.pem group=sys
-file path=etc/certs/CA/Verisign_Class_4_Public_Primary_Certification_Authority_-_G3.pem group=sys
+file \
+    path=etc/certs/CA/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem \
+    group=sys
+file \
+    path=etc/certs/CA/Verisign_Class_1_Public_Primary_Certification_Authority.pem \
+    group=sys
+file \
+    path=etc/certs/CA/Verisign_Class_1_Public_Primary_Certification_Authority_-_G2.pem \
+    group=sys
+file \
+    path=etc/certs/CA/Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem \
+    group=sys
+file \
+    path=etc/certs/CA/Verisign_Class_2_Public_Primary_Certification_Authority.pem \
+    group=sys
+file \
+    path=etc/certs/CA/Verisign_Class_2_Public_Primary_Certification_Authority_-_G2.pem \
+    group=sys
+file \
+    path=etc/certs/CA/Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem \
+    group=sys
+file \
+    path=etc/certs/CA/Verisign_Class_3_Public_Primary_Certification_Authority.pem \
+    group=sys
+file \
+    path=etc/certs/CA/Verisign_Class_3_Public_Primary_Certification_Authority_-_G2.pem \
+    group=sys
+file \
+    path=etc/certs/CA/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem \
+    group=sys
+file \
+    path=etc/certs/CA/Verisign_Class_4_Public_Primary_Certification_Authority_-_G2.pem \
+    group=sys
+file \
+    path=etc/certs/CA/Verisign_Class_4_Public_Primary_Certification_Authority_-_G3.pem \
+    group=sys
 file path=etc/certs/CA/Verisign_RSA_Secure_Server_CA.pem group=sys
 file path=etc/certs/CA/Verisign_Time_Stamping_Authority_CA.pem group=sys
+file path=etc/certs/CA/Visa_International_Global_Root_2.pem group=sys
 file path=etc/certs/CA/Visa_eCommerce_Root.pem group=sys
-file path=etc/certs/CA/Visa_International_Global_Root_2.pem group=sys
+file path=etc/certs/CA/WellsSecure_Public_Root_Certificate_Authority.pem \
+    group=sys
 file path=etc/certs/CA/Wells_Fargo_Root_CA.pem group=sys
-file path=etc/certs/CA/WellsSecure_Public_Root_Certificate_Authority.pem group=sys
 file path=etc/certs/CA/XRamp_Global_CA_Root.pem group=sys
-
-link path=etc/openssl/certs/c9bc75ba.0 target=../../certs/CA/ABAecom_sub.,_Am._Bankers_Assn._Root_CA.pem
-link path=etc/openssl/certs/3c58f906.0 target=../../certs/CA/AddTrust_External_Root.pem
-link path=etc/openssl/certs/e268a4c5.0 target=../../certs/CA/AddTrust_Low-Value_Services_Root.pem
-link path=etc/openssl/certs/a2df7ad7.0 target=../../certs/CA/AddTrust_Public_Services_Root.pem
-link path=etc/openssl/certs/052e396b.0 target=../../certs/CA/AddTrust_Qualified_Certificates_Root.pem
-link path=etc/openssl/certs/bda4cc84.0 target=../../certs/CA/America_Online_Root_Certification_Authority_1.pem
-link path=etc/openssl/certs/2fb1850a.0 target=../../certs/CA/America_Online_Root_Certification_Authority_2.pem
-link path=etc/openssl/certs/0dbd0096.0 target=../../certs/CA/AOL_Time_Warner_Root_Certification_Authority_1.pem
-link path=etc/openssl/certs/0481cb65.0 target=../../certs/CA/AOL_Time_Warner_Root_Certification_Authority_2.pem
-link path=etc/openssl/certs/3ad48a91.0 target=../../certs/CA/Baltimore_CyberTrust_Root.pem
-link path=etc/openssl/certs/f3cf1e8e.0 target=../../certs/CA/beTRUSTed_Root_CA-Baltimore_Implementation.pem
-link path=etc/openssl/certs/47996b5c.0 target=../../certs/CA/beTRUSTed_Root_CA_-_Entrust_Implementation.pem
-link path=etc/openssl/certs/31044350.0 target=../../certs/CA/beTRUSTed_Root_CA.pem
-link path=etc/openssl/certs/bf87590f.0 target=../../certs/CA/beTRUSTed_Root_CA_-_RSA_Implementation.pem
-link path=etc/openssl/certs/ee7cd6fb.0 target=../../certs/CA/Camerfirma_Chambers_of_Commerce_Root.pem
-link path=etc/openssl/certs/a0bc6fbb.0 target=../../certs/CA/Camerfirma_Global_Chambersign_Root.pem
-link path=etc/openssl/certs/fde84897.0 target=../../certs/CA/Certigna.pem
-link path=etc/openssl/certs/17b51fe6.0 target=../../certs/CA/Certplus_Class_2_Primary_CA.pem
-link path=etc/openssl/certs/6e8bf996.0 target=../../certs/CA/Certum_Root_CA.pem
-link path=etc/openssl/certs/75680d2e.0 target=../../certs/CA/Comodo_AAA_Services_root.pem
-link path=etc/openssl/certs/5a3f0ff8.0 target=../../certs/CA/COMODO_Certification_Authority.pem
-link path=etc/openssl/certs/89c02a45.0 target=../../certs/CA/COMODO_ECC_Certification_Authority.pem
-link path=etc/openssl/certs/02b73561.0 target=../../certs/CA/Comodo_Secure_Services_root.pem
-link path=etc/openssl/certs/124bbd54.0 target=../../certs/CA/Comodo_Trusted_Services_root.pem
-link path=etc/openssl/certs/ff588423.0 target=../../certs/CA/ComSign_CA.pem
-link path=etc/openssl/certs/f58a60fe.0 target=../../certs/CA/ComSign_Secured_CA.pem
-link path=etc/openssl/certs/343eb6cb.0 target=../../certs/CA/Cybertrust_Global_Root.pem
-link path=etc/openssl/certs/4e18c148.0 target=../../certs/CA/Deutsche_Telekom_Root_CA_2.pem
-link path=etc/openssl/certs/69105f4f.0 target=../../certs/CA/DigiCert_Assured_ID_Root_CA.pem
-link path=etc/openssl/certs/399e7759.0 target=../../certs/CA/DigiCert_Global_Root_CA.pem
-link path=etc/openssl/certs/81b9768f.0 target=../../certs/CA/DigiCert_High_Assurance_EV_Root_CA.pem
-link path=etc/openssl/certs/c0cafbd2.0 target=../../certs/CA/DigiNotar_Root_CA.pem
-link path=etc/openssl/certs/c215bc69.0 target=../../certs/CA/Digital_Signature_Trust_Co._Global_CA_1.pem
-link path=etc/openssl/certs/128b9c8d.0 target=../../certs/CA/Digital_Signature_Trust_Co._Global_CA_2.pem
-link path=etc/openssl/certs/a15b3b6b.0 target=../../certs/CA/Digital_Signature_Trust_Co._Global_CA_3.pem
-link path=etc/openssl/certs/4643210f.0 target=../../certs/CA/Digital_Signature_Trust_Co._Global_CA_4.pem
-link path=etc/openssl/certs/1dac3003.0 target=../../certs/CA/DST_ACES_CA_X6.pem
-link path=etc/openssl/certs/12d55845.0 target=../../certs/CA/DST_Root_CA_X3.pem
-link path=etc/openssl/certs/d2adc77d.0 target=../../certs/CA/Entrust.net_Global_Secure_Personal_CA.pem
-link path=etc/openssl/certs/19899da5.0 target=../../certs/CA/Entrust.net_Global_Secure_Server_CA.pem
-link path=etc/openssl/certs/3e7271e8.0 target=../../certs/CA/Entrust.net_Premium_2048_Secure_Server_CA.pem
-link path=etc/openssl/certs/0c364b2d.0 target=../../certs/CA/Entrust.net_Secure_Personal_CA.pem
-link path=etc/openssl/certs/ed524cf5.0 target=../../certs/CA/Entrust.net_Secure_Server_CA.pem
-link path=etc/openssl/certs/bf64f35b.0 target=../../certs/CA/Entrust_Root_Certification_Authority.pem
-link path=etc/openssl/certs/9d6523ce.0 target=../../certs/CA/ePKI_Root_Certification_Authority.pem
-link path=etc/openssl/certs/594f1775.0 target=../../certs/CA/Equifax_Secure_CA.pem
-link path=etc/openssl/certs/e7b8d656.0 target=../../certs/CA/Equifax_Secure_eBusiness_CA_1.pem
-link path=etc/openssl/certs/8f7b96c4.0 target=../../certs/CA/Equifax_Secure_eBusiness_CA_2.pem
-link path=etc/openssl/certs/74c26bd0.0 target=../../certs/CA/Equifax_Secure_Global_eBusiness_CA.pem
-link path=etc/openssl/certs/1155c94b.0 target=../../certs/CA/Firmaprofesional_Root_CA.pem
-link path=etc/openssl/certs/57692373.0 target=../../certs/CA/GeoTrust_Global_CA_2.pem
-link path=etc/openssl/certs/7999be0d.0 target=../../certs/CA/GeoTrust_Global_CA.pem
-link path=etc/openssl/certs/9772ca32.0 target=../../certs/CA/GeoTrust_Primary_Certification_Authority.pem
-link path=etc/openssl/certs/87753b0d.0 target=../../certs/CA/GeoTrust_Universal_CA_2.pem
-link path=etc/openssl/certs/e775ed2d.0 target=../../certs/CA/GeoTrust_Universal_CA.pem
-link path=etc/openssl/certs/b0f3e76e.0 target=../../certs/CA/GlobalSign_Root_CA.pem
-link path=etc/openssl/certs/111e6273.0 target=../../certs/CA/GlobalSign_Root_CA_-_R2.pem
-link path=etc/openssl/certs/219d9499.0 target=../../certs/CA/Go_Daddy_Class_2_CA.pem
-link path=etc/openssl/certs/4d654d1d.0 target=../../certs/CA/GTE_CyberTrust_Global_Root.pem
-link path=etc/openssl/certs/97b4211c.0 target=../../certs/CA/GTE_CyberTrust_Root_CA.pem
-link path=etc/openssl/certs/58a44af1.0 target=../../certs/CA/IGC_A.pem
-link path=etc/openssl/certs/a6776c69.0 target=../../certs/CA/IPS_Chained_CAs_root.pem
-link path=etc/openssl/certs/f950ccc2.0 target=../../certs/CA/IPS_CLASE1_root.pem
-link path=etc/openssl/certs/86f32474.0 target=../../certs/CA/IPS_CLASE3_root.pem
-link path=etc/openssl/certs/8fe643df.0 target=../../certs/CA/IPS_CLASEA1_root.pem
-link path=etc/openssl/certs/72bf6a04.0 target=../../certs/CA/IPS_CLASEA3_root.pem
-link path=etc/openssl/certs/f64d9715.0 target=../../certs/CA/IPS_Servidores_root.pem
-link path=etc/openssl/certs/4184de39.0 target=../../certs/CA/IPS_Timestamping_root.pem
-link path=etc/openssl/certs/e7461595.0 target=../../certs/CA/MD5_Collisions_Forged_Rogue_CA_25c3.pem
-link path=etc/openssl/certs/f61bff45.0 target=../../certs/CA/Microsec_e-Szigno_Root_CA.pem
-link path=etc/openssl/certs/5a5372fc.0 target=../../certs/CA/NetLock_Business_Class_B_Root.pem
-link path=etc/openssl/certs/635ccfd5.0 target=../../certs/CA/NetLock_Express_Class_C_Root.pem
-link path=etc/openssl/certs/add67345.0 target=../../certs/CA/NetLock_Notary_Class_A_Root.pem
-link path=etc/openssl/certs/8317b10c.0 target=../../certs/CA/NetLock_Qualified_Class_QA_Root.pem
-link path=etc/openssl/certs/2fa87019.0 target=../../certs/CA/Network_Solutions_Certificate_Authority.pem
-link path=etc/openssl/certs/3a3b02ce.0 target=../../certs/CA/OISTE_WISeKey_Global_Root_GA_CA.pem
-link path=etc/openssl/certs/7a819ef2.0 target=../../certs/CA/QuoVadis_Root_CA_2.pem
-link path=etc/openssl/certs/9339512a.0 target=../../certs/CA/QuoVadis_Root_CA_3.pem
-link path=etc/openssl/certs/5cf9d536.0 target=../../certs/CA/QuoVadis_Root_CA.pem
-link path=etc/openssl/certs/7d3cd826.0 target=../../certs/CA/RSA_Root_Certificate_1.pem
-link path=etc/openssl/certs/4166ec0c.0 target=../../certs/CA/RSA_Security_1024_v3.pem
-link path=etc/openssl/certs/8470719d.0 target=../../certs/CA/RSA_Security_2048_v3.pem
-link path=etc/openssl/certs/bdacca6f.0 target=../../certs/CA/Secure_Global_CA.pem
-link path=etc/openssl/certs/cf701eeb.0 target=../../certs/CA/SecureTrust_CA.pem
-link path=etc/openssl/certs/9dbefe7b.0 target=../../certs/CA/Security_Communication_EV_RootCA1.pem
-link path=etc/openssl/certs/a3896b44.0 target=../../certs/CA/Security_Communication_Root_CA.pem
-link path=etc/openssl/certs/755f7420.0 target=../../certs/CA/Sonera_Class_1_Root_CA.pem
-link path=etc/openssl/certs/a7605362.0 target=../../certs/CA/Sonera_Class_2_Root_CA.pem
-link path=etc/openssl/certs/cdaebb72.0 target=../../certs/CA/Staat_der_Nederlanden_Root_CA.pem
-link path=etc/openssl/certs/23f4c490.0 target=../../certs/CA/Starfield_Class_2_CA.pem
-link path=etc/openssl/certs/33815e15.0 target=../../certs/CA/StartCom_Certification_Authority.pem
-link path=etc/openssl/certs/cb796bc1.0 target=../../certs/CA/StartCom_Ltd..pem
-link path=etc/openssl/certs/f559733c.0 target=../../certs/CA/S-TRUST_Authentication_and_Encryption_Root_CA_2005_PN.pem
-link path=etc/openssl/certs/e60bf0c0.0 target=../../certs/CA/Swisscom_Root_CA_1.pem
-link path=etc/openssl/certs/3c860d51.0 target=../../certs/CA/SwissSign_Gold_CA_-_G2.pem
-link path=etc/openssl/certs/46b2fd3b.0 target=../../certs/CA/SwissSign_Platinum_CA_-_G2.pem
-link path=etc/openssl/certs/5046c355.0 target=../../certs/CA/SwissSign_Silver_CA_-_G2.pem
-link path=etc/openssl/certs/1dcd6f4c.0 target=../../certs/CA/Taiwan_GRCA.pem
-link path=etc/openssl/certs/2afc57aa.0 target=../../certs/CA/TC_TrustCenter_Class_2_CA_II.pem
-link path=etc/openssl/certs/7a481e66.0 target=../../certs/CA/TC_TrustCenter_Class_3_CA_II.pem
-link path=etc/openssl/certs/256fd83b.0 target=../../certs/CA/TC_TrustCenter,_Germany,_Class_2_CA.pem
-link path=etc/openssl/certs/54edfa5d.0 target=../../certs/CA/TC_TrustCenter,_Germany,_Class_3_CA.pem
-link path=etc/openssl/certs/5021a0a2.0 target=../../certs/CA/TC_TrustCenter_Universal_CA_I.pem
-link path=etc/openssl/certs/d537fba6.0 target=../../certs/CA/TDC_Internet_Root_CA.pem
-link path=etc/openssl/certs/11a09b38.0 target=../../certs/CA/TDC_OCES_Root_CA.pem
-link path=etc/openssl/certs/0e82f83a.0 target=../../certs/CA/Thawte_Personal_Basic_CA.pem
-link path=etc/openssl/certs/709afd2b.0 target=../../certs/CA/Thawte_Personal_Freemail_CA.pem
-link path=etc/openssl/certs/412bea73.0 target=../../certs/CA/Thawte_Personal_Premium_CA.pem
-link path=etc/openssl/certs/c33a80d4.0 target=../../certs/CA/Thawte_Premium_Server_CA.pem
-link path=etc/openssl/certs/00673b5b.0 target=../../certs/CA/thawte_Primary_Root_CA.pem
-link path=etc/openssl/certs/ddc328ff.0 target=../../certs/CA/Thawte_Server_CA.pem
-link path=etc/openssl/certs/aaa45464.0 target=../../certs/CA/Thawte_Time_Stamping_CA.pem
-link path=etc/openssl/certs/84cba82f.0 target=../../certs/CA/TURKTRUST_Certificate_Services_Provider_Root_1.pem
-link path=etc/openssl/certs/56b8a0b6.0 target=../../certs/CA/TURKTRUST_Certificate_Services_Provider_Root_2.pem
-link path=etc/openssl/certs/4fbd6bfa.0 target=../../certs/CA/UTN_DATACorp_SGC_Root_CA.pem
-link path=etc/openssl/certs/9ec3a561.0 target=../../certs/CA/UTN_USERFirst_Email_Root_CA.pem
-link path=etc/openssl/certs/ff783690.0 target=../../certs/CA/UTN_USERFirst_Hardware_Root_CA.pem
-link path=etc/openssl/certs/d8274e24.0 target=../../certs/CA/UTN-USER_First-Network_Applications.pem
-link path=etc/openssl/certs/ccb919f9.0 target=../../certs/CA/UTN_USERFirst_Object_Root_CA.pem
-link path=etc/openssl/certs/f4996e82.0 target=../../certs/CA/ValiCert_Class_1_VA.pem
-link path=etc/openssl/certs/bcdd5959.0 target=../../certs/CA/ValiCert_Class_2_VA.pem
-link path=etc/openssl/certs/c19d42c7.0 target=../../certs/CA/Verisign_Class_1_Public_Primary_Certification_Authority_-_G2.pem
-link path=etc/openssl/certs/11f154d6.0 target=../../certs/CA/Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem
-link path=etc/openssl/certs/2edf7016.0 target=../../certs/CA/Verisign_Class_1_Public_Primary_Certification_Authority.pem
-link path=etc/openssl/certs/ed62f4e3.0 target=../../certs/CA/Verisign_Class_2_Public_Primary_Certification_Authority_-_G2.pem
-link path=etc/openssl/certs/d78a75c7.0 target=../../certs/CA/Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem
-link path=etc/openssl/certs/b5f329fa.0 target=../../certs/CA/Verisign_Class_2_Public_Primary_Certification_Authority.pem
-link path=etc/openssl/certs/72fa7371.0 target=../../certs/CA/Verisign_Class_3_Public_Primary_Certification_Authority_-_G2.pem
-link path=etc/openssl/certs/7d453d8f.0 target=../../certs/CA/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem
-link path=etc/openssl/certs/facacbc6.0 target=../../certs/CA/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem
-link path=etc/openssl/certs/7651b327.0 target=../../certs/CA/Verisign_Class_3_Public_Primary_Certification_Authority.pem
-link path=etc/openssl/certs/ed049835.0 target=../../certs/CA/Verisign_Class_4_Public_Primary_Certification_Authority_-_G2.pem
-link path=etc/openssl/certs/c527e4ab.0 target=../../certs/CA/Verisign_Class_4_Public_Primary_Certification_Authority_-_G3.pem
-link path=etc/openssl/certs/f73e89fd.0 target=../../certs/CA/Verisign_RSA_Secure_Server_CA.pem
-link path=etc/openssl/certs/95750816.0 target=../../certs/CA/Verisign_Time_Stamping_Authority_CA.pem
-link path=etc/openssl/certs/6fcc125d.0 target=../../certs/CA/Visa_eCommerce_Root.pem
-link path=etc/openssl/certs/788c9bfc.0 target=../../certs/CA/Visa_International_Global_Root_2.pem
-link path=etc/openssl/certs/6adf0799.0 target=../../certs/CA/Wells_Fargo_Root_CA.pem
-link path=etc/openssl/certs/08aef7bb.0 target=../../certs/CA/WellsSecure_Public_Root_Certificate_Authority.pem
-link path=etc/openssl/certs/76579174.0 target=../../certs/CA/XRamp_Global_CA_Root.pem
-
+file path=etc/certs/CA/beTRUSTed_Root_CA-Baltimore_Implementation.pem \
+    group=sys
+file path=etc/certs/CA/beTRUSTed_Root_CA.pem group=sys
+file path=etc/certs/CA/beTRUSTed_Root_CA_-_Entrust_Implementation.pem \
+    group=sys
+file path=etc/certs/CA/beTRUSTed_Root_CA_-_RSA_Implementation.pem group=sys
+file path=etc/certs/CA/ePKI_Root_Certification_Authority.pem group=sys
+file path=etc/certs/CA/thawte_Primary_Root_CA.pem group=sys
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
+link path=etc/openssl/certs/00673b5b.0 \
+    target=../../certs/CA/thawte_Primary_Root_CA.pem
+link path=etc/openssl/certs/02b73561.0 \
+    target=../../certs/CA/Comodo_Secure_Services_root.pem
+link path=etc/openssl/certs/0481cb65.0 \
+    target=../../certs/CA/AOL_Time_Warner_Root_Certification_Authority_2.pem
+link path=etc/openssl/certs/052e396b.0 \
+    target=../../certs/CA/AddTrust_Qualified_Certificates_Root.pem
+link path=etc/openssl/certs/08aef7bb.0 \
+    target=../../certs/CA/WellsSecure_Public_Root_Certificate_Authority.pem
+link path=etc/openssl/certs/0c364b2d.0 \
+    target=../../certs/CA/Entrust.net_Secure_Personal_CA.pem
+link path=etc/openssl/certs/0dbd0096.0 \
+    target=../../certs/CA/AOL_Time_Warner_Root_Certification_Authority_1.pem
+link path=etc/openssl/certs/0e82f83a.0 \
+    target=../../certs/CA/Thawte_Personal_Basic_CA.pem
+link path=etc/openssl/certs/111e6273.0 \
+    target=../../certs/CA/GlobalSign_Root_CA_-_R2.pem
+link path=etc/openssl/certs/1155c94b.0 \
+    target=../../certs/CA/Firmaprofesional_Root_CA.pem
+link path=etc/openssl/certs/11a09b38.0 \
+    target=../../certs/CA/TDC_OCES_Root_CA.pem
+link path=etc/openssl/certs/11f154d6.0 \
+    target=../../certs/CA/Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem
+link path=etc/openssl/certs/124bbd54.0 \
+    target=../../certs/CA/Comodo_Trusted_Services_root.pem
+link path=etc/openssl/certs/128b9c8d.0 \
+    target=../../certs/CA/Digital_Signature_Trust_Co._Global_CA_2.pem
+link path=etc/openssl/certs/12d55845.0 \
+    target=../../certs/CA/DST_Root_CA_X3.pem
+link path=etc/openssl/certs/17b51fe6.0 \
+    target=../../certs/CA/Certplus_Class_2_Primary_CA.pem
+link path=etc/openssl/certs/19899da5.0 \
+    target=../../certs/CA/Entrust.net_Global_Secure_Server_CA.pem
+link path=etc/openssl/certs/1dac3003.0 \
+    target=../../certs/CA/DST_ACES_CA_X6.pem
+link path=etc/openssl/certs/1dcd6f4c.0 target=../../certs/CA/Taiwan_GRCA.pem
+link path=etc/openssl/certs/219d9499.0 \
+    target=../../certs/CA/Go_Daddy_Class_2_CA.pem
+link path=etc/openssl/certs/23f4c490.0 \
+    target=../../certs/CA/Starfield_Class_2_CA.pem
+link path=etc/openssl/certs/256fd83b.0 \
+    target=../../certs/CA/TC_TrustCenter,_Germany,_Class_2_CA.pem
+link path=etc/openssl/certs/2afc57aa.0 \
+    target=../../certs/CA/TC_TrustCenter_Class_2_CA_II.pem
+link path=etc/openssl/certs/2edf7016.0 \
+    target=../../certs/CA/Verisign_Class_1_Public_Primary_Certification_Authority.pem
+link path=etc/openssl/certs/2fa87019.0 \
+    target=../../certs/CA/Network_Solutions_Certificate_Authority.pem
+link path=etc/openssl/certs/2fb1850a.0 \
+    target=../../certs/CA/America_Online_Root_Certification_Authority_2.pem
+link path=etc/openssl/certs/31044350.0 \
+    target=../../certs/CA/beTRUSTed_Root_CA.pem
+link path=etc/openssl/certs/33815e15.0 \
+    target=../../certs/CA/StartCom_Certification_Authority.pem
+link path=etc/openssl/certs/343eb6cb.0 \
+    target=../../certs/CA/Cybertrust_Global_Root.pem
+link path=etc/openssl/certs/399e7759.0 \
+    target=../../certs/CA/DigiCert_Global_Root_CA.pem
+link path=etc/openssl/certs/3a3b02ce.0 \
+    target=../../certs/CA/OISTE_WISeKey_Global_Root_GA_CA.pem
+link path=etc/openssl/certs/3ad48a91.0 \
+    target=../../certs/CA/Baltimore_CyberTrust_Root.pem
+link path=etc/openssl/certs/3c58f906.0 \
+    target=../../certs/CA/AddTrust_External_Root.pem
+link path=etc/openssl/certs/3c860d51.0 \
+    target=../../certs/CA/SwissSign_Gold_CA_-_G2.pem
+link path=etc/openssl/certs/3e7271e8.0 \
+    target=../../certs/CA/Entrust.net_Premium_2048_Secure_Server_CA.pem
+link path=etc/openssl/certs/412bea73.0 \
+    target=../../certs/CA/Thawte_Personal_Premium_CA.pem
+link path=etc/openssl/certs/4166ec0c.0 \
+    target=../../certs/CA/RSA_Security_1024_v3.pem
+link path=etc/openssl/certs/4184de39.0 \
+    target=../../certs/CA/IPS_Timestamping_root.pem
+link path=etc/openssl/certs/4643210f.0 \
+    target=../../certs/CA/Digital_Signature_Trust_Co._Global_CA_4.pem
+link path=etc/openssl/certs/46b2fd3b.0 \
+    target=../../certs/CA/SwissSign_Platinum_CA_-_G2.pem
+link path=etc/openssl/certs/47996b5c.0 \
+    target=../../certs/CA/beTRUSTed_Root_CA_-_Entrust_Implementation.pem
+link path=etc/openssl/certs/4d654d1d.0 \
+    target=../../certs/CA/GTE_CyberTrust_Global_Root.pem
+link path=etc/openssl/certs/4e18c148.0 \
+    target=../../certs/CA/Deutsche_Telekom_Root_CA_2.pem
+link path=etc/openssl/certs/4fbd6bfa.0 \
+    target=../../certs/CA/UTN_DATACorp_SGC_Root_CA.pem
+link path=etc/openssl/certs/5021a0a2.0 \
+    target=../../certs/CA/TC_TrustCenter_Universal_CA_I.pem
+link path=etc/openssl/certs/5046c355.0 \
+    target=../../certs/CA/SwissSign_Silver_CA_-_G2.pem
+link path=etc/openssl/certs/54edfa5d.0 \
+    target=../../certs/CA/TC_TrustCenter,_Germany,_Class_3_CA.pem
+link path=etc/openssl/certs/56b8a0b6.0 \
+    target=../../certs/CA/TURKTRUST_Certificate_Services_Provider_Root_2.pem
+link path=etc/openssl/certs/57692373.0 \
+    target=../../certs/CA/GeoTrust_Global_CA_2.pem
+link path=etc/openssl/certs/58a44af1.0 target=../../certs/CA/IGC_A.pem
+link path=etc/openssl/certs/594f1775.0 \
+    target=../../certs/CA/Equifax_Secure_CA.pem
+link path=etc/openssl/certs/5a3f0ff8.0 \
+    target=../../certs/CA/COMODO_Certification_Authority.pem
+link path=etc/openssl/certs/5a5372fc.0 \
+    target=../../certs/CA/NetLock_Business_Class_B_Root.pem
+link path=etc/openssl/certs/5cf9d536.0 \
+    target=../../certs/CA/QuoVadis_Root_CA.pem
+link path=etc/openssl/certs/635ccfd5.0 \
+    target=../../certs/CA/NetLock_Express_Class_C_Root.pem
+link path=etc/openssl/certs/69105f4f.0 \
+    target=../../certs/CA/DigiCert_Assured_ID_Root_CA.pem
+link path=etc/openssl/certs/6adf0799.0 \
+    target=../../certs/CA/Wells_Fargo_Root_CA.pem
+link path=etc/openssl/certs/6e8bf996.0 \
+    target=../../certs/CA/Certum_Root_CA.pem
+link path=etc/openssl/certs/6fcc125d.0 \
+    target=../../certs/CA/Visa_eCommerce_Root.pem
+link path=etc/openssl/certs/709afd2b.0 \
+    target=../../certs/CA/Thawte_Personal_Freemail_CA.pem
+link path=etc/openssl/certs/72bf6a04.0 \
+    target=../../certs/CA/IPS_CLASEA3_root.pem
+link path=etc/openssl/certs/72fa7371.0 \
+    target=../../certs/CA/Verisign_Class_3_Public_Primary_Certification_Authority_-_G2.pem
+link path=etc/openssl/certs/74c26bd0.0 \
+    target=../../certs/CA/Equifax_Secure_Global_eBusiness_CA.pem
+link path=etc/openssl/certs/755f7420.0 \
+    target=../../certs/CA/Sonera_Class_1_Root_CA.pem
+link path=etc/openssl/certs/75680d2e.0 \
+    target=../../certs/CA/Comodo_AAA_Services_root.pem
+link path=etc/openssl/certs/7651b327.0 \
+    target=../../certs/CA/Verisign_Class_3_Public_Primary_Certification_Authority.pem
+link path=etc/openssl/certs/76579174.0 \
+    target=../../certs/CA/XRamp_Global_CA_Root.pem
+link path=etc/openssl/certs/788c9bfc.0 \
+    target=../../certs/CA/Visa_International_Global_Root_2.pem
+link path=etc/openssl/certs/7999be0d.0 \
+    target=../../certs/CA/GeoTrust_Global_CA.pem
+link path=etc/openssl/certs/7a481e66.0 \
+    target=../../certs/CA/TC_TrustCenter_Class_3_CA_II.pem
+link path=etc/openssl/certs/7a819ef2.0 \
+    target=../../certs/CA/QuoVadis_Root_CA_2.pem
+link path=etc/openssl/certs/7d3cd826.0 \
+    target=../../certs/CA/RSA_Root_Certificate_1.pem
+link path=etc/openssl/certs/7d453d8f.0 \
+    target=../../certs/CA/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem
+link path=etc/openssl/certs/81b9768f.0 \
+    target=../../certs/CA/DigiCert_High_Assurance_EV_Root_CA.pem
+link path=etc/openssl/certs/8317b10c.0 \
+    target=../../certs/CA/NetLock_Qualified_Class_QA_Root.pem
+link path=etc/openssl/certs/8470719d.0 \
+    target=../../certs/CA/RSA_Security_2048_v3.pem
+link path=etc/openssl/certs/84cba82f.0 \
+    target=../../certs/CA/TURKTRUST_Certificate_Services_Provider_Root_1.pem
+link path=etc/openssl/certs/86f32474.0 \
+    target=../../certs/CA/IPS_CLASE3_root.pem
+link path=etc/openssl/certs/87753b0d.0 \
+    target=../../certs/CA/GeoTrust_Universal_CA_2.pem
+link path=etc/openssl/certs/89c02a45.0 \
+    target=../../certs/CA/COMODO_ECC_Certification_Authority.pem
+link path=etc/openssl/certs/8f7b96c4.0 \
+    target=../../certs/CA/Equifax_Secure_eBusiness_CA_2.pem
+link path=etc/openssl/certs/8fe643df.0 \
+    target=../../certs/CA/IPS_CLASEA1_root.pem
+link path=etc/openssl/certs/9339512a.0 \
+    target=../../certs/CA/QuoVadis_Root_CA_3.pem
+link path=etc/openssl/certs/95750816.0 \
+    target=../../certs/CA/Verisign_Time_Stamping_Authority_CA.pem
+link path=etc/openssl/certs/9772ca32.0 \
+    target=../../certs/CA/GeoTrust_Primary_Certification_Authority.pem
+link path=etc/openssl/certs/97b4211c.0 \
+    target=../../certs/CA/GTE_CyberTrust_Root_CA.pem
+link path=etc/openssl/certs/9d6523ce.0 \
+    target=../../certs/CA/ePKI_Root_Certification_Authority.pem
+link path=etc/openssl/certs/9dbefe7b.0 \
+    target=../../certs/CA/Security_Communication_EV_RootCA1.pem
+link path=etc/openssl/certs/9ec3a561.0 \
+    target=../../certs/CA/UTN_USERFirst_Email_Root_CA.pem
+link path=etc/openssl/certs/a0bc6fbb.0 \
+    target=../../certs/CA/Camerfirma_Global_Chambersign_Root.pem
+link path=etc/openssl/certs/a15b3b6b.0 \
+    target=../../certs/CA/Digital_Signature_Trust_Co._Global_CA_3.pem
+link path=etc/openssl/certs/a2df7ad7.0 \
+    target=../../certs/CA/AddTrust_Public_Services_Root.pem
+link path=etc/openssl/certs/a3896b44.0 \
+    target=../../certs/CA/Security_Communication_Root_CA.pem
+link path=etc/openssl/certs/a6776c69.0 \
+    target=../../certs/CA/IPS_Chained_CAs_root.pem
+link path=etc/openssl/certs/a7605362.0 \
+    target=../../certs/CA/Sonera_Class_2_Root_CA.pem
+link path=etc/openssl/certs/aaa45464.0 \
+    target=../../certs/CA/Thawte_Time_Stamping_CA.pem
+link path=etc/openssl/certs/add67345.0 \
+    target=../../certs/CA/NetLock_Notary_Class_A_Root.pem
+link path=etc/openssl/certs/b0f3e76e.0 \
+    target=../../certs/CA/GlobalSign_Root_CA.pem
+link path=etc/openssl/certs/b5f329fa.0 \
+    target=../../certs/CA/Verisign_Class_2_Public_Primary_Certification_Authority.pem
+link path=etc/openssl/certs/bcdd5959.0 \
+    target=../../certs/CA/ValiCert_Class_2_VA.pem
+link path=etc/openssl/certs/bda4cc84.0 \
+    target=../../certs/CA/America_Online_Root_Certification_Authority_1.pem
+link path=etc/openssl/certs/bdacca6f.0 \
+    target=../../certs/CA/Secure_Global_CA.pem
+link path=etc/openssl/certs/bf64f35b.0 \
+    target=../../certs/CA/Entrust_Root_Certification_Authority.pem
+link path=etc/openssl/certs/bf87590f.0 \
+    target=../../certs/CA/beTRUSTed_Root_CA_-_RSA_Implementation.pem
+link path=etc/openssl/certs/c0cafbd2.0 \
+    target=../../certs/CA/DigiNotar_Root_CA.pem
+link path=etc/openssl/certs/c19d42c7.0 \
+    target=../../certs/CA/Verisign_Class_1_Public_Primary_Certification_Authority_-_G2.pem
+link path=etc/openssl/certs/c215bc69.0 \
+    target=../../certs/CA/Digital_Signature_Trust_Co._Global_CA_1.pem
+link path=etc/openssl/certs/c33a80d4.0 \
+    target=../../certs/CA/Thawte_Premium_Server_CA.pem
+link path=etc/openssl/certs/c527e4ab.0 \
+    target=../../certs/CA/Verisign_Class_4_Public_Primary_Certification_Authority_-_G3.pem
+link path=etc/openssl/certs/c9bc75ba.0 \
+    target=../../certs/CA/ABAecom_sub.,_Am._Bankers_Assn._Root_CA.pem
+link path=etc/openssl/certs/cb796bc1.0 target=../../certs/CA/StartCom_Ltd..pem
+link path=etc/openssl/certs/ccb919f9.0 \
+    target=../../certs/CA/UTN_USERFirst_Object_Root_CA.pem
+link path=etc/openssl/certs/cdaebb72.0 \
+    target=../../certs/CA/Staat_der_Nederlanden_Root_CA.pem
+link path=etc/openssl/certs/cf701eeb.0 \
+    target=../../certs/CA/SecureTrust_CA.pem
+link path=etc/openssl/certs/d2adc77d.0 \
+    target=../../certs/CA/Entrust.net_Global_Secure_Personal_CA.pem
+link path=etc/openssl/certs/d537fba6.0 \
+    target=../../certs/CA/TDC_Internet_Root_CA.pem
+link path=etc/openssl/certs/d78a75c7.0 \
+    target=../../certs/CA/Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem
+link path=etc/openssl/certs/d8274e24.0 \
+    target=../../certs/CA/UTN-USER_First-Network_Applications.pem
+link path=etc/openssl/certs/ddc328ff.0 \
+    target=../../certs/CA/Thawte_Server_CA.pem
+link path=etc/openssl/certs/e268a4c5.0 \
+    target=../../certs/CA/AddTrust_Low-Value_Services_Root.pem
+link path=etc/openssl/certs/e60bf0c0.0 \
+    target=../../certs/CA/Swisscom_Root_CA_1.pem
+link path=etc/openssl/certs/e7461595.0 \
+    target=../../certs/CA/MD5_Collisions_Forged_Rogue_CA_25c3.pem
+link path=etc/openssl/certs/e775ed2d.0 \
+    target=../../certs/CA/GeoTrust_Universal_CA.pem
+link path=etc/openssl/certs/e7b8d656.0 \
+    target=../../certs/CA/Equifax_Secure_eBusiness_CA_1.pem
+link path=etc/openssl/certs/ed049835.0 \
+    target=../../certs/CA/Verisign_Class_4_Public_Primary_Certification_Authority_-_G2.pem
+link path=etc/openssl/certs/ed524cf5.0 \
+    target=../../certs/CA/Entrust.net_Secure_Server_CA.pem
+link path=etc/openssl/certs/ed62f4e3.0 \
+    target=../../certs/CA/Verisign_Class_2_Public_Primary_Certification_Authority_-_G2.pem
+link path=etc/openssl/certs/ee7cd6fb.0 \
+    target=../../certs/CA/Camerfirma_Chambers_of_Commerce_Root.pem
+link path=etc/openssl/certs/f3cf1e8e.0 \
+    target=../../certs/CA/beTRUSTed_Root_CA-Baltimore_Implementation.pem
+link path=etc/openssl/certs/f4996e82.0 \
+    target=../../certs/CA/ValiCert_Class_1_VA.pem
+link path=etc/openssl/certs/f559733c.0 \
+    target=../../certs/CA/S-TRUST_Authentication_and_Encryption_Root_CA_2005_PN.pem
+link path=etc/openssl/certs/f58a60fe.0 \
+    target=../../certs/CA/ComSign_Secured_CA.pem
+link path=etc/openssl/certs/f61bff45.0 \
+    target=../../certs/CA/Microsec_e-Szigno_Root_CA.pem
+link path=etc/openssl/certs/f64d9715.0 \
+    target=../../certs/CA/IPS_Servidores_root.pem
+link path=etc/openssl/certs/f73e89fd.0 \
+    target=../../certs/CA/Verisign_RSA_Secure_Server_CA.pem
+link path=etc/openssl/certs/f950ccc2.0 \
+    target=../../certs/CA/IPS_CLASE1_root.pem
+link path=etc/openssl/certs/facacbc6.0 \
+    target=../../certs/CA/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem
+link path=etc/openssl/certs/fde84897.0 target=../../certs/CA/Certigna.pem
+link path=etc/openssl/certs/ff588423.0 target=../../certs/CA/ComSign_CA.pem
+link path=etc/openssl/certs/ff783690.0 \
+    target=../../certs/CA/UTN_USERFirst_Hardware_Root_CA.pem
--- a/usr/src/pkg/manifests/developer-debug-mdb.mf	Mon Aug 02 15:21:03 2010 -0600
+++ b/usr/src/pkg/manifests/developer-debug-mdb.mf	Mon Aug 02 16:32:07 2010 -0600
@@ -161,18 +161,18 @@
 $(i386_ONLY)file path=kernel/kmdb/ufs group=sys mode=0555
 $(i386_ONLY)file path=kernel/kmdb/uhci group=sys mode=0555
 $(i386_ONLY)file path=kernel/kmdb/usba group=sys mode=0555
-$(i386_ONLY)file path=platform/i86pc/kernel/kmdb/$(ARCH64)/pcplusmp group=sys \
+$(i386_ONLY)file path=platform/i86pc/kernel/kmdb/$(ARCH64)/apix group=sys \
     mode=0555
-$(i386_ONLY)file path=platform/i86pc/kernel/kmdb/$(ARCH64)/apix group=sys \
+$(i386_ONLY)file path=platform/i86pc/kernel/kmdb/$(ARCH64)/pcplusmp group=sys \
     mode=0555
 $(i386_ONLY)file path=platform/i86pc/kernel/kmdb/$(ARCH64)/unix group=sys \
     mode=0555
 $(i386_ONLY)file path=platform/i86pc/kernel/kmdb/$(ARCH64)/uppc group=sys \
     mode=0555
+$(i386_ONLY)file path=platform/i86pc/kernel/kmdb/apix group=sys mode=0555
 $(i386_ONLY)file path=platform/i86pc/kernel/kmdb/pcplusmp group=sys mode=0555
 $(i386_ONLY)file path=platform/i86pc/kernel/kmdb/unix group=sys mode=0555
 $(i386_ONLY)file path=platform/i86pc/kernel/kmdb/uppc group=sys mode=0555
-$(i386_ONLY)file path=platform/i86pc/kernel/kmdb/apix group=sys mode=0555
 $(i386_ONLY)file path=platform/i86xpv/kernel/kmdb/$(ARCH64)/unix group=sys \
     mode=0555
 $(i386_ONLY)file path=platform/i86xpv/kernel/kmdb/$(ARCH64)/xpv_psm group=sys \
@@ -308,22 +308,22 @@
 file path=usr/lib/mdb/proc/mdb_ds.so group=sys mode=0555
 file path=usr/lib/mdb/proc/svc.configd.so group=sys mode=0555
 file path=usr/lib/mdb/proc/svc.startd.so group=sys mode=0555
-$(i386_ONLY)file path=usr/platform/i86pc/lib/mdb/kvm/$(ARCH64)/pcplusmp.so \
+$(i386_ONLY)file path=usr/platform/i86pc/lib/mdb/kvm/$(ARCH64)/apix.so \
     group=sys mode=0555
-$(i386_ONLY)file path=usr/platform/i86pc/lib/mdb/kvm/$(ARCH64)/apix.so \
+$(i386_ONLY)file path=usr/platform/i86pc/lib/mdb/kvm/$(ARCH64)/pcplusmp.so \
     group=sys mode=0555
 $(i386_ONLY)file path=usr/platform/i86pc/lib/mdb/kvm/$(ARCH64)/unix.so \
     group=sys mode=0555
 $(i386_ONLY)file path=usr/platform/i86pc/lib/mdb/kvm/$(ARCH64)/uppc.so \
     group=sys mode=0555
+$(i386_ONLY)file path=usr/platform/i86pc/lib/mdb/kvm/apix.so group=sys \
+    mode=0555
 $(i386_ONLY)file path=usr/platform/i86pc/lib/mdb/kvm/pcplusmp.so group=sys \
     mode=0555
 $(i386_ONLY)file path=usr/platform/i86pc/lib/mdb/kvm/unix.so group=sys \
     mode=0555
 $(i386_ONLY)file path=usr/platform/i86pc/lib/mdb/kvm/uppc.so group=sys \
     mode=0555
-$(i386_ONLY)file path=usr/platform/i86pc/lib/mdb/kvm/apix.so group=sys \
-    mode=0555
 $(i386_ONLY)file path=usr/platform/i86xpv/lib/mdb/kvm/$(ARCH64)/unix.so \
     group=sys mode=0555
 $(i386_ONLY)file path=usr/platform/i86xpv/lib/mdb/kvm/$(ARCH64)/xpv.so \
--- a/usr/src/pkg/manifests/developer-linker.mf	Mon Aug 02 15:21:03 2010 -0600
+++ b/usr/src/pkg/manifests/developer-linker.mf	Mon Aug 02 16:32:07 2010 -0600
@@ -73,12 +73,9 @@
 file path=usr/lib/abi/spec2map mode=0755
 file path=usr/lib/abi/spec2trace mode=0755
 file path=usr/lib/ld/map.above4G mode=0444
-link path=usr/lib/ld/$(ARCH64)/map.above4G target=../map.above4G
 file path=usr/lib/ld/map.below4G mode=0444
-link path=usr/lib/ld/$(ARCH64)/map.below4G target=../map.below4G
 file path=usr/lib/ld/map.bssalign mode=0444
 file path=usr/lib/ld/map.default mode=0444
-link path=usr/lib/ld/$(ARCH64)/map.default target=../map.default
 file path=usr/lib/ld/map.execdata mode=0444
 file path=usr/lib/ld/map.filter mode=0444
 file path=usr/lib/ld/map.noexbss mode=0444
@@ -111,5 +108,8 @@
 link path=usr/ccs/bin/ld target=../../bin/ld
 link path=usr/ccs/bin/regcmp target=../../bin/regcmp
 link path=usr/ccs/lib/link_audit target=../../lib/link_audit
+link path=usr/lib/ld/$(ARCH64)/map.above4G target=../map.above4G
+link path=usr/lib/ld/$(ARCH64)/map.below4G target=../map.below4G
+link path=usr/lib/ld/$(ARCH64)/map.default target=../map.default
 link path=usr/lib/link_audit/32 target=.
 link path=usr/lib/link_audit/64 target=$(ARCH64)
--- a/usr/src/pkg/manifests/developer-opensolaris-osnet.mf	Mon Aug 02 15:21:03 2010 -0600
+++ b/usr/src/pkg/manifests/developer-opensolaris-osnet.mf	Mon Aug 02 16:32:07 2010 -0600
@@ -55,9 +55,9 @@
 depend fmri=library/[email protected] type=require
 depend fmri=package/[email protected] type=require
 depend fmri=print/[email protected] type=require
-depend fmri=runtime/perl-584/[email protected] type=require
+depend fmri=runtime/perl-510/[email protected] type=require
 depend fmri=runtime/[email protected] type=require
-depend fmri=runtime/perl-510/[email protected] type=require
+depend fmri=runtime/perl-584/[email protected] type=require
 depend fmri=storage/[email protected] type=require
 depend fmri=system/data/[email protected] type=require
 depend fmri=system/[email protected] type=require
--- a/usr/src/pkg/manifests/driver-network-ofk.mf	Mon Aug 02 15:21:03 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-ofk.mf	Mon Aug 02 16:32:07 2010 -0600
@@ -42,17 +42,17 @@
 dir path=kernel/misc group=sys
 dir path=kernel/misc/$(ARCH64) group=sys
 driver name=sol_ucma perms="* 0666 root sys"
+driver name=sol_umad perms="* 0666 root sys"
 driver name=sol_uverbs perms="* 0666 root sys"
-driver name=sol_umad perms="* 0666 root sys"
 file path=kernel/drv/$(ARCH64)/sol_ucma group=sys
+file path=kernel/drv/$(ARCH64)/sol_umad group=sys
 file path=kernel/drv/$(ARCH64)/sol_uverbs group=sys
-file path=kernel/drv/$(ARCH64)/sol_umad group=sys
 $(i386_ONLY)file path=kernel/drv/sol_ucma group=sys
-$(i386_ONLY)file path=kernel/drv/sol_uverbs group=sys
+file path=kernel/drv/sol_ucma.conf group=sys
 $(i386_ONLY)file path=kernel/drv/sol_umad group=sys
-file path=kernel/drv/sol_ucma.conf group=sys
+file path=kernel/drv/sol_umad.conf group=sys
+$(i386_ONLY)file path=kernel/drv/sol_uverbs group=sys
 file path=kernel/drv/sol_uverbs.conf group=sys
-file path=kernel/drv/sol_umad.conf group=sys
 file path=kernel/misc/$(ARCH64)/sol_ofs group=sys mode=0755
 $(i386_ONLY)file path=kernel/misc/sol_ofs group=sys mode=0755
 license cr_Sun license=cr_Sun
--- a/usr/src/pkg/manifests/driver-network-rdsv3.mf	Mon Aug 02 15:21:03 2010 -0600
+++ b/usr/src/pkg/manifests/driver-network-rdsv3.mf	Mon Aug 02 16:32:07 2010 -0600
@@ -33,7 +33,8 @@
 set name=pkg.description \
     value="The RDS driver is an implementation of the Reliable Datagram Sockets API. It provides reliable, in-order datagram and RDMA data delivery between sockets."
 set name=pkg.summary value="Solaris Reliable Datagram Sockets"
-set name=info.classification value=org.opensolaris.category.2008:System/Hardware
+set name=info.classification \
+    value=org.opensolaris.category.2008:System/Hardware
 set name=variant.arch value=$(ARCH)
 dir path=kernel group=sys
 dir path=kernel/drv group=sys
--- a/usr/src/pkg/manifests/runtime-perl-510-module-sun-solaris.mf	Mon Aug 02 15:21:03 2010 -0600
+++ b/usr/src/pkg/manifests/runtime-perl-510-module-sun-solaris.mf	Mon Aug 02 16:32:07 2010 -0600
@@ -23,6 +23,11 @@
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
+$(i386_ONLY)<transform file dir path=.*PLAT.* -> edit path PLAT i86pc>
+$(sparc_ONLY)<transform file dir path=.*PLAT.* -> edit path PLAT sun4>
+
+<transform file path=.*\.(pm|bs) -> default mode 0444>
+<transform file path=.*\.so -> default mode 0555>
 set name=pkg.fmri \
     value=pkg:/runtime/perl-510/module/[email protected],$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH)
 set name=pkg.summary value="Perl 5.10.0 Sun::Solaris Modules"
@@ -30,24 +35,12 @@
     value=org.opensolaris.category.2008:Development/Perl
 set name=variant.arch value=$(ARCH)
 set name=variant.opensolaris.zone value=global value=nonglobal
-
-$(i386_ONLY)<transform file dir path=.*PLAT.* -> edit path PLAT i86pc>
-$(sparc_ONLY)<transform file dir path=.*PLAT.* -> edit path PLAT sun4>
-
-<transform file path=.*\.(pm|bs) -> default mode 0444>
-<transform file path=.*\.so -> default mode 0555>
-
 dir path=usr group=sys
 dir path=usr/bin
 dir path=usr/perl5
 dir path=usr/perl5/5.10.0
 dir path=usr/perl5/5.10.0/bin
 dir path=usr/perl5/5.10.0/lib
-dir path=usr/perl5/5.10.0/lib/Sun
-dir path=usr/perl5/5.10.0/lib/Sun/Solaris
-dir path=usr/perl5/5.10.0/lib/Sun/Solaris/BSM
-dir path=usr/perl5/5.10.0/lib/Sun/Solaris/PerlGcc
-
 dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int
 dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun
 dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris
@@ -55,62 +48,92 @@
 dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto
 dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun
 dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris
+dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/BSM
+dir \
+    path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/BSM/_BSMparse
+dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct
+dir \
+    path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/Catalog
+dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/File
+dir \
+    path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/Object
+dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Intrs
+dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Kstat
 dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Lgrp
-dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Project
-dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Ucred
-dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Privilege
-dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Intrs
-dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Task
-dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Utils
 dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/PerlGcc
-dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct
-dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/Object
-dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/File
-dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/Catalog
-dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/BSM
-dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/BSM/_BSMparse
-dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Kstat
-
+dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Privilege
+dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Project
+dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Task
+dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Ucred
+dir path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Utils
+dir path=usr/perl5/5.10.0/lib/Sun
+dir path=usr/perl5/5.10.0/lib/Sun/Solaris
+dir path=usr/perl5/5.10.0/lib/Sun/Solaris/BSM
+dir path=usr/perl5/5.10.0/lib/Sun/Solaris/PerlGcc
 file path=usr/perl5/5.10.0/bin/perlgcc mode=0555
-file path=usr/perl5/5.10.0/lib/Sun/Solaris/BSM/_BSMparse.pm 
-file path=usr/perl5/5.10.0/lib/Sun/Solaris/PerlGcc/Config.pm 
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Intrs.pm 
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Task.pm 
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Lgrp.pm 
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Ucred.pm 
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Utils.pm 
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Kstat.pm 
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Exacct/Catalog.pm 
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Exacct/File.pm 
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Exacct/Object.pm 
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Privilege.pm 
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Exacct.pm 
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Project.pm 
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Lgrp/Lgrp.so 
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Lgrp/Lgrp.bs 
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Project/Project.bs 
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Project/Project.so 
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Ucred/Ucred.so 
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Ucred/Ucred.bs 
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Privilege/Privilege.bs 
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Privilege/Privilege.so 
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Intrs/Intrs.so 
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Intrs/Intrs.bs 
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Task/Task.so 
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Task/Task.bs 
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Utils/Utils.bs 
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Utils/Utils.so 
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/Exacct.so 
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/Object/Object.bs 
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/Object/Object.so 
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/Exacct.bs 
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/File/File.bs 
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/File/File.so 
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/Catalog/Catalog.bs 
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/Catalog/Catalog.so 
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Kstat/Kstat.bs 
-file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Kstat/Kstat.so 
-
+file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Exacct.pm
+file \
+    path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Exacct/Catalog.pm
+file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Exacct/File.pm
+file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Exacct/Object.pm
+file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Intrs.pm
+file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Kstat.pm
+file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Lgrp.pm
+file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Privilege.pm
+file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Project.pm
+file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Task.pm
+file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Ucred.pm
+file path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/Sun/Solaris/Utils.pm
+file \
+    path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/Catalog/Catalog.bs
+file \
+    path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/Catalog/Catalog.so
+file \
+    path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/Exacct.bs
+file \
+    path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/Exacct.so
+file \
+    path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/File/File.bs
+file \
+    path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/File/File.so
+file \
+    path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/Object/Object.bs
+file \
+    path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Exacct/Object/Object.so
+file \
+    path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Intrs/Intrs.bs
+file \
+    path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Intrs/Intrs.so
+file \
+    path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Kstat/Kstat.bs
+file \
+    path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Kstat/Kstat.so
+file \
+    path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Lgrp/Lgrp.bs
+file \
+    path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Lgrp/Lgrp.so
+file \
+    path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Privilege/Privilege.bs
+file \
+    path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Privilege/Privilege.so
+file \
+    path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Project/Project.bs
+file \
+    path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Project/Project.so
+file \
+    path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Task/Task.bs
+file \
+    path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Task/Task.so
+file \
+    path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Ucred/Ucred.bs
+file \
+    path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Ucred/Ucred.so
+file \
+    path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Utils/Utils.bs
+file \
+    path=usr/perl5/5.10.0/lib/PLAT-solaris-64int/auto/Sun/Solaris/Utils/Utils.so
+file path=usr/perl5/5.10.0/lib/Sun/Solaris/BSM/_BSMparse.pm
+file path=usr/perl5/5.10.0/lib/Sun/Solaris/PerlGcc/Config.pm
 license cmd/perl/THIRDPARTYLICENSE license=cmd/perl/THIRDPARTYLICENSE
 license cr_Sun license=cr_Sun
 depend fmri=runtime/perl-510 type=require
--- a/usr/src/pkg/manifests/service-fault-management.mf	Mon Aug 02 15:21:03 2010 -0600
+++ b/usr/src/pkg/manifests/service-fault-management.mf	Mon Aug 02 16:32:07 2010 -0600
@@ -43,6 +43,10 @@
 dir path=etc group=sys variant.opensolaris.zone=__NODEFAULT
 dir path=etc/fm group=sys variant.opensolaris.zone=__NODEFAULT
 dir path=etc/fm/fmd group=sys variant.opensolaris.zone=__NODEFAULT
+#
+# Our additional /etc/logadm.conf entries are common to global and local zones
+#
+dir path=etc/logadm.d group=sys variant.opensolaris.zone=__NODEFAULT
 dir path=etc/net-snmp variant.opensolaris.zone=__NODEFAULT
 dir path=etc/net-snmp/snmp variant.opensolaris.zone=__NODEFAULT
 dir path=etc/net-snmp/snmp/mibs variant.opensolaris.zone=__NODEFAULT
@@ -60,10 +64,6 @@
 dir path=lib/svc/manifest/system/fm group=sys \
     variant.opensolaris.zone=__NODEFAULT
 #
-# Our additional /etc/logadm.conf entries are common to global and local zones
-#
-dir path=etc/logadm.d group=sys variant.opensolaris.zone=__NODEFAULT
-#
 # usr dirs:
 #	- most are common to both global and non-global zones
 #	- those mentioning 'include' will automatically apply to both
@@ -237,6 +237,12 @@
 #
 driver name=fm perms="* 0644 root sys"
 #
+# Our additional /etc/logadm.conf entries are common to global and local zones
+#
+file path=etc/logadm.d/fmd.logadm.conf group=sys mode=0444 \
+    refresh_fmri=svc:/system/logadm-upgrade:default \
+    variant.opensolaris.zone=__NODEFAULT
+#
 # Now for our file and link payloads
 #
 # snmp MIBs are common to both global and non-global zones
@@ -259,12 +265,6 @@
 file path=lib/svc/manifest/system/fmd.xml group=sys mode=0444 \
     variant.opensolaris.zone=__NODEFAULT
 #
-# Our additional /etc/logadm.conf entries are common to global and local zones
-#
-file path=etc/logadm.d/fmd.logadm.conf group=sys mode=0444 \
-    refresh_fmri='svc:/system/logadm-upgrade:default' \
-    variant.opensolaris.zone=__NODEFAULT
-#
 # Headers are automatically included in both contexts.
 # While some of these are from global-zone-only components
 # there's no harm in including them in both contexts.
@@ -364,9 +364,9 @@
     variant.opensolaris.zone=__NODEFAULT
 file path=usr/lib/fm/dict/SENSOR.dict mode=0444 \
     variant.opensolaris.zone=__NODEFAULT
-file path=usr/lib/fm/dict/STORAGE.dict mode=0444 \
+file path=usr/lib/fm/dict/SMF.dict mode=0444 \
     variant.opensolaris.zone=__NODEFAULT
-file path=usr/lib/fm/dict/SMF.dict mode=0444 \
+file path=usr/lib/fm/dict/STORAGE.dict mode=0444 \
     variant.opensolaris.zone=__NODEFAULT
 $(sparc_ONLY)file path=usr/lib/fm/dict/SUN4.dict mode=0444 \
     variant.opensolaris.zone=__NODEFAULT
@@ -583,9 +583,9 @@
     variant.opensolaris.zone=__NODEFAULT
 file path=usr/lib/locale/C/LC_MESSAGES/SENSOR.mo mode=0444 \
     variant.opensolaris.zone=__NODEFAULT
-file path=usr/lib/locale/C/LC_MESSAGES/STORAGE.mo mode=0444 \
+file path=usr/lib/locale/C/LC_MESSAGES/SMF.mo mode=0444 \
     variant.opensolaris.zone=__NODEFAULT
-file path=usr/lib/locale/C/LC_MESSAGES/SMF.mo mode=0444 \
+file path=usr/lib/locale/C/LC_MESSAGES/STORAGE.mo mode=0444 \
     variant.opensolaris.zone=__NODEFAULT
 $(sparc_ONLY)file path=usr/lib/locale/C/LC_MESSAGES/SUN4.mo mode=0444 \
     variant.opensolaris.zone=__NODEFAULT
--- a/usr/src/pkg/manifests/source-demo-system.mf	Mon Aug 02 15:21:03 2010 -0600
+++ b/usr/src/pkg/manifests/source-demo-system.mf	Mon Aug 02 16:32:07 2010 -0600
@@ -48,8 +48,8 @@
 dir path=usr/demo/link_audit
 dir path=usr/demo/link_audit/man
 dir path=usr/demo/link_audit/src
+file path=usr/demo/ELF/00README
 file path=usr/demo/ELF/Makefile
-file path=usr/demo/ELF/00README
 file path=usr/demo/ELF/acom.c
 file path=usr/demo/ELF/dcom.c
 file path=usr/demo/ELF/dispsyms.c
--- a/usr/src/pkg/manifests/system-file-system-zfs.mf	Mon Aug 02 15:21:03 2010 -0600
+++ b/usr/src/pkg/manifests/system-file-system-zfs.mf	Mon Aug 02 16:32:07 2010 -0600
@@ -74,7 +74,8 @@
 $(i386_ONLY)dir path=usr/sbin/$(ARCH32)
 dir path=usr/sbin/$(ARCH64)
 driver name=zfs perms="* 0600 root sys" perms="zfs 0666 root sys"
-file path=etc/sysevent/config/SUNW,EC_zfs,ESC_ZFS_bootfs_vdev_attach,sysevent.conf \
+file \
+    path=etc/sysevent/config/SUNW,EC_zfs,ESC_ZFS_bootfs_vdev_attach,sysevent.conf \
     group=sys
 file path=kernel/drv/$(ARCH64)/zfs group=sys
 $(i386_ONLY)file path=kernel/drv/zfs group=sys
--- a/usr/src/pkg/manifests/system-header.mf	Mon Aug 02 15:21:03 2010 -0600
+++ b/usr/src/pkg/manifests/system-header.mf	Mon Aug 02 16:32:07 2010 -0600
@@ -91,8 +91,8 @@
 dir path=usr/include/sys/ib/clients/of/rdma
 dir path=usr/include/sys/ib/clients/of/sol_ofs
 dir path=usr/include/sys/ib/clients/of/sol_ucma
+dir path=usr/include/sys/ib/clients/of/sol_umad
 dir path=usr/include/sys/ib/clients/of/sol_uverbs
-dir path=usr/include/sys/ib/clients/of/sol_umad
 dir path=usr/include/sys/ib/ibnex
 dir path=usr/include/sys/ib/ibtl
 dir path=usr/include/sys/ib/ibtl/impl
--- a/usr/src/pkg/manifests/system-kernel-platform.mf	Mon Aug 02 15:21:03 2010 -0600
+++ b/usr/src/pkg/manifests/system-kernel-platform.mf	Mon Aug 02 16:32:07 2010 -0600
@@ -821,9 +821,6 @@
 $(i386_ONLY)file \
     path=platform/i86pc/kernel/cpu/$(ARCH64)/cpu_ms.GenuineIntel.6.46 \
     group=sys mode=0755
-$(i386_ONLY)hardlink \
-    path=platform/i86pc/kernel/cpu/$(ARCH64)/cpu_ms.GenuineIntel.6.47 \
-    target=cpu_ms.GenuineIntel.6.46
 $(i386_ONLY)file path=platform/i86pc/kernel/cpu/cpu.generic group=sys \
     mode=0755
 $(i386_ONLY)file path=platform/i86pc/kernel/cpu/cpu_ms.AuthenticAMD group=sys \
@@ -834,9 +831,6 @@
     mode=0755
 $(i386_ONLY)file path=platform/i86pc/kernel/cpu/cpu_ms.GenuineIntel.6.46 \
     group=sys mode=0755
-$(i386_ONLY)hardlink \
-    path=platform/i86pc/kernel/cpu/cpu_ms.GenuineIntel.6.47 \
-    target=cpu_ms.GenuineIntel.6.46
 $(i386_ONLY)file path=platform/i86pc/kernel/dacf/$(ARCH64)/consconfig_dacf \
     group=sys mode=0755
 $(i386_ONLY)file path=platform/i86pc/kernel/dacf/consconfig_dacf group=sys \
@@ -866,15 +860,15 @@
 $(i386_ONLY)file path=platform/i86pc/kernel/drv/ppm.conf group=sys
 $(i386_ONLY)file path=platform/i86pc/kernel/drv/rootnex group=sys
 $(i386_ONLY)file path=platform/i86pc/kernel/drv/rootnex.conf group=sys
-$(i386_ONLY)file path=platform/i86pc/kernel/mach/$(ARCH64)/pcplusmp group=sys \
+$(i386_ONLY)file path=platform/i86pc/kernel/mach/$(ARCH64)/apix group=sys \
     mode=0755
-$(i386_ONLY)file path=platform/i86pc/kernel/mach/$(ARCH64)/apix group=sys \
+$(i386_ONLY)file path=platform/i86pc/kernel/mach/$(ARCH64)/pcplusmp group=sys \
     mode=0755
 $(i386_ONLY)file path=platform/i86pc/kernel/mach/$(ARCH64)/uppc group=sys \
     mode=0755
+$(i386_ONLY)file path=platform/i86pc/kernel/mach/apix group=sys mode=0755
 $(i386_ONLY)file path=platform/i86pc/kernel/mach/pcplusmp group=sys mode=0755
 $(i386_ONLY)file path=platform/i86pc/kernel/mach/uppc group=sys mode=0755
-$(i386_ONLY)file path=platform/i86pc/kernel/mach/apix group=sys mode=0755
 $(i386_ONLY)file path=platform/i86pc/kernel/misc/$(ARCH64)/acpidev group=sys \
     mode=0755
 $(i386_ONLY)file path=platform/i86pc/kernel/misc/$(ARCH64)/gfx_private \
@@ -1162,6 +1156,11 @@
 $(sparc_ONLY)file path=platform/sun4v/kernel/misc/$(ARCH64)/vis group=sys \
     mode=0755
 $(sparc_ONLY)file path=platform/sun4v/wanboot group=sys reboot-needed=true
+$(i386_ONLY)hardlink \
+    path=platform/i86pc/kernel/cpu/$(ARCH64)/cpu_ms.GenuineIntel.6.47 \
+    target=cpu_ms.GenuineIntel.6.46
+$(i386_ONLY)hardlink path=platform/i86pc/kernel/cpu/cpu_ms.GenuineIntel.6.47 \
+    target=cpu_ms.GenuineIntel.6.46
 $(sparc_ONLY)hardlink path=platform/sun4u/kernel/misc/$(ARCH64)/md5 \
     target=../../../kernel/crypto/$(ARCH64)/md5
 $(sparc_ONLY)hardlink path=platform/sun4u/kernel/misc/$(ARCH64)/sha1 \
--- a/usr/src/pkg/manifests/system-library-platform.mf	Mon Aug 02 15:21:03 2010 -0600
+++ b/usr/src/pkg/manifests/system-library-platform.mf	Mon Aug 02 16:32:07 2010 -0600
@@ -482,16 +482,14 @@
     target=../../sun4u/lib/cfgadm
 $(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire/lib/fs \
     target=../../sun4u/lib/fs
-$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire/sbin \
-    target=../sun4u/sbin
+$(sparc_ONLY)link path=usr/platform/SUNW,Sun-Fire/sbin target=../sun4u/sbin
 $(sparc_ONLY)link path=usr/platform/SUNW,T5140/lib/fs \
     target=../../sun4v/lib/fs
 $(sparc_ONLY)link path=usr/platform/SUNW,T5140/lib/libpcp.so \
     target=../../sun4v/lib/libpcp.so
 $(sparc_ONLY)link path=usr/platform/SUNW,T5140/lib/libpcp.so.1 \
     target=../../sun4v/lib/libpcp.so.1
-$(sparc_ONLY)link path=usr/platform/SUNW,T5140/sbin \
-    target=../sun4v/sbin
+$(sparc_ONLY)link path=usr/platform/SUNW,T5140/sbin target=../sun4v/sbin
 $(sparc_ONLY)link path=usr/platform/SUNW,T5240 target=SUNW,T5140
 $(sparc_ONLY)link path=usr/platform/SUNW,T5440 target=SUNW,T5140
 $(sparc_ONLY)link path=usr/platform/SUNW,USBRDT-5240/lib/fs \
@@ -500,8 +498,7 @@
     target=../../sun4v/lib/libpcp.so
 $(sparc_ONLY)link path=usr/platform/SUNW,USBRDT-5240/lib/libpcp.so.1 \
     target=../../sun4v/lib/libpcp.so.1
-$(sparc_ONLY)link path=usr/platform/SUNW,USBRDT-5240/sbin \
-    target=../sun4v/sbin
+$(sparc_ONLY)link path=usr/platform/SUNW,USBRDT-5240/sbin target=../sun4v/sbin
 $(sparc_ONLY)link path=usr/platform/SUNW,Ultra-2/lib/cfgadm \
     target=../../sun4u/lib/cfgadm
 $(sparc_ONLY)link path=usr/platform/SUNW,Ultra-2/lib/fs \
--- a/usr/src/pkg/manifests/system-library-security-crypto-pkcs11_kms.mf	Mon Aug 02 15:21:03 2010 -0600
+++ b/usr/src/pkg/manifests/system-library-security-crypto-pkcs11_kms.mf	Mon Aug 02 16:32:07 2010 -0600
@@ -21,27 +21,28 @@
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/system/library/security/crypto/pkcs11_kms@$(PKGVERS)
-set name=pkg.description \
-    value="PKCS#11 KMS Provider"
-set name=pkg.summary value="pkcs11_kms"
-set name=info.classification value=org.opensolaris.category.2010:System/Security/Crypto
+set name=pkg.fmri \
+    value=pkg:/system/library/security/crypto/pkcs11_kms@$(PKGVERS)
+set name=pkg.description value="PKCS#11 KMS Provider"
+set name=pkg.summary value=pkcs11_kms
+set name=info.classification \
+    value=org.opensolaris.category.2010:System/Security/Crypto
 set name=variant.arch value=$(ARCH)
 set name=variant.opensolaris.zone value=global value=nonglobal
 dir path=usr group=sys
+dir path=usr/bin
 dir path=usr/lib
 dir path=usr/lib/$(ARCH64)
 dir path=usr/lib/security
 dir path=usr/lib/security/$(ARCH64)
-dir path=usr/bin
+file path=usr/bin/kmscfg group=sys mode=0555
 file path=usr/lib/$(ARCH64)/libkmsagent.so.1
+file path=usr/lib/libkmsagent.so.1
 file path=usr/lib/security/$(ARCH64)/pkcs11_kms.so.1
-file path=usr/lib/libkmsagent.so.1
 file path=usr/lib/security/pkcs11_kms.so.1
-file path=usr/bin/kmscfg group=sys mode=0555
 license cr_Sun license=cr_Sun
+license lib/libkmsagent/THIRDPARTYLICENSE \
+    license=lib/libkmsagent/THIRDPARTYLICENSE
 license lic_CDDL license=lic_CDDL
-license lib/libkmsagent/THIRDPARTYLICENSE \
-	license=lib/libkmsagent/THIRDPARTYLICENSE
 link path=usr/lib/security/$(ARCH64)/pkcs11_kms.so target=pkcs11_kms.so.1
 link path=usr/lib/security/pkcs11_kms.so target=pkcs11_kms.so.1
--- a/usr/src/pkg/manifests/system-library.mf	Mon Aug 02 15:21:03 2010 -0600
+++ b/usr/src/pkg/manifests/system-library.mf	Mon Aug 02 16:32:07 2010 -0600
@@ -1199,9 +1199,9 @@
 link path=usr/xpg4/lib/64 target=$(ARCH64)
 link path=usr/xpg4/lib/libcurses.so target=./libcurses.so.2
 $(USE_INTERNAL_CRYPTO)depend fmri=driver/crypto/dprov type=require
+depend fmri=runtime/python-26 type=require
 #
 # libses.so needs to dlopen(3C) plugins from usr/lib/scsi/plugins/ses/vendor/,
 # a dependency which cannot be automatically derived
 #
 depend fmri=system/library/storage/scsi-plugins type=require
-depend fmri=runtime/python-26 type=require