From 1ec65d0b75cab26d5361b7dc9305f7649a8a8518 Mon Sep 17 00:00:00 2001 From: Val Kulkov Date: Wed, 1 Feb 2017 00:25:57 -0500 Subject: [PATCH] nginx: update to 1.10.3, add new module options Update nginx to version 1.10.3. Add new configuration options to enable the following optional modules (disabled by default): - http_auth_request_module - http_v2_module - http_realip_module - http_secure_link_module Signed-off-by: Val Kulkov --- net/nginx/Config.in | 20 ++++++++++++++++++++ net/nginx/Makefile | 22 +++++++++++++++++++--- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/net/nginx/Config.in b/net/nginx/Config.in index bf6b834c2..4cec04026 100644 --- a/net/nginx/Config.in +++ b/net/nginx/Config.in @@ -66,6 +66,11 @@ config NGINX_HTTP_AUTH_BASIC prompt "Enable HTTP auth basic" default y +config NGINX_HTTP_AUTH_REQUEST + bool + prompt "Enable HTTP auth request module" + default n + config NGINX_HTTP_AUTOINDEX bool prompt "Enable HTTP autoindex module" @@ -167,6 +172,11 @@ config NGINX_HTTP_CACHE prompt "Enable HTTP cache" default y +config NGINX_HTTP_V2 + bool + prompt "Enable HTTP_V2 module" + default n + config NGINX_PCRE bool prompt "Enable PCRE library usage" @@ -182,4 +192,14 @@ config NGINX_LUA prompt "Enable Lua module" default n +config NGINX_HTTP_REAL_IP + bool + prompt "Enable HTTP real ip module" + default n + +config NGINX_HTTP_SECURE_LINK + bool + prompt "Enable HTTP secure link module" + default n + endmenu diff --git a/net/nginx/Makefile b/net/nginx/Makefile index 5ebdaa51d..42f831ba0 100644 --- a/net/nginx/Makefile +++ b/net/nginx/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nginx -PKG_VERSION:=1.10.2 +PKG_VERSION:=1.10.3 PKG_RELEASE:=1 PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://nginx.org/download/ -PKG_MD5SUM:=e8f5f4beed041e63eb97f9f4f55f3085 +PKG_MD5SUM:=204a20cb4f0b0c9db746c630d89ff4ea PKG_MAINTAINER:=Thomas Heil 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