diff options
author | Jackie Huang <jackie.huang@windriver.com> | 2017-09-13 14:44:11 +0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2017-09-15 08:01:07 -0700 |
commit | 838f698bd994e8a1ba47608cd6940b8c88461259 (patch) | |
tree | 2d17bac4bc4a638808fdc29f74126376732996ba | |
parent | d3bcc4ba470de02513e2f433fca3dfb341a1b2f8 (diff) | |
download | meta-security-838f698bd994e8a1ba47608cd6940b8c88461259.tar.gz |
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 <jackie.huang@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | recipes-security/samhain/samhain.inc | 24 |
1 files 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', | |||
44 | 44 | ||
45 | # supports mysql|postgresql|oracle|odbc but postgresql is the only one available | 45 | # supports mysql|postgresql|oracle|odbc but postgresql is the only one available |
46 | 46 | ||
47 | PACKAGECONFIG ??= "postgresql ps" | 47 | PACKAGECONFIG ??= "postgresql ps \ |
48 | PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" | 48 | ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ |
49 | PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux audit', '', d)}" | 49 | ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux audit', '', d)} \ |
50 | PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}" | 50 | ${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \ |
51 | 51 | " | |
52 | PACKAGECONFIG[postgres] = "--with-database=postgresql --enable-xml-log, "", postgresql" | 52 | |
53 | PACKAGECONFIG[suidcheck] = "--enable-suidcheck","" , " | 53 | PACKAGECONFIG[postgresql] = "--with-database=postgresql --enable-xml-log, , postgresql" |
54 | PACKAGECONFIG[logwatch] = "--enable-login-watch,"" , " | 54 | PACKAGECONFIG[suidcheck] = "--enable-suidcheck, , " |
55 | PACKAGECONFIG[mounts] = "--enable-mounts-check","" , " | 55 | PACKAGECONFIG[logwatch] = "--enable-login-watch, , " |
56 | PACKAGECONFIG[userfiles] = "--enable-userfiles","" , " | 56 | PACKAGECONFIG[mounts] = "--enable-mounts-check, , " |
57 | PACKAGECONFIG[ipv6] = "--enable-ipv6,"--disable-ipv6"," | 57 | PACKAGECONFIG[userfiles] = "--enable-userfiles, , " |
58 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | ||
58 | PACKAGECONFIG[selinux] = "--enable-selinux, --disable-selinux, libselinux attr" | 59 | PACKAGECONFIG[selinux] = "--enable-selinux, --disable-selinux, libselinux attr" |
59 | PACKAGECONFIG[acl] = " --enable-posix-acl , --disable-posix-acl, acl" | 60 | PACKAGECONFIG[acl] = " --enable-posix-acl , --disable-posix-acl, acl" |
60 | PACKAGECONFIG[audit] = "ac_cv_header_auparse_h=yes,ac_cv_header_auparse_h=no,audit" | 61 | PACKAGECONFIG[audit] = "ac_cv_header_auparse_h=yes,ac_cv_header_auparse_h=no,audit" |
@@ -90,6 +91,7 @@ EOF | |||
90 | } | 91 | } |
91 | 92 | ||
92 | do_configure () { | 93 | do_configure () { |
94 | autoconf -f | ||
93 | ./configure \ | 95 | ./configure \ |
94 | --build=${BUILD_SYS} \ | 96 | --build=${BUILD_SYS} \ |
95 | --host=${HOST_SYS} \ | 97 | --host=${HOST_SYS} \ |