From 2d9ccbcd109e69e341864c975f593cedb2ec6ae8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 27 Jun 2023 20:25:38 +0200 Subject: [PATCH] package/audit: update musl fix Upstream proposed a different fix: https://github.com/linux-audit/audit-userspace/pull/311#issuecomment-1609953611 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- ...ine-__attribute_malloc__-when-needed.patch | 35 +++++++++++++++++ ...ute_malloc__-with-__attribute__-__ma.patch | 39 ------------------- 2 files changed, 35 insertions(+), 39 deletions(-) create mode 100644 package/audit/0001-Define-__attribute_malloc__-when-needed.patch delete mode 100644 package/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch diff --git a/package/audit/0001-Define-__attribute_malloc__-when-needed.patch b/package/audit/0001-Define-__attribute_malloc__-when-needed.patch new file mode 100644 index 0000000000..3dd5359bfc --- /dev/null +++ b/package/audit/0001-Define-__attribute_malloc__-when-needed.patch @@ -0,0 +1,35 @@ +From cf93d8579d5cec0b1ba585bd661776f03c2743ba Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Tue, 27 Jun 2023 20:19:13 +0200 +Subject: [PATCH] Define __attribute_malloc__ when needed + +attribute_malloc is not available on musl + +auparse.h: In function 'auparse_init': +auparse.h:54:2: error: expected declaration specifiers before '__attribute_malloc__' + 54 | __attribute_malloc__ __attr_dealloc (auparse_destroy, 1); + +Upstream: https://github.com/linux-audit/audit-userspace/pull/311 + +Signed-off-by: Bernd Kuhls +--- + auparse/auparse.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/auparse/auparse.h b/auparse/auparse.h +index 95cf256d..5cb7402e 100644 +--- a/auparse/auparse.h ++++ b/auparse/auparse.h +@@ -32,6 +32,9 @@ + # define __attr_dealloc(dealloc, argno) + # define __attr_dealloc_free + #endif ++#ifndef __attribute_malloc__ ++# define __attribute_malloc__ ++#endif + + #ifdef __cplusplus + extern "C" { +-- +2.39.2 + diff --git a/package/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch b/package/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch deleted file mode 100644 index 1a276ca2df..0000000000 --- a/package/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 79c8d6a2755c9dfa00a5e86378e89a94eef0504d Mon Sep 17 00:00:00 2001 -From: Khem Raj -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); -| ^ - -Signed-off-by: Khem Raj - -Upstream: https://github.com/linux-audit/audit-userspace/pull/311 - -Signed-off-by: Bernd Kuhls ---- - - auparse/auparse.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/auparse/auparse.h b/auparse/auparse.h -index 95cf256d..c7dbe5ff 100644 ---- a/auparse/auparse.h -+++ b/auparse/auparse.h -@@ -51,7 +51,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.37.1 -