From 422dc9e9d5812cbff37f8f64a5b27df75a581057 Mon Sep 17 00:00:00 2001 From: "Sergey A. Osokin" Date: Mon, 18 Mar 2024 10:41:40 -0400 Subject: [PATCH] */*: update NGINX JavaScript: 0.8.2 -> 0.8.3 (+) nginx modules: *) Bugfix: fixed Headers.set(). *) Bugfix: fixed js_set with Buffer values. *) Bugfix: fixed clear() method of a shared dictionary when a timeout is not specified. *) Bugfix: fixed stub_status statistics when js_periodic is enabled. Core: *) Bugfix: fixed building with libxml2 2.12 and later. *) Bugfix: fixed Date constructor for overflows and with NaN values. *) Bugfix: fixed underflow in querystring.parse(). *) Bugfix: fixed potential buffer overread in String.prototype.match(). *) Bugfix: fixed parsing of for-in loops. *) Bugfix: fixed parsing of hexadecimal, octal, and binary literals with no digits. --- devel/libnjs/Makefile | 3 +-- devel/libnjs/distinfo | 6 +++--- devel/libnjs/files/patch-auto_make | 24 ------------------------ devel/libnjs/pkg-plist | 5 +---- lang/njs/Makefile | 2 +- lang/njs/distinfo | 6 +++--- www/nginx-devel/Makefile | 2 +- www/nginx-devel/Makefile.extmod | 2 +- www/nginx-devel/distinfo | 6 +++--- 9 files changed, 14 insertions(+), 42 deletions(-) delete mode 100644 devel/libnjs/files/patch-auto_make diff --git a/devel/libnjs/Makefile b/devel/libnjs/Makefile index 938ee47a3e261..804a6bd89b254 100644 --- a/devel/libnjs/Makefile +++ b/devel/libnjs/Makefile @@ -1,6 +1,5 @@ PORTNAME= libnjs -DISTVERSION= 0.8.2 -PORTREVISION= 1 +DISTVERSION= 0.8.3 CATEGORIES= devel www MAINTAINER= osa@FreeBSD.org diff --git a/devel/libnjs/distinfo b/devel/libnjs/distinfo index 15d2a547b14de..5d74d17243534 100644 --- a/devel/libnjs/distinfo +++ b/devel/libnjs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1698150463 -SHA256 (nginx-njs-0.8.2_GH0.tar.gz) = 6f17387db8df90b6e3382d280455962ff85fa2b1a32d91c2ce1fd1af5a854d72 -SIZE (nginx-njs-0.8.2_GH0.tar.gz) = 733916 +TIMESTAMP = 1707339379 +SHA256 (nginx-njs-0.8.3_GH0.tar.gz) = 5e1341ee8c1dfce420ea6456475dafa7d5f4b9aed310faca32597cf4d221cfe0 +SIZE (nginx-njs-0.8.3_GH0.tar.gz) = 735235 diff --git a/devel/libnjs/files/patch-auto_make b/devel/libnjs/files/patch-auto_make deleted file mode 100644 index e3b74fc7b1cc0..0000000000000 --- a/devel/libnjs/files/patch-auto_make +++ /dev/null @@ -1,24 +0,0 @@ ---- auto/make.orig 2023-10-24 04:42:29 UTC -+++ auto/make -@@ -85,8 +85,9 @@ do - cat << END >> $NJS_MAKEFILE - - $NJS_BUILD_DIR/$njs_obj: $njs_src -- \$(NJS_CC) -c \$(NJS_CFLAGS) $NJS_LIB_AUX_CFLAGS \\ -+ \$(NJS_CC) -c \$(NJS_CFLAGS) \\ - \$(NJS_LIB_INCS) -Injs \\ -+ $NJS_LIB_AUX_CFLAGS \\ - -o $NJS_BUILD_DIR/$njs_obj \\ - $njs_dep_flags \\ - $njs_src -@@ -320,9 +321,7 @@ cat << END >> $NJS_MAKEFILE - pc: $NJS_BUILD_DIR/njs.pc - - $NJS_BUILD_DIR/njs.pc: $NJS_BUILD_DIR/njs_auto_config.h -- sed -e "s#@PREFIX@#$(pwd)/$NJS_BUILD_DIR#" \\ -- -e "s#@LIBDIR@#$(pwd)/$NJS_BUILD_DIR#" \\ -- -e "s#@CFLAGS@#-I$(pwd)/$NJS_BUILD_DIR -I$(pwd)/src#" \\ -+ sed -e "s#@PREFIX@#%%LOCALBASE%%#" \\ - -e "s#@VERSION@#\$(NJS_VER)#" \\ - -e "s#@EXTRA_LIBS@#-lm $NJS_LIBS $NJS_LIB_AUX_LIBS#" \\ - src/njs.pc.in > \$@ diff --git a/devel/libnjs/pkg-plist b/devel/libnjs/pkg-plist index 319a98d247210..acd31b1f92ac4 100644 --- a/devel/libnjs/pkg-plist +++ b/devel/libnjs/pkg-plist @@ -21,6 +21,7 @@ include/njs_file.h include/njs_flathsh.h include/njs_function.h include/njs_generator.h +include/njs_hash.h include/njs_iterator.h include/njs_json.h include/njs_lexer_tables.h @@ -29,7 +30,6 @@ include/njs_lvlhsh.h include/njs_main.h include/njs_malloc.h include/njs_math.h -include/njs_md5.h include/njs_module.h include/njs_mp.h include/njs_murmur_hash.h @@ -46,15 +46,12 @@ include/njs_regex.h include/njs_regexp_pattern.h include/njs_regexp.h include/njs_scope.h -include/njs_sha1.h -include/njs_sha2.h include/njs_sprintf.h include/njs_str.h include/njs_string.h include/njs_strtod.h include/njs_symbol.h include/njs_time.h -include/njs_timer.h include/njs_trace.h include/njs_typed_array.h include/njs_types.h diff --git a/lang/njs/Makefile b/lang/njs/Makefile index 0334874d36bca..72ad14c02506b 100644 --- a/lang/njs/Makefile +++ b/lang/njs/Makefile @@ -1,5 +1,5 @@ PORTNAME= njs -DISTVERSION= 0.8.2 +DISTVERSION= 0.8.3 CATEGORIES= lang www MAINTAINER= osa@FreeBSD.org diff --git a/lang/njs/distinfo b/lang/njs/distinfo index 00548e99b2b39..89ff223764cbe 100644 --- a/lang/njs/distinfo +++ b/lang/njs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1698150486 -SHA256 (nginx-njs-0.8.2_GH0.tar.gz) = 6f17387db8df90b6e3382d280455962ff85fa2b1a32d91c2ce1fd1af5a854d72 -SIZE (nginx-njs-0.8.2_GH0.tar.gz) = 733916 +TIMESTAMP = 1707339331 +SHA256 (nginx-njs-0.8.3_GH0.tar.gz) = 5e1341ee8c1dfce420ea6456475dafa7d5f4b9aed310faca32597cf4d221cfe0 +SIZE (nginx-njs-0.8.3_GH0.tar.gz) = 735235 diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index d0659d3389fd5..ca3cc68178e4b 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME?= nginx PORTVERSION= 1.25.4 -PORTREVISION= 5 +PORTREVISION= 6 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 377c10efcf0b3..2bc8f9b7a9871 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -230,7 +230,7 @@ NAXSI_VARS= DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_src NAXSI_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-naxsi-libinjection__sqli_c \ ${PATCHDIR}/extra-patch-naxsi_config -NJS_GH_TUPLE= nginx:njs:0.8.2:njs +NJS_GH_TUPLE= nginx:njs:0.8.3:njs NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx NJS_XML_IMPLIES= NJS diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo index fadf3b846799d..2fd90e2e75404 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1709239742 +TIMESTAMP = 1710263047 SHA256 (nginx-1.25.4.tar.gz) = 760729901acbaa517996e681ee6ea259032985e37c2768beef80df3a877deed9 SIZE (nginx-1.25.4.tar.gz) = 1236273 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae @@ -103,8 +103,8 @@ SHA256 (wargio-naxsi-1.6_GH0.tar.gz) = e5920fdd09cae155b89eb21a94a21c029ebfdb056 SIZE (wargio-naxsi-1.6_GH0.tar.gz) = 1116227 SHA256 (libinjection-libinjection-4aa3894_GH0.tar.gz) = ededea133e89e238ef2e60d0d62ef7ef9e741449eed8c5d856007132505bcd5b SIZE (libinjection-libinjection-4aa3894_GH0.tar.gz) = 2218294 -SHA256 (nginx-njs-0.8.2_GH0.tar.gz) = 6f17387db8df90b6e3382d280455962ff85fa2b1a32d91c2ce1fd1af5a854d72 -SIZE (nginx-njs-0.8.2_GH0.tar.gz) = 733916 +SHA256 (nginx-njs-0.8.3_GH0.tar.gz) = 5e1341ee8c1dfce420ea6456475dafa7d5f4b9aed310faca32597cf4d221cfe0 +SIZE (nginx-njs-0.8.3_GH0.tar.gz) = 735235 SHA256 (osokin-nginx-otel-8f0857d_GH0.tar.gz) = bbf93813928460bdaf78f752f74ecc6c34d13078e97fdffcaa29dbd8689314fc SIZE (osokin-nginx-otel-8f0857d_GH0.tar.gz) = 30197 SHA256 (konstruxi-ngx_postgres-8aa7359_GH0.tar.gz) = c69ad4495de7c7883ebc23e1e6c4cc83a4ac6a7fddd4d5c12e49d33b65f7c50b