ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-29 18:19:02 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
8f714af40b
openwrt/package/network/services/uhttpd/Makefile

127 lines
3.1 KiB
Makefile
Raw Normal View History

add uhttpd (moved from LuCI trunk) SVN-Revision: 20428
2010-03-25 15:46:16 +00:00
#
treewide: replace jow@openwrt.org with jo@mein.io Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-06-07 09:42:32 +00:00
# Copyright (C) 2010-2015 Jo-Philipp Wich <jo@mein.io>
add uhttpd (moved from LuCI trunk) SVN-Revision: 20428
2010-03-25 15:46:16 +00:00
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=uhttpd
uhttpd: handle reload after uhttpd-mod-ubus installation using postinst Use postinst script to reload service instead of uci-defaults hack. It's possible thanks to recent base-files change that executes postinst after uci-defaults. This fixes support for uhttpd customizations. It's possible (again) to adjust uhttpd config with custom uci-defaults before it gets started. Cc: Hauke Mehrtens <hauke@hauke-m.de> Fixes: d25d281fd668 ("uhttpd: Reload config after uhttpd-mod-ubus was added") Ref: b799dd3c705d ("base-files: execute package's "postinst" after executing uci-defaults") Signed-off-by: Rafał Miłecki <rafal@milecki.pl> (cherry picked from commit 1f11a4e28336c07aca61dd3b4fef01ef872a362d)
2023-12-27 15:20:45 +00:00
PKG_RELEASE:=2
uhttpd: switch to external git repo + cmake build system SVN-Revision: 33775
2012-10-15 12:31:33 +00:00
PKG_SOURCE_PROTO:=git
treewide: replace LEDE_GIT with PROJECT_GIT Remove LEDE_GIT references in favor to the new name-agnostic PROJECT_GIT variable. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-01-05 09:46:06 +00:00
PKG_SOURCE_URL=$(PROJECT_GIT)/project/uhttpd.git
uhttpd: update to latest git HEAD 34a8a74 uhttpd/file: fix string out of buffer range on uh_defer_script Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> (cherry picked from commit 7a6f6b812632a5983cd34ab5c41271d5d4de5fbf)
2023-06-25 18:03:42 +00:00
PKG_SOURCE_DATE:=2023-06-25
PKG_SOURCE_VERSION:=34a8a74dbdec3c0de38abc1b08f6a73c51263792
PKG_MIRROR_HASH:=8206885eebed5d1827763bcc5bcf9ca3510ae22b0ad1f6432114f1136c32dde2
treewide: replace nbd@openwrt.org with nbd@nbd.name Signed-off-by: Felix Fietkau <nbd@nbd.name>
2016-06-07 06:58:31 +00:00
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
Add a few SPDX tags Signed-off-by: Steven Barth <steven@midlink.org> SVN-Revision: 43151
2014-11-02 12:20:54 +00:00
PKG_LICENSE:=ISC
add uhttpd (moved from LuCI trunk) SVN-Revision: 20428
2010-03-25 15:46:16 +00:00
uhttpd: Activate PIE by default This activates PIE ASLR support by default when the regular option is selected. This increases the binary size by 39% uncompressed and 21% compressed on MIPS BE. old: 33,189 /usr/sbin/uhttpd 23,016 uhttpd_2019-08-17-6b03f960-4_mips_24kc.ipk new: 46,212 /usr/sbin/uhttpd 27,979 uhttpd_2019-08-17-6b03f960-4_mips_24kc.ipk Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Acked-by: Petr Štetiar <ynezz@true.cz>
2019-10-27 14:13:30 +00:00
PKG_ASLR_PIE_REGULAR:=1
uhttpd: always turn on TLS support, include ustream-ssl as a build dependency SVN-Revision: 35295
2013-01-22 15:05:04 +00:00
PKG_BUILD_DEPENDS = ustream-ssl
add uhttpd (moved from LuCI trunk) SVN-Revision: 20428
2010-03-25 15:46:16 +00:00
include $(INCLUDE_DIR)/package.mk
uhttpd: switch to external git repo + cmake build system SVN-Revision: 33775
2012-10-15 12:31:33 +00:00
include $(INCLUDE_DIR)/cmake.mk
uhttpd: use configured distribution name for SSL certificate CN Signed-off-by: Felix Fietkau <nbd@nbd.name>
2016-05-21 10:42:44 +00:00
include $(INCLUDE_DIR)/version.mk
uhttpd: switch to external git repo + cmake build system SVN-Revision: 33775
2012-10-15 12:31:33 +00:00
add uhttpd (moved from LuCI trunk) SVN-Revision: 20428
2010-03-25 15:46:16 +00:00
define Package/uhttpd/default
SECTION:=net
CATEGORY:=Network
uhttpd: Moved uhttpd to Network|Web Servers/Proxies submenu, just like all the other web serves and proxies from the packages feed SVN-Revision: 26062
2011-03-12 04:47:02 +00:00
SUBMENU:=Web Servers/Proxies
add uhttpd (moved from LuCI trunk) SVN-Revision: 20428
2010-03-25 15:46:16 +00:00
TITLE:=uHTTPd - tiny, single threaded HTTP server
endef
define Package/uhttpd
$(Package/uhttpd/default)
uhttpd: add direct dependency on libjson-c The OpenWrt buildroot ABI version rebuild tracker does not handle transient dependencies, therefor add all libraries linked by uhttpd as direct dependencies to the corresponding binary package definition. This ensures that uhttpd is automatically rebuilt and relinked if any of these libraries has its ABI_VERSION updated in the future. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-06-20 16:07:49 +00:00
DEPENDS:=+libubox +libblobmsg-json +libjson-script +libjson-c
add uhttpd (moved from LuCI trunk) SVN-Revision: 20428
2010-03-25 15:46:16 +00:00
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
uhttpd: update to latest Git HEAD 2f8b136 main: fix leaking -p/-s argument values 881fd3b ucode: adjust to latest ucode api 8b2868e file: specify UTF-8 as charset for dirlists, add option to override 3a5bd84 main: add ucode options to help text 16aa142 examples: add ucode handler example 3ceccd0 ucode: add ucode plugin support f0f1406 examples: add example Lua handler script 9e87095 listen: avoid invalid memory access Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2021-11-23 18:30:30 +00:00
define Package/uhttpd/conffiles
/etc/config/uhttpd
/etc/uhttpd.crt
/etc/uhttpd.key
endef
add uhttpd (moved from LuCI trunk) SVN-Revision: 20428
2010-03-25 15:46:16 +00:00
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
uhttpd: - rewrite large parts of the server, use uloop event driven structure - support concurrent requests and make the upper limit configurable - implement initial version of HTTP-to-ubus JSON proxy and session.* namespace - add compile time support for debug information - code style changes - bump package revision SVN-Revision: 31931
2012-05-28 00:52:24 +00:00
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
uhttpd: update to latest Git HEAD 2f8b136 main: fix leaking -p/-s argument values 881fd3b ucode: adjust to latest ucode api 8b2868e file: specify UTF-8 as charset for dirlists, add option to override 3a5bd84 main: add ucode options to help text 16aa142 examples: add ucode handler example 3ceccd0 ucode: add ucode plugin support f0f1406 examples: add example Lua handler script 9e87095 listen: avoid invalid memory access Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2021-11-23 18:30:30 +00:00
define Package/uhttpd-mod-ucode
$(Package/uhttpd/default)
TITLE+= (ucode plugin)
DEPENDS:=uhttpd +libucode
endef
define Package/uhttpd-mod-ucode/description
The ucode plugin adds a CGI-like ucode runtime interface to uHTTPd.
add uhttpd (moved from LuCI trunk) SVN-Revision: 20428
2010-03-25 15:46:16 +00:00
endef
uhttpd: update to latest Git HEAD 2f8b136 main: fix leaking -p/-s argument values 881fd3b ucode: adjust to latest ucode api 8b2868e file: specify UTF-8 as charset for dirlists, add option to override 3a5bd84 main: add ucode options to help text 16aa142 examples: add ucode handler example 3ceccd0 ucode: add ucode plugin support f0f1406 examples: add example Lua handler script 9e87095 listen: avoid invalid memory access Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2021-11-23 18:30:30 +00:00
packages: more (e)glibc fixes after r44701 _GNU_SOURCE has been declared "deprecated" in favor of _DEFAULT_SOURCE in glibc Signed-off-by: Nicolas Thill <nico@openwrt.org> SVN-Revision: 44843
2015-03-16 12:32:22 +00:00
ifneq ($(CONFIG_USE_GLIBC),)
TARGET_CFLAGS += -D_DEFAULT_SOURCE
endif
add uhttpd (moved from LuCI trunk) SVN-Revision: 20428
2010-03-25 15:46:16 +00:00
define Package/uhttpd/install
uhttpd: clean up Makefile uhttpd's cmake options all default to ON. Either we set all of them or none if the defaults need to be changed. Let's go with the latter. Because support for all modules is always compiled in, remove two unused and useless config toggles. uhttpd detects and uses libcrypt itself, no need to add it here again. Signed-off-by: Andre Heider <a.heider@gmail.com>
2022-11-28 09:06:07 +00:00
$(INSTALL_DIR) $(1)/etc/init.d $(1)/etc/config $(1)/usr/sbin
add uhttpd (moved from LuCI trunk) SVN-Revision: 20428
2010-03-25 15:46:16 +00:00
$(INSTALL_BIN) ./files/uhttpd.init $(1)/etc/init.d/uhttpd
$(INSTALL_CONF) ./files/uhttpd.config $(1)/etc/config/uhttpd
uhttpd: use configured distribution name for SSL certificate CN Signed-off-by: Felix Fietkau <nbd@nbd.name>
2016-05-21 10:42:44 +00:00
$(VERSION_SED_SCRIPT) $(1)/etc/config/uhttpd
add uhttpd (moved from LuCI trunk) SVN-Revision: 20428
2010-03-25 15:46:16 +00:00
$(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
uhttpd: - rewrite large parts of the server, use uloop event driven structure - support concurrent requests and make the upper limit configurable - implement initial version of HTTP-to-ubus JSON proxy and session.* namespace - add compile time support for debug information - code style changes - bump package revision SVN-Revision: 31931
2012-05-28 00:52:24 +00:00
define Package/uhttpd-mod-ubus/install
uhttp: make sure that the ubus module is loaded when when installed Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 38723
2013-11-11 12:18:58 +00:00
$(INSTALL_DIR) $(1)/usr/lib $(1)/etc/uci-defaults
uhttpd: - rewrite large parts of the server, use uloop event driven structure - support concurrent requests and make the upper limit configurable - implement initial version of HTTP-to-ubus JSON proxy and session.* namespace - add compile time support for debug information - code style changes - bump package revision SVN-Revision: 31931
2012-05-28 00:52:24 +00:00
$(INSTALL_BIN) $(PKG_BUILD_DIR)/uhttpd_ubus.so $(1)/usr/lib/
uhttp: make sure that the ubus module is loaded when when installed Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 38723
2013-11-11 12:18:58 +00:00
$(INSTALL_DATA) ./files/ubus.default $(1)/etc/uci-defaults/00_uhttpd_ubus
uhttpd: - rewrite large parts of the server, use uloop event driven structure - support concurrent requests and make the upper limit configurable - implement initial version of HTTP-to-ubus JSON proxy and session.* namespace - add compile time support for debug information - code style changes - bump package revision SVN-Revision: 31931
2012-05-28 00:52:24 +00:00
endef
uhttpd: handle reload after uhttpd-mod-ubus installation using postinst Use postinst script to reload service instead of uci-defaults hack. It's possible thanks to recent base-files change that executes postinst after uci-defaults. This fixes support for uhttpd customizations. It's possible (again) to adjust uhttpd config with custom uci-defaults before it gets started. Cc: Hauke Mehrtens <hauke@hauke-m.de> Fixes: d25d281fd668 ("uhttpd: Reload config after uhttpd-mod-ubus was added") Ref: b799dd3c705d ("base-files: execute package's "postinst" after executing uci-defaults") Signed-off-by: Rafał Miłecki <rafal@milecki.pl> (cherry picked from commit 1f11a4e28336c07aca61dd3b4fef01ef872a362d)
2023-12-27 15:20:45 +00:00
define Package/uhttpd-mod-ubus/postinst
#!/bin/sh
if [ -z "$${IPKG_INSTROOT}" ]; then
/etc/init.d/uhttpd reload
fi
endef
uhttpd: update to latest Git HEAD 2f8b136 main: fix leaking -p/-s argument values 881fd3b ucode: adjust to latest ucode api 8b2868e file: specify UTF-8 as charset for dirlists, add option to override 3a5bd84 main: add ucode options to help text 16aa142 examples: add ucode handler example 3ceccd0 ucode: add ucode plugin support f0f1406 examples: add example Lua handler script 9e87095 listen: avoid invalid memory access Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2021-11-23 18:30:30 +00:00
define Package/uhttpd-mod-ucode/install
$(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_BIN) $(PKG_BUILD_DIR)/uhttpd_ucode.so $(1)/usr/lib/
endef
add uhttpd (moved from LuCI trunk) SVN-Revision: 20428
2010-03-25 15:46:16 +00:00
$(eval $(call BuildPackage,uhttpd))
$(eval $(call BuildPackage,uhttpd-mod-lua))
uhttpd: - rewrite large parts of the server, use uloop event driven structure - support concurrent requests and make the upper limit configurable - implement initial version of HTTP-to-ubus JSON proxy and session.* namespace - add compile time support for debug information - code style changes - bump package revision SVN-Revision: 31931
2012-05-28 00:52:24 +00:00
$(eval $(call BuildPackage,uhttpd-mod-ubus))
uhttpd: update to latest Git HEAD 2f8b136 main: fix leaking -p/-s argument values 881fd3b ucode: adjust to latest ucode api 8b2868e file: specify UTF-8 as charset for dirlists, add option to override 3a5bd84 main: add ucode options to help text 16aa142 examples: add ucode handler example 3ceccd0 ucode: add ucode plugin support f0f1406 examples: add example Lua handler script 9e87095 listen: avoid invalid memory access Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2021-11-23 18:30:30 +00:00
$(eval $(call BuildPackage,uhttpd-mod-ucode))
Reference in New Issue Copy Permalink