Merge pull request #4853 from StevenHessing/noddos

[feed/packages.git] / libs / libwebsockets / Makefile

diff --git a/libs/libwebsockets/Makefile b/libs/libwebsockets/Makefile
index 27455a34c61b319b37816cc5d8dce8cc00ba5864..0fcae55988baba05eb41f173ed9bbbbf29735a4d 100644 (file)
--- a/libs/libwebsockets/Makefile
+++ b/libs/libwebsockets/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libwebsockets
-PKG_VERSION:=2.0.3
-PKG_RELEASE:=1
+PKG_VERSION:=2.2.1
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_URL:=https://codeload.github.com/warmcat/libwebsockets/tar.gz/v$(PKG_VERSION)?
-PKG_MD5SUM:=a025156d606d90579e65d53ccd062a94
+PKG_HASH:=e7f9eaef258e003c9ada0803a9a5636757a5bc0a58927858834fb38a87d18ad2
 
 
 PKG_SOURCE_VERSION:=v$(PKG_VERSION)
@@ -55,11 +55,11 @@ define Package/libwebsockets-openssl
        VARIANT:=openssl
 endef
 
-define Package/libwebsockets-cyassl
+define Package/libwebsockets-wolfssl
        $(call Package/libwebsockets/Default)
-       TITLE += (CyaSSL)
+       TITLE += (WolfSSL)
        DEPENDS += +libcyassl
-       VARIANT:=cyassl
+       VARIANT:=wolfssl
 endef
 
 define Package/libwebsockets-full
@@ -75,15 +75,15 @@ ifeq ($(BUILD_VARIANT),openssl)
     CMAKE_OPTIONS += -DLWS_WITH_SSL=ON
 endif
 
-ifeq ($(BUILD_VARIANT),cyassl)
+ifeq ($(BUILD_VARIANT),wolfssl)
     CMAKE_OPTIONS += -DLWS_OPENSSL_CLIENT_CERTS=/etc/ssl/certs
     CMAKE_OPTIONS += -DLWS_OPENSSL_SUPPORT=ON
     CMAKE_OPTIONS += -DLWS_WITH_SSL=ON
-# for cyassl, edit package/libs/cyassl/Makefile to include --enable-opensslextra
+# for wolfssl, edit package/libs/wolfssl/Makefile to include --enable-opensslextra
 # NOTE: it will compile without it, untested whether it it's needed?!
-    CMAKE_OPTIONS += -DLWS_USE_CYASSL=ON
-    CMAKE_OPTIONS += -DLWS_CYASSL_LIBRARIES=$(STAGING_DIR)/usr/lib/libcyassl.so
-    CMAKE_OPTIONS += -DLWS_CYASSL_INCLUDE_DIRS=$(STAGING_DIR)/usr/include
+    CMAKE_OPTIONS += -DLWS_USE_WOLFSSL=ON
+    CMAKE_OPTIONS += -DLWS_WOLFSSL_LIBRARIES=$(STAGING_DIR)/usr/lib/libwolfssl.so
+    CMAKE_OPTIONS += -DLWS_WOLFSSL_INCLUDE_DIRS=$(STAGING_DIR)/usr/include
 endif
 
 ifeq ($(BUILD_VARIANT),full)
@@ -102,10 +102,10 @@ define Package/libwebsockets/install
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwebsockets.so* $(1)/usr/lib/
 endef
 
-Package/libwebsockets-cyassl/install = $(Package/libwebsockets/install)
+Package/libwebsockets-wolfssl/install = $(Package/libwebsockets/install)
 Package/libwebsockets-openssl/install = $(Package/libwebsockets/install)
 Package/libwebsockets-full/install = $(Package/libwebsockets/install)
 
 $(eval $(call BuildPackage,libwebsockets-openssl))
-$(eval $(call BuildPackage,libwebsockets-cyassl))
+$(eval $(call BuildPackage,libwebsockets-wolfssl))
 $(eval $(call BuildPackage,libwebsockets-full))