--- a/components/openscap/Makefile	Thu Nov 19 14:12:20 2015 -0800
+++ b/components/openscap/Makefile	Thu Nov 19 14:13:43 2015 -0800
@@ -27,16 +27,16 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		openscap
-COMPONENT_VERSION=	1.2.3
+COMPONENT_VERSION=	1.2.6
 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:c15d587e5cdfcef1316536e6ed8ad66fea3e083ac3d3b723b7e54208f63787c7
+COMPONENT_ARCHIVE_HASH= sha256:95f2345e041e9ba838ad8065b68ce0ec4b0971d7afc72d601489236bbfc0c652
 COMPONENT_ARCHIVE_URL=  $(COMPONENT_DOWNLOAD_URL)/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=        utility/openscap
 
-TPNO =			22513	
+TPNO =			25520
 
 CFLAGS+=		-std=c99
 CFLAGS+=		-DNDEBUG
@@ -103,7 +103,7 @@
 
 install:	$(INSTALL_64)
 		$(MKDIR) $(DOCS_DIR)
-		$(CP) $(SOURCE_DIR)/docs/html/* $(DOCS_DIR)
+		$(CP) -r $(SOURCE_DIR)/docs/html/* $(DOCS_DIR)
 
 test:		$(TEST_64)
 

--- a/components/openscap/history	Thu Nov 19 14:12:20 2015 -0800
+++ b/components/openscap/history	Thu Nov 19 14:13:43 2015 -0800
@@ -1,2 +1,3 @@
+library/perl-5/[email protected],5.12-5.12.0.0.0.88.0
 library/python-2/[email protected]
 library/python/[email protected]

--- a/components/openscap/openscap.p5m	Thu Nov 19 14:12:20 2015 -0800
+++ b/components/openscap/openscap.p5m	Thu Nov 19 14:13:43 2015 -0800
@@ -61,6 +61,8 @@
 file path=usr/include/openscap/oval_probe_handler.h
 file path=usr/include/openscap/oval_probe_session.h
 file path=usr/include/openscap/oval_results.h
+file path=usr/include/openscap/oval_schema_version.h
+file path=usr/include/openscap/oval_session.h
 file path=usr/include/openscap/oval_system_characteristics.h
 file path=usr/include/openscap/oval_types.h
 file path=usr/include/openscap/oval_variables.h
@@ -70,12 +72,12 @@
 file path=usr/include/openscap/xccdf_benchmark.h
 file path=usr/include/openscap/xccdf_policy.h
 file path=usr/include/openscap/xccdf_session.h
-link path=usr/lib/$(MACH64)/libopenscap.so target=libopenscap.so.8.4.3
-link path=usr/lib/$(MACH64)/libopenscap.so.8 target=libopenscap.so.8.4.3
-file path=usr/lib/$(MACH64)/libopenscap.so.8.4.3
-link path=usr/lib/$(MACH64)/libopenscap_sce.so target=libopenscap_sce.so.8.4.3
-link path=usr/lib/$(MACH64)/libopenscap_sce.so.8 target=libopenscap_sce.so.8.4.3
-file path=usr/lib/$(MACH64)/libopenscap_sce.so.8.4.3
+link path=usr/lib/$(MACH64)/libopenscap.so target=libopenscap.so.8.6.0
+link path=usr/lib/$(MACH64)/libopenscap.so.8 target=libopenscap.so.8.6.0
+file path=usr/lib/$(MACH64)/libopenscap.so.8.6.0
+link path=usr/lib/$(MACH64)/libopenscap_sce.so target=libopenscap_sce.so.8.6.0
+link path=usr/lib/$(MACH64)/libopenscap_sce.so.8 target=libopenscap_sce.so.8.6.0
+file path=usr/lib/$(MACH64)/libopenscap_sce.so.8.6.0
 file path=usr/lib/$(MACH64)/openscap/probe_dnscache
 file path=usr/lib/$(MACH64)/openscap/probe_environmentvariable
 file path=usr/lib/$(MACH64)/openscap/probe_environmentvariable58
@@ -94,6 +96,7 @@
 file path=usr/lib/$(MACH64)/openscap/probe_shadow
 file path=usr/lib/$(MACH64)/openscap/probe_smf
 file path=usr/lib/$(MACH64)/openscap/probe_smfproperty
+file path=usr/lib/$(MACH64)/openscap/probe_symlink
 file path=usr/lib/$(MACH64)/openscap/probe_sysctl
 file path=usr/lib/$(MACH64)/openscap/probe_system_info
 file path=usr/lib/$(MACH64)/openscap/probe_textfilecontent
@@ -341,6 +344,7 @@
 file path=usr/share/docs/openscap/html/group__OVALDEF.html
 file path=usr/share/docs/openscap/html/group__OVALDIR.html
 file path=usr/share/docs/openscap/html/group__OVALRES.html
+file path=usr/share/docs/openscap/html/group__OVALSESSION.html
 file path=usr/share/docs/openscap/html/group__OVALSYS.html
 file path=usr/share/docs/openscap/html/group__OVALVAR.html
 file path=usr/share/docs/openscap/html/group__PROBEAPI.html
@@ -385,6 +389,7 @@
 file path=usr/share/docs/openscap/html/oscap_8h.html
 file path=usr/share/docs/openscap/html/oscap_8h_source.html
 file path=usr/share/docs/openscap/html/oscap__acquire_8h_source.html
+file path=usr/share/docs/openscap/html/oscap__buffer_8h_source.html
 file path=usr/share/docs/openscap/html/oscap__error_8h.html
 file path=usr/share/docs/openscap/html/oscap__error_8h_source.html
 file path=usr/share/docs/openscap/html/oscap__reference_8h_source.html
@@ -461,6 +466,9 @@
 file path=usr/share/docs/openscap/html/oval__results_8h_source.html
 file path=usr/share/docs/openscap/html/oval__results__impl_8h.html
 file path=usr/share/docs/openscap/html/oval__results__impl_8h_source.html
+file path=usr/share/docs/openscap/html/oval__schema__version_8h_source.html
+file path=usr/share/docs/openscap/html/oval__session_8h.html
+file path=usr/share/docs/openscap/html/oval__session_8h_source.html
 file path=usr/share/docs/openscap/html/oval__set_8c.html
 file path=usr/share/docs/openscap/html/oval__sexp_8c.html
 file path=usr/share/docs/openscap/html/oval__sexp_8h.html
@@ -469,6 +477,7 @@
 file path=usr/share/docs/openscap/html/oval__smc__iterator__impl_8h_source.html
 file path=usr/share/docs/openscap/html/oval__stateContent_8c.html
 file path=usr/share/docs/openscap/html/oval__state_8c.html
+file path=usr/share/docs/openscap/html/oval__status__counter_8h_source.html
 file path=usr/share/docs/openscap/html/oval__string__map_8c.html
 file path=usr/share/docs/openscap/html/oval__string__map__impl_8h.html
 file path=usr/share/docs/openscap/html/oval__string__map__impl_8h_source.html
@@ -547,6 +556,235 @@
 file path=usr/share/docs/openscap/html/seap-scheme_8h_source.html
 file path=usr/share/docs/openscap/html/seap-types_8h_source.html
 file path=usr/share/docs/openscap/html/seap_8h_source.html
+file path=usr/share/docs/openscap/html/search/all_0.html
+file path=usr/share/docs/openscap/html/search/all_0.js
+file path=usr/share/docs/openscap/html/search/all_1.html
+file path=usr/share/docs/openscap/html/search/all_1.js
+file path=usr/share/docs/openscap/html/search/all_10.html
+file path=usr/share/docs/openscap/html/search/all_10.js
+file path=usr/share/docs/openscap/html/search/all_11.html
+file path=usr/share/docs/openscap/html/search/all_11.js
+file path=usr/share/docs/openscap/html/search/all_12.html
+file path=usr/share/docs/openscap/html/search/all_12.js
+file path=usr/share/docs/openscap/html/search/all_13.html
+file path=usr/share/docs/openscap/html/search/all_13.js
+file path=usr/share/docs/openscap/html/search/all_14.html
+file path=usr/share/docs/openscap/html/search/all_14.js
+file path=usr/share/docs/openscap/html/search/all_15.html
+file path=usr/share/docs/openscap/html/search/all_15.js
+file path=usr/share/docs/openscap/html/search/all_2.html
+file path=usr/share/docs/openscap/html/search/all_2.js
+file path=usr/share/docs/openscap/html/search/all_3.html
+file path=usr/share/docs/openscap/html/search/all_3.js
+file path=usr/share/docs/openscap/html/search/all_4.html
+file path=usr/share/docs/openscap/html/search/all_4.js
+file path=usr/share/docs/openscap/html/search/all_5.html
+file path=usr/share/docs/openscap/html/search/all_5.js
+file path=usr/share/docs/openscap/html/search/all_6.html
+file path=usr/share/docs/openscap/html/search/all_6.js
+file path=usr/share/docs/openscap/html/search/all_7.html
+file path=usr/share/docs/openscap/html/search/all_7.js
+file path=usr/share/docs/openscap/html/search/all_8.html
+file path=usr/share/docs/openscap/html/search/all_8.js
+file path=usr/share/docs/openscap/html/search/all_9.html
+file path=usr/share/docs/openscap/html/search/all_9.js
+file path=usr/share/docs/openscap/html/search/all_a.html
+file path=usr/share/docs/openscap/html/search/all_a.js
+file path=usr/share/docs/openscap/html/search/all_b.html
+file path=usr/share/docs/openscap/html/search/all_b.js
+file path=usr/share/docs/openscap/html/search/all_c.html
+file path=usr/share/docs/openscap/html/search/all_c.js
+file path=usr/share/docs/openscap/html/search/all_d.html
+file path=usr/share/docs/openscap/html/search/all_d.js
+file path=usr/share/docs/openscap/html/search/all_e.html
+file path=usr/share/docs/openscap/html/search/all_e.js
+file path=usr/share/docs/openscap/html/search/all_f.html
+file path=usr/share/docs/openscap/html/search/all_f.js
+file path=usr/share/docs/openscap/html/search/classes_0.html
+file path=usr/share/docs/openscap/html/search/classes_0.js
+file path=usr/share/docs/openscap/html/search/classes_1.html
+file path=usr/share/docs/openscap/html/search/classes_1.js
+file path=usr/share/docs/openscap/html/search/classes_2.html
+file path=usr/share/docs/openscap/html/search/classes_2.js
+file path=usr/share/docs/openscap/html/search/classes_3.html
+file path=usr/share/docs/openscap/html/search/classes_3.js
+file path=usr/share/docs/openscap/html/search/classes_4.html
+file path=usr/share/docs/openscap/html/search/classes_4.js
+file path=usr/share/docs/openscap/html/search/classes_5.html
+file path=usr/share/docs/openscap/html/search/classes_5.js
+file path=usr/share/docs/openscap/html/search/classes_6.html
+file path=usr/share/docs/openscap/html/search/classes_6.js
+file path=usr/share/docs/openscap/html/search/classes_7.html
+file path=usr/share/docs/openscap/html/search/classes_7.js
+file path=usr/share/docs/openscap/html/search/classes_8.html
+file path=usr/share/docs/openscap/html/search/classes_8.js
+file path=usr/share/docs/openscap/html/search/classes_9.html
+file path=usr/share/docs/openscap/html/search/classes_9.js
+file path=usr/share/docs/openscap/html/search/classes_a.html
+file path=usr/share/docs/openscap/html/search/classes_a.js
+file path=usr/share/docs/openscap/html/search/classes_b.html
+file path=usr/share/docs/openscap/html/search/classes_b.js
+file path=usr/share/docs/openscap/html/search/classes_c.html
+file path=usr/share/docs/openscap/html/search/classes_c.js
+file path=usr/share/docs/openscap/html/search/classes_d.html
+file path=usr/share/docs/openscap/html/search/classes_d.js
+file path=usr/share/docs/openscap/html/search/classes_e.html
+file path=usr/share/docs/openscap/html/search/classes_e.js
+file path=usr/share/docs/openscap/html/search/classes_f.html
+file path=usr/share/docs/openscap/html/search/classes_f.js
+file path=usr/share/docs/openscap/html/search/close.png
+file path=usr/share/docs/openscap/html/search/defines_0.html
+file path=usr/share/docs/openscap/html/search/defines_0.js
+file path=usr/share/docs/openscap/html/search/defines_1.html
+file path=usr/share/docs/openscap/html/search/defines_1.js
+file path=usr/share/docs/openscap/html/search/defines_2.html
+file path=usr/share/docs/openscap/html/search/defines_2.js
+file path=usr/share/docs/openscap/html/search/enums_0.html
+file path=usr/share/docs/openscap/html/search/enums_0.js
+file path=usr/share/docs/openscap/html/search/enums_1.html
+file path=usr/share/docs/openscap/html/search/enums_1.js
+file path=usr/share/docs/openscap/html/search/enums_2.html
+file path=usr/share/docs/openscap/html/search/enums_2.js
+file path=usr/share/docs/openscap/html/search/enumvalues_0.html
+file path=usr/share/docs/openscap/html/search/enumvalues_0.js
+file path=usr/share/docs/openscap/html/search/enumvalues_1.html
+file path=usr/share/docs/openscap/html/search/enumvalues_1.js
+file path=usr/share/docs/openscap/html/search/enumvalues_2.html
+file path=usr/share/docs/openscap/html/search/enumvalues_2.js
+file path=usr/share/docs/openscap/html/search/files_0.html
+file path=usr/share/docs/openscap/html/search/files_0.js
+file path=usr/share/docs/openscap/html/search/files_1.html
+file path=usr/share/docs/openscap/html/search/files_1.js
+file path=usr/share/docs/openscap/html/search/files_10.html
+file path=usr/share/docs/openscap/html/search/files_10.js
+file path=usr/share/docs/openscap/html/search/files_11.html
+file path=usr/share/docs/openscap/html/search/files_11.js
+file path=usr/share/docs/openscap/html/search/files_2.html
+file path=usr/share/docs/openscap/html/search/files_2.js
+file path=usr/share/docs/openscap/html/search/files_3.html
+file path=usr/share/docs/openscap/html/search/files_3.js
+file path=usr/share/docs/openscap/html/search/files_4.html
+file path=usr/share/docs/openscap/html/search/files_4.js
+file path=usr/share/docs/openscap/html/search/files_5.html
+file path=usr/share/docs/openscap/html/search/files_5.js
+file path=usr/share/docs/openscap/html/search/files_6.html
+file path=usr/share/docs/openscap/html/search/files_6.js
+file path=usr/share/docs/openscap/html/search/files_7.html
+file path=usr/share/docs/openscap/html/search/files_7.js
+file path=usr/share/docs/openscap/html/search/files_8.html
+file path=usr/share/docs/openscap/html/search/files_8.js
+file path=usr/share/docs/openscap/html/search/files_9.html
+file path=usr/share/docs/openscap/html/search/files_9.js
+file path=usr/share/docs/openscap/html/search/files_a.html
+file path=usr/share/docs/openscap/html/search/files_a.js
+file path=usr/share/docs/openscap/html/search/files_b.html
+file path=usr/share/docs/openscap/html/search/files_b.js
+file path=usr/share/docs/openscap/html/search/files_c.html
+file path=usr/share/docs/openscap/html/search/files_c.js
+file path=usr/share/docs/openscap/html/search/files_d.html
+file path=usr/share/docs/openscap/html/search/files_d.js
+file path=usr/share/docs/openscap/html/search/files_e.html
+file path=usr/share/docs/openscap/html/search/files_e.js
+file path=usr/share/docs/openscap/html/search/files_f.html
+file path=usr/share/docs/openscap/html/search/files_f.js
+file path=usr/share/docs/openscap/html/search/functions_0.html
+file path=usr/share/docs/openscap/html/search/functions_0.js
+file path=usr/share/docs/openscap/html/search/functions_1.html
+file path=usr/share/docs/openscap/html/search/functions_1.js
+file path=usr/share/docs/openscap/html/search/functions_2.html
+file path=usr/share/docs/openscap/html/search/functions_2.js
+file path=usr/share/docs/openscap/html/search/functions_3.html
+file path=usr/share/docs/openscap/html/search/functions_3.js
+file path=usr/share/docs/openscap/html/search/functions_4.html
+file path=usr/share/docs/openscap/html/search/functions_4.js
+file path=usr/share/docs/openscap/html/search/functions_5.html
+file path=usr/share/docs/openscap/html/search/functions_5.js
+file path=usr/share/docs/openscap/html/search/functions_6.html
+file path=usr/share/docs/openscap/html/search/functions_6.js
+file path=usr/share/docs/openscap/html/search/functions_7.html
+file path=usr/share/docs/openscap/html/search/functions_7.js
+file path=usr/share/docs/openscap/html/search/functions_8.html
+file path=usr/share/docs/openscap/html/search/functions_8.js
+file path=usr/share/docs/openscap/html/search/functions_9.html
+file path=usr/share/docs/openscap/html/search/functions_9.js
+file path=usr/share/docs/openscap/html/search/groups_0.html
+file path=usr/share/docs/openscap/html/search/groups_0.js
+file path=usr/share/docs/openscap/html/search/groups_1.html
+file path=usr/share/docs/openscap/html/search/groups_1.js
+file path=usr/share/docs/openscap/html/search/groups_2.html
+file path=usr/share/docs/openscap/html/search/groups_2.js
+file path=usr/share/docs/openscap/html/search/groups_3.html
+file path=usr/share/docs/openscap/html/search/groups_3.js
+file path=usr/share/docs/openscap/html/search/groups_4.html
+file path=usr/share/docs/openscap/html/search/groups_4.js
+file path=usr/share/docs/openscap/html/search/groups_5.html
+file path=usr/share/docs/openscap/html/search/groups_5.js
+file path=usr/share/docs/openscap/html/search/groups_6.html
+file path=usr/share/docs/openscap/html/search/groups_6.js
+file path=usr/share/docs/openscap/html/search/groups_7.html
+file path=usr/share/docs/openscap/html/search/groups_7.js
+file path=usr/share/docs/openscap/html/search/groups_8.html
+file path=usr/share/docs/openscap/html/search/groups_8.js
+file path=usr/share/docs/openscap/html/search/mag_sel.png
+file path=usr/share/docs/openscap/html/search/nomatches.html
+file path=usr/share/docs/openscap/html/search/pages_0.html
+file path=usr/share/docs/openscap/html/search/pages_0.js
+file path=usr/share/docs/openscap/html/search/pages_1.html
+file path=usr/share/docs/openscap/html/search/pages_1.js
+file path=usr/share/docs/openscap/html/search/search.css
+file path=usr/share/docs/openscap/html/search/search.js
+file path=usr/share/docs/openscap/html/search/search_l.png
+file path=usr/share/docs/openscap/html/search/search_m.png
+file path=usr/share/docs/openscap/html/search/search_r.png
+file path=usr/share/docs/openscap/html/search/searchdata.js
+file path=usr/share/docs/openscap/html/search/typedefs_0.html
+file path=usr/share/docs/openscap/html/search/typedefs_0.js
+file path=usr/share/docs/openscap/html/search/typedefs_1.html
+file path=usr/share/docs/openscap/html/search/typedefs_1.js
+file path=usr/share/docs/openscap/html/search/typedefs_2.html
+file path=usr/share/docs/openscap/html/search/typedefs_2.js
+file path=usr/share/docs/openscap/html/search/typedefs_3.html
+file path=usr/share/docs/openscap/html/search/typedefs_3.js
+file path=usr/share/docs/openscap/html/search/variables_0.html
+file path=usr/share/docs/openscap/html/search/variables_0.js
+file path=usr/share/docs/openscap/html/search/variables_1.html
+file path=usr/share/docs/openscap/html/search/variables_1.js
+file path=usr/share/docs/openscap/html/search/variables_10.html
+file path=usr/share/docs/openscap/html/search/variables_10.js
+file path=usr/share/docs/openscap/html/search/variables_11.html
+file path=usr/share/docs/openscap/html/search/variables_11.js
+file path=usr/share/docs/openscap/html/search/variables_12.html
+file path=usr/share/docs/openscap/html/search/variables_12.js
+file path=usr/share/docs/openscap/html/search/variables_13.html
+file path=usr/share/docs/openscap/html/search/variables_13.js
+file path=usr/share/docs/openscap/html/search/variables_2.html
+file path=usr/share/docs/openscap/html/search/variables_2.js
+file path=usr/share/docs/openscap/html/search/variables_3.html
+file path=usr/share/docs/openscap/html/search/variables_3.js
+file path=usr/share/docs/openscap/html/search/variables_4.html
+file path=usr/share/docs/openscap/html/search/variables_4.js
+file path=usr/share/docs/openscap/html/search/variables_5.html
+file path=usr/share/docs/openscap/html/search/variables_5.js
+file path=usr/share/docs/openscap/html/search/variables_6.html
+file path=usr/share/docs/openscap/html/search/variables_6.js
+file path=usr/share/docs/openscap/html/search/variables_7.html
+file path=usr/share/docs/openscap/html/search/variables_7.js
+file path=usr/share/docs/openscap/html/search/variables_8.html
+file path=usr/share/docs/openscap/html/search/variables_8.js
+file path=usr/share/docs/openscap/html/search/variables_9.html
+file path=usr/share/docs/openscap/html/search/variables_9.js
+file path=usr/share/docs/openscap/html/search/variables_a.html
+file path=usr/share/docs/openscap/html/search/variables_a.js
+file path=usr/share/docs/openscap/html/search/variables_b.html
+file path=usr/share/docs/openscap/html/search/variables_b.js
+file path=usr/share/docs/openscap/html/search/variables_c.html
+file path=usr/share/docs/openscap/html/search/variables_c.js
+file path=usr/share/docs/openscap/html/search/variables_d.html
+file path=usr/share/docs/openscap/html/search/variables_d.js
+file path=usr/share/docs/openscap/html/search/variables_e.html
+file path=usr/share/docs/openscap/html/search/variables_e.js
+file path=usr/share/docs/openscap/html/search/variables_f.html
+file path=usr/share/docs/openscap/html/search/variables_f.js
 file path=usr/share/docs/openscap/html/selinuxboolean_8c.html
 file path=usr/share/docs/openscap/html/selinuxsecuritycontext_8c.html
 file path=usr/share/docs/openscap/html/sexp-ID_8c.html
@@ -692,6 +930,7 @@
 file path=usr/share/docs/openscap/html/structinterface__t.html
 file path=usr/share/docs/openscap/html/structllist.html
 file path=usr/share/docs/openscap/html/structoresults.html
+file path=usr/share/docs/openscap/html/structoscap__buffer.html
 file path=usr/share/docs/openscap/html/structoscap__err__t.html
 file path=usr/share/docs/openscap/html/structoscap__file__entry.html
 file path=usr/share/docs/openscap/html/structoscap__file__entry__iterator.html
@@ -705,7 +944,6 @@
 file path=usr/share/docs/openscap/html/structoscap__reference.html
 file path=usr/share/docs/openscap/html/structoscap__schema__table__entry.html
 file path=usr/share/docs/openscap/html/structoscap__source.html
-file path=usr/share/docs/openscap/html/structoscap__string.html
 file path=usr/share/docs/openscap/html/structoscap__string__iterator.html
 file path=usr/share/docs/openscap/html/structoscap__string__map.html
 file path=usr/share/docs/openscap/html/structoscap__stringlist.html
@@ -791,6 +1029,8 @@
 file path=usr/share/docs/openscap/html/structoval__result__test__iterator.html
 file path=usr/share/docs/openscap/html/structoval__result__to__xccdf__spec.html
 file path=usr/share/docs/openscap/html/structoval__results__model.html
+file path=usr/share/docs/openscap/html/structoval__schema__version__t.html
+file path=usr/share/docs/openscap/html/structoval__session.html
 file path=usr/share/docs/openscap/html/structoval__set__AGGREGATE.html
 file path=usr/share/docs/openscap/html/structoval__set__COLLECTIVE.html
 file path=usr/share/docs/openscap/html/structoval__set__context.html
@@ -801,6 +1041,7 @@
 file path=usr/share/docs/openscap/html/structoval__state__content.html
 file path=usr/share/docs/openscap/html/structoval__state__content__iterator.html
 file path=usr/share/docs/openscap/html/structoval__state__iterator.html
+file path=usr/share/docs/openscap/html/structoval__status__counter.html
 file path=usr/share/docs/openscap/html/structoval__string__iterator.html
 file path=usr/share/docs/openscap/html/structoval__subtypedsc__t.html
 file path=usr/share/docs/openscap/html/structoval__syschar.html
@@ -829,6 +1070,9 @@
 file path=usr/share/docs/openscap/html/structoval__variable__iterator.html
 file path=usr/share/docs/openscap/html/structoval__variable__model.html
 file path=usr/share/docs/openscap/html/structoval__variable__model__iterator.html
+file path=usr/share/docs/openscap/html/structoval__variable__possible__restriction.html
+file path=usr/share/docs/openscap/html/structoval__variable__possible__value.html
+file path=usr/share/docs/openscap/html/structoval__variable__restriction.html
 file path=usr/share/docs/openscap/html/structpfdata.html
 file path=usr/share/docs/openscap/html/structprobe__citem__t.html
 file path=usr/share/docs/openscap/html/structprobe__ctx.html
@@ -938,6 +1182,7 @@
 file path=usr/share/docs/openscap/html/structxccdf__profile__note.html
 file path=usr/share/docs/openscap/html/structxccdf__profile__note__iterator.html
 file path=usr/share/docs/openscap/html/structxccdf__refine__rule.html
+file path=usr/share/docs/openscap/html/structxccdf__refine__rule__internal.html
 file path=usr/share/docs/openscap/html/structxccdf__refine__rule__iterator.html
 file path=usr/share/docs/openscap/html/structxccdf__refine__value.html
 file path=usr/share/docs/openscap/html/structxccdf__refine__value__iterator.html
@@ -976,6 +1221,7 @@
 file path=usr/share/docs/openscap/html/structxiconf__service.html
 file path=usr/share/docs/openscap/html/structxiconf__strans__t.html
 file path=usr/share/docs/openscap/html/structxiconf__t.html
+file path=usr/share/docs/openscap/html/symlink_8c.html
 file path=usr/share/docs/openscap/html/sync_off.png
 file path=usr/share/docs/openscap/html/sync_on.png
 file path=usr/share/docs/openscap/html/sysctl_8c.html
@@ -1009,6 +1255,7 @@
 file path=usr/share/docs/openscap/html/xccdf__policy__engine__priv_8h_source.html
 file path=usr/share/docs/openscap/html/xccdf__policy__model__priv_8h_source.html
 file path=usr/share/docs/openscap/html/xccdf__policy__priv_8h_source.html
+file path=usr/share/docs/openscap/html/xccdf__policy__resolve_8h_source.html
 file path=usr/share/docs/openscap/html/xccdf__session_8h.html
 file path=usr/share/docs/openscap/html/xccdf__session_8h_source.html
 file path=usr/share/docs/openscap/html/xinetd_8c.html
@@ -1125,6 +1372,59 @@
 file path=usr/share/openscap/schemas/oval/5.10/unix-system-characteristics-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.10/windows-definitions-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.10/windows-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/aix-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/aix-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/android-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/android-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/apache-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/apache-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/apple-ios-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/apple-ios-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/asa-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/asa-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/catos-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/catos-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/esx-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/esx-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/freebsd-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/freebsd-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/hpux-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/hpux-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/independent-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/independent-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/ios-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/ios-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/iosxe-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/iosxe-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/junos-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/junos-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/linux-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/linux-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/macos-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/macos-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/netconf-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/netconf-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/oval-common-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/oval-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/oval-definitions-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.11.1/oval-directives-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/oval-directives-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.11.1/oval-results-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/oval-results-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.11.1/oval-system-characteristic-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.11.1/oval-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/oval-variables-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/oval-variables-schematron.xsl
+file path=usr/share/openscap/schemas/oval/5.11.1/pixos-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/pixos-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/sharepoint-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/sharepoint-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/solaris-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/solaris-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/unix-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/unix-system-characteristics-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/windows-definitions-schema.xsd
+file path=usr/share/openscap/schemas/oval/5.11.1/windows-system-characteristics-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.11/aix-definitions-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.11/aix-system-characteristics-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.11/android-definitions-schema.xsd
@@ -1466,6 +1766,32 @@
 file path=usr/share/openscap/schemas/xccdf/1.2/datatypes.dtd
 file path=usr/share/openscap/schemas/xccdf/1.2/xccdf_1.2-schematron.xsl
 file path=usr/share/openscap/schemas/xccdf/1.2/xccdf_1.2.xsd
+file path=usr/share/openscap/sectool-sce/00_integrity.sh
+file path=usr/share/openscap/sectool-sce/01_bootloader.sh
+file path=usr/share/openscap/sectool-sce/01_disk_usage.sh
+file path=usr/share/openscap/sectool-sce/01_group.sh
+file path=usr/share/openscap/sectool-sce/01_passwd.sh
+file path=usr/share/openscap/sectool-sce/01_shadow.sh
+file path=usr/share/openscap/sectool-sce/02_home_files.sh
+file path=usr/share/openscap/sectool-sce/02_root_dirs.sh
+file path=usr/share/openscap/sectool-sce/03_path.sh
+file path=usr/share/openscap/sectool-sce/04_firewall.sh
+file path=usr/share/openscap/sectool-sce/05_netserv.sh
+file path=usr/share/openscap/sectool-sce/05_openssh.sh
+file path=usr/share/openscap/sectool-sce/05_openvpn.sh
+file path=usr/share/openscap/sectool-sce/05_removed_libs.sh
+file path=usr/share/openscap/sectool-sce/05_xinetd.sh
+file path=usr/share/openscap/sectool-sce/07_log_files.sh
+file path=usr/share/openscap/sectool-sce/08_pam.sh
+file path=usr/share/openscap/sectool-sce/08_permissions.sh
+file path=usr/share/openscap/sectool-sce/09_exec_shield.sh
+file path=usr/share/openscap/sectool-sce/09_selinux.sh
+file path=usr/share/openscap/sectool-sce/09_va_randomization.sh
+file path=usr/share/openscap/sectool-sce/11_aliases.sh
+file path=usr/share/openscap/sectool-sce/12_cron.sh
+file path=usr/share/openscap/sectool-sce/14_nfs.sh
+file path=usr/share/openscap/sectool-sce/15_tcp_wrappers.sh
+file path=usr/share/openscap/sectool-sce/sectool-xccdf.xml
 file path=usr/share/openscap/xsl/legacy-fix.xsl
 file path=usr/share/openscap/xsl/legacy-fixtpl-bash.xml
 file path=usr/share/openscap/xsl/legacy-xccdf-share.xsl
@@ -1484,8 +1810,8 @@
 
 # Bring in the language bindings if the language platforms are installed.
 depend type=conditional \
-    fmri=library/perl-5/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    predicate=runtime/perl-512
+    fmri=library/perl-5/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    predicate=runtime/perl-520
 depend type=conditional \
     fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
     predicate=runtime/python-27

--- a/components/openscap/patches/oval_probe.c.patch	Thu Nov 19 14:12:20 2015 -0800
+++ b/components/openscap/patches/oval_probe.c.patch	Thu Nov 19 14:13:43 2015 -0800
@@ -1,16 +1,19 @@
-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.
+This patch adds the smf, smfproperty and virtualization probes to the list
+ of supported probes.
+This patch has been submitted upstream, but is being negotiated am hoping
+to have it accepted by 2015-Dec-15.
 
---- 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
[email protected]@ -84,7 +84,8 @@
-         OVAL_PROBE_EXTERNAL(OVAL_UNIX_PROCESS58, "process58"),
+--- openscap-1.2.6/src/OVAL/oval_probe.c.~1~	2015-11-12 10:51:29.490353461 -0800
++++ openscap-1.2.6/src/OVAL/oval_probe.c	2015-11-12 10:54:01.882198119 -0800
[email protected]@ -91,7 +91,10 @@
          OVAL_PROBE_EXTERNAL(OVAL_UNIX_FILEEXTENDEDATTRIBUTE, "fileextendedattribute"),
          OVAL_PROBE_EXTERNAL(OVAL_UNIX_GCONF, "gconf"),
--        OVAL_PROBE_EXTERNAL(OVAL_UNIX_ROUTINGTABLE, "routingtable")
-+        OVAL_PROBE_EXTERNAL(OVAL_UNIX_ROUTINGTABLE, "routingtable"),
-+        OVAL_PROBE_EXTERNAL(OVAL_SOLARIS_SMF, "smf")
+         OVAL_PROBE_EXTERNAL(OVAL_UNIX_ROUTINGTABLE, "routingtable"),
+-        OVAL_PROBE_EXTERNAL(OVAL_UNIX_SYMLINK, "symlink")
++        OVAL_PROBE_EXTERNAL(OVAL_UNIX_SYMLINK, "symlink"),
++        OVAL_PROBE_EXTERNAL(OVAL_SOLARIS_SMF, "smf"),
++        OVAL_PROBE_EXTERNAL(OVAL_SOLARIS_SMFPROPERTY,"smfproperty"),
++        OVAL_PROBE_EXTERNAL(OVAL_SOLARIS_VIRTUALIZATIONINFO, "virtualizationinfo")
  };
  
  #define __PROBE_META_COUNT (sizeof OSCAP_GSYM(__probe_meta)/sizeof OSCAP_GSYM(__probe_meta)[0])

--- a/components/openscap/patches/smfproperty.patch	Thu Nov 19 14:12:20 2015 -0800
+++ b/components/openscap/patches/smfproperty.patch	Thu Nov 19 14:13:43 2015 -0800
@@ -1,31 +1,7 @@
 This patch provides the implementation of the smfproperty probe
 on solaris.
-This patch has not been contributed upstream and will be done
-by 2015-Jul-01.
---- openscap-1.2.1/src/OVAL/oval_probe.c.~2~	2015-04-21 09:56:24.689455398 -0700
-+++ openscap-1.2.1/src/OVAL/oval_probe.c	2015-04-21 09:56:58.950099871 -0700
[email protected]@ -91,7 +91,8 @@
-         OVAL_PROBE_EXTERNAL(OVAL_UNIX_FILEEXTENDEDATTRIBUTE, "fileextendedattribute"),
-         OVAL_PROBE_EXTERNAL(OVAL_UNIX_GCONF, "gconf"),
-         OVAL_PROBE_EXTERNAL(OVAL_UNIX_ROUTINGTABLE, "routingtable"),
--        OVAL_PROBE_EXTERNAL(OVAL_SOLARIS_SMF, "smf")
-+        OVAL_PROBE_EXTERNAL(OVAL_SOLARIS_SMF, "smf"),
-+        OVAL_PROBE_EXTERNAL(OVAL_SOLARIS_SMFPROPERTY, "smfproperty")
- };
- 
- #define __PROBE_META_COUNT (sizeof OSCAP_GSYM(__probe_meta)/sizeof OSCAP_GSYM(__probe_meta)[0])
---- openscap-1.2.1/src/OVAL/public/oval_types.h.~1~	2015-01-08 07:30:33.115663437 -0800
-+++ openscap-1.2.1/src/OVAL/public/oval_types.h	2015-04-22 16:01:03.302332582 -0700
[email protected]@ -238,7 +238,8 @@
- 	OVAL_SOLARIS_SMF = OVAL_FAMILY_SOLARIS + 4,
- 	OVAL_SOLARIS_PATCH54 = OVAL_FAMILY_SOLARIS + 5,
- 	OVAL_SOLARIS_NDD = OVAL_FAMILY_SOLARIS + 6,
--	OVAL_SOLARIS_PACKAGECHECK = OVAL_FAMILY_SOLARIS + 7
-+	OVAL_SOLARIS_PACKAGECHECK = OVAL_FAMILY_SOLARIS + 7,
-+	OVAL_SOLARIS_SMFPROPERTY = OVAL_FAMILY_SOLARIS + 8
- } oval_solaris_subtype_t;
- 
- /// Unix subtypes
+This patch has not been contributed upstream but is planned to be contributed
+upstream.  Hoping to have it accepted by 2015-Dec-15.
 --- openscap-1.2.1/configure.ac.~3~	2015-04-22 16:20:53.433875799 -0700
 +++ openscap-1.2.1/configure.ac	2015-04-22 16:25:56.053053597 -0700
 @@ -257,6 +257,10 @@

--- a/components/openscap/patches/system_info.c.patch	Thu Nov 19 14:12:20 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-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
[email protected]@ -92,7 +92,73 @@
- 
-        return mac_buf;
- }
-+#else if defined(__SVR4) && defined(__sun)
-+#include <sys/socket.h>
-+#include <ifaddrs.h>
-+#include <netdb.h>
-+#include <sys/ioctl.h>
-+#include <string.h>
-+#include <net/if.h>
-+#include <arpa/inet.h>
-+#include <sys/sockio.h>
-+#include <net/if_types.h>
-+#include <libdlpi.h>
- 
-+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;
[email protected]@ -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);

--- a/components/openscap/patches/system_info3.c.patch	Thu Nov 19 14:12:20 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-This patch fixes the issue, where the system_info probe crashes on solaris,
- when the network interfaces cannot be detected. Fix provides the default
- loop back interface as default.
-
-This patch has not been contributed upstream, but is planned to be done by
- 2014-Aug-15.
-
-
---- openscap-1.0.0/src/OVAL/probes/independent/system_info.c.~2~	2014-07-24 11:02:52.698291479 -0700
-+++ openscap-1.0.0/src/OVAL/probes/independent/system_info.c	2014-07-25 11:20:07.096049635 -0700
[email protected]@ -170,6 +170,7 @@
-        char host[NI_MAXHOST], *mac;
-        SEXP_t *attrs;
-        SEXP_t *r0, *r1, *r2;
-+	int item_added = 0;
- 
-        if (getifaddrs(&ifaddr) == -1)
-                return rc;
[email protected]@ -213,8 +214,6 @@
- 				goto leave2;
- 			}
- 		}
--
--
- 	        attrs = probe_attr_creat("name",
-                                  r0 = SEXP_string_newf("%s", ifa->ifa_name),
-                                  "ip_address",
[email protected]@ -223,10 +222,22 @@
-                                  r2 = SEXP_string_newf("%s", mac),
-                                  NULL);
- 	        probe_item_ent_add(item, "interface", attrs, NULL);
-+		item_added = 1;
-         	SEXP_vfree(attrs, r0, r1, r2, NULL);
- 	}
- leave2:
-         close(fd);
-+	if (item_added == 0) {
-+		attrs = probe_attr_creat("name",
-+					 r0 = SEXP_string_newf("dummy0"),
-+					 "ip_address",
-+					 r1 = SEXP_string_newf("127.0.0.1"),
-+					 "mac_address",
-+					 r2 = SEXP_string_newf("aa:bb:cc:dd:ee:ff"),
-+					 NULL);
-+		probe_item_ent_add(item, "interface", attrs, NULL);
-+		SEXP_vfree(attrs, r0, r1, r2, NULL);
-+	}
- leave1:
-         freeifaddrs(ifaddr);
-         return rc;

--- a/components/openscap/patches/system_info4.c.patch	Thu Nov 19 14:12:20 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-This patch fixes the issue, where the system_info probe fails on solaris,
- when the network interfaces cannot be detected. Fix provides the default
- loop back interface as default. The earlier patch was not a complete fix.
-
-This patch has not been contributed upstream, but is planned to be done by
- 2014-Oct-15.
-
-
---- openscap-1.0.0/src/OVAL/probes/independent/system_info.c.~3~	2014-09-18 11:08:42.983747329 -0700
-+++ openscap-1.0.0/src/OVAL/probes/independent/system_info.c	2014-09-18 12:41:13.266535881 -0700
[email protected]@ -166,14 +166,16 @@
- static int get_ifs(SEXP_t *item)
- {
-        struct ifaddrs *ifaddr, *ifa;
--       int family, rc=1;
-+       int family, rc=0;
-        char host[NI_MAXHOST], *mac;
-        SEXP_t *attrs;
-        SEXP_t *r0, *r1, *r2;
--	int item_added = 0;
-+#if defined(__SVR4) && defined(__sun)
-+       int item_added = 0;
-+#endif
- 
-        if (getifaddrs(&ifaddr) == -1)
--               return rc;
-+               return 1;
- 
-        fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);
-        if (fd < 0)
[email protected]@ -222,12 +224,15 @@
-                                  r2 = SEXP_string_newf("%s", mac),
-                                  NULL);
- 	        probe_item_ent_add(item, "interface", attrs, NULL);
-+#if defined(__SVR4) && defined(__sun)
- 		item_added = 1;
-+#endif
-         	SEXP_vfree(attrs, r0, r1, r2, NULL);
- 	}
- leave2:
-         close(fd);
--	if (item_added == 0) {
-+#if defined(__SVR4) && defined(__sun)
-+	if (item_added == 0 && rc == 0) {
- 		attrs = probe_attr_creat("name",
- 					 r0 = SEXP_string_newf("dummy0"),
- 					 "ip_address",
[email protected]@ -238,6 +243,7 @@
- 		probe_item_ent_add(item, "interface", attrs, NULL);
- 		SEXP_vfree(attrs, r0, r1, r2, NULL);
- 	}
-+#endif
- leave1:
-         freeifaddrs(ifaddr);
-         return rc;

--- a/components/openscap/patches/system_info5.c.patch	Thu Nov 19 14:12:20 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-This fix prevents the probe from reporting failure when it is not able
- to probe network interfaces, for e.g. on cluster machines with failover.
-This patch has not been submitted upstream but will be by 2015-Feb-28.
---- openscap-1.2.0/src/OVAL/probes/independent/system_info.c.~4~	2015-02-06 10:38:01.670499365 -0800
-+++ openscap-1.2.0/src/OVAL/probes/independent/system_info.c	2015-02-06 11:18:53.895244912 -0800
[email protected]@ -66,7 +66,29 @@
- #include <ctype.h>
- #include <errno.h>
- 
--#if defined(__linux__)
-+#undef OS_FREEBSD
-+#undef OS_LINUX
-+#undef OS_SOLARIS
-+#undef OS_SUNOS
-+#undef OS_WINDOWS
-+
-+#if defined(__FreeBSD__)
-+# define OS_FREEBSD
-+#elif defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
-+# define OS_LINUX
-+#elif defined(sun) || defined(__sun)
-+# if defined(__SVR4) || defined(__svr4__)
-+#  define OS_SOLARIS
-+# else
-+#  define OS_SUNOS
-+# endif
-+#elif defined(_WIN32)
-+# define OS_WINDOWS
-+#else
-+# error "Sorry, your OS isn't supported."
-+#endif
-+
-+#if defined(OS_LINUX)
- #include <sys/socket.h>
- #include <ifaddrs.h>
- #include <netdb.h>
[email protected]@ -96,7 +118,7 @@
- 
-        return mac_buf;
- }
--#else if defined(__SVR4) && defined(__sun)
-+#else if defined(OS_SOLARIS)
- #include <sys/socket.h>
- #include <ifaddrs.h>
- #include <netdb.h>
[email protected]@ -162,7 +184,7 @@
- }
- #endif
- 
--#if defined(__linux__) || (defined(__SVR4) && defined(__sun))
-+#if defined(OS_LINUX) || (defined(OS_SOLARIS))
- static int get_ifs(SEXP_t *item)
- {
-        struct ifaddrs *ifaddr, *ifa;
[email protected]@ -170,7 +192,7 @@
-        char host[NI_MAXHOST], *mac;
-        SEXP_t *attrs;
-        SEXP_t *r0, *r1, *r2;
--#if defined(__SVR4) && defined(__sun)
-+#if defined(OS_SOLARIS)
-        int item_added = 0;
- #endif
- 
[email protected]@ -192,7 +214,7 @@
-                         continue;
- 
-                 mac = get_mac(ifa);
--#if defined(__SVR4) && defined(__sun)
-+#if defined(OS_SOLARIS)
- 		if (mac == NULL) {
- 			rc = 1;
- 			goto leave2;
[email protected]@ -224,15 +246,15 @@
-                                  r2 = SEXP_string_newf("%s", mac),
-                                  NULL);
- 	        probe_item_ent_add(item, "interface", attrs, NULL);
--#if defined(__SVR4) && defined(__sun)
-+#if defined(OS_SOLARIS)
- 		item_added = 1;
- #endif
-         	SEXP_vfree(attrs, r0, r1, r2, NULL);
- 	}
- leave2:
-         close(fd);
--#if defined(__SVR4) && defined(__sun)
--	if (item_added == 0 && rc == 0) {
-+#if defined(OS_SOLARIS)
-+	if (item_added == 0) {
- 		attrs = probe_attr_creat("name",
- 					 r0 = SEXP_string_newf("dummy0"),
- 					 "ip_address",
[email protected]@ -243,6 +265,9 @@
- 		probe_item_ent_add(item, "interface", attrs, NULL);
- 		SEXP_vfree(attrs, r0, r1, r2, NULL);
- 	}
-+ /* if not able to get info on interfaces, do not fail. */
-+	if (rc > 0) 
-+		rc = 0;
- #endif
- leave1:
-         freeifaddrs(ifaddr);

