Update from 1.20.0 to 1.21.0.

[Sergey A. Osokin <osa%FreeBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Sergey A. Osokin <osa%FreeBSD.org@localhost>
Pushed By:	osa
Date:		Fri Nov 20 12:40:11 2020 -0500
Changeset:	3a0a14dcbc0a700e107f67cd43a6649c8097dcdb

Modified Files:
	unit/distinfo
	unit/options.mk
	unit/version.mk
Added Files:
	unit/patches/patch-src_nxt__conf__validation.c
Removed Files:
	unit/patches/patch-auto-modules-php

Log Message:
Update from 1.20.0 to 1.21.0.

<ChangeLog>

*) Change: procfs is mounted by default for all languages when "rootfs"
   isolation is used.

*) Change: any characters valid according to RFC 7230 are now allowed in
   HTTP header field names.

*) Change: HTTP header fields with underscores ("_") are now discarded
   from requests by default.

*) Feature: optional multithreaded request processing for Java, Python,
   Perl, and Ruby apps.

*) Feature: regular expressions in route matching patterns.

*) Feature: compatibility with Python 3.9.

*) Feature: the Python module now supports ASGI 2.0 legacy applications.

*) Feature: the "protocol" option in Python applications aids choice
   between ASGI and WSGI.

*) Feature: the fastcgi_finish_request() PHP function that finalizes
   request processing and continues code execution without holding onto
   the client connection.

*) Feature: the "discard_unsafe_fields" HTTP option that enables
   discarding request header fields with irregular (but still valid)
   characters in the field name.

*) Feature: the "procfs" and "tmpfs" automount isolation options to
   disable automatic mounting of eponymous filesystems.

*) Bugfix: the router process could crash when running Go applications
   under high load; the bug had appeared in 1.19.0.

*) Bugfix: some language dependencies could remain mounted after using
   "rootfs" isolation.

*) Bugfix: various compatibility issues in Java applications.

*) Bugfix: the Java module built with the musl C library couldn't run
   applications that use "rootfs" isolation.

</ChangeLog>

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3a0a14dcbc0a700e107f67cd43a6649c8097dcdb

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 unit/distinfo                                  | 10 +++++-----
 unit/options.mk                                | 12 ++++++++++--
 unit/patches/patch-auto-modules-php            | 16 ----------------
 unit/patches/patch-src_nxt__conf__validation.c | 20 ++++++++++++++++++++
 unit/version.mk                                |  2 +-
 5 files changed, 36 insertions(+), 24 deletions(-)

diffs:
diff --git a/unit/distinfo b/unit/distinfo
index f67eeb21e0..0227a70107 100644
--- a/unit/distinfo
+++ b/unit/distinfo
@@ -1,10 +1,10 @@
 $NetBSD$
 
-SHA1 (unit-1.20.0.tar.gz) = f4a2d2a6b622742acd138a66008407b5f674b08f
-RMD160 (unit-1.20.0.tar.gz) = 8964e056dbe19e659b157a89d1cf39f213ffd952
-SHA512 (unit-1.20.0.tar.gz) = dd68103795acbdcd87a951c92c72f3cb74b5e622eca4e687194508b55a592ac4312de3a8ff7ddb9a5df9750363b24dca9e1b48c7ef42c78aca3a18aca6a51f42
-Size (unit-1.20.0.tar.gz) = 787607 bytes
-SHA1 (patch-auto-modules-php) = 900cc3381050874e194741ce31554f100ed870a7
+SHA1 (unit-1.21.0.tar.gz) = 19278761d3104ff8509422f55207b1daa45a4d14
+RMD160 (unit-1.21.0.tar.gz) = 91c24ed9e8eac402a170c8b02b5633cd892fb017
+SHA512 (unit-1.21.0.tar.gz) = 12e9e8b221ffe8014931fe46c7faa9398de6ad08bbc07e5f8e50f086e4a22419960522d33bece493e17ae544b499acb4ba29cb6cb731c0bb7fbdc6cdc44bf210
+Size (unit-1.21.0.tar.gz) = 802826 bytes
 SHA1 (patch-src_nxt__cert.c) = c91e45f148a079b543a0d3cb277388bffb3e2854
