summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2021-03-02 16:52:03 +0800
committerJoe MacDonald <joe@deserted.net>2021-03-03 13:55:58 -0500
commitbf62d604fb804cac39638a2336c473249bd4db24 (patch)
tree9322d8c6990b490d724d006667a71d76ab49088e
parent77009a63dbb0f7b4d37512161d10a543a388b08b (diff)
downloadmeta-selinux-bf62d604fb804cac39638a2336c473249bd4db24.tar.gz
audit: upgrade 3.0 -> 3.0.1
Drop backported patch: 0001-lib-arm_table.h-update-arm-syscall-table.patch Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Joe MacDonald <joe@deserted.net>
-rw-r--r--recipes-security/audit/audit/0001-lib-arm_table.h-update-arm-syscall-table.patch49
-rw-r--r--recipes-security/audit/audit_3.0.1.bb (renamed from recipes-security/audit/audit_3.0.bb)3
2 files changed, 1 insertions, 51 deletions
diff --git a/recipes-security/audit/audit/0001-lib-arm_table.h-update-arm-syscall-table.patch b/recipes-security/audit/audit/0001-lib-arm_table.h-update-arm-syscall-table.patch
deleted file mode 100644
index 2d91aaf..0000000
--- a/recipes-security/audit/audit/0001-lib-arm_table.h-update-arm-syscall-table.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1From b75eb0db2aed045787b8bf326c7a78e61855af32 Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Mon, 11 Jan 2021 10:25:42 +0800
4Subject: [PATCH] lib/arm_table.h: update arm syscall table
5
6Refer to Glibc 2.32, add *_time64 syscalls.
7
8Upstream-Status: Backport
9[https://github.com/linux-audit/audit-userspace/commit/e7b4006239b5e2c1df7d501a422e39be79a13dc2]
10
11Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
12---
13 lib/arm_table.h | 20 ++++++++++++++++++++
14 1 file changed, 20 insertions(+)
15
16diff --git a/lib/arm_table.h b/lib/arm_table.h
17index 51a0792..5b0da7d 100644
18--- a/lib/arm_table.h
19+++ b/lib/arm_table.h
20@@ -385,6 +385,26 @@ _S(398, "rseq")
21 _S(399, "io_pgetevents")
22 _S(400, "migrate_pages")
23 _S(401, "kexec_file_load")
24+_S(403, "clock_gettime64")
25+_S(404, "clock_settime64")
26+_S(405, "clock_adjtime64")
27+_S(406, "clock_getres_time64")
28+_S(407, "clock_nanosleep_time64")
29+_S(408, "timer_gettime64")
30+_S(409, "timer_settime64")
31+_S(410, "timerfd_gettime64")
32+_S(411, "timerfd_settime64")
33+_S(412, "utimensat_time64")
34+_S(413, "pselect6_time64")
35+_S(414, "ppoll_time64")
36+_S(416, "io_pgetevents_time64")
37+_S(417, "recvmmsg_time64")
38+_S(418, "mq_timedsend_time64")
39+_S(419, "mq_timedreceive_time64")
40+_S(420, "semtimedop_time64")
41+_S(421, "rt_sigtimedwait_time64")
42+_S(422, "futex_time64")
43+_S(423, "sched_rr_get_interval64")
44 _S(424, "pidfd_send_signal")
45 _S(425, "io_uring_setup")
46 _S(426, "io_uring_enter")
47--
482.25.1
49
diff --git a/recipes-security/audit/audit_3.0.bb b/recipes-security/audit/audit_3.0.1.bb
index 88174b8..ba24d36 100644
--- a/recipes-security/audit/audit_3.0.bb
+++ b/recipes-security/audit/audit_3.0.1.bb
@@ -9,14 +9,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
9 9
10SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=master \ 10SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=master \
11 file://Fixed-swig-host-contamination-issue.patch \ 11 file://Fixed-swig-host-contamination-issue.patch \
12 file://0001-lib-arm_table.h-update-arm-syscall-table.patch \
13 file://auditd \ 12 file://auditd \
14 file://auditd.service \ 13 file://auditd.service \
15 file://audit-volatile.conf \ 14 file://audit-volatile.conf \
16" 15"
17 16
18S = "${WORKDIR}/git" 17S = "${WORKDIR}/git"
19SRCREV = "ea8dbab9e0fb3fb2507ac5b8dc792ef32a97c87e" 18SRCREV = "46cb7d92443c9ec7b3af15fb0baa65f65f6415d3"
20 19
21inherit autotools python3native update-rc.d systemd 20inherit autotools python3native update-rc.d systemd
22 21