--- a/components/openscap/patches/virtualizationinfo.patch	Thu Nov 19 14:12:20 2015 -0800
+++ b/components/openscap/patches/virtualizationinfo.patch	Thu Nov 19 14:13:43 2015 -0800
@@ -1,30 +1,6 @@
-This patch provides the implementation of the smfproperty probe
+This patch provides the implementation of the virtualizationinfo probe
 on solaris.
-This patch will be contributed upstream by 2015-Aug-01.
---- openscap-1.2.3/src/OVAL/oval_probe.c.~3~	2015-06-09 10:47:16.093295773 -0700
-+++ openscap-1.2.3/src/OVAL/oval_probe.c	2015-06-09 10:45:27.608974352 -0700
[email protected]@ -92,7 +92,8 @@
-         OVAL_PROBE_EXTERNAL(OVAL_UNIX_GCONF, "gconf"),
-         OVAL_PROBE_EXTERNAL(OVAL_UNIX_ROUTINGTABLE, "routingtable"),
-         OVAL_PROBE_EXTERNAL(OVAL_SOLARIS_SMF, "smf"),
--        OVAL_PROBE_EXTERNAL(OVAL_SOLARIS_SMFPROPERTY, "smfproperty")
-+        OVAL_PROBE_EXTERNAL(OVAL_SOLARIS_SMFPROPERTY, "smfproperty"),
-+        OVAL_PROBE_EXTERNAL(OVAL_SOLARIS_VIRTUALIZATIONINFO, "virtualizationinfo")
- };
- 
- #define __PROBE_META_COUNT (sizeof OSCAP_GSYM(__probe_meta)/sizeof OSCAP_GSYM(__probe_meta)[0])
---- openscap-1.2.3/src/OVAL/public/oval_types.h.~2~	2015-06-09 12:38:09.977190833 -0700
-+++ openscap-1.2.3/src/OVAL/public/oval_types.h	2015-06-09 12:40:10.173236122 -0700
[email protected]@ -239,7 +239,8 @@
- 	OVAL_SOLARIS_PATCH54 = OVAL_FAMILY_SOLARIS + 5,
- 	OVAL_SOLARIS_NDD = OVAL_FAMILY_SOLARIS + 6,
- 	OVAL_SOLARIS_PACKAGECHECK = OVAL_FAMILY_SOLARIS + 7,
--	OVAL_SOLARIS_SMFPROPERTY = OVAL_FAMILY_SOLARIS + 8
-+	OVAL_SOLARIS_SMFPROPERTY = OVAL_FAMILY_SOLARIS + 8,
-+	OVAL_SOLARIS_VIRTUALIZATIONINFO = OVAL_FAMILY_SOLARIS + 9
- } oval_solaris_subtype_t;
- 
- /// Unix subtypes
+This patch will be contributed upstream by 2015-Dec-15.
 --- openscap-1.2.3/configure.ac.~4~	2015-06-09 10:49:21.540749400 -0700
 +++ openscap-1.2.3/configure.ac	2015-06-09 10:54:00.258561346 -0700
 @@ -261,6 +261,10 @@
