From: Wang Mingyu <[email protected]> 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 <[email protected]> --- ...int-mismatch-in-lws_tls_server_abort.patch | 32 ------------------- ...ockets_4.3.2.bb => libwebsockets_4.3.3.bb} | 5 ++- 2 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/libwebsockets/libwebsockets/0001-Fix-Werror-enum-int-mismatch-in-lws_tls_server_abort.patch rename meta-oe/recipes-connectivity/libwebsockets/{libwebsockets_4.3.2.bb => libwebsockets_4.3.3.bb} (95%) diff --git a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets/0001-Fix-Werror-enum-int-mismatch-in-lws_tls_server_abort.patch b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets/0001-Fix-Werror-enum-int-mismatch-in-lws_tls_server_abort.patch deleted file mode 100644 index 41d004d9f..000000000 --- a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets/0001-Fix-Werror-enum-int-mismatch-in-lws_tls_server_abort.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 722e44cb5b74cae206f47a6dc0d985eba8ed1b2e Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -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 <[email protected]> ---- - 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 - diff --git a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.2.bb b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.3.bb similarity index 95% rename from meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.2.bb rename to meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.3.bb index 95c2854fa..4518e2faa 100644 --- a/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.2.bb +++ b/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.3.3.bb @@ -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+)+)" -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#106995): https://lists.openembedded.org/g/openembedded-devel/message/106995 Mute This Topic: https://lists.openembedded.org/mt/102744733/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
