--- a/components/openscap/Makefile	Wed Nov 11 08:19:47 2015 -0800
+++ b/components/openscap/Makefile	Wed Nov 11 11:24:50 2015 -0800
@@ -44,13 +44,12 @@
 
 PYTHON_VERSIONS=	$(PYTHON2_VERSIONS)
 
-PERL_VERSIONS = 5.12 5.20
+PERL_VERSIONS = 5.20
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
 include $(WS_MAKE_RULES)/ips.mk
 
-PERL_VERSION.32 = 5.12
 PERL_VERSION.64 = 5.20
 PERL_VERSION = $(PERL_VERSION.$(BITS))
 PERL = $(PERL.$(PERL_VERSION))
@@ -77,7 +76,6 @@
 
 CONFIGURE_ENV +=        PERL="$(PERL)"
 CONFIGURE_ENV +=        PYTHON="$(PYTHON.$(BITS))"
-CONFIGURE_OPTIONS.32 +=	CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS.64 +=	CFLAGS="$(CFLAGS) -D_FILE_OFFSET_BITS=64"
 CONFIGURE_OPTIONS +=	CPPFLAGS="$(CPPFLAGS)"
 CONFIGURE_OPTIONS +=	--enable-debug=no
@@ -99,15 +97,15 @@
 ASLR_MODE = $(ASLR_ENABLE)
 
 # common targets
-configure:	$(CONFIGURE_32_and_64)
+configure:	$(CONFIGURE_64)
 
-build:		$(BUILD_32_and_64)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32_and_64)
+install:	$(INSTALL_64)
 		$(MKDIR) $(DOCS_DIR)
 		$(CP) $(SOURCE_DIR)/docs/html/* $(DOCS_DIR)
 
-test:		$(TEST_32_and_64)
+test:		$(TEST_64)
 
 system-test:    $(SYSTEM_TESTS_NOT_IMPLEMENTED)
 
@@ -119,7 +117,6 @@
 REQUIRED_PACKAGES += library/libxslt
 REQUIRED_PACKAGES += library/openldap
 REQUIRED_PACKAGES += library/pcre
-REQUIRED_PACKAGES += runtime/perl-512
 REQUIRED_PACKAGES += runtime/perl-520
 REQUIRED_PACKAGES += runtime/python-27
 REQUIRED_PACKAGES += security/compliance/openscap

--- a/components/openscap/openscap-python-PYVER.p5m	Wed Nov 11 08:19:47 2015 -0800
+++ b/components/openscap/openscap-python-PYVER.p5m	Wed Nov 11 11:24:50 2015 -0800
@@ -35,9 +35,8 @@
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 file path=usr/lib/python$(PYVER)/vendor-packages/64/_openscap_py.so
-file path=usr/lib/python$(PYVER)/vendor-packages/_openscap_py.so
-file path=usr/lib/python$(PYVER)/vendor-packages/openscap.py
-file path=usr/lib/python$(PYVER)/vendor-packages/openscap_api.py
+file path=usr/lib/python$(PYVER)/vendor-packages/64/openscap.py
+file path=usr/lib/python$(PYVER)/vendor-packages/64/openscap_api.py
 license openscap.license license="LGPLv2.1, LGPLv3, OVAL"
 
 # force a dependency on the Python $(PYVER) runtime

--- a/components/openscap/openscap.p5m	Wed Nov 11 08:19:47 2015 -0800
+++ b/components/openscap/openscap.p5m	Wed Nov 11 11:24:50 2015 -0800
@@ -103,13 +103,6 @@
 file path=usr/lib/$(MACH64)/openscap/probe_virtualizationinfo
 file path=usr/lib/$(MACH64)/openscap/probe_xinetd
 file path=usr/lib/$(MACH64)/openscap/probe_xmlfilecontent
-link path=usr/lib/libopenscap.so target=libopenscap.so.8.4.3
-link path=usr/lib/libopenscap.so target=libopenscap.so.8.4.3
-link path=usr/lib/libopenscap.so.8 target=libopenscap.so.8.4.3
-link path=usr/lib/libopenscap.so.8 target=libopenscap.so.8.4.3
-file path=usr/lib/libopenscap.so.8.4.3
-file path=usr/lib/libopenscap_sce.so.8.4.3
-file path=usr/lib/pkgconfig/libopenscap.pc
 file path=usr/share/docs/openscap/html/MurmurHash3_8h_source.html
 file path=usr/share/docs/openscap/html/OVAL_2probes_2SEAP_2generic_2bfind_8h_source.html
 file path=usr/share/docs/openscap/html/OVAL_2probes_2SEAP_2public_2helpers_8h_source.html

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/openscap/patches/icache.c.patch	Wed Nov 11 11:24:50 2015 -0800
@@ -0,0 +1,25 @@
+This fix addresses an issue in openscap which is meant
+to handle systems with small memory configurations. But
+on solaris we are not choosing to limit the applications
+memory usage. This has not been contributed upstream,
+but is intended to by 2015-Dec-15.
+--- openscap-1.2.3/src/OVAL/probes/probe/icache.c.~1~	2013-03-21 08:27:20.000000000 -0700
++++ openscap-1.2.3/src/OVAL/probes/probe/icache.c	2015-11-06 14:06:01.150096481 -0800
+@@ -506,7 +506,8 @@
+ 	cobj_itemcnt = SEXP_list_length(cobj_content);
+ 	SEXP_free(cobj_content);
+ 
+-	if (probe_cobj_memcheck(cobj_itemcnt) != 0) {
++#if !defined (__sun)  && !defined  (__SVR4)
++	if (probe_cobj_memcheck(cobj_itemcnt) != 0) { 
+ 
+ 		/*
+ 		 * Don't set the message again if the collected object is
+@@ -532,6 +533,7 @@
+ 
+ 		return 2;
+ 	}
++#endif
+ 
+         if (ctx->filters != NULL && probe_item_filtered(item, ctx->filters)) {
+                 SEXP_free(item);

--- a/components/openscap/patches/smfproperty.patch	Wed Nov 11 08:19:47 2015 -0800
+++ b/components/openscap/patches/smfproperty.patch	Wed Nov 11 11:24:50 2015 -0800
@@ -473,3 +473,13 @@
 +	return PROBE_EOPNOTSUPP;
 +}
 +#endif
+--- openscap-1.2.3/src/OVAL/probes/unix/solaris/smfproperty.c.~2~	2015-11-10 10:00:28.564892744 -0800
++++ openscap-1.2.3/src/OVAL/probes/unix/solaris/smfproperty.c	2015-11-10 10:03:34.496610180 -0800
+@@ -38,6 +38,7 @@
+ #endif
+ 
+ #define	MAX_SCF_VALUE_LENGTH	1024
++#define	STR(x)	((x == NULL) ? "" : x)
+ /* Convenience structure for the results being reported */
+ 
+ /*