From 37f15d1051df246217c31815bb4d9a0495218cdd Mon Sep 17 00:00:00 2001 From: Seo Suchan Date: Fri, 3 May 2024 16:57:32 +0900 Subject: [PATCH] Libwebsockets: update version to 4.3.3 Signed-off-by: Seo Suchan --- libs/libwebsockets/Makefile | 8 +++--- .../010-fix-enum-int-mismatch-openssl.patch | 26 ------------------- .../011-fix-enum-int-mismatch-mbedtls.patch | 14 ---------- 3 files changed, 4 insertions(+), 44 deletions(-) delete mode 100644 libs/libwebsockets/patches/010-fix-enum-int-mismatch-openssl.patch delete mode 100644 libs/libwebsockets/patches/011-fix-enum-int-mismatch-mbedtls.patch diff --git a/libs/libwebsockets/Makefile b/libs/libwebsockets/Makefile index 34e7abd3d7..8f5cc14f76 100644 --- a/libs/libwebsockets/Makefile +++ b/libs/libwebsockets/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libwebsockets -PKG_VERSION:=4.3.2 -PKG_RELEASE:=3 +PKG_VERSION:=4.3.3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL:=https://codeload.github.com/warmcat/libwebsockets/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=6a85a1bccf25acc7e8e5383e4934c9b32a102880d1e4c37c70b27ae2a42406e1 +PKG_HASH:=6fd33527b410a37ebc91bb64ca51bdabab12b076bc99d153d7c5dd405e4bdf90 PKG_SOURCE_VERSION:=v$(PKG_VERSION) @@ -61,7 +61,7 @@ endef define Package/libwebsockets-mbedtls $(call Package/$(PKG_NAME)/Default) TITLE += (mbedTLS) - DEPENDS += +libmbedtls + DEPENDS += +libmbedtls @MBEDTLS_VERSION_C VARIANT:=mbedtls PROVIDES:=libwebsockets CONFLICTS:=libwebsockets-openssl diff --git a/libs/libwebsockets/patches/010-fix-enum-int-mismatch-openssl.patch b/libs/libwebsockets/patches/010-fix-enum-int-mismatch-openssl.patch deleted file mode 100644 index 5f2ee86e0b..0000000000 --- a/libs/libwebsockets/patches/010-fix-enum-int-mismatch-openssl.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 722e44cb5b74cae206f47a6dc0d985eba8ed1b2e Mon Sep 17 00:00:00 2001 -From: Khem Raj -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] - -Signed-off-by: Khem Raj ---- - lib/tls/openssl/openssl-server.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/lib/tls/openssl/openssl-server.c -+++ b/lib/tls/openssl/openssl-server.c -@@ -709,7 +709,7 @@ lws_tls_server_new_nonblocking(struct lw - return 0; - } - --int -+enum lws_ssl_capable_status - lws_tls_server_abort_connection(struct lws *wsi) - { - if (wsi->tls.use_ssl) diff --git a/libs/libwebsockets/patches/011-fix-enum-int-mismatch-mbedtls.patch b/libs/libwebsockets/patches/011-fix-enum-int-mismatch-mbedtls.patch deleted file mode 100644 index ce4d44a379..0000000000 --- a/libs/libwebsockets/patches/011-fix-enum-int-mismatch-mbedtls.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/lib/tls/mbedtls/mbedtls-server.c -+++ b/lib/tls/mbedtls/mbedtls-server.c -@@ -264,11 +264,7 @@ lws_tls_server_new_nonblocking(struct lw - return 0; - } - --#if defined(LWS_AMAZON_RTOS) - enum lws_ssl_capable_status --#else --int --#endif - lws_tls_server_abort_connection(struct lws *wsi) - { - if (wsi->tls.use_ssl) -- 2.30.2