From e95b6af4c8c752331d66cb4470a45b23ae3d8759 Mon Sep 17 00:00:00 2001 From: Oleksandr Kravchuk Date: Wed, 15 Dec 2021 20:15:50 +0100 Subject: libkcapi: update to 1.3.1 Dropped upstreamed patch. License-Update: copyright years updated. Signed-off-by: Oleksandr Kravchuk Signed-off-by: Khem Raj --- ...use-of-__NR_io_getevents-when-not-defined.patch | 36 ---------------------- meta-oe/recipes-crypto/libkcapi/libkcapi_1.2.1.bb | 31 ------------------- meta-oe/recipes-crypto/libkcapi/libkcapi_1.3.1.bb | 29 +++++++++++++++++ 3 files changed, 29 insertions(+), 67 deletions(-) delete mode 100644 meta-oe/recipes-crypto/libkcapi/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch delete mode 100644 meta-oe/recipes-crypto/libkcapi/libkcapi_1.2.1.bb create mode 100644 meta-oe/recipes-crypto/libkcapi/libkcapi_1.3.1.bb (limited to 'meta-oe/recipes-crypto/libkcapi') diff --git a/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch b/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch deleted file mode 100644 index 9d9f63e34..000000000 --- a/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 771dd6aa45dd0bbbb7d7c7a7b116e1b5666fbd7a Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 15 Nov 2020 18:05:48 -0800 -Subject: [PATCH] Disable use of __NR_io_getevents when not defined - -Architectures like riscv32 do not define this syscall, therefore return -ENOSYS on such architectures - -Upstream-Status: Submitted [https://github.com/smuellerDD/libkcapi/pull/100] -Signed-off-by: Khem Raj ---- - lib/internal.h | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - ---- a/lib/internal.h -+++ b/lib/internal.h -@@ -325,10 +325,17 @@ static inline int io_submit(aio_context_ - return syscall(__NR_io_submit, ctx, n, iocb); - } - --static inline int io_getevents(aio_context_t ctx, long min, long max, -- struct io_event *events, struct timespec *timeout) -+static inline int io_getevents(__attribute__((unused)) aio_context_t ctx, -+ __attribute__((unused)) long min, -+ __attribute__((unused)) long max, -+ __attribute__((unused)) struct io_event *events, -+ __attribute__((unused)) struct timespec *timeout) - { -+#ifdef __NR_io_getevents - return syscall(__NR_io_getevents, ctx, min, max, events, timeout); -+#else -+ return -ENOSYS; -+#endif - } - - /************************************************************ diff --git a/meta-oe/recipes-crypto/libkcapi/libkcapi_1.2.1.bb b/meta-oe/recipes-crypto/libkcapi/libkcapi_1.2.1.bb deleted file mode 100644 index cc71903a8..000000000 --- a/meta-oe/recipes-crypto/libkcapi/libkcapi_1.2.1.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "Linux Kernel Crypto API User Space Interface Library" -HOMEPAGE = "http://www.chronox.de/libkcapi.html" -LICENSE = "BSD-3-Clause | GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=c78be93ed8d1637f2a3f4a83ff9d5f54" - -S = "${WORKDIR}/git" -SRCREV = "d41284525ec8960e9a828979cfe269012b7df8db" -SRC_URI = "git://github.com/smuellerDD/libkcapi.git;branch=master;protocol=https \ - file://0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch \ - " - -inherit autotools - -PACKAGECONFIG ??= "" -PACKAGECONFIG[testapp] = "--enable-kcapi-test,,,bash" -PACKAGECONFIG[apps] = "--enable-kcapi-speed --enable-kcapi-hasher --enable-kcapi-rngapp --enable-kcapi-encapp --enable-kcapi-dgstapp,,," -PACKAGECONFIG[hasher_only] = "--enable-kcapi-hasher --disable-lib-kdf --disable-lib-sym --disable-lib-aead --disable-lib-rng,,," - -do_install:append() { - # bindir contains testapp and apps. However it is always created, even - # when no binaries are installed (empty bin_PROGRAMS in Makefile.am), - rmdir --ignore-fail-on-non-empty ${D}${bindir} - - # Remove the generated binary checksum files - rm -f ${D}${bindir}/.*.hmac - rm -f ${D}${libdir}/.*.hmac -} - -CPPFLAGS:append:libc-musl:toolchain-clang = " -Wno-error=sign-compare" - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-crypto/libkcapi/libkcapi_1.3.1.bb b/meta-oe/recipes-crypto/libkcapi/libkcapi_1.3.1.bb new file mode 100644 index 000000000..f10d68470 --- /dev/null +++ b/meta-oe/recipes-crypto/libkcapi/libkcapi_1.3.1.bb @@ -0,0 +1,29 @@ +SUMMARY = "Linux Kernel Crypto API User Space Interface Library" +HOMEPAGE = "http://www.chronox.de/libkcapi.html" +LICENSE = "BSD-3-Clause | GPL-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=80c467906eb826339c7f09e61808ed23" + +S = "${WORKDIR}/git" +SRCREV = "2936ecd060c299157ac880650ba2c9fd94d27bb1" +SRC_URI = "git://github.com/smuellerDD/libkcapi.git;branch=master;protocol=https" + +inherit autotools + +PACKAGECONFIG ??= "" +PACKAGECONFIG[testapp] = "--enable-kcapi-test,,,bash" +PACKAGECONFIG[apps] = "--enable-kcapi-speed --enable-kcapi-hasher --enable-kcapi-rngapp --enable-kcapi-encapp --enable-kcapi-dgstapp,,," +PACKAGECONFIG[hasher_only] = "--enable-kcapi-hasher --disable-lib-kdf --disable-lib-sym --disable-lib-aead --disable-lib-rng,,," + +do_install:append() { + # bindir contains testapp and apps. However it is always created, even + # when no binaries are installed (empty bin_PROGRAMS in Makefile.am), + rmdir --ignore-fail-on-non-empty ${D}${bindir} + + # Remove the generated binary checksum files + rm -f ${D}${bindir}/.*.hmac + rm -f ${D}${libdir}/.*.hmac +} + +CPPFLAGS:append:libc-musl:toolchain-clang = " -Wno-error=sign-compare" + +BBCLASSEXTEND = "native" -- cgit v1.2.3-54-g00ecf