From nobody Mon Mar 18 14:47:44 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TyyPs0vypz5DsSP; Mon, 18 Mar 2024 14:47:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TyyPr5q6Xz4VTK; Mon, 18 Mar 2024 14:47:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710773264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CeWx5xT+9fEzDf/pL882HCwLhq2AV7+Pqg7ji7UmJrI=; b=ihqTY5kcyfgZTUfrQaSrfaUIdtANWtSgJ0axLJMdP0jWT+aF/U6IZpup7HRRsJw1Ga5lKm ooVGuHAbqclyp9kvxXu4p6HiGPHKX22KoypXmm+wegAPVySe98cCEhEnU6X1nDyBWpDkqg q8Xt2rYqeBRItA4xjQdpvtZYnPz62879ludTNUQ2RM47q57qEAipUrkj9YZZutJ1H/ScHs advUWNfbZQWSGheDLQmPuKHjygxvy2xo7FfieXZRj+gAM5syKFyrYgUAov1JvLbyxHV7mv CH3IQcaKgqNH4jZRWgIHVdnW0eXE/MfjxB9bgZpEPKOcG9rmMt1pMNeRrCM4hw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710773264; a=rsa-sha256; cv=none; b=d8Ew2uzZ5z9xmWDaiMOdRftjbBajYFxpQilXqQbjiE7Ngt6vfj380VUGk2BAIitdm+EuXp GNRzLEufWR/6IMyOSzn6yZqMJCeHtMcW5P3EFJ0JsFXoStVB1+j29bsM/X42zmHGuonfVr lVcZ1Zaz+3gDTV/M6OJthRWXVYk2Z1OR1Nv0wrfN0mibqEanKTqIMuI/JfGaN1xNWS+Qqq wqEmLoz6nGaAKdU0R9db2zNngFx+fFnntErqCj18I6rOZhLA7I8A3EfTe2s1x2UXMaU6ql NrPEYLvoeBgmHmLdFvIXCBkL3mn4fwJYicNCoMYYpld0INXCMyUVqADE2ZBInQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710773264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CeWx5xT+9fEzDf/pL882HCwLhq2AV7+Pqg7ji7UmJrI=; b=vyTcMGorMfiil65MsNl3LOA3NrgZXQ6PdYAJGSpqWDmzByTFLZ8czBlJ9MDsfWPqYm8Dgv GhhdFjxg5F8Y9MU9F/Y8rDZ3vyUkgkE3N8gYYeWYPGxUdXIFFCdzir626huhwmBx6t55hR iQI+khpImpUKInuHoGtkef0rnN8+56wTqVSCGAzO940ZiaBHY9fjafTdUQqbdqLJE/AFET NQcuUF7jW9Ve2OUnVRTvYlj3w0pGPuMfII8MDL47lNdWqRG0kFpwUsLV+HkPXKsIheOVu/ c1SOKCoat1JP4CaX4V2BgQGi8IFAmHSfd7iREFvYp9cTLGMVTkGv8cxWslepxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TyyPr5QPQzRj7; Mon, 18 Mar 2024 14:47:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42IEliGJ083557; Mon, 18 Mar 2024 14:47:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IElitJ083554; Mon, 18 Mar 2024 14:47:44 GMT (envelope-from git) Date: Mon, 18 Mar 2024 14:47:44 GMT Message-Id: <202403181447.42IElitJ083554@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 563db0f94efd - main - */*unit*: update NGINX Unit: 1.31.1 -> 1.32.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 563db0f94efd4ce866539aae39ea3e0eb534e590 Auto-Submitted: auto-generated The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=563db0f94efd4ce866539aae39ea3e0eb534e590 commit 563db0f94efd4ce866539aae39ea3e0eb534e590 Author: Sergey A. Osokin AuthorDate: 2024-03-18 14:46:18 +0000 Commit: Sergey A. Osokin CommitDate: 2024-03-18 14:46:50 +0000 */*unit*: update NGINX Unit: 1.31.1 -> 1.32.0 *) 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. --- www/unit-java/Makefile | 6 ++-- www/unit-java/distinfo | 58 +++++++++++++++++----------------- www/unit/Makefile | 1 - www/unit/distinfo | 6 ++-- www/unit/files/patch-src_nxt__js.c | 48 ++++++++++++++++++++++++++++ www/unit/files/patch-src_nxt__script.c | 26 +++++++++++++++ www/unit/version.mk | 2 +- 7 files changed, 110 insertions(+), 37 deletions(-) diff --git a/www/unit-java/Makefile b/www/unit-java/Makefile index 3dd0def364b3..bb175933a4ec 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.162 +CLASSGRAPH_VERSION= 4.8.165 ECJ_VERSION= 3.26.0 -JETTY_VERSION= 9.4.53.v20231009 -TOMCAT_VERSION= 9.0.82 +JETTY_VERSION= 9.4.54.v20240208 +TOMCAT_VERSION= 9.0.86 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 3aeb56d7b9e5..bd47dd8968d0 100644 --- a/www/unit-java/distinfo +++ b/www/unit-java/distinfo @@ -1,31 +1,31 @@ -TIMESTAMP = 1697732146 -SHA256 (unit-1.31.1.tar.gz) = 9df604d49cb57ac0103202efb0f9373e3e48a7dd888c94af10d4f96ccded7d71 -SIZE (unit-1.31.1.tar.gz) = 907165 -SHA256 (classgraph-4.8.162.jar) = ea30b2d5e29e89d52706bcecf7a6ae3b44682d4a1566a5f22b9453f9be2a970c -SIZE (classgraph-4.8.162.jar) = 567746 +TIMESTAMP = 1710284573 +SHA256 (unit-1.32.0.tar.gz) = 4b5e9be3f3990fceabf06292c2b7853667aceb71fd8de5dc67cb7fb05d247a20 +SIZE (unit-1.32.0.tar.gz) = 937300 +SHA256 (classgraph-4.8.165.jar) = 5258d9218fc6413f4d14218a5a6e784528e349f60f48883b77de74bb478ebafd +SIZE (classgraph-4.8.165.jar) = 562061 SHA256 (ecj-3.26.0.jar) = ac0ba5876eaf7ebb47749a0d1be179c51f194b9dd0b875d1c09e1b530f5a2db5 SIZE (ecj-3.26.0.jar) = 3133846 -SHA256 (jetty-http-9.4.53.v20231009.jar) = c0a0cbd25998a13ce68481d6002757e6489ea0253463db761fec0cb30d15d612 -SIZE (jetty-http-9.4.53.v20231009.jar) = 249062 -SHA256 (jetty-server-9.4.53.v20231009.jar) = 9c4e9c6cb0a7a541031500af0823b678f65d809f481efa9cadd1ff81bda19f78 -SIZE (jetty-server-9.4.53.v20231009.jar) = 736758 -SHA256 (jetty-util-9.4.53.v20231009.jar) = 7e5370022ecd1f682653641169a33e62e26730dd1e786433bed506cb0dcb1abc -SIZE (jetty-util-9.4.53.v20231009.jar) = 588870 -SHA256 (tomcat-api-9.0.82.jar) = 4b2dc46719481059fa4ea620a68aba25704e04067adee02ffcdefcefdd213df4 -SIZE (tomcat-api-9.0.82.jar) = 11552 -SHA256 (tomcat-el-api-9.0.82.jar) = dd32e91ddd5f0687fc33bd5375eabda6b5e435274a6de3b71c69b3888780ed1e -SIZE (tomcat-el-api-9.0.82.jar) = 88142 -SHA256 (tomcat-jsp-api-9.0.82.jar) = 2a68cda78d829e0651a7d7728aee7e68ed9e2e75667b2fb4744948e5396b2f14 -SIZE (tomcat-jsp-api-9.0.82.jar) = 73323 -SHA256 (tomcat-jasper-9.0.82.jar) = b1b58ed96a44406a23c6792b2044aed5524d534f4f78399690d716fac43aec01 -SIZE (tomcat-jasper-9.0.82.jar) = 568639 -SHA256 (tomcat-jasper-el-9.0.82.jar) = 6da7eea13ff78d0c12c084eb896e7cab2b867ac0f7dc6679352483a833cee755 -SIZE (tomcat-jasper-el-9.0.82.jar) = 172481 -SHA256 (tomcat-juli-9.0.82.jar) = df7a83cee5b548e3e3368716859fa17ae17ec1b84f0eae3a4c83b6b4e2e0daf7 -SIZE (tomcat-juli-9.0.82.jar) = 48962 -SHA256 (tomcat-servlet-api-9.0.82.jar) = f9302305269e2e88754642a47949b1b7403f18430e11155cb411b67006327666 -SIZE (tomcat-servlet-api-9.0.82.jar) = 284842 -SHA256 (tomcat-util-9.0.82.jar) = b9f1498233f3f32f688e777806c26bfd003ba8e57a56e7a7d5d2a747db7bf6dc -SIZE (tomcat-util-9.0.82.jar) = 224435 -SHA256 (tomcat-util-scan-9.0.82.jar) = 0ae6d8e1ac8f937104da8287ea4c8ae2da1b29615fac2b3b7ad7b8797db9c75f -SIZE (tomcat-util-scan-9.0.82.jar) = 224927 +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 diff --git a/www/unit/Makefile b/www/unit/Makefile index 108c399030ab..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 eaad38e5d8b2..a3e6d898bac9 100644 --- a/www/unit/distinfo +++ b/www/unit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697731692 -SHA256 (unit-1.31.1.tar.gz) = 9df604d49cb57ac0103202efb0f9373e3e48a7dd888c94af10d4f96ccded7d71 -SIZE (unit-1.31.1.tar.gz) = 907165 +TIMESTAMP = 1710267192 +SHA256 (unit-1.32.0.tar.gz) = 4b5e9be3f3990fceabf06292c2b7853667aceb71fd8de5dc67cb7fb05d247a20 +SIZE (unit-1.32.0.tar.gz) = 937300 diff --git a/www/unit/files/patch-src_nxt__js.c b/www/unit/files/patch-src_nxt__js.c new file mode 100644 index 000000000000..66e04fd4d14b --- /dev/null +++ b/www/unit/files/patch-src_nxt__js.c @@ -0,0 +1,48 @@ +--- 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 new file mode 100644 index 000000000000..97b17dd2ea86 --- /dev/null +++ b/www/unit/files/patch-src_nxt__script.c @@ -0,0 +1,26 @@ +--- 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 cbf1ae7a2ec7..22f5db26d111 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.31.1 +UNIT_VERSION= 1.32.0 .endif # UNITVERSION_MK