git: e58c8dfe018a - main - www/nginx-devel: update third-party modules...
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 04 Feb 2025 21:40:00 UTC
The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=e58c8dfe018a3bc2027b7b45843ca3ef42959861 commit e58c8dfe018a3bc2027b7b45843ca3ef42959861 Author: Sergey A. Osokin <osa@FreeBSD.org> AuthorDate: 2025-02-04 21:36:54 +0000 Commit: Sergey A. Osokin <osa@FreeBSD.org> CommitDate: 2025-02-04 21:39:46 +0000 www/nginx-devel: update third-party modules... to their recent snapshots or versions: o) push-stream o) http_substitutions_filter o) upload o) upload-progress o) upstream_check o) mod_zip o) naxsi o) rds-csv o) rds-json o) redis2 o) rtmp o) set-misc o) sflow o) srcache o) vts o) xss Bump PORTREVISION. --- www/nginx-devel/Makefile | 2 +- www/nginx-devel/Makefile.extmod | 36 +++++------ www/nginx-devel/distinfo | 70 ++++++++++----------- .../files/extra-patch-naxsi-libinjection__sqli_c | 6 +- www/nginx-devel/files/extra-patch-naxsi_config | 4 +- .../files/extra-patch-ngx_http_sflow_config.c | 4 +- .../files/extra-patch-ngx_http_sflow_config.h | 4 +- .../files/extra-patch-ngx_http_sflow_module.c | 21 +++---- .../extra-patch-ngx_http_uploadprogress_module.c | 73 ---------------------- .../files/extra-patch-rds-csv-nginx-module-config | 4 +- .../files/extra-patch-rds-json-nginx-module-config | 15 ----- .../files/extra-patch-xss-nginx-module-config | 4 +- 12 files changed, 75 insertions(+), 168 deletions(-) diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 54607d91aae0..9a8acd20a41b 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME?= nginx PORTVERSION= 1.27.3 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod index 66614230777b..cdbf588f2bca 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -140,7 +140,7 @@ HTTP_NOTICE_VARS= DSO_EXTMODS+=notice HTTP_PUSH_GH_TUPLE= slact:nchan:v1.3.7:push HTTP_PUSH_VARS= DSO_EXTMODS+=push -HTTP_PUSH_STREAM_GH_TUPLE= wandenberg:nginx-push-stream-module:8c02220:pushstream +HTTP_PUSH_STREAM_GH_TUPLE= wandenberg:nginx-push-stream-module:0.6.0:pushstream HTTP_PUSH_STREAM_VARS= DSO_EXTMODS+=pushstream HTTP_REDIS_MASTER_SITES= LOCAL/osa:redis @@ -150,7 +150,7 @@ HTTP_REDIS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_redis_module.c HTTP_SLICE_AHEAD_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_http_modules_ngx_http_slice_read_ahead.c -HTTP_SUBS_FILTER_GH_TUPLE= yaoweibin:ngx_http_substitutions_filter_module:c6f825f:subs_filter +HTTP_SUBS_FILTER_GH_TUPLE= yaoweibin:ngx_http_substitutions_filter_module:e12e965:subs_filter HTTP_SUBS_FILTER_VARS= DSO_EXTMODS+=subs_filter HTTP_TARANTOOL_LIB_DEPENDS= libmsgpuck.so:devel/msgpuck \ @@ -159,14 +159,13 @@ HTTP_TARANTOOL_GH_TUPLE= tarantool:nginx_upstream_module:aeb8696:nginx_tarantool HTTP_TARANTOOL_VARS= DSO_EXTMODS+=nginx_tarantool HTTP_TARANTOOL_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_tarantool-config -HTTP_UPLOAD_GH_TUPLE= fdintino:nginx-upload-module:643b4c1:upload +HTTP_UPLOAD_GH_TUPLE= fdintino:nginx-upload-module:96e6460:upload HTTP_UPLOAD_VARS= DSO_EXTMODS+=upload -HTTP_UPLOAD_PROGRESS_GH_TUPLE= masterzen:nginx-upload-progress-module:68b3ab3:uploadprogress +HTTP_UPLOAD_PROGRESS_GH_TUPLE= masterzen:nginx-upload-progress-module:v0.9.3:uploadprogress HTTP_UPLOAD_PROGRESS_VARS= DSO_EXTMODS+=uploadprogress -HTTP_UPLOAD_PROGRESS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_uploadprogress_module.c -HTTP_UPSTREAM_CHECK_GH_TUPLE= yaoweibin:nginx_upstream_check_module:9aecf15:upstreamcheck +HTTP_UPSTREAM_CHECK_GH_TUPLE= yaoweibin:nginx_upstream_check_module:87bfa66:upstreamcheck HTTP_UPSTREAM_CHECK_CONFIGURE_ON= --add-module=${WRKSRC_upstreamcheck} HTTP_UPSTREAM_CHECK_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-http-modules-ngx_http_upstream_hash_module.c \ ${PATCHDIR}/extra-patch-src-http-modules-ngx_http_upstream_ip_hash_module.c \ @@ -190,7 +189,7 @@ HTTP_VIDEO_THUMBEXTRACTOR_GH_TUPLE= wandenberg:nginx-video-thumbextractor-module HTTP_VIDEO_THUMBEXTRACTOR_VARS= DSO_EXTMODS+=vte HTTP_VIDEO_THUMBEXTRACTOR_EXTRA_PATCHES=${PATCHDIR}/extra-patch-nginx-thumbextractor-module-config -HTTP_ZIP_GH_TUPLE= vince2678:mod_zip:5b2604b:mod_zip +HTTP_ZIP_GH_TUPLE= vince2678:mod_zip:39dc908:mod_zip HTTP_ZIP_VARS= DSO_EXTMODS+=mod_zip ICONV_IMPLIES= DEVEL_KIT @@ -232,9 +231,9 @@ MODSECURITY3_LIB_DEPENDS= libmodsecurity.so:security/modsecurity3 MODSECURITY3_GH_TUPLE= owasp-modsecurity:ModSecurity-nginx:fb678c5:modsecurity3 MODSECURITY3_VARS= DSO_EXTMODS+=modsecurity3 -NAXSI_NGINX_VER= 1.6 +NAXSI_NGINX_VER= 1.7 NAXSI_GH_TUPLE= wargio:naxsi:${NAXSI_NGINX_VER}:naxsi \ - libinjection:libinjection:4aa3894:libinjection + libinjection:libinjection:b9fcaaf:libinjection NAXSI_VARS= DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_src NAXSI_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-naxsi-libinjection__sqli_c \ ${PATCHDIR}/extra-patch-naxsi_config @@ -278,25 +277,24 @@ POSTGRES_GH_TUPLE= konstruxi:ngx_postgres:8aa7359:postgres POSTGRES_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_postgres-config POSTGRES_VARS= DSO_EXTMODS+=postgres -RDS_CSV_GH_TUPLE= openresty:rds-csv-nginx-module:v0.09:rdscsv +RDS_CSV_GH_TUPLE= openresty:rds-csv-nginx-module:6a90686:rdscsv RDS_CSV_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-rds-csv-nginx-module-config RDS_CSV_VARS= DSO_EXTMODS+=rdscsv -RDS_JSON_GH_TUPLE= openresty:rds-json-nginx-module:v0.15:rdsjson -RDS_JSON_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-rds-json-nginx-module-config +RDS_JSON_GH_TUPLE= openresty:rds-json-nginx-module:e6517b9:rdsjson RDS_JSON_VARS= DSO_EXTMODS+=rdsjson -REDIS2_GH_TUPLE= openresty:redis2-nginx-module:v0.15:redis2 +REDIS2_GH_TUPLE= openresty:redis2-nginx-module:454c223:redis2 REDIS2_VARS= DSO_EXTMODS+=redis2 -RTMP_GH_TUPLE= arut:nginx-rtmp-module:v1.2.2:rtmp +RTMP_GH_TUPLE= arut:nginx-rtmp-module:6c7719d:rtmp RTMP_VARS= DSO_EXTMODS+=rtmp SET_MISC_IMPLIES= DEVEL_KIT -SET_MISC_GH_TUPLE= openresty:set-misc-nginx-module:3937e7b:setmisc +SET_MISC_GH_TUPLE= openresty:set-misc-nginx-module:eb223c9:setmisc SET_MISC_VARS= DSO_EXTMODS+=setmisc -SFLOW_GH_TUPLE= sflow:nginx-sflow-module:543c72a:sflow +SFLOW_GH_TUPLE= sflow:nginx-sflow-module:f15c87f:sflow SFLOW_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_sflow_config.c \ ${PATCHDIR}/extra-patch-ngx_http_sflow_config.h \ ${PATCHDIR}/extra-patch-ngx_http_sflow_module.c @@ -307,7 +305,7 @@ SHIBBOLETH_VARS= DSO_EXTMODS+=shibboleth SLOWFS_CACHE_GH_TUPLE= baysao:ngx_slowfs_cache:d011a18:slowfs_cache SLOWFS_CACHE_VARS= DSO_EXTMODS+=slowfs_cache -SRCACHE_GH_TUPLE= openresty:srcache-nginx-module:be22ac0:srcache +SRCACHE_GH_TUPLE= openresty:srcache-nginx-module:bcdcfdc:srcache SRCACHE_VARS= DSO_EXTMODS+=srcache STS_IMPLIES= STREAM @@ -320,10 +318,10 @@ VOD_LIB_DEPENDS= libxml2.so:textproc/libxml2 \ VOD_USES= iconv VOD_VARS= DSO_EXTMODS+=vod -VTS_GH_TUPLE= vozlt:nginx-module-vts:a18c3f6:vts +VTS_GH_TUPLE= vozlt:nginx-module-vts:b6f6528:vts VTS_VARS= DSO_EXTMODS+=vts -XSS_GH_TUPLE= openresty:xss-nginx-module:v0.06:xss +XSS_GH_TUPLE= openresty:xss-nginx-module:de2d87a:xss XSS_VARS= DSO_EXTMODS+=xss XSS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-xss-nginx-module-config diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo index 1aafb21ce99e..f9c75fa26fd7 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1738694428 +TIMESTAMP = 1738702510 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 @@ -67,26 +67,26 @@ SHA256 (kr-nginx-notice-3c95966_GH0.tar.gz) = e829fc94178cc8c91fef15a1fc44ee7ac1 SIZE (kr-nginx-notice-3c95966_GH0.tar.gz) = 3343 SHA256 (slact-nchan-v1.3.7_GH0.tar.gz) = 6e82c673cedc7d33ee48ea1c198964fdcf6853bf851de797002199a496f08263 SIZE (slact-nchan-v1.3.7_GH0.tar.gz) = 665133 -SHA256 (wandenberg-nginx-push-stream-module-8c02220_GH0.tar.gz) = ab4fbe236e8bc500f0c5e13403d6a0e2e4e4ec17b81e0fcedaf669b4339626a6 -SIZE (wandenberg-nginx-push-stream-module-8c02220_GH0.tar.gz) = 196720 -SHA256 (yaoweibin-ngx_http_substitutions_filter_module-c6f825f_GH0.tar.gz) = 4ab034f2e056148469b440394e1664c46405712ef27bc4f3197e42bf7df8460e -SIZE (yaoweibin-ngx_http_substitutions_filter_module-c6f825f_GH0.tar.gz) = 94062 +SHA256 (wandenberg-nginx-push-stream-module-0.6.0_GH0.tar.gz) = 84f6ad280c5eaf34e145bae3b835ef826b6e4aa490a94fed7350c8093be67d61 +SIZE (wandenberg-nginx-push-stream-module-0.6.0_GH0.tar.gz) = 210766 +SHA256 (yaoweibin-ngx_http_substitutions_filter_module-e12e965_GH0.tar.gz) = 40f9d43fdb39f4a8c60697e366469a42e229b12f1993376f33431e700bd9a50f +SIZE (yaoweibin-ngx_http_substitutions_filter_module-e12e965_GH0.tar.gz) = 94055 SHA256 (tarantool-nginx_upstream_module-aeb8696_GH0.tar.gz) = 514aa57155c73c2e3f7bdfe00c580183df343f2fa4b34e77f040cf6557caffae SIZE (tarantool-nginx_upstream_module-aeb8696_GH0.tar.gz) = 75708 -SHA256 (fdintino-nginx-upload-module-643b4c1_GH0.tar.gz) = a5bb48589b5c242683da33a9f1acc7847acc3ce4f2c4213ea524858aa789a6e9 -SIZE (fdintino-nginx-upload-module-643b4c1_GH0.tar.gz) = 42571 -SHA256 (masterzen-nginx-upload-progress-module-68b3ab3_GH0.tar.gz) = 35b506e57e19e780e01ecc7c3c31a64473c35e4a022f5a3f98092a60cd1c1602 -SIZE (masterzen-nginx-upload-progress-module-68b3ab3_GH0.tar.gz) = 17322 -SHA256 (yaoweibin-nginx_upstream_check_module-9aecf15_GH0.tar.gz) = 4404c64e845e19feeb07a37976347987892a8e8680a961f793ff0d3ef96c07f4 -SIZE (yaoweibin-nginx_upstream_check_module-9aecf15_GH0.tar.gz) = 130039 +SHA256 (fdintino-nginx-upload-module-96e6460_GH0.tar.gz) = 7643e724edc3e3ffb70b1685312f4e2f405b9b6cc186621b947a640ead6fcc0d +SIZE (fdintino-nginx-upload-module-96e6460_GH0.tar.gz) = 42561 +SHA256 (masterzen-nginx-upload-progress-module-v0.9.3_GH0.tar.gz) = 7d810069f6f3e26f3b00989448fceb891a934c2a2f7eb55e0358b70291c23942 +SIZE (masterzen-nginx-upload-progress-module-v0.9.3_GH0.tar.gz) = 17303 +SHA256 (yaoweibin-nginx_upstream_check_module-87bfa66_GH0.tar.gz) = bffdae53677f703f99401d5d8924f3351832f1ade224e7e45c4e33e930316bb4 +SIZE (yaoweibin-nginx_upstream_check_module-87bfa66_GH0.tar.gz) = 130913 SHA256 (jaygooby-nginx-upstream-fair-10ecdcf_GH0.tar.gz) = 93f71b7cf0db9c6dbf97e3ee11cf8efbc149946c0949d7abd19c74c7620eea50 SIZE (jaygooby-nginx-upstream-fair-10ecdcf_GH0.tar.gz) = 10433 SHA256 (dvershinin-nginx-sticky-module-ng-2753211_GH0.tar.gz) = e4a533dfa214ea28122301aeebbb1a38e1d1972edb7ee9bc72271c14f2693005 SIZE (dvershinin-nginx-sticky-module-ng-2753211_GH0.tar.gz) = 120676 SHA256 (wandenberg-nginx-video-thumbextractor-module-e81f850_GH0.tar.gz) = 9113f887a8740fe72614ee32f481177d33e9542c3b0625627da19a1c4f3da2cb SIZE (wandenberg-nginx-video-thumbextractor-module-e81f850_GH0.tar.gz) = 2710072 -SHA256 (vince2678-mod_zip-5b2604b_GH0.tar.gz) = 4fe63be3b842882494152e586f0b87e73f51bfbfd801b78f033c71a011cba789 -SIZE (vince2678-mod_zip-5b2604b_GH0.tar.gz) = 29559 +SHA256 (vince2678-mod_zip-39dc908_GH0.tar.gz) = bc5c3d725268abbe1c5c38de5b18a4ad9dbe5821c4afeaccabd3eec38b272be4 +SIZE (vince2678-mod_zip-39dc908_GH0.tar.gz) = 30275 SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b8b9f355c05c0790226512f6732348a2404d48531688a1fc04ce6768163bf462 SIZE (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = 13133 SHA256 (baysao-nginx-let-module-c1f23aa_GH0.tar.gz) = 7393809d5d8877812da1bd5b5fbd1d8b00bc85e71f2f387c344f007773e49050 @@ -101,43 +101,43 @@ SHA256 (openresty-memc-nginx-module-v0.20_GH0.tar.gz) = a42dd56dd6e2144755a127bc SIZE (openresty-memc-nginx-module-v0.20_GH0.tar.gz) = 34736 SHA256 (owasp-modsecurity-ModSecurity-nginx-fb678c5_GH0.tar.gz) = ec7fa90e36ccb339ee38f5d273820d56b014d5e469239c0d11a7567bc7e5a4a8 SIZE (owasp-modsecurity-ModSecurity-nginx-fb678c5_GH0.tar.gz) = 52666 -SHA256 (wargio-naxsi-1.6_GH0.tar.gz) = e5920fdd09cae155b89eb21a94a21c029ebfdb056c284130221525be54044aae -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 (wargio-naxsi-1.7_GH0.tar.gz) = adee817da71913f64a9fb0fca142d9520bb0e5014b1acc797841cd8e31273f4d +SIZE (wargio-naxsi-1.7_GH0.tar.gz) = 1132392 +SHA256 (libinjection-libinjection-b9fcaaf_GH0.tar.gz) = 7812e1316b61a7a7d3a65a57a07c6d5235ac40fe35e6edda983f31a44661a38e +SIZE (libinjection-libinjection-b9fcaaf_GH0.tar.gz) = 2218207 SHA256 (nginx-njs-0.8.9_GH0.tar.gz) = 918accac7ec252baac1146e49fdc0f5c101c66ef3b9ceba7ce1b59be704acebf SIZE (nginx-njs-0.8.9_GH0.tar.gz) = 900847 SHA256 (osokin-nginx-otel-3a655df_GH0.tar.gz) = 71ee1561303c289d4562148f8719b60796c36abe16de1b3c10d10b8e6f03a952 SIZE (osokin-nginx-otel-3a655df_GH0.tar.gz) = 27169 SHA256 (konstruxi-ngx_postgres-8aa7359_GH0.tar.gz) = c69ad4495de7c7883ebc23e1e6c4cc83a4ac6a7fddd4d5c12e49d33b65f7c50b SIZE (konstruxi-ngx_postgres-8aa7359_GH0.tar.gz) = 48544 -SHA256 (openresty-rds-csv-nginx-module-v0.09_GH0.tar.gz) = 896be99c0cad50218417800a159e43ec088d6b58c099472ed3b3d7f179d6c0ea -SIZE (openresty-rds-csv-nginx-module-v0.09_GH0.tar.gz) = 20531 -SHA256 (openresty-rds-json-nginx-module-v0.15_GH0.tar.gz) = eaf18f60e981ea2442a7902689a26eba6cf6f36ebee712feeb1f4429eb654bdc -SIZE (openresty-rds-json-nginx-module-v0.15_GH0.tar.gz) = 34744 -SHA256 (openresty-redis2-nginx-module-v0.15_GH0.tar.gz) = d255571bcfb9939b78099df39cb4d42f174d789aec8c8e5e47b93942b0299438 -SIZE (openresty-redis2-nginx-module-v0.15_GH0.tar.gz) = 25471 -SHA256 (arut-nginx-rtmp-module-v1.2.2_GH0.tar.gz) = 07f19b7bffec5e357bb8820c63e5281debd45f5a2e6d46b1636d9202c3e09d78 -SIZE (arut-nginx-rtmp-module-v1.2.2_GH0.tar.gz) = 519934 -SHA256 (openresty-set-misc-nginx-module-3937e7b_GH0.tar.gz) = cb3a4675ab6b8741e5847cf5bc41ee3f6ec5cbceec53188f9ae96e48feea17c5 -SIZE (openresty-set-misc-nginx-module-3937e7b_GH0.tar.gz) = 29335 -SHA256 (sflow-nginx-sflow-module-543c72a_GH0.tar.gz) = 95efdb1f6cfd6c32c577707f693eb6795c6f21ae062842bf84fe762d8b842955 -SIZE (sflow-nginx-sflow-module-543c72a_GH0.tar.gz) = 29504 +SHA256 (openresty-rds-csv-nginx-module-6a90686_GH0.tar.gz) = 92068b96a9cf152e8f10db2b661a031adbb2a29db4b075773c2495846d4c926c +SIZE (openresty-rds-csv-nginx-module-6a90686_GH0.tar.gz) = 20631 +SHA256 (openresty-rds-json-nginx-module-e6517b9_GH0.tar.gz) = 93dc271ff64d9dcbd48e494b72ac7af7a169c58ce4d4a98d732fb71b07e6bf1c +SIZE (openresty-rds-json-nginx-module-e6517b9_GH0.tar.gz) = 35794 +SHA256 (openresty-redis2-nginx-module-454c223_GH0.tar.gz) = dd27c5c1766d67518c42f51c11ca2f74b2db8a71946f90b4fadf5d868fbede65 +SIZE (openresty-redis2-nginx-module-454c223_GH0.tar.gz) = 25731 +SHA256 (arut-nginx-rtmp-module-6c7719d_GH0.tar.gz) = af459cb16d276cf76a73adba55bc063330136090f7ce9279b851c35eea8c57da +SIZE (arut-nginx-rtmp-module-6c7719d_GH0.tar.gz) = 520109 +SHA256 (openresty-set-misc-nginx-module-eb223c9_GH0.tar.gz) = 1eeea5ea1df3531e5a1fafde1464b3bb688a7ef1451875017dc25f72c733244b +SIZE (openresty-set-misc-nginx-module-eb223c9_GH0.tar.gz) = 30088 +SHA256 (sflow-nginx-sflow-module-f15c87f_GH0.tar.gz) = 251de3a5b588a4721effe88f3dbc632706321b7cd1af5fae7aa4f38ca50d2637 +SIZE (sflow-nginx-sflow-module-f15c87f_GH0.tar.gz) = 29515 SHA256 (nginx-shib-nginx-http-shibboleth-629ae1f_GH0.tar.gz) = 79d3d8330c58254605e569bb34371c030122ad2f52e0191cbf06df3bc316952c SIZE (nginx-shib-nginx-http-shibboleth-629ae1f_GH0.tar.gz) = 23907 SHA256 (baysao-ngx_slowfs_cache-d011a18_GH0.tar.gz) = 6ae8abb01a2aff788e75ec68621cb0159148a6f73730a84b30b0bdbc6cdc1758 SIZE (baysao-ngx_slowfs_cache-d011a18_GH0.tar.gz) = 11186 -SHA256 (openresty-srcache-nginx-module-be22ac0_GH0.tar.gz) = 5753d1ffe87b5d6f5b7a0696667bb5ff1388738136fdee26ba55bc33f5796061 -SIZE (openresty-srcache-nginx-module-be22ac0_GH0.tar.gz) = 51029 +SHA256 (openresty-srcache-nginx-module-bcdcfdc_GH0.tar.gz) = fbe15bc0c2d52f778b04d4433e220f219bde0660d19c6acedf67aa194049b130 +SIZE (openresty-srcache-nginx-module-bcdcfdc_GH0.tar.gz) = 50848 SHA256 (vozlt-nginx-module-sts-3c10d42_GH0.tar.gz) = 748b67ceb82b3b843ae915bf7863fd08b7c2427c045e5ec540242d050f7b30d0 SIZE (vozlt-nginx-module-sts-3c10d42_GH0.tar.gz) = 352431 SHA256 (kaltura-nginx-vod-module-26f0687_GH0.tar.gz) = 7c098d4b1c0f0a3d694ece364fa190d5c88a920352e4c3e9377ae3b38904a08b SIZE (kaltura-nginx-vod-module-26f0687_GH0.tar.gz) = 475372 -SHA256 (vozlt-nginx-module-vts-a18c3f6_GH0.tar.gz) = 480d40fdf108b72a699746ae521565c40c66ab8de7e9abb541c502448fc92f8f -SIZE (vozlt-nginx-module-vts-a18c3f6_GH0.tar.gz) = 182366 +SHA256 (vozlt-nginx-module-vts-b6f6528_GH0.tar.gz) = 4ce293881889ae3543db64a7dbe3d263c3f01124addf64f8eb560d6c7bcbedff +SIZE (vozlt-nginx-module-vts-b6f6528_GH0.tar.gz) = 182368 SHA256 (tg123-websockify-nginx-module-c11bc9a_GH0.tar.gz) = aca454bffcee2476dc92682ebfb8c0378a271fda178be7e945d648419d220758 SIZE (tg123-websockify-nginx-module-c11bc9a_GH0.tar.gz) = 14646 -SHA256 (openresty-xss-nginx-module-v0.06_GH0.tar.gz) = 0b12bbc53a41f3e3d6df419c173b8c87434be3e6cd255a8193aa91345a2de6cf -SIZE (openresty-xss-nginx-module-v0.06_GH0.tar.gz) = 12448 +SHA256 (openresty-xss-nginx-module-de2d87a_GH0.tar.gz) = f830c9300d751046e2592c74d09f39ac4b4b4567078c96c24951de5554861b5e +SIZE (openresty-xss-nginx-module-de2d87a_GH0.tar.gz) = 12779 SHA256 (tokers-zstd-nginx-module-f4ba115_GH0.tar.gz) = 20045e8ac80e2cc9fd3659573153cb1f22d98a653a10fe939a4be0e90160826a SIZE (tokers-zstd-nginx-module-f4ba115_GH0.tar.gz) = 55848 diff --git a/www/nginx-devel/files/extra-patch-naxsi-libinjection__sqli_c b/www/nginx-devel/files/extra-patch-naxsi-libinjection__sqli_c index bdd074b620dd..44c5eecebb0b 100644 --- a/www/nginx-devel/files/extra-patch-naxsi-libinjection__sqli_c +++ b/www/nginx-devel/files/extra-patch-naxsi-libinjection__sqli_c @@ -1,6 +1,6 @@ ---- ../libinjection-4aa3894/src/libinjection_sqli.c.orig 2023-05-30 15:47:57.333208000 -0400 -+++ ../libinjection-4aa3894/src/libinjection_sqli.c 2023-05-30 15:49:52.273873000 -0400 -@@ -305,8 +303,8 @@ +--- ../libinjection-b9fcaaf/src/libinjection_sqli.c.orig 2025-02-04 16:00:34.056724000 -0500 ++++ ../libinjection-b9fcaaf/src/libinjection_sqli.c 2025-02-04 16:01:22.692905000 -0500 +@@ -305,8 +305,8 @@ static void st_assign(stoken_t * st, const char stype, size_t pos, size_t len, const char* value) { diff --git a/www/nginx-devel/files/extra-patch-naxsi_config b/www/nginx-devel/files/extra-patch-naxsi_config index 8fa8a4785527..5e3117af7986 100644 --- a/www/nginx-devel/files/extra-patch-naxsi_config +++ b/www/nginx-devel/files/extra-patch-naxsi_config @@ -1,5 +1,5 @@ ---- ../naxsi-1.6/naxsi_src/config.orig 2023-09-27 09:43:18.644606000 -0400 -+++ ../naxsi-1.6/naxsi_src/config 2023-09-27 09:44:37.585970000 -0400 +--- ../naxsi-1.7/naxsi_src/config.orig 2023-09-27 09:43:18.644606000 -0400 ++++ ../naxsi-1.7/naxsi_src/config 2023-09-27 09:44:37.585970000 -0400 @@ -24,11 +24,6 @@ " diff --git a/www/nginx-devel/files/extra-patch-ngx_http_sflow_config.c b/www/nginx-devel/files/extra-patch-ngx_http_sflow_config.c index 3e3eaa2260f5..85cbb181acc2 100644 --- a/www/nginx-devel/files/extra-patch-ngx_http_sflow_config.c +++ b/www/nginx-devel/files/extra-patch-ngx_http_sflow_config.c @@ -1,5 +1,5 @@ ---- ../nginx-sflow-module-543c72a/ngx_http_sflow_config.c.orig 2012-06-07 04:52:57.000000000 +0400 -+++ ../nginx-sflow-module-543c72a/ngx_http_sflow_config.c 2012-06-07 04:59:18.000000000 +0400 +--- ../nginx-sflow-module-f15c87f/ngx_http_sflow_config.c.orig 2012-06-07 04:52:57.000000000 +0400 ++++ ../nginx-sflow-module-f15c87f/ngx_http_sflow_config.c 2012-06-07 04:59:18.000000000 +0400 @@ -26,7 +26,6 @@ ngx_log_error(NGX_LOG_ERR, log, 0, "getaddrinfo() failed: %s", gai_strerror(err)); switch(err) { diff --git a/www/nginx-devel/files/extra-patch-ngx_http_sflow_config.h b/www/nginx-devel/files/extra-patch-ngx_http_sflow_config.h index 6b90d4eaaf14..958e63a77caa 100644 --- a/www/nginx-devel/files/extra-patch-ngx_http_sflow_config.h +++ b/www/nginx-devel/files/extra-patch-ngx_http_sflow_config.h @@ -1,5 +1,5 @@ ---- ../nginx-sflow-module-543c72a/ngx_http_sflow_config.h.orig 2012-07-31 21:36:49.000000000 +0400 -+++ ../nginx-sflow-module-543c72a/ngx_http_sflow_config.h 2012-07-31 21:37:20.000000000 +0400 +--- ../nginx-sflow-module-f15c87f/ngx_http_sflow_config.h.orig 2012-07-31 21:36:49.000000000 +0400 ++++ ../nginx-sflow-module-f15c87f/ngx_http_sflow_config.h 2012-07-31 21:37:20.000000000 +0400 @@ -17,7 +17,7 @@ -----------------___________________________------------------ */ diff --git a/www/nginx-devel/files/extra-patch-ngx_http_sflow_module.c b/www/nginx-devel/files/extra-patch-ngx_http_sflow_module.c index e6b4bad6e25f..aaf343139719 100644 --- a/www/nginx-devel/files/extra-patch-ngx_http_sflow_module.c +++ b/www/nginx-devel/files/extra-patch-ngx_http_sflow_module.c @@ -1,5 +1,5 @@ ---- ../nginx-sflow-module-543c72a/ngx_http_sflow_module.c.orig 2014-09-24 18:20:41.000000000 -0400 -+++ ../nginx-sflow-module-543c72a/ngx_http_sflow_module.c 2016-08-06 21:26:24.515559000 -0400 +--- ../nginx-sflow-module-f15c87f/ngx_http_sflow_module.c.orig 2017-10-16 17:39:14.000000000 -0400 ++++ ../nginx-sflow-module-f15c87f/ngx_http_sflow_module.c 2025-02-04 16:15:53.466117000 -0500 @@ -8,9 +8,6 @@ #include <ngx_http.h> #include <nginx.h> @@ -15,9 +15,9 @@ ngx_log_t *log; -#if (NGX_THREADS) -- ngx_mutex_t *mut; --#define SFWB_LOCK(_s) ngx_mutex_lock((_s)->mut) --#define SFWB_UNLOCK(_s) ngx_mutex_unlock((_s)->mut) +- ngx_thread_mutex_t *mut; +-#define SFWB_LOCK(_s) ngx_thread_mutex_lock((_s)->mut, (_s)->log) +-#define SFWB_UNLOCK(_s) ngx_thread_mutex_unlock((_s)->mut, (_s)->log) -#define SFWB_INC_CTR(_c) ngx_atomic_fetch_add(&(_c), 1) -#define SFWB_COUNTDOWN(_c) (ngx_atomic_fetch_add(&(_c), -1) == 1) -#else @@ -29,7 +29,7 @@ /* skip countdown is handled per-worker to reduce lock contention. * If all processes sample at 1:N it's the same as having only one -@@ -645,13 +634,8 @@ +@@ -645,10 +634,6 @@ { sm->random_seed = ((sm->random_seed * 32719) + 3) % 32749; ngx_atomic_t next_skip = (sm->random_seed % ((2 * sm->sampling_rate) - 1)) + 1; @@ -39,11 +39,8 @@ -#else sm->sflow_skip = next_skip; return next_skip; --#endif - } - - /*_________________---------------------------__________________ -@@ -864,13 +848,6 @@ + #endif +@@ -864,13 +849,6 @@ { ngx_log_debug0(NGX_LOG_DEBUG_HTTP, cf->log, 0, "sflow: sfwb_init()"); @@ -52,7 +49,7 @@ - * is more that one worker thread - right now it seems like threads are not even - * an option in the configure script) - */ -- sm->mut = ngx_mutex_init(cf->log, 0); +- ngx_thread_mutex_create(sm->mut, cf->log); -#endif /* look up some vars by name and cache the index numbers -- see ngx_http_variables.c */ diff --git a/www/nginx-devel/files/extra-patch-ngx_http_uploadprogress_module.c b/www/nginx-devel/files/extra-patch-ngx_http_uploadprogress_module.c deleted file mode 100644 index 5dfbdbfea794..000000000000 --- a/www/nginx-devel/files/extra-patch-ngx_http_uploadprogress_module.c +++ /dev/null @@ -1,73 +0,0 @@ ---- ../nginx-upload-progress-module-68b3ab3/ngx_http_uploadprogress_module.c.orig 2021-12-24 10:53:38.000000000 -0500 -+++ ../nginx-upload-progress-module-68b3ab3/ngx_http_uploadprogress_module.c 2022-07-10 22:24:32.435330000 -0400 -@@ -559,12 +559,12 @@ - ngx_chain_t out; - ngx_int_t rc, found=0, done=0, err_status=0; - off_t rest=0, length=0; -- ngx_uint_t len, i; -+ ngx_uint_t len; - ngx_slab_pool_t *shpool; - ngx_http_uploadprogress_conf_t *upcf; - ngx_http_uploadprogress_ctx_t *ctx; - ngx_http_uploadprogress_node_t *up; -- ngx_table_elt_t *expires, *cc, **ccp; -+ ngx_table_elt_t *expires, *cc; - ngx_http_uploadprogress_state_t state; - ngx_http_uploadprogress_template_t *t; - -@@ -637,6 +637,7 @@ - } - - r->headers_out.expires = expires; -+ expires->next = NULL; - - expires->hash = 1; - expires->key.len = sizeof("Expires") - 1; -@@ -646,37 +647,30 @@ - len = sizeof("Mon, 28 Sep 1970 06:00:00 GMT"); - expires->value.len = len - 1; - -- ccp = r->headers_out.cache_control.elts; -- if (ccp == NULL) { -+ cc = r->headers_out.cache_control; - -- if (ngx_array_init(&r->headers_out.cache_control, r->pool, -- 1, sizeof(ngx_table_elt_t *)) -- != NGX_OK) { -- return NGX_HTTP_INTERNAL_SERVER_ERROR; -- } -+ if (cc == NULL) { - -- ccp = ngx_array_push(&r->headers_out.cache_control); -- if (ccp == NULL) { -- return NGX_HTTP_INTERNAL_SERVER_ERROR; -- } -- - cc = ngx_list_push(&r->headers_out.headers); - if (cc == NULL) { -+ expires->hash = 0; - return NGX_HTTP_INTERNAL_SERVER_ERROR; - } - -+ r->headers_out.cache_control = cc; -+ cc->next = NULL; -+ - cc->hash = 1; - cc->key.len = sizeof("Cache-Control") - 1; - cc->key.data = (u_char *) "Cache-Control"; - -- *ccp = cc; -- - } else { -- for (i = 1; i < r->headers_out.cache_control.nelts; i++) { -- ccp[i]->hash = 0; -+ for (cc = cc->next; cc; cc = cc->next) { -+ cc->hash = 0; - } - -- cc = ccp[0]; -+ cc = r->headers_out.cache_control; -+ cc->next = NULL; - } - - expires->value.data = (u_char *) "Thu, 01 Jan 1970 00:00:01 GMT"; diff --git a/www/nginx-devel/files/extra-patch-rds-csv-nginx-module-config b/www/nginx-devel/files/extra-patch-rds-csv-nginx-module-config index 040c78a481e0..657cb0e4bdcc 100644 --- a/www/nginx-devel/files/extra-patch-rds-csv-nginx-module-config +++ b/www/nginx-devel/files/extra-patch-rds-csv-nginx-module-config @@ -1,5 +1,5 @@ ---- ../rds-csv-nginx-module-0.09/config.orig 2020-04-25 11:37:21.896900000 -0400 -+++ ../rds-csv-nginx-module-0.09/config 2020-04-25 11:39:06.371176000 -0400 +--- ../rds-csv-nginx-module-6a90686/config.orig 2020-04-25 11:37:21.896900000 -0400 ++++ ../rds-csv-nginx-module-6a90686/config 2020-04-25 11:39:06.371176000 -0400 @@ -1,5 +1,9 @@ ngx_addon_name=ngx_http_rds_csv_filter_module -HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_rds_csv_filter_module" diff --git a/www/nginx-devel/files/extra-patch-rds-json-nginx-module-config b/www/nginx-devel/files/extra-patch-rds-json-nginx-module-config deleted file mode 100644 index f3252ac0ba50..000000000000 --- a/www/nginx-devel/files/extra-patch-rds-json-nginx-module-config +++ /dev/null @@ -1,15 +0,0 @@ ---- ../rds-json-nginx-module-0.15/config.orig 2020-04-25 11:39:29.003855000 -0400 -+++ ../rds-json-nginx-module-0.15/config 2020-04-25 11:40:18.345148000 -0400 -@@ -1,5 +1,9 @@ - ngx_addon_name=ngx_http_rds_json_filter_module --HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_rds_json_filter_module" --NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/src/ngx_http_rds_json_filter_module.c $ngx_addon_dir/src/ngx_http_rds_json_processor.c $ngx_addon_dir/src/ngx_http_rds_json_util.c $ngx_addon_dir/src/ngx_http_rds_json_output.c $ngx_addon_dir/src/ngx_http_rds_json_handler.c" --NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ngx_addon_dir/src/ddebug.h $ngx_addon_dir/src/resty_dbd_stream.h $ngx_addon_dir/src/ngx_http_rds_json_filter_module.h $ngx_addon_dir/src/ngx_http_rds_json_processor.h $ngx_addon_dir/src/ngx_http_rds_json_util.h $ngx_addon_dir/src/ngx_http_rds.h $ngx_addon_dir/src/resty_dbd_stream.h $ngx_addon_dir/src/ngx_http_rds_json_output.h $ngx_addon_dir/src/ngx_http_rds_utils.h $ngx_addon_dir/src/ngx_http_rds_json_handler.h" - -+ngx_module_name="$ngx_addon_name" -+ngx_module_type=HTTP_FILTER -+ -+ngx_module_srcs="$ngx_addon_dir/src/ngx_http_rds_json_filter_module.c $ngx_addon_dir/src/ngx_http_rds_json_processor.c $ngx_addon_dir/src/ngx_http_rds_json_util.c $ngx_addon_dir/src/ngx_http_rds_json_output.c $ngx_addon_dir/src/ngx_http_rds_json_handler.c" -+ngx_module_deps="$ngx_addon_dir/src/ddebug.h $ngx_addon_dir/src/resty_dbd_stream.h $ngx_addon_dir/src/ngx_http_rds_json_filter_module.h $ngx_addon_dir/src/ngx_http_rds_json_processor.h $ngx_addon_dir/src/ngx_http_rds_json_util.h $ngx_addon_dir/src/ngx_http_rds.h $ngx_addon_dir/src/resty_dbd_stream.h $ngx_addon_dir/src/ngx_http_rds_json_output.h $ngx_addon_dir/src/ngx_http_rds_utils.h $ngx_addon_dir/src/ngx_http_rds_json_handler.h" -+ -+. auto/module diff --git a/www/nginx-devel/files/extra-patch-xss-nginx-module-config b/www/nginx-devel/files/extra-patch-xss-nginx-module-config index c5dc537b783c..e341b4c5a020 100644 --- a/www/nginx-devel/files/extra-patch-xss-nginx-module-config +++ b/www/nginx-devel/files/extra-patch-xss-nginx-module-config @@ -1,5 +1,5 @@ ---- ../xss-nginx-module-0.06/config.orig 2020-04-24 17:13:57.596040000 -0400 -+++ ../xss-nginx-module-0.06/config 2020-04-24 17:18:16.438437000 -0400 +--- ../xss-nginx-module-de2d87a/config.orig 2020-04-24 17:13:57.596040000 -0400 ++++ ../xss-nginx-module-de2d87a/config 2020-04-24 17:18:16.438437000 -0400 @@ -1,5 +1,9 @@ ngx_addon_name=ngx_http_xss_filter_module -HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_xss_filter_module"