From nobody Tue Feb 7 23:49:19 2023 X-Original-To: dev-commits-ports-all@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 4PBKbh0sVRz3nsGl; Tue, 7 Feb 2023 23:49:20 +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 4PBKbg5d3Dz3vTb; Tue, 7 Feb 2023 23:49:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675813759; 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=KOt9B5QKC5qR0qzn9t+NJIy/kdEfZdhbyPZJbp2e4TY=; b=MNl5bMrDbCo5+2E/II/lICut1q33NCYG+k0z7df6TT5wVoKFP7nJIkMONcFGGKeOOpvf+h DqBYZB659sJQfHVFjOApvwd2cXBtbMrRiATQjlJKsfNzhWCQuXLz5egvaLoJ753B5xvE8R 0GjtJM+kMfNst5i3HUaXKyJkKjxT//UBBfI0NfPkDRFjWAO1SYV2JGcVOJjDEbX7KLTMov Qyqx5H9vrNF0oaBDLigi/rM/zOYHw4Hotaqczl/D35rT8zH2VKO8Wl6RIc63kDjry0U1Fe Lf4Rd0zuU0NfLAYYMCwHO6KJYkLGIWFX5m6F+i/UJ6pfNEWrHfiYVSyEx8jzqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675813759; 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=KOt9B5QKC5qR0qzn9t+NJIy/kdEfZdhbyPZJbp2e4TY=; b=c14E5a0Zd0of5B8qN8d9NOoouB5ACxn3LIbZS8BUjm4THpPkixRK+YFBR/Y6iTnJElPWZk 8474r5PmsFdw23oKKK36T2BHKq5QB1ezlaDA2U7o4SQxLB4TITWDK0VUGbwMD2d4UIDQBe mZZqbGkOiuKhttJC6WoNB7ZP8I2ZjmLqeqNRjDRtuAb8+/0zEs9dg9MIgjlotedirhIhTH j8RIiZDNsRdcdEwx+fFGesR7SQiccoJ01FtBwYLM6DDQ3m8pRS6nii4RaYWKPQQwNa0A9g j4esVonMgX76E0Mx8vTBK3rMjfyVbE+B9iAA6CXazArBDzAYrkwmJLuNyBlMIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675813759; a=rsa-sha256; cv=none; b=L3o1ZWfMQp1MBXBLrODd3C8lXI8XhEK8J3+U9sZ+lTM20ybYketyDYJa384CqPoYJHROL8 RC8alIuOWtys40tasLDiv2A0TBwWfm10qSn4Vr2dfoXa4KtOulqNsycDxM0MOaDqOehXXS iRJkN+CuiNfpm9GSsyLmA8McjKFtFhRrfg22twIWe+xJf9sK3COJjvLOCSxON1+5eoDywp 5rap8IQZv38QkOTiIKH5yCOr4N7jnvtnxjUIks8IIzAASaym14iBR26F/tM7a0w7CjkLRN Jm0Ke8jNlcChR4KV0yPesJy7tSzrlgq7vnDGFGY3gUfr1RzKjZD2yYLcPFJjjg== 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 4PBKbg4jQFzbSh; Tue, 7 Feb 2023 23:49:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 317NnJUH038658; Tue, 7 Feb 2023 23:49:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 317NnJ3W038657; Tue, 7 Feb 2023 23:49:19 GMT (envelope-from git) Date: Tue, 7 Feb 2023 23:49:19 GMT Message-Id: <202302072349.317NnJ3W038657@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: d1b04483c52a - main - */*: update NGINX JavaScript 0.7.9 -> 0.7.10 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: d1b04483c52a818a56054ddb3bbe8b706e3f3cd7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=d1b04483c52a818a56054ddb3bbe8b706e3f3cd7 commit d1b04483c52a818a56054ddb3bbe8b706e3f3cd7 Author: Sergey A. Osokin AuthorDate: 2023-02-07 23:48:09 +0000 Commit: Sergey A. Osokin CommitDate: 2023-02-07 23:49:06 +0000 */*: update NGINX JavaScript 0.7.9 -> 0.7.10 Bump PORTREVISION for www/nginx-devel. nginx modules: *) Feature: added Request, Response and Headers ctors in Fetch API. *) Bugfix: fixed nginx logger callback for calls in master process. Core: *) Feature: added signal support in CLI. *) Feature: added "xml" module for working with XML documents. *) Feature: extended support for symmetric and asymmetric keys in WebCrypto. Most notably JWK format for importKey() was added. *) Feature: extended support for symmetric and asymmetric keys in WebCrypto. Most notably JWK format for importKey() was added. generateKey() and exportKey() were also implemented. *) Feature: added String.prototype.replaceAll(). *) Bugfix: fixed for(expr1; conditional syntax error handling. *) Bugfix: fixed Object.values() and Object.entries() with external objects. *) Bugfix: fixed RegExp.prototype[@@replace](). --- devel/libnjs/Makefile | 2 +- devel/libnjs/distinfo | 6 +++--- www/nginx-devel/Makefile | 8 ++++++-- www/nginx-devel/Makefile.extmod | 5 ++++- www/nginx-devel/Makefile.options.desc | 3 ++- www/nginx-devel/distinfo | 6 +++--- 6 files changed, 19 insertions(+), 11 deletions(-) diff --git a/devel/libnjs/Makefile b/devel/libnjs/Makefile index 269f68a519d5..55226ef510e4 100644 --- a/devel/libnjs/Makefile +++ b/devel/libnjs/Makefile @@ -1,5 +1,5 @@ PORTNAME= libnjs -DISTVERSION= 0.7.9 +DISTVERSION= 0.7.10 CATEGORIES= devel www MAINTAINER= osa@FreeBSD.org diff --git a/devel/libnjs/distinfo b/devel/libnjs/distinfo index 161f62d3fa41..36c42be7d98d 100644 --- a/devel/libnjs/distinfo +++ b/devel/libnjs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1668698435 -SHA256 (nginx-njs-0.7.9_GH0.tar.gz) = 92cc425d0b0952bb7e2e7a396cba58feb4a90fb3cb63441c201ab4d3e0cd6403 -SIZE (nginx-njs-0.7.9_GH0.tar.gz) = 617115 +TIMESTAMP = 1675792206 +SHA256 (nginx-njs-0.7.10_GH0.tar.gz) = fa69ce6819f172c34338dc23ba5126ac986caf4652c7c01ea02bcef93d558cc4 +SIZE (nginx-njs-0.7.10_GH0.tar.gz) = 652296 diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 0a0ee6b1bf6e..19ea035ff50c 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME?= nginx PORTVERSION= 1.23.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa @@ -79,7 +79,7 @@ OPTIONS_GROUP_MAILGRP= MAIL MAIL_IMAP MAIL_POP3 MAIL_SMTP MAIL_SSL OPTIONS_GROUP_STREAMGRP= STREAM STREAM_REALIP STREAM_SSL \ STREAM_SSL_PREREAD -OPTIONS_DEFINE= DEBUG DEBUGLOG DSO FILE_AIO IPV6 NJS THREADS WWW +OPTIONS_DEFINE= DEBUG DEBUGLOG DSO FILE_AIO IPV6 NJS NJS_XML THREADS WWW OPTIONS_DEFAULT?= DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \ HTTP_DAV HTTP_FLV HTTP_GUNZIP_FILTER HTTP_GZIP_STATIC HTTP_MP4 \ HTTP_RANDOM_INDEX HTTP_REALIP HTTP_SECURE_LINK HTTP_SLICE HTTP_SSL \ @@ -252,6 +252,10 @@ IGNORE= required HTTPV3_BORING or HTTPV3_LSSL or HTTPV3_QTLS \ NJS_CONFIGURE_ARGS= --no-pcre2 .endif +.if empty(PORT_OPTIONS:MNJS_XML) +NJS_CONFIGURE_ARGS= --no-libxml2 +.endif + pre-everything:: @${ECHO_MSG} .if ${PORT_OPTIONS:MHTTP_UPSTREAM_FAIR} diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod index a3932ff06b34..224cb918cd18 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -247,10 +247,13 @@ NAXSI_GH_TUPLE= nbs-system:naxsi:${NAXSI_NGINX_VER}:naxsi NAXSI_VARS= DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_src NAXSI_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-naxsi_runtime.c -NJS_GH_TUPLE= nginx:njs:0.7.9:njs +NJS_GH_TUPLE= nginx:njs:0.7.10:njs NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx NJS_USES= libedit +NJS_XML_IMPLIES= NJS +NJS_XML_LIB_DEPENDS= libxml2.so:textproc/libxml2 + OPENTRACING_GH_TUPLE= opentracing-contrib:nginx-opentracing:v0.24.0:opentracing OPENTRACING_LIB_DEPENDS= libopentracing.so:devel/libopentracing OPENTRACING_VARS= DSO_EXTMODS+=opentracing OPENTRACING_SUBDIR=/opentracing diff --git a/www/nginx-devel/Makefile.options.desc b/www/nginx-devel/Makefile.options.desc index 9f2a6a589e41..bfe005c66f25 100644 --- a/www/nginx-devel/Makefile.options.desc +++ b/www/nginx-devel/Makefile.options.desc @@ -90,7 +90,8 @@ MAIL_SSL_DESC= Enable mail_ssl module MEMC_DESC= 3rd party memc (memcached) module MODSECURITY3_DESC= 3rd party modsecurity3 module NAXSI_DESC= 3rd party naxsi module -NJS_DESC= Enable javascript module +NJS_DESC= Enable javascript (NJS) module +NJS_XML_DESC= Enable XML functionality in NJS module OPENTRACING_DESC= 3rd party opentracing module PASSENGER_DESC= 3rd party passenger module PCRE_ONE_DESC= Enable PCRE1 support diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo index 522a802ee0df..867ebcc14b4d 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1674147529 +TIMESTAMP = 1675811845 SHA256 (nginx-1.23.3.tar.gz) = 75cb5787dbb9fae18b14810f91cc4343f64ce4c24e27302136fb52498042ba54 SIZE (nginx-1.23.3.tar.gz) = 1108958 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae @@ -107,8 +107,8 @@ SHA256 (SpiderLabs-ModSecurity-nginx-v1.0.3_GH0.tar.gz) = 32a42256616cc674dca24c SIZE (SpiderLabs-ModSecurity-nginx-v1.0.3_GH0.tar.gz) = 34063 SHA256 (nbs-system-naxsi-29793dc_GH0.tar.gz) = 579df0e50ff32464f7bb152df9d93ea18c05c4aa3966ec4d8c603b5dd629be08 SIZE (nbs-system-naxsi-29793dc_GH0.tar.gz) = 236932 -SHA256 (nginx-njs-0.7.9_GH0.tar.gz) = 92cc425d0b0952bb7e2e7a396cba58feb4a90fb3cb63441c201ab4d3e0cd6403 -SIZE (nginx-njs-0.7.9_GH0.tar.gz) = 617115 +SHA256 (nginx-njs-0.7.10_GH0.tar.gz) = fa69ce6819f172c34338dc23ba5126ac986caf4652c7c01ea02bcef93d558cc4 +SIZE (nginx-njs-0.7.10_GH0.tar.gz) = 652296 SHA256 (opentracing-contrib-nginx-opentracing-v0.24.0_GH0.tar.gz) = 5328c5f37e0615b5252aed51b9cd40f3d14989d995ad54134076aeda4ab9b280 SIZE (opentracing-contrib-nginx-opentracing-v0.24.0_GH0.tar.gz) = 679417 SHA256 (konstruxi-ngx_postgres-8aa7359_GH0.tar.gz) = c69ad4495de7c7883ebc23e1e6c4cc83a4ac6a7fddd4d5c12e49d33b65f7c50b