@@ -328,3 +304,16 @@
 +	return get_environment_settings(ctx);
 +}
 +#endif
+--- openscap-1.2.6/src/OVAL/public/oval_types.h.~1~	2015-11-10 17:27:49.662710013 -0800
++++ openscap-1.2.6/src/OVAL/public/oval_types.h	2015-11-10 17:28:59.300311475 -0800
[email protected]@ -238,7 +238,9 @@
+ 	OVAL_SOLARIS_SMF = OVAL_FAMILY_SOLARIS + 4,
+ 	OVAL_SOLARIS_PATCH54 = OVAL_FAMILY_SOLARIS + 5,
+ 	OVAL_SOLARIS_NDD = OVAL_FAMILY_SOLARIS + 6,
+-	OVAL_SOLARIS_PACKAGECHECK = OVAL_FAMILY_SOLARIS + 7
++	OVAL_SOLARIS_PACKAGECHECK = OVAL_FAMILY_SOLARIS + 7,
++	OVAL_SOLARIS_SMFPROPERTY = OVAL_FAMILY_SOLARIS + 8,
++	OVAL_SOLARIS_VIRTUALIZATIONINFO = OVAL_FAMILY_SOLARIS + 9
+ } oval_solaris_subtype_t;
+ 
+ /// Unix subtypes

