Commit Graph

31 Commits

Author SHA1 Message Date
Khem Raj b19ff59668 libwebsockets: Fix build with clang-20
Backport a needed patch from main branch upstream

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2025-03-13 09:50:12 -07:00
Wang Mingyu bdd9d799c0 libwebsockets: upgrade 4.3.3 -> 4.3.5
Changelog:
===========
- async dns: allow up to 8 x 128-char CNAMEs from 4
- docs: fix typo

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2025-03-11 17:17:21 -07:00
Martin Jansa 17a1bb00de libwebsockets: remove STAGING_LIBDIR with /
* after buildpath warnings fix from:
  https://git.openembedded.org/meta-openembedded/commit/?id=eeef1fddd9052bed4b1a91565260518eb042fed2
  the LibwebsocketsTargets.cmake ends with:
  INTERFACE_LINK_LIBRARIES "ssl;crypto;ssl;crypto;/libcap.so;-lpthread"
  instead of:
  INTERFACE_LINK_LIBRARIES "ssl;crypto;ssl;crypto;/OE/build/.../libwebsockets/4.3.3/lib32-recipe-sysroot/usr/lib/libcap.so;-lpthread"
  which causes e.g. mosquitto to fail in do_compile with:
  ninja: error: '/libcap.so', needed by 'src/mosquitto', missing and no known rule to make it

* this happens only when libwebsocket is built with libcap enabled
  (by libcap in DEPENDS)

Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2024-05-24 14:31:08 -07:00
Gerard Salvatella eeef1fddd9 libwebsockets: fix buildpath warnings
In order to remove absolute paths from the cmake artifacts, paths from
the `$lib` folder should also be stripped off, otherwise internally
linked libraries (e.g. libz) may appear.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2024-05-19 08:28:00 -07:00
Wang Mingyu bc1674784b libwebsockets: upgrade 4.3.2 -> 4.3.3
0001-Fix-Werror-enum-int-mismatch-in-lws_tls_server_abort.patch
removed since it's included in 4.3.3

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2023-11-21 22:35:50 -08:00
Peter Kjellerstedt c083e0569a libwebsockets: Support building for native
This is needed to be able to build mosquitto-native.

The dependency on libcap when building for native is needed because
cmake will pick up the existence of libcap from the host, but then the
build fails if it is not available in the sysroot. Unfortunately, there
does not seem to be any way to explicitly tell cmake to not build with
libcap.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2023-10-26 12:00:14 -07:00
Khem Raj 317ee5bb13 libwebsockets: Fix reference to TMPDIR
.cmake files encoded absolute paths, fixed thusly

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2023-05-19 17:11:37 -07:00
Khem Raj cc396c8e9a libwebsockets: Fix build with gcc13
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2023-01-26 21:52:26 -08:00
Livin Sunny c062df353c libwebsockets: add ipv6 in PACKAGECONFIG
Adds a PACKAGECONFIG if ipv6 is enabled in DISTRO_FEATURES.

Signed-off-by: Livin Sunny <livinsunny519@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2022-12-13 09:18:18 -08:00
Lukas Rusak f3fa2a5d5c libwebsockets: add error check if PACKAGECONFIG contains systemd but DISTRO_FEATURES doesn't
Signed-off-by: Lukas Rusak <lorusak@gmail.com>
2022-10-02 23:59:48 -07:00
Lukas Rusak cdc175009d libwebsockets: add optional support for sd-event loop
Signed-off-by: Lukas Rusak <lorusak@gmail.com>
2022-09-29 13:32:15 -07:00
Radovan Scasny 0c4f3404ef libwebsockets: update to version 4.3.2
Signed-off-by: Radovan Scasny <radovan.scasny@siemens.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2022-07-24 06:28:56 -07:00
Peter Kjellerstedt 4e8b3a21cc libwebsockets: Avoid absolute paths in *.cmake files in the sysroot
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2022-05-10 12:54:45 -07:00
wangmy 271bda48fe libwebsockets: upgrade 4.2.1 -> 4.2.2
ss: sigv4: disable ctest until new auth available

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2021-09-05 22:19:55 -07:00
Martin Jansa c61dc077bb Convert to new override syntax
This is the result of automated script (0.9.1) conversion:

