From 1f37d710e7485e2c31be55476cf5a88c6b56336b Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 18 Nov 2015 12:39:06 +0000 Subject: [PATCH] uhttpd: update to the latest version, adds support for redirect helper scripts Signed-off-by: Felix Fietkau Backport of r47419 SVN-Revision: 47499 --- package/network/services/uhttpd/Makefile | 6 +++--- package/network/services/uhttpd/files/uhttpd.init | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) 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 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 9bde7e5312..f4c49685ed 100755 --- a/package/network/services/uhttpd/files/uhttpd.init +++ b/package/network/services/uhttpd/files/uhttpd.init @@ -136,6 +136,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 } -- 2.30.2