--- a/components/openscap/openscap.p5m	Thu Jul 25 22:11:17 2013 -0700
+++ b/components/openscap/openscap.p5m	Mon Jul 29 09:35:09 2013 -0700
@@ -23,54 +23,30 @@
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 <transform file path=usr/lib/openscap/.+ ->default mode 0555>
-
-set name=pkg.fmri value=pkg:/security/compliance/openscap@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Open implementation of SCAP; a line of standards managed by NIST"
+set name=pkg.fmri \
+    value=pkg:/security/compliance/openscap@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="Open implementation of SCAP; a line of standards managed by NIST"
 set name=com.oracle.info.description value="the Open implementation of SCAP"
-set name=com.oracle.info.tpno value=8008
-set name=info.classification value="org.opensolaris.category.2008:System/Security"
+set name=com.oracle.info.tpno value=13530
+set name=info.classification value=org.opensolaris.category.2008:System/Security
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2012/152
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2012/152
-set pkg.linted=true
-
-license openscap.license license=LGPLv2.1
 
-dir path=usr
-dir path=usr/bin
-dir path=usr/etc
-dir path=usr/etc/bash_completion.d
-dir path=usr/include
-dir path=usr/include/openscap
-dir path=usr/lib
-dir path=usr/lib/openscap
-dir path=usr/lib/pkgconfig
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man8
-dir path=usr/share/openscap
-dir path=usr/share/openscap/schemas
-dir path=usr/share/openscap/schemas/oval
-dir path=usr/share/openscap/schemas/oval/5.8
-dir path=usr/share/openscap/schemas/xccdf
-dir path=usr/share/openscap/schemas/xccdf/1.1.4
-dir path=usr/share/openscap/xsl
 
 file path=usr/bin/oscap
 file path=usr/etc/bash_completion.d/oscap
-file path=usr/include/openscap/alloc.h
-file path=usr/include/openscap/cce.h
-file path=usr/include/openscap/cpe.h
-file path=usr/include/openscap/cpedict.h
-file path=usr/include/openscap/cpelang.h
-file path=usr/include/openscap/cpeuri.h
-file path=usr/include/openscap/cve.h
-file path=usr/include/openscap/cvss.h
-file path=usr/include/openscap/debug.h
-file path=usr/include/openscap/error.h
+file path=usr/include/openscap/cpe_dict.h
+file path=usr/include/openscap/cpe_lang.h
+file path=usr/include/openscap/cpe_name.h
+file path=usr/include/openscap/cve_nvd.h
+file path=usr/include/openscap/cvss_score.h
 file path=usr/include/openscap/oscap.h
+file path=usr/include/openscap/oscap_error.h
+file path=usr/include/openscap/oscap_reference.h
+file path=usr/include/openscap/oscap_text.h
 file path=usr/include/openscap/oval_agent_api.h
 file path=usr/include/openscap/oval_agent_xccdf_api.h
 file path=usr/include/openscap/oval_definitions.h
@@ -82,12 +58,14 @@
 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
-file path=usr/include/openscap/reference.h
-file path=usr/include/openscap/reporter.h
-file path=usr/include/openscap/text.h
-file path=usr/include/openscap/xccdf.h
+file path=usr/include/openscap/oval_version.h
+file path=usr/include/openscap/scap_ds.h
+file path=usr/include/openscap/sce_engine_api.h
+file path=usr/include/openscap/xccdf_benchmark.h
 file path=usr/include/openscap/xccdf_policy.h
-file path=usr/lib/libopenscap.so.1.0.0
+link path=usr/lib/libopenscap.so target=libopenscap.so.3.2.1
+link path=usr/lib/libopenscap.so.3 target=libopenscap.so.3.2.1
+file path=usr/lib/libopenscap.so.3.2.1
 file path=usr/lib/openscap/probe_dnscache
 file path=usr/lib/openscap/probe_environmentvariable
 file path=usr/lib/openscap/probe_environmentvariable58
@@ -116,40 +94,323 @@
 file path=usr/lib/openscap/probe_xmlfilecontent
 file path=usr/lib/pkgconfig/libopenscap.pc
 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
