[pkgsrc/trunk]: pkgsrc unit & libunit: update to 1.25.0

[gutteridge <gutteridge%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7adf85ec778a
branches:  trunk
changeset: 457260:7adf85ec778a
user:      gutteridge <gutteridge%pkgsrc.org@localhost>
date:      Sun Aug 22 04:00:43 2021 +0000

description:
unit & libunit: update to 1.25.0

Changes with Unit 1.25.0                                         19 Aug 2021

    *) Feature: client IP address replacement from a specified HTTP header
       field.

    *) Feature: TLS sessions cache.

    *) Feature: TLS session tickets.

    *) Feature: application restart control.

    *) Feature: process and thread lifecycle hooks in Ruby.

    *) Bugfix: the router process could crash on TLS connection open when
       multiple listeners with TLS certificates were configured; the bug had
       appeared in 1.23.0.

    *) Bugfix: TLS connections were rejected for configurations with
       multiple certificate bundles in a listener if the client did not use
       SNI.

    *) Bugfix: the router process could crash with frequent mutithreaded
       application reconfiguration.

    *) Bugfix: compatibility issues with some Python ASGI apps, notably
       based on the Starlette framework.

    *) Bugfix: a descriptor and memory leak occurred in the router process
       when an app process stopped or crashed.

    *) Bugfix: the controller or router process could crash if the
       configuration contained a full-form IPv6 in a listener address.

    *) Bugfix: the router process crashed when a request was passed to an
       empty "routes" or "upstreams" using a variable "pass" option.

    *) Bugfix: the router process crashed while matching a request to an
       empty array of source or destination address patterns.


Changes with Unit 1.24.0                                         27 May 2021

    *) Change: PHP added to the default MIME type list.

    *) Feature: arbitrary configuration of TLS connections via OpenSSL
       commands.

    *) Feature: the ability to limit static file serving by MIME types.

    *) Feature: support for chrooting, rejecting symlinks, and rejecting
       mount point traversal on a per-request basis when serving static
       files.

    *) Feature: a loader for automatically overriding the "http" and
       "websocket" modules in Node.js.

    *) Feature: multiple "targets" in Python applications.

    *) Feature: compatibility with Ruby 3.0.

    *) Bugfix: the router process could crash while closing a TLS
       connection.

    *) Bugfix: a segmentation fault might have occurred in the PHP module if
       fastcgi_finish_request() was used with the "auto_globals_jit" option
       enabled.


Changes with Unit 1.23.0                                         25 Mar 2021

    *) Feature: support for multiple certificate bundles on a listener via
       the Server Name Indication (SNI) TLS extension.

    *) Feature: "--mandir" ./configure option to specify the directory for
       man page installation.

    *) Bugfix: the router process could crash on premature TLS connection
       close; the bug had appeared in 1.17.0.

    *) Bugfix: a connection leak occurred on premature TLS connection close;
       the bug had appeared in 1.6.

    *) Bugfix: a descriptor and memory leak occurred in the router process
       when processing small WebSocket frames from a client; the bug had
       appeared in 1.19.0.

    *) Bugfix: a descriptor leak occurred in the router process when
       removing or reconfiguring an application; the bug had appeared in
       1.19.0.

    *) Bugfix: persistent storage of certificates might've not worked with
       some filesystems in Linux, and all uploaded certificate bundles were
       forgotten after restart.

    *) Bugfix: the controller process could crash while requesting
       information about a certificate with a non-DNS SAN entry.

    *) Bugfix: the controller process could crash on manipulations with a
       certificate containing a SAN and no standard name attributes in
       subject or issuer.

    *) Bugfix: the Ruby module didn't respect the user locale for defaults
       in the Encoding class.

    *) Bugfix: the PHP 5 module failed to build with thread safety enabled;
       the bug had appeared in 1.22.0.

