PKG_NAME:=nginx
PKG_VERSION:=1.21.3
-PKG_RELEASE:=3
+PKG_RELEASE:=4
PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://nginx.org/download/
PKG_CONFIG_DEPENDS := \
CONFIG_NGINX_DAV \
- CONFIG_NGINX_DAV_EXT \
CONFIG_NGINX_FLV \
- CONFIG_NGINX_UBUS \
CONFIG_NGINX_STUB_STATUS \
CONFIG_NGINX_HTTP_CHARSET \
CONFIG_NGINX_HTTP_GZIP \
CONFIG_NGINX_HTTP_CACHE \
CONFIG_NGINX_HTTP_V2 \
CONFIG_NGINX_PCRE \
- CONFIG_NGINX_NAXSI \
- CONFIG_NGINX_LUA \
CONFIG_NGINX_HTTP_REAL_IP \
CONFIG_NGINX_HTTP_SECURE_LINK \
- CONFIG_NGINX_HTTP_BROTLI \
- CONFIG_NGINX_HEADERS_MORE \
CONFIG_NGINX_STREAM_CORE_MODULE \
CONFIG_NGINX_STREAM_SSL_MODULE \
CONFIG_NGINX_STREAM_SSL_PREREAD_MODULE \
- CONFIG_NGINX_RTMP_MODULE \
- CONFIG_NGINX_TS_MODULE \
CONFIG_OPENSSL_ENGINE \
CONFIG_OPENSSL_WITH_NPN
VARIANT:=ssl
DEPENDS+= +NGINX_PCRE:libpcre \
+NGINX_PCRE:nginx-ssl-util +!NGINX_PCRE:nginx-ssl-util-nopcre \
- +NGINX_HTTP_GZIP:zlib +NGINX_LUA:liblua +NGINX_DAV:libxml2 \
- +NGINX_UBUS:libubus +NGINX_UBUS:libblobmsg-json +NGINX_UBUS:libjson-c
+ +NGINX_HTTP_GZIP:zlib +NGINX_DAV:libxml2
EXTRA_DEPENDS:=nginx-ssl-util$(if $(CONFIG_NGINX_PCRE),,-nopcre) (>=1.5-1) (<2)
CONFLICTS:=nginx-all-module
endef
define Package/nginx-all-module
$(Package/nginx/default)
TITLE += with ALL module selected
- DEPENDS+=+libpcre +nginx-ssl-util +zlib +liblua +libxml2 +libubus \
- +libblobmsg-json +libjson-c
+ DEPENDS+=+libpcre +nginx-ssl-util +zlib +libxml2 \
+ +nginx-mod-ubus +nginx-mod-naxsi +nginx-mod-lua \
+ +nginx-mod-dav-ext +nginx-mod-stream +nginx-mod-headers-more \
+ +nginx-mod-brotli +nginx-mod-rtmp +nginx-mod-ts
EXTRA_DEPENDS:=nginx-ssl-util (>=1.5-1) (<2)
VARIANT:=all-module
PROVIDES += nginx-ssl
Package/nginx-ssl/conffiles = $(Package/nginx/conffiles)
Package/nginx-all-module/conffiles = $(Package/nginx/conffiles)
-
ADDITIONAL_MODULES:= --with-http_ssl_module
ifneq ($(BUILD_VARIANT),all-module)
ifneq ($(CONFIG_NGINX_HTTP_UPSTREAM_KEEPALIVE),y)
ADDITIONAL_MODULES += --without-http_upstream_keepalive_module
endif
- ifeq ($(CONFIG_NGINX_NAXSI),y)
- ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-naxsi/naxsi_src
- endif
- ifeq ($(CONFIG_NGINX_LUA),y)
- ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/lua-nginx
- endif
ifeq ($(CONFIG_IPV6),y)
ADDITIONAL_MODULES += --with-ipv6
endif
ifeq ($(CONFIG_NGINX_DAV),y)
ADDITIONAL_MODULES += --with-http_dav_module
endif
- ifeq ($(CONFIG_NGINX_DAV_EXT),y)
- ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-dav-ext-module
- endif
- ifeq ($(CONFIG_NGINX_UBUS),y)
- ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-ubus-module
- endif
ifeq ($(CONFIG_NGINX_HTTP_AUTH_REQUEST),y)
ADDITIONAL_MODULES += --with-http_auth_request_module
endif
ifeq ($(CONFIG_NGINX_HTTP_SUB),y)
ADDITIONAL_MODULES += --with-http_sub_module
endif
- ifeq ($(CONFIG_NGINX_STREAM_CORE_MODULE),y)
- ADDITIONAL_MODULES += --with-stream
- endif
- ifeq ($(CONFIG_NGINX_STREAM_SSL_MODULE),y)
- ADDITIONAL_MODULES += --with-stream_ssl_module
- endif
- ifeq ($(CONFIG_NGINX_STREAM_SSL_PREREAD_MODULE),y)
- ADDITIONAL_MODULES += --with-stream_ssl_preread_module
- endif
- ifeq ($(CONFIG_NGINX_HEADERS_MORE),y)
- ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-headers-more
- endif
- ifeq ($(CONFIG_NGINX_HTTP_BROTLI),y)
- ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-brotli
- endif
- ifeq ($(CONFIG_NGINX_RTMP_MODULE),y)
- ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-rtmp
- endif
- ifeq ($(CONFIG_NGINX_TS_MODULE),y)
- ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-ts
- endif
else
- CONFIG_NGINX_HEADERS_MORE:=y
- CONFIG_NGINX_HTTP_BROTLI:=y
- CONFIG_NGINX_RTMP_MODULE:=y
- CONFIG_NGINX_TS_MODULE:=y
- CONFIG_NGINX_NAXSI:=y
- CONFIG_NGINX_LUA:=y
- CONFIG_NGINX_DAV:=y
- CONFIG_NGINX_DAV_EXT:=y
- CONFIG_NGINX_UBUS:=y
ADDITIONAL_MODULES += --with-ipv6 --with-http_stub_status_module --with-http_flv_module \
--with-http_dav_module \
--with-http_auth_request_module --with-http_v2_module --with-http_realip_module \
--with-http_secure_link_module --with-http_sub_module \
- --with-stream --with-stream_ssl_module --with-stream_ssl_preread_module \
- --add-module=$(PKG_BUILD_DIR)/nginx-headers-more \
- --add-module=$(PKG_BUILD_DIR)/nginx-naxsi/naxsi_src \
- --add-module=$(PKG_BUILD_DIR)/lua-nginx \
- --add-module=$(PKG_BUILD_DIR)/nginx-dav-ext-module \
- --add-module=$(PKG_BUILD_DIR)/nginx-brotli --add-module=$(PKG_BUILD_DIR)/nginx-rtmp \
- --add-module=$(PKG_BUILD_DIR)/nginx-ts --add-module=$(PKG_BUILD_DIR)/nginx-ubus-module
+ --with-stream_ssl_module --with-stream_ssl_preread_module \
config_files += koi-utf koi-win win-utf fastcgi_params uwsgi_params
endif
+ifneq ($(CONFIG_PACKAGE_nginx-mod-naxsi),)
+ ADDITIONAL_MODULES += --add-dynamic-module=$(PKG_BUILD_DIR)/nginx-naxsi/naxsi_src
+endif
+ifneq ($(CONFIG_PACKAGE_nginx-mod-lua),)
+ ADDITIONAL_MODULES += --add-dynamic-module=$(PKG_BUILD_DIR)/lua-nginx
+endif
+ifneq ($(CONFIG_PACKAGE_nginx-mod-dav-ext),)
+ ADDITIONAL_MODULES += --add-dynamic-module=$(PKG_BUILD_DIR)/nginx-dav-ext-module
+endif
+ifneq ($(CONFIG_NGINX_STREAM_CORE_MODULE),)
+ ADDITIONAL_MODULES += --with-stream=dynamic --with-stream_ssl_module --with-stream_ssl_preread_module
+endif
+ifneq ($(CONFIG_PACKAGE_nginx-mod-ubus),)
+ ADDITIONAL_MODULES += --add-dynamic-module=$(PKG_BUILD_DIR)/nginx-ubus-module
+endif
+ifneq ($(CONFIG_PACKAGE_nginx-mod-headers-more),)
+ ADDITIONAL_MODULES += --add-dynamic-module=$(PKG_BUILD_DIR)/nginx-headers-more
+endif
+ifneq ($(CONFIG_PACKAGE_nginx-mod-brotli),)
+ ADDITIONAL_MODULES += --add-dynamic-module=$(PKG_BUILD_DIR)/nginx-brotli
+endif
+ifneq ($(CONFIG_PACKAGE_nginx-mod-rtmp),)
+ ADDITIONAL_MODULES += --add-dynamic-module=$(PKG_BUILD_DIR)/nginx-rtmp
+endif
+ifneq ($(CONFIG_PACKAGE_nginx-mod-ts),)
+ ADDITIONAL_MODULES += --add-dynamic-module=$(PKG_BUILD_DIR)/nginx-ts
+endif
+ifeq ($(CONFIG_NGINX_GEOIP_MODULE),y)
+ ADDITIONAL_MODULES += --with-http_geoip_module=dynamic
+endif
+
define Package/nginx-mod-luci
TITLE:=Nginx on LuCI
SECTION:=net
SUBMENU:=Web Servers/Proxies
TITLE:=Support file for Nginx
URL:=http://nginx.org/
- DEPENDS:=+uwsgi +uwsgi-luci-support +nginx
+ DEPENDS:=+uwsgi +uwsgi-luci-support +nginx +nginx-mod-ubus
# TODO: add PROVIDES when removing nginx-mod-luci-ssl
# PROVIDES:=nginx-mod-luci-ssl
endef
Support file for LuCI in nginx. Include custom nginx configuration, autostart script for uwsgi.
endef
+NGINX_MODULES :=
+
+# $(1) module name
+# $(2) module additional dependency
+# $(3) module so name (stripped of the finaly _module.so)
+# $(4) module description
+define module
+ define Package/nginx-mod-$(strip $(1))
+ $(call Package/nginx/default)
+ DEPENDS:=+nginx-ssl $(2)
+ TITLE:=Nginx $(1) module
+ endef
+
+ define Package/nginx-mod-$(strip $(1))/description
+ $(4)
+ endef
+
+ define Package/nginx-mod-$(strip $(1))/install
+ $(INSTALL_DIR) $$(1)/usr/lib/nginx/modules
+ $(INSTALL_BIN) $$(PKG_INSTALL_DIR)/usr/lib/nginx/modules/$(3)_module.so $$(1)/usr/lib/nginx/modules
+ endef
+
+ NGINX_MODULES += nginx-mod-$(strip $(1))
+endef
+
+define brotli
+ define Package/nginx-mod-brotli
+ $(call Package/nginx/default)
+ DEPENDS:=+nginx-ssl
+ TITLE:=Nginx Brotli module
+ endef
+
+ define Package/nginx-mod-brotli/description
+ Add support for brotli compression module.
+ endef
+
+ define Package/nginx-mod-brotli/install
+ $(INSTALL_DIR) $$(1)/usr/lib/nginx/modules
+ $(INSTALL_BIN) $$(PKG_INSTALL_DIR)/usr/lib/nginx/modules/ngx_http_brotli_filter_module.so $$(1)/usr/lib/nginx/modules
+ $(INSTALL_BIN) $$(PKG_INSTALL_DIR)/usr/lib/nginx/modules/ngx_http_brotli_static_module.so $$(1)/usr/lib/nginx/modules
+ endef
+
+ NGINX_MODULES += nginx-mod-brotli
+endef
+
+define naxsi
+ define Package/nginx-mod-naxsi
+ $(call Package/nginx/default)
+ DEPENDS:=+nginx-ssl
+ TITLE:=Nginx naxsi module
+ endef
+
+ define Package/nginx-mod-naxsi/description
+ Enable NAXSI module.
+ endef
+
+ define Package/nginx-mod-naxsi/install
+ $(INSTALL_DIR) $$(1)/usr/lib/nginx/modules
+ $(INSTALL_BIN) $$(PKG_INSTALL_DIR)/usr/lib/nginx/modules/ngx_http_naxsi_module.so $$(1)/usr/lib/nginx/modules
-TARGET_CFLAGS += -fvisibility=hidden -DNGX_LUA_NO_BY_LUA_BLOCK
+ $(INSTALL_DIR) $$(1)/etc/nginx
+ $(INSTALL_BIN) $$(PKG_BUILD_DIR)/nginx-naxsi/naxsi_config/naxsi_core.rules $$(1)/etc/nginx
+ chmod 0640 $$(1)/etc/nginx/naxsi_core.rules
+
+ $(INSTALL_BIN) $$(PKG_BUILD_DIR)/nginx-naxsi/naxsi_config/naxsi_core.rules $$(1)/etc/nginx
+ chmod 0640 $$(1)/etc/nginx/naxsi_core.rules
+ endef
+
+ NGINX_MODULES += nginx-mod-naxsi
+endef
-ifeq ($(CONFIG_NGINX_LUA),y)
+$(eval $(call module,lua, +liblua,ngx_http_lua, Enable Lua module))
+$(eval $(call module,stream, +@NGINX_STREAM_CORE_MODULE,ngx_stream, Add support for NGINX request streaming.))
+$(eval $(call module,ubus, +libubus +libjson-c +libblobmsg-json +@NGINX_UBUS,ngx_http_ubus, Enable UBUS api support directly from the server.))
+$(eval $(call module,dav-ext, +@NGINX_DAV,ngx_http_dav_ext, Enable the WebDAV methods PROPFIND OPTIONS LOCK UNLOCK.))
+$(eval $(call module,headers-more,,ngx_http_headers_more_filter, Set and clear input and output headers...more than "add"!))
+$(eval $(call module,rtmp,,ngx_rtmp, Add support for NGINX-based Media Streaming Server module. \
+ DASH enhanced - https://github.com/ut0mt8/nginx-rtmp-module))
+$(eval $(call module, ts,,ngx_http_ts, Add support for MPEG-TS Live Module module.))
+$(eval $(call brotli))
+$(eval $(call naxsi))
+
+PKG_CONFIG_DEPENDS += $(patsubst %,CONFIG_PACKAGE_%,$(NGINX_MODULES))
+
+TARGET_CFLAGS += -DNGX_LUA_NO_BY_LUA_BLOCK
+
+ifneq ($(CONFIG_PACKAGE_nginx-mod-lua),)
CONFIGURE_VARS += LUA_INC=$(STAGING_DIR)/usr/include \
LUA_LIB=$(STAGING_DIR)/usr/lib
endif
--crossbuild=Linux::$(ARCH) \
--prefix=/usr \
--conf-path=/etc/nginx/nginx.conf \
+ --modules-path=/usr/lib/nginx/modules \
$(ADDITIONAL_MODULES) \
--error-log-path=stderr \
--pid-path=/var/run/nginx.pid \
--with-cc="$(TARGET_CC)" \
--with-cc-opt="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
--with-ld-opt="$(TARGET_LDFLAGS)" \
- --without-http_upstream_zone_module
+ --without-http_upstream_zone_module \
+ --without-pcre2
define Package/nginx-mod-luci/install
$(INSTALL_DIR) $(1)/etc/nginx/conf.d
$(INSTALL_DATA) $(addprefix $(PKG_INSTALL_DIR)/etc/nginx/,$(config_files)) $(1)/etc/nginx/
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/nginx.init $(1)/etc/init.d/nginx
-ifeq ($(CONFIG_NGINX_NAXSI),y)
- $(INSTALL_DIR) $(1)/etc/nginx
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/nginx-naxsi/naxsi_config/naxsi_core.rules $(1)/etc/nginx
- chmod 0640 $(1)/etc/nginx/naxsi_core.rules
-endif
- $(if $(CONFIG_NGINX_NAXSI),$($(INSTALL_BIN) $(PKG_BUILD_DIR)/nginx-naxsi/naxsi_config/naxsi_core.rules $(1)/etc/nginx))
- $(if $(CONFIG_NGINX_NAXSI),$(chmod 0640 $(1)/etc/nginx/naxsi_core.rules))
endef
Package/nginx-all-module/install = $(Package/nginx-ssl/install)
define Build/Patch
$(if $(QUILT),rm -rf $(PKG_BUILD_DIR)/patches; mkdir -p $(PKG_BUILD_DIR)/patches)
$(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/nginx,nginx/)
-ifneq "$(or $(CONFIG_NGINX_DAV_EXT),$(QUILT))" ""
+ifneq "$(or $(CONFIG_PACKAGE_nginx-mod-dav-ext),$(QUILT))" ""
$(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/dav-nginx,dav-nginx/)
endif
-ifneq "$(or $(CONFIG_NGINX_LUA),$(QUILT))" ""
+ifneq "$(or $(CONFIG_PACKAGE_nginx-mod-lua),$(QUILT))" ""
$(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/lua-nginx,lua-nginx/)
endif
-ifneq "$(or $(CONFIG_NGINX_RTMP_MODULE),$(QUILT))" ""
+ifneq "$(or $(CONFIG_PACKAGE_nginx-mod-rtmp),$(QUILT))" ""
$(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/rtmp-nginx,rtmp-nginx/)
endif
$(if $(QUILT),touch $(PKG_BUILD_DIR)/.quilt_used)
mkdir -p $(PKG_BUILD_DIR)
$(PKG_UNPACK)
-ifeq ($(CONFIG_NGINX_NAXSI),y)
+ifneq ($(CONFIG_PACKAGE_nginx-mod-naxsi),)
$(eval $(call Download,nginx-naxsi))
$(Prepare/nginx-naxsi)
endif
-ifneq "$(or $(CONFIG_NGINX_LUA),$(QUILT))" ""
+ifneq "$(or $(CONFIG_PACKAGE_nginx-mod-lua),$(QUILT))" ""
$(eval $(call Download,lua-nginx))
$(Prepare/lua-nginx)
endif
-ifeq ($(CONFIG_NGINX_HTTP_BROTLI),y)
+ifneq ($(CONFIG_PACKAGE_nginx-mod-brotli),)
$(eval $(call Download,nginx-brotli))
$(Prepare/nginx-brotli)
endif
-ifeq ($(CONFIG_NGINX_HEADERS_MORE),y)
+ifneq ($(CONFIG_PACKAGE_nginx-mod-headers-more),)
$(eval $(call Download,nginx-headers-more))
$(Prepare/nginx-headers-more)
endif
-ifneq "$(or $(CONFIG_NGINX_RTMP_MODULE),$(QUILT))" ""
+ifneq "$(or $(CONFIG_PACKAGE_nginx-mod-rtmp),$(QUILT))" ""
$(eval $(call Download,nginx-rtmp))
$(Prepare/nginx-rtmp)
endif
-ifeq ($(CONFIG_NGINX_TS_MODULE),y)
+ifneq ($(CONFIG_PACKAGE_nginx-mod-ts),)
$(eval $(call Download,nginx-ts))
$(Prepare/nginx-ts)
endif
-ifneq "$(or $(CONFIG_NGINX_DAV_EXT),$(QUILT))" ""
+ifneq "$(or $(CONFIG_PACKAGE_nginx-mod-dav-ext),$(QUILT))" ""
$(eval $(call Download,nginx-dav-ext-module))
$(Prepare/nginx-dav-ext-module)
endif
-ifeq ($(CONFIG_NGINX_UBUS),y)
+ifneq ($(CONFIG_PACKAGE_nginx-mod-ubus),)
$(eval $(call Download,nginx-ubus-module))
$(Prepare/nginx-ubus-module)
endif
$(eval $(call BuildPackage,nginx-all-module))
$(eval $(call BuildPackage,nginx-mod-luci))
+$(foreach m,$(NGINX_MODULES),$(eval $(call BuildPackage,$(m))))
+
# TODO: remove after a transition period (together with pkg nginx-util):
# It is for smoothly substituting nginx and nginx-mod-luci-ssl (by nginx-ssl
# respectively nginx-mod-luci). Add above commented PROVIDES when removing.
projects / feed / packages.git / blobdiff