Tue May 7 13:49:33 2024 UTC (19d)
*/*unit*: update NGINX Unit from 1.31.1 to 1.32.1

<ChangeLog>

Changes with Unit 1.32.1                                  26 Mar 2024

*) Bugfix: NJS variables in templates may have incorrect values due to
   improper caching.

*) Bugfix: Wasm application process hangs after receiving restart signal
   from the control.

Changes with Unit 1.32.0                                  27 Feb 2024

*) Feature: WebAssembly Components using WASI interfaces defined in
   wasi:http/proxy@0.2.0.

*) Feature: conditional access logging.

*) Feature: NJS variables access.

*) Feature: $request_id variable contains a string that is formed using
   random data and can be used as a unique request identifier.

*) Feature: options to set control socket permissions.

*) Feature: Ruby arrays in response headers, improving compatibility
   with Rack v3.0.

*) Feature: Python bytearray response bodies for ASGI applications.

*) Bugfix: router could crash while sending large files. Thanks to
   rustedsword.

*) Bugfix: serving static files from a network filesystem could lead to
   error.

*) Bugfix: "uidmap" and "gidmap" isolation options validation.

*) Bugfix: abstract UNIX socket name could be corrupted during
   configuration validation. Thanks to Alejandro Colomar.

*) Bugfix: HTTP header field value encoding could be misinterpreted in
   Python module.

*) Bugfix: Node.js http.createServer() accepts and ignores the "options"
   argument, improving compatibility with strapi applications, among
   others.

*) Bugfix: ServerRequest.flushHeaders() implemented in Node.js module to
   make it compatible with Next.js.

*) Bugfix: ServerRequest.httpVersion variable format in Node.js module.

*) Bugfix: Node.js module handles standard library imports prefixed with
   "node:", making it possible to run newer Nuxt applications, among
   others.

*) Bugfix: Node.js tarball location changed to avoid build/install
   errors.

*) Bugfix: Go module sets environment variables necessary for building
   on macOS/arm64 systems.

</ChangeLog>


(osa)
diff -r1.18 -r1.19 pkgsrc/www/unit/distinfo
diff -r1.11 -r1.12 pkgsrc/www/unit/version.mk
diff -r1.12 -r1.13 pkgsrc/www/unit-php/Makefile
diff -r0 -r1.3 pkgsrc/www/unit/patches/patch-src_nxt__js.c
diff -r0 -r1.1 pkgsrc/www/unit/patches/patch-src_nxt__script.c

cvs diff -r1.18 -r1.19 pkgsrc/www/unit/distinfo (expand / switch to unified diff)

--- pkgsrc/www/unit/distinfo 2023/10/21 23:24:43 1.18
+++ pkgsrc/www/unit/distinfo 2024/05/07 13:49:33 1.19
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.18 2023/10/21 23:24:43 osa Exp $ 1$NetBSD: distinfo,v 1.19 2024/05/07 13:49:33 osa Exp $
2 2
3BLAKE2s (unit-1.31.1.tar.gz) = aeff6d7b24e8c0866fb49bbddfc7fd07446c293d251c472d2b3c41f265d6542b 3BLAKE2s (unit-1.32.1.tar.gz) = bfc777d7485f893699f6e0905c5d330914ff939fed9b17765e247310354de22d
4SHA512 (unit-1.31.1.tar.gz) = 28e5f1e88b9e5e21c5094f901227e193137c120e4af3f2950e113d118a301cabb17abf9f0fea8fc8893f36f6e9ae09f86bbf7a323999da34e71e42615937c57c 4SHA512 (unit-1.32.1.tar.gz) = 159b36f7afb8857188c9b64ee192e18d6990da3733caafcfb684b98e3f5182a7589ed2439f32af0cd3c763a3fa73f061f5a73ef01894182b1c12a4cd324c528a
5Size (unit-1.31.1.tar.gz) = 907165 bytes 5Size (unit-1.32.1.tar.gz) = 937669 bytes
6SHA1 (patch-auto_events) = 0556b5d3db6b88d23d686d9da1f3274187079973 6SHA1 (patch-auto_events) = 0556b5d3db6b88d23d686d9da1f3274187079973
7SHA1 (patch-auto_os_conf) = 6d1cd7aef662a60d4288014eb6fadbe8c1268e55 7SHA1 (patch-auto_os_conf) = 6d1cd7aef662a60d4288014eb6fadbe8c1268e55
8SHA1 (patch-auto_shmem) = cb37c368c19205c2cc1750f4a847af23be8bfa25 8SHA1 (patch-auto_shmem) = cb37c368c19205c2cc1750f4a847af23be8bfa25
9SHA1 (patch-src_nxt__kqueue__engine.c) = c341425f4b21d4cff6e003958f88a04b53dc4ee1 9SHA1 (patch-src_nxt__kqueue__engine.c) = c341425f4b21d4cff6e003958f88a04b53dc4ee1
10SHA1 (patch-src_nxt__php__sapi.c) = 2d5e557ff2066bec78f5bfbca6a64688f60da01b 10SHA1 (patch-src_nxt__php__sapi.c) = 2d5e557ff2066bec78f5bfbca6a64688f60da01b
11SHA1 (patch-src_nxt__unix.h) = c0db5bc4d9c45a3ead48627567284d8b3041b0a0 11SHA1 (patch-src_nxt__unix.h) = c0db5bc4d9c45a3ead48627567284d8b3041b0a0
12SHA1 (patch-src_nxt__websocket__header.h) = 1b50405b187cc8a662372a1c20ab7737278135ae 12SHA1 (patch-src_nxt__websocket__header.h) = 1b50405b187cc8a662372a1c20ab7737278135ae

cvs diff -r1.11 -r1.12 pkgsrc/www/unit/version.mk (expand / switch to unified diff)

--- pkgsrc/www/unit/version.mk 2023/10/21 23:24:43 1.11
+++ pkgsrc/www/unit/version.mk 2024/05/07 13:49:33 1.12
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: version.mk,v 1.11 2023/10/21 23:24:43 osa Exp $ 1# $NetBSD: version.mk,v 1.12 2024/05/07 13:49:33 osa Exp $
2# 2#
3# UNIT_EXTENSION_DIR 3# UNIT_EXTENSION_DIR
4# Relative path to ${PREFIX} for NGINX Unit's modules. 4# Relative path to ${PREFIX} for NGINX Unit's modules.
5# 5#
6# Example: libexec/unit/modules 6# Example: libexec/unit/modules
7# 7#
8# Keywords: unit 8# Keywords: unit
9# 9#
10 10
11.if !defined(UNITVERSION_MK) 11.if !defined(UNITVERSION_MK)
12UNITVERSION_MK= defined 12UNITVERSION_MK= defined
13 13
14# Define NGINX Unit's version. 14# Define NGINX Unit's version.
15UNIT_VERSION= 1.31.1 15UNIT_VERSION= 1.32.1
16 16
17# Define NGINX Unit's modules directory 17# Define NGINX Unit's modules directory
18UNIT_EXTENSION_DIR= libexec/unit/modules 18UNIT_EXTENSION_DIR= libexec/unit/modules
19 19
20.endif # UNITVERSION_MK 20.endif # UNITVERSION_MK

cvs diff -r1.12 -r1.13 pkgsrc/www/unit-php/Makefile (expand / switch to unified diff)

--- pkgsrc/www/unit-php/Makefile 2023/09/01 17:28:29 1.12
+++ pkgsrc/www/unit-php/Makefile 2024/05/07 13:49:33 1.13
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1# $NetBSD: Makefile,v 1.12 2023/09/01 17:28:29 osa Exp $ 1# $NetBSD: Makefile,v 1.13 2024/05/07 13:49:33 osa Exp $
2 2
3PKGNAME= unit-${LANG}${PKG_PHP_VERSION}-${UNIT_VERSION} 3PKGNAME= unit-${LANG}${PKG_PHP_VERSION}-${UNIT_VERSION}
4COMMENT= PHP module for NGINX Unit 4COMMENT= PHP module for NGINX Unit
5 5
6LANG= php 6LANG= php
7MODNAME= ${LANG}${PHP_VERSION} 7MODNAME= ${LANG}${PHP_VERSION}
8 8
9MAINTAINER= osa@NetBSD.org 9MAINTAINER= osa@NetBSD.org
10 10
11PHP_VERSIONS_ACCEPTED?= 56 74 80 81 82 11PHP_VERSIONS_ACCEPTED?= 56 74 80 81 82 83
12 12
13.include "../../lang/php/phpversion.mk" 13.include "../../lang/php/phpversion.mk"
14 14
15post-configure: 15post-configure:
16 ${RUN} cd ${WRKSRC} && ${SETENV} ${_CONFIGURE_SCRIPT_ENV} \ 16 ${RUN} cd ${WRKSRC} && ${SETENV} ${_CONFIGURE_SCRIPT_ENV} \
17 ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} \ 17 ${CONFIG_SHELL} ${CONFIG_SHELL_FLAGS} \
18 ${CONFIGURE_SCRIPT} ${LANG} \ 18 ${CONFIGURE_SCRIPT} ${LANG} \
19 --lib-path=${PREFIX}/lib \ 19 --lib-path=${PREFIX}/lib \
20 --module=${MODNAME} 20 --module=${MODNAME}
21 21
22.include "${PHPPKGSRCDIR}/buildlink3.mk" 22.include "${PHPPKGSRCDIR}/buildlink3.mk"
23.if empty(PKG_BUILD_OPTIONS.php:Mphp-embed) 23.if empty(PKG_BUILD_OPTIONS.php:Mphp-embed)
24PKG_FAIL_REASON= "Requires the php-embed option enabled in PHP." 24PKG_FAIL_REASON= "Requires the php-embed option enabled in PHP."

File Added: pkgsrc/www/unit/patches/patch-src_nxt__js.c
$NetBSD: patch-src_nxt__js.c,v 1.3 2024/05/07 13:49:33 osa Exp $

Fix build with the recent version of NGINX JavaScript

--- src/nxt_js.c.orig	2023-10-17 14:15:38 UTC
+++ src/nxt_js.c
@@ -69,14 +69,6 @@ nxt_js_module_loader(njs_vm_t *vm, njs_external_ptr_t 
 }
 
 
-static njs_vm_ops_t  nxt_js_ops = {
-    NULL,
-    NULL,
-    nxt_js_module_loader,
-    NULL,
-};
-
-
 njs_int_t  nxt_js_proto_id;
 
 
@@ -127,6 +119,7 @@ nxt_js_vm_create(nxt_js_conf_t *jcf)
 {
     u_char           *p;
     size_t           size;
+    njs_vm_t         *vm;
     nxt_uint_t       i;
     njs_vm_opt_t     opts;
     nxt_js_module_t  *module, *mod;
@@ -146,7 +139,6 @@ nxt_js_vm_create(nxt_js_conf_t *jcf)
         goto done;
     }
 
-    opts.ops = &nxt_js_ops;
     opts.external = jcf;
 
     size = 0;
@@ -203,7 +195,13 @@ nxt_js_vm_create(nxt_js_conf_t *jcf)
 
 done:
 
-    return njs_vm_create(&opts);
+    vm = njs_vm_create(&opts);
+
+    if (nxt_fast_path(vm != NULL)) {
+        njs_vm_set_module_loader(vm, nxt_js_module_loader, jcf);
+    }
+
+    return vm;
 }
 
 

File Added: pkgsrc/www/unit/patches/patch-src_nxt__script.c
$NetBSD: patch-src_nxt__script.c,v 1.1 2024/05/07 13:49:33 osa Exp $

Fix build with the recent versions of NGINX JavaScript

--- src/nxt_script.c.orig	2023-10-17 14:15:38 UTC
+++ src/nxt_script.c
@@ -37,14 +37,6 @@ static void nxt_script_buf_completion(nxt_task_t *task
 static nxt_lvlhsh_t  nxt_script_info;
 
 
-static njs_vm_ops_t  nxt_js_ops = {
-    NULL,
-    NULL,
-    nxt_js_module_loader,
-    NULL,
-};
-
-
 nxt_script_t *
 nxt_script_new(nxt_task_t *task, nxt_str_t *name, u_char *data, size_t size,
     u_char *error)
@@ -62,8 +54,6 @@ nxt_script_new(nxt_task_t *task, nxt_str_t *name, u_ch
 
     opts.file.start = (u_char *) "default";
     opts.file.length = 7;
-
-    opts.ops = &nxt_js_ops;
 
     vm = njs_vm_create(&opts);
     if (nxt_slow_path(vm == NULL)) {