--- a/components/openscap/openscap.p5m	Tue Feb 23 15:51:24 2016 -0800
+++ b/components/openscap/openscap.p5m	Wed Feb 24 14:19:35 2016 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -36,9 +36,7 @@
 set name=org.opensolaris.arc-caseid value=PSARC/2012/152
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
-
 file path=usr/bin/oscap
-file path=usr/etc/bash_completion.d/oscap
 file path=usr/include/openscap/check_engine_plugin.h
 file path=usr/include/openscap/cpe_dict.h
 file path=usr/include/openscap/cpe_lang.h
@@ -61,6 +59,8 @@
 file path=usr/include/openscap/oval_probe_handler.h
 file path=usr/include/openscap/oval_probe_session.h
 file path=usr/include/openscap/oval_results.h
+file path=usr/include/openscap/oval_schema_version.h
+file path=usr/include/openscap/oval_session.h
 file path=usr/include/openscap/oval_system_characteristics.h
 file path=usr/include/openscap/oval_types.h
 file path=usr/include/openscap/oval_variables.h
@@ -70,12 +70,12 @@
 file path=usr/include/openscap/xccdf_benchmark.h
 file path=usr/include/openscap/xccdf_policy.h
 file path=usr/include/openscap/xccdf_session.h
-link path=usr/lib/libopenscap.so target=libopenscap.so.8.4.3
-link path=usr/lib/libopenscap.so.8 target=libopenscap.so.8.4.3
-file path=usr/lib/libopenscap.so.8.4.3
-link path=usr/lib/libopenscap_sce.so target=libopenscap_sce.so.8.4.3
-link path=usr/lib/libopenscap_sce.so.8 target=libopenscap_sce.so.8.4.3
-file path=usr/lib/libopenscap_sce.so.8.4.3
+link path=usr/lib/libopenscap.so target=libopenscap.so.8.6.0
+link path=usr/lib/libopenscap.so.8 target=libopenscap.so.8.6.0
+file path=usr/lib/libopenscap.so.8.6.0
+link path=usr/lib/libopenscap_sce.so target=libopenscap_sce.so.8.6.0
+link path=usr/lib/libopenscap_sce.so.8 target=libopenscap_sce.so.8.6.0
+file path=usr/lib/libopenscap_sce.so.8.6.0
 file path=usr/lib/openscap/probe_dnscache
 file path=usr/lib/openscap/probe_environmentvariable
 file path=usr/lib/openscap/probe_environmentvariable58
@@ -93,6 +93,8 @@
 file path=usr/lib/openscap/probe_runlevel
 file path=usr/lib/openscap/probe_shadow
 file path=usr/lib/openscap/probe_smf
+file path=usr/lib/openscap/probe_smfproperty
+file path=usr/lib/openscap/probe_symlink
 file path=usr/lib/openscap/probe_sysctl
 file path=usr/lib/openscap/probe_system_info
 file path=usr/lib/openscap/probe_textfilecontent
@@ -101,7 +103,6 @@
 file path=usr/lib/openscap/probe_variable
 file path=usr/lib/openscap/probe_xinetd
 file path=usr/lib/openscap/probe_xmlfilecontent
-file path=usr/lib/pkgconfig/libopenscap.pc
 file path=usr/share/docs/openscap/html/MurmurHash3_8h_source.html
 file path=usr/share/docs/openscap/html/OVAL_2probes_2SEAP_2generic_2bfind_8h_source.html
 file path=usr/share/docs/openscap/html/OVAL_2probes_2SEAP_2public_2helpers_8h_source.html
@@ -340,6 +341,7 @@
 file path=usr/share/docs/openscap/html/group__OVALDEF.html
 file path=usr/share/docs/openscap/html/group__OVALDIR.html
 file path=usr/share/docs/openscap/html/group__OVALRES.html
+file path=usr/share/docs/openscap/html/group__OVALSESSION.html
 file path=usr/share/docs/openscap/html/group__OVALSYS.html
 file path=usr/share/docs/openscap/html/group__OVALVAR.html
 file path=usr/share/docs/openscap/html/group__PROBEAPI.html
