Commit Graph

49 Commits

Author SHA1 Message Date
Seo Suchan feb64a0502 Libwebsockets: temp fix for mbedtls 3.6+
3.6 removed mbedtls_x509_get_cert into private header, redefined it in resonable place to temperatly fix it, and make it not depend on mbedtls_version_C. everything is upstreamed so won't need when upstrea release 4.3.4

Signed-off-by: Seo Suchan <tjtncks@gmail.com>
2024-05-15 14:32:07 -07:00
Seo Suchan 37f15d1051 Libwebsockets: update version to 4.3.3
Signed-off-by: Seo Suchan <tjtncks@gmail.com>
2024-05-15 14:32:07 -07:00
Oskari Rauta 6a897e22b0 libwebsockets: Fix -Werror=enum-int-mismatch in lws_tls_server_abort_connection()
with gcc 13 libwebsockets fails with -Werror=enum-int-mismatch with both
SSL variants. These 2 patches work out that issue. Problem is mentioned
as a issue in openwrt/packages#20949 and instead of overriding issue
with appropriate CFLAGS, this approach was suggested for me as it's
been made as a PR (for openssl) at warmcat/libwebsockets#2824

Second patch for mbedtls, was made by me using same approach
as was used of openssl.

Eventually these propably will be merged into libwebsockets mainstream.