oe-core/scripts/contrib/convert-overrides.py .

converting the metadata to use ":" as the override character instead of "_".

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2021-08-03 10:21:25 -07:00
Luan Rafael Carneiro 8adf2bd2c6 libwebsockets: Update 4.2.0 -> 4.2.1
Update the library to the 4.2.1 stable release.
This commit includes following changes:

    8a580b59 v4.2.1
    e90f005a vhost: listen: protect listen port transfer between
    041baf93 mbedtls: sessions: clean session on bail path
    4038a7d4 windows: align plat insert socket POLLIN handling to linux
    a310e16f socks5: cast for mingw3 nonposix recv args
    439651fa openssl: manage _GNU_SOURCE better
    c042ba8c mqtt: handle NULL mqtt publish metadata
    04761c4b event libs: glib: use glib.h specifically
    599d318a mqtt: coverity: help coverity see we wont have an mqtt role wsi without mqtt member allocated
    bae99f63 tls: add option to serialize ssl handshake
    ff1b8ed0 tls: fix inbalanced tls restrict borrow/return calls
    ad3901d0 raw-proxy: fix role bind flag
    4bc8b1a4 extpoll: clean up test server for Wconversion in extpoll parts
    eeea000c dns: handle EAI_NONAME as fatal
    9e5acc05 minimal: hcmulti: modernize startup to use OPERATIONAL
    55533f96 netlink: hold in COLDPLUG until we actually have some routing table contents
    fa1a7040 sspc: close: differentiate between ss and sspc at final wsi close
    3f0fef17 gcc: gcc8 only recognizes fallthu
    e319b15b minimal: ws client spam: modernize with pvo and cancel service after interrupted
    ea4d8008 service: fix casts for EXTERNAL_POLL
    aea9d0ce tls-sessions: remove no stash warning
    10c1b882 ss: check destroy null policy
    e4aa3ece ss: check serialize null policy
    4141a68f ss: avoid null ss policy on req tx len
    de8185db ss: avoid null ss policy on req tx
    526310df ss: h1: log dereferences NULL
    7a283eba minimal: htt-client: send user agent and accept
    3d13468e ctest: do not reuse ctest-ssp path
    e3da2a3b android: getnameinfo uses nonstandard size_t
    8398ef79 getifaddrs: casts for android
    02ae95fa non-windows: explicit cast vaarg to mode_t
    7c3c179e win32: client: just do WIN32 check
    4c8195df windows: only conceal mode_t on windows
    0ba8df6e threadpool: disassociate wsi on close
    94c50618 tls: mbedtls: fix cast for dump helper
    d896d401 freertos: check for forcing each time around service loop
    cd87bc1c cmake: tls: use CHECK_SYMBOL_EXISTS
    da17f018 plugin: post: check unexpected write after protocol unbind
    1c935dff clean: else became a NOP
    896a2e09 strexp: handle NULL better
    aa090fc2 cygwin: include in unix type socket init
    58a34cb0 examples: embedded: keep loop running on WROVER
    85f772f2 OSX: Fixed can't find clock_gettime
    014aa77e core-net: Remove unused variable
    e1ef2301 ss: h2: handle zero length COLON_PATH for metadata
    0557e919 sspc: handle nonexistent metadata cleanly
    07bef6b8 coverity: ntp from blob: handle blob missing
    2f9ed48d coverity: report problem in hpack_dynamic_size() to parent
    d155970b coverity: h->cwsi must be valid if we are handling rx on it
    2d97e343 ss: split out blob into own minimal example
    c3dd4d05 ss: sspc: handle destroy for client_connect and request_tx

Signed-off-by: Luan Rafael Carneiro <luan.rafael@ossystems.com.br>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2021-07-16 09:23:03 -07:00
Khem Raj 109700fc61 libwebsockets: Update to latest on v4.2-stable
Remove unused variable which is flagged by clang