+SHA1 (patch-src_nxt__conf__validation.c) = 99662fc0d975604fea0708a810e916991d0bf578
 SHA1 (patch-src_nxt__router.c) = 366241f155bccf6a3291e37fef5993eb1c364b99
 SHA1 (patch-src_nxt__websocket__header.h) = 1b50405b187cc8a662372a1c20ab7737278135ae
diff --git a/unit/options.mk b/unit/options.mk
index aada995527..dfb9d49011 100644
--- a/unit/options.mk
+++ b/unit/options.mk
@@ -1,8 +1,8 @@
 # $NetBSD$
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.unit
-PKG_SUPPORTED_OPTIONS=	debug devkit inet6 ssl
-PKG_SUGGESTED_OPTIONS=	inet6 ssl
+PKG_SUPPORTED_OPTIONS=	debug devkit inet6 pcre2 ssl
+PKG_SUGGESTED_OPTIONS=	inet6 pcre2 ssl
 
 PLIST_VARS+=		devkit
 
@@ -20,6 +20,14 @@ PLIST.devkit=		yes
 CONFIGURE_ARGS+=	--no-ipv6
 .endif
 
+.if empty(PKG_OPTIONS:Mpcre2)
+CONFIGURE_ARGS+=	--no-regex
+.endif
+
+.if !empty(PKG_OPTIONS:Mpcre2)
+.include "../../devel/pcre2/buildlink3.mk"
+.endif
+
 .if !empty(PKG_OPTIONS:Mssl)
 .include "../../security/openssl/buildlink3.mk"
 CONFIGURE_ARGS+=	--openssl
diff --git a/unit/patches/patch-auto-modules-php b/unit/patches/patch-auto-modules-php
deleted file mode 100644
index dccfd61b91..0000000000
--- a/unit/patches/patch-auto-modules-php
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-This patch fixes build of php module.  The issue has been
-reported to the vendor, https://github.com/nginx/unit/issues/497
-
---- auto/modules/php.orig	2020-10-09 11:15:55.011861773 -0400
-+++ auto/modules/php	2020-10-09 11:16:18.986144628 -0400
-@@ -112,7 +112,7 @@
-             # "php-config --ldflags" does not contain path to libphp, but
-             # contains usually path to libraries required by extensions.
-             NXT_PHP_LDFLAGS="-L${NXT_PHP_LIB_PATH} \
--                             -Wl,-rpath ${NXT_PHP_LIB_PATH}"
-+                             -Wl,-rpath,${NXT_PHP_LIB_PATH}"
-         fi
-     fi
- 
diff --git a/unit/patches/patch-src_nxt__conf__validation.c b/unit/patches/patch-src_nxt__conf__validation.c
new file mode 100644
index 0000000000..b49d6c4d86
--- /dev/null
+++ b/unit/patches/patch-src_nxt__conf__validation.c
@@ -0,0 +1,20 @@
+$NetBSD$
+
+NetBSD portability,
+https://mail-index.netbsd.org/tech-userlevel/2014/08/15/msg008729.html
+
+--- src/nxt_conf_validation.c.orig	2020-11-20 11:59:37.258205794 -0500
++++ src/nxt_conf_validation.c	2020-11-20 12:11:43.940557782 -0500
+@@ -1426,10 +1426,10 @@
+ 
+     size = nxt_conf_get_number(value);
+ 
+-    if (size < PTHREAD_STACK_MIN) {
++    if (size < sysconf(_SC_THREAD_STACK_MIN)) {
+         return nxt_conf_vldt_error(vldt, "The \"thread_stack_size\" number "
+                                    "must be equal to or greater than %d.",
+-                                   PTHREAD_STACK_MIN);
++                                   sysconf(_SC_THREAD_STACK_MIN));
+     }
+ 
+     if ((size % nxt_pagesize) != 0) {
diff --git a/unit/version.mk b/unit/version.mk
index fb9c9bf663..94b29548f0 100644
--- a/unit/version.mk
+++ b/unit/version.mk
@@ -12,7 +12,7 @@
 UNITVERSION_MK=	defined
 
 # Define NGINX Unit's version.
-UNIT_VERSION=	1.20.0
+UNIT_VERSION=	1.21.0
 
 # Define NGINX Unit's modules directory
 UNIT_EXTENSION_DIR=	libexec/unit/modules