diff options
Diffstat (limited to 'meta-security/recipes-ids')
4 files changed, 92 insertions, 5 deletions
diff --git a/meta-security/recipes-ids/samhain/files/fix-build-with-new-version-attr.patch b/meta-security/recipes-ids/samhain/files/fix-build-with-new-version-attr.patch new file mode 100644 index 000000000..eaf30dbba --- /dev/null +++ b/meta-security/recipes-ids/samhain/files/fix-build-with-new-version-attr.patch @@ -0,0 +1,73 @@ +From e67acafa62f71f0015ed548918b98ed0b1ded128 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Sun, 19 Jan 2020 15:53:48 +0800 +Subject: [PATCH] fix build with new version attr + +The attr/xattr.h has been removed from attr 2.4.48 with commit: +http://git.savannah.nongnu.org/cgit/attr.git/commit/include?id=7921157890d07858d092f4003ca4c6bae9fd2c38 +The xattr syscalls are provided by sys/xattr.h from glibc now. +Remove the checking code to adapt it. + +Upstream-Status: Pending + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + aclocal.m4 | 26 +++++++++++--------------- + src/sh_unix.c | 2 +- + 2 files changed, 12 insertions(+), 16 deletions(-) + +diff --git a/aclocal.m4 b/aclocal.m4 +index ee5b204..38cef8e 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -1453,23 +1453,19 @@ AC_DEFUN([sh_CHECK_POSIX_ACL], + + AC_DEFUN([sh_CHECK_XATTR], + [ +- AC_CHECK_HEADERS(attr/xattr.h) +- if test $ac_cv_header_attr_xattr_h = yes; then +- +- AC_CHECK_LIB([attr], [getxattr], sh_lattr=yes, sh_lattr=no) +- if test x"$sh_lattr" = xyes; then +- LIBATTR=-lattr +- else +- LIBATTR= +- fi +- +- OLDLIBS="$LIBS" +- LIBS="$LIBS $LIBATTR" +- AC_CHECK_FUNCS([getxattr lgetxattr fgetxattr], +- [sh_fattr=yes],[sh_fattr=no]) +- LIBS="$OLDLIBS" ++ AC_CHECK_LIB([attr], [getxattr], sh_lattr=yes, sh_lattr=no) ++ if test x"$sh_lattr" = xyes; then ++ LIBATTR=-lattr ++ else ++ LIBATTR= + fi + ++ OLDLIBS="$LIBS" ++ LIBS="$LIBS $LIBATTR" ++ AC_CHECK_FUNCS([getxattr lgetxattr fgetxattr], ++ [sh_fattr=yes],[sh_fattr=no]) ++ LIBS="$OLDLIBS" ++ + if test x"$sh_fattr" = xyes; then + AC_DEFINE(USE_XATTR, 1, [Define if you want extended attributes support.]) + LIBS="$LIBS $LIBATTR" +diff --git a/src/sh_unix.c b/src/sh_unix.c +index 3ede57f..ef236e9 100644 +--- a/src/sh_unix.c ++++ b/src/sh_unix.c +@@ -3681,7 +3681,7 @@ static char * sh_unix_getinfo_acl (char * path, int fd, struct stat * buf) + + #ifdef USE_XATTR + +-#include <attr/xattr.h> ++#include <sys/xattr.h> + static char * sh_unix_getinfo_xattr_int (char * path, int fd, char * name) + { + char * out = NULL; +-- +2.7.4 + diff --git a/meta-security/recipes-ids/samhain/files/samhain-server-volatiles.conf b/meta-security/recipes-ids/samhain/files/samhain-server-volatiles.conf new file mode 100644 index 000000000..f2ea39039 --- /dev/null +++ b/meta-security/recipes-ids/samhain/files/samhain-server-volatiles.conf @@ -0,0 +1 @@ +d /var/log/yule 0775 daemon daemon - diff --git a/meta-security/recipes-ids/samhain/samhain-server.bb b/meta-security/recipes-ids/samhain/samhain-server.bb index d304912e7..e7a3aa623 100644 --- a/meta-security/recipes-ids/samhain/samhain-server.bb +++ b/meta-security/recipes-ids/samhain/samhain-server.bb @@ -4,14 +4,22 @@ require samhain.inc DEPENDS = "gmp" -SRC_URI += "file://samhain-server-volatiles" +SRC_URI += "file://samhain-server-volatiles \ + file://samhain-server-volatiles.conf \ + " TARGET_CC_ARCH += "${LDFLAGS}" do_install_append() { - install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/samhain-server-volatiles \ - ${D}${sysconfdir}/default/volatiles/samhain-server + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/tmpfiles.d + install -m 0644 ${WORKDIR}/samhain-server-volatiles.conf \ + ${D}${sysconfdir}/tmpfiles.d/samhain-server.conf + else + install -d ${D}${sysconfdir}/default/volatiles + install -m 0644 ${WORKDIR}/samhain-server-volatiles \ + ${D}${sysconfdir}/default/volatiles/samhain-server + fi install -m 700 samhain-install.sh init/samhain.startLinux \ init/samhain.startLSB ${D}/var/lib/samhain diff --git a/meta-security/recipes-ids/samhain/samhain.inc b/meta-security/recipes-ids/samhain/samhain.inc index 16222ba10..b867bbc43 100644 --- a/meta-security/recipes-ids/samhain/samhain.inc +++ b/meta-security/recipes-ids/samhain/samhain.inc @@ -14,6 +14,7 @@ SRC_URI = "http://la-samhna.de/archive/samhain_signed-${PV}.tar.gz \ file://samhain-configure-add-option-for-ps.patch \ file://samhain-avoid-searching-host-for-postgresql.patch \ file://samhain-add-LDFLAGS-variable-for-samhain_setpwd.patch \ + file://fix-build-with-new-version-attr.patch \ file://${INITSCRIPT_NAME}.init \ file://${INITSCRIPT_NAME}.default \ file://samhain.service \ @@ -66,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 @@ -117,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} } @@ -158,6 +161,8 @@ do_install_append () { if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run fi + + rm -rf ${D}${localstatedir}/log } FILES_${PN} += "${systemd_system_unitdir}" |