License-Update: copy secondary license texts into LICENSE as a convenience

Add Apache-2.0 as well since lib/tls/mbedtls/wrapper is using it

[1] https://github.com/warmcat/libwebsockets/commit/a12d5ebed672a28c16484d983885474be606cc21#diff-c693279643b8cd5d248172d9c22cb7cf4ed163a3c98c8a3f69c2717edd3eacb7

Signed-off-by: Khem Raj <raj.khem@gmail.com>
2021-06-05 06:06:27 -07:00
zangrc fd27d08d47 libwebsockets: upgrade 4.1.6 -> 4.2.0
Signed-off-by: Zang Ruochen <zangrc.fnst@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2021-04-22 11:19:38 -07:00
Alexander Vickberg fa8cbd8817 libwebsockets: upgrade to 4.1.6
Event lib support is now built into dynamically loaded plugins so
package them separately and include them in RDEPENDS if enabled.

Building minimal-examples with generated SDK failed due to cmake
configuration had static enabled but not included into SDK. Solve
this by adding static as PACKAGECONFIG option and adding
${PN}-staticdev to RDEPENDS_${PN}-dev if enabled.

Remove CFLAGS_append with -Wno-error added for fixing building with
Os. This looks like it's fixed in upstream.

Signed-off-by: Alexander Vickberg <wickbergster@gmail.com>
2020-12-08 10:38:57 -08:00
Oleksandr Kravchuk 961a609c31 libwebsockets: update to 4.0.20
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-07-28 12:23:16 -07:00
Martin Balik f48d31a4eb libwebsockets: upgrade 3.2.2 -> 4.0.1
Signed-off-by: Martin Balik <martin.balik@siemens.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-04-25 08:32:41 -07:00
Pierre-Jean Texier dc3fece666 libwebsockets: fix upstream check URL
Fixes:

INFO: libwebsockets             3.2.2           2015            None 9494c66d20898ddb39483427c84f152b03cbad28

Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-03-25 12:48:21 -07:00
Pierre-Jean Texier 80514e173b libwebsockets: upgrade 3.2.0 -> 3.2.2
Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2020-02-03 12:54:21 -08:00
Oleksandr Kravchuk ee124e6a3d libwebsockets: update to 3.2.0
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-09-16 07:10:03 -07:00
Adrian Bunk 2d3a7261e6 libwebsockets: Fix the build with -Os
lib/event-libs/libuv/libuv.c: In function 'elops_destroy_context1_uv':
lib/event-libs/libuv/libuv.c:519:7: error: 'm' may be used uninitialized in this function [-Werror=maybe-uninitialized]
    if (m)
       ^

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-08-29 09:06:54 -07:00
Andreas Müller 6c21a3f623 libwebsockets: upgrade 3.0.0 -> 3.1.0
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-02-01 06:57:14 -08:00
Andreas Müller e10659da3f libwebsockets: fix multilib install
| ERROR: libwebsockets-3.0.0-r0 do_package: QA Issue: libwebsockets: Files/directories were installed but not shipped in any package:
|   /usr/lib/libwebsockets.so
|   /usr/lib/libwebsockets.a
|   /usr/lib/libwebsockets.so.13
|   /usr/lib/cmake
|   /usr/lib/pkgconfig
|   /usr/lib/cmake/libwebsockets
|   /usr/lib/cmake/libwebsockets/LibwebsocketsTargets-release.cmake
|   /usr/lib/cmake/libwebsockets/LibwebsocketsConfig.cmake
|   /usr/lib/cmake/libwebsockets/LibwebsocketsConfigVersion.cmake
|   /usr/lib/cmake/libwebsockets/LibwebsocketsTargets.cmake
|   /usr/lib/pkgconfig/libwebsockets_static.pc
|   /usr/lib/pkgconfig/libwebsockets.pc

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2019-02-01 06:57:14 -08:00
Trevor Woerner e148ac43cc libwebsockets: rely on cmake.bbclass to put cmake package files in dev package
The cmake.bbclass in oe-core now ensures that ${libdir}/cmake and
${datadir}/cmake end up in the dev package, so recipes no longer need to
provide custom packaging rules to handles these files.

	http://git.openembedded.org/openembedded-core/commit/?id=d91dc4666683a96e9d03cbbd21b8a546f9069c93

