Libwebsockets: update version to 4.3.3
authorSeo Suchan <tjtncks@gmail.com>
Fri, 3 May 2024 07:57:32 +0000 (16:57 +0900)
committerRosen Penev <rosenp@gmail.com>
Wed, 15 May 2024 21:32:07 +0000 (14:32 -0700)
Signed-off-by: Seo Suchan <tjtncks@gmail.com>
libs/libwebsockets/Makefile
libs/libwebsockets/patches/010-fix-enum-int-mismatch-openssl.patch [deleted file]
libs/libwebsockets/patches/011-fix-enum-int-mismatch-mbedtls.patch [deleted file]

index 34e7abd3d730604ab94f76ca1f2831294365a8f7..8f5cc14f76489a3817be5ae098061e8863d9815d 100644 (file)
@@ -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 (file)
index 5f2ee86..0000000
+++ /dev/null
@@ -1,26 +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]
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- 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 (file)
index ce4d44a..0000000
+++ /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)