Author: nbd Date: 2015-11-18 13:39:06 +0100 (Wed, 18 Nov 2015) New Revision: 47499
Modified: branches/chaos_calmer/package/network/services/uhttpd/Makefile branches/chaos_calmer/package/network/services/uhttpd/files/uhttpd.init Log: uhttpd: update to the latest version, adds support for redirect helper scripts Signed-off-by: Felix Fietkau <[email protected]> Backport of r47419 Modified: branches/chaos_calmer/package/network/services/uhttpd/Makefile =================================================================== --- branches/chaos_calmer/package/network/services/uhttpd/Makefile 2015-11-18 12:39:00 UTC (rev 47498) +++ branches/chaos_calmer/package/network/services/uhttpd/Makefile 2015-11-18 12:39:06 UTC (rev 47499) @@ -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 <[email protected]> PKG_LICENSE:=ISC @@ -33,7 +33,7 @@ define Package/uhttpd $(Package/uhttpd/default) - DEPENDS:=+libubox + DEPENDS:=+libubox +libblobmsg-json +libjson-script endef define Package/uhttpd/description Modified: branches/chaos_calmer/package/network/services/uhttpd/files/uhttpd.init =================================================================== --- branches/chaos_calmer/package/network/services/uhttpd/files/uhttpd.init 2015-11-18 12:39:00 UTC (rev 47498) +++ branches/chaos_calmer/package/network/services/uhttpd/files/uhttpd.init 2015-11-18 12:39:06 UTC (rev 47499) @@ -136,6 +136,10 @@ 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 } _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
