pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc
Module Name: pkgsrc
Committed By: osa
Date: Tue Jun 3 22:59:20 UTC 2025
Modified Files:
pkgsrc/devel/libnjs: Makefile PLIST distinfo
pkgsrc/lang/njs: Makefile distinfo
pkgsrc/www/nginx: Makefile distinfo options.mk
pkgsrc/www/nginx-devel: Makefile distinfo options.mk
pkgsrc/www/unit: Makefile distinfo
Added Files:
pkgsrc/www/unit/patches: patch-auto_njs patch-src_nxt__http__js.c
Log Message:
*/*: update NGINX JavaScript 0.8.9 -> 0.9.0
Bump PKGREVISION for www/nginx, www/nginx-devel, www/unit.
<ChangeLog>
Core:
*) Feature: refactored working with built-in strings, symbols
and small integers.
Performance improvements (arewefastyet/benchmarks/v8-v7 benchmark):
Richards: +57% (631 → 989)
Crypto: +7% (1445 → 1551)
RayTrace: +37% (562 → 772)
NavierStokes: +20% (2062 → 2465)
Overall score: +29% (1014 → 1307)
*) Bugfix: fixed regexp undefined value of captured group.
*) Bugfix: fixed GCC 15 build with -Wunterminated-string-initialization.
</ChangeLog>
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/libnjs/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/libnjs/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/libnjs/distinfo
cvs rdiff -u -r1.27 -r1.28 pkgsrc/lang/njs/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/lang/njs/distinfo
cvs rdiff -u -r1.176 -r1.177 pkgsrc/www/nginx/Makefile
cvs rdiff -u -r1.133 -r1.134 pkgsrc/www/nginx/distinfo
cvs rdiff -u -r1.117 -r1.118 pkgsrc/www/nginx/options.mk
cvs rdiff -u -r1.152 -r1.153 pkgsrc/www/nginx-devel/Makefile
cvs rdiff -u -r1.124 -r1.125 pkgsrc/www/nginx-devel/distinfo
cvs rdiff -u -r1.44 -r1.45 pkgsrc/www/nginx-devel/options.mk
cvs rdiff -u -r1.23 -r1.24 pkgsrc/www/unit/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/www/unit/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/www/unit/patches/patch-auto_njs
cvs rdiff -u -r0 -r1.3 pkgsrc/www/unit/patches/patch-src_nxt__http__js.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/devel/libnjs/Makefile
diff -u pkgsrc/devel/libnjs/Makefile:1.19 pkgsrc/devel/libnjs/Makefile:1.20
--- pkgsrc/devel/libnjs/Makefile:1.19 Thu Apr 17 21:50:29 2025
+++ pkgsrc/devel/libnjs/Makefile Tue Jun 3 22:59:19 2025
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2025/04/17 21:50:29 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2025/06/03 22:59:19 osa Exp $
-DISTNAME= njs-0.8.10
+DISTNAME= njs-0.9.0
PKGNAME= lib${DISTNAME}
-PKGREVISION= 1
CATEGORIES= devel www
MASTER_SITES= ${MASTER_SITE_GITHUB:=nginx/}
GITHUB_PROJECT= njs
Index: pkgsrc/devel/libnjs/PLIST
diff -u pkgsrc/devel/libnjs/PLIST:1.4 pkgsrc/devel/libnjs/PLIST:1.5
--- pkgsrc/devel/libnjs/PLIST:1.4 Thu Jun 27 16:03:24 2024
+++ pkgsrc/devel/libnjs/PLIST Tue Jun 3 22:59:19 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2024/06/27 16:03:24 osa Exp $
+@comment $NetBSD: PLIST,v 1.5 2025/06/03 22:59:19 osa Exp $
include/njs.h
include/njs_addr2line.h
include/njs_arr.h
@@ -6,6 +6,8 @@ include/njs_array.h
include/njs_array_buffer.h
include/njs_assert.h
include/njs_async.h
+include/njs_atom.h
+include/njs_atom_defs.h
include/njs_auto_config.h
include/njs_boolean.h
include/njs_buffer.h
@@ -25,7 +27,6 @@ include/njs_generator.h
include/njs_iterator.h
include/njs_json.h
include/njs_lexer.h
-include/njs_lexer_tables.h
include/njs_lvlhsh.h
include/njs_main.h
include/njs_malloc.h
@@ -35,7 +36,6 @@ include/njs_mp.h
include/njs_murmur_hash.h
include/njs_number.h
include/njs_object.h
-include/njs_object_hash.h
include/njs_object_prop_declare.h
include/njs_parser.h
include/njs_promise.h
Index: pkgsrc/devel/libnjs/distinfo
diff -u pkgsrc/devel/libnjs/distinfo:1.12 pkgsrc/devel/libnjs/distinfo:1.13
--- pkgsrc/devel/libnjs/distinfo:1.12 Thu Apr 17 15:14:32 2025
+++ pkgsrc/devel/libnjs/distinfo Tue Jun 3 22:59:19 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2025/04/17 15:14:32 osa Exp $
+$NetBSD: distinfo,v 1.13 2025/06/03 22:59:19 osa Exp $
-BLAKE2s (njs-0.8.10.tar.gz) = ac3c80ae8a08a5900728382962fd376195215329ab8639129bedc9499deb299f
-SHA512 (njs-0.8.10.tar.gz) = 71bcd596383ff501514adcf9baa0fd4d5cd0d3b53b2cdeee7e64b094ba12f6ee0f8fe99849dd8ad71afb6212566253ebdca2b83713d026ddfed3fe7902a5e906
-Size (njs-0.8.10.tar.gz) = 942446 bytes
+BLAKE2s (njs-0.9.0.tar.gz) = 74009bc72c3bd8510291fcf00d365765caeba4b773bf88f1b0f9cf9c574b51aa
+SHA512 (njs-0.9.0.tar.gz) = a8c893593606ee5f16df65e0d7214b3487e39dbc85e0d2dd907dd086b8bf9f06b0b902000d31bdaa1836ae6aaae001d2624b4499daf887b775be5e79a32956aa
+Size (njs-0.9.0.tar.gz) = 942562 bytes
SHA1 (patch-src_njs.pc.in) = 24a1a073fd5308d4e80395c93e446c86e6e69983
Index: pkgsrc/lang/njs/Makefile
diff -u pkgsrc/lang/njs/Makefile:1.27 pkgsrc/lang/njs/Makefile:1.28
--- pkgsrc/lang/njs/Makefile:1.27 Thu Apr 17 21:51:20 2025
+++ pkgsrc/lang/njs/Makefile Tue Jun 3 22:59:20 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2025/04/17 21:51:20 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2025/06/03 22:59:20 osa Exp $
-DISTNAME= njs-0.8.10
-PKGREVISION= 1
+DISTNAME= njs-0.9.0
CATEGORIES= lang www
MASTER_SITES= ${MASTER_SITE_GITHUB:=nginx/}
GITHUB_TAG= ${PKGVERSION_NOREV}
Index: pkgsrc/lang/njs/distinfo
diff -u pkgsrc/lang/njs/distinfo:1.17 pkgsrc/lang/njs/distinfo:1.18
--- pkgsrc/lang/njs/distinfo:1.17 Thu Apr 17 15:14:32 2025
+++ pkgsrc/lang/njs/distinfo Tue Jun 3 22:59:20 2025
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.17 2025/04/17 15:14:32 osa Exp $
+$NetBSD: distinfo,v 1.18 2025/06/03 22:59:20 osa Exp $
-BLAKE2s (njs-0.8.10.tar.gz) = ac3c80ae8a08a5900728382962fd376195215329ab8639129bedc9499deb299f
-SHA512 (njs-0.8.10.tar.gz) = 71bcd596383ff501514adcf9baa0fd4d5cd0d3b53b2cdeee7e64b094ba12f6ee0f8fe99849dd8ad71afb6212566253ebdca2b83713d026ddfed3fe7902a5e906
-Size (njs-0.8.10.tar.gz) = 942446 bytes
+BLAKE2s (njs-0.9.0.tar.gz) = 74009bc72c3bd8510291fcf00d365765caeba4b773bf88f1b0f9cf9c574b51aa
+SHA512 (njs-0.9.0.tar.gz) = a8c893593606ee5f16df65e0d7214b3487e39dbc85e0d2dd907dd086b8bf9f06b0b902000d31bdaa1836ae6aaae001d2624b4499daf887b775be5e79a32956aa
+Size (njs-0.9.0.tar.gz) = 942562 bytes
Index: pkgsrc/www/nginx/Makefile
diff -u pkgsrc/www/nginx/Makefile:1.176 pkgsrc/www/nginx/Makefile:1.177
--- pkgsrc/www/nginx/Makefile:1.176 Thu Apr 24 14:16:05 2025
+++ pkgsrc/www/nginx/Makefile Tue Jun 3 22:59:20 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.176 2025/04/24 14:16:05 wiz Exp $
+# $NetBSD: Makefile,v 1.177 2025/06/03 22:59:20 osa Exp $
DISTNAME= nginx-1.28.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/
DISTFILES= ${DEFAULT_DISTFILES}
Index: pkgsrc/www/nginx/distinfo
diff -u pkgsrc/www/nginx/distinfo:1.133 pkgsrc/www/nginx/distinfo:1.134
--- pkgsrc/www/nginx/distinfo:1.133 Wed Apr 23 18:33:05 2025
+++ pkgsrc/www/nginx/distinfo Tue Jun 3 22:59:20 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.133 2025/04/23 18:33:05 osa Exp $
+$NetBSD: distinfo,v 1.134 2025/06/03 22:59:20 osa Exp $
BLAKE2s (1ac658f44afc9240f13e9d6c1c9d5a7816299e8e.patch) = 6c3880dc781886fb1f4190fa9b8f1459246cc5d157aaed3b9a24cc7abaf7c5a1
SHA512 (1ac658f44afc9240f13e9d6c1c9d5a7816299e8e.patch) = b780bea19736f5db844f11b0b407c159cc6ba7326b50177cefde6f8ee875238d3618e50d29b132a66fe98103cb5656f33895e5989d98d4cdc26cfeaa7f12865f
@@ -48,9 +48,9 @@ Size (ngx_devel_kit-0.3.3.tar.gz) = 6656
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.10.tar.gz) = ac3c80ae8a08a5900728382962fd376195215329ab8639129bedc9499deb299f
-SHA512 (njs-0.8.10.tar.gz) = 71bcd596383ff501514adcf9baa0fd4d5cd0d3b53b2cdeee7e64b094ba12f6ee0f8fe99849dd8ad71afb6212566253ebdca2b83713d026ddfed3fe7902a5e906
-Size (njs-0.8.10.tar.gz) = 942446 bytes
+BLAKE2s (njs-0.9.0.tar.gz) = 74009bc72c3bd8510291fcf00d365765caeba4b773bf88f1b0f9cf9c574b51aa
+SHA512 (njs-0.9.0.tar.gz) = a8c893593606ee5f16df65e0d7214b3487e39dbc85e0d2dd907dd086b8bf9f06b0b902000d31bdaa1836ae6aaae001d2624b4499daf887b775be5e79a32956aa
+Size (njs-0.9.0.tar.gz) = 942562 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
Index: pkgsrc/www/nginx/options.mk
diff -u pkgsrc/www/nginx/options.mk:1.117 pkgsrc/www/nginx/options.mk:1.118
--- pkgsrc/www/nginx/options.mk:1.117 Wed Apr 23 18:33:05 2025
+++ pkgsrc/www/nginx/options.mk Tue Jun 3 22:59:20 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.117 2025/04/23 18:33:05 osa Exp $
+# $NetBSD: options.mk,v 1.118 2025/06/03 22:59:20 osa Exp $
CODELOAD_SITE_GITHUB= https://codeload.github.com/
@@ -361,7 +361,7 @@ PLIST.rtmp= yes
.endif
.if !empty(PKG_OPTIONS:Mnginx-njs) || make(makesum) || make(mdi) || make(distclean)
-NJS_VERSION= 0.8.10
+NJS_VERSION= 0.9.0
NJS_DISTNAME= njs-${NJS_VERSION}
NJS_DISTFILE= ${NJS_DISTNAME}.tar.gz
SITES.${NJS_DISTFILE}= -${MASTER_SITE_GITHUB:=nginx/njs/archive/}${NJS_VERSION}.tar.gz
Index: pkgsrc/www/nginx-devel/Makefile
diff -u pkgsrc/www/nginx-devel/Makefile:1.152 pkgsrc/www/nginx-devel/Makefile:1.153
--- pkgsrc/www/nginx-devel/Makefile:1.152 Thu Apr 24 14:16:05 2025
+++ pkgsrc/www/nginx-devel/Makefile Tue Jun 3 22:59:20 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.152 2025/04/24 14:16:05 wiz Exp $
+# $NetBSD: Makefile,v 1.153 2025/06/03 22:59:20 osa Exp $
DISTNAME= nginx-1.28.0
PKGNAME= ${DISTNAME:S/-/-devel-/1}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/
DISTFILES= ${DEFAULT_DISTFILES}
Index: pkgsrc/www/nginx-devel/distinfo
diff -u pkgsrc/www/nginx-devel/distinfo:1.124 pkgsrc/www/nginx-devel/distinfo:1.125
--- pkgsrc/www/nginx-devel/distinfo:1.124 Wed Apr 23 17:45:48 2025
+++ pkgsrc/www/nginx-devel/distinfo Tue Jun 3 22:59:20 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.124 2025/04/23 17:45:48 osa Exp $
+$NetBSD: distinfo,v 1.125 2025/06/03 22:59:20 osa Exp $
BLAKE2s (1ac658f44afc9240f13e9d6c1c9d5a7816299e8e.patch) = 6c3880dc781886fb1f4190fa9b8f1459246cc5d157aaed3b9a24cc7abaf7c5a1
SHA512 (1ac658f44afc9240f13e9d6c1c9d5a7816299e8e.patch) = b780bea19736f5db844f11b0b407c159cc6ba7326b50177cefde6f8ee875238d3618e50d29b132a66fe98103cb5656f33895e5989d98d4cdc26cfeaa7f12865f
@@ -48,9 +48,9 @@ Size (ngx_devel_kit-0.3.3.tar.gz) = 6656
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.10.tar.gz) = ac3c80ae8a08a5900728382962fd376195215329ab8639129bedc9499deb299f
-SHA512 (njs-0.8.10.tar.gz) = 71bcd596383ff501514adcf9baa0fd4d5cd0d3b53b2cdeee7e64b094ba12f6ee0f8fe99849dd8ad71afb6212566253ebdca2b83713d026ddfed3fe7902a5e906
-Size (njs-0.8.10.tar.gz) = 942446 bytes
+BLAKE2s (njs-0.9.0.tar.gz) = 74009bc72c3bd8510291fcf00d365765caeba4b773bf88f1b0f9cf9c574b51aa
+SHA512 (njs-0.9.0.tar.gz) = a8c893593606ee5f16df65e0d7214b3487e39dbc85e0d2dd907dd086b8bf9f06b0b902000d31bdaa1836ae6aaae001d2624b4499daf887b775be5e79a32956aa
+Size (njs-0.9.0.tar.gz) = 942562 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
Index: pkgsrc/www/nginx-devel/options.mk
diff -u pkgsrc/www/nginx-devel/options.mk:1.44 pkgsrc/www/nginx-devel/options.mk:1.45
--- pkgsrc/www/nginx-devel/options.mk:1.44 Wed Apr 23 18:19:57 2025
+++ pkgsrc/www/nginx-devel/options.mk Tue Jun 3 22:59:20 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.44 2025/04/23 18:19:57 osa Exp $
+# $NetBSD: options.mk,v 1.45 2025/06/03 22:59:20 osa Exp $
CODELOAD_SITE_GITHUB= https://codeload.github.com/
@@ -361,7 +361,7 @@ PLIST.rtmp= yes
.endif
.if !empty(PKG_OPTIONS:Mnginx-njs) || make(makesum) || make(mdi) || make(distclean)
-NJS_VERSION= 0.8.10
+NJS_VERSION= 0.9.0
NJS_DISTNAME= njs-${NJS_VERSION}
NJS_DISTFILE= ${NJS_DISTNAME}.tar.gz
SITES.${NJS_DISTFILE}= -${MASTER_SITE_GITHUB:=nginx/njs/archive/}${NJS_VERSION}.tar.gz
Index: pkgsrc/www/unit/Makefile
diff -u pkgsrc/www/unit/Makefile:1.23 pkgsrc/www/unit/Makefile:1.24
--- pkgsrc/www/unit/Makefile:1.23 Tue Jan 14 18:07:35 2025
+++ pkgsrc/www/unit/Makefile Tue Jun 3 22:59:20 2025
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2025/01/14 18:07:35 osa Exp $
+# $NetBSD: Makefile,v 1.24 2025/06/03 22:59:20 osa Exp $
.include "../../www/unit/version.mk"
DISTNAME= unit-${UNIT_VERSION}
+PKGREVISION= 1
COMMENT= Dynamic web application server
Index: pkgsrc/www/unit/distinfo
diff -u pkgsrc/www/unit/distinfo:1.27 pkgsrc/www/unit/distinfo:1.28
--- pkgsrc/www/unit/distinfo:1.27 Mon Mar 3 19:58:25 2025
+++ pkgsrc/www/unit/distinfo Tue Jun 3 22:59:20 2025
@@ -1,12 +1,14 @@
-$NetBSD: distinfo,v 1.27 2025/03/03 19:58:25 osa Exp $
+$NetBSD: distinfo,v 1.28 2025/06/03 22:59:20 osa Exp $
BLAKE2s (unit-1.34.2.tar.gz) = 0fca35d7e702599e856b16fd9205ab41e02d1a2413137332ce4f3cb189c1d5fa
SHA512 (unit-1.34.2.tar.gz) = c3d778b7f3de6231d4833f17b8a40c4d971a1b186efc5b4160da4acc62c43acb129c1596896ea64aa1d6c52a37418bc823094ef2e89a15494cf3d3d09eb0f666
Size (unit-1.34.2.tar.gz) = 1054961 bytes
SHA1 (patch-auto_events) = 0556b5d3db6b88d23d686d9da1f3274187079973
SHA1 (patch-auto_modules_php) = df85739053db94b606282253fe36e22e67dc192f
+SHA1 (patch-auto_njs) = da6e1fe988b3c583e94ffd766f0f1cc74e8fd711
SHA1 (patch-auto_os_conf) = 6d1cd7aef662a60d4288014eb6fadbe8c1268e55
SHA1 (patch-auto_shmem) = cb37c368c19205c2cc1750f4a847af23be8bfa25
+SHA1 (patch-src_nxt__http__js.c) = 9b0e088ae4d93afb195b045696d1dec636f1aacf
SHA1 (patch-src_nxt__kqueue__engine.c) = c341425f4b21d4cff6e003958f88a04b53dc4ee1
SHA1 (patch-src_nxt__php__sapi.c) = 2d5e557ff2066bec78f5bfbca6a64688f60da01b
SHA1 (patch-src_nxt__unix.h) = c0db5bc4d9c45a3ead48627567284d8b3041b0a0
Added files:
Index: pkgsrc/www/unit/patches/patch-auto_njs
diff -u /dev/null pkgsrc/www/unit/patches/patch-auto_njs:1.1
--- /dev/null Tue Jun 3 22:59:20 2025
+++ pkgsrc/www/unit/patches/patch-auto_njs Tue Jun 3 22:59:20 2025
@@ -0,0 +1,26 @@
+$NetBSD: patch-auto_njs,v 1.1 2025/06/03 22:59:20 osa Exp $
+
+Adopt njs-0.9.0
+
+--- auto/njs.orig 2025-06-03 22:42:50.205164330 +0000
++++ auto/njs
+@@ -25,8 +25,8 @@ nxt_feature_incs="$NXT_NJS_CFLAGS $NXT_N
+ nxt_feature_libs="$NXT_NJS_LIBS $NXT_NJS_AUX_LIBS"
+ nxt_feature_test="#include <njs.h>
+
+- #if NJS_VERSION_NUMBER < 0x000803
+- # error njs < 0.8.3 is not supported.
++ #if NJS_VERSION_NUMBER < 0x000900
++ # error njs < 0.9.0 is not supported.
+ #endif
+
+ int main(void) {
+@@ -44,7 +44,7 @@ nxt_feature_test="#include <njs.h>
+
+ if [ $nxt_found = no ]; then
+ $echo
+- $echo $0: error: no njs library \>= 0.8.3 found.
++ $echo $0: error: no njs library \>= 0.9.0 found.
+ $echo
+ exit 1;
+ fi
Index: pkgsrc/www/unit/patches/patch-src_nxt__http__js.c
diff -u /dev/null pkgsrc/www/unit/patches/patch-src_nxt__http__js.c:1.3
--- /dev/null Tue Jun 3 22:59:20 2025
+++ pkgsrc/www/unit/patches/patch-src_nxt__http__js.c Tue Jun 3 22:59:20 2025
@@ -0,0 +1,143 @@
+$NetBSD: patch-src_nxt__http__js.c,v 1.3 2025/06/03 22:59:20 osa Exp $
+
+Adopt njs-0.9.0
+
+--- src/nxt_http_js.c.orig 2025-02-27 22:02:21.000000000 +0000
++++ src/nxt_http_js.c
+@@ -9,27 +9,31 @@
+
+
+ static njs_int_t nxt_http_js_ext_uri(njs_vm_t *vm, njs_object_prop_t *prop,
+- njs_value_t *value, njs_value_t *setval, njs_value_t *retval);
++ uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
++ njs_value_t *retval);
+ static njs_int_t nxt_http_js_ext_host(njs_vm_t *vm, njs_object_prop_t *prop,
+- njs_value_t *value, njs_value_t *setval, njs_value_t *retval);
+-static njs_int_t nxt_http_js_ext_remote_addr(njs_vm_t *vm,
+- njs_object_prop_t *prop, njs_value_t *value, njs_value_t *setval,
++ uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
+ njs_value_t *retval);
++static njs_int_t nxt_http_js_ext_remote_addr(njs_vm_t *vm,
++ njs_object_prop_t *prop, uint32_t atom_id, njs_value_t *value,
++ njs_value_t *setval, njs_value_t *retval);
+ static njs_int_t nxt_http_js_ext_get_args(njs_vm_t *vm,
+- njs_object_prop_t *prop, njs_value_t *value, njs_value_t *setval,
+- njs_value_t *retval);
++ njs_object_prop_t *prop, uint32_t atom_id, njs_value_t *value,
++ njs_value_t *setval, njs_value_t *retval);
+ static njs_int_t nxt_http_js_ext_get_header(njs_vm_t *vm,
+- njs_object_prop_t *prop, njs_value_t *value, njs_value_t *setval,
+- njs_value_t *retval);
++ njs_object_prop_t *prop, uint32_t atom_id, njs_value_t *value,
++ njs_value_t *setval, njs_value_t *retval);
+ static njs_int_t nxt_http_js_ext_keys_header(njs_vm_t *vm,
+ njs_value_t *value, njs_value_t *keys);
+ static njs_int_t nxt_http_js_ext_get_cookie(njs_vm_t *vm,
+- njs_object_prop_t *prop, njs_value_t *value, njs_value_t *setval,
++ njs_object_prop_t *prop, uint32_t atom_id, njs_value_t *value,
++ njs_value_t *setval,
+ njs_value_t *retval);
+ static njs_int_t nxt_http_js_ext_keys_cookie(njs_vm_t *vm, njs_value_t *value,
+ njs_value_t *keys);
+ static njs_int_t nxt_http_js_ext_get_var(njs_vm_t *vm, njs_object_prop_t *prop,
+- njs_value_t *value, njs_value_t *setval, njs_value_t *retval);
++ uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
++ njs_value_t *retval);
+
+
+ static njs_external_t nxt_http_js_proto[] = {
+@@ -109,7 +113,7 @@ nxt_http_register_js_proto(nxt_js_conf_t
+
+
+ static njs_int_t
+-nxt_http_js_ext_uri(njs_vm_t *vm, njs_object_prop_t *prop,
++nxt_http_js_ext_uri(njs_vm_t *vm, njs_object_prop_t *prop, uint32_t atom_id,
+ njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
+ {
+ nxt_http_request_t *r;
+@@ -126,7 +130,7 @@ nxt_http_js_ext_uri(njs_vm_t *vm, njs_ob
+
+
+ static njs_int_t
+-nxt_http_js_ext_host(njs_vm_t *vm, njs_object_prop_t *prop,
++nxt_http_js_ext_host(njs_vm_t *vm, njs_object_prop_t *prop, uint32_t atom_id,
+ njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
+ {
+ nxt_http_request_t *r;
+@@ -144,7 +148,8 @@ nxt_http_js_ext_host(njs_vm_t *vm, njs_o
+
+ static njs_int_t
+ nxt_http_js_ext_remote_addr(njs_vm_t *vm, njs_object_prop_t *prop,
+- njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
++ uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
++ njs_value_t *retval)
+ {
+ nxt_http_request_t *r;
+
+@@ -162,7 +167,8 @@ nxt_http_js_ext_remote_addr(njs_vm_t *vm
+
+ static njs_int_t
+ nxt_http_js_ext_get_args(njs_vm_t *vm, njs_object_prop_t *prop,
+- njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
++ uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
++ njs_value_t *retval)
+ {
+ u_char *start;
+ njs_int_t ret;
+@@ -193,7 +199,8 @@ nxt_http_js_ext_get_args(njs_vm_t *vm, n
+
+ static njs_int_t
+ nxt_http_js_ext_get_header(njs_vm_t *vm, njs_object_prop_t *prop,
+- njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
++ uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
++ njs_value_t *retval)
+ {
+ njs_int_t rc;
+ njs_str_t key;
+@@ -206,7 +213,7 @@ nxt_http_js_ext_get_header(njs_vm_t *vm,
+ return NJS_DECLINED;
+ }
+
+- rc = njs_vm_prop_name(vm, prop, &key);
++ rc = njs_vm_prop_name(vm, atom_id, &key);
+ if (rc != NJS_OK) {
+ njs_value_undefined_set(retval);
+ return NJS_DECLINED;
+@@ -266,7 +273,8 @@ nxt_http_js_ext_keys_header(njs_vm_t *vm
+
+ static njs_int_t
+ nxt_http_js_ext_get_cookie(njs_vm_t *vm, njs_object_prop_t *prop,
+- njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
++ uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
++ njs_value_t *retval)
+ {
+ njs_int_t rc;
+ njs_str_t key;
+@@ -280,7 +288,7 @@ nxt_http_js_ext_get_cookie(njs_vm_t *vm,
+ return NJS_DECLINED;
+ }
+
+- rc = njs_vm_prop_name(vm, prop, &key);
++ rc = njs_vm_prop_name(vm, atom_id, &key);
+ if (rc != NJS_OK) {
+ njs_value_undefined_set(retval);
+ return NJS_DECLINED;
+@@ -355,7 +363,8 @@ nxt_http_js_ext_keys_cookie(njs_vm_t *vm
+
+ static njs_int_t
+ nxt_http_js_ext_get_var(njs_vm_t *vm, njs_object_prop_t *prop,
+- njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
++ uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
++ njs_value_t *retval)
+ {
+ njs_int_t rc;
+ njs_str_t key;
+@@ -369,7 +378,7 @@ nxt_http_js_ext_get_var(njs_vm_t *vm, nj
+ return NJS_DECLINED;
+ }
+
+- rc = njs_vm_prop_name(vm, prop, &key);
++ rc = njs_vm_prop_name(vm, atom_id, &key);
+ if (rc != NJS_OK) {
+ njs_value_undefined_set(retval);
+ return NJS_DECLINED;
Home |
Main Index |
Thread Index |
Old Index