summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@intel.com>2010-11-17 11:37:47 +0000
committerJoshua Lock <josh@linux.intel.com>2010-12-10 11:37:14 +0000
commitc5ab4d56f97a0e45b124d40c9f536541be04c201 (patch)
treea11ae12d8253f6717b3d46dede49e60cfef8970b
parentb9d6950732185f6f349e159ce80b1a45715e244c (diff)
downloadpoky-c5ab4d56f97a0e45b124d40c9f536541be04c201.tar.gz
openssl-native: disable execstack flag to prevent problems with SELinux
The execstack flag gets set on libcrypto.so by default which causes SELinux to prevent it from being loaded on systems using SELinux, which includes Fedora. This patch disables the execstack flag. (Note: Red Hat do this in their openssl packaging.) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-rw-r--r--meta/recipes-connectivity/openssl/openssl.inc6
-rw-r--r--meta/recipes-connectivity/openssl/openssl_0.9.8o.bb2
2 files changed, 6 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index 11dd1e528a..dc2ff3e78b 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -15,7 +15,11 @@ S = "${WORKDIR}/openssl-${PV}"
15 15
16AR_append = " r" 16AR_append = " r"
17CFLAG = "${@base_conditional('SITEINFO_ENDIANESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)} \ 17CFLAG = "${@base_conditional('SITEINFO_ENDIANESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)} \
18 -DTERMIO ${FULL_OPTIMIZATION} -Wall" 18 -DTERMIO ${FULL_OPTIMIZATION}"
19
20# Avoid binaries being marked as requiring an executable stack (which causes
21# issues with SELinux on the host)
22CFLAG_append_virtclass-native = " -Wa,--noexecstack"
19 23
20# -02 does not work on mipsel: ssh hangs when it tries to read /dev/urandom 24# -02 does not work on mipsel: ssh hangs when it tries to read /dev/urandom
21CFLAG_mtx-1 := "${@'${CFLAG}'.replace('-O2', '')}" 25CFLAG_mtx-1 := "${@'${CFLAG}'.replace('-O2', '')}"
diff --git a/meta/recipes-connectivity/openssl/openssl_0.9.8o.bb b/meta/recipes-connectivity/openssl/openssl_0.9.8o.bb
index 31c5568ba1..aa11cdf781 100644
--- a/meta/recipes-connectivity/openssl/openssl_0.9.8o.bb
+++ b/meta/recipes-connectivity/openssl/openssl_0.9.8o.bb
@@ -1,6 +1,6 @@
1require openssl.inc 1require openssl.inc
2 2
3PR = "r0" 3PR = "r1"
4SRC_URI += "file://debian/ca.patch \ 4SRC_URI += "file://debian/ca.patch \
5 file://debian/config-hurd.patch;apply=no \ 5 file://debian/config-hurd.patch;apply=no \
6 file://debian/debian-targets.patch \ 6 file://debian/debian-targets.patch \