diff mbox series

[meta-oe] audit: upgrade 4.0.5 -> 4.1.2

Message ID 20250906130231.2936481-1-yi.zhao@windriver.com
State Under Review
Headers show
Series [meta-oe] audit: upgrade 4.0.5 -> 4.1.2 | expand

Commit Message

Yi Zhao Sept. 6, 2025, 1:02 p.m. UTC 
ChangeLog:
https://github.com/linux-audit/audit-userspace/releases/tag/v4.1.0
https://github.com/linux-audit/audit-userspace/releases/tag/v4.1.1
https://github.com/linux-audit/audit-userspace/releases/tag/v4.1.2

Disable some test cases in auparse/test as they can not be built with
--disable-static configuration.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 ...auparse-test-disable-some-test-cases.patch | 38 +++++++++++++++++++
 .../audit/{audit_4.0.5.bb => audit_4.1.2.bb}  |  3 +-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-security/audit/audit/0001-auparse-test-disable-some-test-cases.patch
 rename meta-oe/recipes-security/audit/{audit_4.0.5.bb => audit_4.1.2.bb} (96%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-security/audit/audit/0001-auparse-test-disable-some-test-cases.patch b/meta-oe/recipes-security/audit/audit/0001-auparse-test-disable-some-test-cases.patch
new file mode 100644
index 0000000000..fb9a901f3c
--- /dev/null
+++ b/meta-oe/recipes-security/audit/audit/0001-auparse-test-disable-some-test-cases.patch
@@ -0,0 +1,38 @@ 
+From 003983a6e04a5e8d9373a96cb0a1c13caae9b193 Mon Sep 17 00:00:00 2001
+From: Yi Zhao <yi.zhao@windriver.com>
+Date: Sat, 6 Sep 2025 14:04:40 +0800
+Subject: [PATCH] auparse/test: disable some test cases
+
+Disable test cases databuf_test lru_cache_test and uid_name_wrap_test as
+they can not be built with --disable-static configuration. See [1].
+
+[1]: https://github.com/linux-audit/audit-userspace/issues/494
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+---
+ auparse/test/Makefile.am | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/auparse/test/Makefile.am b/auparse/test/Makefile.am
+index 06928438..dad75e76 100644
+--- a/auparse/test/Makefile.am
++++ b/auparse/test/Makefile.am
+@@ -21,10 +21,10 @@
+ #
+ 
+ CONFIG_CLEAN_FILES = *.loT *.rej *.orig *.cur
+-noinst_PROGRAMS = auparse_test auparselol_test lookup_test databuf_test \
+-	auparse_extra_test lru_cache_test uid_name_wrap_test
++noinst_PROGRAMS = auparse_test auparselol_test lookup_test \
++	auparse_extra_test
+ TESTS = run_auparse_tests.sh run_auparselol_test.sh lookup_test \
+-	databuf_test auparse_extra_test lru_cache_test uid_name_wrap_test
++	auparse_extra_test
+ dist_check_SCRIPTS = run_auparse_tests.sh run_auparselol_test.sh
+ EXTRA_DIST = auparse_test.ref auparse_test.ref.py test.log test2.log test3.log test4.log auditd_raw.sed run_auparse_tests.sh auparse_test.py run_auparselol_test.sh
+ CLEANFILES = run_auparse_tests.sh run_auparselol_test.sh
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-security/audit/audit_4.0.5.bb b/meta-oe/recipes-security/audit/audit_4.1.2.bb
similarity index 96%
rename from meta-oe/recipes-security/audit/audit_4.0.5.bb
rename to meta-oe/recipes-security/audit/audit_4.1.2.bb
index 58100b206d..2cd28e85f1 100644
--- a/meta-oe/recipes-security/audit/audit_4.0.5.bb
+++ b/meta-oe/recipes-security/audit/audit_4.1.2.bb
@@ -9,10 +9,11 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=master;protocol=https \
            file://0001-Fixed-swig-host-contamination-issue.patch \
+           file://0001-auparse-test-disable-some-test-cases.patch \
            file://auditd \
           "
 
-SRCREV = "97c4ec3d68b5b199f2796d1e126c2144506bd228"
+SRCREV = "4db9c700b0c8b24a8113bc00d98101228e7d0212"
 
 inherit autotools python3targetconfig update-rc.d systemd