diff options
Diffstat (limited to 'www/nginx-devel')
| -rw-r--r-- | www/nginx-devel/Makefile | 5 | ||||
| -rw-r--r-- | www/nginx-devel/Makefile.extmod | 5 | ||||
| -rw-r--r-- | www/nginx-devel/distinfo | 6 | ||||
| -rw-r--r-- | www/nginx-devel/files/extra-patch-njs-auto-quickjs | 12 | ||||
| -rw-r--r-- | www/nginx-devel/files/extra-patch-njs-nginx-config | 13 |
5 files changed, 28 insertions, 13 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index be6d68b28917..77e8965f5092 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME?= nginx PORTVERSION= 1.27.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa @@ -313,7 +313,8 @@ post-patch-ICONV-on: @${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_iconv}/config post-patch-NJS_QJS-on: - @${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_njs}/auto/quickjs + @${REINPLACE_CMD} 's!%%LOCALBASE%%!${LOCALBASE}!g' ${WRKSRC_njs}/auto/quickjs \ + ${WRKSRC_njs}/nginx/config post-patch-PASSENGER-on: @${REINPLACE_CMD} \ diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod index 9c9768512993..6940f5892a51 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -241,13 +241,14 @@ 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.7:njs +NJS_GH_TUPLE= nginx:njs:0.8.8:njs NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx NJS_IMPLIES= STREAM NJS_QJS_IMPLIES= HTTP NJS NJS_QJS_LIB_DEPENDS= libquickjs.so:lang/quickjs -NJS_QJS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-njs-auto-quickjs +NJS_QJS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-njs-auto-quickjs \ + ${PATCHDIR}/extra-patch-njs-nginx-config NJS_XML_IMPLIES= HTTP NJS NJS_XML_LIB_DEPENDS= libxml2.so:textproc/libxml2 \ diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo index 75f862d34b20..679d3b03998d 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1733174774 +TIMESTAMP = 1734365634 SHA256 (nginx-1.27.3.tar.gz) = ba23a9568f442036b61cd0e29bd66a47b90634efa91e0b2cf2d719057a9b7903 SIZE (nginx-1.27.3.tar.gz) = 1271526 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae @@ -105,8 +105,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.7_GH0.tar.gz) = e959b01637d6684387347cc6dea073949467193d273f58062129e52b110aefa2 -SIZE (nginx-njs-0.8.7_GH0.tar.gz) = 880217 +SHA256 (nginx-njs-0.8.8_GH0.tar.gz) = 356386c8133590a4d1d3a529694821d4d1a00b6f7575eeb454a698bec823477b +SIZE (nginx-njs-0.8.8_GH0.tar.gz) = 887735 SHA256 (osokin-nginx-otel-b185501_GH0.tar.gz) = 6cb1297d99393daa3b14f1371ca40fa5593edb7e8f2f6efd9e58c4fdba0076c6 SIZE (osokin-nginx-otel-b185501_GH0.tar.gz) = 30307 SHA256 (konstruxi-ngx_postgres-8aa7359_GH0.tar.gz) = c69ad4495de7c7883ebc23e1e6c4cc83a4ac6a7fddd4d5c12e49d33b65f7c50b diff --git a/www/nginx-devel/files/extra-patch-njs-auto-quickjs b/www/nginx-devel/files/extra-patch-njs-auto-quickjs index 13bd88446cce..6fe199bd9e73 100644 --- a/www/nginx-devel/files/extra-patch-njs-auto-quickjs +++ b/www/nginx-devel/files/extra-patch-njs-auto-quickjs @@ -1,15 +1,15 @@ ---- ../njs-0.8.7/auto/quickjs.orig 2024-06-25 13:40:20.000000000 -0400 -+++ ../njs-0.8.7/auto/quickjs 2024-07-08 14:45:08.895107000 -0400 -@@ -47,9 +46,9 @@ +--- ../njs-0.8.8/auto/quickjs.orig 2024-12-15 17:49:15 UTC ++++ ../njs-0.8.8/auto/quickjs +@@ -46,9 +46,9 @@ if [ $NJS_TRY_QUICKJS = YES ]; then fi if [ $njs_found = no ]; then - njs_feature="QuickJS library -I/usr/include/quickjs/ -L/usr/lib/quickjs/ -lquickjs" - njs_feature_incs="/usr/include/quickjs/" - njs_feature_libs="-L/usr/lib/quickjs/ -lquickjs -lm -ldl -lpthread" -+ njs_feature="QuickJS library -I%%PREFIX%%/include/quickjs/ -L%%PREFIX%%/lib/quickjs/ -lquickjs" -+ njs_feature_incs="%%PREFIX%%/include/quickjs/" -+ njs_feature_libs="-L%%PREFIX%%/lib -lquickjs -lm -ldl -lpthread" ++ njs_feature="QuickJS library -I%%LOCALBASE%%/include/quickjs/ -L%%LOCALBASE%%/lib/ -lquickjs" ++ njs_feature_incs="%%LOCALBASE%%/include/quickjs/" ++ njs_feature_libs="-L%%LOCALBASE%%/lib/ -lquickjs -lm -ldl -lpthread" . auto/feature fi diff --git a/www/nginx-devel/files/extra-patch-njs-nginx-config b/www/nginx-devel/files/extra-patch-njs-nginx-config new file mode 100644 index 000000000000..e9a340ab733f --- /dev/null +++ b/www/nginx-devel/files/extra-patch-njs-nginx-config @@ -0,0 +1,13 @@ +--- ../njs-0.8.8/nginx/config.orig 2024-12-16 11:16:44.892658000 -0500 ++++ ../njs-0.8.8/nginx/config 2024-12-16 11:19:57.566877000 -0500 +@@ -60,8 +60,8 @@ + fi + + if [ $ngx_found = no ]; then +- ngx_feature="QuickJS library -I/usr/include/quickjs/ -L/usr/lib/quickjs/ -lquickjs" +- ngx_feature_libs="-L/usr/lib/quickjs/ -lquickjs -lm -ldl -lpthread" ++ ngx_feature="QuickJS library -I%%LOCALBASE%%/include/quickjs/ -L%%LOCALBASE%%/lib/ -lquickjs" ++ ngx_feature_libs="-L%%LOCALBASE%%/lib/ -lquickjs -lm -ldl -lpthread" + + . auto/feature + fi |