helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-04-02 02:49:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

libwebsockets: upgrade 4.3.2 -> 4.3.3

Browse Source 
0001-Fix-Werror-enum-int-mismatch-in-lws_tls_server_abort.patch
removed since it's included in 4.3.3

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Wang Mingyu 2023-11-22 14:19:55 +08:00 committed by Khem Raj
parent fdb279bc33
commit bc1674784b
No known key found for this signature in database
GPG Key ID: BB053355919D3314
2 changed files with 2 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
meta-oe/recipes-connectivity/libwebsockets/libwebsockets/0001-Fix-Werror-enum-int-mismatch-in-lws_tls_server_abort.patch
View File

@ -1,32 +0,0 @@
From 722e44cb5b74cae206f47a6dc0d985eba8ed1b2e Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 26 Jan 2023 17:17:49 -0800
Subject: [PATCH] Fix -Werror=enum-int-mismatch in
lws_tls_server_abort_connection()
GCC 13 is findinf this function signature mismatch.
../git/lib/tls/openssl/openssl-server.c:713:1: error: conflicting types for 'lws_tls_server_abort_connection' due to enum/integer mismatch; have 'int(struct lws *)' [-Werror=enum-int-mismatch]
Upstream-Status: Submitted [https://github.com/warmcat/libwebsockets/pull/2824]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
lib/tls/openssl/openssl-server.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/tls/openssl/openssl-server.c b/lib/tls/openssl/openssl-server.c
index f2e77324f..43d65e030 100644
--- a/lib/tls/openssl/openssl-server.c
+++ b/lib/tls/openssl/openssl-server.c
@@ -699,7 +699,7 @@ lws_tls_server_new_nonblocking(struct lws *wsi, lws_sockfd_type accept_fd)
return 0;
}
-int
+enum lws_ssl_capable_status
lws_tls_server_abort_connection(struct lws *wsi)
{
if (wsi->tls.use_ssl)
--
2.39.1

5
meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.2.bb → meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.3.bb
View File

@ -7,9 +7,8 @@ DEPENDS = "zlib"
DEPENDS:append:class-native = " libcap-native"
S = "${WORKDIR}/git"
SRCREV = "b0a749c8e7a8294b68581ce4feac0e55045eb00b"
SRC_URI = "git://github.com/warmcat/libwebsockets.git;protocol=https;branch=v4.3-stable \
file://0001-Fix-Werror-enum-int-mismatch-in-lws_tls_server_abort.patch"
SRCREV = "4415e84c095857629863804e941b9e1c2e9347ef"
SRC_URI = "git://github.com/warmcat/libwebsockets.git;protocol=https;branch=v4.3-stable"
UPSTREAM_CHECK_URI = "https://github.com/warmcat/${BPN}/releases"
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"