From 831041c60ada1bc995f7fc6ef3b0391ce3ac5124 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Fri, 22 Mar 2024 17:30:44 +0800 Subject: [PATCH] audit: upgrade 4.0 -> 4.0.1 ChangeLog: https://github.com/linux-audit/audit-userspace/releases/tag/v4.0.1 Update TRUSTED_APP interpretation to look for known fields; In auditd plugins, allow variable amount of arguments; Fix augenrules to work correctly when kernel is in immutable mode; Add audisp-filter plugin; Improve sorting speed of aureport --summary reports; Auditd & audit-rules.service pick up paths automatically. * Drop backport patch. * Specify runstatedir. Signed-off-by: Yi Zhao Signed-off-by: Khem Raj --- .../0002-Add-attribute-declarations.patch | 35 ------------------- .../audit/{audit_4.0.bb => audit_4.0.1.bb} | 4 +-- 2 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 meta-oe/recipes-security/audit/audit/0002-Add-attribute-declarations.patch rename meta-oe/recipes-security/audit/{audit_4.0.bb => audit_4.0.1.bb} (97%) diff --git a/meta-oe/recipes-security/audit/audit/0002-Add-attribute-declarations.patch b/meta-oe/recipes-security/audit/audit/0002-Add-attribute-declarations.patch deleted file mode 100644 index 349142580a..0000000000 --- a/meta-oe/recipes-security/audit/audit/0002-Add-attribute-declarations.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 64cb48e1e5137b8a389c7528e611617a98389bc7 Mon Sep 17 00:00:00 2001 -From: Steve Grubb -Date: Thu, 25 Jan 2024 15:14:51 -0500 -Subject: [PATCH] Add attribute declarations - -Upstream-Status: Backport -[https://github.com/linux-audit/audit-userspace/commit/64cb48e1e5137b8a389c7528e611617a98389bc7] - -Signed-off-by: Yi Zhao ---- - audisp/plugins/remote/queue.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/audisp/plugins/remote/queue.h b/audisp/plugins/remote/queue.h -index 36b70d04..2c70e839 100644 ---- a/audisp/plugins/remote/queue.h -+++ b/audisp/plugins/remote/queue.h -@@ -1,5 +1,5 @@ - /* queue.h -- a queue abstraction -- * Copyright 2009, 2011 Red Hat Inc., Durham, North Carolina. -+ * Copyright 2009, 2011 Red Hat Inc. - * All Rights Reserved. - * - * This library is free software; you can redistribute it and/or -@@ -25,6 +25,7 @@ - #define QUEUE_HEADER - - #include -+#include "common.h" // attribute decls - - struct queue; - --- -2.25.1 - diff --git a/meta-oe/recipes-security/audit/audit_4.0.bb b/meta-oe/recipes-security/audit/audit_4.0.1.bb similarity index 97% rename from meta-oe/recipes-security/audit/audit_4.0.bb rename to meta-oe/recipes-security/audit/audit_4.0.1.bb index c8ab0d880d..96ed6ff3d0 100644 --- a/meta-oe/recipes-security/audit/audit_4.0.bb +++ b/meta-oe/recipes-security/audit/audit_4.0.1.bb @@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=master;protocol=https \ file://0001-Fixed-swig-host-contamination-issue.patch \ - file://0002-Add-attribute-declarations.patch \ file://auditd \ file://audit-volatile.conf \ " @@ -17,7 +16,7 @@ SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=master;proto SRC_URI:append:libc-musl = " file://0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch" S = "${WORKDIR}/git" -SRCREV = "ae7d2830391c1115cebff6340ef3130b1b03ce45" +SRCREV = "22ccbd984e493524050ac445f796e9a7e90e1149" inherit autotools python3targetconfig update-rc.d systemd @@ -40,6 +39,7 @@ EXTRA_OECONF = " \ --disable-gssapi-krb5 \ --disable-zos-remote \ --sbindir=${base_sbindir} \ + --runstatedir=/run \ " EXTRA_OEMAKE = " \