Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 9 Mar 2023 23:39:12 GMT
From:      "Sergey A. Osokin" <osa@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: ea54114ca5fa - main - */*: update NGINX JavaScript 0.7.10 -> 0.7.11
Message-ID:  <202303092339.329NdChM024375@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by osa:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ea54114ca5fac09640c1074c4c69472781b27995

commit ea54114ca5fac09640c1074c4c69472781b27995
Author:     Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2023-03-09 23:36:15 +0000
Commit:     Sergey A. Osokin <osa@FreeBSD.org>
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.
    
    <ChangeLog>
    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
       "$'", "$`".
    
    </ChangeLog>
---
 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303092339.329NdChM024375>