nginx: updated to 1.16.1

Changes with nginx 1.16.1

    *) Security: when using HTTP/2 a client might cause excessive memory
       consumption and CPU usage (CVE-2019-9511, CVE-2019-9513,
       CVE-2019-9516).

3 files changed, 18 insertions, 19 deletions

diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index a951a2c6b34..71c5376bd1d 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.84 2019/08/11 13:24:22 wiz Exp $
+# $NetBSD: Makefile,v 1.85 2019/08/15 08:06:29 adam Exp $
 
-DISTNAME=	nginx-1.16.0
+DISTNAME=	nginx-1.16.1
 
 MAINTAINER=	joerg@NetBSD.org
 
-PKGREVISION= 1
 .include "../../www/nginx/Makefile.common"
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 1f085a00f35..c81acd97888 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.69 2019/05/06 09:38:48 adam Exp $
+$NetBSD: distinfo,v 1.70 2019/08/15 08:06:29 adam Exp $
 
 SHA1 (array-var-nginx-module-0.05.tar.gz) = c69fac77814947009ab783a471783b3c95a63a26
 RMD160 (array-var-nginx-module-0.05.tar.gz) = 89bd4efc04864e3e90781588a337338951ec8733
@@ -28,22 +28,22 @@ SHA1 (naxsi-0.56.tar.gz) = 42ce137bd3e52a612793bcea43f3ffbb8376910a
 RMD160 (naxsi-0.56.tar.gz) = a5c97194ef3db415a4bab07c44f9e9f2860b9e1a
 SHA512 (naxsi-0.56.tar.gz) = 4660751849bce303af6010b7257532404710106a94817e78d4bc4b566f8019620f24f30207f1d4366b88132a5124e34b164dc67ed80b6710f4bad66115564cbd
 Size (naxsi-0.56.tar.gz) = 192120 bytes
-SHA1 (nginx-1.16.0.tar.gz) = 5e2fe78453ecc983247223d73ad2129509ef2564
-RMD160 (nginx-1.16.0.tar.gz) = d2b74e3558f06c3f0aeaf9698e5819086138ef4b
-SHA512 (nginx-1.16.0.tar.gz) = e99cfaa4538f209c096ea2f93c04b5019756617f3bcd3305c273e98ddc89fed5bf90d65fb9b493149bc47d55ff79e73850bfcac20505fab74930d0102075df3d
-Size (nginx-1.16.0.tar.gz) = 1032345 bytes
+SHA1 (nginx-1.16.1.tar.gz) = 77ce4d26481b62f7a9d83e399454df0912f01a4b
+RMD160 (nginx-1.16.1.tar.gz) = add74d704607e48db5fba935552f5432252eef46
+SHA512 (nginx-1.16.1.tar.gz) = 17e95b43fa47d4fef5e652dea587518e16ab5ec562c9c94355c356440166d4b6a6a41ee520d406e5a34791a327d2e3c46b3f9b105ac9ce07afdd495c49eca437
+Size (nginx-1.16.1.tar.gz) = 1032630 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
 Size (nginx-rtmp-module-1.2.1.tar.gz) = 519919 bytes
-SHA1 (nginx_http_push_module-1.2.5.tar.gz) = 7185c47f818e97737ff72afadbbd72095328fc23
-RMD160 (nginx_http_push_module-1.2.5.tar.gz) = 6562de613afcd33905e03903d483b57aadbd8ae5
-SHA512 (nginx_http_push_module-1.2.5.tar.gz) = 016bbc4a33dccb4f06d43d32b132159473f26b96df2366f6eea246c695073842bcd6252a71873f42032fa47404cbbf9e34ac80f2ea819a9196491ef6c58713f7
-Size (nginx_http_push_module-1.2.5.tar.gz) = 670583 bytes
-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 (nginx_http_push_module-1.2.6.tar.gz) = 393d32d61fadd5d2c181ef0538383777f123b66f
+RMD160 (nginx_http_push_module-1.2.6.tar.gz) = 5bf879d80aa9c78ad2a9e67c7a817e1d5533213f
+SHA512 (nginx_http_push_module-1.2.6.tar.gz) = 08071b86384eb49540a04181d35ac37dbffa33d160e364f1ca9e806088522dc1db6bb679cc80c96366539e7ff5cb781978419e0282dcbe97f485c57600da1afd
+Size (nginx_http_push_module-1.2.6.tar.gz) = 671808 bytes
+SHA1 (ngx_devel_kit-0.3.1.tar.gz) = e15316e13a7b19a3d2502becbb26043a464a135a
+RMD160 (ngx_devel_kit-0.3.1.tar.gz) = 5c52a463544294096611aa9dec1c76e937a1aa23
+SHA512 (ngx_devel_kit-0.3.1.tar.gz) = de1e3349d8dd08e5982279b2219dc8a8006739f0409b8e0f5c50d93434beff1fbafba43e9c5ac85a5fab90afc5c0a7244a340610339c36f82f2cba7233e72de9
+Size (ngx_devel_kit-0.3.1.tar.gz) = 66542 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
diff --git a/www/nginx/options.mk b/www/nginx/options.mk
index f15f8042e09..29c904cbb16 100644
--- a/www/nginx/options.mk
+++ b/www/nginx/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.50 2019/05/06 09:38:48 adam Exp $
+# $NetBSD: options.mk,v 1.51 2019/08/15 08:06:29 adam Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.nginx
 PKG_SUPPORTED_OPTIONS=		dav flv gtools inet6 luajit mail-proxy memcache naxsi \
@@ -86,7 +86,7 @@ NEED_NDK=		yes
 .  endif
 .endfor
 .if defined(NEED_NDK) || make(makesum)
-NDK_VERSION=		0.3.0
+NDK_VERSION=		0.3.1
 NDK_DISTNAME=		ngx_devel_kit-${NDK_VERSION}
 NDK_DISTFILE=		${NDK_DISTNAME}.tar.gz
 SITES.${NDK_DISTFILE}=	-https://github.com/simpl/ngx_devel_kit/archive/v${NDK_VERSION}.tar.gz
@@ -185,7 +185,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.2.5
+PUSH_VERSION=		1.2.6
 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