diff options
Diffstat (limited to 'meta-security/recipes-ids/aide')
| -rw-r--r-- | meta-security/recipes-ids/aide/aide/m4_allow.patch | 40 | ||||
| -rw-r--r-- | meta-security/recipes-ids/aide/aide_0.18.8.bb (renamed from meta-security/recipes-ids/aide/aide_0.17.4.bb) | 16 |
2 files changed, 49 insertions, 7 deletions
diff --git a/meta-security/recipes-ids/aide/aide/m4_allow.patch b/meta-security/recipes-ids/aide/aide/m4_allow.patch new file mode 100644 index 0000000000..6f0b97bfdc --- /dev/null +++ b/meta-security/recipes-ids/aide/aide/m4_allow.patch @@ -0,0 +1,40 @@ +Fixes build issues + +Upstream-Status: Inappropriate [next version has many changes to configure.ac] +Signed-off-by: Armin Kuster <akuster@mvista.com> + +Index: aide-0.18.8/configure.ac +=================================================================== +--- aide-0.18.8.orig/configure.ac ++++ aide-0.18.8/configure.ac +@@ -14,6 +14,7 @@ dnl The name of the configure h-file. + AC_CONFIG_HEADERS(include/config.h) + + dnl Checks for programs. ++m4_pattern_allow([AC_MSG_ERROR]) + AC_PROG_CC + if test "x$ac_cv_prog_cc_c99" = xno; then + AC_MSG_ERROR([AIDE needs a C99 compatible compiler]) +@@ -246,6 +247,7 @@ if test "$aide_static_choice" != "yes"; + fi + + dnl This macro is new in autoconf-2.13 ++m4_pattern_allow([AC_DEFINE]) + AC_SEARCH_LIBS(syslog, bsd socket inet, [AC_DEFINE(HAVE_SYSLOG,1,[syslog available?])]) + AC_CHECK_FUNCS(vsyslog) + +@@ -320,14 +322,10 @@ fi + AC_CHECK_HEADERS(syslog.h inttypes.h fcntl.h ctype.h) + + AIDE_PKG_CHECK_MANDATORY(pcre2, PCRE2, libpcre2-8) +- + AC_MSG_CHECKING(for pthread for multithreading) + AC_ARG_WITH([pthread], AS_HELP_STRING([--with-pthread], [use pthread for multithreading (default: yes)]), [with_pthread=$withval], [with_pthread=yes]) + AC_MSG_RESULT([$with_pthread]) + compoptionstring="${compoptionstring}use pthread: $with_pthread\\n" +-AS_IF([test x"$with_pthread" = xyes], [ +- AX_PTHREAD([AC_DEFINE(WITH_PTHREAD,1,[use pthread])], [AC_MSG_ERROR([AIDE requires pthread])]) +-]) + + AIDE_PKG_CHECK(zlib, zlib compression, yes, ZLIB, zlib) + diff --git a/meta-security/recipes-ids/aide/aide_0.17.4.bb b/meta-security/recipes-ids/aide/aide_0.18.8.bb index 52ddc43ff8..e2014a1ea6 100644 --- a/meta-security/recipes-ids/aide/aide_0.17.4.bb +++ b/meta-security/recipes-ids/aide/aide_0.18.8.bb @@ -3,18 +3,20 @@ HOMEPAGE = "https://aide.github.io" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" LICENSE = "GPL-2.0-only" -DEPENDS = "bison-native libpcre" +DEPENDS = "bison-native libpcre2" SRC_URI = "https://github.com/aide/aide/releases/download/v${PV}/${BPN}-${PV}.tar.gz \ - file://aide.conf" + file://aide.conf \ + file://m4_allow.patch \ + " -SRC_URI[sha256sum] = "c81505246f3ffc2e76036d43a77212ae82895b5881d9b9e25c1361b1a9b7a846" +SRC_URI[sha256sum] = "16662dc632d17e2c5630b801752f97912a8e22697c065ebde175f1cc37b83a60" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" inherit autotools pkgconfig aide-base -PACKAGECONFIG ??=" mhash zlib e2fsattrs posix capabilities curl \ +PACKAGECONFIG ??=" gcrypt zlib e2fsattrs posix capabilities curl pthread \ ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux audit', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'xattr', '', d)} \ " @@ -28,14 +30,14 @@ PACKAGECONFIG[mhash] = "--with-mhash, --without-mhash, libmhash, libmhash" PACKAGECONFIG[e2fsattrs] = "--with-e2fsattrs, --without-e2fsattrs, e2fsprogs, e2fsprogs" PACKAGECONFIG[capabilities] = "--with-capabilities, --without-capabilities, libcap, libcap" PACKAGECONFIG[posix] = "--with-posix-acl, --without-posix-acl, acl, acl" - +PACKAGECONFIG[pthread] = "--with-pthread," do_install[nostamp] = "1" do_install:append () { install -d ${D}${libdir}/${PN}/logs install -d ${D}${sysconfdir} - install ${WORKDIR}/aide.conf ${D}${sysconfdir}/ + install ${UNPACKDIR}/aide.conf ${D}${sysconfdir}/ for dir in ${AIDE_INCLUDE_DIRS}; do echo "${dir} NORMAL" >> ${D}${sysconfdir}/aide.conf @@ -50,7 +52,7 @@ do_install:class-native () { install -d ${STAGING_AIDE_DIR}/lib/logs install ${B}/aide ${STAGING_AIDE_DIR}/bin - install ${WORKDIR}/aide.conf ${STAGING_AIDE_DIR}/ + install ${UNPACKDIR}/aide.conf ${STAGING_AIDE_DIR}/ sed -i -s "s:\@\@define DBDIR.*:\@\@define DBDIR ${STAGING_AIDE_DIR}/lib:" ${STAGING_AIDE_DIR}/aide.conf sed -i -e "s:\@\@define LOGDIR.*:\@\@define LOGDIR ${STAGING_AIDE_DIR}/lib/logs:" ${STAGING_AIDE_DIR}/aide.conf |