Signed-off-by: Oskari Rauta <oskari.rauta@gmail.com>
2023-07-01 04:48:25 -07:00
John Crispin a4bfe48e27 libwebsockets: update PKG_RELEASE
Fixes: df13b03e50 ("libwebsockets: fix uloop support")
Signed-off-by: John Crispin <john@phrozen.org>
2023-01-04 20:45:32 +01:00
John Crispin df13b03e50 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-03 20:31:31 +01:00
Josef Schlehofer a4e8cbb89a
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: 676c5c72b5 ("libwebsockets: OpenSSL
and mbedTLS variants should conflict")

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2022-10-26 09:31:30 +02:00
Josef Schlehofer 676c5c72b5
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-10-25 12:27:11 +02:00
Josef Schlehofer 77e682a11c
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-10-25 07:57:23 +02:00
Karl Palsson f4ce13b700 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-09-26 09:38:00 +00:00
Rosen Penev 9c5d4fb5a4 libwebsockets: fix compilation with GCC12
Upstream backport.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2022-06-09 10:59:53 -07:00
Rosen Penev 7d1a019734 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-02-14 17:20:42 -08:00
Karl Palsson 689dabd8de 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>
2021-08-25 10:10:55 +00:00
Ronny Kotzschmar 35876858d1 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>
2021-08-20 10:31:49 +00:00
Karl Palsson 1557ac367a 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>
2021-08-03 17:29:16 +00:00
Karl Palsson 0e186bd511 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>
2021-08-03 17:29:16 +00:00
Rosen Penev 2e654b19f3 treewide: back to cmake.mk
Ninja was merged to base and therefore we can now use normal cmake.mk

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2021-06-12 21:05:01 -07:00
Rosen Penev a31b732007 treewide: build CMake projects with Ninja
faster to compile.

A small selection of packages was tested going from:

Executed in  696.30 secs   fish           external
   usr time   82.98 mins  395.00 micros   82.98 mins
   sys time    9.02 mins    0.00 micros    9.02 mins

to:

Executed in  592.20 secs   fish           external
   usr time   84.84 mins  361.00 micros   84.84 mins
   sys time    8.85 mins   57.00 micros    8.85 mins

Tested by running make -j 12 and wiping staging/build_dir/target_x

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2021-03-27 21:51:50 -07:00
Karl Palsson 544c7b22b6 libwebsockets: update to 4.1.6
This is a major version bump, from 3.x to 4.x, and continues the path
towards a mail client.

New features:
* ntp client
* dns resolver
* mqtt client
* number humanizing string helpers

License change upstream.
cmake options tweaked to match current upstream defaults again.

Tested with mosquitto and ttyd.

Signed-off-by: Karl Palsson <karlp@etactica.com>
2021-03-15 16:05:58 +00:00
Karl Palsson d5bace89cf Revert "libwebsockets: move to 3.2.1"
This reverts commit 7066486fbb.

LWS 3.2.x and 4.0.x are broken on ath79 and malta-be, (at least)

See https://github.com/warmcat/libwebsockets/issues/2008
and
https://github.com/openwrt/packages/issues/13085

Restore a functional 3.1 release until upstream release.

Signed-off-by: Karl Palsson <karlp@etactica.com>
2020-08-21 13:13:45 +00:00
Karl Palsson 7066486fbb libwebsockets: move to 3.2.1
3.2.x is formally "not maintained" and people should stick with 3.1.x
until a new release of the master branch occurs.  However, in reality,
3.2.1 has been released, with performance improvements and fixes.

Signed-off-by: Karl Palsson <karlp@etactica.com>
2020-01-09 13:39:01 +00:00
Mathew McBride 19c284e05d libwebsockets: enable unix socket support in the full build
This functionality can be used by downstream applications such as
ttyd to present their HTTP service as a unix domain socket rather
than a TCP server.

Signed-off-by: Mathew McBride <matt@traverse.com.au>
2020-01-08 16:41:34 +11:00
Jeffery To 53e1692ae9 treewide: Use default PKG_BUILD_DIR when possible
This removes lines that set PKG_BUILD_DIR when the set value is no
different from the default value.

Specifically, the line is removed if the assigned value is:

* $(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)

  The default PKG_BUILD_DIR was updated[1] to incorporate BUILD_VARIANT
  if it is set, so now this is identical to the default value.

* $(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_SOURCE_SUBDIR)

  if PKG_SOURCE_SUBDIR is set to $(PKG_NAME)-$(PKG_VERSION), making it
  the same as the previous case

* $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

  This is the same as the default PKG_BUILD_DIR when there is no
  BUILD_VARIANT.

* $(BUILD_DIR)/[name]-$(PKG_VERSION)

  where [name] is a string that is identical to PKG_NAME

[1]: https://git.openwrt.org/?p=openwrt/openwrt.git;a=commit;h=e545fac8d968864a965edb9e50c6f90940b0a6c9

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2019-10-13 02:01:34 +08:00
Karl Palsson 05ec863154 libwebsockets: bump to 3.1.0
Drops an openssl deprecation patch applied upstream.

Changes since 3.0.0, the following list of websocket related features:
* gzip+brotli compression in the webserver
* threadpools
* string tokenizers
* http reverse proxies
* managed disk cache

Full changes at https://libwebsockets.org/git/libwebsockets/tree/changelog?id=89eedcaa94e1c8a97ea3af10642fd224bcea068f#n4

Tested on ath79, and classic usage of libwebsockets to provide
websockets support to a C application.

Signed-off-by: Karl Palsson <karlp@etactica.com>
2018-12-10 15:33:50 +00:00
Rosen Penev e54ecea1b0 libwebsockets: Fix build without deprecated OpenSSL APIs
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-11-09 12:25:58 +00:00
Karl Palsson 21c29aa2a9 libwebsockets: bump to 3.0.1
As usual, LWS upstream completely failed to maintain their changelog.
Skimming the git log by hand, probably the biggest change of note here
is fixed compatibility with openssl 1.1.0

Tested on ath79.
Signed-off-by: Karl Palsson <karlp@etactica.com>
2018-09-12 17:35:28 +00:00
Rosen Penev 4b9ec8dbae libwebsockets: Update to 3.0.0
Removed upstreamed patch.

Also added a patch to fix Travis.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Tested-by: Karl Palsson <karlp@etactica.com>
2018-07-05 10:45:01 +00:00
Alexander Couzens 3531c3a6c0 libwebsockets: remove build hostname
Using the build hostname breaks reproducible builds.
The patch is already merged upstream

Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
2017-12-11 10:51:46 +00:00
Karl Palsson fd00a9eaca libwebsockets: bump to version 2.4.1
No changelog entry upstream unfortunately.

Signed-off-by: Karl Palsson <karlp@etactica.com>
2017-12-11 10:46:57 +00:00
Karl Palsson c97d4999f8 libwebsockets: Upgrade to 2.4.0 and drop wolfssl for mbedtls
Libwebsockets 2.4.0 now includes mbedtls as a first class citizen.
Drop the problematic and poorly supported wolf/cyassl variant and add
mbedtls variant instead.

Signed-off-by: Karl Palsson <karlp@etactica.com>
2017-10-25 10:53:25 +00:00
Karl Palsson de2196a77e libwebsockets: rename cyassl variant to wolfssl
libwolfssl doesn't exist yet, but at least get all the names right as
much as we can.

Signed-off-by: Karl Palsson <karlp@etactica.com>
2017-09-01 12:07:39 +00:00
Alexandru Ardelean 8419a2e354 libwebsockets: fix build for cyassl variant
Looks like the cyassl redirect to wolfssl does not work flawlessly in libwebsockets.

Tested with libwolfssl 3.12.0 & 3.10.0 from LEDE.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-09-01 11:44:15 +00:00
Karl Palsson 3aab07b0d6 libwebsockets: bump to 2.2.1
Changelog is
https://github.com/warmcat/libwebsockets/blob/v2.2.1/changelog

Since 2.0.3, the last version packaged, banner highlights are:

* mountains of work on lws being it's own webserver
* fixes apparently, but they don't get changelog entries.

Signed-off-by: Karl Palsson <karlp@etactica.com>
2017-05-05 11:36:37 +00:00
Denis Osvald 7982274860 libwebsockets: fix typos referencing package name
In commit f82287cf5c (treewide: use name in define and eval lines)
two typos were committed as result of replacing PKG_NAME macro with
actual package name.

Undo those typos here to make the affected variants installable.

Signed-off-by: Denis Osvald <denis.osvald@sartura.hr>
2017-03-28 17:50:01 +02:00
Stijn Tintel f82287cf5c treewide: use name in define and eval lines
For consistency, use full name instead of $(PKG_NAME) in define and eval
lines for all packages.

I've seen reviews that asked to do this before, and I am asking the same
during reviews now. To avoid this in the future, fix this treewide so
when people use existing packages as example, we will not have to
request this change anymore.

This makes all packages consistent with both LEDE and OpenWrt base
repositories.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
2017-03-08 21:15:20 +01:00
Denis Osvald 55c38be4cc libwebsockets: use tarball releases instead of git
Signed-off-by: Denis Osvald <denis.osvald@sartura.hr>
2016-10-13 19:11:54 +02:00
Denis Osvald 02302c5eb2 libwebsockets: bump to v2.0.3
Signed-off-by: Denis Osvald <denis.osvald@sartura.hr>
2016-10-13 17:23:24 +02:00
Denis Osvald 09e331107e libwebsockets: add full variant with libuv, plugins, CGI
Signed-off-by: Denis Osvald <denis.osvald@sartura.hr>
2016-10-11 11:02:02 +02:00
Karl Palsson 0bde9e3c14 libwebsockets: Upgrade to latest stable release.
Fairly major bump from 1.7.x to 2.0.2.

Changelog (mostly) available at:
https://github.com/warmcat/libwebsockets/blob/v2.0-stable/changelog

Signed-off-by: Karl Palsson <karlp@etactica.com>
2016-08-26 09:48:56 +00:00
Karl Palsson c96eae9549 libwebsockets: Update maintainer email
Signed-off-by: Karl Palsson <karlp@remake.is>
Signed-off-by: Karl Palsson <karlp@etactica.com>
2016-08-26 09:48:56 +00:00
Karl Palsson 9afd7c83e4 libwebsockets: bump to 1.7.5
Minor fixes, see
https://github.com/warmcat/libwebsockets/blob/v1.7-stable/changelog for
full changelog.

Signed-off-by: Karl Palsson <karlp@etactica.com>
2016-04-05 15:39:29 +00:00
Karl Palsson 709a1337be libwebsockets: Bump version to 1.7.3
Latest "stable" release from 1.7.x branch.

Signed-off-by: Karl Palsson <karlp@etactica.com>
2016-03-08 15:10:03 +00:00
Karl Palsson cc422ba64b libwebsockets: bump to v1.6.2
Many user api changes, largely to cleanup and make more consistent.
Full changelog available at
http://git.libwebsockets.org/cgi-bin/cgit/libwebsockets/tree/changelog

Signed-off-by: Karl Palsson <karlp@remake.is>
2016-01-25 13:41:56 +00:00
Karl Palsson 58c51c1e2a libwebsockets: Correctly enable IPv6 support
Signed-off-by: Karl Palsson <karlp@remake.is>
2016-01-25 13:41:56 +00:00
Karl Palsson 5ccaccf03b libwebsockets: Bump to version 1.5
Very minor changes in this release, but best to keep up.

Full changelog available at
http://git.libwebsockets.org/cgi-bin/cgit/libwebsockets/tree/changelog

Signed-off-by: Karl Palsson <karlp@remake.is>
2015-11-05 14:00:41 +00:00
Steven Barth 1d853ac05a all: get rid of kmod-ipv6 dependencies
Signed-off-by: Steven Barth <steven@midlink.org>
2015-10-06 09:04:29 +02:00
Karl Palsson d3fd7b1126 libwebsockets: Add maintainer/url info
I added the package originally, guess I should maintain it.

Signed-off-by: Karl Palsson <karlp@remake.is>
2015-05-07 14:09:12 +00:00
Karl Palsson affb6cb9ed libwebsockets: update to 1.4.x release.
This changes the ABI and .so number, so it is only suitable for
trunk packages.  A patch included upstream has been dropped.

Full changelog:
https://github.com/warmcat/libwebsockets/blob/master/changelog

Signed-off-by: Karl Palsson <karlp@remake.is>
2015-05-07 14:06:04 +00:00
Nicolas Thill 09a07e9f21 libwebsockets: don't use github conflicting tag archives (#1051)
Signed-off-by: Nicolas Thill <nico@openwrt.org>
2015-05-01 04:52:50 +02:00
Karl Palsson 8e6fc86dd5 libs: libwebsockets: add latest released version
This includes a patch for cyassl building that has been committed
upstream, but not released.

There's no SPDX license identifier for LGPL + static linking exception,
so I've used "LGPL-2.1+exception" as suggested at
http://lwn.net/Articles/378329/

See also: https://github.com/warmcat/libwebsockets/issues/170

Signed-off-by: Karl Palsson <karlp@remake.is>
2014-12-18 16:28:05 +00:00