NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/audit: update musl fix

Browse Source 
Upstream proposed a different fix:
https://github.com/linux-audit/audit-userspace/pull/311#issuecomment-1609953611

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Bernd Kuhls 2023-06-27 20:25:38 +02:00 committed by Thomas Petazzoni
parent bca9d7e58a
commit 2d9ccbcd10
2 changed files with 35 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
package/audit/0001-Define-__attribute_malloc__-when-needed.patch Normal file
View File

@ -0,0 +1,35 @@
From cf93d8579d5cec0b1ba585bd661776f03c2743ba Mon Sep 17 00:00:00 2001
From: Bernd Kuhls <bernd@kuhls.net>
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 <bernd@kuhls.net>
---
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

39
package/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch
View File

@ -1,39 +0,0 @@
From 79c8d6a2755c9dfa00a5e86378e89a94eef0504d 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);
| ^
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream: https://github.com/linux-audit/audit-userspace/pull/311
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
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