22188277 upgrade openscap to 1.2.6
21572223 tailored variable didn't take effect in SCE test and test report
22241242 openscap upgrade for b87 fails due to conditional dependency
merged
This patch is required to build 64-bit versions of openscap on solaris.
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
@@ -877,7 +877,7 @@
#check for atomic functions
case $host_cpu in
i386 | i486 | i586 | i686)
- CFLAGS="$CFLAGS -march=i686"
+# CFLAGS="$CFLAGS -march=i686"
;;
esac
--- 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 @@
uintptr_t nxsz;
uint16_t real;
uint16_t refs;
+#if defined(__sparc) && defined(_LP64)
+ uint32_t pad_gcc_align_hack;
+#endif
SEXP_t memb[];
} __attribute__ ((packed));