+file path=usr/share/openscap/schemas/arf/1.1/xAL.xsd
+file path=usr/share/openscap/schemas/arf/1.1/xNL.xsd
+file path=usr/share/openscap/schemas/arf/1.1/xlink.xsd
+file path=usr/share/openscap/schemas/common/xml.xsd
+file path=usr/share/openscap/schemas/common/xmldsig-core-schema.xsd
+file path=usr/share/openscap/schemas/cpe/2.0/cpe-dictionary_2.0.xsd
+file path=usr/share/openscap/schemas/cpe/2.1/cpe-dictionary_2.1.xsd
+file path=usr/share/openscap/schemas/cpe/2.2/cpe-dictionary_2.2.xsd
+file path=usr/share/openscap/schemas/cpe/2.3/cpe-dictionary_2.3.xsd
+file path=usr/share/openscap/schemas/cpe/2.3/cpe-language_2.3.xsd
+file path=usr/share/openscap/schemas/cpe/2.3/cpe-naming_2.3.xsd
+file path=usr/share/openscap/schemas/cve/cce_0.1.xsd
+file path=usr/share/openscap/schemas/cve/cpe-language_2.1.xsd
+file path=usr/share/openscap/schemas/cve/cve_0.1.xsd
+file path=usr/share/openscap/schemas/cve/cvss-v2_0.2.xsd
+file path=usr/share/openscap/schemas/cve/nvd-cve-feed_2.0.xsd
+file path=usr/share/openscap/schemas/cve/patch_0.1.xsd
+file path=usr/share/openscap/schemas/cve/scap-core_0.1.xsd
+file path=usr/share/openscap/schemas/cve/vulnerability_0.4.xsd
+file path=usr/share/openscap/schemas/ocil/2.0/ocil-2.0.xsd
+file path=usr/share/openscap/schemas/oval/5.10.1/aix-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10.1/aix-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10.1/apache-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10.1/apache-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10.1/catos-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10.1/catos-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10.1/esx-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10.1/esx-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10.1/freebsd-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10.1/freebsd-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10.1/hpux-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10.1/hpux-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10.1/independent-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10.1/independent-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10.1/ios-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10.1/ios-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10.1/linux-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10.1/linux-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10.1/macos-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10.1/macos-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10.1/oval-common-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10.1/oval-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10.1/oval-definitions-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.10.1/oval-directives-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10.1/oval-directives-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.10.1/oval-results-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10.1/oval-results-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.10.1/oval-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10.1/oval-system-characteristics-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.10.1/oval-variables-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10.1/oval-variables-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.10.1/pixos-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10.1/pixos-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10.1/sharepoint-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10.1/sharepoint-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10.1/solaris-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10.1/solaris-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10.1/unix-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10.1/unix-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10.1/windows-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10.1/windows-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10/aix-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10/aix-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10/apache-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10/apache-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10/catos-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10/catos-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10/esx-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10/esx-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10/freebsd-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10/freebsd-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10/hpux-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10/hpux-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10/independent-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10/independent-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10/ios-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10/ios-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10/linux-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10/linux-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10/macos-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10/macos-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10/oval-common-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10/oval-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10/oval-definitions-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.10/oval-directives-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10/oval-directives-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.10/oval-results-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10/oval-results-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.10/oval-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10/oval-system-characteristics-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.10/oval-variables-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10/oval-variables-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.10/pixos-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10/pixos-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10/sharepoint-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10/sharepoint-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10/solaris-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10/solaris-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.10/unix-definitions-schema.xsd
+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.3/apache-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.3/apache-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.3/freebsd-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.3/freebsd-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.3/hpux-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.3/hpux-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.3/independent-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.3/independent-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.3/ios-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.3/ios-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.3/linux-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.3/linux-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.3/macos-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.3/macos-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.3/oval-common-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.3/oval-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.3/oval-definitions-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.3/oval-results-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.3/oval-results-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.3/oval-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.3/oval-system-characteristics-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.3/oval-variables-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.3/oval-variables-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.3/solaris-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.3/solaris-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.3/unix-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.3/unix-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.3/windows-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.3/windows-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.4/aix-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.4/aix-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.4/apache-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.4/apache-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.4/catos-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.4/catos-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.4/esx-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.4/esx-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.4/freebsd-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.4/freebsd-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.4/hpux-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.4/hpux-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.4/independent-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.4/independent-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.4/ios-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.4/ios-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.4/linux-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.4/linux-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.4/macos-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.4/macos-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.4/oval-common-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.4/oval-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.4/oval-definitions-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.4/oval-results-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.4/oval-results-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.4/oval-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.4/oval-system-characteristics-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.4/oval-variables-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.4/oval-variables-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.4/solaris-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.4/solaris-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.4/unix-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.4/unix-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.4/windows-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.4/windows-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.5/aix-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.5/aix-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.5/apache-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.5/apache-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.5/catos-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.5/catos-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.5/esx-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.5/esx-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.5/freebsd-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.5/freebsd-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.5/hpux-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.5/hpux-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.5/independent-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.5/independent-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.5/ios-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.5/ios-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.5/linux-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.5/linux-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.5/macos-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.5/macos-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.5/oval-common-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.5/oval-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.5/oval-definitions-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.5/oval-results-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.5/oval-results-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.5/oval-system-characteristic-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.5/oval-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.5/oval-variables-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.5/oval-variables-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.5/pixos-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.5/pixos-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.5/solaris-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.5/solaris-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.5/unix-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.5/unix-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.5/windows-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.5/windows-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.6/aix-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.6/aix-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.6/apache-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.6/apache-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.6/catos-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.6/catos-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.6/esx-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.6/esx-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.6/freebsd-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.6/freebsd-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.6/hpux-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.6/hpux-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.6/independent-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.6/independent-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.6/ios-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.6/ios-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.6/linux-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.6/linux-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.6/macos-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.6/macos-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.6/oval-common-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.6/oval-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.6/oval-definitions-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.6/oval-results-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.6/oval-results-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.6/oval-system-characteristic-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.6/oval-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.6/oval-variables-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.6/oval-variables-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.6/pixos-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.6/pixos-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.6/sharepoint-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.6/sharepoint-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.6/solaris-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.6/solaris-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.6/unix-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.6/unix-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.6/windows-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.6/windows-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/aix-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/aix-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/apache-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/apache-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/catos-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/catos-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/debian-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/debian-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/esx-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/esx-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/freebsd-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/freebsd-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/hpux-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/hpux-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/independent-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/independent-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/ios-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/ios-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/linux-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/linux-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/macos-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/macos-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/oval-common-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/oval-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/oval-definitions-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.7/oval-results-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/oval-results-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.7/oval-system-characteristic-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.7/oval-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/oval-variables-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/oval-variables-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.7/pixos-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/pixos-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/redhat-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/redhat-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/sharepoint-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/sharepoint-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/solaris-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/solaris-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/unix-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/unix-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/windows-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.7/windows-system-characteristics-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.8/aix-definitions-schema.xsd
-file \
-    path=usr/share/openscap/schemas/oval/5.8/aix-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.8/aix-system-characteristics-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.8/apache-definitions-schema.xsd
-file \
-    path=usr/share/openscap/schemas/oval/5.8/apache-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.8/apache-system-characteristics-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.8/catos-definitions-schema.xsd
-file \
-    path=usr/share/openscap/schemas/oval/5.8/catos-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.8/catos-system-characteristics-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.8/debian-definitions-schema.xsd
-file \
-    path=usr/share/openscap/schemas/oval/5.8/debian-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.8/debian-system-characteristics-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.8/esx-definitions-schema.xsd
-file \
-    path=usr/share/openscap/schemas/oval/5.8/esx-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.8/esx-system-characteristics-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.8/freebsd-definitions-schema.xsd
-file \
-    path=usr/share/openscap/schemas/oval/5.8/freebsd-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.8/freebsd-system-characteristics-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.8/hpux-definitions-schema.xsd
-file \
-    path=usr/share/openscap/schemas/oval/5.8/hpux-system-characteristics-schema.xsd
-file \
-    path=usr/share/openscap/schemas/oval/5.8/independent-definitions-schema.xsd
-file \
-    path=usr/share/openscap/schemas/oval/5.8/independent-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.8/hpux-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.8/independent-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.8/independent-system-characteristics-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.8/ios-definitions-schema.xsd
-file \
-    path=usr/share/openscap/schemas/oval/5.8/ios-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.8/ios-system-characteristics-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.8/linux-definitions-schema.xsd
-file \
-    path=usr/share/openscap/schemas/oval/5.8/linux-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.8/linux-system-characteristics-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.8/macos-definitions-schema.xsd
-file \
-    path=usr/share/openscap/schemas/oval/5.8/macos-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.8/macos-system-characteristics-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.8/oval-common-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.8/oval-definitions-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.8/oval-definitions-schematron.xsl
@@ -157,41 +418,106 @@
 file path=usr/share/openscap/schemas/oval/5.8/oval-directives-schematron.xsl
 file path=usr/share/openscap/schemas/oval/5.8/oval-results-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.8/oval-results-schematron.xsl
