* Update www/nginx to 1.12.0.

* Update naxsi to 0.55.3.

Approximate changelog since nginx 1.10.3 follows.

Changes with nginx 1.12.0                                        12 Apr 2017
- 1.12.x stable branch.

Changes with nginx 1.11.13                                       04 Apr 2017
- Feature: the "http_429" parameter of the "proxy_next_upstream",
  "fastcgi_next_upstream", "scgi_next_upstream", and
  "uwsgi_next_upstream" directives.
  Thanks to Piotr Sikora.
- Bugfix: in memory allocation error handling.
- Bugfix: requests might hang when using the "sendfile" and
  "timer_resolution" directives on Linux.
- Bugfix: requests might hang when using the "sendfile" and "aio_write"
  directives with subrequests.
- Bugfix: in the ngx_http_v2_module.
  Thanks to Piotr Sikora.
- Bugfix: a segmentation fault might occur in a worker process when
  using HTTP/2.
- Bugfix: requests might hang when using the "limit_rate",
  "sendfile_max_chunk", "limit_req" directives, or the $r->sleep()
  embedded perl method with subrequests.
- Bugfix: in the ngx_http_slice_module.


Changes with nginx 1.11.12                                       24 Mar 2017
- Bugfix: nginx might hog CPU; the bug had appeared in 1.11.11.


Changes with nginx 1.11.11                                       21 Mar 2017
- Feature: the "worker_shutdown_timeout" directive.
- Feature: vim syntax highlighting scripts improvements.
  Thanks to Wei-Ko Kao.
- Bugfix: a segmentation fault might occur in a worker process if the
  $limit_rate variable was set to an empty string.
- Bugfix: the "proxy_cache_background_update",
  "fastcgi_cache_background_update", "scgi_cache_background_update",
  and "uwsgi_cache_background_update" directives might work incorrectly
  if the "if" directive was used.
- Bugfix: a segmentation fault might occur in a worker process if
  number of large_client_header_buffers in a virtual server was
  different from the one in the default server.
- Bugfix: in the mail proxy server.


Changes with nginx 1.11.10                                       14 Feb 2017
- Change: cache header format has been changed, previously cached
  responses will be invalidated.
- Feature: support of "stale-while-revalidate" and "stale-if-error"
  extensions in the "Cache-Control" backend response header line.
- Feature: the "proxy_cache_background_update",
  "fastcgi_cache_background_update", "scgi_cache_background_update",
  and "uwsgi_cache_background_update" directives.
- Feature: nginx is now able to cache responses with the "Vary" header
  line up to 128 characters long (instead of 42 characters in previous
  versions).
- Feature: the "build" parameter of the "server_tokens" directive.
  Thanks to Tom Thorogood.
- Bugfix: "[crit] SSL_write() failed" messages might appear in logs
  when handling requests with the "Expect: 100-continue" request header
  line.
- Bugfix: the ngx_http_slice_module did not work in named locations.
- Bugfix: a segmentation fault might occur in a worker process when
  using AIO after an "X-Accel-Redirect" redirection.
- Bugfix: reduced memory consumption for long-lived requests using
  gzipping.


Changes with nginx 1.11.9                                        24 Jan 2017
- Bugfix: nginx might hog CPU when using the stream module; the bug had
  appeared in 1.11.5.
- Bugfix: EXTERNAL authentication mechanism in mail proxy was accepted
  even if it was not enabled in the configuration.
- Bugfix: a segmentation fault might occur in a worker process if the
  "ssl_verify_client" directive of the stream module was used.
- Bugfix: the "ssl_verify_client" directive of the stream module might
  not work.
- Bugfix: closing keepalive connections due to no free worker
  connections might be too aggressive.
  Thanks to Joel Cunningham.
- Bugfix: an incorrect response might be returned when using the
  "sendfile" directive on FreeBSD and macOS; the bug had appeared in
  1.7.8.
- Bugfix: a truncated response might be stored in cache when using the
  "aio_write" directive.
- Bugfix: a socket leak might occur when using the "aio_write"
  directive.


Changes with nginx 1.11.8                                        27 Dec 2016
- Feature: the "absolute_redirect" directive.
- Feature: the "escape" parameter of the "log_format" directive.
- Feature: client SSL certificates verification in the stream module.
- Feature: the "ssl_session_ticket_key" directive supports AES256
  encryption of TLS session tickets when used with 80-byte keys.
- Feature: vim-commentary support in vim scripts.
  Thanks to Armin Grodon.
- Bugfix: recursion when evaluating variables was not limited.
- Bugfix: in the ngx_stream_ssl_preread_module.
- Bugfix: if a server in an upstream in the stream module failed, it
  was considered alive only when a test connection sent to it after
  fail_timeout was closed; now a successfully established connection is
  enough.
- Bugfix: nginx/Windows could not be built with 64-bit Visual Studio.
- Bugfix: nginx/Windows could not be built with OpenSSL 1.1.0.


Changes with nginx 1.11.7                                        13 Dec 2016

- Change: now in case of a client certificate verification error the
  $ssl_client_verify variable contains a string with the failure
  reason, for example, "FAILED:certificate has expired".
- Feature: the $ssl_ciphers, $ssl_curves, $ssl_client_v_start,
  $ssl_client_v_end, and $ssl_client_v_remain variables.
- Feature: the "volatile" parameter of the "map" directive.
- Bugfix: dependencies specified for a module were ignored while
  building dynamic modules.
