summaryrefslogtreecommitdiffstats
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:30:57 -0700
commitd83f7cb0c90666fedd127d5173e6c8b972755c32 (patch)
tree5c751e91b22286eae09ea39146bdb6060a3ff905
parentb7db91fd19ebe63504c21fb4b8229fda42d88fc0 (diff)
downloadmeta-security-d83f7cb0c90666fedd127d5173e6c8b972755c32.tar.gz
samhain: dnmalloc hash fix for aarch64 and mips64
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"
67PACKAGECONFIG[audit] = "ac_cv_header_auparse_h=yes,ac_cv_header_auparse_h=no,audit" 67PACKAGECONFIG[audit] = "ac_cv_header_auparse_h=yes,ac_cv_header_auparse_h=no,audit"
68PACKAGECONFIG[ps] = "--with-ps-path=${base_bindir}/ps,,,procps" 68PACKAGECONFIG[ps] = "--with-ps-path=${base_bindir}/ps,,,procps"
69 69
70EXTRA_OEMAKE_append_aarch64 = " CPPFLAGS+=-DCONFIG_ARCH_AARCH64=1"
71EXTRA_OEMAKE_append_mips64 = " CPPFLAGS+=-DCONFIG_ARCH_MIPS64=1"
72
70do_unpack_samhain() { 73do_unpack_samhain() {
71 cd ${WORKDIR} 74 cd ${WORKDIR}
72 tar -xzvf samhain-${PV}.tar.gz 75 tar -xzvf samhain-${PV}.tar.gz
@@ -118,7 +121,6 @@ do_configure () {
118 --enable-network=${SAMHAIN_MODE} \ 121 --enable-network=${SAMHAIN_MODE} \
119 --with-pid-file=${localstatedir}/run/samhain.pid \ 122 --with-pid-file=${localstatedir}/run/samhain.pid \
120 --with-data-file=${localstatedir}/lib/samhain/samhain_file \ 123 --with-data-file=${localstatedir}/lib/samhain/samhain_file \
121 --disable-dnmalloc \
122 ${EXTRA_OECONF} 124 ${EXTRA_OECONF}
123} 125}
124 126