From bf62d604fb804cac39638a2336c473249bd4db24 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Tue, 2 Mar 2021 16:52:03 +0800 Subject: [PATCH] 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 Signed-off-by: Joe MacDonald --- ...arm_table.h-update-arm-syscall-table.patch | 49 ------------------- .../audit/{audit_3.0.bb => audit_3.0.1.bb} | 3 +- 2 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 recipes-security/audit/audit/0001-lib-arm_table.h-update-arm-syscall-table.patch rename recipes-security/audit/{audit_3.0.bb => audit_3.0.1.bb} (96%) 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 @@ -From b75eb0db2aed045787b8bf326c7a78e61855af32 Mon Sep 17 00:00:00 2001 -From: Yi Zhao -Date: Mon, 11 Jan 2021 10:25:42 +0800 -Subject: [PATCH] lib/arm_table.h: update arm syscall table - -Refer to Glibc 2.32, add *_time64 syscalls. - -Upstream-Status: Backport -[https://github.com/linux-audit/audit-userspace/commit/e7b4006239b5e2c1df7d501a422e39be79a13dc2] - -Signed-off-by: Yi Zhao ---- - lib/arm_table.h | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - -diff --git a/lib/arm_table.h b/lib/arm_table.h -index 51a0792..5b0da7d 100644 ---- a/lib/arm_table.h -+++ b/lib/arm_table.h -@@ -385,6 +385,26 @@ _S(398, "rseq") - _S(399, "io_pgetevents") - _S(400, "migrate_pages") - _S(401, "kexec_file_load") -+_S(403, "clock_gettime64") -+_S(404, "clock_settime64") -+_S(405, "clock_adjtime64") -+_S(406, "clock_getres_time64") -+_S(407, "clock_nanosleep_time64") -+_S(408, "timer_gettime64") -+_S(409, "timer_settime64") -+_S(410, "timerfd_gettime64") -+_S(411, "timerfd_settime64") -+_S(412, "utimensat_time64") -+_S(413, "pselect6_time64") -+_S(414, "ppoll_time64") -+_S(416, "io_pgetevents_time64") -+_S(417, "recvmmsg_time64") -+_S(418, "mq_timedsend_time64") -+_S(419, "mq_timedreceive_time64") -+_S(420, "semtimedop_time64") -+_S(421, "rt_sigtimedwait_time64") -+_S(422, "futex_time64") -+_S(423, "sched_rr_get_interval64") - _S(424, "pidfd_send_signal") - _S(425, "io_uring_setup") - _S(426, "io_uring_enter") --- -2.25.1 - diff --git a/recipes-security/audit/audit_3.0.bb b/recipes-security/audit/audit_3.0.1.bb similarity index 96% rename from recipes-security/audit/audit_3.0.bb rename to 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" SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=master \ file://Fixed-swig-host-contamination-issue.patch \ - file://0001-lib-arm_table.h-update-arm-syscall-table.patch \ file://auditd \ file://auditd.service \ file://audit-volatile.conf \ " S = "${WORKDIR}/git" -SRCREV = "ea8dbab9e0fb3fb2507ac5b8dc792ef32a97c87e" +SRCREV = "46cb7d92443c9ec7b3af15fb0baa65f65f6415d3" inherit autotools python3native update-rc.d systemd