Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libs/libwebsockets/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=libwebsockets
PKG_VERSION:=4.3.2
PKG_RELEASE:=2
PKG_RELEASE:=3

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
Expand Down
26 changes: 26 additions & 0 deletions libs/libwebsockets/patches/010-fix-enum-int-mismatch-openssl.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
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)
14 changes: 14 additions & 0 deletions libs/libwebsockets/patches/011-fix-enum-int-mismatch-mbedtls.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
--- 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)