diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/nginx-devel/Makefile | 5 | ||||
| -rw-r--r-- | www/nginx-devel/Makefile.extmod | 6 | ||||
| -rw-r--r-- | www/nginx-devel/distinfo | 6 | ||||
| -rw-r--r-- | www/unit/Makefile | 1 | ||||
| -rw-r--r-- | www/unit/files/patch-src_nxt__js.c | 72 |
5 files changed, 82 insertions, 8 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 0d66c490df2f..fe72cee17917 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME?= nginx PORTVERSION= 1.25.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa @@ -249,7 +249,8 @@ CONFIGURE_ARGS+= --with-ld-opt="-L ${LOCALBASE}/lib -lpcre" LIB_DEPENDS+= libpcre.so:devel/pcre .endif -.if empty(PORT_OPTIONS:MNJS_XML) +.if ${PORT_OPTIONS:MNJS} && empty(PORT_OPTIONS:MNJS_XML) +CONFIGURE_ENV+= NJS_LIBXSLT=NO NJS_CONFIGURE_ARGS= --no-libxml2 .endif diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod index ee1d035eb47f..6ef47d920908 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -236,12 +236,12 @@ 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.12:njs +NJS_GH_TUPLE= nginx:njs:0.8.0:njs NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx -NJS_USES= libedit NJS_XML_IMPLIES= NJS -NJS_XML_LIB_DEPENDS= libxml2.so:textproc/libxml2 +NJS_XML_LIB_DEPENDS= libxml2.so:textproc/libxml2 \ + libxslt.so:textproc/libxslt OPENTRACING_GH_TUPLE= opentracing-contrib:nginx-opentracing:v0.24.0:opentracing OPENTRACING_LIB_DEPENDS= libopentracing.so:devel/libopentracing diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo index 88e2a46c53e7..a265baf0a3ae 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1688165378 +TIMESTAMP = 1689101193 SHA256 (nginx-1.25.1.tar.gz) = f09071ac46e0ea3adc0008ef0baca229fc6b4be4533baef9bbbfba7de29a8602 SIZE (nginx-1.25.1.tar.gz) = 1213919 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae @@ -105,8 +105,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.12_GH0.tar.gz) = 7a75a39022dfb58dbf461053903a07cc48dd4942f7d82a46601819c1b0077687 -SIZE (nginx-njs-0.7.12_GH0.tar.gz) = 662554 +SHA256 (nginx-njs-0.8.0_GH0.tar.gz) = b98033fff6aadcbb8e108b96e80c0d94c6e2103bcbe75846b5ae0b560696084b +SIZE (nginx-njs-0.8.0_GH0.tar.gz) = 715391 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 diff --git a/www/unit/Makefile b/www/unit/Makefile index 018e336e7b0f..d283d5a06a57 100644 --- a/www/unit/Makefile +++ b/www/unit/Makefile @@ -1,5 +1,6 @@ PORTNAME= unit PORTVERSION= ${UNIT_VERSION} +PORTREVISION= 1 CATEGORIES= www MASTER_SITES?= https://unit.nginx.org/download/ diff --git a/www/unit/files/patch-src_nxt__js.c b/www/unit/files/patch-src_nxt__js.c new file mode 100644 index 000000000000..bd7ba596126d --- /dev/null +++ b/www/unit/files/patch-src_nxt__js.c @@ -0,0 +1,72 @@ +--- src/nxt_js.c.orig 2023-05-10 16:22:28 UTC ++++ src/nxt_js.c +@@ -386,11 +386,11 @@ nxt_js_call(nxt_task_t *task, nxt_js_conf_t *jcf, nxt_ + 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,13 @@ nxt_js_call(nxt_task_t *task, nxt_js_conf_t *jcf, nxt_ + return NXT_ERROR; + } + +- ret = njs_vm_start(vm); ++ ret = njs_vm_start(vm, njs_value_arg(&retval)); + if (ret != NJS_OK) { + return NXT_ERROR; + } + +- array = njs_vm_retval(vm); +- + cache->vm = vm; +- cache->array = *array; ++ cache->array = *njs_value_arg(&retval); + } + + value = njs_vm_array_prop(vm, &cache->array, js->index, &opaque_value); +@@ -463,18 +461,20 @@ nxt_js_call(nxt_task_t *task, nxt_js_conf_t *jcf, nxt_ + return NXT_ERROR; + } + +- ret = njs_vm_call(vm, func, njs_value_arg(&arguments), 6); ++ ret = njs_vm_invoke(vm, func, njs_value_arg(&arguments), 6, ++ njs_value_arg(&retval)); + +- rc = njs_vm_retval_string(vm, &res); +- if (rc != NJS_OK) { +- return NXT_ERROR; +- } +- + 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 +498,7 @@ nxt_js_error(njs_vm_t *vm, u_char *error) + 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; + } |