Commit Graph

15 Commits

Author SHA1 Message Date
John Crispin
a2be83a5a0 libwebsockets: update PKG_RELEASE
Fixes: df13b03e50 ("libwebsockets: fix uloop support")
Signed-off-by: John Crispin <john@phrozen.org>
2023-01-05 11:46:24 +08:00
John Crispin
4f762ff0b4 libwebsockets: fix uloop support
The commit adding uloop support failed to actually install the .so and
add the correct dependencies.

[2022/12/26 18:19:38:1835] E: lws_create_context: failed to load evlib_uloop

Fixes: 1557ac367a ("libwebsockets: enable built in uloop support")
Signed-off-by: John Crispin <john@phrozen.org>
2023-01-05 11:46:24 +08:00
Josef Schlehofer
e6d17c224b libwebsockets: fix recursive dependency
While running `make menuconfig`, it was discovered then there is a
recursive dependency like this:
tmp/.config-package.in:59138:error: recursive dependency detected!
tmp/.config-package.in:59138:	symbol PACKAGE_libwebsockets-openssl is selected by PACKAGE_libwebsockets-mbedtls
tmp/.config-package.in:59122:	symbol PACKAGE_libwebsockets-mbedtls depends on PACKAGE_libwebsockets-openssl

It is not possible with the recently added conflicts that two packages
(OpenSSL and full variant, which uses OpenSSL as well), which are almost the same
provides the same named package libwebsockets as their conflict - Mbed
TLS.

Fixes: 676c5c72b5eeb583da2603e399fac085fa442c59 ("libwebsockets: OpenSSL
and mbedTLS variants should conflict")

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2022-11-08 14:59:00 +08:00
Josef Schlehofer
7bec67e600 libwebsockets: OpenSSL and mbedTLS variants should conflict
They provide the same files, but they don't conflict to each other, this
means that users can install them side by side.

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2022-11-08 14:59:00 +08:00
Josef Schlehofer
4daa659e2a libwebsockets: full variant provides OpenSSL
For some time, it is not possible to install ttyd and mosquitto-ssl at the
same time, so let's solve it that libwebsockets-full provides
libwebsockets-openssl. This allows to install ttyd and mosquitto at
the same time.

Also, we need to add conflict, because we should not have installed
libwebsockets-openssl and libwebsockets-full at the same time as they
provides the same files.

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2022-11-08 14:59:00 +08:00
Karl Palsson
26e7851f3d 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>
2022-11-08 14:59:00 +08:00
Rosen Penev
1f0029fd9b libwebsockets: fix compilation with GCC12
Upstream backport.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2022-11-08 14:59:00 +08:00
Rosen Penev
3aab10b8d2 libwebsockets: fix compilation with newer GCC
Errors on uninitialized variable. No idea why only on powerpc64.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2022-11-08 14:58:59 +08:00
Karl Palsson
bf47c2a1a2 libwebsockets: enable external poll support
This was removed and then re-added, but defaulted off upstream.  It's
still listed as "not recommended" but still absolutely essential for
many apps for performance.

Fixes: https://github.com/eclipse/mosquitto/issues/2284

Signed-off-by: Karl Palsson <karlp@etactica.com>
2022-11-08 14:58:59 +08:00
Ronny Kotzschmar
d948be2c5f libwebsockets: avoid a compilation error due to a missing uloop
With a clean build environment and at least two parallel jobs
a compilation error may occur:

...
-- Looking for uv/version.h - found
libubox include dir: ULOOP_INCLUDE_DIRS-NOTFOUND
libubox libraries: ULOOP_LIBRARIES-NOTFOUND
...
CMake Error in lib/event-libs/uloop/CMakeLists.txt:
  Found relative path while evaluating include directories of
  "websockets-evlib_uloop":

    "ULOOP_INCLUDE_DIRS-NOTFOUND"
...

Signed-off-by: Ronny Kotzschmar <ro.ok@me.com>
2022-11-08 14:58:59 +08:00
Karl Palsson
cffeaffb43 libwebsockets: enable built in uloop support
uloop is always available on OpenWrt, so build in LWS's uloop support by
default. Size difference of .ipk is 683 bytes, or about 0.5%.
No known applications use this at present, but it seems better to
proactively offer it.

Signed-off-by: Karl Palsson <karlp@etactica.com>
2022-11-08 14:58:59 +08:00
Karl Palsson
e6f02bdf6b libwebsockets: Bump to 4.2.1
Changelog at: https://libwebsockets.org/git/libwebsockets/tree/changelog?id=8a580b59b23d204ca72028370e97a8f6aa0c9202

Signed-off-by: Karl Palsson <karlp@etactica.com>
2022-11-08 14:58:58 +08:00
lean
49b7495639 packages: merge upstream 2021-06-15 17:47:11 +08:00
coolsnowwolf
c36ad692b4 packages: sync to new packages 2020-07-08 14:18:52 +08:00
coolsnowwolf
d17588da1a first commit 2018-10-18 16:56:47 +08:00