nginx: updated to 1.14.0

nginx-1.14.0 stable version has been released, incorporating new features and bug fixes from the 1.13.x mainline branch - including the mirror module, HTTP/2 push, the gRPC proxy module, and more.

3 files changed, 24 insertions, 25 deletions

diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index df4942caab0..12b7acf7081 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.76 2018/04/12 06:48:25 adam Exp $
+# $NetBSD: Makefile,v 1.77 2018/05/16 07:45:58 adam Exp $
 
-DISTNAME=	nginx-1.12.2
+DISTNAME=	nginx-1.14.0
 MAINTAINER=	joerg@NetBSD.org
 
-PKGREVISION=	2
 .include "../../www/nginx/Makefile.common"
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 065fe1d79ec..c3d8b848974 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.62 2018/04/12 06:48:25 adam Exp $
+$NetBSD: distinfo,v 1.63 2018/05/16 07:45:58 adam Exp $
 
 SHA1 (array-var-nginx-module-0.05.tar.gz) = c69fac77814947009ab783a471783b3c95a63a26
 RMD160 (array-var-nginx-module-0.05.tar.gz) = 89bd4efc04864e3e90781588a337338951ec8733
@@ -8,10 +8,10 @@ SHA1 (echo-nginx-module-0.61.tar.gz) = 58a0b5430497cf9e13be5f52e46cad6f48ec251a
 RMD160 (echo-nginx-module-0.61.tar.gz) = 65bfe167de019826c44479bd413324e1cf686bba
 SHA512 (echo-nginx-module-0.61.tar.gz) = c90b81a4e85a8e9beeb5ff591dc91adb25fa4e0b6cb47086b577e5fa36db2368442dd011187675e358781956c364b949bc4d920ca2b534481b21c9987d2a9a3b
 Size (echo-nginx-module-0.61.tar.gz) = 53155 bytes
-SHA1 (encrypted-session-nginx-module-0.07.tar.gz) = a5169a299775a5cbd8779fb61764f8fa62301632
-RMD160 (encrypted-session-nginx-module-0.07.tar.gz) = 0747d31b47a288be455589d39c8280672a72bd4b
-SHA512 (encrypted-session-nginx-module-0.07.tar.gz) = 2bd6f3c59184aa8bc1aef0c37852690f2b76039a607b96f5bf416874b5fb08c15e367ddf2176b60d0079bb587bf99e9d3293a7b4ede7c03e5ddcccaf6e134f22
-Size (encrypted-session-nginx-module-0.07.tar.gz) = 11139 bytes
+SHA1 (encrypted-session-nginx-module-0.08.tar.gz) = 0e36e7ae2553f1ac5566e60021c535efa065c8ab
+RMD160 (encrypted-session-nginx-module-0.08.tar.gz) = becf8617c53c463f49ad853532ce5e4a3b35e073
+SHA512 (encrypted-session-nginx-module-0.08.tar.gz) = 80651951edd69d202e991a66f531bbe0398b4f062e822bb7748411f5f597eb1d5827102ba477bb6cd2793274adf6f6d60dd89fde7645174b091143251197af69
+Size (encrypted-session-nginx-module-0.08.tar.gz) = 11802 bytes
 SHA1 (form-input-nginx-module-0.12.tar.gz) = 03d3befb5ecc6aba5f4f871d18c490e206906022
 RMD160 (form-input-nginx-module-0.12.tar.gz) = 954f13e7ef7afe0d859b543a57482c3dbdf33ced
 SHA512 (form-input-nginx-module-0.12.tar.gz) = 1c5c5ab74156cac09da44a2dcdd84f7c03c9919a23a847e63613e00e3781ecd73d5ad12446174b4fdef9d064257a31570a8dbcccc00d8266f7048e3dcde0362e
@@ -20,18 +20,18 @@ SHA1 (headers-more-nginx-module-0.33.tar.gz) = 7d6af910dae98f0dbc67bf77e82eab8b7
 RMD160 (headers-more-nginx-module-0.33.tar.gz) = fb27195a722e81f533016e693b5a6616fd6b4f72
 SHA512 (headers-more-nginx-module-0.33.tar.gz) = 13165b1b8d4be281b8bd2404fa48d456013d560bace094c81da08a35dc6a4f025a809a3ae3a42be6bbf67abbcbe41e0730aba06f905220f3baeb01e1192a7d37
 Size (headers-more-nginx-module-0.33.tar.gz) = 28130 bytes
