summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@intel.com>2010-11-17 11:37:47 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-12-09 12:37:11 +0000
commit089612794d4d8d9c79bd2a4365d6df78371f7f40 (patch)
tree8f97e7334a56612315f3757cd8e2403f4ff47409 /meta
parent0f716e64c4f46ae483797f0536f1c63f3c247ef1 (diff)
downloadpoky-089612794d4d8d9c79bd2a4365d6df78371f7f40.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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/openssl/openssl.inc6
-rw-r--r--meta/recipes-connectivity/openssl/openssl_0.9.8p.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 da90456928..5cc5732469 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.8p.bb b/meta/recipes-connectivity/openssl/openssl_0.9.8p.bb
index 3949540f7c..fe0227275f 100644
--- a/meta/recipes-connectivity/openssl/openssl_0.9.8p.bb
+++ b/meta/recipes-connectivity/openssl/openssl_0.9.8p.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 \