ustream-ssl: update to the latest version, adds cyassl/wolfssl fixes

[openwrt/openwrt.git] / package / libs / ustream-ssl / Makefile

diff --git a/package/libs/ustream-ssl/Makefile b/package/libs/ustream-ssl/Makefile
index 9fef5e7f1999cd1911c6e039ca91a75a4b542ed3..1729e82a816a7a64003d901b26329b2c9f316378 100644 (file)
--- a/package/libs/ustream-ssl/Makefile
+++ b/package/libs/ustream-ssl/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ustream-ssl
-PKG_VERSION:=2013-01-22
+PKG_VERSION:=2016-06-07
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://nbd.name/ustream-ssl.git
+PKG_SOURCE_URL=$(OPENWRT_GIT)/project/ustream-ssl.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=da607e6272d789ed5dae3b0efff90912fda6f81f
+PKG_SOURCE_VERSION:=17085b7abc0cd09c64ccace6f8d16ddee5729678
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 CMAKE_INSTALL:=1
 
@@ -16,7 +16,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_SOURCE_SUBDIR)
 PKG_LICENSE:=ISC
 PKG_LICENSE_FILES:=
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
@@ -26,6 +26,7 @@ define Package/libustream/default
   CATEGORY:=Libraries
   TITLE:=ustream SSL Library
   DEPENDS:=+libubox
+  ABI_VERSION:=$(PKG_VERSION)
 endef
 
 define Package/libustream-openssl
@@ -42,10 +43,32 @@ define Package/libustream-cyassl
   VARIANT:=cyassl
 endef
 
+define Package/libustream-polarssl
+  $(Package/libustream/default)
+  TITLE += (polarssl)
+  DEPENDS += +libpolarssl
+  VARIANT:=polarssl
+  DEFAULT_VARIANT:=1
+endef
+
+define Package/libustream-mbedtls
+  $(Package/libustream/default)
+  TITLE += (mbedtls)
+  DEPENDS += +libmbedtls
+  VARIANT:=mbedtls
+  DEFAULT_VARIANT:=1
+endef
+
 ifeq ($(BUILD_VARIANT),cyassl)
-  TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/cyassl
+  TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/cyassl -DHAVE_SNI
   CMAKE_OPTIONS += -DCYASSL=on
 endif
+ifeq ($(BUILD_VARIANT),polarssl)
+  CMAKE_OPTIONS += -DPOLARSSL=on
+endif
+ifeq ($(BUILD_VARIANT),mbedtls)
+  CMAKE_OPTIONS += -DMBEDTLS=on
+endif
 
 define Package/libustream/default/install
        $(INSTALL_DIR) $(1)/lib/
@@ -54,6 +77,10 @@ endef
 
 Package/libustream-openssl/install = $(Package/libustream/default/install)
 Package/libustream-cyassl/install = $(Package/libustream/default/install)
+Package/libustream-polarssl/install = $(Package/libustream/default/install)
+Package/libustream-mbedtls/install = $(Package/libustream/default/install)
 
+$(eval $(call BuildPackage,libustream-polarssl))
+$(eval $(call BuildPackage,libustream-mbedtls))
 $(eval $(call BuildPackage,libustream-cyassl))
 $(eval $(call BuildPackage,libustream-openssl))