libwebsockets: update to 4.3.0.

v4.3.0
======

 - Add full CBOR stream parsing and writing support, with huge
   amount of test vectors and resumable printf type write apis
   See ./READMEs/README.cbor-lecp.md
 - Add COSE key and signing / validation support with huge amount of
   test vectors
    cose_sign[1] ES256/384/512, RS256/384/512
    cose_mac0    HS256/384/512
   See ./READMEs/README.cbor-cose.md
 - JIT Trust: for constrained devices, provides a way to determine the
   trusted CA certs the peer requires, and instantiate just those.
   This allows generic client browsing without the overhead of ~130
   x.509 CA certs in memory permanently.
   See ./READMEs/README.jit-trust.md
 - Add support for client Netscape cookie jar with caching
 - Secure Streams: issue LWSSSCS_EVENT_WAIT_CANCELLED state() when
   lws_cancel_service() called, so cross-thread events can be handled
   in SS
 - Actively assert() on attempt to destroy SS handles still active in
   the call stack, use DESTROY_ME returns instead so caller can choose
   how to handle it.
 - Improved Client Connection Error report strings for tls errors
 - SMP: Use a private fakewsi for PROTOCOL_INIT so pts cannot try to
   use the same one concurrently
 - MbedTLS v3 support for all release changes, as well as retaining
   support for v2.x
 - MQTT client: support QoS2
 - Event lib ops can now be set at context creation time directly,
   bringing full event lib hooking to custom event loops.  See
   minimal-http-server-eventlib-custom
 - Extra APIs to recover AKID and SKID from x.509 in mbedtls and openssl
 - Improve http redirect to handle h2-> h2 cleanly
 - IPv4+6 listen sockets on vhosts are now done with two separate
   sockets bound individually to AF_INET and AF_INET6 addresses,
   handled by the same vhost listen flow.
 - Improved tls restriction handling
 - Log contexts: allow objects to log into local logging contexts, by
   lws_context, vhost, wsi and ss handle.  Each context has its own
   emit function and log level. See ./READMEs/README.logging.md
 - Upgrade compiler checking to default to -Werror -Wall -Wextra
 - Fault injection apis now also support pseudo-random number binding
   within a specified range, eg,
   --fault-injection "f1(10%),f1_delay(123..456)"
 - Remove LWS_WITH_DEPRECATED_THINGS, remove master branch
 - Interface binding now uses ipv6 scoring to select bind address

v4.2.0
======

 - Sai coverage upgrades, 495 builds on 27 platforms, including OSX M1,
   Xenial, Bionic and Focal Ubuntu, Debian Sid and Buster on both 32 and
   64-bit OS, and NetBSD, Solaris, FreeBSD, Windows, ESP32.
   Ctest run on more scenarios including all LWS_WITH_DISTRO_RECOMMENDED.
   More tests use valgrind if available on platform.
 - RFC7231 date and time parsing and retry-after wired up to lws_retry
 - `LWS_WITH_SUL_DEBUGGING` checks that no sul belonging to Secure Streams
   and wsi objects are left registered on destruction
 - Netlink monitoring on Linux dynamically tracks interface address and
   routing changes, and immediately closes connections on invalidated
   routes.
 - RFC6724 DNS results sorting over ipv4 + ipv6 results, according to
   available dynamic route information
 - Support new event library, sdevent (systemd native loop), via
   `LWS_WITH_SDEVENT`
 - Reduce .rodata cost of role structs by making them sparse
 - Additional Secure Streams QA tests and runtime state transition
   validation
 - SMD-over-ss-proxy documentation and helpers to simplify forwarding
 - SSPC stream buffering at proxy and client set from policy by streamtype
 - Trigger Captive Portal Detection if DNS resolution fails
 - Switch all logs related to wsi and Secure Streams to use unique,
   descriptive tags instead of pointers (which may be reallocated)
 - Use NOITCE logging for Secure Streams and wsi lifecycle logging using
   tags
 - Update SSPC serialization to include versioning on initial handshake,
   and pass client pid to proxy so related objects are tagged with it
 - Enable errors on -Wconversion pedantic type-related build issues
   throughout the lws sources and upgrade every affected cast.
 - Windows remove WSA event implementation and replace with WSAPoll, with
   a pair of UDP sockets instead of pipe() for `lws_cancel_service()`
 - `lws_strcmp_wildcard()` helper that understand "x*", "x*y", "x*y*" etc
 - `LWS_WITH_PLUGINS_BUILTIN` cmake option just builds plugins into the main
 library image directly
 - Secure Streams proxy supports policy for flow control between proxy and
 clients
 - libressl also supported along with boringssl, wolfssl
 - prepared for openssl v3 compatibility, for main function and GENCRYPTO
 - Fault injection apis can confirm operation of 48 error paths and counting
 - `LWS_WITH_SYS_METRICS` keeps stats and reports them to user-defined
 function, compatible with openmetrics
 - windows platform knows how to prepare openssl with system trust store certs
 - `LWS_WITH_SYS_CONMON` allows selected client connections to make precise
 measurements of connection performance and DNS results, and report them in a struct
 - New native support for uloop event loop (OpenWRT loop)
 - More options around JWT
 - Support TLS session caching and reuse by default, on both OpenSSL and
 mbedtls
 - Many fixes and improvements...

