package/libwebsockets: bump version to 4.0.20

Other changes:
  - Remove upstream patch.
  - Change license type to MIT.
  - Update license shasum due to the above change.
  - Upstrem agained optional support for libglib2 and fsmount, we
    disable those so far

Signed-off-by: Adam Duskett <Aduskett@gmail.com>
[yann.morin.1998@free.fr: forcibly disable new features]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>

diff --git a/package/libwebsockets/0001-CMakeLists-txt-fix-static-build-with-openssl.patch b/package/libwebsockets/0001-CMakeLists-txt-fix-static-build-with-openssl.patch
deleted file mode 100644 (file)
index 868685d..0000000
--- a/package/libwebsockets/0001-CMakeLists-txt-fix-static-build-with-openssl.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 5f8134cfe5e7b90a8ce07d27ae737dcc54b523b3 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Wed, 16 Oct 2019 20:09:13 +0200
-Subject: [PATCH] CMakeLists.txt: fix static build with openssl
-
-openssl can depends on -latomic so use pkg-config (if available) to
-retrieve these static dependencies otherwise build will fail because
-HMAC_CTX_new test will return a wrong result
-
-Fixes:
- - http://autobuild.buildroot.org/results/65d0528b208c0a470264f7e2433be89425971dd7
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Retrieved (and backported) from:
-https://github.com/warmcat/libwebsockets/commit/5f8134cfe5e7b90a8ce07d27ae737dcc54b523b3]
----
- CMakeLists.txt | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2693ac56a..888f65e83 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1803,7 +1803,10 @@ if (LWS_WITH_SSL)
-               if (NOT OPENSSL_FOUND AND NOT LWS_WITH_BORINGSSL)
-                       # TODO: Add support for STATIC also.
-               if (NOT LWS_WITH_ESP32)
-+                      find_package(PkgConfig QUIET)
-+                      pkg_check_modules(PC_OPENSSL openssl QUIET)
-                       find_package(OpenSSL REQUIRED)
-+                      list(APPEND OPENSSL_LIBRARIES ${PC_OPENSSL_LIBRARIES})
-               endif()
-                       set(OPENSSL_INCLUDE_DIRS "${OPENSSL_INCLUDE_DIR}")
-               endif()

diff --git a/package/libwebsockets/libwebsockets.hash b/package/libwebsockets/libwebsockets.hash
index ca0c1db2d5ef0242b17ca904bfb9f2918b36b4bc..3963370710f2eebc1fe192b47809ac724f349963 100644 (file)
--- a/package/libwebsockets/libwebsockets.hash
+++ b/package/libwebsockets/libwebsockets.hash
@@ -1,3 +1,3 @@
 # Locally computed:
-sha256 166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c  libwebsockets-3.2.2.tar.gz
-sha256  4d092cd5e062c5ab0cf6408963d74619b5baf1571344410be6aa5bcef512eb70  LICENSE
+sha256  a26d243f2642a9b810e7d91f1e66b149d1da978decdca58ce1c9218c454f397e  libwebsockets-4.0.20.tar.gz
+sha256  5756db345eb9c21cb06dd7cb69c38ec234657a233f9a186b4f5fa453681bd394  LICENSE

diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk
index 6716d527960dc0503f22aefeaf32a61a1e3b0d47..376321585bf28f19399ad1c647aaa1ec941d6fc0 100644 (file)
--- a/package/libwebsockets/libwebsockets.mk
+++ b/package/libwebsockets/libwebsockets.mk
@@ -4,13 +4,15 @@
 #
 ################################################################################
 
-LIBWEBSOCKETS_VERSION = 3.2.2
+LIBWEBSOCKETS_VERSION = 4.0.20
 LIBWEBSOCKETS_SITE = $(call github,warmcat,libwebsockets,v$(LIBWEBSOCKETS_VERSION))
-LIBWEBSOCKETS_LICENSE = LGPL-2.1 with exceptions
+LIBWEBSOCKETS_LICENSE = MIT with exceptions
 LIBWEBSOCKETS_LICENSE_FILES = LICENSE
 LIBWEBSOCKETS_DEPENDENCIES = zlib
 LIBWEBSOCKETS_INSTALL_STAGING = YES
 LIBWEBSOCKETS_CONF_OPTS = \
+       -DLWS_WITH_FSMOUNT=OFF \
+       -DLWS_WITH_GLIB=OFF \
        -DLWS_WITHOUT_TESTAPPS=ON \
        -DLWS_IPV6=ON \
        -DLWS_UNIX_SOCK=ON \