--- a/components/openscap/openscap.p5m	Thu May 21 15:02:14 2015 -0700
+++ b/components/openscap/openscap.p5m	Fri May 22 09:41:01 2015 -0700
@@ -22,7 +22,7 @@
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
-<transform file path=usr/lib/openscap/.+ ->default mode 0555>
+<transform file path=usr/lib/openscap/.+ -> default mode 0555>
 <transform file path=usr/share/docs/openscap/html/.* -> default facet.doc.html true>
 set name=pkg.fmri \
     value=pkg:/security/compliance/openscap@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -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.1
-link path=usr/lib/libopenscap.so.8 target=libopenscap.so.8.4.1
-file path=usr/lib/libopenscap.so.8.4.1
-link path=usr/lib/libopenscap_sce.so target=libopenscap_sce.so.8.4.1
-link path=usr/lib/libopenscap_sce.so.8 target=libopenscap_sce.so.8.4.1
-file path=usr/lib/libopenscap_sce.so.8.4.1
+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
 file path=usr/lib/openscap/probe_dnscache
 file path=usr/lib/openscap/probe_environmentvariable
 file path=usr/lib/openscap/probe_environmentvariable58
@@ -134,6 +134,8 @@
 file path=usr/share/docs/openscap/html/alloc_8h.html
 file path=usr/share/docs/openscap/html/alloc_8h_source.html
 file path=usr/share/docs/openscap/html/annotated.html
+file path=usr/share/docs/openscap/html/arrowdown.png
+file path=usr/share/docs/openscap/html/arrowright.png
 file path=usr/share/docs/openscap/html/assume_8h_source.html
 file path=usr/share/docs/openscap/html/bc_s.png
 file path=usr/share/docs/openscap/html/bdwn.png
@@ -222,6 +224,7 @@
 file path=usr/share/docs/openscap/html/dir_e59844bb90898a84583aad04688e689a.html
 file path=usr/share/docs/openscap/html/dir_f2a93cdd3aad33ca5b82af4e93bb682f.html
 file path=usr/share/docs/openscap/html/dir_fdedb0aba14d44ce9d99bc100e026e6a.html
+file path=usr/share/docs/openscap/html/doc.png
 file path=usr/share/docs/openscap/html/doc__type__priv_8h_source.html
 file path=usr/share/docs/openscap/html/doxygen.css
 file path=usr/share/docs/openscap/html/doxygen.png
@@ -248,26 +251,12 @@
 file path=usr/share/docs/openscap/html/findfile_8h.html
 file path=usr/share/docs/openscap/html/findfile_8h_source.html
 file path=usr/share/docs/openscap/html/fini_8c.html
+file path=usr/share/docs/openscap/html/folderclosed.png
+file path=usr/share/docs/openscap/html/folderopen.png
 file path=usr/share/docs/openscap/html/fsdev_8c.html
 file path=usr/share/docs/openscap/html/fsdev_8h.html
 file path=usr/share/docs/openscap/html/fsdev_8h_source.html
 file path=usr/share/docs/openscap/html/fts__sun_8h_source.html
-file path=usr/share/docs/openscap/html/ftv2blank.png
-file path=usr/share/docs/openscap/html/ftv2cl.png
-file path=usr/share/docs/openscap/html/ftv2doc.png
-file path=usr/share/docs/openscap/html/ftv2folderclosed.png
-file path=usr/share/docs/openscap/html/ftv2folderopen.png
-file path=usr/share/docs/openscap/html/ftv2lastnode.png
-file path=usr/share/docs/openscap/html/ftv2link.png
-file path=usr/share/docs/openscap/html/ftv2mlastnode.png
-file path=usr/share/docs/openscap/html/ftv2mnode.png
-file path=usr/share/docs/openscap/html/ftv2mo.png
-file path=usr/share/docs/openscap/html/ftv2node.png
-file path=usr/share/docs/openscap/html/ftv2ns.png
-file path=usr/share/docs/openscap/html/ftv2plastnode.png
-file path=usr/share/docs/openscap/html/ftv2pnode.png
-file path=usr/share/docs/openscap/html/ftv2splitbar.png
-file path=usr/share/docs/openscap/html/ftv2vertline.png
 file path=usr/share/docs/openscap/html/functions.html
 file path=usr/share/docs/openscap/html/functions_b.html
 file path=usr/share/docs/openscap/html/functions_c.html
@@ -344,9 +333,7 @@
 file path=usr/share/docs/openscap/html/group__CVSS.html
 file path=usr/share/docs/openscap/html/group__Check.html
 file path=usr/share/docs/openscap/html/group__DS.html