@@ -384,6 +386,7 @@
 file path=usr/share/docs/openscap/html/oscap_8h.html
 file path=usr/share/docs/openscap/html/oscap_8h_source.html
 file path=usr/share/docs/openscap/html/oscap__acquire_8h_source.html
+file path=usr/share/docs/openscap/html/oscap__buffer_8h_source.html
 file path=usr/share/docs/openscap/html/oscap__error_8h.html
 file path=usr/share/docs/openscap/html/oscap__error_8h_source.html
 file path=usr/share/docs/openscap/html/oscap__reference_8h_source.html
@@ -460,6 +463,9 @@
 file path=usr/share/docs/openscap/html/oval__results_8h_source.html
 file path=usr/share/docs/openscap/html/oval__results__impl_8h.html
 file path=usr/share/docs/openscap/html/oval__results__impl_8h_source.html
+file path=usr/share/docs/openscap/html/oval__schema__version_8h_source.html
+file path=usr/share/docs/openscap/html/oval__session_8h.html
+file path=usr/share/docs/openscap/html/oval__session_8h_source.html
 file path=usr/share/docs/openscap/html/oval__set_8c.html
 file path=usr/share/docs/openscap/html/oval__sexp_8c.html
 file path=usr/share/docs/openscap/html/oval__sexp_8h.html
@@ -468,6 +474,7 @@
 file path=usr/share/docs/openscap/html/oval__smc__iterator__impl_8h_source.html
 file path=usr/share/docs/openscap/html/oval__stateContent_8c.html
 file path=usr/share/docs/openscap/html/oval__state_8c.html
+file path=usr/share/docs/openscap/html/oval__status__counter_8h_source.html
 file path=usr/share/docs/openscap/html/oval__string__map_8c.html
 file path=usr/share/docs/openscap/html/oval__string__map__impl_8h.html
 file path=usr/share/docs/openscap/html/oval__string__map__impl_8h_source.html
@@ -691,6 +698,7 @@
 file path=usr/share/docs/openscap/html/structinterface__t.html
 file path=usr/share/docs/openscap/html/structllist.html
 file path=usr/share/docs/openscap/html/structoresults.html
+file path=usr/share/docs/openscap/html/structoscap__buffer.html
 file path=usr/share/docs/openscap/html/structoscap__err__t.html
 file path=usr/share/docs/openscap/html/structoscap__file__entry.html
 file path=usr/share/docs/openscap/html/structoscap__file__entry__iterator.html
@@ -704,7 +712,6 @@
 file path=usr/share/docs/openscap/html/structoscap__reference.html
 file path=usr/share/docs/openscap/html/structoscap__schema__table__entry.html
 file path=usr/share/docs/openscap/html/structoscap__source.html
-file path=usr/share/docs/openscap/html/structoscap__string.html
 file path=usr/share/docs/openscap/html/structoscap__string__iterator.html
 file path=usr/share/docs/openscap/html/structoscap__string__map.html
 file path=usr/share/docs/openscap/html/structoscap__stringlist.html
@@ -790,6 +797,8 @@
 file path=usr/share/docs/openscap/html/structoval__result__test__iterator.html
 file path=usr/share/docs/openscap/html/structoval__result__to__xccdf__spec.html
 file path=usr/share/docs/openscap/html/structoval__results__model.html
+file path=usr/share/docs/openscap/html/structoval__schema__version__t.html
+file path=usr/share/docs/openscap/html/structoval__session.html
 file path=usr/share/docs/openscap/html/structoval__set__AGGREGATE.html
 file path=usr/share/docs/openscap/html/structoval__set__COLLECTIVE.html
 file path=usr/share/docs/openscap/html/structoval__set__context.html
@@ -800,6 +809,7 @@
 file path=usr/share/docs/openscap/html/structoval__state__content.html
 file path=usr/share/docs/openscap/html/structoval__state__content__iterator.html
 file path=usr/share/docs/openscap/html/structoval__state__iterator.html