diffstat:

 devel/libunit/distinfo                             |  10 +++---
 www/unit/Makefile                                  |   3 +-
 www/unit/Makefile.common                           |   5 ++-
 www/unit/PLIST                                     |   3 +-
 www/unit/distinfo                                  |  14 +++-----
 www/unit/patches/patch-src_nxt__cert.c             |  34 ----------------------
 www/unit/patches/patch-src_nxt__conf__validation.c |  22 --------------
 www/unit/patches/patch-src_nxt__router.c           |  17 -----------
 www/unit/patches/patch-src_nxt__unit.c             |  19 ------------
 www/unit/version.mk                                |   4 +-
 10 files changed, 19 insertions(+), 112 deletions(-)

diffs (204 lines):

diff -r 4107a000d3f1 -r 7adf85ec778a devel/libunit/distinfo
--- a/devel/libunit/distinfo    Sun Aug 22 02:42:29 2021 +0000
+++ b/devel/libunit/distinfo    Sun Aug 22 04:00:43 2021 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2021/03/04 14:57:41 mef Exp $
+$NetBSD: distinfo,v 1.3 2021/08/22 04:00:43 gutteridge Exp $
 
-SHA1 (unit-1.22.0.tar.gz) = ab38a89c12d15a56fdc1a51dd6fa8a689e02abae
-RMD160 (unit-1.22.0.tar.gz) = a658f1c8f898e381a017303264b0d7202627cdbb
-SHA512 (unit-1.22.0.tar.gz) = 7418e9dd86c10d64184f5a2f3e26c27bacc53b90ba35658fba6af00a57df89645c16c16b510d3e570eee6f8fdeef4ec7f92971f7231093e3da118e858ed386f5
-Size (unit-1.22.0.tar.gz) = 824763 bytes
+SHA1 (unit-1.25.0.tar.gz) = f235f96f7f51f169bae85222dbc8c93ece69d589
+RMD160 (unit-1.25.0.tar.gz) = d08da7f6404e3fad4a69f31ba203cc9a3b69024c
+SHA512 (unit-1.25.0.tar.gz) = fc001ab21c5aa6c07b092f7b1f44be3b88636f9e2059c8bc4049a06d863daae1bbfa2531a4a24bdd5976250d7a0e260dcf0dbb0dec63efcc008b5398c6bb4bbd
+Size (unit-1.25.0.tar.gz) = 853280 bytes
diff -r 4107a000d3f1 -r 7adf85ec778a www/unit/Makefile
--- a/www/unit/Makefile Sun Aug 22 02:42:29 2021 +0000
+++ b/www/unit/Makefile Sun Aug 22 04:00:43 2021 +0000
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.3 2021/05/24 19:55:58 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2021/08/22 04:00:43 gutteridge Exp $
 
-PKGREVISION= 1
 .include "../../www/unit/version.mk"
 
 DISTNAME=      unit-${UNIT_VERSION}
diff -r 4107a000d3f1 -r 7adf85ec778a www/unit/Makefile.common
--- a/www/unit/Makefile.common  Sun Aug 22 02:42:29 2021 +0000
+++ b/www/unit/Makefile.common  Sun Aug 22 04:00:43 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2021/02/14 13:43:39 otis Exp $
+# $NetBSD: Makefile.common,v 1.3 2021/08/22 04:00:43 gutteridge Exp $
 #
 # used by www/libunit/Makefile
 # used by www/unit/Makefile
@@ -49,6 +49,9 @@
 CONFIGURE_ARGS+=       --tmp=${UNIT_TMPDIR}
 CONFIGURE_ARGS+=       --user=${UNIT_USER}
 CONFIGURE_ARGS+=       --group=${UNIT_GROUP}
+CONFIGURE_ARGS+=       --mandir=${PREFIX}/${PKGMANDIR}
+
+CHECK_WRKREF_SKIP=     libexec/unit/modules/ruby.unit.so
 
 .include "../../www/unit/options.mk"
 
diff -r 4107a000d3f1 -r 7adf85ec778a www/unit/PLIST
--- a/www/unit/PLIST    Sun Aug 22 02:42:29 2021 +0000
+++ b/www/unit/PLIST    Sun Aug 22 04:00:43 2021 +0000
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2021/02/14 11:56:57 otis Exp $
+@comment $NetBSD: PLIST,v 1.2 2021/08/22 04:00:43 gutteridge Exp $
 sbin/unitd
