deleted file mode 100644
@@ -1,49 +0,0 @@
-From 88c9b2c5cebebf13f90890baebbadc60d9fe8d16 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 9 Aug 2022 23:57:03 -0700
-Subject: [PATCH] Replace __attribute_malloc__ with __attribute__((__malloc__))
-
-__attribute_malloc__ is not available on musl
-
-Fixes
-| ../../git/auparse/auparse.h:54:2: error: expected function body after function declarator
-| __attribute_malloc__ __attr_dealloc (auparse_destroy, 1);
-| ^
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- audisp/plugins/remote/queue.h | 2 +-
- auparse/auparse.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/audisp/plugins/remote/queue.h b/audisp/plugins/remote/queue.h
-index 36b70d04..031507dc 100644
---- a/audisp/plugins/remote/queue.h
-+++ b/audisp/plugins/remote/queue.h
-@@ -53,7 +53,7 @@ void q_close(struct queue *q);
- * On error, return NULL and set errno. */
- struct queue *q_open(int q_flags, const char *path, size_t num_entries,
- size_t entry_size)
-- __attribute_malloc__ __attr_dealloc (q_close, 1) __wur;
-+ __attribute__((__malloc__)) __attr_dealloc (q_close, 1) __wur;
-
- /* Add DATA to tail of Q. Return 0 on success, -1 on error and set errno. */
- int q_append(struct queue *q, const char *data);
-diff --git a/auparse/auparse.h b/auparse/auparse.h
-index c27f1ff9..87c52965 100644
---- a/auparse/auparse.h
-+++ b/auparse/auparse.h
-@@ -55,7 +55,7 @@ typedef void (*auparse_callback_ptr)(auparse_state_t *au,
- void auparse_destroy(auparse_state_t *au);
- void auparse_destroy_ext(auparse_state_t *au, auparse_destroy_what_t what);
- auparse_state_t *auparse_init(ausource_t source, const void *b)
-- __attribute_malloc__ __attr_dealloc (auparse_destroy, 1);
-+ __attribute__((__malloc__)) __attr_dealloc (auparse_destroy, 1);
- int auparse_new_buffer(auparse_state_t *au, const char *data, size_t data_len)
- __attr_access ((__read_only__, 2, 3));
- int auparse_feed(auparse_state_t *au, const char *data, size_t data_len)
-2.25.1
-
similarity index 96%
rename from meta-oe/recipes-security/audit/audit_4.0.1.bb
rename to meta-oe/recipes-security/audit/audit_4.0.2.bb
@@ -13,10 +13,8 @@ SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=master;proto
file://audit-volatile.conf \
"
-SRC_URI:append:libc-musl = " file://0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch"
-
S = "${WORKDIR}/git"
-SRCREV = "22ccbd984e493524050ac445f796e9a7e90e1149"
+SRCREV = "4e6deae41d4646d28bb3ba9524a8a227a38ccd0b"
inherit autotools python3targetconfig update-rc.d systemd
ChangeLog: - Fix musl C builds - Many code cleanups - Use atomic variables if available for signal related flags - Dont rotate audit logs when auditd is in debug mode - Fix a couple memory leaks on error paths - Correct output when displaying rules with exe/path/dir - Fix auparse lookup test to not use the system libaupaurse - Improve auparse metrics - Update auparse normalizer for recent syscalls - Make status report uniform Drop 0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch as the issue has been fixed upstream. Signed-off-by: Yi Zhao <yi.zhao@windriver.com> --- ...ute_malloc__-with-__attribute__-__ma.patch | 49 ------------------- .../audit/{audit_4.0.1.bb => audit_4.0.2.bb} | 4 +- 2 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 meta-oe/recipes-security/audit/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch rename meta-oe/recipes-security/audit/{audit_4.0.1.bb => audit_4.0.2.bb} (96%)