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: Thu Jul 20 15:02:52 UTC 2023
Modified Files:
pkgsrc/devel/libnjs: Makefile distinfo
pkgsrc/devel/libnjs/patches: patch-auto_make
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/devel/libnjs/patches: patch-src_njs.pc.in
pkgsrc/www/unit/patches: patch-src_nxt__js.c
Log Message:
*/*: update NGINX JavaScript 0.7.12 -> 0.8.0
Bump PKGREVISION for www/nginx, www/nginx-devel, and www/unit.
<ChangeLog>
nginx modules:
*) Change: removed special treatment of forbidden headers in Fetch API
introduced in 0.7.10.
*) Change: removed deprecated since 0.5.0 r.requestBody and
r.responseBody in HTTP module.
*) Change: throwing an exception in r.internalRedirect() while
filtering in HTTP module.
*) Feature: introduced global nginx properties.
ngx.build - an optional nginx build name, corresponds to
--build=name argument of configure script, by default is "".
ngx.conf_file_path - the file path to current nginx configuration
file.
ngx.error_log_path - the file path to current error log file.
ngx.prefix - the directory that keeps server files.
ngx.version - the nginx version as a string, for example: "1.25.0".
ngx.version_number - the nginx version as a number, for example:
1025000.
ngx.worker_id - corresponds to an nginx internal worker id.
The value is between 0 and worker_processes - 1.
*) Feature: introduced js_shared_dict_zone directive.
The directive allows to declare a dictionary that is shared among the
working processes.
*) Improvement: added compile-time options to disable njs modules.
For example to disable libxslt related code:
NJS_LIBXSLT=NO ./configure .. --add-module=/path/to/njs/module
*) Bugfix: fixed r.status setter when filtering in HTTP module.
*) Bugfix: fixed setting of Location header in HTTP module.
Core:
*) Change: native methods are provided with retval argument.
This change breaks compatibility with C extension for njs
requiring to modify the code.
*) Change: non-compliant deprecated String methods were removed.
The following methods were removed: String.bytesFrom(),
String.prototype.fromBytes(), String.prototype.fromUTF8(),
String.prototype.toBytes(), String.prototype.toUTF8(),
String.prototype.toString(encoding).
*) Change: removed support for building with GNU readline.
*) Feature: added Array.from(), Array.prototype.toSorted(),
Array.prototype.toSpliced(), Array.prototype.toReversed().
*) Feature: added %TypedArray%.prototype.toSorted(),
%TypedArray%.prototype.toSpliced(),
%TypedArray%.prototype.toReversed().
*) Feature: added CryptoKey properties in WebCrypto.
The following properties for CryptoKey were added:
algorithm, extractable, type, usages.
*) Bugfix: fixed retval of crypto.getRandomValues().
*) Bugfix: fixed evaluation of computed property names with function
expressions.
*) Bugfix: fixed implicit name for a function expression declared in
arrays.
*) Bugfix: fixed parsing of for-in loops.
*) Bugfix: fixed Date.parse() with ISO-8601 format and UTC time
offset.
</ChangeLog>
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/libnjs/Makefile \
pkgsrc/devel/libnjs/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/libnjs/patches/patch-auto_make
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/libnjs/patches/patch-src_njs.pc.in
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/njs/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/njs/distinfo
cvs rdiff -u -r1.141 -r1.142 pkgsrc/www/nginx/Makefile
cvs rdiff -u -r1.111 -r1.112 pkgsrc/www/nginx/distinfo
cvs rdiff -u -r1.95 -r1.96 pkgsrc/www/nginx/options.mk
cvs rdiff -u -r1.110 -r1.111 pkgsrc/www/nginx-devel/Makefile
cvs rdiff -u -r1.97 -r1.98 pkgsrc/www/nginx-devel/distinfo
cvs rdiff -u -r1.23 -r1.24 pkgsrc/www/nginx-devel/options.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/unit/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/www/unit/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/www/unit/patches/patch-src_nxt__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.1 pkgsrc/devel/libnjs/Makefile:1.2
--- pkgsrc/devel/libnjs/Makefile:1.1 Wed May 17 16:44:51 2023
+++ pkgsrc/devel/libnjs/Makefile Thu Jul 20 15:02:51 2023
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2023/05/17 16:44:51 osa Exp $
+# $NetBSD: Makefile,v 1.2 2023/07/20 15:02:51 osa Exp $
-PKGNAME= libnjs-${VERSION}
-VERSION= 0.7.12
-DISTNAME= njs-${VERSION}
+DISTNAME= njs-0.8.0
+PKGNAME= libnjs-0.8.0
CATEGORIES= devel www
MASTER_SITES= ${MASTER_SITE_GITHUB:=nginx/}
@@ -16,6 +15,13 @@ USE_LANGUAGES+= c
INSTALLATION_DIRS= include lib/pkgconfig
+SUBST_CLASSES+= fix-pc
+SUBST_STAGE.fix-pc= pre-configure
+SUBST_MESSAGE.fix-pc= Fix NJS pkg-config
+SUBST_FILES.fix-pc= auto/make
+SUBST_NOOP_OK.fix-pc= yes
+SUBST_SED.fix-pc= -e 's|%%LOCALBASE%%|${LOCALBASE}|'
+
do-build:
${RUN} cd ${WRKSRC} && ${BUILD_MAKE_CMD} libnjs
Index: pkgsrc/devel/libnjs/distinfo
diff -u pkgsrc/devel/libnjs/distinfo:1.1 pkgsrc/devel/libnjs/distinfo:1.2
--- pkgsrc/devel/libnjs/distinfo:1.1 Wed May 17 16:44:51 2023
+++ pkgsrc/devel/libnjs/distinfo Thu Jul 20 15:02:51 2023
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2023/05/17 16:44:51 osa Exp $
+$NetBSD: distinfo,v 1.2 2023/07/20 15:02:51 osa Exp $
-BLAKE2s (njs-0.7.12.tar.gz) = a4c69c83bcc81ecd593f63f6d3e2d5d9cff8185ad56e8fd4846660c132976133
-SHA512 (njs-0.7.12.tar.gz) = a65a6c6aa3fbd499536284f8d8610f61b87112156885e6c3b1f73872df22195af897766f266b4569098a70e1680aef66594da17d13519f16687b4e43dce49062
-Size (njs-0.7.12.tar.gz) = 662554 bytes
-SHA1 (patch-auto_make) = dc784639fa8c4b7fb1437c16575555b38a1d85af
+BLAKE2s (njs-0.8.0.tar.gz) = a65bfea36473c5e43abfb51c6e4a92573af7a8e89c56ad9cd8534d14a83c1849
+SHA512 (njs-0.8.0.tar.gz) = 5e5fd3b0aba9d1a0b47207081e59d577cbd3db41e141cfa529526a778bbcd4fec1cd4dacaa1dc63ee07868ccf35f4d4cc465abff831bb03d128b0b1f1b04bb28
+Size (njs-0.8.0.tar.gz) = 715391 bytes
+SHA1 (patch-auto_make) = 050838e7ad8f3103c923669ab4fdf478cab0698c
+SHA1 (patch-src_njs.pc.in) = 163acd71272008f70e95e759eb3c1539ccaabb06
Index: pkgsrc/devel/libnjs/patches/patch-auto_make
diff -u pkgsrc/devel/libnjs/patches/patch-auto_make:1.1 pkgsrc/devel/libnjs/patches/patch-auto_make:1.2
--- pkgsrc/devel/libnjs/patches/patch-auto_make:1.1 Wed May 17 16:44:51 2023
+++ pkgsrc/devel/libnjs/patches/patch-auto_make Thu Jul 20 15:02:51 2023
@@ -1,27 +1,17 @@
-$NetBSD: patch-auto_make,v 1.1 2023/05/17 16:44:51 osa Exp $
+$NetBSD: patch-auto_make,v 1.2 2023/07/20 15:02:51 osa Exp $
-Use pipe as a delimiter for sed(1) to fix build for libnjs target.
+Fix NJS's pkg-config file
-sed(1) command line utility may fail with the following error:
-sed: 1: "s, at EXTRA_LIBS@,-lm -L ...": bad in substitute command: '-'
-when a replacement for @EXTRA_LIBS@ contains a comma symbol.
-
---- auto/make.orig 2023-05-11 23:24:57 UTC
+--- auto/make.orig 2023-07-11 23:27:41 UTC
+++ auto/make
-@@ -320,11 +320,11 @@ cat << END >> $NJS_MAKEFILE
+@@ -320,9 +320,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," \\
-- -e "s,@VERSION@,\$(NJS_VER)," \\
-- -e "s,@EXTRA_LIBS@,-lm $NJS_LIBS $NJS_LIB_AUX_LIBS," \\
-+ 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|" \\
-+ -e "s|@VERSION@|\$(NJS_VER)|" \\
-+ -e "s|@EXTRA_LIBS@|-lm $NJS_LIBS $NJS_LIB_AUX_LIBS|" \\
+- 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 > \$@
- END
-
Index: pkgsrc/lang/njs/Makefile
diff -u pkgsrc/lang/njs/Makefile:1.11 pkgsrc/lang/njs/Makefile:1.12
--- pkgsrc/lang/njs/Makefile:1.11 Wed Apr 19 08:10:35 2023
+++ pkgsrc/lang/njs/Makefile Thu Jul 20 15:02:51 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2023/04/19 08:10:35 adam Exp $
+# $NetBSD: Makefile,v 1.12 2023/07/20 15:02:51 osa Exp $
-DISTNAME= njs-0.7.12
-PKGREVISION= 1
+DISTNAME= njs-0.8.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.8 pkgsrc/lang/njs/distinfo:1.9
--- pkgsrc/lang/njs/distinfo:1.8 Thu Apr 13 16:45:47 2023
+++ pkgsrc/lang/njs/distinfo Thu Jul 20 15:02:51 2023
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2023/04/13 16:45:47 osa Exp $
+$NetBSD: distinfo,v 1.9 2023/07/20 15:02:51 osa Exp $
-BLAKE2s (njs-0.7.12.tar.gz) = a4c69c83bcc81ecd593f63f6d3e2d5d9cff8185ad56e8fd4846660c132976133
-SHA512 (njs-0.7.12.tar.gz) = a65a6c6aa3fbd499536284f8d8610f61b87112156885e6c3b1f73872df22195af897766f266b4569098a70e1680aef66594da17d13519f16687b4e43dce49062
-Size (njs-0.7.12.tar.gz) = 662554 bytes
+BLAKE2s (njs-0.8.0.tar.gz) = a65bfea36473c5e43abfb51c6e4a92573af7a8e89c56ad9cd8534d14a83c1849
+SHA512 (njs-0.8.0.tar.gz) = 5e5fd3b0aba9d1a0b47207081e59d577cbd3db41e141cfa529526a778bbcd4fec1cd4dacaa1dc63ee07868ccf35f4d4cc465abff831bb03d128b0b1f1b04bb28
+Size (njs-0.8.0.tar.gz) = 715391 bytes
Index: pkgsrc/www/nginx/Makefile
diff -u pkgsrc/www/nginx/Makefile:1.141 pkgsrc/www/nginx/Makefile:1.142
--- pkgsrc/www/nginx/Makefile:1.141 Thu Jul 6 09:42:18 2023
+++ pkgsrc/www/nginx/Makefile Thu Jul 20 15:02:52 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.141 2023/07/06 09:42:18 wiz Exp $
+# $NetBSD: Makefile,v 1.142 2023/07/20 15:02:52 osa Exp $
DISTNAME= nginx-1.24.0
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/
DISTFILES= ${DEFAULT_DISTFILES}
Index: pkgsrc/www/nginx/distinfo
diff -u pkgsrc/www/nginx/distinfo:1.111 pkgsrc/www/nginx/distinfo:1.112
--- pkgsrc/www/nginx/distinfo:1.111 Mon May 29 00:24:23 2023
+++ pkgsrc/www/nginx/distinfo Thu Jul 20 15:02:52 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.111 2023/05/29 00:24:23 osa Exp $
+$NetBSD: distinfo,v 1.112 2023/07/20 15:02:52 osa Exp $
BLAKE2s (array-var-nginx-module-0.06.tar.gz) = fa6ad2a2ce3c3eba3f69287b224e9c01fcaca29a083394ab74f2f655d3e2138b
SHA512 (array-var-nginx-module-0.06.tar.gz) = bc72158856a1be18a26ee04c6b5b0f0a20bcce688610a493bf31e2a133e7eb12e11f7c18197a09a72b1513f6a08348ee5281b9d5b84cf43603539040ebd23c26
@@ -45,9 +45,9 @@ Size (ngx_devel_kit-0.3.2.tar.gz) = 6655
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.7.12.tar.gz) = a4c69c83bcc81ecd593f63f6d3e2d5d9cff8185ad56e8fd4846660c132976133
-SHA512 (njs-0.7.12.tar.gz) = a65a6c6aa3fbd499536284f8d8610f61b87112156885e6c3b1f73872df22195af897766f266b4569098a70e1680aef66594da17d13519f16687b4e43dce49062
-Size (njs-0.7.12.tar.gz) = 662554 bytes
+BLAKE2s (njs-0.8.0.tar.gz) = a65bfea36473c5e43abfb51c6e4a92573af7a8e89c56ad9cd8534d14a83c1849
+SHA512 (njs-0.8.0.tar.gz) = 5e5fd3b0aba9d1a0b47207081e59d577cbd3db41e141cfa529526a778bbcd4fec1cd4dacaa1dc63ee07868ccf35f4d4cc465abff831bb03d128b0b1f1b04bb28
+Size (njs-0.8.0.tar.gz) = 715391 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.95 pkgsrc/www/nginx/options.mk:1.96
--- pkgsrc/www/nginx/options.mk:1.95 Mon May 15 22:02:57 2023
+++ pkgsrc/www/nginx/options.mk Thu Jul 20 15:02:52 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.95 2023/05/15 22:02:57 osa Exp $
+# $NetBSD: options.mk,v 1.96 2023/07/20 15:02:52 osa Exp $
CODELOAD_SITE_GITHUB= https://codeload.github.com/
@@ -7,7 +7,7 @@ PKG_SUPPORTED_OPTIONS= array-var auth-re
PKG_SUPPORTED_OPTIONS+= dso echo encrypted-session flv form-input
PKG_SUPPORTED_OPTIONS+= geoip geoip2 gssapi gtools gzip headers-more http2
PKG_SUPPORTED_OPTIONS+= image-filter luajit mail-proxy memcache
-PKG_SUPPORTED_OPTIONS+= naxsi njs perl push realip redis rtmp
+PKG_SUPPORTED_OPTIONS+= naxsi njs njs-xml perl push realip redis rtmp
PKG_SUPPORTED_OPTIONS+= secure-link set-misc slice ssl status
PKG_SUPPORTED_OPTIONS+= stream-ssl-preread sts sub upload uwsgi vts
@@ -318,15 +318,21 @@ PLIST.rtmp= yes
.endif
.if !empty(PKG_OPTIONS:Mnjs) || make(makesum) || make(mdi) || make(distclean)
-NJS_VERSION= 0.7.12
+NJS_VERSION= 0.8.0
NJS_DISTNAME= njs-${NJS_VERSION}
NJS_DISTFILE= ${NJS_DISTNAME}.tar.gz
-NJS_CONFIGURE_ARGS= --no-libxml2
SITES.${NJS_DISTFILE}= -${MASTER_SITE_GITHUB:=nginx/njs/archive/}${NJS_VERSION}.tar.gz
DISTFILES+= ${NJS_DISTFILE}
DSO_EXTMODS+= njs
NJS_SUBDIR= /nginx
PLIST.njs= yes
+. if !empty(PKG_OPTIONS:Mnjs-xml)
+.include "../../textproc/libxslt/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+. else
+NJS_CONFIGURE_ARGS= --no-libxml2
+CONFIGURE_ENV+= NJS_LIBXSLT=NO
+. endif
.endif
.if !empty(PKG_OPTIONS:Mupload) || make(makesum) || make(mdi) || make(distclean)
Index: pkgsrc/www/nginx-devel/Makefile
diff -u pkgsrc/www/nginx-devel/Makefile:1.110 pkgsrc/www/nginx-devel/Makefile:1.111
--- pkgsrc/www/nginx-devel/Makefile:1.110 Thu Jul 6 09:42:18 2023
+++ pkgsrc/www/nginx-devel/Makefile Thu Jul 20 15:02:52 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.110 2023/07/06 09:42:18 wiz Exp $
+# $NetBSD: Makefile,v 1.111 2023/07/20 15:02:52 osa Exp $
DISTNAME= nginx-1.25.1
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.97 pkgsrc/www/nginx-devel/distinfo:1.98
--- pkgsrc/www/nginx-devel/distinfo:1.97 Tue Jun 13 19:05:32 2023
+++ pkgsrc/www/nginx-devel/distinfo Thu Jul 20 15:02:52 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.97 2023/06/13 19:05:32 osa Exp $
+$NetBSD: distinfo,v 1.98 2023/07/20 15:02:52 osa Exp $
BLAKE2s (array-var-nginx-module-0.06.tar.gz) = fa6ad2a2ce3c3eba3f69287b224e9c01fcaca29a083394ab74f2f655d3e2138b
SHA512 (array-var-nginx-module-0.06.tar.gz) = bc72158856a1be18a26ee04c6b5b0f0a20bcce688610a493bf31e2a133e7eb12e11f7c18197a09a72b1513f6a08348ee5281b9d5b84cf43603539040ebd23c26
@@ -45,9 +45,9 @@ Size (ngx_devel_kit-0.3.2.tar.gz) = 6655
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.7.12.tar.gz) = a4c69c83bcc81ecd593f63f6d3e2d5d9cff8185ad56e8fd4846660c132976133
-SHA512 (njs-0.7.12.tar.gz) = a65a6c6aa3fbd499536284f8d8610f61b87112156885e6c3b1f73872df22195af897766f266b4569098a70e1680aef66594da17d13519f16687b4e43dce49062
-Size (njs-0.7.12.tar.gz) = 662554 bytes
+BLAKE2s (njs-0.8.0.tar.gz) = a65bfea36473c5e43abfb51c6e4a92573af7a8e89c56ad9cd8534d14a83c1849
+SHA512 (njs-0.8.0.tar.gz) = 5e5fd3b0aba9d1a0b47207081e59d577cbd3db41e141cfa529526a778bbcd4fec1cd4dacaa1dc63ee07868ccf35f4d4cc465abff831bb03d128b0b1f1b04bb28
+Size (njs-0.8.0.tar.gz) = 715391 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.23 pkgsrc/www/nginx-devel/options.mk:1.24
--- pkgsrc/www/nginx-devel/options.mk:1.23 Tue May 23 20:26:22 2023
+++ pkgsrc/www/nginx-devel/options.mk Thu Jul 20 15:02:52 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.23 2023/05/23 20:26:22 osa Exp $
+# $NetBSD: options.mk,v 1.24 2023/07/20 15:02:52 osa Exp $
CODELOAD_SITE_GITHUB= https://codeload.github.com/
@@ -7,7 +7,7 @@ PKG_SUPPORTED_OPTIONS= array-var auth-re
PKG_SUPPORTED_OPTIONS+= dso echo encrypted-session flv form-input
PKG_SUPPORTED_OPTIONS+= geoip geoip2 gssapi gtools gzip headers-more http2
PKG_SUPPORTED_OPTIONS+= http3 image-filter luajit mail-proxy memcache
-PKG_SUPPORTED_OPTIONS+= naxsi njs perl push realip redis rtmp
+PKG_SUPPORTED_OPTIONS+= naxsi njs njs-xml perl push realip redis rtmp
PKG_SUPPORTED_OPTIONS+= secure-link set-misc slice ssl status
PKG_SUPPORTED_OPTIONS+= stream-ssl-preread sts sub upload uwsgi vts
@@ -322,15 +322,21 @@ PLIST.rtmp= yes
.endif
.if !empty(PKG_OPTIONS:Mnjs) || make(makesum) || make(mdi) || make(distclean)
-NJS_VERSION= 0.7.12
+NJS_VERSION= 0.8.0
NJS_DISTNAME= njs-${NJS_VERSION}
NJS_DISTFILE= ${NJS_DISTNAME}.tar.gz
-NJS_CONFIGURE_ARGS= --no-libxml2
SITES.${NJS_DISTFILE}= -${MASTER_SITE_GITHUB:=nginx/njs/archive/}${NJS_VERSION}.tar.gz
DISTFILES+= ${NJS_DISTFILE}
DSO_EXTMODS+= njs
NJS_SUBDIR= /nginx
PLIST.njs= yes
+. if !empty(PKG_OPTIONS:Mnjs-xml)
+.include "../../textproc/libxslt/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+. else
+NJS_CONFIGURE_ARGS= --no-libxml2
+CONFIGURE_ENV+= NJS_LIBXSLT=NO
+. endif
.endif
.if !empty(PKG_OPTIONS:Mupload) || make(makesum) || make(mdi) || make(distclean)
Index: pkgsrc/www/unit/Makefile
diff -u pkgsrc/www/unit/Makefile:1.10 pkgsrc/www/unit/Makefile:1.11
--- pkgsrc/www/unit/Makefile:1.10 Wed May 17 17:39:43 2023
+++ pkgsrc/www/unit/Makefile Thu Jul 20 15:02:52 2023
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2023/05/17 17:39:43 osa Exp $
+# $NetBSD: Makefile,v 1.11 2023/07/20 15:02:52 osa Exp $
.include "../../www/unit/version.mk"
DISTNAME= unit-${UNIT_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= Dynamic web application server
Index: pkgsrc/www/unit/distinfo
diff -u pkgsrc/www/unit/distinfo:1.15 pkgsrc/www/unit/distinfo:1.16
--- pkgsrc/www/unit/distinfo:1.15 Mon May 15 22:24:38 2023
+++ pkgsrc/www/unit/distinfo Thu Jul 20 15:02:52 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2023/05/15 22:24:38 osa Exp $
+$NetBSD: distinfo,v 1.16 2023/07/20 15:02:52 osa Exp $
BLAKE2s (unit-1.30.0.tar.gz) = f7e52b90480d529ef304cc659b123819270d24c74e5c9085a61d71b59c409e35
SHA512 (unit-1.30.0.tar.gz) = cee27016c5445eb44d144a491c6ec36445e45492c09775ec62613dd260e36a9a2d387088e3ae814082d1782dbcefca105e884ebd21dea94288a03062c945139d
@@ -6,6 +6,7 @@ Size (unit-1.30.0.tar.gz) = 894843 bytes
SHA1 (patch-auto_events) = 0556b5d3db6b88d23d686d9da1f3274187079973
SHA1 (patch-auto_os_conf) = 6d1cd7aef662a60d4288014eb6fadbe8c1268e55
SHA1 (patch-auto_shmem) = cb37c368c19205c2cc1750f4a847af23be8bfa25
+SHA1 (patch-src_nxt__js.c) = 8267786453ade749b09b9d1c5cb25abd424dd703
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/devel/libnjs/patches/patch-src_njs.pc.in
diff -u /dev/null pkgsrc/devel/libnjs/patches/patch-src_njs.pc.in:1.1
--- /dev/null Thu Jul 20 15:02:52 2023
+++ pkgsrc/devel/libnjs/patches/patch-src_njs.pc.in Thu Jul 20 15:02:51 2023
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_njs.pc.in,v 1.1 2023/07/20 15:02:51 osa Exp $
+
+Fix NJS' pkg-config file.
+
+--- src/njs.pc.in.orig 2023-07-11 23:13:20 UTC
++++ src/njs.pc.in
+@@ -1,8 +1,8 @@
+ prefix=@PREFIX@
+-libdir=@LIBDIR@
++libdir=${prefix}/lib
+
+ Name: njs
+ Description: library to embed njs scripting language
+ Version: @VERSION@
+ Libs: -L${libdir} -lnjs @EXTRA_LIBS@
+-Cflags: @CFLAGS@
++Cflags: -I${prefix}/include
Index: pkgsrc/www/unit/patches/patch-src_nxt__js.c
diff -u /dev/null pkgsrc/www/unit/patches/patch-src_nxt__js.c:1.1
--- /dev/null Thu Jul 20 15:02:52 2023
+++ pkgsrc/www/unit/patches/patch-src_nxt__js.c Thu Jul 20 15:02:52 2023
@@ -0,0 +1,77 @@
+$NetBSD: patch-src_nxt__js.c,v 1.1 2023/07/20 15:02:52 osa Exp $
+
+Fix compatibility, obtained from the upstream
+
+--- src/nxt_js.c.orig 2023-05-10 12:22:28.000000000 -0400
++++ src/nxt_js.c
+@@ -386,11 +386,11 @@
+ nxt_js_t *js, nxt_str_t *str, void *ctx)
+ {
+ njs_vm_t *vm;
+- njs_int_t rc, ret;
++ njs_int_t ret;
+ njs_str_t res;
+- njs_value_t *array, *value;
++ njs_value_t *value;
+ njs_function_t *func;
+- njs_opaque_value_t opaque_value, arguments[6];
++ njs_opaque_value_t retval, opaque_value, arguments[6];
+
+ static const njs_str_t uri_str = njs_str("uri");
+ static const njs_str_t host_str = njs_str("host");
+@@ -407,15 +407,12 @@
+ return NXT_ERROR;
+ }
+
+- ret = njs_vm_start(vm);
++
++ cache->vm = vm;
++ ret = njs_vm_start(vm, &cache->array);
+ if (ret != NJS_OK) {
+ return NXT_ERROR;
+ }
+-
+- array = njs_vm_retval(vm);
+-
+- cache->vm = vm;
+- cache->array = *array;
+ }
+
+ value = njs_vm_array_prop(vm, &cache->array, js->index, &opaque_value);
+@@ -463,18 +460,20 @@
+ return NXT_ERROR;
+ }
+
+- ret = njs_vm_call(vm, func, njs_value_arg(&arguments), 6);
+-
+- rc = njs_vm_retval_string(vm, &res);
+- if (rc != NJS_OK) {
+- return NXT_ERROR;
+- }
++ ret = njs_vm_invoke(vm, func, njs_value_arg(&arguments), 6,
++ njs_value_arg(&retval));
+
+ if (ret != NJS_OK) {
+- nxt_alert(task, "js exception: %V", &res);
++ ret = njs_vm_exception_string(vm, &res);
++ if (ret == NJS_OK) {
++ nxt_alert(task, "js exception: %V", &res);
++ }
++
+ return NXT_ERROR;
+ }
+
++ ret = njs_vm_value_string(vm, &res, njs_value_arg(&retval));
++
+ str->length = res.length;
+ str->start = res.start;
+
+@@ -498,7 +497,7 @@
+ njs_str_t res;
+ nxt_str_t err;
+
+- ret = njs_vm_retval_string(vm, &res);
++ ret = njs_vm_exception_string(vm, &res);
+ if (nxt_slow_path(ret != NJS_OK)) {
+ return NXT_ERROR;
+ }
Home |
Main Index |
Thread Index |
Old Index