author | Jacob Varughese <jacob.varughese@oracle.com> |
Thu, 17 Nov 2016 13:46:47 -0800 | |
changeset 7343 | a6cfc180f5e8 |
parent 5111 | e68e059c3456 |
permissions | -rw-r--r-- |
3703
71b5204c547a
16873524 Need to convert openscap to 64-bit and enable ASLR.
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
1 |
This patch is required to build 64-bit versions of openscap on solaris. |
5111
e68e059c3456
22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
3703
diff
changeset
|
2 |
It has been submitted to upstream, parts of it were accepted, but the |
e68e059c3456
22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
3703
diff
changeset
|
3 |
remainder have not been accepted. |
3703
71b5204c547a
16873524 Need to convert openscap to 64-bit and enable ASLR.
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
4 |
|
71b5204c547a
16873524 Need to convert openscap to 64-bit and enable ASLR.
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
5 |
--- openscap-1.2.0/configure.ac.~3~ 2014-08-08 10:58:39.160398757 -0700 |
71b5204c547a
16873524 Need to convert openscap to 64-bit and enable ASLR.
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
6 |
+++ openscap-1.2.0/configure.ac 2014-08-08 10:58:15.703200526 -0700 |
71b5204c547a
16873524 Need to convert openscap to 64-bit and enable ASLR.
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
7 |
@@ -877,7 +877,7 @@ |
71b5204c547a
16873524 Need to convert openscap to 64-bit and enable ASLR.
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
8 |
#check for atomic functions |
71b5204c547a
16873524 Need to convert openscap to 64-bit and enable ASLR.
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
9 |
case $host_cpu in |
71b5204c547a
16873524 Need to convert openscap to 64-bit and enable ASLR.
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
10 |
i386 | i486 | i586 | i686) |
71b5204c547a
16873524 Need to convert openscap to 64-bit and enable ASLR.
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
11 |
- CFLAGS="$CFLAGS -march=i686" |
71b5204c547a
16873524 Need to convert openscap to 64-bit and enable ASLR.
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
12 |
+# CFLAGS="$CFLAGS -march=i686" |
71b5204c547a
16873524 Need to convert openscap to 64-bit and enable ASLR.
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
13 |
;; |
71b5204c547a
16873524 Need to convert openscap to 64-bit and enable ASLR.
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
14 |
esac |
71b5204c547a
16873524 Need to convert openscap to 64-bit and enable ASLR.
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
15 |
|
71b5204c547a
16873524 Need to convert openscap to 64-bit and enable ASLR.
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
16 |
--- openscap-1.2.0/src/OVAL/probes/SEAP/_sexp-value.h.~1~ 2014-12-19 09:53:15.178129356 -0800 |
71b5204c547a
16873524 Need to convert openscap to 64-bit and enable ASLR.
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
17 |
+++ openscap-1.2.0/src/OVAL/probes/SEAP/_sexp-value.h 2014-12-19 09:55:26.268851025 -0800 |
71b5204c547a
16873524 Need to convert openscap to 64-bit and enable ASLR.
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
18 |
@@ -95,6 +95,9 @@ |
71b5204c547a
16873524 Need to convert openscap to 64-bit and enable ASLR.
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
19 |
uintptr_t nxsz; |
71b5204c547a
16873524 Need to convert openscap to 64-bit and enable ASLR.
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
20 |
uint16_t real; |
71b5204c547a
16873524 Need to convert openscap to 64-bit and enable ASLR.
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
21 |
uint16_t refs; |
7343
a6cfc180f5e8
25077840 smfproperty probe needs to be fixed to handle nested property groups
Jacob Varughese <jacob.varughese@oracle.com>
parents:
5111
diff
changeset
|
22 |
+#if defined(__sun) && defined(__sparcv9) |
3703
71b5204c547a
16873524 Need to convert openscap to 64-bit and enable ASLR.
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
23 |
+ uint32_t pad_gcc_align_hack; |
71b5204c547a
16873524 Need to convert openscap to 64-bit and enable ASLR.
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
24 |
+#endif |
71b5204c547a
16873524 Need to convert openscap to 64-bit and enable ASLR.
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
25 |
SEXP_t memb[]; |
71b5204c547a
16873524 Need to convert openscap to 64-bit and enable ASLR.
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
26 |
} __attribute__ ((packed)); |
5111
e68e059c3456
22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
3703
diff
changeset
|
27 |
|
7343
a6cfc180f5e8
25077840 smfproperty probe needs to be fixed to handle nested property groups
Jacob Varughese <jacob.varughese@oracle.com>
parents:
5111
diff
changeset
|
28 |
--- openscap-1.2.3/src/OVAL/probes/SEAP/sexp-value.c.~1~ 2015-09-10 15:14:06.694228778 -0700 |
a6cfc180f5e8
25077840 smfproperty probe needs to be fixed to handle nested property groups
Jacob Varughese <jacob.varughese@oracle.com>
parents:
5111
diff
changeset
|
29 |
+++ openscap-1.2.3/src/OVAL/probes/SEAP/sexp-value.c 2015-09-10 15:15:53.755827733 -0700 |
a6cfc180f5e8
25077840 smfproperty probe needs to be fixed to handle nested property groups
Jacob Varughese <jacob.varughese@oracle.com>
parents:
5111
diff
changeset
|
30 |
@@ -119,7 +119,7 @@ |
a6cfc180f5e8
25077840 smfproperty probe needs to be fixed to handle nested property groups
Jacob Varughese <jacob.varughese@oracle.com>
parents:
5111
diff
changeset
|
31 |
_A(sz < 16); |
a6cfc180f5e8
25077840 smfproperty probe needs to be fixed to handle nested property groups
Jacob Varughese <jacob.varughese@oracle.com>
parents:
5111
diff
changeset
|
32 |
|
a6cfc180f5e8
25077840 smfproperty probe needs to be fixed to handle nested property groups
Jacob Varughese <jacob.varughese@oracle.com>
parents:
5111
diff
changeset
|
33 |
if (sm_memalign ((void **)(void *)&lblk, SEXP_LBLK_ALIGN, |
a6cfc180f5e8
25077840 smfproperty probe needs to be fixed to handle nested property groups
Jacob Varughese <jacob.varughese@oracle.com>
parents:
5111
diff
changeset
|
34 |
- sizeof (uintptr_t) + (2 * sizeof (uint16_t)) + (sizeof (SEXP_t) * (1 << sz))) != 0) { |
a6cfc180f5e8
25077840 smfproperty probe needs to be fixed to handle nested property groups
Jacob Varughese <jacob.varughese@oracle.com>
parents:
5111
diff
changeset
|
35 |
+ sizeof (struct SEXP_val_lblk) + (sizeof (SEXP_t) * (1 << sz))) != 0) { |
a6cfc180f5e8
25077840 smfproperty probe needs to be fixed to handle nested property groups
Jacob Varughese <jacob.varughese@oracle.com>
parents:
5111
diff
changeset
|
36 |
/* TODO: handle this */ |
a6cfc180f5e8
25077840 smfproperty probe needs to be fixed to handle nested property groups
Jacob Varughese <jacob.varughese@oracle.com>
parents:
5111
diff
changeset
|
37 |
abort (); |
a6cfc180f5e8
25077840 smfproperty probe needs to be fixed to handle nested property groups
Jacob Varughese <jacob.varughese@oracle.com>
parents:
5111
diff
changeset
|
38 |
return ((uintptr_t) NULL); |