Skip to content

Commit

Permalink
*/*: update NGINX JavaScript 0.8.4 -> 0.8.5
Browse files Browse the repository at this point in the history
Bump PKGREVISIONs for www/nginx, www/nginx-devel, www/unit.

<ChangeLog>

nginx modules:

*) Change: r.variables.var, r.requestText, r.responseText,
   s.variables.var, and the "data" argument of the s.on() callback
   with "upload" or "download" event types will now convert bytes
   invalid in UTF-8 encoding into the replacement character.  When
   working with binary data, use r.rawVariables.var, r.requestBuffer,
   r.responseBuffer, s.rawVariables.var, and the "upstream" or
   "downstream" event type for s.on() instead.

*) Feature: added timeout argument for shared dictionary methods
   add(), set() and incr().

*) Bugfix: fixed checking for duplicate js_set variables.

*) Bugfix: fixed request Host header when the port is non-standard.

*) Bugfix: fixed handling of a zero-length request body in ngx.fetch()
   and r.subrequest().

*) Bugfix: fixed heap-buffer-overflow in Headers.get().

*) Bugfix: fixed r.subrequest() error handling.

Core:

*) Feature: added zlib module for QuickJS engine.

*) Bugfix: fixed zlib.inflate().

*) Bugfix: fixed String.prototype.replaceAll() with zero-length
   argument.

*) Bugfix: fixed retval handling after an exception in
   Array.prototype.toSpliced(), Array.prototype.toReversed(),
   Array.prototype.toSorted().

*) Bugfix: fixed RegExp.prototype[@@replace]() with replacements
   containing "$'", "$\`" and strings with Unicode characters.

*) Bugfix: fixed a one-byte overread in decodeURI() and
   decodeURIComponent().

*) Bugfix: fixed tracking of argument scope.

*) Bugfix: fixed integer overflow in Date.parse().

</ChangeLog>
  • Loading branch information
osa committed Jun 27, 2024
1 parent d1fe813 commit f468d58
Show file tree
Hide file tree
Showing 15 changed files with 120 additions and 40 deletions.
5 changes: 2 additions & 3 deletions devel/libnjs/Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.9 2024/06/06 13:16:40 jperkin Exp $
# $NetBSD: Makefile,v 1.10 2024/06/27 16:03:24 osa Exp $

DISTNAME= njs-0.8.4
DISTNAME= njs-0.8.5
PKGNAME= lib${DISTNAME}
PKGREVISION= 1
CATEGORIES= devel www
MASTER_SITES= ${MASTER_SITE_GITHUB:=nginx/}
GITHUB_PROJECT= njs
Expand Down
3 changes: 2 additions & 1 deletion devel/libnjs/PLIST
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.3 2024/05/07 13:43:55 osa Exp $
@comment $NetBSD: PLIST,v 1.4 2024/06/27 16:03:24 osa Exp $
include/njs.h
include/njs_addr2line.h
include/njs_arr.h
Expand Down Expand Up @@ -66,5 +66,6 @@ include/njs_value_conversion.h
include/njs_variable.h
include/njs_vm.h
include/njs_vmcode.h
include/qjs.h
lib/libnjs.a
lib/pkgconfig/njs.pc
8 changes: 4 additions & 4 deletions devel/libnjs/distinfo
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$NetBSD: distinfo,v 1.6 2024/06/06 13:17:25 jperkin Exp $
$NetBSD: distinfo,v 1.7 2024/06/27 16:03:24 osa Exp $

BLAKE2s (njs-0.8.4.tar.gz) = 41f4ace141fd0440fc77baccb57c027cad3fa6dacbb379edf515161639ba2401
SHA512 (njs-0.8.4.tar.gz) = 450f6866141f6f370767149c8749e84c4373f401d6d2237ca85365a851ebe7bdbd8a3c25e85a55747673e8bef2238a979dd237d5fc5c641b2f3f2cf7f26dffc8
Size (njs-0.8.4.tar.gz) = 743910 bytes
BLAKE2s (njs-0.8.5.tar.gz) = d7087ba9174f8acc5fc8ac21a7eca77549d170adc6b7ff711ed9e0610edaadbe
SHA512 (njs-0.8.5.tar.gz) = 09fb37d609f5cb97b0af5eb097a017233af2eacb2d38071346b49f5e03b5e37280eebb360fc824acba0c600c44d234e2d11fa55f4bc913319491d7789a94171c
Size (njs-0.8.5.tar.gz) = 844437 bytes
SHA1 (patch-src_njs.pc.in) = 163acd71272008f70e95e759eb3c1539ccaabb06
5 changes: 2 additions & 3 deletions lang/njs/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.18 2024/05/29 16:33:14 adam Exp $
# $NetBSD: Makefile,v 1.19 2024/06/27 16:03:24 osa Exp $

DISTNAME= njs-0.8.4
PKGREVISION= 1
DISTNAME= njs-0.8.5
CATEGORIES= lang www
MASTER_SITES= ${MASTER_SITE_GITHUB:=nginx/}
GITHUB_TAG= ${PKGVERSION_NOREV}
Expand Down
8 changes: 4 additions & 4 deletions lang/njs/distinfo
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
$NetBSD: distinfo,v 1.12 2024/05/07 13:43:55 osa Exp $
$NetBSD: distinfo,v 1.13 2024/06/27 16:03:24 osa Exp $

BLAKE2s (njs-0.8.4.tar.gz) = 41f4ace141fd0440fc77baccb57c027cad3fa6dacbb379edf515161639ba2401
SHA512 (njs-0.8.4.tar.gz) = 450f6866141f6f370767149c8749e84c4373f401d6d2237ca85365a851ebe7bdbd8a3c25e85a55747673e8bef2238a979dd237d5fc5c641b2f3f2cf7f26dffc8
Size (njs-0.8.4.tar.gz) = 743910 bytes
BLAKE2s (njs-0.8.5.tar.gz) = d7087ba9174f8acc5fc8ac21a7eca77549d170adc6b7ff711ed9e0610edaadbe
SHA512 (njs-0.8.5.tar.gz) = 09fb37d609f5cb97b0af5eb097a017233af2eacb2d38071346b49f5e03b5e37280eebb360fc824acba0c600c44d234e2d11fa55f4bc913319491d7789a94171c
Size (njs-0.8.5.tar.gz) = 844437 bytes
3 changes: 2 additions & 1 deletion www/nginx-devel/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.127 2024/05/29 19:52:18 osa Exp $
# $NetBSD: Makefile,v 1.128 2024/06/27 16:03:25 osa Exp $

DISTNAME= nginx-1.27.0
PKGVERSION= 1
PKGNAME= ${DISTNAME:S/-/-devel-/1}
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/
Expand Down
8 changes: 4 additions & 4 deletions www/nginx-devel/distinfo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.108 2024/05/29 19:52:18 osa Exp $
$NetBSD: distinfo,v 1.109 2024/06/27 16:03:25 osa Exp $

BLAKE2s (1ac658f44afc9240f13e9d6c1c9d5a7816299e8e.patch) = 6c3880dc781886fb1f4190fa9b8f1459246cc5d157aaed3b9a24cc7abaf7c5a1
SHA512 (1ac658f44afc9240f13e9d6c1c9d5a7816299e8e.patch) = b780bea19736f5db844f11b0b407c159cc6ba7326b50177cefde6f8ee875238d3618e50d29b132a66fe98103cb5656f33895e5989d98d4cdc26cfeaa7f12865f
Expand Down Expand Up @@ -48,9 +48,9 @@ Size (ngx_devel_kit-0.3.3.tar.gz) = 66561 bytes
BLAKE2s (ngx_http_geoip2_module-3.4.tar.gz) = eb14ed670788d4cc46037719ebab29e1c0da53cadbb0da10198e76255d924273
SHA512 (ngx_http_geoip2_module-3.4.tar.gz) = 18dea21e5ae2647bea1fc448058a1b773c936917245edef8d861d5e23ed92e9a3b1ec4ef43ffb2ece7b5899d787910adcf4fbd39f84d7e8d7c54759e2fee5b72
Size (ngx_http_geoip2_module-3.4.tar.gz) = 8877 bytes
BLAKE2s (njs-0.8.4.tar.gz) = 41f4ace141fd0440fc77baccb57c027cad3fa6dacbb379edf515161639ba2401
SHA512 (njs-0.8.4.tar.gz) = 450f6866141f6f370767149c8749e84c4373f401d6d2237ca85365a851ebe7bdbd8a3c25e85a55747673e8bef2238a979dd237d5fc5c641b2f3f2cf7f26dffc8
Size (njs-0.8.4.tar.gz) = 743910 bytes
BLAKE2s (njs-0.8.5.tar.gz) = d7087ba9174f8acc5fc8ac21a7eca77549d170adc6b7ff711ed9e0610edaadbe
SHA512 (njs-0.8.5.tar.gz) = 09fb37d609f5cb97b0af5eb097a017233af2eacb2d38071346b49f5e03b5e37280eebb360fc824acba0c600c44d234e2d11fa55f4bc913319491d7789a94171c
Size (njs-0.8.5.tar.gz) = 844437 bytes
BLAKE2s (osokin-ngx_http_redis-59eb1c3_GH.tar.gz) = 4970dcfa8b4d51dde1e21b326a0c2a9feda370df9b7081e5e6e480bcfad63607
SHA512 (osokin-ngx_http_redis-59eb1c3_GH.tar.gz) = 63a488f95167dcd3b87cfc687e68e99beb33766c3f91bbf2eea9d7427e806941d445fa969fcdfae741b6566ef0dc9f95c1be53ce398d6f6d80ea31399f383943
Size (osokin-ngx_http_redis-59eb1c3_GH.tar.gz) = 12696 bytes
Expand Down
4 changes: 2 additions & 2 deletions www/nginx-devel/options.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: options.mk,v 1.29 2024/05/07 13:43:55 osa Exp $
# $NetBSD: options.mk,v 1.30 2024/06/27 16:03:25 osa Exp $

CODELOAD_SITE_GITHUB= https://codeload.github.com/

Expand Down Expand Up @@ -322,7 +322,7 @@ PLIST.rtmp= yes
.endif

.if !empty(PKG_OPTIONS:Mnjs) || make(makesum) || make(mdi) || make(distclean)
NJS_VERSION= 0.8.4
NJS_VERSION= 0.8.5
NJS_DISTNAME= njs-${NJS_VERSION}
NJS_DISTFILE= ${NJS_DISTNAME}.tar.gz
SITES.${NJS_DISTFILE}= -${MASTER_SITE_GITHUB:=nginx/njs/archive/}${NJS_VERSION}.tar.gz
Expand Down
3 changes: 2 additions & 1 deletion www/nginx/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.155 2024/05/29 20:00:23 osa Exp $
# $NetBSD: Makefile,v 1.156 2024/06/27 16:03:24 osa Exp $

DISTNAME= nginx-1.26.1
PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/
DISTFILES= ${DEFAULT_DISTFILES}
Expand Down
8 changes: 4 additions & 4 deletions www/nginx/distinfo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.119 2024/05/29 20:00:23 osa Exp $
$NetBSD: distinfo,v 1.120 2024/06/27 16:03:24 osa Exp $

BLAKE2s (1ac658f44afc9240f13e9d6c1c9d5a7816299e8e.patch) = 6c3880dc781886fb1f4190fa9b8f1459246cc5d157aaed3b9a24cc7abaf7c5a1
SHA512 (1ac658f44afc9240f13e9d6c1c9d5a7816299e8e.patch) = b780bea19736f5db844f11b0b407c159cc6ba7326b50177cefde6f8ee875238d3618e50d29b132a66fe98103cb5656f33895e5989d98d4cdc26cfeaa7f12865f
Expand Down Expand Up @@ -48,9 +48,9 @@ Size (ngx_devel_kit-0.3.3.tar.gz) = 66561 bytes
BLAKE2s (ngx_http_geoip2_module-3.4.tar.gz) = eb14ed670788d4cc46037719ebab29e1c0da53cadbb0da10198e76255d924273
SHA512 (ngx_http_geoip2_module-3.4.tar.gz) = 18dea21e5ae2647bea1fc448058a1b773c936917245edef8d861d5e23ed92e9a3b1ec4ef43ffb2ece7b5899d787910adcf4fbd39f84d7e8d7c54759e2fee5b72
Size (ngx_http_geoip2_module-3.4.tar.gz) = 8877 bytes
BLAKE2s (njs-0.8.4.tar.gz) = 41f4ace141fd0440fc77baccb57c027cad3fa6dacbb379edf515161639ba2401
SHA512 (njs-0.8.4.tar.gz) = 450f6866141f6f370767149c8749e84c4373f401d6d2237ca85365a851ebe7bdbd8a3c25e85a55747673e8bef2238a979dd237d5fc5c641b2f3f2cf7f26dffc8
Size (njs-0.8.4.tar.gz) = 743910 bytes
BLAKE2s (njs-0.8.5.tar.gz) = d7087ba9174f8acc5fc8ac21a7eca77549d170adc6b7ff711ed9e0610edaadbe
SHA512 (njs-0.8.5.tar.gz) = 09fb37d609f5cb97b0af5eb097a017233af2eacb2d38071346b49f5e03b5e37280eebb360fc824acba0c600c44d234e2d11fa55f4bc913319491d7789a94171c
Size (njs-0.8.5.tar.gz) = 844437 bytes
BLAKE2s (osokin-ngx_http_redis-59eb1c3_GH.tar.gz) = 4970dcfa8b4d51dde1e21b326a0c2a9feda370df9b7081e5e6e480bcfad63607
SHA512 (osokin-ngx_http_redis-59eb1c3_GH.tar.gz) = 63a488f95167dcd3b87cfc687e68e99beb33766c3f91bbf2eea9d7427e806941d445fa969fcdfae741b6566ef0dc9f95c1be53ce398d6f6d80ea31399f383943
Size (osokin-ngx_http_redis-59eb1c3_GH.tar.gz) = 12696 bytes
Expand Down
4 changes: 2 additions & 2 deletions www/nginx/options.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: options.mk,v 1.102 2024/05/07 14:15:29 osa Exp $
# $NetBSD: options.mk,v 1.103 2024/06/27 16:03:24 osa Exp $

CODELOAD_SITE_GITHUB= https://codeload.github.com/

Expand Down Expand Up @@ -322,7 +322,7 @@ PLIST.rtmp= yes
.endif

.if !empty(PKG_OPTIONS:Mnjs) || make(makesum) || make(mdi) || make(distclean)
NJS_VERSION= 0.8.4
NJS_VERSION= 0.8.5
NJS_DISTNAME= njs-${NJS_VERSION}
NJS_DISTFILE= ${NJS_DISTNAME}.tar.gz
SITES.${NJS_DISTFILE}= -${MASTER_SITE_GITHUB:=nginx/njs/archive/}${NJS_VERSION}.tar.gz
Expand Down
4 changes: 2 additions & 2 deletions www/unit/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.17 2023/10/25 16:04:47 osa Exp $
# $NetBSD: Makefile,v 1.18 2024/06/27 16:03:25 osa Exp $

PKGREVISION= 2
PKGREVISION= 3
.include "../../www/unit/version.mk"

DISTNAME= unit-${UNIT_VERSION}
Expand Down
5 changes: 3 additions & 2 deletions www/unit/distinfo
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
$NetBSD: distinfo,v 1.20 2024/05/07 13:51:29 osa Exp $
$NetBSD: distinfo,v 1.21 2024/06/27 16:03:25 osa Exp $

BLAKE2s (unit-1.32.1.tar.gz) = bfc777d7485f893699f6e0905c5d330914ff939fed9b17765e247310354de22d
SHA512 (unit-1.32.1.tar.gz) = 159b36f7afb8857188c9b64ee192e18d6990da3733caafcfb684b98e3f5182a7589ed2439f32af0cd3c763a3fa73f061f5a73ef01894182b1c12a4cd324c528a
Size (unit-1.32.1.tar.gz) = 937669 bytes
SHA1 (patch-auto_events) = 0556b5d3db6b88d23d686d9da1f3274187079973
SHA1 (patch-auto_os_conf) = 6d1cd7aef662a60d4288014eb6fadbe8c1268e55
SHA1 (patch-auto_shmem) = cb37c368c19205c2cc1750f4a847af23be8bfa25
SHA1 (patch-src_nxt__http__js.c) = 8303ced032074c8902fad49ceca4ee97ed1dcdf5
SHA1 (patch-src_nxt__js.c) = 659960992fa99b2b5d62ed57715a78bc4be90446
SHA1 (patch-src_nxt__kqueue__engine.c) = c341425f4b21d4cff6e003958f88a04b53dc4ee1
SHA1 (patch-src_nxt__php__sapi.c) = 2d5e557ff2066bec78f5bfbca6a64688f60da01b
SHA1 (patch-src_nxt__script.c) = 777e92b2b9de3c153d0681f87022ae510d386a4b
SHA1 (patch-src_nxt__script.c) = a7c0851a2686b87b180b77a632a06724d79c7110
SHA1 (patch-src_nxt__unix.h) = c0db5bc4d9c45a3ead48627567284d8b3041b0a0
SHA1 (patch-src_nxt__websocket__header.h) = 1b50405b187cc8a662372a1c20ab7737278135ae
78 changes: 78 additions & 0 deletions www/unit/patches/patch-src_nxt__http__js.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
$NetBSD: patch-src_nxt__http__js.c,v 1.1 2024/06/27 16:03:25 osa Exp $

Fix build with the recent version of NGINX JavaScript

--- src/nxt_http_js.c.orig 2024-06-26 22:04:35 UTC
+++ src/nxt_http_js.c
@@ -120,7 +120,7 @@ nxt_http_js_ext_uri(njs_vm_t *vm, njs_object_prop_t *p
return NJS_DECLINED;
}

- return njs_vm_value_string_set(vm, retval, r->path->start, r->path->length);
+ return njs_vm_value_string_create(vm, retval, r->path->start, r->path->length);
}


@@ -136,7 +136,7 @@ nxt_http_js_ext_host(njs_vm_t *vm, njs_object_prop_t *
return NJS_DECLINED;
}

- return njs_vm_value_string_set(vm, retval, r->host.start, r->host.length);
+ return njs_vm_value_string_create(vm, retval, r->host.start, r->host.length);
}


@@ -152,7 +152,7 @@ nxt_http_js_ext_remote_addr(njs_vm_t *vm, njs_object_p
return NJS_DECLINED;
}

- return njs_vm_value_string_set(vm, retval,
+ return njs_vm_value_string_create(vm, retval,
nxt_sockaddr_address(r->remote),
r->remote->address_length);
}
@@ -214,7 +214,7 @@ nxt_http_js_ext_get_header(njs_vm_t *vm, njs_object_pr
if (key.length == f->name_length
&& memcmp(key.start, f->name, f->name_length) == 0)
{
- return njs_vm_value_string_set(vm, retval, f->value,
+ return njs_vm_value_string_create(vm, retval, f->value,
f->value_length);
}

@@ -250,7 +250,7 @@ nxt_http_js_ext_keys_header(njs_vm_t *vm, njs_value_t
return NJS_ERROR;
}

- rc = njs_vm_value_string_set(vm, value, f->name, f->name_length);
+ rc = njs_vm_value_string_create(vm, value, f->name, f->name_length);
if (rc != NJS_OK) {
return NJS_ERROR;
}
@@ -296,7 +296,7 @@ nxt_http_js_ext_get_cookie(njs_vm_t *vm, njs_object_pr
if (key.length == nv->name_length
&& memcmp(key.start, nv->name, nv->name_length) == 0)
{
- return njs_vm_value_string_set(vm, retval, nv->value,
+ return njs_vm_value_string_create(vm, retval, nv->value,
nv->value_length);
}
}
@@ -340,7 +340,7 @@ nxt_http_js_ext_keys_cookie(njs_vm_t *vm, njs_value_t
return NJS_ERROR;
}

- rc = njs_vm_value_string_set(vm, value, nv->name, nv->name_length);
+ rc = njs_vm_value_string_create(vm, value, nv->name, nv->name_length);
if (rc != NJS_OK) {
return NJS_ERROR;
}
@@ -380,7 +380,7 @@ nxt_http_js_ext_get_var(njs_vm_t *vm, njs_object_prop_
vv = nxt_var_get(&r->task, rtcf->tstr_state, &r->tstr_cache.var, &name, r);

if (vv != NULL) {
- return njs_vm_value_string_set(vm, retval, vv->start, vv->length);
+ return njs_vm_value_string_create(vm, retval, vv->start, vv->length);
}

njs_value_undefined_set(retval);
14 changes: 7 additions & 7 deletions www/unit/patches/patch-src_nxt__script.c
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
$NetBSD: patch-src_nxt__script.c,v 1.1 2024/05/07 13:49:33 osa Exp $
$NetBSD: patch-src_nxt__script.c,v 1.2 2024/06/27 16:03:25 osa Exp $

Fix build with the recent versions of NGINX JavaScript

--- src/nxt_script.c.orig 2023-10-17 14:15:38 UTC
--- src/nxt_script.c.orig 2024-03-21 13:47:41.000000000 +0000
+++ src/nxt_script.c
@@ -37,14 +37,6 @@ static void nxt_script_buf_completion(nxt_task_t *task
@@ -37,14 +37,6 @@ static void nxt_script_buf_completion(nx
static nxt_lvlhsh_t nxt_script_info;


Expand All @@ -19,12 +19,12 @@ Fix build with the recent versions of NGINX JavaScript
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

@@ -63,8 +55,6 @@ nxt_script_new(nxt_task_t *task, nxt_str
opts.file.start = (u_char *) "default";
opts.file.length = 7;
-
- opts.ops = &nxt_js_ops;

- opts.ops = &nxt_js_ops;
-
vm = njs_vm_create(&opts);
if (nxt_slow_path(vm == NULL)) {
return NULL;

0 comments on commit f468d58

Please sign in to comment.