#
-# Copyright (C) 2010-2015 Jo-Philipp Wich <jow@openwrt.org>
+# Copyright (C) 2010-2015 Jo-Philipp Wich <jo@mein.io>
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
include $(TOPDIR)/rules.mk
PKG_NAME:=uhttpd
-PKG_VERSION:=2015-03-30
+PKG_VERSION:=2016-10-06
PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://nbd.name/uhttpd2.git
+PKG_SOURCE_URL=$(LEDE_GIT)/project/uhttpd.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=b9178b9357798ae23a5724333cc6572d14f23958
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_SOURCE_VERSION:=c0b5444b533e7177394ceaa247de4495307f72d6
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
+PKG_MIRROR_MD5SUM:=24fbdd2a4e353668a64c9f729db74b3abdcfbbded6b63649696876ace455f252
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
PKG_LICENSE:=ISC
PKG_BUILD_DEPENDS = ustream-ssl
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk
+include $(INCLUDE_DIR)/version.mk
define Package/uhttpd/default
SECTION:=net
define Package/uhttpd
$(Package/uhttpd/default)
- DEPENDS:=+libubox
+ DEPENDS:=+libubox +libblobmsg-json +libjson-script
endef
define Package/uhttpd/description
TITLE+= (TLS plugin)
DEPENDS:=uhttpd \
+PACKAGE_uhttpd-mod-tls_polarssl:libustream-polarssl \
+ +PACKAGE_uhttpd-mod-tls_mbedtls:libustream-mbedtls \
+PACKAGE_uhttpd-mod-tls_cyassl:libustream-cyassl \
+PACKAGE_uhttpd-mod-tls_openssl:libustream-openssl
endef
prompt "TLS Provider"
default PACKAGE_uhttpd-mod-tls_polarssl
+ config PACKAGE_uhttpd-mod-tls_mbedtls
+ bool "mbedTLS"
+
config PACKAGE_uhttpd-mod-tls_polarssl
bool "PolarSSL"
$(INSTALL_BIN) ./files/uhttpd.init $(1)/etc/init.d/uhttpd
$(INSTALL_DIR) $(1)/etc/config
$(INSTALL_CONF) ./files/uhttpd.config $(1)/etc/config/uhttpd
+ $(VERSION_SED_SCRIPT) $(1)/etc/config/uhttpd
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/uhttpd $(1)/usr/sbin/uhttpd
endef