From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 8 Nov 2015 20:39:09 +0000 (+0000)
Subject: uhttpd: update to the latest version, adds support for redirect helper scripts
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1d6a530fe6a129814fc93a45df01a01342569be8;p=openwrt%2Fstaging%2Fyousong.git

uhttpd: update to the latest version, adds support for redirect helper scripts

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 47419
---

diff --git a/package/network/services/uhttpd/Makefile b/package/network/services/uhttpd/Makefile
index d14e3a942e..f757696f64 100644
--- a/package/network/services/uhttpd/Makefile
+++ b/package/network/services/uhttpd/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uhttpd
-PKG_VERSION:=2015-10-20
+PKG_VERSION:=2015-11-08
 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:=618315bc0729c3064e06af2900a86211354f81c9
+PKG_SOURCE_VERSION:=fe01ef3f52adae9da38ef47926cd50974af5d6b7
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
 PKG_LICENSE:=ISC
@@ -33,7 +33,7 @@ endef
 
 define Package/uhttpd
   $(Package/uhttpd/default)
-  DEPENDS:=+libubox
+  DEPENDS:=+libubox +libblobmsg-json +libjson-script
 endef
 
 define Package/uhttpd/description
diff --git a/package/network/services/uhttpd/files/uhttpd.init b/package/network/services/uhttpd/files/uhttpd.init
index fcde52a564..d6ffc3b4c9 100755
--- a/package/network/services/uhttpd/files/uhttpd.init
+++ b/package/network/services/uhttpd/files/uhttpd.init
@@ -135,6 +135,10 @@ start_instance()
 		append_bool "$cfg" redirect_https "-q" 0
 	}
 
+	for file in /etc/uhttpd/*.json; do
+		[ -s "$file" ] && procd_append_param command -H "$file"
+	done
+
 	procd_close_instance
 }