Thanks, applied as 8c23ffcc8a87bfb8f411f25eef65e332e8019ba4. Michael
[sent from post-receive hook] On Fri, 31 May 2024 08:08:28 +0200, Ian Abbott <[email protected]> wrote: > Add a configuration option to support WebSocket connections using the > libwebsockets library. If Mosquitto is configured to use TLS, select > TLS support in the libwebsockets package too. > > Signed-off-by: Ian Abbott <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/rules/mosquitto.in b/rules/mosquitto.in > index 9b55f084703d..3c751ede7efb 100644 > --- a/rules/mosquitto.in > +++ b/rules/mosquitto.in > @@ -4,9 +4,11 @@ menuconfig MOSQUITTO > tristate > prompt "mosquitto " > select HOST_CMAKE > - select OPENSSL if MOSQUITTO_TLS > - select C_ARES if MOSQUITTO_SRV > - select SYSTEMD if MOSQUITTO_SYSTEMD_UNIT > + select OPENSSL if MOSQUITTO_TLS > + select C_ARES if MOSQUITTO_SRV > + select SYSTEMD if MOSQUITTO_SYSTEMD_UNIT > + select LIBWEBSOCKETS if MOSQUITTO_WEBSOCKETS > + select LIBWEBSOCKETS_TLS if MOSQUITTO_WEBSOCKETS && MOSQUITTO_TLS > help > Open source MQTT message broker, library, and client. > > @@ -35,6 +37,11 @@ config MOSQUITTO_SRV > bool > prompt "SRV lookup support" > > +config MOSQUITTO_WEBSOCKETS > + bool > + depends on MOSQUITTO_BROKER > + prompt "Websockets support" > + > endif > > # vim: ft=kconfig noet tw=72 > diff --git a/rules/mosquitto.make b/rules/mosquitto.make > index eedb5ca580e2..239f1fe3c34a 100644 > --- a/rules/mosquitto.make > +++ b/rules/mosquitto.make > @@ -60,7 +60,7 @@ MOSQUITTO_CONF_OPT := \ > -DWITH_TLS=$(call ptx/onoff, PTXCONF_MOSQUITTO_TLS) \ > -DWITH_TLS_PSK=$(call ptx/onoff, PTXCONF_MOSQUITTO_TLS) \ > -DWITH_UNIX_SOCKETS=ON \ > - -DWITH_WEBSOCKETS=OFF > + -DWITH_WEBSOCKETS=$(call ptx/onoff, PTXCONF_MOSQUITTO_WEBSOCKETS) > > # > ---------------------------------------------------------------------------- > # Install
