summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2020-03-07 20:38:49 +0000
committerArmin Kuster <akuster808@gmail.com>2020-03-08 14:13:07 -0700
commit4229f5025e628d48665be95880fe1e458df5dda3 (patch)
treed8ae82e6ddf83951e003726fbb4af8e30f9d33f4
parent96737082ad20eabcbbaa82b0cacee0d05d50eaab (diff)
downloadmeta-security-4229f5025e628d48665be95880fe1e458df5dda3.tar.gz
libseccomp: update to 2.4.3
dropped patch now included in update Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--recipes-security/libseccomp/files/0001-tests-rely-on-__SNR_xxx-instead-of-__NR_xxx-for-sysc.patch45
-rw-r--r--recipes-security/libseccomp/libseccomp_2.4.3.bb (renamed from recipes-security/libseccomp/libseccomp_2.4.2.bb)3
2 files changed, 1 insertions, 47 deletions
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 @@
1From 1ecdddb2a5b61cf527d1f238f88a9d129239f87a Mon Sep 17 00:00:00 2001
2From: Paul Moore <paul@paul-moore.com>
3Date: Tue, 5 Nov 2019 15:11:11 -0500
4Subject: [PATCH] tests: rely on __SNR_xxx instead of __NR_xxx for syscalls
5
6We recently changed how libseccomp handles syscall numbers that are
7not defined natively, but we missed test #15.
8
9Acked-by: Tom Hromatka <tom.hromatka@oracle.com>
10Signed-off-by: Paul Moore <paul@paul-moore.com>
11
12Upstream-Status: Backport
13[https://github.com/seccomp/libseccomp/commit/1ecdddb2a5b61cf527d1f238f88a9d129239f87a]
14
15Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
16---
17 tests/15-basic-resolver.c | 6 +++---
18 1 file changed, 3 insertions(+), 3 deletions(-)
19
20diff --git a/tests/15-basic-resolver.c b/tests/15-basic-resolver.c
21index 6badef1..0c1eefe 100644
22--- a/tests/15-basic-resolver.c
23+++ b/tests/15-basic-resolver.c
24@@ -55,15 +55,15 @@ int main(int argc, char *argv[])
25 unsigned int arch;
26 char *name = NULL;
27
28- if (seccomp_syscall_resolve_name("open") != __NR_open)
29+ if (seccomp_syscall_resolve_name("open") != __SNR_open)
30 goto fail;
31- if (seccomp_syscall_resolve_name("read") != __NR_read)
32+ if (seccomp_syscall_resolve_name("read") != __SNR_read)
33 goto fail;
34 if (seccomp_syscall_resolve_name("INVALID") != __NR_SCMP_ERROR)
35 goto fail;
36
37 rc = seccomp_syscall_resolve_name_rewrite(SCMP_ARCH_NATIVE, "openat");
38- if (rc != __NR_openat)
39+ if (rc != __SNR_openat)
40 goto fail;
41
42 while ((arch = arch_list[iter++]) != -1) {
43--
442.17.1
45
diff --git a/recipes-security/libseccomp/libseccomp_2.4.2.bb b/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"
4LICENSE = "LGPL-2.1" 4LICENSE = "LGPL-2.1"
5LIC_FILES_CHKSUM = "file://LICENSE;beginline=0;endline=1;md5=8eac08d22113880357ceb8e7c37f989f" 5LIC_FILES_CHKSUM = "file://LICENSE;beginline=0;endline=1;md5=8eac08d22113880357ceb8e7c37f989f"
6 6
7SRCREV = "1b6cfd1fc0b7499a28c24299a93a80bd18619563" 7SRCREV = "1dde9d94e0848e12da20602ca38032b91d521427"
8 8
9SRC_URI = "git://github.com/seccomp/libseccomp.git;branch=release-2.4 \ 9SRC_URI = "git://github.com/seccomp/libseccomp.git;branch=release-2.4 \
10 file://0001-tests-rely-on-__SNR_xxx-instead-of-__NR_xxx-for-sysc.patch \
11 file://run-ptest \ 10 file://run-ptest \
12" 11"
13 12