uhttpd: update to latest version, fixes compile error with latest libubox

[openwrt/openwrt.git] / package / network / services / uhttpd / Makefile

diff --git a/package/network/services/uhttpd/Makefile b/package/network/services/uhttpd/Makefile
index d9050bd630be78acec80cc13839a72a23f5c3334..6165ac3e4a5390d0eaec713e48f25c8388259384 100644 (file)
--- a/package/network/services/uhttpd/Makefile
+++ b/package/network/services/uhttpd/Makefile
@@ -8,21 +8,21 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uhttpd
-PKG_VERSION:=2013-01-21
+PKG_VERSION:=2013-04-15
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://nbd.name/uhttpd2.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=7bd66ddacb6b87a927b7846a44c02c0df7988c71
+PKG_SOURCE_VERSION:=9d83bd3c524c4bbeb8e6583155dd7df9e8a1b5d3
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
 
-PKG_CONFIG_DEPENDS = CONFIG_PACKAGE_uhttpd-mod-tls
+PKG_BUILD_DEPENDS = ustream-ssl
+
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
-
 define Package/uhttpd/default
   SECTION:=net
   CATEGORY:=Network
@@ -102,7 +102,7 @@ endef
 
 TARGET_LDFLAGS += -lcrypt
 
-CMAKE_OPTIONS = -DTLS_SUPPORT=$(if $(CONFIG_PACKAGE_uhttpd-mod-tls),on,off)
+CMAKE_OPTIONS = -DTLS_SUPPORT=on
 
 define Package/uhttpd/install
        $(INSTALL_DIR) $(1)/etc/init.d