--- a/components/openscap/patches/zone_file_fix_opt.c.patch	Thu Nov 19 14:12:20 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,169 +0,0 @@
-This patch fixes an issue with file probe on solaris. The file probe currently
- is not zone aware and so descends into non-global zones from the global-zone.
-Fix prevents file probe traversal into non-global zones  from the global zone,
- when local is specified for recursion.
-
-This patch has not been contributed upstream, but is planned to be done by
- 2014-Aug-15.
---- openscap-1.0.0/src/OVAL/probes/oval_fts.c.~2~	2014-07-24 10:53:15.269589073 -0700
-+++ openscap-1.0.0/src/OVAL/probes/oval_fts.c	2014-07-24 11:02:30.267608422 -0700
[email protected]@ -45,6 +45,8 @@
- #if defined(__SVR4) && defined(__sun)
- #include "fts_sun.h"
- #include <sys/mntent.h>
-+#include <libzonecfg.h>
-+#include <sys/avl.h>
- #else
- #include <fts.h>
- #endif
[email protected]@ -138,6 +140,13 @@
- #define MNTTYPE_PROC	"proc"
- #endif
- 
-+typedef struct zone_path {
-+	avl_node_t avl_link_next;
-+	char zpath[MAXPATHLEN];
-+} zone_path_t;
-+static avl_tree_t avl_tree_list;
-+
-+
- static bool valid_remote_fs(char *fstype)
- {
- 	if (strcmp(fstype, MNTTYPE_NFS) == 0 ||
[email protected]@ -160,6 +169,85 @@
- 		return (false);
- 	return (true);
- }
-+
-+/* function to compare two avl nodes in the avl tree */
-+static int compare_zoneroot(const void *entry1, const void *entry2)
-+{
-+	zone_path_t *t1, *t2;
-+	int comp;
-+
-+	t1 = (zone_path_t *)entry1;
-+	t2 = (zone_path_t *)entry2;
-+	if ((comp = strcmp(t1->zpath, t2->zpath)) == 0) {
-+		return (0);
-+	}
-+	return (comp > 0 ? 1 : -1);
-+}
-+
-+int load_zones_path_list()
-+{
-+	FILE *cookie;
-+	char *name;
-+	zone_state_t state_num;
-+	zone_path_t *temp = NULL;
-+	avl_index_t where;
-+	char rpath[MAXPATHLEN];
-+
-+	cookie = setzoneent();
-+	if (getzoneid() != GLOBAL_ZONEID)
-+		return (0);
-+	avl_create(&avl_tree_list, compare_zoneroot,
-+	    sizeof(zone_path_t), offsetof(zone_path_t, avl_link_next));
-+	while ((name = getzoneent(cookie)) != NULL) {
-+		if (strcmp(name, "global") == 0)
-+			continue;
-+		if (zone_get_state(name, &state_num) != Z_OK) {
-+			dE("Could not get zone state for %s\n", name);
-+			continue;
-+		} else if (state_num > ZONE_STATE_CONFIGURED) {
-+			temp = malloc(sizeof(zone_path_t));
-+			if (temp == NULL) {
-+				dE("Memory alloc failed\n");
-+				return(1);
-+			}
-+			if (zone_get_zonepath(name, rpath,
-+			    sizeof(rpath)) != Z_OK) {
-+				dE("Could not get zone path for %s\n",
-+				    name);
-+				continue;
-+			}
-+			if (realpath(rpath, temp->zpath) != NULL)
-+				avl_add(&avl_tree_list, temp);
-+		}
-+	}
-+	endzoneent(cookie);
-+	return (0);
-+}
-+
-+static void free_zones_path_list()
-+{
-+	zone_path_t *temp;
-+	void* cookie = NULL;
-+
-+	while ((temp = avl_destroy_nodes(&avl_tree_list, &cookie)) != NULL) {
-+		free(temp);
-+	}
-+	avl_destroy(&avl_tree_list);
-+}
-+
-+static bool valid_local_zone(char *path)
-+{
-+	zone_path_t temp;
-+	avl_index_t where;
-+	
-+	strlcpy(temp.zpath, path, sizeof(temp.zpath));
-+	if (avl_find(&avl_tree_list, &temp, &where) != NULL)
-+		return (true);
-+
-+	return (false);
-+}
-+
-+
- #endif
- 
- static bool OVAL_FTS_localp(OVAL_FTS *ofts, const char *path, void *id)
[email protected]@ -168,9 +256,11 @@
- 	if (id != NULL && (*(char*)id) != '\0') {
- 		/* if not a valid local fs skip */
- 		if (valid_local_fs((char*)id)) {
--			/* if recurse is local , skip remote fs */
-+			/* if recurse is local , skip remote fs 
-+			   and non-global zones */
- 			if (ofts->filesystem == OVAL_RECURSE_FS_LOCAL) {
--				return (!valid_remote_fs((char*)id));
-+				return (!(valid_remote_fs((char*)id) ||
-+				    valid_local_zone(path)));
- 			}
- 			return (true);
- 		}
[email protected]@ -179,9 +269,11 @@
- 		/* id was not set, because fts_read failed to stat the node */
- 		struct stat sb;
- 		if ((stat(path, &sb) == 0) && (valid_local_fs(sb.st_fstype))) {
--			/* if recurse is local , skip remote fs */
-+			/* if recurse is local , skip remote fs
-+			   and non-global zones */
- 			if (ofts->filesystem == OVAL_RECURSE_FS_LOCAL) {
--				return (!valid_remote_fs(sb.st_fstype));
-+				return (!(valid_remote_fs(sb.st_fstype) ||
-+				    valid_local_zone(path)));
- 			}
- 			return (true);
- 		}
[email protected]@ -793,6 +884,12 @@
- 		ofts->ofts_sfilepath = SEXP_ref(filepath);
- 	}
- 
-+#if defined(__SVR4) && defined(__sun)
-+	if (load_zones_path_list() != 0) {
-+		dE("Failed to load zones path info. Recursing non-global zones.");
-+		free_zones_path_list();
-+	}
-+#endif
- 	return (ofts);
- }
- 
[email protected]@ -1249,6 +1346,9 @@
- 	fsdev_free(ofts->localdevs);
- 
- 	OVAL_FTS_free(ofts);
-+#if defined(__SVR4) && defined(__sun)
-+	free_zones_path_list();
-+#endif
- 
- 	return (0);
- }

