libwebsockets: fix compilation with GCC12

Upstream backport.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/libs/libwebsockets/Makefile b/libs/libwebsockets/Makefile
index f4372799343e23d1e9df149761a26fae4f8798c8..29c43ce95d954335d5b4abb5d06faca45334147b 100644 (file)
--- a/libs/libwebsockets/Makefile
+++ b/libs/libwebsockets/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libwebsockets
 PKG_VERSION:=4.2.1
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

diff --git a/libs/libwebsockets/patches/020-gcc12.patch b/libs/libwebsockets/patches/020-gcc12.patch
new file mode 100644 (file)
index 0000000..ee6dfe5
--- /dev/null
+++ b/libs/libwebsockets/patches/020-gcc12.patch
@@ -0,0 +1,21 @@
+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));
+