From 838f698bd994e8a1ba47608cd6940b8c88461259 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Wed, 13 Sep 2017 14:44:11 +0800 Subject: samhain: fix for the PACKAGECONFIG * The "??=" assignment for PACKAGECONFIG is overridden by the following "+=" assignments, which is not expected, so combine them into one assignment with multiple lines. * Fix a typo for postgresql. * Remove unneeded quotation marks. * run aotoconf to regenerate the configure, or the patch for ps option doesn't work: | configure: error: unrecognized option: --with-ps-path=/bin/ps Signed-off-by: Jackie Huang Signed-off-by: Armin Kuster --- recipes-security/samhain/samhain.inc | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/recipes-security/samhain/samhain.inc b/recipes-security/samhain/samhain.inc index 7b71d9f..d25f653 100644 --- a/recipes-security/samhain/samhain.inc +++ b/recipes-security/samhain/samhain.inc @@ -44,17 +44,18 @@ SAMHAIN_MODE = "${@oe.utils.ifelse(d.getVar('MODE_NAME') == 'standalone', 'no', # supports mysql|postgresql|oracle|odbc but postgresql is the only one available -PACKAGECONFIG ??= "postgresql ps" -PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" -PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux audit', '', d)}" -PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}" - -PACKAGECONFIG[postgres] = "--with-database=postgresql --enable-xml-log, "", postgresql" -PACKAGECONFIG[suidcheck] = "--enable-suidcheck","" , " -PACKAGECONFIG[logwatch] = "--enable-login-watch,"" , " -PACKAGECONFIG[mounts] = "--enable-mounts-check","" , " -PACKAGECONFIG[userfiles] = "--enable-userfiles","" , " -PACKAGECONFIG[ipv6] = "--enable-ipv6,"--disable-ipv6"," +PACKAGECONFIG ??= "postgresql ps \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux audit', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \ +" + +PACKAGECONFIG[postgresql] = "--with-database=postgresql --enable-xml-log, , postgresql" +PACKAGECONFIG[suidcheck] = "--enable-suidcheck, , " +PACKAGECONFIG[logwatch] = "--enable-login-watch, , " +PACKAGECONFIG[mounts] = "--enable-mounts-check, , " +PACKAGECONFIG[userfiles] = "--enable-userfiles, , " +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," PACKAGECONFIG[selinux] = "--enable-selinux, --disable-selinux, libselinux attr" PACKAGECONFIG[acl] = " --enable-posix-acl , --disable-posix-acl, acl" PACKAGECONFIG[audit] = "ac_cv_header_auparse_h=yes,ac_cv_header_auparse_h=no,audit" @@ -90,6 +91,7 @@ EOF } do_configure () { + autoconf -f ./configure \ --build=${BUILD_SYS} \ --host=${HOST_SYS} \ -- cgit v1.2.3-54-g00ecf