6 files changed, 19 insertions, 44 deletions

diff --git a/www/libwebsockets/Makefile b/www/libwebsockets/Makefile
index 9d4f8733860..6845454c9b1 100644
--- a/www/libwebsockets/Makefile
+++ b/www/libwebsockets/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2021/05/26 19:38:28 bouyer Exp $
+# $NetBSD: Makefile,v 1.3 2022/07/03 10:46:54 wiz Exp $
 
-DISTNAME=	libwebsockets-4.1.4
+DISTNAME=	libwebsockets-4.3.0
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_GITHUB:=warmcat/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
-PKGREVISION=	1
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://libwebsockets.org/
@@ -12,6 +11,7 @@ COMMENT=	Lightweight C library for websocket clients and servers
 LICENSE=	mit
 
 USE_CMAKE=	yes
+USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config
 
 CMAKE_ARGS+=	-DLWS_WITH_LIBUV=ON
diff --git a/www/libwebsockets/PLIST b/www/libwebsockets/PLIST
index 385d952800a..2a9a2d54f1a 100644
--- a/www/libwebsockets/PLIST
+++ b/www/libwebsockets/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2020/11/02 12:32:20 nia Exp $
+@comment $NetBSD: PLIST,v 1.2 2022/07/03 10:46:54 wiz Exp $
 include/libwebsockets.h
 include/libwebsockets/abstract/abstract.h
 include/libwebsockets/abstract/protocols.h
@@ -11,17 +11,20 @@ include/libwebsockets/lws-async-dns.h
 include/libwebsockets/lws-bb-i2c.h
 include/libwebsockets/lws-bb-spi.h
 include/libwebsockets/lws-button.h
+include/libwebsockets/lws-cache-ttl.h
 include/libwebsockets/lws-callbacks.h
 include/libwebsockets/lws-cgi.h
 include/libwebsockets/lws-client.h
+include/libwebsockets/lws-conmon.h
 include/libwebsockets/lws-context-vhost.h
+include/libwebsockets/lws-cose.h
 include/libwebsockets/lws-dbus.h
-include/libwebsockets/lws-detailed-latency.h
 include/libwebsockets/lws-diskcache.h
 include/libwebsockets/lws-display.h
 include/libwebsockets/lws-dll2.h
 include/libwebsockets/lws-dsh.h
 include/libwebsockets/lws-eventlib-exports.h
+include/libwebsockets/lws-fault-injection.h
 include/libwebsockets/lws-freertos.h
 include/libwebsockets/lws-fts.h
 include/libwebsockets/lws-genaes.h
@@ -37,10 +40,13 @@ include/libwebsockets/lws-jose.h
 include/libwebsockets/lws-jwe.h
 include/libwebsockets/lws-jwk.h
 include/libwebsockets/lws-jws.h
+include/libwebsockets/lws-lecp.h
 include/libwebsockets/lws-led.h
 include/libwebsockets/lws-lejp.h
 include/libwebsockets/lws-logs.h
 include/libwebsockets/lws-lwsac.h
+include/libwebsockets/lws-map.h
+include/libwebsockets/lws-metrics.h
 include/libwebsockets/lws-misc.h
 include/libwebsockets/lws-mqtt.h
 include/libwebsockets/lws-netdev.h
@@ -63,12 +69,12 @@ include/libwebsockets/lws-spa.h
 include/libwebsockets/lws-spi.h
 include/libwebsockets/lws-ssd1306-i2c.h
 include/libwebsockets/lws-state.h
-include/libwebsockets/lws-stats.h
 include/libwebsockets/lws-struct.h
 include/libwebsockets/lws-system.h
 include/libwebsockets/lws-test-sequencer.h
 include/libwebsockets/lws-threadpool.h
 include/libwebsockets/lws-timeout-timer.h
+include/libwebsockets/lws-tls-sessions.h
 include/libwebsockets/lws-tokenize.h
 include/libwebsockets/lws-vfs.h
 include/libwebsockets/lws-write.h
@@ -86,6 +92,6 @@ lib/cmake/libwebsockets/libwebsockets-config.cmake
 lib/libwebsockets-evlib_uv.so
 lib/libwebsockets.a
 lib/libwebsockets.so
