mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 07:28:39 +01:00
nginx: bump to 1.9.6
In this bump as agreed with Thomas we are dropping out all the nginx 3rd party addons. In case you would like to see your 3rd party addon included please send a pull request and make sure it works with newest version. Signed-off-by: Luka Perkov <luka@openwrt.org>
This commit is contained in:
Luka Perkov
committed by
Zoltan HERPAI
Zoltan HERPAI
parent
3c7b3d57dd
commit
d44b07c279
+27
-166
@@ -8,27 +8,25 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=nginx
|
||||
PKG_VERSION:=1.4.7
|
||||
PKG_RELEASE:=4
|
||||
PKG_VERSION:=1.9.6
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=http://nginx.org/download/
|
||||
PKG_MD5SUM:=aee151d298dcbfeb88b3f7dd3e7a4d17
|
||||
PKG_MD5SUM:=f6899825e7a8deadba4948ff84515ad6
|
||||
PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
|
||||
PKG_LICENSE:=2-clause BSD-like license
|
||||
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/nginx-$(PKG_VERSION)
|
||||
|
||||
PKG_BUILD_PARALLEL:=1
|
||||
PKG_INSTALL:=1
|
||||
|
||||
PKG_CONFIG_DEPENDS := \
|
||||
CONFIG_NGINX_STUB_STATUS \
|
||||
CONFIG_NGINX_FLV \
|
||||
CONFIG_NGINX_SSL \
|
||||
CONFIG_NGINX_DAV \
|
||||
CONFIG_NGINX_LUA \
|
||||
CONFIG_NGINX_SPNEGO \
|
||||
CONFIG_NGINX_PCRE \
|
||||
CONFIG_NGINX_HTTP_CACHE \
|
||||
CONFIG_NGINX_FLV \
|
||||
CONFIG_NGINX_STUB_STATUS \
|
||||
CONFIG_NGINX_HTTP_CHARSET \
|
||||
CONFIG_NGINX_HTTP_GZIP \
|
||||
CONFIG_NGINX_HTTP_SSI \
|
||||
@@ -50,7 +48,13 @@ PKG_CONFIG_DEPENDS := \
|
||||
CONFIG_NGINX_HTTP_LIMIT_REQ \
|
||||
CONFIG_NGINX_HTTP_EMPTY_GIF \
|
||||
CONFIG_NGINX_HTTP_BROWSER \
|
||||
CONFIG_NGINX_HTTP_UPSTREAM_IP_HASH
|
||||
CONFIG_NGINX_HTTP_UPSTREAM_HASH \
|
||||
CONFIG_NGINX_HTTP_UPSTREAM_IP_HASH \
|
||||
CONFIG_NGINX_HTTP_UPSTREAM_LEAST_CONN \
|
||||
CONFIG_NGINX_HTTP_UPSTREAM_KEEPALIVE \
|
||||
CONFIG_NGINX_HTTP_UPSTREAM_ZONE \
|
||||
CONFIG_NGINX_HTTP_CACHE \
|
||||
CONFIG_NGINX_PCRE
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
@@ -60,7 +64,7 @@ define Package/nginx
|
||||
SUBMENU:=Web Servers/Proxies
|
||||
TITLE:=Nginx web server
|
||||
URL:=http://nginx.org/
|
||||
DEPENDS:=+NGINX_PCRE:libpcre +(NGINX_SSL||NGINX_HTTP_CACHE||NGINX_HTTP_AUTH_BASIC):libopenssl +NGINX_HTTP_GZIP:zlib +libpthread +NGINX_LUA:liblua +NGINX_SPNEGO:krb5-libs
|
||||
DEPENDS:=+NGINX_PCRE:libpcre +(NGINX_SSL||NGINX_HTTP_CACHE||NGINX_HTTP_AUTH_BASIC):libopenssl +NGINX_HTTP_GZIP:zlib +libpthread
|
||||
MENU:=1
|
||||
endef
|
||||
|
||||
@@ -80,9 +84,6 @@ define Package/nginx/conffiles
|
||||
endef
|
||||
|
||||
ADDITIONAL_MODULES:=
|
||||
ifeq ($(CONFIG_NGINX_NAXSI),y)
|
||||
ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-naxsi/naxsi_src
|
||||
endif
|
||||
ifeq ($(CONFIG_IPV6),y)
|
||||
ADDITIONAL_MODULES += --with-ipv6
|
||||
endif
|
||||
@@ -98,13 +99,6 @@ endif
|
||||
ifeq ($(CONFIG_NGINX_DAV),y)
|
||||
ADDITIONAL_MODULES += --with-http_dav_module
|
||||
endif
|
||||
ifeq ($(CONFIG_NGINX_LUA),y)
|
||||
ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/lua-nginx
|
||||
endif
|
||||
ifeq ($(CONFIG_NGINX_SPNEGO),y)
|
||||
ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/spnego-http-auth-nginx-module
|
||||
TARGET_CFLAGS += -I $(STAGING_DIR)/usr/include/krb5
|
||||
endif
|
||||
ifneq ($(CONFIG_NGINX_HTTP_CACHE),y)
|
||||
ADDITIONAL_MODULES += --without-http-cache
|
||||
endif
|
||||
@@ -174,23 +168,21 @@ endif
|
||||
ifneq ($(CONFIG_NGINX_HTTP_BROWSER),y)
|
||||
ADDITIONAL_MODULES += --without-http_browser_module
|
||||
endif
|
||||
ifneq ($(CONFIG_NGINX_HTTP_UPSTREAM_HASH),y)
|
||||
ADDITIONAL_MODULES += --without-http_upstream_hash_module
|
||||
endif
|
||||
ifneq ($(CONFIG_NGINX_HTTP_UPSTREAM_IP_HASH),y)
|
||||
ADDITIONAL_MODULES += --without-http_upstream_ip_hash_module
|
||||
endif
|
||||
ifeq ($(CONFIG_NGINX_PROXYPROTOCOL),y)
|
||||
ADDITIONAL_MODULES += --with-proxy-protocol
|
||||
ifneq ($(CONFIG_NGINX_HTTP_UPSTREAM_LEAST_CONN),y)
|
||||
ADDITIONAL_MODULES += --without-http_upstream_least_conn_module
|
||||
endif
|
||||
ifeq ($(CONFIG_NGINX_SYSLOG),y)
|
||||
ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-syslog
|
||||
endif
|
||||
ifeq ($(CONFIG_NGINX_HTTP_UPSTREAM_CHECK),y)
|
||||
ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-upstream-check
|
||||
ifneq ($(CONFIG_NGINX_HTTP_UPSTREAM_KEEPALIVE),y)
|
||||
ADDITIONAL_MODULES += --without-http_upstream_keepalive_module
|
||||
endif
|
||||
|
||||
define Build/Configure
|
||||
# TODO: fix --crossbuild
|
||||
(cd $(PKG_BUILD_DIR) ;\
|
||||
$(if $(CONFIG_NGINX_LUA),LUA_INC=$(STAGING_DIR)/usr/include LUA_LIB=$(STAGING_DIR)/usr/lib) \
|
||||
( cd $(PKG_BUILD_DIR) ; \
|
||||
./configure \
|
||||
--crossbuild=Linux::$(ARCH) \
|
||||
--prefix=/usr \
|
||||
@@ -205,7 +197,9 @@ define Build/Configure
|
||||
--http-fastcgi-temp-path=/var/lib/nginx/fastcgi \
|
||||
--with-cc="$(TARGET_CC)" \
|
||||
--with-cc-opt="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
|
||||
--with-ld-opt="$(TARGET_LDFLAGS)" )
|
||||
--with-ld-opt="$(TARGET_LDFLAGS)" \
|
||||
--without-http_upstream_zone_module \
|
||||
)
|
||||
endef
|
||||
|
||||
define Package/nginx/install
|
||||
@@ -217,137 +211,4 @@ define Package/nginx/install
|
||||
$(INSTALL_BIN) ./files/nginx.init $(1)/etc/init.d/nginx
|
||||
endef
|
||||
|
||||
define Build/Prepare
|
||||
$(call Build/Prepare/Default)
|
||||
$(if $(CONFIG_NGINX_LUA),$(call Prepare/lua-nginx))
|
||||
$(if $(CONFIG_NGINX_SPNEGO),$(call Prepare/spnego-http-auth-nginx-module))
|
||||
$(if $(CONFIG_NGINX_NAXSI),$(call Prepare/nginx-naxsi))
|
||||
$(if $(CONFIG_NGINX_SYSLOG),$(call Prepare/nginx-syslog))
|
||||
$(if $(CONFIG_NGINX_HTTP_UPSTREAM_CHECK),$(call Prepare/nginx-upstream-check))
|
||||
endef
|
||||
|
||||
define Download/lua-nginx
|
||||
VERSION:=d3ab0edd45bffe1b9a36abdf5bff544de436ccee
|
||||
SUBDIR:=lua-nginx
|
||||
FILE:=lua-nginx-module-$(PKG_VERSION)-$$(VERSION).tar.gz
|
||||
URL:=https://github.com/chaoslawful/lua-nginx-module.git
|
||||
PROTO:=git
|
||||
endef
|
||||
|
||||
define Prepare/lua-nginx
|
||||
$(eval $(call Download,lua-nginx))
|
||||
gzip -dc $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
|
||||
$(call PatchDir,$(PKG_BUILD_DIR),./patches-lua-nginx)
|
||||
endef
|
||||
|
||||
define Download/nginx-upstream-check
|
||||
VERSION:=d40b9f956d9d978005bb15616d2f283d4e3d2031
|
||||
SUBDIR:=nginx-upstream-check
|
||||
FILE:=nginx-upstream-check-$(PKG_VERSION)-$$(VERSION).tar.gz
|
||||
URL:=https://github.com/yaoweibin/nginx_upstream_check_module.git
|
||||
PROTO:=git
|
||||
endef
|
||||
|
||||
define Prepare/nginx-upstream-check
|
||||
$(eval $(call Download,nginx-upstream-check))
|
||||
gzip -dc $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
|
||||
$(call PatchDir,$(PKG_BUILD_DIR),./patches-nginx-upstream-check)
|
||||
endef
|
||||
|
||||
|
||||
define Package/nginx-naxsi
|
||||
MENU:=1
|
||||
$(call Package/nginx)
|
||||
TITLE:=nginx-naxsi
|
||||
DEPENDS:=nginx @NGINX_NAXSI
|
||||
endef
|
||||
|
||||
define Package/nginx-naxsi/description
|
||||
NGINX WAF NAXSI
|
||||
endef
|
||||
|
||||
define Package/nginx-proxyprotocol
|
||||
MENU:=1
|
||||
$(call Package/nginx)
|
||||
TITLE:=nginx
|
||||
DEPENDS:=nginx @NGINX_PROXYPROTOCOL
|
||||
endef
|
||||
|
||||
define Package/nginx-proxyprotocol/description
|
||||
IMPLEMENT Proxy Protocol
|
||||
endef
|
||||
|
||||
define Package/nginx-syslog
|
||||
MENU:=1
|
||||
$(call Package/nginx)
|
||||
TITLE:=nginx-syslog
|
||||
DEPENDS:=nginx @NGINX_SYSLOG
|
||||
endef
|
||||
|
||||
define Package/nginx-syslog/description
|
||||
IMPLEMENT Syslog Protocol
|
||||
endef
|
||||
|
||||
define Download/nginx-naxsi
|
||||
VERSION:=34dcb45fe4fdcb144c5258d83672f8e1e1c8db2e
|
||||
SUBDIR:=nginx-naxsi
|
||||
FILE:=nginx-naxsi-module-$(PKG_VERSION)-$$(VERSION).tar.gz
|
||||
URL:=https://github.com/nbs-system/naxsi.git
|
||||
PROTO:=git
|
||||
endef
|
||||
|
||||
define Prepare/nginx-naxsi
|
||||
$(eval $(call Download,nginx-naxsi))
|
||||
gzip -dc $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
|
||||
endef
|
||||
|
||||
define Package/nginx-naxsi/install
|
||||
$(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
|
||||
endef
|
||||
|
||||
define Download/nginx-syslog
|
||||
VERSION:=7abf48e52552c40a21463e1a8c608e0e575261cd
|
||||
SUBDIR:=nginx-syslog
|
||||
FILE:=nginx-syslog-module-$(PKG_VERSION)-$$(VERSION).tar.gz
|
||||
URL:=https://github.com/splitice/nginx_syslog_patch.git
|
||||
PROTO:=git
|
||||
endef
|
||||
|
||||
define Prepare/nginx-syslog
|
||||
$(eval $(call Download,nginx-syslog))
|
||||
gzip -dc $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
|
||||
endef
|
||||
|
||||
define Package/nginx-proxyprotocol/install
|
||||
$(INSTALL_DIR) $(1)/etc/nginx
|
||||
$(INSTALL_BIN) ./files/nginx.proxyprotocol.example $(1)/etc/nginx/nginx.conf.proxyprotocol
|
||||
chmod 0640 $(1)/etc/nginx/nginx.conf.proxyprotocol
|
||||
endef
|
||||
|
||||
define Package/nginx-syslog/install
|
||||
$(INSTALL_DIR) $(1)/etc/nginx
|
||||
$(INSTALL_BIN) ./files/nginx.syslog.example $(1)/etc/nginx/nginx.conf.syslog
|
||||
chmod 0640 $(1)/etc/nginx/nginx.conf.syslog
|
||||
endef
|
||||
|
||||
|
||||
define Download/spnego-http-auth-nginx-module
|
||||
VERSION:=c85a38c595
|
||||
SUBDIR:=spnego-http-auth-nginx-module
|
||||
FILE:=spnego-http-auth-nginx-module-$(PKG_VERSION)-$$(VERSION).tar.gz
|
||||
URL:=https://github.com/stnoonan/spnego-http-auth-nginx-module
|
||||
PROTO:=git
|
||||
endef
|
||||
|
||||
define Prepare/spnego-http-auth-nginx-module
|
||||
$(eval $(call Download,spnego-http-auth-nginx-module))
|
||||
gzip -dc $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,nginx))
|
||||
$(eval $(call BuildPackage,nginx-naxsi))
|
||||
$(eval $(call BuildPackage,nginx-proxyprotocol))
|
||||
$(eval $(call BuildPackage,nginx-syslog))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user