--- a/components/openscap/patches/zz_fixes_for_64bit.patch	Thu Nov 19 14:12:20 2015 -0800
+++ b/components/openscap/patches/zz_fixes_for_64bit.patch	Thu Nov 19 14:13:43 2015 -0800
@@ -1,5 +1,6 @@
 This patch is required to build 64-bit versions of openscap on solaris.
-It has not been submitted to upstream, but will be  2015-Feb-15.
+It has been submitted to upstream, parts of it were accepted, but the
+remainder have not been accepted.
 
 --- openscap-1.2.0/configure.ac.~3~	2014-08-08 10:58:39.160398757 -0700
 +++ openscap-1.2.0/configure.ac	2014-08-08 10:58:15.703200526 -0700
@@ -12,18 +13,6 @@
  		;;
  esac
  
---- openscap-1.2.0/src/SCE/sce_engine.c.~1~	2014-12-12 10:59:03.676427726 -0800
-+++ openscap-1.2.0/src/SCE/sce_engine.c	2014-12-12 11:01:28.358061794 -0800
[email protected]@ -48,6 +48,9 @@
- #include <sys/prctl.h>
- #include <limits.h>
- #include <unistd.h>
-+#if defined(__SVR4) && defined(__sun)
-+#include <libgen.h>
-+#endif
- 
- struct sce_check_result
- {
 --- openscap-1.2.0/src/OVAL/probes/SEAP/_sexp-value.h.~1~	2014-12-19 09:53:15.178129356 -0800
 +++ openscap-1.2.0/src/OVAL/probes/SEAP/_sexp-value.h	2014-12-19 09:55:26.268851025 -0800
 @@ -95,6 +95,9 @@
@@ -35,15 +24,4 @@
 +#endif
          SEXP_t    memb[];
  } __attribute__ ((packed));
- 
---- openscap-1.2.0/src/OVAL/probes/independent/system_info.c.~5~	2014-12-19 11:20:58.972279544 -0800
-+++ openscap-1.2.0/src/OVAL/probes/independent/system_info.c	2014-12-19 11:23:46.471735971 -0800
[email protected]@ -114,7 +114,7 @@
- static char *get_mac(const struct ifaddrs *ifa)
- {
-        struct lifreq lifr;
--	uint_t physaddrlen = DLPI_PHYSADDR_MAX;
-+	size_t physaddrlen = DLPI_PHYSADDR_MAX;
- 	uchar_t physaddr[DLPI_PHYSADDR_MAX];
- 	static char mac_buf[DLPI_PHYSADDR_MAX];
- 	char *str;
+