dropped patch now included in update Signed-off-by: Armin Kuster <[email protected]> --- ...SNR_xxx-instead-of-__NR_xxx-for-sysc.patch | 45 ------------------- ...ibseccomp_2.4.2.bb => libseccomp_2.4.3.bb} | 3 +- 2 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 recipes-security/libseccomp/files/0001-tests-rely-on-__SNR_xxx-instead-of-__NR_xxx-for-sysc.patch rename recipes-security/libseccomp/{libseccomp_2.4.2.bb => libseccomp_2.4.3.bb} (90%)
diff --git a/recipes-security/libseccomp/files/0001-tests-rely-on-__SNR_xxx-instead-of-__NR_xxx-for-sysc.patch b/recipes-security/libseccomp/files/0001-tests-rely-on-__SNR_xxx-instead-of-__NR_xxx-for-sysc.patch deleted file mode 100644 index a53433f..0000000 --- a/recipes-security/libseccomp/files/0001-tests-rely-on-__SNR_xxx-instead-of-__NR_xxx-for-sysc.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 1ecdddb2a5b61cf527d1f238f88a9d129239f87a Mon Sep 17 00:00:00 2001 -From: Paul Moore <[email protected]> -Date: Tue, 5 Nov 2019 15:11:11 -0500 -Subject: [PATCH] tests: rely on __SNR_xxx instead of __NR_xxx for syscalls - -We recently changed how libseccomp handles syscall numbers that are -not defined natively, but we missed test #15. - -Acked-by: Tom Hromatka <[email protected]> -Signed-off-by: Paul Moore <[email protected]> - -Upstream-Status: Backport -[https://github.com/seccomp/libseccomp/commit/1ecdddb2a5b61cf527d1f238f88a9d129239f87a] - -Signed-off-by: Yi Zhao <[email protected]> ---- - tests/15-basic-resolver.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/tests/15-basic-resolver.c b/tests/15-basic-resolver.c -index 6badef1..0c1eefe 100644 ---- a/tests/15-basic-resolver.c -+++ b/tests/15-basic-resolver.c -@@ -55,15 +55,15 @@ int main(int argc, char *argv[]) - unsigned int arch; - char *name = NULL; - -- if (seccomp_syscall_resolve_name("open") != __NR_open) -+ if (seccomp_syscall_resolve_name("open") != __SNR_open) - goto fail; -- if (seccomp_syscall_resolve_name("read") != __NR_read) -+ if (seccomp_syscall_resolve_name("read") != __SNR_read) - goto fail; - if (seccomp_syscall_resolve_name("INVALID") != __NR_SCMP_ERROR) - goto fail; - - rc = seccomp_syscall_resolve_name_rewrite(SCMP_ARCH_NATIVE, "openat"); -- if (rc != __NR_openat) -+ if (rc != __SNR_openat) - goto fail; - - while ((arch = arch_list[iter++]) != -1) { --- -2.17.1 - diff --git a/recipes-security/libseccomp/libseccomp_2.4.2.bb b/recipes-security/libseccomp/libseccomp_2.4.3.bb similarity index 90% rename from recipes-security/libseccomp/libseccomp_2.4.2.bb rename to recipes-security/libseccomp/libseccomp_2.4.3.bb index 07db82a..9ca41e6 100644 --- a/recipes-security/libseccomp/libseccomp_2.4.2.bb +++ b/recipes-security/libseccomp/libseccomp_2.4.3.bb @@ -4,10 +4,9 @@ SECTION = "security" LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://LICENSE;beginline=0;endline=1;md5=8eac08d22113880357ceb8e7c37f989f" -SRCREV = "1b6cfd1fc0b7499a28c24299a93a80bd18619563" +SRCREV = "1dde9d94e0848e12da20602ca38032b91d521427" SRC_URI = "git://github.com/seccomp/libseccomp.git;branch=release-2.4 \ - file://0001-tests-rely-on-__SNR_xxx-instead-of-__NR_xxx-for-sysc.patch \ file://run-ptest \ " -- 2.17.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#48713): https://lists.yoctoproject.org/g/yocto/message/48713 Mute This Topic: https://lists.yoctoproject.org/mt/71809327/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