-lib/libwebsockets.so.17
+lib/libwebsockets.so.19
 lib/pkgconfig/libwebsockets.pc
 lib/pkgconfig/libwebsockets_static.pc
diff --git a/www/libwebsockets/buildlink3.mk b/www/libwebsockets/buildlink3.mk
index 9606c392922..d81d916e2ad 100644
--- a/www/libwebsockets/buildlink3.mk
+++ b/www/libwebsockets/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2020/11/02 12:32:20 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2022/07/03 10:46:54 wiz Exp $
 
 BUILDLINK_TREE+=	libwebsockets
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	libwebsockets
 LIBWEBSOCKETS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libwebsockets+=	libwebsockets>=1.7.2
+BUILDLINK_ABI_DEPENDS.libwebsockets?=	libwebsockets>=4.3.0
 BUILDLINK_PKGSRCDIR.libwebsockets?=	../../www/libwebsockets
 
 .include "../../security/openssl/buildlink3.mk"
diff --git a/www/libwebsockets/distinfo b/www/libwebsockets/distinfo
index c31d903351f..61e6872078c 100644
--- a/www/libwebsockets/distinfo
+++ b/www/libwebsockets/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 11:29:37 nia Exp $
+$NetBSD: distinfo,v 1.5 2022/07/03 10:46:54 wiz Exp $
 
-BLAKE2s (libwebsockets-4.1.4.tar.gz) = 4efed454d12b836939c6c85802af6ad1f9ef667c1ad2d7b5a93644eb755b6d42
-SHA512 (libwebsockets-4.1.4.tar.gz) = 4da84f612ad427465c4eea0bdd0db59c21c9e42bb21eb46b904f544dc4078af2c9a957e61430f3569b87cfc96b3addee50ac7a7c77777dcf16350fe441dd8854
-Size (libwebsockets-4.1.4.tar.gz) = 12698800 bytes
-SHA1 (patch-CMakeLists.txt) = 7d8a4d5d87ab887c78a914c09ae61f119c47737e
-SHA1 (patch-lib_core_context.c) = a0f7067a0ffa65b19a13945bfc1fe0cece5d2869
+BLAKE2s (libwebsockets-4.3.0.tar.gz) = f3d36d771602cfb8a4f5660a5ca8313e8034114dc056f7f3d6e5ff9919a4f5e3
+SHA512 (libwebsockets-4.3.0.tar.gz) = 7f183cb0417a902cb18e76431a8580d87db09c973483f3a129e138e4644b9d0e78e0539e985dc6286d9fe429edea7f63147864dc0413cf8e40fca3d67f9c3c42
+Size (libwebsockets-4.3.0.tar.gz) = 15605272 bytes
diff --git a/www/libwebsockets/patches/patch-CMakeLists.txt b/www/libwebsockets/patches/patch-CMakeLists.txt
deleted file mode 100644
index c3dd98c760c..00000000000
--- a/www/libwebsockets/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2021/05/26 19:38:28 bouyer Exp $
-
-Don't use libdl on BSD systems
-
---- CMakeLists.txt.orig	2020-10-26 12:31:31.000000000 +0100
-+++ CMakeLists.txt	2021-05-26 19:47:32.380836987 +0200
-@@ -539,7 +539,7 @@
- 	list(APPEND LIB_LIST_AT_END "${ZLIB_LIBRARIES}")
- endif()
- 
--if (LWS_WITH_PLUGINS_API AND UNIX AND NOT (${CMAKE_SYSTEM_NAME} MATCHES "QNX"))
-+if (LWS_WITH_PLUGINS_API AND UNIX AND NOT (${CMAKE_SYSTEM_NAME} MATCHES "QNX") AND NOT (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD") AND NOT (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") AND NOT (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD"))
- 	list(APPEND LIB_LIST_AT_END "dl")
- endif()
- 
diff --git a/www/libwebsockets/patches/patch-lib_core_context.c b/www/libwebsockets/patches/patch-lib_core_context.c
deleted file mode 100644
index 06cc7fe6517..00000000000
--- a/www/libwebsockets/patches/patch-lib_core_context.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-lib_core_context.c,v 1.1 2020/11/02 12:32:20 nia Exp $
-
-Add more stuff to the ifdef mess.
-
---- lib/core/context.c.orig	2020-10-26 11:31:31.000000000 +0000
-+++ lib/core/context.c
-@@ -30,7 +30,7 @@
- 
- static const char *library_version = LWS_LIBRARY_VERSION;
- 
--#if defined(__linux__) || defined(__FreeBSD__) || defined(__illumos__)
-+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__illumos__)
- /* for setrlimit */
- #include <sys/resource.h>
- #endif