From 925fc7a769e06ce36568e377da90387f11ac5069 Mon Sep 17 00:00:00 2001
From: Deng Qingfang <dengqf6@mail2.sysu.edu.cn>
Date: Tue, 1 Jan 2019 21:52:14 +0800
Subject: [PATCH] nginx: update to 1.15.8 and remove PKG_VERSION from modules
 tarball filename

Update to 1.15.8. Also use HTTPS
PKG_VERSION (nginx version) in 3rd-party modules tarball filename is dispensable and can be dropped to avoid unnecessary downloading

Signed-off-by: Deng Qingfang <dengqf6@mail2.sysu.edu.cn>
---
 net/nginx/Makefile | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/net/nginx/Makefile b/net/nginx/Makefile
index 23307eea5..4a5272059 100644
--- a/net/nginx/Makefile
+++ b/net/nginx/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nginx
-PKG_VERSION:=1.15.7
-PKG_RELEASE:=3
+PKG_VERSION:=1.15.8
+PKG_RELEASE:=1
 
 PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://nginx.org/download/
-PKG_HASH:=8f22ea2f6c0e0a221b6ddc02b6428a3ff708e2ad55f9361102b1c9f4142bdf93
+PKG_SOURCE_URL:=https://nginx.org/download/
+PKG_HASH:=a8bdafbca87eb99813ae4fcac1ad0875bf725ce19eb265d28268c309b2b40787
 
 PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de> \
 				Ansuel Smith <ansuelsmth@gmail.com>
@@ -411,7 +411,7 @@ ifeq ($(CONFIG_NGINX_HEADERS_MORE),y)
   define Download/nginx-headers-more
     VERSION:=a9f7c7e86cc7441d04e2f11f01c2e3a9c4b0301d
     SUBDIR:=nginx-headers-more
-    FILE:=headers-more-nginx-module-$(PKG_VERSION)-$$(VERSION).tar.gz
+    FILE:=headers-more-nginx-module-$$(VERSION).tar.gz
     URL:=https://github.com/openresty/headers-more-nginx-module.git
     MIRROR_HASH:=432609015719aaa7241e5166c7cda427acbe004f725887f78ef629d51bd9cb3f
     PROTO:=git
@@ -429,7 +429,7 @@ ifeq ($(CONFIG_NGINX_HTTP_BROTLI),y)
   define Download/nginx-brotli
     VERSION:=e26248ee361c04e25f581b92b85d95681bdffb39
     SUBDIR:=nginx-brotli
-    FILE:=ngx-brotli-module-$(PKG_VERSION)-$$(VERSION).tar.gz
+    FILE:=ngx-brotli-module-$$(VERSION).tar.gz
     URL:=https://github.com/eustas/ngx_brotli.git
     MIRROR_HASH:=76b891ba49f82f0cfbc9cba875646e26ee986b522373e0aa2698a9923a4adcdb
     PROTO:=git
@@ -447,7 +447,7 @@ ifeq ($(CONFIG_NGINX_RTMP_MODULE),y)
   define Download/nginx-rtmp
     VERSION:=f0ea62342a4eca504b311cd5df910d026c3ea4cf
     SUBDIR:=nginx-rtmp
-    FILE:=ngx-rtmp-module-$(PKG_VERSION)-$$(VERSION).tar.gz
+    FILE:=ngx-rtmp-module-$$(VERSION).tar.gz
     URL:=https://github.com/ut0mt8/nginx-rtmp-module.git
     MIRROR_HASH:=9ba7625718d21f658c4878729271832a07bd989165f1d1c720b3a9b54cf738cc
     PROTO:=git
@@ -465,7 +465,7 @@ ifeq ($(CONFIG_NGINX_TS_MODULE),y)
   define Download/nginx-ts
     VERSION:=ef2f874d95cc75747eb625a292524a702aefb0fd
     SUBDIR:=nginx-ts
-    FILE:=ngx-ts-module-$(PKG_VERSION)-$$(VERSION).tar.gz
+    FILE:=ngx-ts-module-$$(VERSION).tar.gz
     URL:=https://github.com/arut/nginx-ts-module.git
     MIRROR_HASH:=31ecc9968b928886b54884138eafe2fa747648bca5094d4c3132e8ae9509d1d3
     PROTO:=git
@@ -483,7 +483,7 @@ ifeq ($(CONFIG_NGINX_NAXSI),y)
   define Download/nginx-naxsi
     VERSION:=951123ad456bdf5ac94e8d8819342fe3d49bc002
     SUBDIR:=nginx-naxsi
-    FILE:=nginx-naxsi-module-$(PKG_VERSION)-$$(VERSION).tar.gz
+    FILE:=nginx-naxsi-module-$$(VERSION).tar.gz
     URL:=https://github.com/nbs-system/naxsi.git
     MIRROR_HASH:=7ab791f2ff38096f48013141bbfe20ba213d5e04dcac08ca82e0cac07d5c30f0
     PROTO:=git
@@ -501,7 +501,7 @@ ifeq ($(CONFIG_NGINX_LUA),y)
   define Download/lua-nginx
     VERSION:=e94f2e5d64daa45ff396e262d8dab8e56f5f10e0
     SUBDIR:=lua-nginx
-    FILE:=lua-nginx-module-$(PKG_VERSION)-$$(VERSION).tar.gz
+    FILE:=lua-nginx-module-$$(VERSION).tar.gz
     URL:=https://github.com/openresty/lua-nginx-module.git
     MIRROR_HASH:=ae439f9a8b3c34d7240735b844db72ee721af4791bbaff5692bca20e6785f541
     PROTO:=git
@@ -520,7 +520,7 @@ ifeq ($(CONFIG_NGINX_DAV),y)
   define Download/nginx-dav-ext-module
     VERSION:=430fd774fe838a04f1a5defbf1dd571d42300cf9
     SUBDIR:=nginx-dav-ext-module
-    FILE:=nginx-dav-ext-module-$(PKG_VERSION)-$$(VERSION).tar.gz
+    FILE:=nginx-dav-ext-module-$$(VERSION).tar.gz
     URL:=https://github.com/arut/nginx-dav-ext-module.git
     MIRROR_HASH:=0566053a8756423ecab455fd9d218cec1e017598fcbb3d6415a06f816851611e
     PROTO:=git