X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=package%2Flibs%2Fustream-ssl%2FMakefile;h=4a8a8d393d7944b2452d02296d8c518a0c70b223;hp=cd6b78f09326fd49b799ceb982a0aeb1538f3ee3;hb=b77a72ce0cc236adb45ed61d56725021cebbb300;hpb=8ba022ab48723a1c4caa726750a7b82d51257f8f

diff --git a/package/libs/ustream-ssl/Makefile b/package/libs/ustream-ssl/Makefile
index cd6b78f093..4a8a8d393d 100644
--- 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-07-24
+PKG_VERSION:=2016-02-21
 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:=daa954de38f2bf4e2fbc41ac7917f8447d37a2a0
+PKG_SOURCE_VERSION:=6ba14990e63fc956e8aff3b0b09be1fd3aaa6d75
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 CMAKE_INSTALL:=1
 
@@ -26,19 +26,20 @@ define Package/libustream/default
   CATEGORY:=Libraries
   TITLE:=ustream SSL Library
   DEPENDS:=+libubox
+  ABI_VERSION:=$(PKG_VERSION)
 endef
 
 define Package/libustream-openssl
   $(Package/libustream/default)
   TITLE += (openssl)
-  DEPENDS += +libopenssl
+  DEPENDS += +PACKAGE_libustream-openssl:libopenssl
   VARIANT:=openssl
 endef
 
 define Package/libustream-cyassl
   $(Package/libustream/default)
   TITLE += (cyassl)
-  DEPENDS += +libcyassl
+  DEPENDS += +PACKAGE_libustream-cyassl:libcyassl
   VARIANT:=cyassl
 endef
 
@@ -47,15 +48,27 @@ define Package/libustream-polarssl
   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/
@@ -65,7 +78,9 @@ 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))