From 06a9dc3528847ec6c12a9b6188d4106e086eabe5 Mon Sep 17 00:00:00 2001 From: Tan En De Date: Sat, 15 Oct 2022 16:47:55 +0800 Subject: [PATCH] package/libkcapi: bump version to 1.4.0 Removed patch applied upstream: https://github.com/smuellerDD/libkcapi/commit/455c4938f5822c017c7ff79dd2dca638b6410923 Signed-off-by: Tan En De Signed-off-by: Thomas Petazzoni --- ...f-__NR_io_getevents-when-not-defined.patch | 42 ------------------- package/libkcapi/libkcapi.hash | 4 +- package/libkcapi/libkcapi.mk | 2 +- 3 files changed, 3 insertions(+), 45 deletions(-) delete mode 100644 package/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch diff --git a/package/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch b/package/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch deleted file mode 100644 index 20aa75b741..0000000000 --- a/package/libkcapi/0001-Disable-use-of-__NR_io_getevents-when-not-defined.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 455c4938f5822c017c7ff79dd2dca638b6410923 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: Pending -Signed-off-by: Khem Raj -Signed-off-by: Stephan Mueller -[Retrieved from: -https://github.com/smuellerDD/libkcapi/commit/455c4938f5822c017c7ff79dd2dca638b6410923] -Signed-off-by: Fabrice Fontaine ---- - lib/internal.h | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/lib/internal.h b/lib/internal.h -index 1237827..f765461 100644 ---- a/lib/internal.h -+++ b/lib/internal.h -@@ -325,10 +325,17 @@ static inline int io_submit(aio_context_t ctx, long n, struct iocb **iocb) - 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/package/libkcapi/libkcapi.hash b/package/libkcapi/libkcapi.hash index 49b0880211..d858086408 100644 --- a/package/libkcapi/libkcapi.hash +++ b/package/libkcapi/libkcapi.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 8a08dcbb4d05ede4357cdc9d61c7f2a7f2cd96b7ce2eb41b28e45b2e378267ad libkcapi-1.1.5.tar.xz -sha256 c6b8402a68999b0f84560ab43cdf60f9ff33c4a9a8ced6a40db9d3b787ba5b4a COPYING +sha256 644b47593b3f27f08add7a8808ccdbe569a2f331d70fb8b52551e57379b917fa libkcapi-1.4.0.tar.xz +sha256 9765fad61726afb2b253db2c68153672e4178d6809667ae98141f3e90fe8645b COPYING sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING.gplv2 sha256 13aa749a5b0a454917a944ed8fffc530b784f5ead522b1aacaf4ec8aa55a6239 COPYING.bsd diff --git a/package/libkcapi/libkcapi.mk b/package/libkcapi/libkcapi.mk index 09c5c028bc..30d500696b 100644 --- a/package/libkcapi/libkcapi.mk +++ b/package/libkcapi/libkcapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBKCAPI_VERSION = 1.1.5 +LIBKCAPI_VERSION = 1.4.0 LIBKCAPI_SOURCE = libkcapi-$(LIBKCAPI_VERSION).tar.xz LIBKCAPI_SITE = http://www.chronox.de/libkcapi LIBKCAPI_AUTORECONF = YES