From 9bb7fa51a59fe80080746a763b4f530c4ba29f4e Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Sun, 28 Feb 2021 19:20:44 +0000 Subject: libseccomp: upgrade 2.5.0 -> 2.5.1 drop patch merged in update --- .../libseccomp/files/fix-mips-build-failure.patch | 49 ---------------------- recipes-security/libseccomp/libseccomp_2.5.0.bb | 48 --------------------- recipes-security/libseccomp/libseccomp_2.5.1.bb | 47 +++++++++++++++++++++ 3 files changed, 47 insertions(+), 97 deletions(-) delete mode 100644 recipes-security/libseccomp/files/fix-mips-build-failure.patch delete mode 100644 recipes-security/libseccomp/libseccomp_2.5.0.bb create mode 100644 recipes-security/libseccomp/libseccomp_2.5.1.bb diff --git a/recipes-security/libseccomp/files/fix-mips-build-failure.patch b/recipes-security/libseccomp/files/fix-mips-build-failure.patch deleted file mode 100644 index 7d17a03..0000000 --- a/recipes-security/libseccomp/files/fix-mips-build-failure.patch +++ /dev/null @@ -1,49 +0,0 @@ -Backport patch to fix cross compile error for mips: - -| syscalls.h:44:6: error: expected identifier or '(' before numeric constant -| 44 | int mips; -| | ^~~~ - -Upstream-Status: Submitted [https://github.com/seccomp/libseccomp/pull/279/commits/04c519e5] - -Signed-off-by: Kai Kang - -From 04c519e5b1de53592e98307813e5c6db7418f91b Mon Sep 17 00:00:00 2001 -From: Paul Moore -Date: Sun, 2 Aug 2020 09:57:39 -0400 -Subject: [PATCH] build: undefine "mips" to prevent build problems for MIPS - targets - -It turns out that the MIPS GCC compiler defines a "mips" cpp macro -which was resulting in build failures on MIPS so we need to -undefine the "mips" macro during build. As this should be safe -to do in all architectures, just add it to the compiler flags by -default. - -This was reported in the following GH issue: -* https://github.com/seccomp/libseccomp/issues/274 - -Reported-by: Rongwei Zhang -Suggested-by: Rongwei Zhang -Signed-off-by: Paul Moore ---- - configure.ac | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 40d9dcbb..3e877348 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -65,9 +65,11 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - - dnl #### - dnl build flags -+dnl NOTE: the '-Umips' is here because MIPS GCC compilers "helpfully" define it -+dnl for us which wreaks havoc on the build - dnl #### - AM_CPPFLAGS="-I\${top_srcdir}/include -I\${top_builddir}/include" --AM_CFLAGS="-Wall" -+AM_CFLAGS="-Wall -Umips" - AM_LDFLAGS="-Wl,-z -Wl,relro" - AC_SUBST([AM_CPPFLAGS]) - AC_SUBST([AM_CFLAGS]) diff --git a/recipes-security/libseccomp/libseccomp_2.5.0.bb b/recipes-security/libseccomp/libseccomp_2.5.0.bb deleted file mode 100644 index 0cf2d70..0000000 --- a/recipes-security/libseccomp/libseccomp_2.5.0.bb +++ /dev/null @@ -1,48 +0,0 @@ -SUMMARY = "interface to seccomp filtering mechanism" -DESCRIPTION = "The libseccomp library provides and easy to use, platform independent,interface to the Linux Kernel's syscall filtering mechanism: seccomp." -SECTION = "security" -LICENSE = "LGPL-2.1" -LIC_FILES_CHKSUM = "file://LICENSE;beginline=0;endline=1;md5=8eac08d22113880357ceb8e7c37f989f" - -DEPENDS += "gperf-native" - -SRCREV = "f13f58efc690493fe7aa69f54cb52a118f3769c1" - -SRC_URI = "git://github.com/seccomp/libseccomp.git;branch=release-2.5 \ - file://run-ptest \ - file://fix-mips-build-failure.patch \ -" - -COMPATIBLE_HOST_riscv32 = "null" - -S = "${WORKDIR}/git" - -inherit autotools-brokensep pkgconfig ptest - -PACKAGECONFIG ??= "" -PACKAGECONFIG[python] = "--enable-python, --disable-python, python3" - -DISABLE_STATIC = "" - -do_compile_ptest() { - oe_runmake -C tests check-build -} - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - install -d ${D}${PTEST_PATH}/tools - for file in $(find tests/* -executable -type f); do - install -m 744 ${S}/${file} ${D}/${PTEST_PATH}/tests - done - for file in $(find tests/*.tests -type f); do - install -m 744 ${S}/${file} ${D}/${PTEST_PATH}/tests - done - for file in $(find tools/* -executable -type f); do - install -m 744 ${S}/${file} ${D}/${PTEST_PATH}/tools - done -} - -FILES_${PN} = "${bindir} ${libdir}/${BPN}.so*" -FILES_${PN}-dbg += "${libdir}/${PN}/tests/.debug/* ${libdir}/${PN}/tools/.debug" - -RDEPENDS_${PN}-ptest = "coreutils bash" diff --git a/recipes-security/libseccomp/libseccomp_2.5.1.bb b/recipes-security/libseccomp/libseccomp_2.5.1.bb new file mode 100644 index 0000000..40ac1a8 --- /dev/null +++ b/recipes-security/libseccomp/libseccomp_2.5.1.bb @@ -0,0 +1,47 @@ +SUMMARY = "interface to seccomp filtering mechanism" +DESCRIPTION = "The libseccomp library provides and easy to use, platform independent,interface to the Linux Kernel's syscall filtering mechanism: seccomp." +SECTION = "security" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://LICENSE;beginline=0;endline=1;md5=8eac08d22113880357ceb8e7c37f989f" + +DEPENDS += "gperf-native" + +SRCREV = "4bf70431a339a2886ab8c82e9a45378f30c6e6c7" + +SRC_URI = "git://github.com/seccomp/libseccomp.git;branch=release-2.5 \ + file://run-ptest \ + " + +COMPATIBLE_HOST_riscv32 = "null" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep pkgconfig ptest + +PACKAGECONFIG ??= "" +PACKAGECONFIG[python] = "--enable-python, --disable-python, python3" + +DISABLE_STATIC = "" + +do_compile_ptest() { + oe_runmake -C tests check-build +} + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + install -d ${D}${PTEST_PATH}/tools + for file in $(find tests/* -executable -type f); do + install -m 744 ${S}/${file} ${D}/${PTEST_PATH}/tests + done + for file in $(find tests/*.tests -type f); do + install -m 744 ${S}/${file} ${D}/${PTEST_PATH}/tests + done + for file in $(find tools/* -executable -type f); do + install -m 744 ${S}/${file} ${D}/${PTEST_PATH}/tools + done +} + +FILES_${PN} = "${bindir} ${libdir}/${BPN}.so*" +FILES_${PN}-dbg += "${libdir}/${PN}/tests/.debug/* ${libdir}/${PN}/tools/.debug" + +RDEPENDS_${PN}-ptest = "coreutils bash" -- cgit v1.2.3-54-g00ecf