nginx: update to 1.12.1

[feed/packages.git] / net / nginx / Makefile

diff --git a/net/nginx/Makefile b/net/nginx/Makefile
index fa1e8739121cb6ac23acf2e1321c1562da68829c..4624c1aa1e901e1dcfbdecfbfd1564ab4400852b 100644 (file)
--- a/net/nginx/Makefile
+++ b/net/nginx/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nginx
-PKG_VERSION:=1.10.1
-PKG_RELEASE:=2
+PKG_VERSION:=1.12.1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://nginx.org/download/
-PKG_MD5SUM:=088292d9caf6059ef328aa7dda332e44
+PKG_HASH:=8793bf426485a30f91021b6b945a9fd8a84d87d17b566562c3797aba8fac76fb
 PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
 PKG_LICENSE:=2-clause BSD-like license
 
@@ -33,6 +33,7 @@ PKG_CONFIG_DEPENDS := \
        CONFIG_NGINX_HTTP_USERID \
        CONFIG_NGINX_HTTP_ACCESS \
        CONFIG_NGINX_HTTP_AUTH_BASIC \
+       CONFIG_NGINX_HTTP_AUTH_REQUEST \
        CONFIG_NGINX_HTTP_AUTOINDEX \
        CONFIG_NGINX_HTTP_GEO \
        CONFIG_NGINX_HTTP_MAP \
@@ -54,9 +55,12 @@ PKG_CONFIG_DEPENDS := \
        CONFIG_NGINX_HTTP_UPSTREAM_KEEPALIVE \
        CONFIG_NGINX_HTTP_UPSTREAM_ZONE \
        CONFIG_NGINX_HTTP_CACHE \
+       CONFIG_NGINX_HTTP_V2 \
        CONFIG_NGINX_PCRE \
        CONFIG_NGINX_NAXSI \
-       CONFIG_NGINX_LUA
+       CONFIG_NGINX_LUA \
+       CONFIG_NGINX_HTTP_REAL_IP \
+       CONFIG_NGINX_HTTP_SECURE_LINK
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -133,6 +137,9 @@ endif
 ifneq ($(CONFIG_NGINX_HTTP_AUTH_BASIC),y)
   ADDITIONAL_MODULES += --without-http_auth_basic_module
 endif
+ifeq ($(CONFIG_NGINX_HTTP_AUTH_REQUEST),y)
+  ADDITIONAL_MODULES += --with-http_auth_request_module
+endif
 ifneq ($(CONFIG_NGINX_HTTP_AUTOINDEX),y)
   ADDITIONAL_MODULES += --without-http_autoindex_module
 endif
@@ -192,6 +199,15 @@ endif
 ifneq ($(CONFIG_NGINX_HTTP_UPSTREAM_KEEPALIVE),y)
   ADDITIONAL_MODULES += --without-http_upstream_keepalive_module
 endif
+ifeq ($(CONFIG_NGINX_HTTP_V2),y)
+  ADDITIONAL_MODULES += --with-http_v2_module
+endif
+ifeq ($(CONFIG_NGINX_HTTP_REAL_IP),y)
+  ADDITIONAL_MODULES += --with-http_realip_module
+endif
+ifeq ($(CONFIG_NGINX_HTTP_SECURE_LINK),y)
+  ADDITIONAL_MODULES += --with-http_secure_link_module
+endif
 
 TARGET_CFLAGS += -fvisibility=hidden -ffunction-sections -fdata-sections -DNGX_LUA_NO_BY_LUA_BLOCK
 TARGET_LDFLAGS += -Wl,--gc-sections
@@ -241,7 +257,7 @@ define Build/Prepare
 endef
 
 define Download/nginx-naxsi
-       VERSION:=7a6ff365f6be736c826b2d69b967a250ac07197d
+       VERSION:=cf73f9c8664127252c2a4958d2e169516d3845a1
        SUBDIR:=nginx-naxsi
        FILE:=nginx-naxsi-module-$(PKG_VERSION)-$$(VERSION).tar.gz
        URL:=https://github.com/nbs-system/naxsi.git