+man/man8/unitd.8
diff -r 4107a000d3f1 -r 7adf85ec778a www/unit/distinfo
--- a/www/unit/distinfo Sun Aug 22 02:42:29 2021 +0000
+++ b/www/unit/distinfo Sun Aug 22 04:00:43 2021 +0000
@@ -1,16 +1,12 @@
-$NetBSD: distinfo,v 1.1 2021/02/14 11:56:57 otis Exp $
+$NetBSD: distinfo,v 1.2 2021/08/22 04:00:43 gutteridge Exp $
 
-SHA1 (unit-1.22.0.tar.gz) = ab38a89c12d15a56fdc1a51dd6fa8a689e02abae
-RMD160 (unit-1.22.0.tar.gz) = a658f1c8f898e381a017303264b0d7202627cdbb
-SHA512 (unit-1.22.0.tar.gz) = 7418e9dd86c10d64184f5a2f3e26c27bacc53b90ba35658fba6af00a57df89645c16c16b510d3e570eee6f8fdeef4ec7f92971f7231093e3da118e858ed386f5
-Size (unit-1.22.0.tar.gz) = 824763 bytes
+SHA1 (unit-1.25.0.tar.gz) = f235f96f7f51f169bae85222dbc8c93ece69d589
+RMD160 (unit-1.25.0.tar.gz) = d08da7f6404e3fad4a69f31ba203cc9a3b69024c
+SHA512 (unit-1.25.0.tar.gz) = fc001ab21c5aa6c07b092f7b1f44be3b88636f9e2059c8bc4049a06d863daae1bbfa2531a4a24bdd5976250d7a0e260dcf0dbb0dec63efcc008b5398c6bb4bbd
+Size (unit-1.25.0.tar.gz) = 853280 bytes
 SHA1 (patch-auto_events) = 0347dfefbedaacd206c8c2bfd8ea38b18995dd9f
 SHA1 (patch-auto_os_conf) = 6d1cd7aef662a60d4288014eb6fadbe8c1268e55
-SHA1 (patch-src_nxt__cert.c) = c91e45f148a079b543a0d3cb277388bffb3e2854
-SHA1 (patch-src_nxt__conf__validation.c) = bc00a598fc3e8a6bb9ccee3b773b603e788b426f
 SHA1 (patch-src_nxt__kqueue__engine.c) = c341425f4b21d4cff6e003958f88a04b53dc4ee1
 SHA1 (patch-src_nxt__php__sapi.c) = 2d5e557ff2066bec78f5bfbca6a64688f60da01b
-SHA1 (patch-src_nxt__router.c) = cc679af06fce1589d555c001574cd4cbd1af53b7
-SHA1 (patch-src_nxt__unit.c) = fd9a43fc2cbcd342cd5e82e074c3c5a3d6a090cb
 SHA1 (patch-src_nxt__unix.h) = c0db5bc4d9c45a3ead48627567284d8b3041b0a0
 SHA1 (patch-src_nxt__websocket__header.h) = 1b50405b187cc8a662372a1c20ab7737278135ae
