# HG changeset patch # User Jacob Varughese # Date 1372182236 25200 # Node ID 20813e08fff38b8599aae5eb3c0a4eb8ffb40444 # Parent e7bb00f30a5ae7feedf690bf3a88e1b05af4ca7d 16186483 Port openscap 0.9.7 to solaris 16371391 system info probe does not provide phys. interface name, mac addr and IP addr 16597173 File probe crashes when encountering file types of door,port 16908303 oscap leaves too many open file descriptors, processing xccdf diff -r e7bb00f30a5a -r 20813e08fff3 components/openscap/Makefile --- a/components/openscap/Makefile Tue Jun 25 09:04:10 2013 -0700 +++ b/components/openscap/Makefile Tue Jun 25 10:43:56 2013 -0700 @@ -25,13 +25,14 @@ include ../../make-rules/shared-macros.mk COMPONENT_NAME= openscap -COMPONENT_VERSION= 0.8.1 -COMPONENT_PROJECT_URL= http://www.open-scap.org/ +COMPONENT_VERSION= 0.9.7 +COMPONENT_PROJECT_URL= http://www.open-scap.org +COMPONENT_DOWNLOAD_URL= https://fedorahosted.org/releases/o/p/openscap COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz -COMPONENT_ARCHIVE_HASH= sha256:3365a5f4e7535e5f7134fdf386d4bd35d9b98f61d185be67606e946dc62efedc -COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)download/$(COMPONENT_ARCHIVE) -COMPONENT_BUGDB= utility/openscap +COMPONENT_ARCHIVE_HASH= sha256:0d9ae804026d69e60d44e27cf489e65dd1c2865895cde2cb174ff90fd7868a6a +COMPONENT_ARCHIVE_URL= $(COMPONENT_DOWNLOAD_URL)/$(COMPONENT_ARCHIVE) +COMPONENT_BUGDB= utility/openscap COMPILER= gcc CFLAGS+= -std=c99 @@ -43,6 +44,11 @@ CPPFLAGS += -I/usr/include/openldap +#Need to do cloney, so that the schema files +#can get packaged. +COMPONENT_PRE_CONFIGURE_ACTION = \ + ($(CLONEY) $(SOURCE_DIR) $(@D)) + # Perl related patch needs configure script recreation. COMPONENT_PREP_ACTION +=(cd $(@D); autoreconf); @@ -55,10 +61,11 @@ CONFIGURE_OPTIONS += CPPFLAGS="$(CPPFLAGS)" CONFIGURE_OPTIONS += --enable-debug=no CONFIGURE_OPTIONS += --enable-sce=yes +CONFIGURE_OPTIONS += --enable-perl=yes CONFIGURE_OPTIONS += --libexecdir=$(CONFIGURE_LIBDIR.$(BITS)) CONFIGURE_OPTIONS += am_cv_python_pythondir=$(PYTHON_VENDOR_PACKAGES) CONFIGURE_OPTIONS += am_cv_python_pyexecdir=$(PYTHON_VENDOR_PACKAGES) -CONFIGURE_OPTIONS += LIBS="-lsocket -lnsl -lldap_r -lscf" +CONFIGURE_OPTIONS += LIBS="-lldap_r -lscf -ldlpi" # common targets build: $(BUILD_32) diff -r e7bb00f30a5a -r 20813e08fff3 components/openscap/openscap-perl-512.p5m --- a/components/openscap/openscap-perl-512.p5m Tue Jun 25 09:04:10 2013 -0700 +++ b/components/openscap/openscap-perl-512.p5m Tue Jun 25 10:43:56 2013 -0700 @@ -21,19 +21,20 @@ # Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. # -set name=pkg.fmri value=pkg:/library/perl-5/openscap-512@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) -set name=pkg.summary value="Perl 5.12 bindings for the Open implementation of SCAP" -set name=com.oracle.info.description value="Perl 5.12 bindings for 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=pkg.fmri \ + value=pkg:/library/perl-5/openscap-512@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.summary \ + value="Perl 5.12 bindings for the Open implementation of SCAP" +set name=com.oracle.info.description \ + value="Perl 5.12 bindings for the Open implementation of SCAP" +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 - -license openscap.license license=LGPLv2.1 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/_openscap_pm.so file path=usr/perl5/vendor_perl/$(PERL_VERSION)/openscap.pm +license openscap.license license=LGPLv2.1 diff -r e7bb00f30a5a -r 20813e08fff3 components/openscap/openscap-python-26.p5m --- a/components/openscap/openscap-python-26.p5m Tue Jun 25 09:04:10 2013 -0700 +++ b/components/openscap/openscap-python-26.p5m Tue Jun 25 10:43:56 2013 -0700 @@ -21,24 +21,25 @@ # Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. # -set name=pkg.fmri value=pkg:/library/python-2/openscap-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) -set name=pkg.summary value="Python 2.6 bindings for the Open implementation of SCAP" -set name=com.oracle.info.description value="the Python 2.6 bindings for 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=pkg.fmri \ + value=pkg:/library/python-2/openscap-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.summary \ + value="Python 2.6 bindings for the Open implementation of SCAP" +set name=com.oracle.info.description \ + value="the Python 2.6 bindings for the Open implementation of SCAP" +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 - -license openscap.license license=LGPLv2.1 file path=usr/lib/python2.6/vendor-packages/_openscap_py.so file path=usr/lib/python2.6/vendor-packages/openscap.py file path=usr/lib/python2.6/vendor-packages/openscap_api.py +license openscap.license license=LGPLv2.1 # force a dependency on the Python 2.6 runtime -depend fmri=__TBD pkg.debug.depend.file=python2.6 \ - pkg.debug.depend.path=usr/bin type=require +depend type=require fmri=__TBD pkg.debug.depend.file=python2.6 \ + pkg.debug.depend.path=usr/bin diff -r e7bb00f30a5a -r 20813e08fff3 components/openscap/openscap.p5m --- a/components/openscap/openscap.p5m Tue Jun 25 09:04:10 2013 -0700 +++ b/components/openscap/openscap.p5m Tue Jun 25 10:43:56 2013 -0700 @@ -23,34 +23,30 @@ default mangler.man.stability uncommitted> 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 - -license openscap.license license=LGPLv2.1 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 @@ -62,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 @@ -96,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 @@ -137,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 @@ -187,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 \ diff -r e7bb00f30a5a -r 20813e08fff3 components/openscap/patches/configure.ac.patch --- a/components/openscap/patches/configure.ac.patch Tue Jun 25 09:04:10 2013 -0700 +++ b/components/openscap/patches/configure.ac.patch Tue Jun 25 10:43:56 2013 -0700 @@ -1,18 +1,27 @@ ---- openscap-0.8.1/configure.ac.orig 2012-05-09 09:09:41.227540183 -0700 -+++ openscap-0.8.1/configure.ac 2012-05-09 15:05:59.163156764 -0700 -@@ -837,11 +837,11 @@ +This patch fixes the configure script to pick up the perl libraries correctly +for supporting perl bindings. +This patch has not been contributed upstream, but is planned to be done by + 2013-Jul-12. + +--- openscap-0.9.7/configure.ac.~1~ 2013-04-26 04:47:24.501000000 -0700 ++++ openscap-0.9.7/configure.ac 2013-06-20 10:56:13.253028642 -0700 +@@ -1067,14 +1067,14 @@ + if test "x${perl_bind}" = xyes; then + AC_PATH_PROG(PERL, perl) + PERL_INCLUDES="`$PERL -e 'use Config; print $Config{archlib}'`/CORE" +- vendorlib="$( $PERL -e 'use Config; print $Config{vendorlib}' | sed "s|$($PERL -e 'use Config; print $Config{prefix}')||" )" +- vendorarch="$( $PERL -e 'use Config; print $Config{vendorarch}' | sed "s|$($PERL -e 'use Config; print $Config{prefix}')||" )" ++ vendorlib="$( $PERL -e 'use Config; print $Config{vendorlib}')" ++ vendorarch="$( $PERL -e 'use Config; print $Config{vendorarch}')" + AC_SUBST([PERL_INCLUDES], ["-I$PERL_INCLUDES"]) +- AC_SUBST([perl_vendorlibdir], ['${prefix}'$vendorlib]) +- AC_SUBST([perl_vendorarchdir], ['${prefix}'$vendorarch]) ++ AC_SUBST([perl_vendorlibdir], [$vendorlib]) ++ AC_SUBST([perl_vendorarchdir], [$vendorarch]) + save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $PERL_INCLUDES" +- AC_CHECK_HEADERS([EXTERN.h],[],[AC_MSG_ERROR(Perl development librarier are needed for perl bindings)],[-]) ++ AC_CHECK_HEADERS([EXTERN.h],[],[AC_MSG_ERROR(Perl development libraries are needed for perl bindings)],[-]) + CPPFLAGS="$save_CPPFLAGS" + fi - AC_PATH_PROG(PERL, perl) - PERL_INCLUDES="`$PERL -e 'use Config; print $Config{archlib}'`/CORE" --vendorlib="$( $PERL -e 'use Config; print $Config{vendorlib}' | sed "s|$($PERL -e 'use Config; print $Config{prefix}')||" )" --vendorarch="$( $PERL -e 'use Config; print $Config{vendorarch}' | sed "s|$($PERL -e 'use Config; print $Config{prefix}')||" )" -+vendorlib="$( $PERL -e 'use Config; print $Config{vendorlib}')" -+vendorarch="$( $PERL -e 'use Config; print $Config{vendorarch}')" - AC_SUBST([PERL_INCLUDES], ["$PERL_INCLUDES"]) --AC_SUBST([perl_vendorlibdir], ['${prefix}'$vendorlib]) --AC_SUBST([perl_vendorarchdir], ['${prefix}'$vendorarch]) -+AC_SUBST([perl_vendorlibdir], [$vendorlib]) -+AC_SUBST([perl_vendorarchdir], [$vendorarch]) - - AC_ARG_ENABLE([oval], - [AC_HELP_STRING([--enable-oval], [include support for OVAL (default=yes)])], diff -r e7bb00f30a5a -r 20813e08fff3 components/openscap/patches/debug.c.patch --- a/components/openscap/patches/debug.c.patch Tue Jun 25 09:04:10 2013 -0700 +++ b/components/openscap/patches/debug.c.patch Tue Jun 25 10:43:56 2013 -0700 @@ -1,3 +1,7 @@ +This patch fixes debug logging so that it works on solaris. +This patch has not been contributed upstream, but is planned to be done by + 2013-Jul-12. + --- openscap-0.8.1/src/common/debug.c.orig 2012-11-19 10:04:47.622821073 -0800 +++ openscap-0.8.1/src/common/debug.c 2012-11-19 09:58:03.173819234 -0800 @@ -150,7 +150,11 @@ diff -r e7bb00f30a5a -r 20813e08fff3 components/openscap/patches/file.c.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/openscap/patches/file.c.patch Tue Jun 25 10:43:56 2013 -0700 @@ -0,0 +1,50 @@ +This patch fixes the file probe from crashing on solaris when encountering file +types of door and port. +This patch has not been contributed upstream, but is planned to be done by + 2013-Jul-12. + +--- openscap-0.9.7/src/OVAL/probes/unix/file.c.~1~ 2012-12-12 07:09:05.806498654 -0800 ++++ openscap-0.9.7/src/OVAL/probes/unix/file.c 2013-03-12 19:52:50.739765914 -0700 +@@ -84,6 +84,9 @@ + static SEXP_t *gr_t_dir = NULL, *gr_t_lnk = NULL, *gr_t_blk = NULL; + static SEXP_t *gr_t_fifo = NULL, *gr_t_sock = NULL, *gr_t_char = NULL; + static SEXP_t gr_lastpath; ++#if defined(__SVR4) && defined(__sun) ++static SEXP_t *gr_t_door = NULL, *gr_t_port = NULL; ++#endif + + static SEXP_t *se_filetype (mode_t mode) + { +@@ -95,6 +98,10 @@ + case S_IFIFO: return (gr_t_fifo); + case S_IFSOCK: return (gr_t_sock); + case S_IFCHR: return (gr_t_char); ++#if defined(__SVR4) && defined(__sun) ++ case S_IFDOOR: return (gr_t_door); ++ case S_IFPORT: return (gr_t_port); ++#endif + default: + abort (); + } +@@ -355,6 +362,10 @@ + #define STR_SOCKET "socket" + #define STR_CHARSPEC "character special" + #define STRLEN_PAIR(str) (str), strlen(str) ++#if defined(__SVR4) && (__sun) ++#define STR_DOOR "door" ++#define STR_PORT "port" ++#endif + + gr_t_reg = SEXP_string_new (STRLEN_PAIR(STR_REGULAR)); + gr_t_dir = SEXP_string_new (STRLEN_PAIR(STR_DIRECTORY)); +@@ -363,6 +374,10 @@ + gr_t_fifo = SEXP_string_new (STRLEN_PAIR(STR_FIFO)); + gr_t_sock = SEXP_string_new (STRLEN_PAIR(STR_SOCKET)); + gr_t_char = SEXP_string_new (STRLEN_PAIR(STR_CHARSPEC)); ++#if defined(__SVR4) && (__sun) ++ gr_t_door = SEXP_string_new (STRLEN_PAIR(STR_DOOR)); ++ gr_t_port = SEXP_string_new (STRLEN_PAIR(STR_PORT)); ++#endif + + SEXP_init(&gr_lastpath); + diff -r e7bb00f30a5a -r 20813e08fff3 components/openscap/patches/oval_agent.c.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/openscap/patches/oval_agent.c.patch Tue Jun 25 10:43:56 2013 -0700 @@ -0,0 +1,19 @@ +This patch closes the system_info probe session, as soon as the sysinfo is +queried. This prevents system_info probes from hanging around till the process +completes. +This patch has not been contributed upstream, but is planned to be done by + 2013-Jul-12. + +--- openscap-0.9.7/src/OVAL/oval_agent.c.~1~ 2013-04-23 06:21:51.236000001 -0700 ++++ openscap-0.9.7/src/OVAL/oval_agent.c 2013-06-13 18:01:31.297731735 -0700 +@@ -107,6 +107,10 @@ + oscap_free(ag_sess); + return NULL; + } ++#if defined(__SVR4) && defined(__sun) ++ oval_probe_session_destroy(ag_sess->psess); ++ ag_sess->psess = oval_probe_session_new(ag_sess->sys_model); ++#endif + oval_syschar_model_set_sysinfo(ag_sess->sys_model, sysinfo); + oval_sysinfo_free(sysinfo); + diff -r e7bb00f30a5a -r 20813e08fff3 components/openscap/patches/oval_probe.c.patch --- a/components/openscap/patches/oval_probe.c.patch Tue Jun 25 09:04:10 2013 -0700 +++ b/components/openscap/patches/oval_probe.c.patch Tue Jun 25 10:43:56 2013 -0700 @@ -1,3 +1,7 @@ +This patch adds the smf probe to the list of supported probes. +This patch has not been contributed upstream, but is planned to be done by + 2013-Jul-12. + --- openscap-0.8.1/src/OVAL/oval_probe.c.orig 2012-11-19 10:04:14.596320954 -0800 +++ openscap-0.8.1/src/OVAL/oval_probe.c 2012-11-19 09:56:27.562728645 -0800 @@ -84,7 +84,8 @@ diff -r e7bb00f30a5a -r 20813e08fff3 components/openscap/patches/port097.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/openscap/patches/port097.patch Tue Jun 25 10:43:56 2013 -0700 @@ -0,0 +1,169 @@ +This patch provides ports for oscap-info.c, isainfo.c, sce_engince.c, +xccdf_policy.c for solaris. +This patch has not been contributed upstream, but is planned to be done by + 2013-Jul-12. + +--- openscap-0.9.7/src/OVAL/probes/unix/solaris/isainfo.c.orig 2012-12-12 07:09:05.809498641 -0800 ++++ openscap-0.9.7/src/OVAL/probes/unix/solaris/isainfo.c 2012-12-28 11:57:46.931236023 -0800 +@@ -47,6 +47,7 @@ + #include + #include + #include ++#include "../../../../common/debug_priv.h" + + /* man sysinfo (2) recommends using 257 for this size */ + #define MAX_STR_RESULT 257 +--- openscap-0.9.7/utils/oscap-info.c.~1~ 2012-12-14 02:13:18.113881933 -0800 ++++ openscap-0.9.7/utils/oscap-info.c 2013-01-16 09:55:13.348770490 -0800 +@@ -34,7 +34,11 @@ + #include + #include + #include ++#if defined(__SVR4) && defined (__sun) ++#include ++#else + #include ++#endif + + #include + #include +--- openscap-0.9.7/src/SCE/sce_engine.c.~1~ 2013-02-25 06:14:51.840092360 -0800 ++++ openscap-0.9.7/src/SCE/sce_engine.c 2013-04-03 15:31:16.479290382 -0700 +@@ -52,7 +52,11 @@ + { + char* href; + char* basename; ++#if defined(__SVR4) && defined(__sun) ++ char* std_out; ++#else + char* stdout; ++#endif + int exit_code; + struct oscap_stringlist* environment_variables; + xccdf_test_result_type_t xccdf_result; +@@ -63,7 +67,11 @@ + struct sce_check_result* ret = oscap_alloc(sizeof(struct sce_check_result)); + ret->href = NULL; + ret->basename = NULL; ++#if defined(__SVR4) && defined(__sun) ++ ret->std_out = NULL; ++#else + ret->stdout = NULL; ++#endif + ret->environment_variables = oscap_stringlist_new(); + ret->xccdf_result = XCCDF_RESULT_UNKNOWN; + +@@ -79,8 +87,13 @@ + oscap_free(v->href); + if (v->basename) + oscap_free(v->basename); ++#if defined(__SVR4) && defined(__sun) ++ if (v->std_out) ++ oscap_free(v->std_out); ++#else + if (v->stdout) + oscap_free(v->stdout); ++#endif + + oscap_stringlist_free(v->environment_variables); + +@@ -115,15 +128,24 @@ + + void sce_check_result_set_stdout(struct sce_check_result* v, const char* _stdout) + { ++#if defined(__SVR4) && defined(__sun) ++ if (v->std_out) ++ oscap_free(v->std_out); ++ v->std_out = oscap_strdup(_stdout); ++#else + if (v->stdout) + oscap_free(v->stdout); +- + v->stdout = oscap_strdup(_stdout); ++#endif + } + + const char* sce_check_result_get_stdout(struct sce_check_result* v) + { ++#if defined(__SVR4) && defined(__sun) ++ return v->std_out; ++#else + return v->stdout; ++#endif + } + + void sce_check_result_set_exit_code(struct sce_check_result* v, int exit_code) +@@ -178,7 +200,11 @@ + oscap_string_iterator_free(it); + fprintf(f, "\t\n"); + fprintf(f, "\tstd_out, 1, strlen(v->std_out), f); ++#else + fwrite(v->stdout, 1, strlen(v->stdout), f); ++#endif + fprintf(f, "\t]]>\n"); + fprintf(f, "\t%i\n", sce_check_result_get_exit_code(v)); + fprintf(f, "\t%s\n", xccdf_test_result_type_get_text(sce_check_result_get_xccdf_result(v))); +--- openscap-0.9.7/src/XCCDF_POLICY/xccdf_policy.c.~1~ 2013-03-19 07:58:22.307735235 -0700 ++++ openscap-0.9.7/src/XCCDF_POLICY/xccdf_policy.c 2013-04-03 15:35:39.100347346 -0700 +@@ -521,7 +521,11 @@ + if (r_value != NULL) { + selector = xccdf_refine_value_get_selector(r_value); + /* This refine value changes the value content */ ++#if defined(__SVR4) && defined(__sun) ++ if (!isnan((double)xccdf_refine_value_get_oper(r_value))) { ++#else + if (!isnan(xccdf_refine_value_get_oper(r_value))) { ++#endif + binding->operator = xccdf_refine_value_get_oper(r_value); + } else binding->operator = xccdf_value_get_oper(value); + +@@ -2142,9 +2146,17 @@ + + } else if (xccdf_item_get_type(item) == XCCDF_RULE) { + /* Perform all changes in rule */ ++#if defined(__SVR4) && defined(__sun) ++ if (!isnan((double)xccdf_refine_rule_get_role(r_rule))) ++#else + if (!isnan(xccdf_refine_rule_get_role(r_rule))) ++#endif + xccdf_rule_set_role((struct xccdf_rule *) item, xccdf_refine_rule_get_role(r_rule)); ++#if defined(__SVR4) && defined(__sun) ++ if (!isnan((double)xccdf_refine_rule_get_severity(r_rule))) ++#else + if (!isnan(xccdf_refine_rule_get_severity(r_rule))) ++#endif + xccdf_rule_set_severity((struct xccdf_rule *) item, xccdf_refine_rule_get_severity(r_rule)); + + } else {}/* TODO oscap_err ? */; +@@ -2201,7 +2213,11 @@ + const struct xccdf_version_info* version_info = xccdf_benchmark_get_schema_version(benchmark); + doc_version = xccdf_version_info_get_version(version_info); + ++#ifdef __USE_GNU + if (strverscmp("1.2", doc_version) >= 0) ++#else ++ if (strcmp("1.2", doc_version) >= 0) ++#endif + { + // we have to enforce a certain type of ids for XCCDF 1.2+ + +@@ -2376,9 +2392,17 @@ + if (r_rule == NULL) return item; + + new_item = (struct xccdf_item *) xccdf_rule_clone((struct xccdf_rule *) item); ++#if defined(__SVR4) && defined(__sun) ++ if (!isnan((double)xccdf_refine_rule_get_role(r_rule))) ++#else + if (!isnan(xccdf_refine_rule_get_role(r_rule))) ++#endif + xccdf_rule_set_role((struct xccdf_rule *) new_item, xccdf_refine_rule_get_role(r_rule)); ++#if defined(__SVR4) && defined(__sun) ++ if (!isnan((double)xccdf_refine_rule_get_severity(r_rule))) ++#else + if (!isnan(xccdf_refine_rule_get_severity(r_rule))) ++#endif + xccdf_rule_set_severity((struct xccdf_rule *) new_item, xccdf_refine_rule_get_severity(r_rule)); + if (xccdf_refine_rule_weight_defined(r_rule)) + xccdf_rule_set_weight((struct xccdf_rule *) new_item, xccdf_refine_rule_get_weight(r_rule)); diff -r e7bb00f30a5a -r 20813e08fff3 components/openscap/patches/recurse_file_system_local.patch --- a/components/openscap/patches/recurse_file_system_local.patch Tue Jun 25 09:04:10 2013 -0700 +++ b/components/openscap/patches/recurse_file_system_local.patch Tue Jun 25 10:43:56 2013 -0700 @@ -1,14 +1,26 @@ ---- openscap-0.8.1/src/OVAL/probes/oval_fts.c.~1~ 2011-10-10 02:03:15.000000000 -0700 -+++ openscap-0.8.1/src/OVAL/probes/oval_fts.c 2013-02-20 09:31:53.973553902 -0800 -@@ -45,6 +45,7 @@ - #include "SEAP/public/seap-debug.h" +This patch fixes the issue with recursing directories when local is specified +on solaris. It no longer traverses remote and pseudo file systems like proc, +etc. + +This patch has not been contributed upstream, but is planned to be done by + 2013-Jul-12. + +--- openscap-0.9.5/src/OVAL/probes/oval_fts.c.~1~ 2013-01-14 05:21:10.139830956 -0800 ++++ openscap-0.9.5/src/OVAL/probes/oval_fts.c 2013-02-27 14:12:10.322103381 -0800 +@@ -44,11 +44,11 @@ + #include "oval_fts.h" #if defined(__SVR4) && defined(__sun) #include "fts_sun.h" +#include #else #include #endif -@@ -128,14 +129,73 @@ + +-#undef OSCAP_FTS_DEBUG + + static OVAL_FTS *OVAL_FTS_new() + { +@@ -130,14 +130,73 @@ return; } @@ -82,77 +94,89 @@ } static char *__regex_locate(char *str) -@@ -410,11 +470,15 @@ +@@ -695,6 +754,9 @@ + } - if (path) { /* filepath == NULL */ - if (filesystem == OVAL_RECURSE_FS_LOCAL) { -+#if defined(__SVR4) && defined(__sun) -+ ofts->localdevs = NULL; + if (filesystem == OVAL_RECURSE_FS_LOCAL) { ++#if defined(__SVR4) && defined(__sun) ++ ofts->localdevs = NULL; +#else - ofts->localdevs = fsdev_init(NULL, 0); - if (ofts->localdevs == NULL) { - _F("fsdev_init() failed.\n"); - return (NULL); - } + ofts->localdevs = fsdev_init(NULL, 0); + if (ofts->localdevs == NULL) { + dE("fsdev_init() failed.\n"); +@@ -705,6 +767,7 @@ + oval_fts_close(ofts); + return (NULL); + } +#endif - } - - ofts->ofts_spath = SEXP_ref(path); /* path entity */ -@@ -444,7 +508,18 @@ + } else if (filesystem == OVAL_RECURSE_FS_DEFINED) { + /* store the device id for future comparison */ + FTSENT *fts_ent; +@@ -745,7 +808,6 @@ fts_ent = fts_read(ofts->ofts_match_path_fts); if (fts_ent == NULL) return NULL; - -+#if defined(__SVR4) && defined(__sun) -+ /* pseudo filesystems will be skipped */ -+ /* no need to match in non-local fs when local is specified */ -+ if ((fts_ent->fts_info == FTS_D || fts_ent->fts_info == FTS_SL) -+ && (!OVAL_FTS_localp(ofts, fts_ent->fts_path, -+ (fts_ent->fts_statp != NULL) ? -+ &fts_ent->fts_statp->st_fstype : NULL))) { -+ fts_set(ofts->ofts_match_path_fts, fts_ent, FTS_SKIP); -+ dI("Skipping path:%s\n", fts_ent->fts_path); -+ continue; -+ } -+#endif switch (fts_ent->fts_info) { case FTS_DP: continue; -@@ -605,14 +680,23 @@ +@@ -769,13 +831,21 @@ + fts_set(ofts->ofts_match_path_fts, fts_ent, FTS_FOLLOW); + continue; + } +- ++#if defined(__SVR4) && defined(__sun) ++ /* pseudo filesystems will be skipped */ ++ /* don't recurse into remote fs if local is specified */ ++ if ((fts_ent->fts_info == FTS_D || fts_ent->fts_info == FTS_SL) ++ && (!OVAL_FTS_localp(ofts, fts_ent->fts_path, ++ (fts_ent->fts_statp != NULL) ? ++ &fts_ent->fts_statp->st_fstype : NULL))) { ++#else + /* don't recurse into non-local filesystems */ + if (ofts->filesystem == OVAL_RECURSE_FS_LOCAL + && (fts_ent->fts_info == FTS_D || fts_ent->fts_info == FTS_SL) + && (!OVAL_FTS_localp(ofts, fts_ent->fts_path, + (fts_ent->fts_statp != NULL) ? + &fts_ent->fts_statp->st_dev : NULL))) { ++#endif + dI("Don't recurse into non-local filesystems, skipping '%s'.\n", fts_ent->fts_path); + fts_set(ofts->ofts_recurse_path_fts, fts_ent, FTS_SKIP); + continue; +@@ -964,6 +1034,15 @@ continue; } } -- -+#if defined(__SVR4) && defined(__sun) ++#if defined(__SVR4) && defined(__sun) + /* pseudo filesystems will be skipped */ -+ /* don't recurse into non-local fs if configured so */ -+ if ((fts_ent->fts_info == FTS_D || fts_ent->fts_info == FTS_SL) -+ && (!OVAL_FTS_localp(ofts, fts_ent->fts_path, -+ (fts_ent->fts_statp != NULL) ? -+ &fts_ent->fts_statp->st_fstype : NULL))) { ++ /* don't recurse into remote fs if local is specified */ ++ if ((fts_ent->fts_info == FTS_D || ++ fts_ent->fts_info == FTS_SL) ++ && (!OVAL_FTS_localp(ofts, fts_ent->fts_path, ++ (fts_ent->fts_statp != NULL) ? ++ &fts_ent->fts_statp->st_fstype : NULL))) { +#else - /* don't recurse into non-local fs if configured so */ + + /* don't recurse into non-local filesystems */ if (ofts->filesystem == OVAL_RECURSE_FS_LOCAL - && (fts_ent->fts_info == FTS_D || fts_ent->fts_info == FTS_SL) +@@ -971,6 +1050,7 @@ && (!OVAL_FTS_localp(ofts, fts_ent->fts_path, (fts_ent->fts_statp != NULL) ? &fts_ent->fts_statp->st_dev : NULL))) { +#endif fts_set(ofts->ofts_recurse_path_fts, fts_ent, FTS_SKIP); -+ dI("Skipping path:%s\n", fts_ent->fts_path); continue; } - } -@@ -644,12 +728,18 @@ - +@@ -1039,12 +1119,18 @@ if (ofts->ofts_recurse_path_curdepth == 0) ofts->ofts_recurse_path_devid = fts_ent->fts_statp->st_dev; + */ - -+#if defined(__SVR4) && defined(__sun) ++#if defined(__SVR4) && defined(__sun) + if ((!OVAL_FTS_localp(ofts, fts_ent->fts_path, -+ (fts_ent->fts_statp != NULL) ? -+ &fts_ent->fts_statp->st_fstype : NULL))) -+ break; ++ (fts_ent->fts_statp != NULL) ? ++ &fts_ent->fts_statp->st_fstype : NULL))) ++ break; +#else if (ofts->filesystem == OVAL_RECURSE_FS_LOCAL && (!OVAL_FTS_localp(ofts, fts_ent->fts_path, @@ -163,46 +187,8 @@ if (ofts->filesystem == OVAL_RECURSE_FS_DEFINED && ofts->ofts_recurse_path_devid != fts_ent->fts_statp->st_dev) break; ---- openscap-0.8.1/src/OVAL/probes/fsdev.c.~1~ 2011-09-21 04:46:46.000000000 -0700 -+++ openscap-0.8.1/src/OVAL/probes/fsdev.c 2013-02-19 11:12:36.120977086 -0800 -@@ -223,7 +223,7 @@ - FILE *fp; - size_t i; - -- struct mnttab *ment; -+ struct mnttab ment; - struct stat st; - - fp = fopen(MNTTAB, "r"); -@@ -248,9 +248,8 @@ - i = 0; - - if (fs == NULL) { -- while ((getmntent(fp, ment)) != 0) { -- /* TODO: Is this check reliable? */ -- if (stat (ment->mnt_special, &st) == 0 && (st.st_mode & S_IFCHR)) { -+ while ((getmntent(fp, &ment)) == 0) { -+ if (stat (ment.mnt_special, &st) == 0 && (st.st_mode & S_IFCHR)) { - - if (i >= lfs->cnt) { - lfs->cnt += DEVID_ARRAY_ADD; -@@ -261,9 +260,12 @@ - } - } - } else { -- while ((getmntent(fp, ment)) != 0) { -+ while ((getmntent(fp, &ment)) == 0) { - -- if (match_fs(ment->mnt_fstype, fs, fs_cnt)) { -+ if (match_fs(ment.mnt_fstype, fs, fs_cnt)) { -+ -+ if (stat(ment.mnt_mountp, &st) != 0) -+ continue; - - if (i >= lfs->cnt) { - lfs->cnt += DEVID_ARRAY_ADD; ---- openscap-0.8.1/src/OVAL/fts_sun.c.~1~ 2011-09-21 04:46:45.000000000 -0700 -+++ openscap-0.8.1/src/OVAL/fts_sun.c 2013-02-15 17:11:38.926803711 -0800 +--- openscap-0.9.5/src/OVAL/fts_sun.c.~1~ 2012-11-06 05:51:31.668229747 -0800 ++++ openscap-0.9.5/src/OVAL/fts_sun.c 2013-02-27 11:32:47.333961072 -0800 @@ -1022,6 +1022,10 @@ p->fts_instr = FTS_NOINSTR; p->fts_number = 0; diff -r e7bb00f30a5a -r 20813e08fff3 components/openscap/patches/rpl_getline.patch --- a/components/openscap/patches/rpl_getline.patch Tue Jun 25 09:04:10 2013 -0700 +++ b/components/openscap/patches/rpl_getline.patch Tue Jun 25 10:43:56 2013 -0700 @@ -1,3 +1,7 @@ +This patch fixes the tests to run on solaris. +This patch has not been contributed upstream, but is planned to be done by + 2013-Jul-12. + --- openscap-0.8.1/tests/API/SEAP/test_api_seap_parser.c.orig 2012-04-16 05:46:10.857636161 -0700 +++ openscap-0.8.1/tests/API/SEAP/test_api_seap_parser.c 2012-04-16 05:46:33.459579066 -0700 @@ -52,7 +52,7 @@ diff -r e7bb00f30a5a -r 20813e08fff3 components/openscap/patches/smf.c.patch --- a/components/openscap/patches/smf.c.patch Tue Jun 25 09:04:10 2013 -0700 +++ b/components/openscap/patches/smf.c.patch Tue Jun 25 10:43:56 2013 -0700 @@ -1,9 +1,20 @@ ---- openscap-0.8.1/src/OVAL/probes/unix/solaris/smf.c.~1~ 2011-09-21 04:46:46.000000000 -0700 -+++ openscap-0.8.1/src/OVAL/probes/unix/solaris/smf.c 2013-01-28 15:39:59.601258629 -0800 -@@ -28,10 +28,238 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ +This patch implements the smf probe on solaris, which gathers service_name, +service_state, exec_as_user from the smf repository for the fmri that is +provided. +This patch has not been contributed upstream, but is planned to be done by + 2013-Jul-12. + +--- openscap-0.9.7/src/OVAL/probes/unix/solaris/smf.c.~1~ 2013-04-23 06:21:51.479000001 -0700 ++++ openscap-0.9.7/src/OVAL/probes/unix/solaris/smf.c 2013-06-18 13:13:20.112012008 -0700 +@@ -33,9 +33,240 @@ + #endif + #include "probe-api.h" ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ ++#if defined(__SVR4) && defined(__sun) +/* + * smf probe: + * @@ -16,7 +27,7 @@ + * exec_as_user + */ + -+ + +#include +#include +#include @@ -29,7 +40,6 @@ +#include +#include +#include "seap.h" - #include "probe-api.h" +#include "probe/entcmp.h" +#include "alloc.h" +#include "common/debug_priv.h" @@ -48,9 +58,8 @@ + char *server_arguments; + char *exec_as_user; +}; - - --int probe_main(probe_ctx *ctx, void *probe_arg) ++ ++ +static void +toUpperCase(char *str) +{ @@ -66,8 +75,7 @@ + +static char * +strdup_check(char *p) - { -- return(PROBE_EOPNOTSUPP); ++{ + char *ret; + + if ((ret = strdup(p)) == NULL) { @@ -77,29 +85,27 @@ + return (ret); +} + -+static int -+get_smf_prop(scf_handle_t *h, const char *fmri, ++static void ++get_smf_prop_val(scf_handle_t *h, const char *fmri, + const char *prop_grp_name, const char *prop_name, char **val) +{ + scf_simple_prop_t *prop; -+ char *state; ++ char *prop_val; + *val = NULL; + + if ((prop = scf_simple_prop_get(h, fmri, prop_grp_name, + prop_name)) == NULL) { -+ if (scf_error() == SCF_ERROR_NOT_FOUND) ++ if (scf_error() == SCF_ERROR_NOT_FOUND) { + oscap_dlprintf(DBG_E, "Error: Specified service " + " %s has no %s/%s property.\n", + fmri, prop_grp_name, prop_name); -+ if (scf_error() == SCF_ERROR_INVALID_ARGUMENT) { -+ oscap_dlprintf(DBG_E, "Error: %s is not a valid " -+ "service.\n", fmri); -+ (void) scf_handle_unbind(h); -+ scf_handle_destroy(h); -+ return (PROBE_EINVAL); ++ } else if (scf_error() == SCF_ERROR_INVALID_ARGUMENT) { ++ oscap_dlprintf(DBG_E, "Error: Invalid service " ++ " %s does not exist.\n", ++ fmri); + } + } else { -+ if ((state = ++ if ((prop_val = + scf_simple_prop_next_astring(prop)) == NULL) { + oscap_dlprintf(DBG_E, + "Error: Could not read " @@ -107,48 +113,13 @@ + prop_grp_name, + prop_name, + fmri); -+ } else if (state[0] != '\0') { -+ *val = strdup_check(state); ++ } else if (prop_val[0] != '\0') { ++ *val = strdup_check(prop_val); + } + scf_simple_prop_free(prop); + } -+ return (0); +} + -+static int -+find_smf(struct result_info *res) -+{ -+ scf_handle_t *scf_hdl; -+ int i; -+ -+ oscap_dlprintf(DBG_I, "In find_smf\n"); -+ if ((scf_hdl = scf_handle_create(SCF_VERSION)) == NULL) { -+ oscap_dlprintf(DBG_E, "Unexpected libscf error: %s. Exiting.\n", -+ scf_strerror(scf_error())); -+ return (PROBE_EFATAL); -+ } -+ if (scf_handle_bind(scf_hdl) == -1) { -+ oscap_dlprintf(DBG_E, "Error: Could not bind to" -+ " svc.configd.\n"); -+ scf_handle_destroy(scf_hdl); -+ return (PROBE_EFATAL); -+ } -+ if ((i = get_smf_prop(scf_hdl, res->fmri, SCF_PG_RESTARTER, -+ SCF_PROPERTY_STATE, &(res->service_state))) != 0) { -+ return (i); -+ } else { -+ toUpperCase(res->service_state); -+ } -+ if ((i = get_smf_prop(scf_hdl, res->fmri, SCF_PG_START, -+ SCF_PROPERTY_EXEC, &(res->server_executable))) != 0) -+ return (i); -+ if ((i = get_smf_prop(scf_hdl, res->fmri, SCF_PG_START, -+ SCF_PROPERTY_USER, &(res->exec_as_user))) != 0) -+ return (i); -+ (void) scf_handle_unbind(scf_hdl); -+ scf_handle_destroy(scf_hdl); -+ return (0); -+} + +static void +report_finding(struct result_info *res, probe_ctx *ctx) @@ -174,9 +145,13 @@ +collect_smf_info(char *fmri, probe_ctx *ctx) +{ + struct result_info r; -+ int i, rc, type; ++ int rc = 0, type; + const char *service, *instance, *scope, *propgrp, *prop; + char *tmp; ++ scf_handle_t *scf_hdl = NULL; ++ scf_instance_t *inst = NULL; ++ scf_service_t *svc = NULL; ++ + + oscap_dlprintf(DBG_I, "In collect_smf_info.\n"); + memset(&r, 0, sizeof (r)); @@ -185,10 +160,8 @@ + scf_parse_fmri(r.service_name, &type, &scope, &service, + &instance, &propgrp, &prop); + if (scf_error() == SCF_ERROR_INVALID_ARGUMENT) { -+ oscap_dlprintf(DBG_E, "Error: Not a valid fmri:%s.\n", -+ fmri); -+ free(r.service_name); -+ return (PROBE_EINVAL); ++ rc = PROBE_EINVAL; ++ goto cleanup; + } + if (instance == NULL) + r.service_name = strdup(service); @@ -198,21 +171,47 @@ + exit(PROBE_ENOMEM); + free(tmp); + r.fmri = fmri; -+ if ((rc = find_smf(&r)) > 0) { -+ free(r.service_name); -+ return (rc); ++ if ((scf_hdl = scf_handle_create(SCF_VERSION)) == NULL || ++ scf_handle_bind(scf_hdl) != 0 || ++ (svc = scf_service_create(scf_hdl)) == NULL || ++ (instance != NULL && ++ (inst = scf_instance_create(scf_hdl)) == NULL)) { ++ rc = PROBE_EFATAL; ++ goto cleanup; + } -+ oscap_dlprintf(DBG_I, "service params %s, %s, %s, %s, %s, %s, %s\n", -+ r.fmri, r.service_name, r.service_state, r.protocol, -+ r.server_executable, r.server_arguments, r.exec_as_user); ++ /* To check if service exists */ ++ get_smf_prop_val(scf_hdl, r.fmri, SCF_PG_RESTARTER, ++ SCF_PROPERTY_STATE, &(r.service_state)); ++ if (scf_error() == SCF_ERROR_NOT_FOUND) { ++ if (scf_handle_decode_fmri(scf_hdl, fmri, NULL, svc, ++ (instance == NULL ? NULL : inst), ++ NULL, NULL, SCF_DECODE_FMRI_EXACT) != 0 || ++ scf_error() == SCF_ERROR_NOT_FOUND) { ++ oscap_dlprintf(DBG_I,"decode_fmri failed.\n"); ++ goto cleanup; ++ } ++ } ++ if (r.service_state != NULL && ++ r.service_state[0] != '\0') ++ toUpperCase(r.service_state); ++ get_smf_prop_val(scf_hdl, r.fmri, SCF_PG_START, ++ SCF_PROPERTY_EXEC, &(r.server_executable)); ++ get_smf_prop_val(scf_hdl, r.fmri, SCF_PG_START, ++ SCF_PROPERTY_USER, &(r.exec_as_user)); + report_finding(&r, ctx); + free(r.protocol); -+ free(r.service_name); + free(r.service_state); + free(r.server_executable); + free(r.server_arguments); + free(r.exec_as_user); -+ return (0); ++cleanup: ++ free(r.service_name); ++ scf_service_destroy(svc); ++ scf_instance_destroy(inst); ++ if (scf_hdl != NULL) ++ scf_handle_unbind(scf_hdl); ++ scf_handle_destroy(scf_hdl); ++ return (rc); +} + +int @@ -240,4 +239,11 @@ + SEXP_free(fmri_val); + SEXP_free(fmri); + return (rc); ++} ++#else + + int probe_main(probe_ctx *ctx, void *probe_arg) + { + return(PROBE_EOPNOTSUPP); } ++#endif diff -r e7bb00f30a5a -r 20813e08fff3 components/openscap/patches/system_info.c.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/openscap/patches/system_info.c.patch Tue Jun 25 10:43:56 2013 -0700 @@ -0,0 +1,97 @@ +This patch provides the system info probe functionality for solaris. It +detects the ethernet network interfaces and MAC and IP addresses associated +with them. +This patch has not been contributed upstream, but is planned to be done by + 2013-Jul-12. + +--- openscap-0.9.5/src/OVAL/probes/independent/system_info.c.~1~ 2012-11-06 05:51:30.048128639 -0800 ++++ openscap-0.9.5/src/OVAL/probes/independent/system_info.c 2013-04-03 15:04:36.221945232 -0700 +@@ -92,7 +92,73 @@ + + return mac_buf; + } ++#else if defined(__SVR4) && defined(__sun) ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + ++static int fd=-1; ++ ++static char *get_mac(const struct ifaddrs *ifa) ++{ ++ struct lifreq lifr; ++ uint_t physaddrlen = DLPI_PHYSADDR_MAX; ++ uchar_t physaddr[DLPI_PHYSADDR_MAX]; ++ static char mac_buf[DLPI_PHYSADDR_MAX]; ++ char *str; ++ int retv; ++ dlpi_handle_t dh; ++ dlpi_info_t dlinfo; ++ ++ memset(mac_buf, 0, sizeof(mac_buf)); ++ memset(&lifr, 0, sizeof(struct lifreq)); ++ strlcpy(lifr.lifr_name, ifa->ifa_name, sizeof (lifr.lifr_name)); ++ if (ioctl(fd, SIOCGLIFFLAGS, &lifr) >= 0) { ++ ++ if (lifr.lifr_flags & (IFF_VIRTUAL| IFF_IPMP)) ++ return (mac_buf); ++ ++ if (dlpi_open(lifr.lifr_name, &dh, 0) != DLPI_SUCCESS) ++ return (NULL); ++ ++ retv = dlpi_get_physaddr(dh, DL_CURR_PHYS_ADDR, physaddr, ++ &physaddrlen); ++ if (retv != DLPI_SUCCESS) { ++ dlpi_close(dh); ++ return (NULL); ++ } ++ ++ retv = dlpi_info(dh, &dlinfo, DLPI_INFO_VERSION); ++ if (retv != DLPI_SUCCESS) { ++ dlpi_close(dh); ++ return (NULL); ++ } ++ dlpi_close(dh); ++ str = _link_ntoa(physaddr, NULL, physaddrlen, IFT_OTHER); ++ ++ if (str != NULL && physaddrlen != 0) { ++ switch(dlinfo.di_mactype) { ++ case DL_IB: ++ break; ++ default: ++ strlcpy(mac_buf, str, sizeof(mac_buf)); ++ break; ++ } ++ free(str); ++ } ++ } ++ return mac_buf; ++} ++#endif ++ ++#if defined(__linux__) || (defined(__SVR4) && defined(__sun)) + static int get_ifs(SEXP_t *item) + { + struct ifaddrs *ifaddr, *ifa; +@@ -119,6 +185,14 @@ + continue; + + mac = get_mac(ifa); ++#if defined(__SVR4) && defined(__sun) ++ if (mac == NULL) { ++ rc = 1; ++ goto leave2; ++ } ++ if (mac[0] == '\0') ++ continue; ++#endif + if (family == AF_INET) { + rc = getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in), + host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST); diff -r e7bb00f30a5a -r 20813e08fff3 components/openscap/resolve.deps --- a/components/openscap/resolve.deps Tue Jun 25 09:04:10 2013 -0700 +++ b/components/openscap/resolve.deps Tue Jun 25 10:43:56 2013 -0700 @@ -5,9 +5,11 @@ library/openldap library/pcre runtime/python-26 +runtime/perl-512 security/compliance/openscap system/library system/library/gcc-3-runtime system/library/gcc-45-runtime system/library/math system/library/security/libgcrypt +web/curl