From 7e20373cde8610afda9cd99104cbb99e164b24a1 Mon Sep 17 00:00:00 2001 From: Ansuel Smith Date: Sat, 16 Nov 2019 17:07:51 +0100 Subject: [PATCH] nginx: update to 1.17.5 Signed-off-by: Ansuel Smith --- net/nginx/Makefile | 14 +++++++------- net/nginx/patches/201-ignore-invalid-options.patch | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/net/nginx/Makefile b/net/nginx/Makefile index c14d77d062..d558bfdd69 100644 --- a/net/nginx/Makefile +++ b/net/nginx/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nginx -PKG_VERSION:=1.16.1 -PKG_RELEASE:=5 +PKG_VERSION:=1.17.5 +PKG_RELEASE:=1 PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://nginx.org/download/ -PKG_HASH:=f11c2a6dd1d3515736f0324857957db2de98be862461b5a542a3ac6188dbe32b +PKG_HASH:=63ee35e15a75af028ffa1f995e2b9c120b59ef5f1b61a23b8a4c33c262fc10c3 PKG_MAINTAINER:=Thomas Heil \ Ansuel Smith @@ -547,18 +547,18 @@ endif ifeq ($(CONFIG_NGINX_UBUS),y) define Download/nginx-ubus-module - VERSION:=29537c50018153375376b11febd5e4f1da6ba54e + VERSION:=4547af00991357c9bc3bf4266b7c1547841bf204 SUBDIR:=nginx-ubus-module - FILE:=nginx-ubus-module-$$(VERSION).tar.gz + FILE:=nginx-ubus-module-$$(VERSION).tar.xz URL:=https://github.com/Ansuel/nginx-ubus-module.git - MIRROR_HASH:=85a465a2d24e018f9aabfc6c9b1610e48593c7f2169f88ac4c0d535605aeb5e1 + MIRROR_HASH:=4e354934bd5fbd82b3d4c5ada19459c0f12162186a7a101a6426e2e1f30a8236 PROTO:=git endef $(eval $(call Download,nginx-ubus-module)) define Prepare/nginx-ubus-module $(eval $(Download/nginx-ubus-module)) - gzip -dc $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS) + xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS) endef endif diff --git a/net/nginx/patches/201-ignore-invalid-options.patch b/net/nginx/patches/201-ignore-invalid-options.patch index 28be2fb717..88b521353c 100644 --- a/net/nginx/patches/201-ignore-invalid-options.patch +++ b/net/nginx/patches/201-ignore-invalid-options.patch @@ -1,6 +1,6 @@ --- a/auto/options +++ b/auto/options -@@ -397,8 +397,7 @@ $0: warning: the \"--with-sha1-asm\" opt +@@ -396,8 +396,7 @@ $0: warning: the \"--with-sha1-asm\" opt --test-build-solaris-sendfilev) NGX_TEST_BUILD_SOLARIS_SENDFILEV=YES ;; *) -- 2.30.2