+file path=usr/share/docs/openscap/html/structoval__status__counter.html
 file path=usr/share/docs/openscap/html/structoval__string__iterator.html
 file path=usr/share/docs/openscap/html/structoval__subtypedsc__t.html
 file path=usr/share/docs/openscap/html/structoval__syschar.html
@@ -828,6 +838,9 @@
 file path=usr/share/docs/openscap/html/structoval__variable__iterator.html
 file path=usr/share/docs/openscap/html/structoval__variable__model.html
 file path=usr/share/docs/openscap/html/structoval__variable__model__iterator.html
+file path=usr/share/docs/openscap/html/structoval__variable__possible__restriction.html
+file path=usr/share/docs/openscap/html/structoval__variable__possible__value.html
+file path=usr/share/docs/openscap/html/structoval__variable__restriction.html
 file path=usr/share/docs/openscap/html/structpfdata.html
 file path=usr/share/docs/openscap/html/structprobe__citem__t.html
 file path=usr/share/docs/openscap/html/structprobe__ctx.html
@@ -937,6 +950,7 @@
 file path=usr/share/docs/openscap/html/structxccdf__profile__note.html
 file path=usr/share/docs/openscap/html/structxccdf__profile__note__iterator.html
 file path=usr/share/docs/openscap/html/structxccdf__refine__rule.html
+file path=usr/share/docs/openscap/html/structxccdf__refine__rule__internal.html
 file path=usr/share/docs/openscap/html/structxccdf__refine__rule__iterator.html
 file path=usr/share/docs/openscap/html/structxccdf__refine__value.html
 file path=usr/share/docs/openscap/html/structxccdf__refine__value__iterator.html
@@ -975,6 +989,7 @@
 file path=usr/share/docs/openscap/html/structxiconf__service.html
 file path=usr/share/docs/openscap/html/structxiconf__strans__t.html
 file path=usr/share/docs/openscap/html/structxiconf__t.html
+file path=usr/share/docs/openscap/html/symlink_8c.html
 file path=usr/share/docs/openscap/html/sync_off.png
 file path=usr/share/docs/openscap/html/sync_on.png
 file path=usr/share/docs/openscap/html/sysctl_8c.html
@@ -1008,6 +1023,7 @@
 file path=usr/share/docs/openscap/html/xccdf__policy__engine__priv_8h_source.html
 file path=usr/share/docs/openscap/html/xccdf__policy__model__priv_8h_source.html
 file path=usr/share/docs/openscap/html/xccdf__policy__priv_8h_source.html
+file path=usr/share/docs/openscap/html/xccdf__policy__resolve_8h_source.html
 file path=usr/share/docs/openscap/html/xccdf__session_8h.html
 file path=usr/share/docs/openscap/html/xccdf__session_8h_source.html
 file path=usr/share/docs/openscap/html/xinetd_8c.html
@@ -1016,9 +1032,16 @@
 file path=usr/share/docs/openscap/html/xmlns__priv_8h_source.html
 file path=usr/share/docs/openscap/html/xmltext__priv_8h_source.html
 file path=usr/share/docs/openscap/html/xslt__priv_8h_source.html
+file path=usr/share/man/man8/oscap-docker.8
+file path=usr/share/man/man8/oscap-ssh.8
 file path=usr/share/man/man8/oscap.8
+file path=usr/share/man/man8/scap-as-rpm.8
 file path=usr/share/openscap/cpe/openscap-cpe-dict.xml
 file path=usr/share/openscap/cpe/openscap-cpe-oval.xml
+file path=usr/share/openscap/scap-fedora14-oval.xml
+file path=usr/share/openscap/scap-fedora14-xccdf.xml
+file path=usr/share/openscap/scap-rhel6-oval.xml
+file path=usr/share/openscap/scap-rhel6-xccdf.xml
 file path=usr/share/openscap/schemas/arf/1.1/asset-identification_1.1.0.xsd
 file path=usr/share/openscap/schemas/arf/1.1/asset-reporting-format_1.1.0.xsd
 file path=usr/share/openscap/schemas/arf/1.1/reporting-core_1.1.0.xsd
