From nobody Thu Mar 09 23:39:12 2023 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 4PXly91q7qz3xWs7; Thu, 9 Mar 2023 23:39:13 +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 4PXly91Hwjz3mS6; Thu, 9 Mar 2023 23:39:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678405153; 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=TdKMK2Y6kD+K+R1oIhZq0H7y+1zozw8BkHEQw0XAYk8=; b=a9kiNdwMiJD7hxY/yF9bJ86DzJD/NKG+bOI+OcS2Dmr7GuW4Rrwj/gkiJaCNDHyQXDGkci CA3edfoH10Rns6fTPjztQGRATpCkL0iWyqB39GQmvujRwKvbaGPSEPtMuQ2LXWU2XVsAJ6 PPFeBKB7N4llt8B9EpqwOT3eNOi3kuaEuy9AxH2Vf8VQgnBJFlsosn+ITULtXZENn8bIu/ 9pcnjAvm+SiGBkJlGElR4kZpCMwp1TnYhHbTzTx6xAf8CNyKnXe0iphOmL/tGcpTcJN6MJ yUszgbV44nVJDFCNrxpQVb7bjrnd1W5aCr8bRh+3Ac6t8aFo0yGdXwpMTqVgAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678405153; 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=TdKMK2Y6kD+K+R1oIhZq0H7y+1zozw8BkHEQw0XAYk8=; b=Fmf7Tnb5BsAJOU7puOaAUlK+SAHzw4wUeeEenXR9gUJfvz9eCVvPafVOCrql4vL2C2P9+Q FVllBiC2zuKBA2OPKYLq0SQd+m4YSIVziUgHO2OSFONzLawerEVaI57yjEN6ja9/G1muXP pdJaRpS+ird2qoNk7UWJsczfsL1qI0nDxOvJVXgGaFi7gWZajo7AX/ehh/ViIMPUzsejTH bqk05mp9VQnmceO9i5QraW4k852yHnHOcu+g4VTY5dY5me2zkCmHYIU5v1J7I8TxrALckb pEMLalwHX21TRqV5G7jAr3pl++tDXz8dPhU2h9SX2s90htxfq54aR5NwBN0CGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678405153; a=rsa-sha256; cv=none; b=xWG3fBI/QPDVrbOugf2YwwrDjo5Rd+vgsVrm5GXse18D6xp4wO2UEEpU7bNY+gcYMd4MGg fATxR3iVjHU0XQiiqzy/+Rlii1lPDP4Y/ZqaqYrrti3VcHazpppsP4+130W7rUpo98p7dw E27C8BMZhVD2JInfvY3JI8EK3+ZVm9L7jbg1Mi47aj3x3EhbriucUDNEIyB5OAPBYlXy2Q LEXBQtZOomdtDaZujVk7EYiKDEftv8jCwMsBNvlx9172udZlg/UbaN3jJUQDXM1/1X171t ZheCdQoMzYuuOhw+LX5T9kKQOiF8ldBqhs7EWdlizahoeHyRv8HSOMAoabKnSw== 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 4PXly90F3zzRm4; Thu, 9 Mar 2023 23:39:13 +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 329NdC63024376; Thu, 9 Mar 2023 23:39:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 329NdChM024375; Thu, 9 Mar 2023 23:39:12 GMT (envelope-from git) Date: Thu, 9 Mar 2023 23:39:12 GMT Message-Id: <202303092339.329NdChM024375@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: ea54114ca5fa - main - */*: update NGINX JavaScript 0.7.10 -> 0.7.11 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: ea54114ca5fac09640c1074c4c69472781b27995 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=ea54114ca5fac09640c1074c4c69472781b27995 commit ea54114ca5fac09640c1074c4c69472781b27995 Author: Sergey A. Osokin AuthorDate: 2023-03-09 23:36:15 +0000 Commit: Sergey A. Osokin CommitDate: 2023-03-09 23:39:06 +0000 */*: update NGINX JavaScript 0.7.10 -> 0.7.11 While I'm here drop pcre flavor support for lang/njs. Bump PORTREVISION for www/nginx-devel. nginx modules: *) Bugfix: added missed linking with libxml2 for the dynamic module. The bug was introduced in 0.7.10. Core: *) Feature: added XMLNode API to modify XML documents. *) Change: removed XML_PARSE_DTDVALID during parsing of XML document due to security implications. The issue was introduced in 0.7.10. When XML_PARSE_DTDVALID is enabled, libxml2 parses and executes external entities present inside an XML document. *) Bugfix: fixed the detection of await in arguments. *) Bugfix: fixed Error() instance dumping when "name" prop is not primitive. *) Bugfix: fixed array instance with a getter property dumping. *) Bugfix: fixed njs_object_property() with NJS_WHITEOUT properties. *) Bugfix: fixed func instance dumping with "name" as getter. *) Bugfix: fixed attaching of a stack to an error object. *) Bugfix: fixed String.prototype.replace() with replacement containing "$'", "$`". --- devel/libnjs/Makefile | 2 +- devel/libnjs/distinfo | 6 +++--- lang/njs/Makefile | 18 ++---------------- lang/njs/distinfo | 6 +++--- www/nginx-devel/Makefile | 2 +- www/nginx-devel/Makefile.extmod | 2 +- www/nginx-devel/distinfo | 6 +++--- 7 files changed, 14 insertions(+), 28 deletions(-) diff --git a/devel/libnjs/Makefile b/devel/libnjs/Makefile index 55226ef510e4..3b08085c148f 100644 --- a/devel/libnjs/Makefile +++ b/devel/libnjs/Makefile @@ -1,5 +1,5 @@ PORTNAME= libnjs -DISTVERSION= 0.7.10 +DISTVERSION= 0.7.11 CATEGORIES= devel www MAINTAINER= osa@FreeBSD.org diff --git a/devel/libnjs/distinfo b/devel/libnjs/distinfo index 36c42be7d98d..2888e1bc3e32 100644 --- a/devel/libnjs/distinfo +++ b/devel/libnjs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1675792206 -SHA256 (nginx-njs-0.7.10_GH0.tar.gz) = fa69ce6819f172c34338dc23ba5126ac986caf4652c7c01ea02bcef93d558cc4 -SIZE (nginx-njs-0.7.10_GH0.tar.gz) = 652296 +TIMESTAMP = 1678403303 +SHA256 (nginx-njs-0.7.11_GH0.tar.gz) = f807e0109afab1ff9eb7b9e13b171ab84393953818827c3b6254ab91a19bef0b +SIZE (nginx-njs-0.7.11_GH0.tar.gz) = 658543 diff --git a/lang/njs/Makefile b/lang/njs/Makefile index fd9cee38a9f2..20b4ae6ba530 100644 --- a/lang/njs/Makefile +++ b/lang/njs/Makefile @@ -1,5 +1,5 @@ PORTNAME= njs -DISTVERSION= 0.7.10 +DISTVERSION= 0.7.11 CATEGORIES= lang www MAINTAINER= osa@FreeBSD.org @@ -17,21 +17,7 @@ USE_GITHUB= yes GH_TUPLE= nginx:njs:${DISTVERSION} HAS_CONFIGURE= yes -FLAVORS= pcre pcre2 -FLAVOR?= ${FLAVORS:[1]} - -pcre_PKGNAMESUFFIX= -pcre2_PKGNAMESUFFIX= -pcre2 - -pcre_CONFLICTS_INSTALL= ${PORTNAME}-pcre2 -pcre2_CONFLICTS_INSTALL= ${PORTNAME} - -.if ${FLAVOR} == pcre -LIB_DEPENDS= libpcre.so:devel/pcre -CONFIGURE_FLAGS+= --no-pcre2 -.else -LIB_DEPENDS= libpcre2-8.so:devel/pcre2 -.endif +LIB_DEPENDS= libpcre2-8.so:devel/pcre2 PLIST_FILES= bin/njs diff --git a/lang/njs/distinfo b/lang/njs/distinfo index 3e7d44ba532b..af9a971033bf 100644 --- a/lang/njs/distinfo +++ b/lang/njs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676304825 -SHA256 (nginx-njs-0.7.10_GH0.tar.gz) = fa69ce6819f172c34338dc23ba5126ac986caf4652c7c01ea02bcef93d558cc4 -SIZE (nginx-njs-0.7.10_GH0.tar.gz) = 652296 +TIMESTAMP = 1678403555 +SHA256 (nginx-njs-0.7.11_GH0.tar.gz) = f807e0109afab1ff9eb7b9e13b171ab84393953818827c3b6254ab91a19bef0b +SIZE (nginx-njs-0.7.11_GH0.tar.gz) = 658543 diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 428c6f2b9da7..26641a7b1366 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME?= nginx PORTVERSION= 1.23.3 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod index 06c2244ae1f2..02271c354e6b 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -250,7 +250,7 @@ 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.10:njs +NJS_GH_TUPLE= nginx:njs:0.7.11:njs NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx NJS_USES= libedit diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo index d6141b04f458..e0a1807fef3b 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1678383518 +TIMESTAMP = 1678402781 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 @@ -109,8 +109,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.10_GH0.tar.gz) = fa69ce6819f172c34338dc23ba5126ac986caf4652c7c01ea02bcef93d558cc4 -SIZE (nginx-njs-0.7.10_GH0.tar.gz) = 652296 +SHA256 (nginx-njs-0.7.11_GH0.tar.gz) = f807e0109afab1ff9eb7b9e13b171ab84393953818827c3b6254ab91a19bef0b +SIZE (nginx-njs-0.7.11_GH0.tar.gz) = 658543 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