diff --git a/package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch b/package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch index 197dd1de0f..87f343a9d9 100644 --- a/package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch +++ b/package/libuwsc/0001-CMakeLists.txt-add-BUILD_EXAMPLE.patch @@ -6,7 +6,7 @@ Subject: [PATCH] CMakeLists.txt: add BUILD_EXAMPLE Allow the user to disable example Signed-off-by: Fabrice Fontaine -[yann.morin.1998@free.fr: backport from upstream] +Upstream: https://github.com/zhaojh329/libuwsc/commit/bb71b21eb9407479ad729b3c858b0fc350fae335 Signed-off-by: Yann E. MORIN --- CMakeLists.txt | 6 +++++- diff --git a/package/libuwsc/0002-fix-bad-indentation.patch b/package/libuwsc/0002-fix-bad-indentation.patch index f33f944d06..77cae92cf2 100644 --- a/package/libuwsc/0002-fix-bad-indentation.patch +++ b/package/libuwsc/0002-fix-bad-indentation.patch @@ -5,8 +5,7 @@ Subject: [PATCH] fix bad indentation Fixes error with GCC11. -[Retrieved from: -https://github.com/zhaojh329/libuwsc/commit/8cb416140741a596235b8acc46b2b119b13ebfab] +Upstream: https://github.com/zhaojh329/libuwsc/commit/8cb416140741a596235b8acc46b2b119b13ebfab Signed-off-by: Fabrice Fontaine --- src/lua/uwsc_lua.c | 2 +- diff --git a/package/libuwsc/0003-src-ssl.c-fix-wolfssl-build.patch b/package/libuwsc/0003-src-ssl.c-fix-wolfssl-build.patch new file mode 100644 index 0000000000..4c652a63c2 --- /dev/null +++ b/package/libuwsc/0003-src-ssl.c-fix-wolfssl-build.patch @@ -0,0 +1,37 @@ +From 1c3579e99163a13d622c3ef44088c23d5eea306d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 14 Jan 2024 16:44:13 +0100 +Subject: [PATCH] src/ssl.c: fix wolfssl build + +wolfssl/options.h must also be included by clients to avoid the +following build failure because OPENSSL_ALL won't be defined: + +/home/autobuild/autobuild/instance-6/output-1/build/libuwsc-3.3.5/src/ssl.c:62:5: error: unknown type name 'SSL_CTX' + 62 | SSL_CTX *ctx; + | ^~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/edc49cce5b1f456d980841f4c315e7cd784b1561 + +Signed-off-by: Fabrice Fontaine +Upstream: N/A (already fixed by +https://github.com/zhaojh329/ssl/commit/c40ebcd7b4277321acbbd4b00b4b10fd363c7a97) +--- + src/ssl.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/ssl.c b/src/ssl.c +index 3640022..6a3d250 100644 +--- a/src/ssl.c ++++ b/src/ssl.c +@@ -54,6 +54,7 @@ struct uwsc_ssl_ctx { + #include + #elif UWSC_HAVE_WOLFSSL + #define WC_NO_HARDEN ++#include + #include + #include + #endif +-- +2.43.0 +