From: Karl Palsson <karlp@etactica.com>
Date: Fri, 23 Sep 2022 12:15:56 +0000 (+0000)
Subject: libs/libwebsockets: Update to 4.3.x
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f4ce13b70000a96a64685c8433045b43fd580f45;p=feed%2Fpackages.git

libs/libwebsockets: Update to 4.3.x

Changes since 4.2 are extensive, as always.
https://libwebsockets.org/git/libwebsockets/tree/changelog?h=v4.3-stable#n4

Eg, Adds CBOR, support for reduced memory CA verification, cookie jars,
mqtt client gains qos2, mbedtls v3, fault injection apis, better support
for event loops.

Signed-off-by: Karl Palsson <karlp@etactica.com>
---

diff --git a/libs/libwebsockets/Makefile b/libs/libwebsockets/Makefile
index 29c43ce95d..22eb9aa765 100644
--- a/libs/libwebsockets/Makefile
+++ b/libs/libwebsockets/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libwebsockets
-PKG_VERSION:=4.2.1
-PKG_RELEASE:=3
+PKG_VERSION:=4.3.2
+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:=842da21f73ccba2be59e680de10a8cce7928313048750eb6ad73b6fa50763c51
+PKG_HASH:=6a85a1bccf25acc7e8e5383e4934c9b32a102880d1e4c37c70b27ae2a42406e1
 
 PKG_SOURCE_VERSION:=v$(PKG_VERSION)
 
diff --git a/libs/libwebsockets/patches/010-uninit.patch b/libs/libwebsockets/patches/010-uninit.patch
deleted file mode 100644
index 7895bf606d..0000000000
--- a/libs/libwebsockets/patches/010-uninit.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 1f9925b44379941065690f0dce8ca0c79414b9f1 Mon Sep 17 00:00:00 2001
-From: Rosen Penev <rosenp@gmail.com>
-Date: Tue, 1 Feb 2022 09:13:11 +0000
-Subject: [PATCH] genec: show correct nid when not allowed
-
-As noticed by gcc11 warning
-
-https://github.com/warmcat/libwebsockets/pull/2551
----
- lib/tls/lws-genec-common.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/lib/tls/lws-genec-common.c
-+++ b/lib/tls/lws-genec-common.c
-@@ -94,7 +94,7 @@ lws_genec_confirm_curve_allowed_by_tls_i
- 		}
- 	} while (e > 0);
- 
--	lwsl_err("%s: unsupported curve group nid %d\n", __func__, n);
-+	lwsl_err("%s: unsupported curve group nid %d\n", __func__, id);
- 
- 	return -1;
- }
diff --git a/libs/libwebsockets/patches/020-gcc12.patch b/libs/libwebsockets/patches/020-gcc12.patch
deleted file mode 100644
index ee6dfe5ad3..0000000000
--- a/libs/libwebsockets/patches/020-gcc12.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 6352fee2194a41179a808e9e2b805e0f5c86f8cf Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@warmcat.com>
-Date: Sun, 16 Jan 2022 06:49:38 +0000
-Subject: [PATCH] sort-dns: fix scope comparison
-
-https://github.com/warmcat/libwebsockets/issues/2537
----
- lib/core-net/client/sort-dns.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/lib/core-net/client/sort-dns.c
-+++ b/lib/core-net/client/sort-dns.c
-@@ -406,7 +406,7 @@ lws_sort_dns_dcomp(const lws_dns_sort_t
- 	 */
- 
- 	scopea = lws_ipv6_unicast_scope(to_v6_sa(&da->dest));
--	scopeb = lws_ipv6_unicast_scope(to_v6_sa(&db));
-+	scopeb = lws_ipv6_unicast_scope(to_v6_sa(&db->dest));
- 	scope_srca = lws_ipv6_unicast_scope(to_v6_sa(&da->source));
- 	scope_srcb = lws_ipv6_unicast_scope(to_v6_sa(&db->source));
-