From 203087eb7031085d57f34a9e7fa94e1ee32929c3 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Sun, 26 Apr 2026 05:30:20 +0300 Subject: [PATCH] aide: Upgrade to 0.19.3 Release notes: https://github.com/aide/aide/releases/tag/v0.19 https://github.com/aide/aide/releases/tag/v0.19.1 https://github.com/aide/aide/releases/tag/v0.19.2 https://github.com/aide/aide/releases/tag/v0.19.3 Signed-off-by: Scott Murray --- .../aide/aide/0001-Fixes-build-issues.patch | 37 +++++++++++++++++ recipes-ids/aide/aide/m4_allow.patch | 40 ------------------- .../aide/{aide_0.18.8.bb => aide_0.19.3.bb} | 15 ++++--- 3 files changed, 44 insertions(+), 48 deletions(-) create mode 100644 recipes-ids/aide/aide/0001-Fixes-build-issues.patch delete mode 100644 recipes-ids/aide/aide/m4_allow.patch rename recipes-ids/aide/{aide_0.18.8.bb => aide_0.19.3.bb} (85%) diff --git a/recipes-ids/aide/aide/0001-Fixes-build-issues.patch b/recipes-ids/aide/aide/0001-Fixes-build-issues.patch new file mode 100644 index 0000000..399df76 --- /dev/null +++ b/recipes-ids/aide/aide/0001-Fixes-build-issues.patch @@ -0,0 +1,37 @@ +From d7c7cb223ddb8b816332532c9d8f79f3ba16c911 Mon Sep 17 00:00:00 2001 +From: Scott Murray +Date: Sun, 26 Apr 2026 05:15:36 +0300 +Subject: [PATCH] Fixes build issues + +Upstream-Status: Inappropriate [next version has many changes to configure.ac] +Signed-off-by: Armin Kuster +(Updated for 0.19.3) +Signed-off-by: Scott Murray +--- + configure.ac | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index eb39aaa..c538c58 100644 +--- a/configure.ac ++++ b/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]) +@@ -282,8 +283,6 @@ AC_CHECK_HEADERS(syslog.h inttypes.h fcntl.h ctype.h) + + AIDE_PKG_CHECK_MANDATORY(pcre2, PCRE2, libpcre2-8) + +-AX_PTHREAD(compoptionstring="${compoptionstring}use pthread: mandatory\\n", [AC_MSG_ERROR([AIDE requires pthread])]) +- + AC_ARG_WITH([fstype], + AS_HELP_STRING([--without-fstype], + [Disable file system type support for restricted rules (Linux only)]), +-- +2.47.3 + diff --git a/recipes-ids/aide/aide/m4_allow.patch b/recipes-ids/aide/aide/m4_allow.patch deleted file mode 100644 index 6f0b97b..0000000 --- a/recipes-ids/aide/aide/m4_allow.patch +++ /dev/null @@ -1,40 +0,0 @@ -Fixes build issues - -Upstream-Status: Inappropriate [next version has many changes to configure.ac] -Signed-off-by: Armin Kuster - -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/recipes-ids/aide/aide_0.18.8.bb b/recipes-ids/aide/aide_0.19.3.bb similarity index 85% rename from recipes-ids/aide/aide_0.18.8.bb rename to recipes-ids/aide/aide_0.19.3.bb index 2912cb2..9a94ce2 100644 --- a/recipes-ids/aide/aide_0.18.8.bb +++ b/recipes-ids/aide/aide_0.19.3.bb @@ -6,17 +6,17 @@ LICENSE = "GPL-2.0-only" DEPENDS = "bison-native libpcre2" SRC_URI = "https://github.com/aide/aide/releases/download/v${PV}/${BPN}-${PV}.tar.gz \ + file://0001-Fixes-build-issues.patch \ file://aide.conf \ - file://m4_allow.patch \ - " +" -SRC_URI[sha256sum] = "16662dc632d17e2c5630b801752f97912a8e22697c065ebde175f1cc37b83a60" +SRC_URI[sha256sum] = "6513170bb5b8c22802dd1b72f02d8aa9f432aef2b4470522db03e755212a3f47" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" inherit autotools pkgconfig aide-base -PACKAGECONFIG ??= " gcrypt zlib e2fsattrs posix capabilities curl pthread \ +PACKAGECONFIG ??= " nettle zlib e2fsattrs posix-acl capabilities curl \ ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux audit', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'xattr', '', d)} \ " @@ -25,12 +25,11 @@ PACKAGECONFIG[zlib] = "--with-zlib, --without-zlib, zlib, zlib " PACKAGECONFIG[xattr] = "--with-xattr, --without-xattr, attr, attr" PACKAGECONFIG[curl] = "--with-curl, --without-curl, curl, libcurl" PACKAGECONFIG[audit] = "--with-audit, --without-audit,audit" -PACKAGECONFIG[gcrypt] = "--with-gcrypt, --without-gcrypt, libgcrypt, libgcrypt" -PACKAGECONFIG[mhash] = "--with-mhash, --without-mhash, libmhash, libmhash" +PACKAGECONFIG[gcrypt] = "--with-gcrypt, --without-gcrypt, libgcrypt, libgcrypt, , nettle" +PACKAGECONFIG[nettle] = "--with-nettle, --without-nettle, nettle, nettle, , gcrypt" 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," +PACKAGECONFIG[posix-acl] = "--with-posix-acl, --without-posix-acl, acl, acl" do_install[nostamp] = "1"