diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2022-08-09 23:59:51 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2022-08-10 08:48:30 -0700 |
| commit | ad978133a1a10d609bb2545882a2f720a2572f3d (patch) | |
| tree | cfcab0160c5268a9f11ed5ebfebbc7b807aa2cf3 | |
| parent | 0f8dced8c7b76a41af211d57add34f5284e9733e (diff) | |
| download | meta-openembedded-ad978133a1a10d609bb2545882a2f720a2572f3d.tar.gz | |
audit: Fix build with musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-security/audit/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch | 34 | ||||
| -rw-r--r-- | meta-oe/recipes-security/audit/audit_3.0.8.bb | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/meta-oe/recipes-security/audit/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch b/meta-oe/recipes-security/audit/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch new file mode 100644 index 0000000000..c2080e156d --- /dev/null +++ b/meta-oe/recipes-security/audit/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch @@ -0,0 +1,34 @@ +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> +--- + 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 + diff --git a/meta-oe/recipes-security/audit/audit_3.0.8.bb b/meta-oe/recipes-security/audit/audit_3.0.8.bb index 3dbfc9e604..28d7d01764 100644 --- a/meta-oe/recipes-security/audit/audit_3.0.8.bb +++ b/meta-oe/recipes-security/audit/audit_3.0.8.bb @@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=master;protocol=https \ file://Fixed-swig-host-contamination-issue.patch \ + file://0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch \ file://auditd \ file://auditd.service \ file://audit-volatile.conf \ |