-SHA1 (lua-nginx-module-0.10.11.tar.gz) = 8a09f76c9b33367b77fc86e7ef3de38a8b59b9f8
-RMD160 (lua-nginx-module-0.10.11.tar.gz) = 10ca0bbd13f4e8f0fcac5bf98aac417e913ad31c
-SHA512 (lua-nginx-module-0.10.11.tar.gz) = 35e1510c9da71c8bdf028f4ac253404550a83bd904f6c5639697d78c76708625bb6deaa858a7d086b5582f71bb46578e8f804887a46ccfbaf5f4de8510cb1511
-Size (lua-nginx-module-0.10.11.tar.gz) = 616653 bytes
+SHA1 (lua-nginx-module-0.10.13.tar.gz) = 88f16ee8f1d168d1f6c1f2a1b48d31a5f4429114
+RMD160 (lua-nginx-module-0.10.13.tar.gz) = ec6278fb7936abfdead2df5e20a90092a1024098
+SHA512 (lua-nginx-module-0.10.13.tar.gz) = 8c316b9d12dc35779fcddc6bb90942c096f19fd8c2e090b8397e1e1ca6f0ebd7a4edddc03fddb31310147ba4e9db9fc4b3749cfd2323046d88045b3b3333f07d
+Size (lua-nginx-module-0.10.13.tar.gz) = 624102 bytes
 SHA1 (naxsi-0.55.3.tar.gz) = 93c2be1f50e5e86a44c54ee02fc6a6faca16707f
 RMD160 (naxsi-0.55.3.tar.gz) = 45dcedc7961e487c2c659064abdeaf5b91dc75d2
 SHA512 (naxsi-0.55.3.tar.gz) = 9e8f41a5cd1342cc9b8aa334a603842d14a256aab1f4a21205bb1278aecbb0c49e39c889d8113a5b41aad2efeaa2ed9f11cba6929173f50add91f54c4c59c8a0
 Size (naxsi-0.55.3.tar.gz) = 187416 bytes
-SHA1 (nginx-1.12.2.tar.gz) = 6b41d63befa4f52b0724b533e6292a6671b71fdc
-RMD160 (nginx-1.12.2.tar.gz) = d339de3ae1e05740810314e5c5884d67f622d302
-SHA512 (nginx-1.12.2.tar.gz) = 3faa2043e237a7e1d15cc5661ac9d002a965220a78c25a863be9f19e01007347e53f776b61c229f6bd3d916cc1ccf92de260811f7b8092ec1b747fba7c0061f7
-Size (nginx-1.12.2.tar.gz) = 981687 bytes
+SHA1 (nginx-1.14.0.tar.gz) = 016ab1a12c9a0c9444f9073e4300223ffd6fadbe
+RMD160 (nginx-1.14.0.tar.gz) = aa5445ef786c83de81f9b98b261caf1bd13e2d89
+SHA512 (nginx-1.14.0.tar.gz) = 40f086c9f741727e6f55802b6c3a66f081f7c49c38646dc1491aa3e3c35bae12b65ea6594386609fc849bcd99a60d7cd8ecb3f8d519e0e9ab8db01d653e930e9
+Size (nginx-1.14.0.tar.gz) = 1016272 bytes
 SHA1 (nginx-rtmp-module-1.2.1.tar.gz) = 7c6ae1afc117e3bf946b0d81f99d41fe538a7245
 RMD160 (nginx-rtmp-module-1.2.1.tar.gz) = 5fc0b4ac0b2c0a6d70957a5256754db8a9e934cf
 SHA512 (nginx-rtmp-module-1.2.1.tar.gz) = 4a0af5e9afa4deb0b53de8de7ddb2cfa6430d372e1ef9e421f01b509548bd134d427345442ac1ce667338cc2a1484dc2ab732e316e878ac7d3537dc527d5f922
@@ -44,10 +44,10 @@ SHA1 (ngx_devel_kit-0.3.0.tar.gz) = b556d068db23037be30436af559795f45dd93c67
 RMD160 (ngx_devel_kit-0.3.0.tar.gz) = beb2736eb06e8e26f60643623553789346f653da
 SHA512 (ngx_devel_kit-0.3.0.tar.gz) = 558764c9be913a4f61d0e277d07bf3c272e1ce086b3fadb85b693a7e92805cd9fca4da7a8d29c96e53fc0d23b331327d3b2561ff61f19d2330e7d5d35ac7d614
 Size (ngx_devel_kit-0.3.0.tar.gz) = 66455 bytes
