Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/openscap/patches/sce_engine.c.patch
author Jacob Varughese <jacob.varughese@oracle.com>
Fri, 13 Feb 2015 12:30:50 -0800
branchs11-update
changeset 3806 bdc70b98921a
permissions -rw-r--r--
PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC 20002615 upgrade openscap to latest version 1.2.0 20465100 openscap needs to have ASLR enabled
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3806
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     1
 
This patch fix is required to port this file to solaris.
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     2
 
This patch has not been submitted upstream, but is intended to by
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     3
 
2015-Jan-31.
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     4
 
--- openscap-1.1.1/src/SCE/sce_engine.c.~1~	2014-10-27 14:47:43.904868342 -0700
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     5
 
+++ openscap-1.1.1/src/SCE/sce_engine.c	2014-10-27 14:49:29.343125585 -0700
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     6
 
@@ -45,7 +45,9 @@
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     7
 
 #include <assert.h>
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     8
 
 #include <fcntl.h>
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
     9
 
 #include <sys/types.h>
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    10
 
+#if defined(__linux__)
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    11
 
 #include <sys/prctl.h>
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    12
 
+#endif
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    13
 
 #include <limits.h>
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    14
 
 #include <unistd.h>
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset 
    15
upstream/oracle/userland-gate