diff options
-rw-r--r-- | meta-oe/recipes-security/audit/audit/0001-auparse-test-disable-some-test-cases.patch | 38 | ||||
-rw-r--r-- | meta-oe/recipes-security/audit/audit_4.1.2.bb (renamed from meta-oe/recipes-security/audit/audit_4.0.5.bb) | 3 |
2 files changed, 40 insertions, 1 deletions
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 @@ | |||
1 | From 003983a6e04a5e8d9373a96cb0a1c13caae9b193 Mon Sep 17 00:00:00 2001 | ||
2 | From: Yi Zhao <yi.zhao@windriver.com> | ||
3 | Date: Sat, 6 Sep 2025 14:04:40 +0800 | ||
4 | Subject: [PATCH] auparse/test: disable some test cases | ||
5 | |||
6 | Disable test cases databuf_test lru_cache_test and uid_name_wrap_test as | ||
7 | they can not be built with --disable-static configuration. See [1]. | ||
8 | |||
9 | [1]: https://github.com/linux-audit/audit-userspace/issues/494 | ||
10 | |||
11 | Upstream-Status: Inappropriate [embedded specific] | ||
12 | |||
13 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
14 | --- | ||
15 | auparse/test/Makefile.am | 6 +++--- | ||
16 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
17 | |||
18 | diff --git a/auparse/test/Makefile.am b/auparse/test/Makefile.am | ||
19 | index 06928438..dad75e76 100644 | ||
20 | --- a/auparse/test/Makefile.am | ||
21 | +++ b/auparse/test/Makefile.am | ||
22 | @@ -21,10 +21,10 @@ | ||
23 | # | ||
24 | |||
25 | CONFIG_CLEAN_FILES = *.loT *.rej *.orig *.cur | ||
26 | -noinst_PROGRAMS = auparse_test auparselol_test lookup_test databuf_test \ | ||
27 | - auparse_extra_test lru_cache_test uid_name_wrap_test | ||
28 | +noinst_PROGRAMS = auparse_test auparselol_test lookup_test \ | ||
29 | + auparse_extra_test | ||
30 | TESTS = run_auparse_tests.sh run_auparselol_test.sh lookup_test \ | ||
31 | - databuf_test auparse_extra_test lru_cache_test uid_name_wrap_test | ||
32 | + auparse_extra_test | ||
33 | dist_check_SCRIPTS = run_auparse_tests.sh run_auparselol_test.sh | ||
34 | 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 | ||
35 | CLEANFILES = run_auparse_tests.sh run_auparselol_test.sh | ||
36 | -- | ||
37 | 2.34.1 | ||
38 | |||
diff --git a/meta-oe/recipes-security/audit/audit_4.0.5.bb b/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" | |||
9 | 9 | ||
10 | SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=master;protocol=https \ | 10 | SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=master;protocol=https \ |
11 | file://0001-Fixed-swig-host-contamination-issue.patch \ | 11 | file://0001-Fixed-swig-host-contamination-issue.patch \ |
12 | file://0001-auparse-test-disable-some-test-cases.patch \ | ||
12 | file://auditd \ | 13 | file://auditd \ |
13 | " | 14 | " |
14 | 15 | ||
15 | SRCREV = "97c4ec3d68b5b199f2796d1e126c2144506bd228" | 16 | SRCREV = "4db9c700b0c8b24a8113bc00d98101228e7d0212" |
16 | 17 | ||
17 | inherit autotools python3targetconfig update-rc.d systemd | 18 | inherit autotools python3targetconfig update-rc.d systemd |
18 | 19 | ||