diff -r 4107a000d3f1 -r 7adf85ec778a www/unit/patches/patch-src_nxt__cert.c
--- a/www/unit/patches/patch-src_nxt__cert.c    Sun Aug 22 02:42:29 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-$NetBSD: patch-src_nxt__cert.c,v 1.1 2021/02/14 11:56:57 otis Exp $
-
-Use more portable way to find regular files.
-
---- src/nxt_cert.c.orig        2020-10-08 16:04:40.000000000 +0000
-+++ src/nxt_cert.c
-@@ -9,6 +9,9 @@
- #include <nxt_cert.h>
- 
- #include <dirent.h>
-+#include <fcntl.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
- 
- #include <openssl/bio.h>
- #include <openssl/pem.h>
-@@ -809,6 +812,7 @@ nxt_cert_store_load(nxt_task_t *task, nx
-     nxt_runtime_t    *rt;
-     struct dirent    *de;
-     nxt_cert_item_t  *item;
-+    struct stat      cert_statbuf;
- 
-     rt = task->thread->runtime;
- 
-@@ -838,7 +842,8 @@ nxt_cert_store_load(nxt_task_t *task, nx
-             break;
-         }
- 
--        if (de->d_type != DT_REG) {
-+        if (stat(de->d_name, &cert_statbuf) == -1 ||
-+            (cert_statbuf.st_mode & S_IFREG) == 0) {
-             continue;
-         }
- 
diff -r 4107a000d3f1 -r 7adf85ec778a www/unit/patches/patch-src_nxt__conf__validation.c
--- a/www/unit/patches/patch-src_nxt__conf__validation.c        Sun Aug 22 02:42:29 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_nxt__conf__validation.c,v 1.1 2021/02/14 11:56:57 otis Exp $
-
-NetBSD portability,
-https://mail-index.netbsd.org/tech-userlevel/2014/08/15/msg008729.html
-
-This patch is going to be reviewed by the vendor.
-
---- 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 -r 4107a000d3f1 -r 7adf85ec778a www/unit/patches/patch-src_nxt__router.c
--- a/www/unit/patches/patch-src_nxt__router.c  Sun Aug 22 02:42:29 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_nxt__router.c,v 1.1 2021/02/14 11:56:57 otis Exp $
-
-Silence warning.
-
-This patch is going to be reviewed by the vendor.
-
---- src/nxt_router.c.orig      2020-10-08 16:04:40.000000000 +0000
-+++ src/nxt_router.c
-@@ -3692,7 +3692,7 @@ nxt_router_thread_exit_handler(nxt_task_
-     nxt_event_engine_t   *engine;
-     nxt_thread_handle_t  handle;
- 
--    handle = (nxt_thread_handle_t) obj;
-+    handle = (nxt_thread_handle_t)(uintptr_t) obj;
-     link = data;
- 
-     nxt_thread_wait(handle);
diff -r 4107a000d3f1 -r 7adf85ec778a www/unit/patches/patch-src_nxt__unit.c
--- a/www/unit/patches/patch-src_nxt__unit.c    Sun Aug 22 02:42:29 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-src_nxt__unit.c,v 1.1 2021/02/14 11:56:57 otis Exp $
-
-Use more apropriate format specifier for shm prefix.
-
-This patch is going to be reviewed by the vendor.
-
---- src/nxt_unit.c.orig        2020-11-19 18:12:30.000000000 +0000
-+++ src/nxt_unit.c
-@@ -3762,8 +3762,8 @@ nxt_unit_shm_open(nxt_unit_ctx_t *ctx, s
- #if (NXT_HAVE_MEMFD_CREATE || NXT_HAVE_SHM_OPEN)
-     char             name[64];
- 
--    snprintf(name, sizeof(name), NXT_SHM_PREFIX "unit.%d.%p",
--             lib->pid, (void *) pthread_self());
-+    snprintf(name, sizeof(name), NXT_SHM_PREFIX "unit.%d.%p",
-+             lib->pid, (void *) (uintptr_t)pthread_self());
- #endif
- 
- #if (NXT_HAVE_MEMFD_CREATE)
diff -r 4107a000d3f1 -r 7adf85ec778a www/unit/version.mk
--- a/www/unit/version.mk       Sun Aug 22 02:42:29 2021 +0000
+++ b/www/unit/version.mk       Sun Aug 22 04:00:43 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: version.mk,v 1.1 2021/02/14 11:56:57 otis Exp $
+# $NetBSD: version.mk,v 1.2 2021/08/22 04:00:43 gutteridge Exp $
 #
 # UNIT_EXTENSION_DIR
 #      Relative path to ${PREFIX} for NGINX Unit's modules.
@@ -12,7 +12,7 @@
 UNITVERSION_MK=        defined
 
 # Define NGINX Unit's version.
-UNIT_VERSION=  1.22.0
+UNIT_VERSION=  1.25.0
 
 # Define NGINX Unit's modules directory
 UNIT_EXTENSION_DIR=    libexec/unit/modules