-SHA1 (set-misc-nginx-module-0.31.tar.gz) = 181b04a9264dd503de4c7d80ccc240e80c85b071
-RMD160 (set-misc-nginx-module-0.31.tar.gz) = bba92dfdfb63f8f654e7546a8f476221a7aa95bd
-SHA512 (set-misc-nginx-module-0.31.tar.gz) = c853b041cecc3521f888be3d0483c6cf23d239259ac4f5d35b10d4483b0fb06d1d22060adedcf6605b220d99f9051faf300d06989736d510b4486f943d3a675e
-Size (set-misc-nginx-module-0.31.tar.gz) = 29359 bytes
+SHA1 (set-misc-nginx-module-0.32.tar.gz) = 2433bb7a138c3b13812ec2af7070cdc67435918f
+RMD160 (set-misc-nginx-module-0.32.tar.gz) = eff9be78f884f7c3e09e88af6bdf4cdd9aaea05d
+SHA512 (set-misc-nginx-module-0.32.tar.gz) = 5590526f60c99630f99a49bfa9e3455baee6d58cd2a1419eab1367a838dafb87a50f5e2607aa8ac557b90dbf633dcf61069c997b3526cddc8f2fc45820a7bc3b
+Size (set-misc-nginx-module-0.32.tar.gz) = 29329 bytes
 SHA1 (patch-aa) = 47f0c19b47b115f00ea6e9432d5bb12058c3bc1c
 SHA1 (patch-ab) = 7d126a4372aa8575ef01a4bfd9aec9898861c763
 SHA1 (patch-auto_cc_conf) = 5e6a479ba419cd16dedeb3b4c47dc685d126ef6a
diff --git a/www/nginx/options.mk b/www/nginx/options.mk
index 99c664e1d40..bebcd45248c 100644
--- a/www/nginx/options.mk
+++ b/www/nginx/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.44 2018/04/12 06:48:25 adam Exp $
+# $NetBSD: options.mk,v 1.45 2018/05/16 07:45:58 adam Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.nginx
 PKG_SUPPORTED_OPTIONS=		dav flv gtools inet6 luajit mail-proxy memcache naxsi \
@@ -104,7 +104,7 @@ CONFIGURE_ENV+=		LUAJIT_INC=${PREFIX}/include/luajit-2.0
 CONFIGURE_ARGS+=	--add-module=../${LUA_DISTNAME}
 .endif
 .if !empty(PKG_OPTIONS:Mluajit) || make(makesum)
-LUA_VERSION=		0.10.11
+LUA_VERSION=		0.10.13
 LUA_DISTNAME=		lua-nginx-module-${LUA_VERSION}
 LUA_DISTFILE=		${LUA_DISTNAME}.tar.gz
 SITES.${LUA_DISTFILE}=	-https://github.com/openresty/lua-nginx-module/archive/v${LUA_VERSION}.tar.gz
@@ -126,7 +126,7 @@ DISTFILES+=		${ECHOMOD_DISTFILE}
 CONFIGURE_ARGS+=	--add-module=../${SETMISC_DISTNAME}
 .endif
 .if !empty(PKG_OPTIONS:Mset-misc) || make(makesum)
-SETMISC_VERSION=	0.31
+SETMISC_VERSION=	0.32
 SETMISC_DISTNAME=	set-misc-nginx-module-${SETMISC_VERSION}
 SETMISC_DISTFILE=	${SETMISC_DISTNAME}.tar.gz
 SITES.${SETMISC_DISTFILE}=	-https://github.com/openresty/set-misc-nginx-module/archive/v${SETMISC_VERSION}.tar.gz
@@ -148,7 +148,7 @@ DISTFILES+=		${ARRAYVAR_DISTFILE}
 CONFIGURE_ARGS+=	--add-module=../${ENCSESS_DISTNAME}
 .endif
 .if !empty(PKG_OPTIONS:Mencrypted-session) || make(makesum)
-ENCSESS_VERSION=	0.07
+ENCSESS_VERSION=	0.08
 ENCSESS_DISTNAME=	encrypted-session-nginx-module-${ENCSESS_VERSION}
 ENCSESS_DISTFILE=	${ENCSESS_DISTNAME}.tar.gz
 SITES.${ENCSESS_DISTFILE}=	-https://github.com/openresty/encrypted-session-nginx-module/archive/v${ENCSESS_VERSION}.tar.gz
@@ -188,7 +188,7 @@ CONFIGURE_ARGS+=	--without-http_uwsgi_module
 CONFIGURE_ARGS+=	--add-module=../nchan-${PUSH_VERSION}
 .endif
 .if !empty(PKG_OPTIONS:Mpush) || make(makesum)
-PUSH_VERSION=		1.1.13 # 1.1.14 needs memrchr(): https://github.com/slact/nchan/issues/441
+PUSH_VERSION=		1.1.13 # 1.1.15 needs memrchr(): https://github.com/slact/nchan/issues/441
 PUSH_DISTNAME=		nginx_http_push_module-${PUSH_VERSION}
 PUSH_DISTFILE=		${PUSH_DISTNAME}.tar.gz
 SITES.${PUSH_DISTFILE}=	-https://github.com/slact/nchan/archive/v${PUSH_VERSION}.tar.gz