-file path=usr/share/docs/openscap/html/group__Debug.html
 file path=usr/share/docs/openscap/html/group__ERRORS.html
-file path=usr/share/docs/openscap/html/group__ITER.html
 file path=usr/share/docs/openscap/html/group__Memory.html
 file path=usr/share/docs/openscap/html/group__OVAL.html
 file path=usr/share/docs/openscap/html/group__OVALADT.html
@@ -363,7 +350,6 @@
 file path=usr/share/docs/openscap/html/group__PROBEOVALSEXP.html
 file path=usr/share/docs/openscap/html/group__PROBES.html
 file path=usr/share/docs/openscap/html/group__PROBESESSION.html
-file path=usr/share/docs/openscap/html/group__Reporters.html
 file path=usr/share/docs/openscap/html/group__SEXPRESSIONS.html
 file path=usr/share/docs/openscap/html/group__STRINGS.html
 file path=usr/share/docs/openscap/html/group__Session.html
@@ -404,6 +390,7 @@
 file path=usr/share/docs/openscap/html/oscap__reference_8h_source.html
 file path=usr/share/docs/openscap/html/oscap__source_8h_source.html
 file path=usr/share/docs/openscap/html/oscap__source__priv_8h_source.html
+file path=usr/share/docs/openscap/html/oscap__string_8h_source.html
 file path=usr/share/docs/openscap/html/oscap__text_8h.html
 file path=usr/share/docs/openscap/html/oscap__text_8h_source.html
 file path=usr/share/docs/openscap/html/oscapxml_8h_source.html
@@ -445,6 +432,8 @@
 file path=usr/share/docs/openscap/html/oval__filter_8c.html
 file path=usr/share/docs/openscap/html/oval__fts_8h_source.html
 file path=usr/share/docs/openscap/html/oval__generator_8c.html
+file path=usr/share/docs/openscap/html/oval__glob__to__regex_8c.html
+file path=usr/share/docs/openscap/html/oval__glob__to__regex_8h_source.html
 file path=usr/share/docs/openscap/html/oval__message_8c.html
 file path=usr/share/docs/openscap/html/oval__objectContent_8c.html
 file path=usr/share/docs/openscap/html/oval__object_8c.html
@@ -578,6 +567,7 @@
 file path=usr/share/docs/openscap/html/sm__alloc_8h_source.html
 file path=usr/share/docs/openscap/html/smf_8c.html
 file path=usr/share/docs/openscap/html/spb_8h_source.html
+file path=usr/share/docs/openscap/html/splitbar.png
 file path=usr/share/docs/openscap/html/sql57_8c.html
 file path=usr/share/docs/openscap/html/sql_8c.html
 file path=usr/share/docs/openscap/html/strbuf_8h_source.html
@@ -715,6 +705,7 @@
 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
@@ -734,6 +725,7 @@
 file path=usr/share/docs/openscap/html/structoval__component__ARITHMETIC.html
 file path=usr/share/docs/openscap/html/structoval__component__BEGEND.html
 file path=usr/share/docs/openscap/html/structoval__component__FUNCTION.html
+file path=usr/share/docs/openscap/html/structoval__component__GLOB.html
 file path=usr/share/docs/openscap/html/structoval__component__LITERAL.html
 file path=usr/share/docs/openscap/html/structoval__component__OBJECTREF.html
 file path=usr/share/docs/openscap/html/structoval__component__REGEX__CAPTURE.html
@@ -1026,13 +1018,8 @@
 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.8
-file path=usr/share/openscap/cpe/README
 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
@@ -1172,10 +1159,15 @@
 file path=usr/share/openscap/schemas/oval/5.11/netconf-system-characteristics-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.11/oval-common-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.11/oval-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11/oval-definitions-schematron.xsl
 file path=usr/share/openscap/schemas/oval/5.11/oval-directives-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11/oval-directives-schematron.xsl
 file path=usr/share/openscap/schemas/oval/5.11/oval-results-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11/oval-results-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.11/oval-system-characteristic-schematron.xsl
 file path=usr/share/openscap/schemas/oval/5.11/oval-system-characteristics-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.11/oval-variables-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11/oval-variables-schematron.xsl
 file path=usr/share/openscap/schemas/oval/5.11/pixos-definitions-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.11/pixos-system-characteristics-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.11/sharepoint-definitions-schema.xsd
@@ -1474,32 +1466,6 @@
 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