@@ -1124,6 +1147,59 @@
 file path=usr/share/openscap/schemas/oval/5.10/unix-system-characteristics-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.10/windows-definitions-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.10/windows-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/aix-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/aix-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/android-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/android-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/apache-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/apache-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/apple-ios-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/apple-ios-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/asa-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/asa-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/catos-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/catos-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/esx-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/esx-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/freebsd-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/freebsd-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/hpux-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/hpux-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/independent-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/independent-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/ios-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/ios-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/iosxe-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/iosxe-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/junos-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/junos-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/linux-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/linux-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/macos-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/macos-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/netconf-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/netconf-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/oval-common-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/oval-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/oval-definitions-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.11.1/oval-directives-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/oval-directives-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.11.1/oval-results-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/oval-results-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.11.1/oval-system-characteristic-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.11.1/oval-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/oval-variables-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/oval-variables-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.11.1/pixos-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/pixos-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/sharepoint-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/sharepoint-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/solaris-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/solaris-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/unix-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/unix-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/windows-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/windows-system-characteristics-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.11/aix-definitions-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.11/aix-system-characteristics-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.11/android-definitions-schema.xsd
@@ -1465,6 +1541,32 @@
 file path=usr/share/openscap/schemas/xccdf/1.2/datatypes.dtd
 file path=usr/share/openscap/schemas/xccdf/1.2/xccdf_1.2-schematron.xsl
 file path=usr/share/openscap/schemas/xccdf/1.2/xccdf_1.2.xsd
+file path=usr/share/openscap/sectool-sce/00_integrity.sh
+file path=usr/share/openscap/sectool-sce/01_bootloader.sh
+file path=usr/share/openscap/sectool-sce/01_disk_usage.sh
+file path=usr/share/openscap/sectool-sce/01_group.sh
+file path=usr/share/openscap/sectool-sce/01_passwd.sh
+file path=usr/share/openscap/sectool-sce/01_shadow.sh
+file path=usr/share/openscap/sectool-sce/02_home_files.sh
+file path=usr/share/openscap/sectool-sce/02_root_dirs.sh
+file path=usr/share/openscap/sectool-sce/03_path.sh
+file path=usr/share/openscap/sectool-sce/04_firewall.sh
+file path=usr/share/openscap/sectool-sce/05_netserv.sh
+file path=usr/share/openscap/sectool-sce/05_openssh.sh
+file path=usr/share/openscap/sectool-sce/05_openvpn.sh
+file path=usr/share/openscap/sectool-sce/05_removed_libs.sh
+file path=usr/share/openscap/sectool-sce/05_xinetd.sh
+file path=usr/share/openscap/sectool-sce/07_log_files.sh
+file path=usr/share/openscap/sectool-sce/08_pam.sh
+file path=usr/share/openscap/sectool-sce/08_permissions.sh
+file path=usr/share/openscap/sectool-sce/09_exec_shield.sh
+file path=usr/share/openscap/sectool-sce/09_selinux.sh
+file path=usr/share/openscap/sectool-sce/09_va_randomization.sh
+file path=usr/share/openscap/sectool-sce/11_aliases.sh
+file path=usr/share/openscap/sectool-sce/12_cron.sh
+file path=usr/share/openscap/sectool-sce/14_nfs.sh
+file path=usr/share/openscap/sectool-sce/15_tcp_wrappers.sh
+file path=usr/share/openscap/sectool-sce/sectool-xccdf.xml
 file path=usr/share/openscap/xsl/legacy-fix.xsl
 file path=usr/share/openscap/xsl/legacy-fixtpl-bash.xml
 file path=usr/share/openscap/xsl/legacy-xccdf-share.xsl
@@ -1486,7 +1588,7 @@
     fmri=library/perl-5/openscap-512@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
     predicate=runtime/perl-512
 depend type=conditional \
-    fmri=library/python/openscap-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    fmri=library/python/openscap-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
     predicate=runtime/python-26
 depend type=conditional \
     fmri=library/python/openscap-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \