*/*unit*: update NGINX Unit: 1.30.0 -> 1.31.0
<ChangeLog> *) Change: if building with njs, version 0.8.0 or later is now required. *) Feature: technology preview of WebAssembly application module. *) Feature: "response_headers" option to manage headers in the action and fallback. *) Feature: HTTP response header variables. *) Feature: ASGI lifespan state support. Thanks to synodriver. *) Bugfix: ensure that $uri variable is not cached. *) Bugfix: deprecated options were unavailable. *) Bugfix: ASGI applications inaccessible over IPv6. </ChangeLog>
This commit is contained in:
osa
parent
0c97385ba1
commit
0858375444
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.6 2023/05/15 22:24:38 osa Exp $
|
||||
# $NetBSD: Makefile,v 1.7 2023/09/01 17:28:28 osa Exp $
|
||||
|
||||
PKGNAME= libunit-${UNIT_VERSION}
|
||||
DISTNAME= unit-${UNIT_VERSION}
|
||||
|
|
@ -13,6 +13,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}
|
|||
|
||||
CONFIGURE_ARGS+= --prefix=${PREFIX}
|
||||
CONFIGURE_ARGS+= --ld-opt="-L${PREFIX}/lib -R${PREFIX}/lib"
|
||||
CONFIGURE_ARGS+= --pkgconfigdir=${PREFIX}/lib/pkgconfig
|
||||
CONFIGURE_ARGS+= --no-regex
|
||||
|
||||
do-build:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
@comment $NetBSD: PLIST,v 1.1 2021/02/14 12:04:30 otis Exp $
|
||||
@comment $NetBSD: PLIST,v 1.2 2023/09/01 17:28:28 osa Exp $
|
||||
include/nxt_auto_config.h
|
||||
include/nxt_unit.h
|
||||
include/nxt_unit_field.h
|
||||
|
|
@ -10,3 +10,4 @@ include/nxt_unit_websocket.h
|
|||
include/nxt_version.h
|
||||
include/nxt_websocket_header.h
|
||||
lib/libunit.a
|
||||
lib/pkgconfig/unit.pc
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
# $NetBSD: Makefile,v 1.8 2023/07/06 09:43:01 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.9 2023/09/01 17:28:28 osa Exp $
|
||||
|
||||
PKGNAME= unit-${LANG}-${UNIT_VERSION}
|
||||
PKGREVISION= 1
|
||||
COMMENT= Perl module for NGINX Unit
|
||||
|
||||
LANG= perl
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
# $NetBSD: Makefile,v 1.11 2023/06/30 20:44:33 osa Exp $
|
||||
# $NetBSD: Makefile,v 1.12 2023/09/01 17:28:29 osa Exp $
|
||||
|
||||
PKGNAME= unit-${LANG}${PKG_PHP_VERSION}-${UNIT_VERSION}
|
||||
PKGREVISION= 1
|
||||
COMMENT= PHP module for NGINX Unit
|
||||
|
||||
LANG= php
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
# $NetBSD: Makefile,v 1.9 2023/08/14 05:25:31 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.10 2023/09/01 17:28:29 osa Exp $
|
||||
|
||||
PKGNAME= unit-${LANG}${PYVERSSUFFIX}-${UNIT_VERSION}
|
||||
PKGREVISION= 2
|
||||
COMMENT= Python module for NGINX Unit
|
||||
|
||||
LANG= python
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
# $NetBSD: Makefile,v 1.5 2023/06/30 20:49:44 osa Exp $
|
||||
# $NetBSD: Makefile,v 1.6 2023/09/01 17:28:29 osa Exp $
|
||||
|
||||
PKGNAME= unit-${LANG}${RUBY_VER}-${UNIT_VERSION}
|
||||
PKGREVISION= 1
|
||||
COMMENT= Ruby module for NGINX Unit
|
||||
|
||||
LANG= ruby
|
||||
|
|
|
|||
|
|
@ -1,9 +1,8 @@
|
|||
# $NetBSD: Makefile,v 1.12 2023/08/14 05:25:31 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.13 2023/09/01 17:28:28 osa Exp $
|
||||
|
||||
.include "../../www/unit/version.mk"
|
||||
|
||||
DISTNAME= unit-${UNIT_VERSION}
|
||||
PKGREVISION= 3
|
||||
|
||||
COMMENT= Dynamic web application server
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,11 @@
|
|||
$NetBSD: distinfo,v 1.16 2023/07/20 15:02:52 osa Exp $
|
||||
$NetBSD: distinfo,v 1.17 2023/09/01 17:28:28 osa Exp $
|
||||
|
||||
BLAKE2s (unit-1.30.0.tar.gz) = f7e52b90480d529ef304cc659b123819270d24c74e5c9085a61d71b59c409e35
|
||||
SHA512 (unit-1.30.0.tar.gz) = cee27016c5445eb44d144a491c6ec36445e45492c09775ec62613dd260e36a9a2d387088e3ae814082d1782dbcefca105e884ebd21dea94288a03062c945139d
|
||||
Size (unit-1.30.0.tar.gz) = 894843 bytes
|
||||
BLAKE2s (unit-1.31.0.tar.gz) = b32dd736ae40a1037a43b47bea8365884d1c82cf1f8c7672bc49bb075e93c180
|
||||
SHA512 (unit-1.31.0.tar.gz) = ce367c81dc96b4a8d280a3e34ff8bbf1941a595c5570f9e50ffa49e1f8ac3c2e0a620be5a994a1c4c65aee7790ca227fddafba1c461fccdced83fd4c08c091e6
|
||||
Size (unit-1.31.0.tar.gz) = 905152 bytes
|
||||
SHA1 (patch-auto_events) = 0556b5d3db6b88d23d686d9da1f3274187079973
|
||||
SHA1 (patch-auto_os_conf) = 6d1cd7aef662a60d4288014eb6fadbe8c1268e55
|
||||
SHA1 (patch-auto_shmem) = cb37c368c19205c2cc1750f4a847af23be8bfa25
|
||||
SHA1 (patch-src_nxt__js.c) = 8267786453ade749b09b9d1c5cb25abd424dd703
|
||||
SHA1 (patch-src_nxt__kqueue__engine.c) = c341425f4b21d4cff6e003958f88a04b53dc4ee1
|
||||
SHA1 (patch-src_nxt__php__sapi.c) = 2d5e557ff2066bec78f5bfbca6a64688f60da01b
|
||||
SHA1 (patch-src_nxt__unix.h) = c0db5bc4d9c45a3ead48627567284d8b3041b0a0
|
||||
|
|
|
|||
|
|
@ -1,77 +0,0 @@
|
|||
$NetBSD: patch-src_nxt__js.c,v 1.1 2023/07/20 15:02:52 osa Exp $
|
||||
|
||||
Fix compatibility, obtained from the upstream
|
||||
|
||||
--- src/nxt_js.c.orig 2023-05-10 12:22:28.000000000 -0400
|
||||
+++ src/nxt_js.c
|
||||
@@ -386,11 +386,11 @@
|
||||
nxt_js_t *js, nxt_str_t *str, void *ctx)
|
||||
{
|
||||
njs_vm_t *vm;
|
||||
- njs_int_t rc, ret;
|
||||
+ njs_int_t ret;
|
||||
njs_str_t res;
|
||||
- njs_value_t *array, *value;
|
||||
+ njs_value_t *value;
|
||||
njs_function_t *func;
|
||||
- njs_opaque_value_t opaque_value, arguments[6];
|
||||
+ njs_opaque_value_t retval, opaque_value, arguments[6];
|
||||
|
||||
static const njs_str_t uri_str = njs_str("uri");
|
||||
static const njs_str_t host_str = njs_str("host");
|
||||
@@ -407,15 +407,12 @@
|
||||
return NXT_ERROR;
|
||||
}
|
||||
|
||||
- ret = njs_vm_start(vm);
|
||||
+
|
||||
+ cache->vm = vm;
|
||||
+ ret = njs_vm_start(vm, &cache->array);
|
||||
if (ret != NJS_OK) {
|
||||
return NXT_ERROR;
|
||||
}
|
||||
-
|
||||
- array = njs_vm_retval(vm);
|
||||
-
|
||||
- cache->vm = vm;
|
||||
- cache->array = *array;
|
||||
}
|
||||
|
||||
value = njs_vm_array_prop(vm, &cache->array, js->index, &opaque_value);
|
||||
@@ -463,18 +460,20 @@
|
||||
return NXT_ERROR;
|
||||
}
|
||||
|
||||
- ret = njs_vm_call(vm, func, njs_value_arg(&arguments), 6);
|
||||
-
|
||||
- rc = njs_vm_retval_string(vm, &res);
|
||||
- if (rc != NJS_OK) {
|
||||
- return NXT_ERROR;
|
||||
- }
|
||||
+ ret = njs_vm_invoke(vm, func, njs_value_arg(&arguments), 6,
|
||||
+ njs_value_arg(&retval));
|
||||
|
||||
if (ret != NJS_OK) {
|
||||
- nxt_alert(task, "js exception: %V", &res);
|
||||
+ ret = njs_vm_exception_string(vm, &res);
|
||||
+ if (ret == NJS_OK) {
|
||||
+ nxt_alert(task, "js exception: %V", &res);
|
||||
+ }
|
||||
+
|
||||
return NXT_ERROR;
|
||||
}
|
||||
|
||||
+ ret = njs_vm_value_string(vm, &res, njs_value_arg(&retval));
|
||||
+
|
||||
str->length = res.length;
|
||||
str->start = res.start;
|
||||
|
||||
@@ -498,7 +497,7 @@
|
||||
njs_str_t res;
|
||||
nxt_str_t err;
|
||||
|
||||
- ret = njs_vm_retval_string(vm, &res);
|
||||
+ ret = njs_vm_exception_string(vm, &res);
|
||||
if (nxt_slow_path(ret != NJS_OK)) {
|
||||
return NXT_ERROR;
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: version.mk,v 1.9 2023/05/15 22:24:38 osa Exp $
|
||||
# $NetBSD: version.mk,v 1.10 2023/09/01 17:28:28 osa 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.30.0
|
||||
UNIT_VERSION= 1.31.0
|
||||
|
||||
# Define NGINX Unit's modules directory
|
||||
UNIT_EXTENSION_DIR= libexec/unit/modules
|
||||
|
|
|
|||
Loading…
Reference in New Issue