mirrors/meta-security
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-security synced 2026-06-02 13:30:33 +00:00
Code Issues Projects Releases Wiki Activity

samhain: fix for the PACKAGECONFIG

Browse Source 
* 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>
This commit is contained in:
Jackie Huang
2017-09-13 14:44:11 +08:00
committed by Armin Kuster
parent d3bcc4ba47
commit 838f698bd9
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recipes-security/samhain/samhain.inc
+12 -10
View File
@@ -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 # supports mysql|postgresql|oracle|odbc but postgresql is the only one available
PACKAGECONFIG ??= "postgresql ps" PACKAGECONFIG ??= "postgresql ps \
PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \
PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux audit', '', d)}" ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux audit', '', d)} \
PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}" ${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \
"
PACKAGECONFIG[postgres] = "--with-database=postgresql --enable-xml-log, "", postgresql" PACKAGECONFIG[postgresql] = "--with-database=postgresql --enable-xml-log, , postgresql"
PACKAGECONFIG[suidcheck] = "--enable-suidcheck","" , " PACKAGECONFIG[suidcheck] = "--enable-suidcheck, , "
PACKAGECONFIG[logwatch] = "--enable-login-watch,"" , " PACKAGECONFIG[logwatch] = "--enable-login-watch, , "
PACKAGECONFIG[mounts] = "--enable-mounts-check","" , " PACKAGECONFIG[mounts] = "--enable-mounts-check, , "
PACKAGECONFIG[userfiles] = "--enable-userfiles","" , " PACKAGECONFIG[userfiles] = "--enable-userfiles, , "
PACKAGECONFIG[ipv6] = "--enable-ipv6,"--disable-ipv6"," PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
PACKAGECONFIG[selinux] = "--enable-selinux, --disable-selinux, libselinux attr" PACKAGECONFIG[selinux] = "--enable-selinux, --disable-selinux, libselinux attr"
PACKAGECONFIG[acl] = " --enable-posix-acl , --disable-posix-acl, acl" 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[audit] = "ac_cv_header_auparse_h=yes,ac_cv_header_auparse_h=no,audit"
@@ -90,6 +91,7 @@ EOF
} }
do_configure () { do_configure () {
autoconf -f
./configure \ ./configure \
--build=${BUILD_SYS} \ --build=${BUILD_SYS} \
--host=${HOST_SYS} \ --host=${HOST_SYS} \