aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHaseeb Ashraf <haseeb_ashraf@mentor.com>2020-04-20 11:27:19 +0500
committerArmin Kuster <akuster808@gmail.com>2020-05-15 05:28:21 -0700
commit95fe86eb98bc401dae8183326048f50ce7985bda (patch)
tree5c751e91b22286eae09ea39146bdb6060a3ff905
parent9168152b1eae7af3ccdc550eac56ac78fdeb61e7 (diff)
downloadmeta-security-master.tar.gz
meta-security-master.tar.bz2
meta-security-master.zip
samhain: dnmalloc hash fix for aarch64 and mips64HEADmaster
fix runtime error: samhain[4069]: FATAL: x_dnmalloc.c: 2790: hashval < AMOUNTHASH Killed The proper fix is not to disable dnmalloc. This change is in continuation of samhain-mips64-aarch64-dnmalloc-hash-fix.patch which requires CONFIG_ARCH_AARCH64 or CONFIG_ARCH_MIPS64 to be defined for the corresponding architecture Signed-off-by: Haseeb Ashraf <Haseeb_Ashraf@mentor.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--recipes-ids/samhain/samhain.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/recipes-ids/samhain/samhain.inc b/recipes-ids/samhain/samhain.inc
index 0a5e432..b867bbc 100644
--- a/recipes-ids/samhain/samhain.inc
+++ b/recipes-ids/samhain/samhain.inc
@@ -67,6 +67,9 @@ PACKAGECONFIG[acl] = " --enable-posix-acl , --disable-posix-acl, acl"
PACKAGECONFIG[audit] = "ac_cv_header_auparse_h=yes,ac_cv_header_auparse_h=no,audit"
PACKAGECONFIG[ps] = "--with-ps-path=${base_bindir}/ps,,,procps"
+EXTRA_OEMAKE_append_aarch64 = " CPPFLAGS+=-DCONFIG_ARCH_AARCH64=1"
+EXTRA_OEMAKE_append_mips64 = " CPPFLAGS+=-DCONFIG_ARCH_MIPS64=1"
+
do_unpack_samhain() {
cd ${WORKDIR}
tar -xzvf samhain-${PV}.tar.gz
@@ -118,7 +121,6 @@ do_configure () {
--enable-network=${SAMHAIN_MODE} \
--with-pid-file=${localstatedir}/run/samhain.pid \
--with-data-file=${localstatedir}/lib/samhain/samhain_file \
- --disable-dnmalloc \
${EXTRA_OECONF}
}