mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 23:42:43 +00:00
7a8b75375c
Update to latest git HEAD in order to support configuring multiple
concurrent Lua prefixes in a single uhttpd instance:
b741dec lua: support multiple Lua prefixes
Additionally rework the init script and update the default configuration
example to treat the lua_prefix option as key=value uci list, similar to
the interpreter extension mapping. Support for the old "option lua_prefix"
plus "option lua_handler" notation is still present.
Finally drop the sed postinstall hack in uhttpd-mod-lua to avoid mangling
files belonging to other packages. Since Lua prefixes have precedence
over CGI prefixes, simply register `/cgi-bin/luci` as Lua handler which
will only become active if both luci-base and uhttpd-mod-lua is installed.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 214146c6f2)
114 lines
2.8 KiB
Makefile
114 lines
2.8 KiB
Makefile
#
|
|
# 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_RELEASE:=1
|
|
|
|
PKG_SOURCE_PROTO:=git
|
|
PKG_SOURCE_URL=$(PROJECT_GIT)/project/uhttpd.git
|
|
PKG_SOURCE_DATE:=2018-08-23
|
|
PKG_SOURCE_VERSION:=b741dec35698a80266fb8206970638e666774a33
|
|
PKG_MIRROR_HASH:=2f7c88ba1b36dd6776a7d954b4c5e96aff288992acf19152a38641c665e261e4
|
|
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
|
|
PKG_LICENSE:=ISC
|
|
|
|
PKG_BUILD_DEPENDS = ustream-ssl
|
|
PKG_CONFIG_DEPENDS:= CONFIG_uhttpd_lua
|
|
|
|
include $(INCLUDE_DIR)/package.mk
|
|
include $(INCLUDE_DIR)/cmake.mk
|
|
include $(INCLUDE_DIR)/version.mk
|
|
|
|
define Package/uhttpd/default
|
|
SECTION:=net
|
|
CATEGORY:=Network
|
|
SUBMENU:=Web Servers/Proxies
|
|
TITLE:=uHTTPd - tiny, single threaded HTTP server
|
|
endef
|
|
|
|
define Package/uhttpd
|
|
$(Package/uhttpd/default)
|
|
DEPENDS:=+libubox +libblobmsg-json +libjson-script
|
|
endef
|
|
|
|
define Package/uhttpd/description
|
|
uHTTPd is a tiny single threaded HTTP server with TLS, CGI and Lua
|
|
support. It is intended as a drop-in replacement for the Busybox
|
|
HTTP daemon.
|
|
endef
|
|
|
|
define Package/uhttpd/config
|
|
config uhttpd_lua
|
|
depends on PACKAGE_uhttpd-mod-lua
|
|
bool "Enable Integrated Lua interpreter"
|
|
default y
|
|
endef
|
|
|
|
define Package/uhttpd-mod-lua
|
|
$(Package/uhttpd/default)
|
|
TITLE+= (Lua plugin)
|
|
DEPENDS:=uhttpd +liblua
|
|
endef
|
|
|
|
define Package/uhttpd-mod-lua/description
|
|
The Lua plugin adds a CGI-like Lua runtime interface to uHTTPd.
|
|
endef
|
|
|
|
|
|
define Package/uhttpd-mod-ubus
|
|
$(Package/uhttpd/default)
|
|
TITLE+= (ubus plugin)
|
|
DEPENDS:=uhttpd +libubus +libblobmsg-json
|
|
endef
|
|
|
|
define Package/uhttpd-mod-ubus/description
|
|
The ubus plugin adds a HTTP/JSON RPC proxy for ubus and publishes the
|
|
session.* namespace and procedures.
|
|
endef
|
|
|
|
define Package/uhttpd/conffiles
|
|
/etc/config/uhttpd
|
|
/etc/uhttpd.crt
|
|
/etc/uhttpd.key
|
|
endef
|
|
|
|
ifneq ($(CONFIG_USE_GLIBC),)
|
|
TARGET_CFLAGS += -D_DEFAULT_SOURCE
|
|
endif
|
|
|
|
TARGET_LDFLAGS += -lcrypt
|
|
|
|
CMAKE_OPTIONS = -DTLS_SUPPORT=on
|
|
|
|
define Package/uhttpd/install
|
|
$(INSTALL_DIR) $(1)/etc/init.d
|
|
$(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
|
|
|
|
define Package/uhttpd-mod-lua/install
|
|
$(INSTALL_DIR) $(1)/usr/lib
|
|
$(INSTALL_BIN) $(PKG_BUILD_DIR)/uhttpd_lua.so $(1)/usr/lib/
|
|
endef
|
|
|
|
define Package/uhttpd-mod-ubus/install
|
|
$(INSTALL_DIR) $(1)/usr/lib $(1)/etc/uci-defaults
|
|
$(INSTALL_BIN) $(PKG_BUILD_DIR)/uhttpd_ubus.so $(1)/usr/lib/
|
|
$(INSTALL_DATA) ./files/ubus.default $(1)/etc/uci-defaults/00_uhttpd_ubus
|
|
endef
|
|
|
|
|
|
$(eval $(call BuildPackage,uhttpd))
|
|
$(eval $(call BuildPackage,uhttpd-mod-lua))
|
|
$(eval $(call BuildPackage,uhttpd-mod-ubus))
|