--- 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
-@@ -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
-@@ -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;
+