diff --git a/meta-oe/recipes-security/audit/audit/Fixed-swig-host-contamination-issue.patch b/meta-oe/recipes-security/audit/audit/0001-Fixed-swig-host-contamination-issue.patch similarity index 73% rename from meta-oe/recipes-security/audit/audit/Fixed-swig-host-contamination-issue.patch rename to meta-oe/recipes-security/audit/audit/0001-Fixed-swig-host-contamination-issue.patch index b023c80ae4..5f2ecc1417 100644 --- a/meta-oe/recipes-security/audit/audit/Fixed-swig-host-contamination-issue.patch +++ b/meta-oe/recipes-security/audit/audit/0001-Fixed-swig-host-contamination-issue.patch @@ -1,7 +1,7 @@ -From 3d13f92c1bb293523670ba01aea7e655b00a6709 Mon Sep 17 00:00:00 2001 +From 9a32d42dfc6713fd0085dd4563a934afc30ec097 Mon Sep 17 00:00:00 2001 From: Li xin Date: Sun, 19 Jul 2015 02:42:58 +0900 -Subject: [PATCH] audit: Fixed swig host contamination issue +Subject: [PATCH] Fixed swig host contamination issue The audit build uses swig to generate a python wrapper. Unfortunately, the swig info file references host include @@ -18,6 +18,8 @@ Signed-off-by: Yi Zhao bindings/swig/src/auditswig.i | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) +diff --git a/bindings/swig/python3/Makefile.am b/bindings/swig/python3/Makefile.am +index 6131e80d..2fb7207b 100644 --- a/bindings/swig/python3/Makefile.am +++ b/bindings/swig/python3/Makefile.am @@ -23,6 +23,7 @@ @@ -28,7 +30,7 @@ Signed-off-by: Yi Zhao LIBS = $(top_builddir)/lib/libaudit.la SWIG_FLAGS = -python -py3 -modern SWIG_INCLUDES = -I. -I$(top_builddir) -I${top_srcdir}/lib $(PYTHON3_INCLUDES) -@@ -37,7 +38,7 @@ _audit_la_DEPENDENCIES =${top_srcdir}/li +@@ -37,7 +38,7 @@ _audit_la_DEPENDENCIES =${top_srcdir}/lib/libaudit.h ${top_builddir}/lib/libaudi _audit_la_LIBADD = ${top_builddir}/lib/libaudit.la nodist__audit_la_SOURCES = audit_wrap.c audit.py audit_wrap.c: ${srcdir}/../src/auditswig.i @@ -37,14 +39,19 @@ Signed-off-by: Yi Zhao CLEANFILES = audit.py* audit_wrap.c *~ +diff --git a/bindings/swig/src/auditswig.i b/bindings/swig/src/auditswig.i +index 9a2c5661..6cbb7295 100644 --- a/bindings/swig/src/auditswig.i +++ b/bindings/swig/src/auditswig.i -@@ -39,7 +39,7 @@ signed - #define __attribute(X) /*nothing*/ - typedef unsigned __u32; - typedef unsigned uid_t; +@@ -43,7 +43,7 @@ typedef unsigned uid_t; + * generating setters against them: https://github.com/swig/swig/issues/1699 + */ + %ignore audit_rule_data::buf; -%include "/usr/include/linux/audit.h" +%include "../lib/audit.h" #define __extension__ /*nothing*/ %include %include "../lib/libaudit.h" +-- +2.25.1 + diff --git a/meta-oe/recipes-security/audit/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch b/meta-oe/recipes-security/audit/audit/0002-Replace-__attribute_malloc__-with-__attribute__-__ma.patch similarity index 81% rename from meta-oe/recipes-security/audit/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch rename to meta-oe/recipes-security/audit/audit/0002-Replace-__attribute_malloc__-with-__attribute__-__ma.patch index 23747c45f0..7f0af74a8c 100644 --- a/meta-oe/recipes-security/audit/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch +++ b/meta-oe/recipes-security/audit/audit/0002-Replace-__attribute_malloc__-with-__attribute__-__ma.patch @@ -1,8 +1,7 @@ -From 79c8d6a2755c9dfa00a5e86378e89a94eef0504d Mon Sep 17 00:00:00 2001 +From 679cb57fa93984fed345dd3890cdbcbaa24e8518 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__)) +Subject: [PATCH] Replace __attribute_malloc__ with __attribute__((__malloc__)) __attribute_malloc__ is not available on musl @@ -11,18 +10,18 @@ Fixes | __attribute_malloc__ __attr_dealloc (auparse_destroy, 1); | ^ -Signed-off-by: Khem Raj ---- Upstream-Status: Pending +Signed-off-by: Khem Raj +--- 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 +index 5cb7402e..39156eff 100644 --- a/auparse/auparse.h +++ b/auparse/auparse.h -@@ -51,7 +51,7 @@ typedef void (*auparse_callback_ptr)(auparse_state_t *au, +@@ -54,7 +54,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) @@ -32,5 +31,5 @@ index 95cf256d..c7dbe5ff 100644 __attr_access ((__read_only__, 2, 3)); int auparse_feed(auparse_state_t *au, const char *data, size_t data_len) -- -2.37.1 +2.25.1 diff --git a/meta-oe/recipes-security/audit/audit_3.1.1.bb b/meta-oe/recipes-security/audit/audit_3.1.2.bb similarity index 95% rename from meta-oe/recipes-security/audit/audit_3.1.1.bb rename to meta-oe/recipes-security/audit/audit_3.1.2.bb index 7ed2fd2dec..5380e90223 100644 --- a/meta-oe/recipes-security/audit/audit_3.1.1.bb +++ b/meta-oe/recipes-security/audit/audit_3.1.2.bb @@ -8,15 +8,15 @@ LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later" 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://0001-Fixed-swig-host-contamination-issue.patch \ + file://0002-Replace-__attribute_malloc__-with-__attribute__-__ma.patch \ file://auditd \ file://auditd.service \ file://audit-volatile.conf \ " S = "${WORKDIR}/git" -SRCREV = "6e367585a899231da05797c6126f8bb01febb2f5" +SRCREV = "572eb7d4fe926e7c1c52166d08e78af54877cbc5" inherit autotools python3targetconfig update-rc.d systemd