From c5ab4d56f97a0e45b124d40c9f536541be04c201 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 17 Nov 2010 11:37:47 +0000 Subject: 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 --- meta/recipes-connectivity/openssl/openssl.inc | 6 +++++- meta/recipes-connectivity/openssl/openssl_0.9.8o.bb | 2 +- 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}" AR_append = " r" CFLAG = "${@base_conditional('SITEINFO_ENDIANESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)} \ - -DTERMIO ${FULL_OPTIMIZATION} -Wall" + -DTERMIO ${FULL_OPTIMIZATION}" + +# Avoid binaries being marked as requiring an executable stack (which causes +# issues with SELinux on the host) +CFLAG_append_virtclass-native = " -Wa,--noexecstack" # -02 does not work on mipsel: ssh hangs when it tries to read /dev/urandom CFLAG_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 @@ require openssl.inc -PR = "r0" +PR = "r1" SRC_URI += "file://debian/ca.patch \ file://debian/config-hurd.patch;apply=no \ file://debian/debian-targets.patch \ -- cgit v1.2.3-54-g00ecf