git: af57cd6317d4 - main - */*unit*: update NGINX Unit: 1.32.1 -> 1.33.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 21 Sep 2024 16:25:48 UTC
The branch main has been updated by osa:
URL: https://cgit.FreeBSD.org/ports/commit/?id=af57cd6317d458a7e936aa3eaadea2da37a6e5dd
commit af57cd6317d458a7e936aa3eaadea2da37a6e5dd
Author: Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2024-09-21 16:24:59 +0000
Commit: Sergey A. Osokin <osa@FreeBSD.org>
CommitDate: 2024-09-21 16:25:40 +0000
*/*unit*: update NGINX Unit: 1.32.1 -> 1.33.0
<ChangeLog>
*) Feature: make the number of router threads configurable.
*) Feature: make the listen(2) backlog configurable.
*) Feature: add Python application factory support.
*) Feature: add experimental chunked request body support. (Disabled by
default).
*) Feature: add fuzzing via oss-fuzz.
*) Feature: add "if" option to the "match" object.
*) Feature: show list of loaded language modules in the /status
endpoint.
*) Feature: Unit ships with a new Rust based CLI application "unitctl".
*) Feature: the wasm-wasi-component language module now inherits the
processes environment.
*) Change: under systemd unit runs in forking mode (once again).
*) Change: if building with njs, version 0.8.3 or later is now required.
*) Change: Unit now builds with -std=gnu11 (C11 with GNU extensions).
*) Change: Unit now creates the full directory path for the PID file and
control socket.
*) Change: build system improvements, including pretty printing the make
output and enabling various make variables to influence the build
process (see: make help).
*) Change: better detection of available runnable CPUs on Linux.
*) Change: default listen(2) backlog on Linux now defaults to Kernel
default.
*) Bugfix: don't modify REQUEST_URI.
*) Bugfix: fix a crash when interrupting a download via a proxy.
*) Bugfix: wasm-wasi-component application process hangs after receiving
restart signal from the control endpoint.
*) Bugfix: njs variables accessed with a JS template literal should not
be cacheable.
*) Bugfix: properly handle deleting arrays of certificates.
*) Bugfix: don't create the $runstatedir directory which triggered an
Alpine packaging error.
</ChangeLog>
---
www/unit-java/Makefile | 6 +--
www/unit-java/distinfo | 58 ++++++++++++-------------
www/unit-wasm/Makefile | 1 -
www/unit/Makefile | 1 -
www/unit/distinfo | 6 +--
www/unit/files/patch-src_nxt__http__js.c | 74 --------------------------------
www/unit/files/patch-src_nxt__js.c | 48 ---------------------
www/unit/files/patch-src_nxt__script.c | 26 -----------
www/unit/version.mk | 2 +-
9 files changed, 36 insertions(+), 186 deletions(-)
diff --git a/www/unit-java/Makefile b/www/unit-java/Makefile
index bb175933a4ec..abb77bceba9d 100644
--- a/www/unit-java/Makefile
+++ b/www/unit-java/Makefile
@@ -39,10 +39,10 @@ COMMENT= Java module for NGINX Unit
RUN_DEPENDS= unitd:www/unit
UNIT_MODNAME= java${JAVA_PORT_VERSION}
-CLASSGRAPH_VERSION= 4.8.165
+CLASSGRAPH_VERSION= 4.8.175
ECJ_VERSION= 3.26.0
-JETTY_VERSION= 9.4.54.v20240208
-TOMCAT_VERSION= 9.0.86
+JETTY_VERSION= 9.4.56.v20240826
+TOMCAT_VERSION= 9.0.93
PLIST_FILES= %%JAVAJARDIR%%/classgraph-${CLASSGRAPH_VERSION}.jar \
%%JAVAJARDIR%%/ecj-${ECJ_VERSION}.jar \
diff --git a/www/unit-java/distinfo b/www/unit-java/distinfo
index 422f047a9f7b..afbb2c43154e 100644
--- a/www/unit-java/distinfo
+++ b/www/unit-java/distinfo
@@ -1,31 +1,31 @@
-TIMESTAMP = 1714515235
-SHA256 (unit-1.32.1.tar.gz) = 0e440ef63a3adf9400db978a64fc84e1eb8887f61a04ccff284c3f682fb83ea2
-SIZE (unit-1.32.1.tar.gz) = 937669
-SHA256 (classgraph-4.8.165.jar) = 5258d9218fc6413f4d14218a5a6e784528e349f60f48883b77de74bb478ebafd
-SIZE (classgraph-4.8.165.jar) = 562061
+TIMESTAMP = 1726838751
+SHA256 (unit-1.33.0.tar.gz) = 2a95937473c8ff01f6fbaa0103b388c769df8a23962248b0b9cb80b606d74155
+SIZE (unit-1.33.0.tar.gz) = 1025455
+SHA256 (classgraph-4.8.175.jar) = 47509308539a3e0da50053dafd6474542df210cea724fb1a783563018372089a
+SIZE (classgraph-4.8.175.jar) = 574448
SHA256 (ecj-3.26.0.jar) = ac0ba5876eaf7ebb47749a0d1be179c51f194b9dd0b875d1c09e1b530f5a2db5
SIZE (ecj-3.26.0.jar) = 3133846
-SHA256 (jetty-http-9.4.54.v20240208.jar) = 90e44ea0dba911fe23b7cc4554ea8761e92dfd803401e3888fe6eb10a07944e7
-SIZE (jetty-http-9.4.54.v20240208.jar) = 249060
-SHA256 (jetty-server-9.4.54.v20240208.jar) = 96a3e929207cab7612aef2ed9e80a2d1514bd5cfba118f6d040677ae483398f3
-SIZE (jetty-server-9.4.54.v20240208.jar) = 736747
-SHA256 (jetty-util-9.4.54.v20240208.jar) = 0025f8470828d60dc93e6b5c33c015630b6b05a23afa8173ee7e60b928a4521e
-SIZE (jetty-util-9.4.54.v20240208.jar) = 588936
-SHA256 (tomcat-api-9.0.86.jar) = a7c7fba27d3ca290b68fd1032738e3d606557f7d9ef62340cf472f363253d36a
-SIZE (tomcat-api-9.0.86.jar) = 11647
-SHA256 (tomcat-el-api-9.0.86.jar) = ad1246f087765f775676d2b783e7153fe5132b3e82d86e1fe1c572c3e3bf52dc
-SIZE (tomcat-el-api-9.0.86.jar) = 89536
-SHA256 (tomcat-jsp-api-9.0.86.jar) = 4fdacc9aaa31b65028f6d77df9b874c716abee7edcc130faa4b44dc8b8b4e48d
-SIZE (tomcat-jsp-api-9.0.86.jar) = 73914
-SHA256 (tomcat-jasper-9.0.86.jar) = 71b7b1820499470faddb965de5f4e7a095a7573a1c35c724d6f29e4c2a489e7c
-SIZE (tomcat-jasper-9.0.86.jar) = 575641
-SHA256 (tomcat-jasper-el-9.0.86.jar) = eef9f53c6fe75b51164bef47e29a781f632be6f57ed6d210fb5fc571893eaebf
-SIZE (tomcat-jasper-el-9.0.86.jar) = 173819
-SHA256 (tomcat-juli-9.0.86.jar) = 8be3d1fc0f23f7aebc7e04dd709fb6c743a4d31fae4c3f816ee4a4ca62365c36
-SIZE (tomcat-juli-9.0.86.jar) = 49609
-SHA256 (tomcat-servlet-api-9.0.86.jar) = a7ee32024d12a86ca0b5e0054827c94f08ca6e337e4d56151c5996d92c596328
-SIZE (tomcat-servlet-api-9.0.86.jar) = 285627
-SHA256 (tomcat-util-9.0.86.jar) = 3324d15b7f59007233cd398bc30a9badd0535d11a428610440934f078d579f3c
-SIZE (tomcat-util-9.0.86.jar) = 228110
-SHA256 (tomcat-util-scan-9.0.86.jar) = 0e06191fae3fa1ba3022781788414a8191d8023414992ffd4c6f924441cfe811
-SIZE (tomcat-util-scan-9.0.86.jar) = 227552
+SHA256 (jetty-http-9.4.56.v20240826.jar) = 203bb49644f2be0aea6a6adb320e64808156588b854ff231a756f65847fcd493
+SIZE (jetty-http-9.4.56.v20240826.jar) = 249063
+SHA256 (jetty-server-9.4.56.v20240826.jar) = afb44ddcd73a6f31f518af69c4ca6af0f0d43a8f3bf67b842ff954891ca77e65
+SIZE (jetty-server-9.4.56.v20240826.jar) = 739465
+SHA256 (jetty-util-9.4.56.v20240826.jar) = 08d10469827064960b00807963a0d221f1b706054c4559bca9c74c92f8906aaa
+SIZE (jetty-util-9.4.56.v20240826.jar) = 588923
+SHA256 (tomcat-api-9.0.93.jar) = 331e27f01ad1ba8e54a091929ebb059970db544350cc8a9d26fa79fbca1a2918
+SIZE (tomcat-api-9.0.93.jar) = 11647
+SHA256 (tomcat-el-api-9.0.93.jar) = e495c9f85312f3663a960ab282e70c0d7be46bf0cbee55d22aa0f24c2a48967f
+SIZE (tomcat-el-api-9.0.93.jar) = 89557
+SHA256 (tomcat-jsp-api-9.0.93.jar) = 4c6cd2390f571ced6e4abcb14556702e5e62488415db020644c1bec50eca286b
+SIZE (tomcat-jsp-api-9.0.93.jar) = 73913
+SHA256 (tomcat-jasper-9.0.93.jar) = d920c050fd9e6b869585655877fb721ae6b54fcf3bbce727b1cd3c4d40ff0694
+SIZE (tomcat-jasper-9.0.93.jar) = 576695
+SHA256 (tomcat-jasper-el-9.0.93.jar) = 2f7c4d13f29b5c099a30e6400d37b3b45a203d47c5f100dce11e7daa2a61c0a8
+SIZE (tomcat-jasper-el-9.0.93.jar) = 173924
+SHA256 (tomcat-juli-9.0.93.jar) = 6051ba8f34729c5b9ff75eb605242657b316b910aa1a1ecc390170c6db80d84b
+SIZE (tomcat-juli-9.0.93.jar) = 49609
+SHA256 (tomcat-servlet-api-9.0.93.jar) = f24f069873cdc291ca918ee5cf91abf592f121ef9b0f06a85708121000acaddc
+SIZE (tomcat-servlet-api-9.0.93.jar) = 285625
+SHA256 (tomcat-util-9.0.93.jar) = 8c8918be7d12f5650fde086e838e3c89d3a1be0ad2955f49a51f257b806b2d76
+SIZE (tomcat-util-9.0.93.jar) = 229600
+SHA256 (tomcat-util-scan-9.0.93.jar) = d7192927a20892e831dd59b7725059569d8ed43671e3ae291a2e355f5ca04b22
+SIZE (tomcat-util-scan-9.0.93.jar) = 227690
diff --git a/www/unit-wasm/Makefile b/www/unit-wasm/Makefile
index 2b87d3ff838a..7dc4e2c28bdb 100644
--- a/www/unit-wasm/Makefile
+++ b/www/unit-wasm/Makefile
@@ -1,5 +1,4 @@
PKGNAMESUFFIX= -${UNIT_MODNAME}
-PORTREVISION= 1
UNIT_MODNAME= wasm
diff --git a/www/unit/Makefile b/www/unit/Makefile
index 43a4c7744739..39d154976c3e 100644
--- a/www/unit/Makefile
+++ b/www/unit/Makefile
@@ -1,6 +1,5 @@
PORTNAME= unit
PORTVERSION= ${UNIT_VERSION}
-PORTREVISION= 1
CATEGORIES= www
MASTER_SITES?= https://unit.nginx.org/download/
diff --git a/www/unit/distinfo b/www/unit/distinfo
index b126e53ad55c..cd78dd2b941a 100644
--- a/www/unit/distinfo
+++ b/www/unit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1714508183
-SHA256 (unit-1.32.1.tar.gz) = 0e440ef63a3adf9400db978a64fc84e1eb8887f61a04ccff284c3f682fb83ea2
-SIZE (unit-1.32.1.tar.gz) = 937669
+TIMESTAMP = 1726786423
+SHA256 (unit-1.33.0.tar.gz) = 2a95937473c8ff01f6fbaa0103b388c769df8a23962248b0b9cb80b606d74155
+SIZE (unit-1.33.0.tar.gz) = 1025455
diff --git a/www/unit/files/patch-src_nxt__http__js.c b/www/unit/files/patch-src_nxt__http__js.c
deleted file mode 100644
index 51c291304599..000000000000
--- a/www/unit/files/patch-src_nxt__http__js.c
+++ /dev/null
@@ -1,74 +0,0 @@
---- src/nxt_http_js.c.orig 2024-06-26 22:04:35 UTC
-+++ src/nxt_http_js.c
-@@ -120,7 +120,7 @@ nxt_http_js_ext_uri(njs_vm_t *vm, njs_object_prop_t *p
- return NJS_DECLINED;
- }
-
-- return njs_vm_value_string_set(vm, retval, r->path->start, r->path->length);
-+ return njs_vm_value_string_create(vm, retval, r->path->start, r->path->length);
- }
-
-
-@@ -136,7 +136,7 @@ nxt_http_js_ext_host(njs_vm_t *vm, njs_object_prop_t *
- return NJS_DECLINED;
- }
-
-- return njs_vm_value_string_set(vm, retval, r->host.start, r->host.length);
-+ return njs_vm_value_string_create(vm, retval, r->host.start, r->host.length);
- }
-
-
-@@ -152,7 +152,7 @@ nxt_http_js_ext_remote_addr(njs_vm_t *vm, njs_object_p
- return NJS_DECLINED;
- }
-
-- return njs_vm_value_string_set(vm, retval,
-+ return njs_vm_value_string_create(vm, retval,
- nxt_sockaddr_address(r->remote),
- r->remote->address_length);
- }
-@@ -214,7 +214,7 @@ nxt_http_js_ext_get_header(njs_vm_t *vm, njs_object_pr
- if (key.length == f->name_length
- && memcmp(key.start, f->name, f->name_length) == 0)
- {
-- return njs_vm_value_string_set(vm, retval, f->value,
-+ return njs_vm_value_string_create(vm, retval, f->value,
- f->value_length);
- }
-
-@@ -250,7 +250,7 @@ nxt_http_js_ext_keys_header(njs_vm_t *vm, njs_value_t
- return NJS_ERROR;
- }
-
-- rc = njs_vm_value_string_set(vm, value, f->name, f->name_length);
-+ rc = njs_vm_value_string_create(vm, value, f->name, f->name_length);
- if (rc != NJS_OK) {
- return NJS_ERROR;
- }
-@@ -296,7 +296,7 @@ nxt_http_js_ext_get_cookie(njs_vm_t *vm, njs_object_pr
- if (key.length == nv->name_length
- && memcmp(key.start, nv->name, nv->name_length) == 0)
- {
-- return njs_vm_value_string_set(vm, retval, nv->value,
-+ return njs_vm_value_string_create(vm, retval, nv->value,
- nv->value_length);
- }
- }
-@@ -340,7 +340,7 @@ nxt_http_js_ext_keys_cookie(njs_vm_t *vm, njs_value_t
- return NJS_ERROR;
- }
-
-- rc = njs_vm_value_string_set(vm, value, nv->name, nv->name_length);
-+ rc = njs_vm_value_string_create(vm, value, nv->name, nv->name_length);
- if (rc != NJS_OK) {
- return NJS_ERROR;
- }
-@@ -380,7 +380,7 @@ nxt_http_js_ext_get_var(njs_vm_t *vm, njs_object_prop_
- vv = nxt_var_get(&r->task, rtcf->tstr_state, &r->tstr_cache.var, &name, r);
-
- if (vv != NULL) {
-- return njs_vm_value_string_set(vm, retval, vv->start, vv->length);
-+ return njs_vm_value_string_create(vm, retval, vv->start, vv->length);
- }
-
- njs_value_undefined_set(retval);
diff --git a/www/unit/files/patch-src_nxt__js.c b/www/unit/files/patch-src_nxt__js.c
deleted file mode 100644
index 66e04fd4d14b..000000000000
--- a/www/unit/files/patch-src_nxt__js.c
+++ /dev/null
@@ -1,48 +0,0 @@
---- 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;
- }
-
-
diff --git a/www/unit/files/patch-src_nxt__script.c b/www/unit/files/patch-src_nxt__script.c
deleted file mode 100644
index 97b17dd2ea86..000000000000
--- a/www/unit/files/patch-src_nxt__script.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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)) {
diff --git a/www/unit/version.mk b/www/unit/version.mk
index 777fee093486..e36ab865cde2 100644
--- a/www/unit/version.mk
+++ b/www/unit/version.mk
@@ -2,6 +2,6 @@
UNITVERSION_MK= defined
# Define NGINX Unit's version.
-UNIT_VERSION= 1.32.1
+UNIT_VERSION= 1.33.0
.endif # UNITVERSION_MK