-file \
-    path=usr/share/openscap/schemas/oval/5.8/oval-system-characteristics-schema.xsd
-file \
-    path=usr/share/openscap/schemas/oval/5.8/oval-system-characteristics-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.8/oval-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.8/oval-system-characteristics-schematron.xsl
 file path=usr/share/openscap/schemas/oval/5.8/oval-variables-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.8/oval-variables-schematron.xsl
 file path=usr/share/openscap/schemas/oval/5.8/pixos-definitions-schema.xsd
-file \
-    path=usr/share/openscap/schemas/oval/5.8/pixos-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.8/pixos-system-characteristics-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.8/redhat-definitions-schema.xsd
-file \
-    path=usr/share/openscap/schemas/oval/5.8/redhat-system-characteristics-schema.xsd
-file \
-    path=usr/share/openscap/schemas/oval/5.8/sharepoint-definitions-schema.xsd
-file \
-    path=usr/share/openscap/schemas/oval/5.8/sharepoint-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.8/redhat-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.8/sharepoint-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.8/sharepoint-system-characteristics-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.8/solaris-definitions-schema.xsd
-file \
-    path=usr/share/openscap/schemas/oval/5.8/solaris-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.8/solaris-system-characteristics-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.8/unix-definitions-schema.xsd
-file \
-    path=usr/share/openscap/schemas/oval/5.8/unix-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.8/unix-system-characteristics-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.8/windows-definitions-schema.xsd
-file \
-    path=usr/share/openscap/schemas/oval/5.8/windows-system-characteristics-schema.xsd
-file path=usr/share/openscap/schemas/oval/5.8/xmldsig-core-schema.xsd
-file path=usr/share/openscap/schemas/xccdf/1.1.4/XMLSchema.dtd
-file path=usr/share/openscap/schemas/xccdf/1.1.4/cpe-1.0.xsd
-file path=usr/share/openscap/schemas/xccdf/1.1.4/cpe-language_2.0.xsd
-file path=usr/share/openscap/schemas/xccdf/1.1.4/datatypes.dtd
-file path=usr/share/openscap/schemas/xccdf/1.1.4/platform-0.2.3.xsd
-file path=usr/share/openscap/schemas/xccdf/1.1.4/simpledc20021212.xsd
-file path=usr/share/openscap/schemas/xccdf/1.1.4/xccdf-schema.xsd
-file path=usr/share/openscap/schemas/xccdf/1.1.4/xccdfp-1.1.xsd
-file path=usr/share/openscap/schemas/xccdf/1.1.4/xml.xsd
+file path=usr/share/openscap/schemas/oval/5.8/windows-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.9/aix-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.9/aix-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.9/apache-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.9/apache-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.9/catos-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.9/catos-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.9/esx-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.9/esx-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.9/freebsd-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.9/freebsd-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.9/hpux-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.9/hpux-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.9/independent-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.9/independent-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.9/ios-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.9/ios-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.9/linux-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.9/linux-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.9/macos-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.9/macos-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.9/oval-common-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.9/oval-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.9/oval-definitions-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.9/oval-directives-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.9/oval-directives-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.9/oval-results-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.9/oval-results-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.9/oval-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.9/oval-system-characteristics-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.9/oval-variables-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.9/oval-variables-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.9/pixos-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.9/pixos-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.9/sharepoint-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.9/sharepoint-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.9/solaris-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.9/solaris-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.9/unix-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.9/unix-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.9/windows-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.9/windows-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/sce/1.0/sce-result-schema.xsd
+file path=usr/share/openscap/schemas/sds/1.2/catalog.xsd
+file path=usr/share/openscap/schemas/sds/1.2/cpe-dictionary_2.3.xsd
+file path=usr/share/openscap/schemas/sds/1.2/scap-source-data-stream_1.2.xsd
+file path=usr/share/openscap/schemas/sds/1.2/xlink.xsd
+file path=usr/share/openscap/schemas/xccdf/1.1/XMLSchema.dtd
+file path=usr/share/openscap/schemas/xccdf/1.1/cpe-1.0.xsd
+file path=usr/share/openscap/schemas/xccdf/1.1/cpe-language_2.0.xsd
+file path=usr/share/openscap/schemas/xccdf/1.1/datatypes.dtd
+file path=usr/share/openscap/schemas/xccdf/1.1/platform-0.2.3.xsd
+file path=usr/share/openscap/schemas/xccdf/1.1/simpledc20021212.xsd
+file path=usr/share/openscap/schemas/xccdf/1.1/xccdf-schema.xsd
+file path=usr/share/openscap/schemas/xccdf/1.1/xccdfp-1.1.xsd
+file path=usr/share/openscap/schemas/xccdf/1.2/XMLSchema.dtd
+file path=usr/share/openscap/schemas/xccdf/1.2/cpe-language_2.3.xsd
+file path=usr/share/openscap/schemas/xccdf/1.2/datatypes.dtd
+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/dbout-html.xsl
 file path=usr/share/openscap/xsl/dc2docbook.xsl
 file path=usr/share/openscap/xsl/docbook-share.xsl
@@ -207,8 +533,8 @@
 file path=usr/share/openscap/xsl/xccdf-share.xsl
 file path=usr/share/openscap/xsl/xccdf-substitute.xsl
 file path=usr/share/openscap/xsl/xccdf-tailor.xsl
-link path=usr/lib/libopenscap.so target=libopenscap.so.1.0.0
-link path=usr/lib/libopenscap.so.1 target=libopenscap.so.1.0.0
+file path=usr/share/openscap/xsl/xccdf_1.1_to_1.2.xsl
+license openscap.license license=LGPLv2.1
 
 # Bring in the language bindings if the language platforms are installed.
 depend type=conditional \