Update from 1.19.8 to 1.19.9.

Update NGINX JavaScript module from 0.5.2 to 0.5.3.
Remove needless patches.

<ChangeLog for nginx 1.19.9>

*) Bugfix: nginx could not be built with the mail proxy module, but
   without the ngx_mail_ssl_module; the bug had appeared in 1.19.8.

*) Bugfix: "upstream sent response body larger than indicated content
   length" errors might occur when working with gRPC backends; the bug
   had appeared in 1.19.1.

*) Bugfix: nginx might not close a connection till keepalive timeout
   expiration if the connection was closed by the client while
   discarding the request body.

*) Bugfix: nginx might not detect that a connection was already closed
   by the client when waiting for auth_delay or limit_req delay, or when
   working with backends.

*) Bugfix: in the eventport method.

</ChangeLog>

<ChangeLog for njs 0.5.3>

nginx modules:

*) Feature: added the "js_var" directive.

</ChangeLog>

5 files changed, 7 insertions, 54 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index d2e8ade9548e..dc822d3a8aa7 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	nginx
-PORTVERSION=	1.19.8
-PORTREVISION=	1
+PORTVERSION=	1.19.9
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \
 		LOCAL/osa
diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod
index 42e89e78a150..84960ac86a85 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -231,7 +231,7 @@ NAXSI_NGINX_VER=	1.3
 NAXSI_GH_TUPLE=		nbs-system:naxsi:${NAXSI_NGINX_VER}:naxsi
 NAXSI_VARS=		DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_src
 
-NJS_GH_TUPLE=		nginx:njs:0.5.2:njs
+NJS_GH_TUPLE=		nginx:njs:0.5.3:njs
 NJS_VARS=		DSO_EXTMODS+=njs NJS_SUBDIR=/nginx
 NJS_USES=		libedit
 
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index e28349be630d..99c7ff754fa4 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1615304472
-SHA256 (nginx-1.19.8.tar.gz) = 308919b1a1359315a8066578472f998f14cb32af8de605a3743acca834348b05
-SIZE (nginx-1.19.8.tar.gz) = 1060155
+TIMESTAMP = 1617640083
+SHA256 (nginx-1.19.9.tar.gz) = 2e35dff06a9826e8aca940e9e8be46b7e4b12c19a48d55bfc2dc28fc9cc7d841
+SIZE (nginx-1.19.9.tar.gz) = 1060580
 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
 SIZE (nginx_mogilefs_module-1.0.4.tar.gz) = 11208
 SHA256 (nginx_mod_h264_streaming-2.2.7.tar.gz) = 6d974ba630cef59de1f60996c66b401264a345d25988a76037c2856cec756c19
@@ -111,8 +111,8 @@ SHA256 (SpiderLabs-ModSecurity-nginx-v1.0.1_GH0.tar.gz) = c969a78659bb47c84929de
 SIZE (SpiderLabs-ModSecurity-nginx-v1.0.1_GH0.tar.gz) = 31920
 SHA256 (nbs-system-naxsi-1.3_GH0.tar.gz) = 439c8677372d2597b4360bbcc10bc86490de1fc75695b193ad5df154a214d628
 SIZE (nbs-system-naxsi-1.3_GH0.tar.gz) = 235626
-SHA256 (nginx-njs-0.5.2_GH0.tar.gz) = 13781a3a92ad61fdb409a87048e3b7a76f36a5569b0c705006e1f2224056b7d1
-SIZE (nginx-njs-0.5.2_GH0.tar.gz) = 519331
+SHA256 (nginx-njs-0.5.3_GH0.tar.gz) = 3f64b9df0d2b4722899feeb490ffbc28e334da9b916e6476570083155a25c73a
+SIZE (nginx-njs-0.5.3_GH0.tar.gz) = 519938
 SHA256 (opentracing-contrib-nginx-opentracing-2d81c29_GH0.tar.gz) = b082bb8e0f4de2e3361c9cae79e266856de1e5b26a43611e08446b7c2bc0b2b4
 SIZE (opentracing-contrib-nginx-opentracing-2d81c29_GH0.tar.gz) = 664357
 SHA256 (konstruxi-ngx_postgres-8aa7359_GH0.tar.gz) = c69ad4495de7c7883ebc23e1e6c4cc83a4ac6a7fddd4d5c12e49d33b65f7c50b
diff --git a/www/nginx-devel/files/patch-src-mail-ngx_mail_auth_http_module.c b/www/nginx-devel/files/patch-src-mail-ngx_mail_auth_http_module.c
deleted file mode 100644
index af8dcda8f7a2..000000000000
--- a/www/nginx-devel/files/patch-src-mail-ngx_mail_auth_http_module.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/mail/ngx_mail_auth_http_module.c.orig	2021-03-09 12:50:37.389186000 -0500
-+++ src/mail/ngx_mail_auth_http_module.c	2021-03-09 12:55:40.877872000 -0500
-@@ -1135,10 +1135,10 @@
-     size_t                     len;
-     ngx_buf_t                 *b;
-     ngx_str_t                  login, passwd;
-+    ngx_connection_t          *c;
- #if (NGX_MAIL_SSL)
-     ngx_str_t                  verify, subject, issuer, serial, fingerprint,
-                                raw_cert, cert;
--    ngx_connection_t          *c;
-     ngx_mail_ssl_conf_t       *sslcf;
- #endif
-     ngx_mail_core_srv_conf_t  *cscf;
-@@ -1151,9 +1151,10 @@
-         return NULL;
-     }
- 
-+    c = s->connection;
-+
- #if (NGX_MAIL_SSL)
- 
--    c = s->connection;
-     sslcf = ngx_mail_get_module_srv_conf(s, ngx_mail_ssl_module);
- 
-     if (c->ssl && sslcf->verify) {
diff --git a/www/nginx-devel/files/patch-src-mail-ngx_mail_handler.c b/www/nginx-devel/files/patch-src-mail-ngx_mail_handler.c
deleted file mode 100644
index b2c43f2cdd78..000000000000
--- a/www/nginx-devel/files/patch-src-mail-ngx_mail_handler.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/mail/ngx_mail_handler.c.orig	2021-03-10 10:39:31.807351000 -0500
-+++ src/mail/ngx_mail_handler.c	2021-03-10 10:41:28.739497000 -0500
-@@ -273,14 +273,15 @@
- ngx_mail_init_session_handler(ngx_event_t *rev)
- {
-     ngx_connection_t    *c;
--    ngx_mail_session_t  *s;
- 
-     c = rev->data;
--    s = c->data;
- 
- #if (NGX_MAIL_SSL)
-     {
-+    ngx_mail_session_t   *s;
-     ngx_mail_ssl_conf_t  *sslcf;
-+
-+    s = c->data;
- 
-     sslcf = ngx_mail_get_module_srv_conf(s, ngx_mail_ssl_module);
-