Originally-conceived-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2018-05-29 09:17:27 -07:00
Trevor Woerner abead52851 libwebsockets: update 2.1.0 -> 3.0.0
The LICENSE checksum update was required because the LICENSE file added an
initial clause, and the locations of the third-party sources changed.

Here is a diff of the old and new licenses:

	--- LICENSE.old 2018-05-11 14:36:05.053031281 -0400
	+++ LICENSE.new 2018-05-11 14:35:40.364931066 -0400
	@@ -1,7 +1,13 @@
	 Libwebsockets and included programs are provided under the terms of the GNU
	 Library General Public License (LGPL) 2.1, with the following exceptions:

	-1) Static linking of programs with the libwebsockets library does not
	+1) Any reference, whether in these modifications or in the GNU
	+Library General Public License 2.1, to this License, these terms, the
	+GNU Lesser Public License,  GNU Library General Public License, LGPL, or
	+any similar reference shall refer to the GNU Library General Public
	+License 2.1 as modified by these paragraphs 1) through 4).
	+
	+2) Static linking of programs with the libwebsockets library does not
	 constitute a derivative work and does not require the author to provide
	 source code for the program, use the shared libwebsockets libraries, or
	 link their program against a user-supplied version of libwebsockets.
	@@ -10,7 +16,7 @@
	 changes to libwebsockets must be provided under the terms of the LGPL in
	 sections 1, 2, and 4.

	-2) You do not have to provide a copy of the libwebsockets license with
	+3) You do not have to provide a copy of the libwebsockets license with
	 programs that are linked to the libwebsockets library, nor do you have to
	 identify the libwebsockets license in your program or documentation as
	 required by section 6 of the LGPL.
	@@ -22,26 +28,30 @@
	 "[program] is based in part on the work of the libwebsockets  project
	 (https://libwebsockets.org)"

	-3) Some sources included have their own, more liberal licenses, or options
	+4) Some sources included have their own, more liberal licenses, or options
	 to get original sources with the liberal terms.

	 Original liberal license retained

	-  - lib/sha-1.c         - 3-clause BSD license retained, link to original
	+  - lib/misc/sha-1.c    - 3-clause BSD license retained, link to original
	   - win32port/zlib      - ZLIB license (see zlib.h)
	+  - lib/tls/mbedtls/wrapper - Apache 2.0 (only built if linked against mbedtls)

	 Relicensed to libwebsocket license

	-  - lib/base64-decode.c - relicensed to LGPL2.1+SLE, link to original
	-  - lib/daemonize.c     - relicensed from Public Domain to LGPL2.1+SLE,
	-                          link to original Public Domain version
	+  - lib/misc/base64-decode.c - relicensed to LGPL2.1+SLE, link to original
	+  - lib/misc/daemonize.c     - relicensed from Public Domain to LGPL2.1+SLE,
	+                               link to original Public Domain version

	 Public Domain (CC-zero) to simplify reuse

	-  - test-server/*.c
	-  - test-server/*.h
	+  - test-apps/*.c
	+  - test-apps/*.h
	+  - minimal-examples/*
	   - lwsws/*
	-
	+
	+------ end of exceptions
	+
			   GNU LESSER GENERAL PUBLIC LICENSE
				Version 2.1, February 1999

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
2018-05-17 08:28:20 -07:00
Trevor Woerner dd80399993 libwebsockets: switch away from github archive
Since we know that github archives which are automatically generated have a
tendency to change their checksums[1], switch to using a git clone.

[1] http://lists.openembedded.org/pipermail/openembedded-devel/2017-September/114916.html

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
2018-05-17 08:28:20 -07:00
Fabio Berton 701397952e libwebsockets: Add recipe for version 2.1.0
Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2017-02-13 18:43:36 +01:00