- Bugfix: when using HTTP/2 and the "limit_req" or "auth_request"
  directives client request body might be corrupted; the bug had
  appeared in 1.11.0.
- Bugfix: a segmentation fault might occur in a worker process when
  using HTTP/2; the bug had appeared in 1.11.3.
- Bugfix: in the ngx_http_mp4_module.
  Thanks to Congcong Hu.
- Bugfix: in the ngx_http_perl_module.

3 files changed, 13 insertions, 14 deletions

diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 90989fb4d5f..92ae729add1 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.69 2017/02/28 15:20:11 ryoon Exp $
+# $NetBSD: Makefile,v 1.70 2017/05/02 12:28:31 fhajny Exp $
 
-DISTNAME=		nginx-1.10.3
+DISTNAME=		nginx-1.12.0
 MAINTAINER=		joerg@NetBSD.org
 
-PKGREVISION= 1
 .include "../../www/nginx/Makefile.common"
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index ba140fd4cd3..3e812599b4f 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.55 2017/02/14 10:12:35 fhajny Exp $
+$NetBSD: distinfo,v 1.56 2017/05/02 12:28:31 fhajny Exp $
 
 SHA1 (array-var-nginx-module-0.04.tar.gz) = 1fd3bdd05c2d1d7667ed6f7baa612ddf7f630df3
 RMD160 (array-var-nginx-module-0.04.tar.gz) = a751a2ce87dcfb88d072779097b4df9f42a415e4
@@ -24,14 +24,14 @@ SHA1 (lua-nginx-module-0.10.5.tar.gz) = a33590654c0624c45eb64a2f1443977ab7fa8ebe
 RMD160 (lua-nginx-module-0.10.5.tar.gz) = 0117c85d034f7424f0fbf29209fb0a39c61fa668
 SHA512 (lua-nginx-module-0.10.5.tar.gz) = a02b8614fdcd063b1087a3114f05402c707343ff3bceabaca1fb98531ba30edea1a525fc45e2f5a49ff155de8d6f9e1155e8870e463476da5703acfd5f8fc3fc
 Size (lua-nginx-module-0.10.5.tar.gz) = 579793 bytes
-SHA1 (naxsi-0.54.tar.gz) = d5db25db19a564358af7763d4935e978d05bf6f5
-RMD160 (naxsi-0.54.tar.gz) = 094b09c198cf690ec24b3e9d3763647e06ebee64
-SHA512 (naxsi-0.54.tar.gz) = 91934bfd41495715269cc6e549d17f6da66f2bdd0c9a6821fa9096b694dd3927109c4aad2f8b327620ae7c34f76a0839ac16669cd8c65081bc01fa7f829c1d43
-Size (naxsi-0.54.tar.gz) = 163809 bytes
-SHA1 (nginx-1.10.3.tar.gz) = 95cf32c3e33efc53ac81338a5779fbaa425f02e2
-RMD160 (nginx-1.10.3.tar.gz) = e27327509a706f90bb5f01d42edd9624223588a0
-SHA512 (nginx-1.10.3.tar.gz) = 25cddbe5c419700aeca41bff3be5b7c3accfb38ad846ec8d91d81ab7c15f10db719f02d9263edf1fa12f59805ff7001b62864dc2885370b24afeea1d7d2afbbf
-Size (nginx-1.10.3.tar.gz) = 911509 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.0.tar.gz) = 40733c030d0096fe56513c0a4da65c682ca0a18b
+RMD160 (nginx-1.12.0.tar.gz) = e9c61e3f3d4b257a579e7a0d8a9a6da42b4f1a7e
+SHA512 (nginx-1.12.0.tar.gz) = e2e930b61491d91090090d4716740895fc7812e8e266c427ac2b40c5a70493150e5c81e769c6b7563baf5f0e15b32fae8f2b11fd5699e468e1cc40706defb8ee
+Size (nginx-1.12.0.tar.gz) = 980831 bytes
 SHA1 (nginx_http_push_module-0.731.tar.gz) = 353f3ef3d013edfcc78ddba0237a9ce7dca633b4
 RMD160 (nginx_http_push_module-0.731.tar.gz) = d35d7138d3b4dd20076b1026c420f03c68177f99
 SHA512 (nginx_http_push_module-0.731.tar.gz) = b95e6e88236d920e18c927a5bdf7d84210ba34b234e7c20ba09d114337a4494535c94c7e84926e5479b23d4eba4e2f1db0a3e7d8b017c9907a4a824cd25098d8
diff --git a/www/nginx/options.mk b/www/nginx/options.mk
index b7e702485a1..d61791d8ecb 100644
--- a/www/nginx/options.mk
+++ b/www/nginx/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.38 2017/04/15 06:26:51 maya Exp $
+# $NetBSD: options.mk,v 1.39 2017/05/02 12:28:31 fhajny Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.nginx
 PKG_SUPPORTED_OPTIONS=		dav flv gtools inet6 luajit mail-proxy memcache naxsi \
@@ -68,7 +68,7 @@ CONFIGURE_ARGS+=	--without-http_memcached_module
 .endif
 
 .if !empty(PKG_OPTIONS:Mnaxsi) || make(makesum)
-NAXSI_VERSION=			0.54
+NAXSI_VERSION=			0.55.3
 NAXSI_DISTNAME=			naxsi-${NAXSI_VERSION}
 NAXSI_DISTFILE=			${NAXSI_DISTNAME}.tar.gz
 SITES.${NAXSI_DISTFILE}=	-https://github.com/nbs-system/naxsi/archive/${NAXSI_VERSION}.tar.gz