diff --git a/security/modsecurity3-nginx/Makefile b/security/modsecurity3-nginx/Makefile index a6b71d079ff2..bc2fb8c8f4b3 100644 --- a/security/modsecurity3-nginx/Makefile +++ b/security/modsecurity3-nginx/Makefile @@ -1,95 +1,95 @@ PORTNAME= modsecurity3-nginx DISTVERSION= 1.0.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= security www MASTER_SITES= https://nginx.org/download/ DISTFILES= ${_NGINX_DISTNAME}${EXTRACT_SUFX} MAINTAINER= joneum@FreeBSD.org COMMENT= Instruction detection and prevention engine / nginx Wrapper WWW= https://github.com/SpiderLabs/ModSecurity-nginx LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_armv6= ./configure: error: ngx_http_modsecurity_module requires the ModSecurity library. LIB_DEPENDS= libmodsecurity.so:security/modsecurity3 USES= compiler:c11 USE_GITHUB= nodefault GH_TUPLE= SpiderLabs:ModSecurity-nginx:e6a568a:modsecurity3 HAS_CONFIGURE= yes # Most arguments should be derived from www/nginx's Makefile to be in sync CONFIGURE_ARGS+= --prefix=${PREFIX}/etc/nginx \ --with-cc-opt="-I ${LOCALBASE}/include" \ --with-ld-opt="-L ${LOCALBASE}/lib" \ --conf-path=${PREFIX}/etc/nginx.conf \ --sbin-path=${PREFIX}/sbin/nginx \ --pid-path=${_NGINX_RUNDIR}/nginx.pid \ --error-log-path=${_NGINX_ERRORLOG} \ --user=${WWWOWN} --group=${WWWGRP} \ --modules-path=${_MODULESDIR} \ --with-file-aio \ --http-client-body-temp-path=${_NGINX_TMPDIR}/client_body_temp \ --http-fastcgi-temp-path=${_NGINX_TMPDIR}/fastcgi_temp \ --http-proxy-temp-path=${_NGINX_TMPDIR}/proxy_temp \ --http-scgi-temp-path=${_NGINX_TMPDIR}/scgi_temp \ --http-uwsgi-temp-path=${_NGINX_TMPDIR}/uwsgi_temp \ --http-log-path=${_NGINX_ACCESSLOG} \ --with-compat \ --with-http_v2_module \ --with-http_v3_module \ --with-http_addition_module \ --with-http_auth_request_module \ --with-http_dav_module \ --with-http_flv_module \ --with-http_gunzip_module \ --with-http_gzip_static_module \ --with-http_mp4_module \ --with-http_random_index_module \ --with-http_realip_module \ --with-pcre \ --with-http_secure_link_module \ --with-http_slice_module \ --with-http_ssl_module \ --with-stream_realip_module \ --with-http_stub_status_module \ --with-http_sub_module \ --without-mail_imap_module \ --without-mail_pop3_module \ --without-mail_smtp_module \ --with-mail_ssl_module \ --with-stream_ssl_module \ --with-stream_ssl_preread_module \ --with-threads \ --with-mail=dynamic \ --with-stream=dynamic \ --add-dynamic-module=${WRKSRC_modsecurity3} ALL_TARGET= WRKSRC= ${WRKDIR}/${_NGINX_DISTNAME} PLIST_FILES= ${_MODULESDIR}/ngx_http_modsecurity_module.so # These variables should be derived from www/nginx's Makefile _MODULESDIR= ${PREFIX}/libexec/nginx _NGINX_ACCESSLOG= ${_NGINX_LOGDIR}/access.log _NGINX_ERRORLOG= ${_NGINX_LOGDIR}/error.log _NGINX_LOGDIR= ${_NGINX_VARDIR}/log/nginx _NGINX_RUNDIR= ${_NGINX_VARDIR}/run _NGINX_TMPDIR= ${_NGINX_VARDIR}/tmp/nginx _NGINX_VARDIR= /var _NGINX_PORTNAME= nginx -_NGINX_PORTVERSION= 1.28.3 +_NGINX_PORTVERSION= 1.30.1 _NGINX_DISTNAME= ${_NGINX_PORTNAME}-${_NGINX_PORTVERSION} do-install: @${MKDIR} ${STAGEDIR}${_MODULESDIR} ${INSTALL_PROGRAM} ${WRKSRC}/objs/ngx_http_modsecurity_module.so \ ${STAGEDIR}${_MODULESDIR} .include diff --git a/security/modsecurity3-nginx/distinfo b/security/modsecurity3-nginx/distinfo index 2fd9b7c9aec2..bf3bdd0dbcf5 100644 --- a/security/modsecurity3-nginx/distinfo +++ b/security/modsecurity3-nginx/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1774552910 -SHA256 (nginx-1.28.3.tar.gz) = 2c96a946bfb0882a21744ed429770a2123ae1828c7c48665092993ddee91a918 -SIZE (nginx-1.28.3.tar.gz) = 1284562 +TIMESTAMP = 1778960233 +SHA256 (nginx-1.30.1.tar.gz) = 99765000d974896b31ca5882d8c279ce3fe7ef6f5c6f9f0a967ed7fd3407f9cc +SIZE (nginx-1.30.1.tar.gz) = 1325173 SHA256 (SpiderLabs-ModSecurity-nginx-e6a568a_GH0.tar.gz) = 0680f0c025b91e0f233cd908eac7da0f08ff5042f941c570d4ad8c8a94eea533 SIZE (SpiderLabs-ModSecurity-nginx-e6a568a_GH0.tar.gz) = 1161281 diff --git a/www/nginx-acme/Makefile b/www/nginx-acme/Makefile index f1542d5ef194..e9d28ecc39da 100644 --- a/www/nginx-acme/Makefile +++ b/www/nginx-acme/Makefile @@ -1,76 +1,76 @@ PORTNAME= acme PORTVERSION= 0.3.1 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://github.com/nginx/nginx-${PORTNAME}/releases/download/v${PORTVERSION}/:acme \ https://nginx.org/download/:nginx DISTFILES= nginx-${PORTNAME}-${DISTVERSION}.tar.gz:acme \ nginx-${NGINX_VERSION_DEFAULT}.tar.gz:nginx \ nginx-${NGINX_VERSION_DEVEL}.tar.gz:nginx MAINTAINER= joneum@FreeBSD.org COMMENT= ACME module for NGINX WWW= https://github.com/nginx/nginx-acme LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS+= libpcre2-8.so:devel/pcre2 FLAVORS= default devel FLAVOR?= default USES= cargo cpe llvm:lib,noexport ssl default_PKGNAMEPREFIX= nginx- devel_PKGNAMEPREFIX= nginx-devel- PKGNAMEPREFIX= ${${FLAVOR}_PKGNAMEPREFIX} WRKSRC= ${WRKDIR}/nginx-${PORTNAME}-${PORTVERSION} default_CONFLICTS_INSTALL= nginx-devel-${PORTNAME} devel_CONFLICTS_INSTALL= nginx-${PORTNAME} CONFLICTS_INSTALL= ${${FLAVOR}_CONFLICTS_INSTALL} .include "${.CURDIR}/../nginx/version.mk" NGINX_VERSION_DEFAULT:= ${NGINX_VERSION} .undef NGINX_VERSION .include "${.CURDIR}/../nginx-devel/version.mk" NGINX_VERSION_DEVEL:= ${NGINX_VERSION} .if ${FLAVOR} == devel RUN_DEPENDS= ${LOCALBASE}/sbin/nginx:www/nginx-devel .else RUN_DEPENDS= ${LOCALBASE}/sbin/nginx:www/nginx .endif .if ${FLAVOR} == devel NGINX_VERSION= ${NGINX_VERSION_DEVEL} .else NGINX_VERSION= ${NGINX_VERSION_DEFAULT} .endif CPE_VENDOR= f5 CPE_PRODUCT= nginx-acme CARGO_ENV+= NGINX_BUILD_DIR=${WRKDIR}/nginx-${NGINX_VERSION}/objs NGX_CONFIGURE_ARGS= --with-compat \ --with-cc-opt="-I ${LOCALBASE}/include" \ --with-ld-opt="-L ${LOCALBASE}/lib" \ --with-http_ssl_module .include "${.CURDIR}/Makefile.cargo" PLIST_FILES= libexec/nginx/ngx_http_acme_module.so pre-configure: ( cd ${WRKDIR}/nginx-${NGINX_VERSION} && \ ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${NGX_CONFIGURE_ARGS} ) do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nginx/ ${INSTALL_DATA} ${WRKDIR}/target/release/libnginx_acme.so \ ${STAGEDIR}${PREFIX}/libexec/nginx/ngx_http_acme_module.so .include diff --git a/www/nginx-acme/distinfo b/www/nginx-acme/distinfo index a20fc1aed8a4..b463cbea200b 100644 --- a/www/nginx-acme/distinfo +++ b/www/nginx-acme/distinfo @@ -1,161 +1,161 @@ -TIMESTAMP = 1774564056 +TIMESTAMP = 1778960147 SHA256 (nginx-acme-0.3.1.tar.gz) = be3d3d10f042930a3bf348731698eadb7003d224a863c53b719ccd28721572c3 SIZE (nginx-acme-0.3.1.tar.gz) = 99486 -SHA256 (nginx-1.28.3.tar.gz) = 2c96a946bfb0882a21744ed429770a2123ae1828c7c48665092993ddee91a918 -SIZE (nginx-1.28.3.tar.gz) = 1284562 +SHA256 (nginx-1.30.1.tar.gz) = 99765000d974896b31ca5882d8c279ce3fe7ef6f5c6f9f0a967ed7fd3407f9cc +SIZE (nginx-1.30.1.tar.gz) = 1325173 SHA256 (nginx-1.29.7.tar.gz) = 673f8fb8c0961c44fbd9410d6161831453609b44063d3f2948253fc2b5692139 SIZE (nginx-1.29.7.tar.gz) = 1323485 SHA256 (rust/crates/aho-corasick-1.1.4.crate) = ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301 SIZE (rust/crates/aho-corasick-1.1.4.crate) = 184015 SHA256 (rust/crates/allocator-api2-0.3.1.crate) = c583acf993cf4245c4acb0a2cc2ab1f9cc097de73411bb6d3647ff6af2b1013d SIZE (rust/crates/allocator-api2-0.3.1.crate) = 66312 SHA256 (rust/crates/annotate-snippets-0.11.5.crate) = 710e8eae58854cdc1790fcb56cca04d712a17be849eeb81da2a724bf4bae2bc4 SIZE (rust/crates/annotate-snippets-0.11.5.crate) = 34687 SHA256 (rust/crates/anstyle-1.0.13.crate) = 5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78 SIZE (rust/crates/anstyle-1.0.13.crate) = 17651 SHA256 (rust/crates/async-task-4.7.1.crate) = 8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de SIZE (rust/crates/async-task-4.7.1.crate) = 38077 SHA256 (rust/crates/atomic-waker-1.1.2.crate) = 1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0 SIZE (rust/crates/atomic-waker-1.1.2.crate) = 12422 SHA256 (rust/crates/base64-0.22.1.crate) = 72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6 SIZE (rust/crates/base64-0.22.1.crate) = 81597 SHA256 (rust/crates/bindgen-0.72.1.crate) = 993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895 SIZE (rust/crates/bindgen-0.72.1.crate) = 246071 SHA256 (rust/crates/bitflags-2.10.0.crate) = 812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3 SIZE (rust/crates/bitflags-2.10.0.crate) = 48427 SHA256 (rust/crates/bytes-1.11.0.crate) = b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3 SIZE (rust/crates/bytes-1.11.0.crate) = 78391 SHA256 (rust/crates/cc-1.2.49.crate) = 90583009037521a116abf44494efecd645ba48b6622457080f080b85544e2215 SIZE (rust/crates/cc-1.2.49.crate) = 93145 SHA256 (rust/crates/cexpr-0.6.0.crate) = 6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766 SIZE (rust/crates/cexpr-0.6.0.crate) = 17966 SHA256 (rust/crates/cfg-if-1.0.4.crate) = 9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801 SIZE (rust/crates/cfg-if-1.0.4.crate) = 9360 SHA256 (rust/crates/clang-sys-1.8.1.crate) = 0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4 SIZE (rust/crates/clang-sys-1.8.1.crate) = 44009 SHA256 (rust/crates/constcat-0.6.1.crate) = 136d3e02915a2cea4d74caa8681e2d44b1c3254bdbf17d11d41d587ff858832c SIZE (rust/crates/constcat-0.6.1.crate) = 8583 SHA256 (rust/crates/dunce-1.0.5.crate) = 92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813 SIZE (rust/crates/dunce-1.0.5.crate) = 8244 SHA256 (rust/crates/either-1.15.0.crate) = 48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719 SIZE (rust/crates/either-1.15.0.crate) = 20114 SHA256 (rust/crates/errno-0.3.14.crate) = 39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb SIZE (rust/crates/errno-0.3.14.crate) = 12002 SHA256 (rust/crates/find-msvc-tools-0.1.5.crate) = 3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844 SIZE (rust/crates/find-msvc-tools-0.1.5.crate) = 30942 SHA256 (rust/crates/foreign-types-0.3.2.crate) = f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1 SIZE (rust/crates/foreign-types-0.3.2.crate) = 7504 SHA256 (rust/crates/foreign-types-shared-0.1.1.crate) = 00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b SIZE (rust/crates/foreign-types-shared-0.1.1.crate) = 5672 SHA256 (rust/crates/futures-channel-0.3.31.crate) = 2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10 SIZE (rust/crates/futures-channel-0.3.31.crate) = 31971 SHA256 (rust/crates/futures-core-0.3.31.crate) = 05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e SIZE (rust/crates/futures-core-0.3.31.crate) = 14318 SHA256 (rust/crates/glob-0.3.3.crate) = 0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280 SIZE (rust/crates/glob-0.3.3.crate) = 22861 SHA256 (rust/crates/http-1.4.0.crate) = e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a SIZE (rust/crates/http-1.4.0.crate) = 106978 SHA256 (rust/crates/http-body-1.0.1.crate) = 1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184 SIZE (rust/crates/http-body-1.0.1.crate) = 6125 SHA256 (rust/crates/http-body-util-0.1.3.crate) = b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a SIZE (rust/crates/http-body-util-0.1.3.crate) = 16975 SHA256 (rust/crates/http-serde-2.1.1.crate) = 0f056c8559e3757392c8d091e796416e4649d8e49e88b8d76df6c002f05027fd SIZE (rust/crates/http-serde-2.1.1.crate) = 6359 SHA256 (rust/crates/httparse-1.10.1.crate) = 6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87 SIZE (rust/crates/httparse-1.10.1.crate) = 45190 SHA256 (rust/crates/hyper-1.8.1.crate) = 2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11 SIZE (rust/crates/hyper-1.8.1.crate) = 157353 SHA256 (rust/crates/iri-string-0.7.9.crate) = 4f867b9d1d896b67beb18518eda36fdb77a32ea590de864f1325b294a6d14397 SIZE (rust/crates/iri-string-0.7.9.crate) = 142144 SHA256 (rust/crates/itertools-0.13.0.crate) = 413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186 SIZE (rust/crates/itertools-0.13.0.crate) = 146261 SHA256 (rust/crates/itoa-1.0.15.crate) = 4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c SIZE (rust/crates/itoa-1.0.15.crate) = 11231 SHA256 (rust/crates/libc-0.2.178.crate) = 37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091 SIZE (rust/crates/libc-0.2.178.crate) = 783720 SHA256 (rust/crates/libloading-0.8.9.crate) = d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55 SIZE (rust/crates/libloading-0.8.9.crate) = 30222 SHA256 (rust/crates/lock_api-0.4.14.crate) = 224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965 SIZE (rust/crates/lock_api-0.4.14.crate) = 29249 SHA256 (rust/crates/log-0.4.29.crate) = 5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897 SIZE (rust/crates/log-0.4.29.crate) = 51515 SHA256 (rust/crates/memchr-2.7.6.crate) = f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273 SIZE (rust/crates/memchr-2.7.6.crate) = 97616 SHA256 (rust/crates/minimal-lexical-0.2.1.crate) = 68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a SIZE (rust/crates/minimal-lexical-0.2.1.crate) = 94841 SHA256 (rust/crates/nginx-sys-0.5.0.crate) = 3c85fc3a3b71cdb9269103e3934e989fe5c9f22a34d9068c1b23db1f0349ca79 SIZE (rust/crates/nginx-sys-0.5.0.crate) = 26184 SHA256 (rust/crates/ngx-0.5.0.crate) = 3cafa4700c0836055c5c78ba9defc418cea187d92ac65478bb7053a5a1d39775 SIZE (rust/crates/ngx-0.5.0.crate) = 60872 SHA256 (rust/crates/nom-7.1.3.crate) = d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a SIZE (rust/crates/nom-7.1.3.crate) = 117570 SHA256 (rust/crates/once_cell-1.21.3.crate) = 42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d SIZE (rust/crates/once_cell-1.21.3.crate) = 34534 SHA256 (rust/crates/openssl-0.10.75.crate) = 08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328 SIZE (rust/crates/openssl-0.10.75.crate) = 288136 SHA256 (rust/crates/openssl-macros-0.1.1.crate) = a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c SIZE (rust/crates/openssl-macros-0.1.1.crate) = 5601 SHA256 (rust/crates/openssl-sys-0.9.111.crate) = 82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321 SIZE (rust/crates/openssl-sys-0.9.111.crate) = 80871 SHA256 (rust/crates/pin-project-lite-0.2.16.crate) = 3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b SIZE (rust/crates/pin-project-lite-0.2.16.crate) = 30504 SHA256 (rust/crates/pin-utils-0.1.0.crate) = 8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184 SIZE (rust/crates/pin-utils-0.1.0.crate) = 7580 SHA256 (rust/crates/pkg-config-0.3.32.crate) = 7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c SIZE (rust/crates/pkg-config-0.3.32.crate) = 21370 SHA256 (rust/crates/prettyplease-0.2.37.crate) = 479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b SIZE (rust/crates/prettyplease-0.2.37.crate) = 72033 SHA256 (rust/crates/proc-macro2-1.0.103.crate) = 5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8 SIZE (rust/crates/proc-macro2-1.0.103.crate) = 60024 SHA256 (rust/crates/quote-1.0.42.crate) = a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f SIZE (rust/crates/quote-1.0.42.crate) = 31504 SHA256 (rust/crates/regex-1.12.2.crate) = 843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4 SIZE (rust/crates/regex-1.12.2.crate) = 163843 SHA256 (rust/crates/regex-automata-0.4.13.crate) = 5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c SIZE (rust/crates/regex-automata-0.4.13.crate) = 625250 SHA256 (rust/crates/regex-syntax-0.8.8.crate) = 7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58 SIZE (rust/crates/regex-syntax-0.8.8.crate) = 359141 SHA256 (rust/crates/rustc-hash-2.1.1.crate) = 357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d SIZE (rust/crates/rustc-hash-2.1.1.crate) = 14154 SHA256 (rust/crates/ryu-1.0.20.crate) = 28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f SIZE (rust/crates/ryu-1.0.20.crate) = 48738 SHA256 (rust/crates/scopeguard-1.2.0.crate) = 94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49 SIZE (rust/crates/scopeguard-1.2.0.crate) = 11619 SHA256 (rust/crates/serde-1.0.228.crate) = 9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e SIZE (rust/crates/serde-1.0.228.crate) = 83652 SHA256 (rust/crates/serde_core-1.0.228.crate) = 41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad SIZE (rust/crates/serde_core-1.0.228.crate) = 63111 SHA256 (rust/crates/serde_derive-1.0.228.crate) = d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79 SIZE (rust/crates/serde_derive-1.0.228.crate) = 59605 SHA256 (rust/crates/serde_json-1.0.145.crate) = 402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c SIZE (rust/crates/serde_json-1.0.145.crate) = 155748 SHA256 (rust/crates/shlex-1.3.0.crate) = 0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64 SIZE (rust/crates/shlex-1.3.0.crate) = 18713 SHA256 (rust/crates/siphasher-1.0.1.crate) = 56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d SIZE (rust/crates/siphasher-1.0.1.crate) = 10351 SHA256 (rust/crates/smallvec-1.15.1.crate) = 67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03 SIZE (rust/crates/smallvec-1.15.1.crate) = 38116 SHA256 (rust/crates/syn-2.0.111.crate) = 390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87 SIZE (rust/crates/syn-2.0.111.crate) = 302117 SHA256 (rust/crates/thiserror-2.0.17.crate) = f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8 SIZE (rust/crates/thiserror-2.0.17.crate) = 28857 SHA256 (rust/crates/thiserror-impl-2.0.17.crate) = 3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913 SIZE (rust/crates/thiserror-impl-2.0.17.crate) = 21344 SHA256 (rust/crates/tokio-1.48.0.crate) = ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408 SIZE (rust/crates/tokio-1.48.0.crate) = 843434 SHA256 (rust/crates/try-lock-0.2.5.crate) = e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b SIZE (rust/crates/try-lock-0.2.5.crate) = 4314 SHA256 (rust/crates/unicode-ident-1.0.22.crate) = 9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5 SIZE (rust/crates/unicode-ident-1.0.22.crate) = 47919 SHA256 (rust/crates/unicode-width-0.2.2.crate) = b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254 SIZE (rust/crates/unicode-width-0.2.2.crate) = 282768 SHA256 (rust/crates/vcpkg-0.2.15.crate) = accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426 SIZE (rust/crates/vcpkg-0.2.15.crate) = 228735 SHA256 (rust/crates/want-0.3.1.crate) = bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e SIZE (rust/crates/want-0.3.1.crate) = 6398 SHA256 (rust/crates/windows-link-0.2.1.crate) = f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5 SIZE (rust/crates/windows-link-0.2.1.crate) = 6133 SHA256 (rust/crates/windows-sys-0.61.2.crate) = ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc SIZE (rust/crates/windows-sys-0.61.2.crate) = 2517186 SHA256 (rust/crates/zeroize-1.8.2.crate) = b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0 SIZE (rust/crates/zeroize-1.8.2.crate) = 20907 diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod index 4541950ef5ce..c22375e66ee2 100644 --- a/www/nginx/Makefile.extmod +++ b/www/nginx/Makefile.extmod @@ -1,332 +1,332 @@ ### External modules OPTIONS_GROUP+= THIRDPARTYGRP # External modules (arrayvar MUST appear after devel_kit for build-dep) OPTIONS_GROUP_THIRDPARTYGRP= AJP AWS_AUTH BROTLI CACHE_PURGE \ DEVEL_KIT ARRAYVAR DRIZZLE DYNAMIC_UPSTREAM ECHO ENCRYPTSESSION \ FIPS_CHECK FORMINPUT GRIDFS HEADERS_MORE HTTP_ACCEPT_LANGUAGE HTTP_AUTH_DIGEST \ HTTP_AUTH_KRB5 HTTP_AUTH_LDAP HTTP_AUTH_PAM HTTP_DAV_EXT HTTP_EVAL \ HTTP_FANCYINDEX HTTP_FOOTER HTTP_GEOIP2 HTTP_IP2LOCATION HTTP_IP2PROXY \ HTTP_JSON_STATUS HTTP_MOGILEFS HTTP_NOTICE HTTP_PUSH \ HTTP_PUSH_STREAM HTTP_REDIS HTTP_SLICE_AHEAD HTTP_SUBS_FILTER HTTP_TARANTOOL \ HTTP_UPLOAD HTTP_UPLOAD_PROGRESS HTTP_UPSTREAM_CHECK HTTP_UPSTREAM_FAIR \ HTTP_UPSTREAM_STICKY HTTP_VIDEO_THUMBEXTRACTOR HTTP_ZIP ICONV LET LINK LUA LUASTREAM \ MEMC MODSECURITY3 NAXSI PASSENGER POSTGRES RDS_CSV RDS_JSON \ REDIS2 RTMP SET_MISC SFLOW SHIBBOLETH SLOWFS_CACHE SRCACHE STS \ VOD VTS XSS WEBSOCKIFY ZSTD AJP_GH_TUPLE= msva:nginx_ajp_module:fcbb2cc:ajp AJP_VARS= DSO_EXTMODS+=ajp ARRAYVAR_IMPLIES= DEVEL_KIT ARRAYVAR_GH_TUPLE= openresty:array-var-nginx-module:v0.05:arrayvar ARRAYVAR_VARS= DSO_EXTMODS+=arrayvar AWS_AUTH_GH_TUPLE= anomalizer:ngx_aws_auth:21931b2:aws_auth AWS_AUTH_VARS= DSO_EXTMODS+=aws_auth BROTLI_LIB_DEPENDS= libbrotlicommon.so:archivers/brotli BROTLI_GH_TUPLE= google:ngx_brotli:a71f931:brotli BROTLI_VARS= DSO_EXTMODS+=brotli BROTLI_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_brotli_filter_config CACHE_PURGE_GH_TUPLE= nginx-modules:ngx_cache_purge:a84b0f3:cache_purge CACHE_PURGE_VARS= DSO_EXTMODS+=cache_purge ECHO_GH_TUPLE= openresty:echo-nginx-module:5a402aa:echo ECHO_VARS= DSO_EXTMODS+=echo DRIZZLE_LIB_DEPENDS= libdrizzle.so:databases/libdrizzle DRIZZLE_CONFIGURE_ENV= LIBDRIZZLE_INC=${LOCALBASE}/include \ LIBDRIZZLE_LIB=${LOCALBASE}/lib DRIZZLE_GH_TUPLE= openresty:drizzle-nginx-module:3504fc6:drizzle DRIZZLE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-openresty-drizzle-nginx-module-config DRIZZLE_VARS= DSO_EXTMODS+=drizzle DYNAMIC_UPSTREAM_IMPLIES= STREAM DYNAMIC_UPSTREAM_GH_TUPLE= ZigzagAK:ngx_dynamic_upstream:960eef2:dynamic_upstream DYNAMIC_UPSTREAM_VARS= DSO_EXTMODS+=dynamic_upstream DEVEL_KIT_GH_TUPLE= vision5:ngx_devel_kit:v0.3.3:devel_kit DEVEL_KIT_VARS= FIRST_DSO_EXTMODS+=devel_kit ENCRYPTSESSION_IMPLIES= DEVEL_KIT ENCRYPTSESSION_GH_TUPLE= openresty:encrypted-session-nginx-module:v0.09:encryptsession ENCRYPTSESSION_VARS= DSO_EXTMODS+=encryptsession FIPS_CHECK_GH_TUPLE= ogarrett:nginx-fips-check-module:6cb4270:fipscheck FIPS_CHECK_VARS= DSO_EXTMODS+=fipscheck FORMINPUT_IMPLIES= DEVEL_KIT FORMINPUT_GH_TUPLE= calio:form-input-nginx-module:v0.12:forminput FORMINPUT_VARS= DSO_EXTMODS+=forminput GRIDFS_GH_TUPLE= nieoding:nginx-gridfs:059bdc3:gridfs GRIDFS_LIB_DEPENDS= libbson-1.0.so:devel/libbson \ libmongoc-1.0.so:devel/mongo-c-driver GRIDFS_VARS= DSO_EXTMODS+=gridfs GRIDFS_SUBDIR=/nginx-gridfs HEADERS_MORE_GH_TUPLE= openresty:headers-more-nginx-module:06dc0be:headers_more HEADERS_MORE_VARS= DSO_EXTMODS+=headers_more HTTP_ACCEPT_LANGUAGE_GH_TUPLE= dvershinin:nginx_accept_language_module:5683967:accept_language HTTP_ACCEPT_LANGUAGE_VARS= DSO_EXTMODS+=accept_language HTTP_AUTH_DIGEST_GH_TUPLE= atomx:nginx-http-auth-digest:274490c:auth_digest HTTP_AUTH_DIGEST_VARS= DSO_EXTMODS+=auth_digest HTTP_AUTH_KRB5_GH_TUPLE= stnoonan:spnego-http-auth-nginx-module:3575542:auth_krb5 HTTP_AUTH_KRB5_VARS= DSO_EXTMODS+=auth_krb5 HTTP_AUTH_KRB5_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-spnego-http-auth-nginx-module-config HTTP_AUTH_LDAP_GH_TUPLE= kvspb:nginx-auth-ldap:83c059b:http_auth_ldap HTTP_AUTH_LDAP_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_auth_ldap_module.c HTTP_AUTH_LDAP_VARS= DSO_EXTMODS+=http_auth_ldap HTTP_AUTH_LDAP_USES= ldap HTTP_AUTH_PAM_GH_TUPLE= sto:ngx_http_auth_pam_module:v1.5.3:auth_pam HTTP_AUTH_PAM_VARS= DSO_EXTMODS+=auth_pam HTTP_DAV_EXT_IMPLIES= HTTP_DAV HTTP_DAV_EXT_LIB_DEPENDS= libxml2.so:textproc/libxml2 \ libxslt.so:textproc/libxslt HTTP_DAV_EXT_GH_TUPLE= arut:nginx-dav-ext-module:v3.0.0:dav_ext HTTP_DAV_EXT_VARS= DSO_EXTMODS+=dav_ext HTTP_DAV_EXT_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_dav_ext_module.c HTTP_EVAL_GH_TUPLE= openresty:nginx-eval-module:582bd25:eval HTTP_EVAL_VARS= DSO_EXTMODS+=eval HTTP_FANCYINDEX_GH_TUPLE= aperezdc:ngx-fancyindex:v0.5.2:fancyindex HTTP_FANCYINDEX_VARS= DSO_EXTMODS+=fancyindex HTTP_FOOTER_GH_TUPLE= alibaba:nginx-http-footer-filter:1.2.2:footer HTTP_FOOTER_VARS= DSO_EXTMODS+=footer HTTP_FOOTER_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-http-footer-filter-config HTTP_GEOIP2_GH_TUPLE= leev:ngx_http_geoip2_module:3.4:geoip2 HTTP_GEOIP2_CFLAGS= -I${LOCALBASE}/include HTTP_GEOIP2_VARS= DSO_EXTMODS+=geoip2 HTTP_GEOIP2_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb HTTP_IP2LOCATION_GH_TUPLE= ip2location:ip2location-nginx:2df35fb:ip2location HTTP_IP2LOCATION_LIB_DEPENDS= libIP2Location.so:net/ip2location HTTP_IP2LOCATION_VARS= DSO_EXTMODS+=ip2location HTTP_IP2PROXY_GH_TUPLE= ip2location:ip2proxy-nginx:02ce447:ip2proxy HTTP_IP2PROXY_LIB_DEPENDS= libIP2Proxy.so:net/ip2proxy HTTP_IP2PROXY_VARS= DSO_EXTMODS+=ip2proxy HTTP_JSON_STATUS_GH_TUPLE= nginx-modules:ngx_http_json_status_module:1d2f303:json_status HTTP_JSON_STATUS_VARS= DSO_EXTMODS+=json_status HTTP_JSON_STATUS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_json_status_module-config HTTP_MOGILEFS_MASTER_SITES= http://www.grid.net.ru/nginx/download/:mogilefs HTTP_MOGILEFS_DISTFILES= nginx_mogilefs_module-1.0.4.tar.gz:mogilefs HTTP_MOGILEFS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_mogilefs_module.c \ ${PATCHDIR}/extra-patch-nginx_mogilefs_module-config HTTP_MOGILEFS_VARS= DSO_EXTDIRS+=nginx_mogilefs_module-1.0.4 HTTP_NOTICE_GH_TUPLE= kr:nginx-notice:3c95966:notice HTTP_NOTICE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_notice_module.c \ ${PATCHDIR}/extra-patch-nginx-notice-config HTTP_NOTICE_VARS= DSO_EXTMODS+=notice HTTP_PUSH_GH_TUPLE= slact:nchan:v1.3.6:push HTTP_PUSH_VARS= DSO_EXTMODS+=push HTTP_PUSH_STREAM_GH_TUPLE= wandenberg:nginx-push-stream-module:8c02220:pushstream HTTP_PUSH_STREAM_VARS= DSO_EXTMODS+=pushstream HTTP_REDIS_MASTER_SITES= LOCAL/osa:redis HTTP_REDIS_DISTFILES= ngx_http_redis-0.3.9.tar.gz:redis HTTP_REDIS_VARS= DSO_EXTDIRS+=ngx_http_redis-0.3.9 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_VARS= DSO_EXTMODS+=subs_filter HTTP_TARANTOOL_LIB_DEPENDS= libmsgpuck.so:devel/msgpuck \ libyajl.so:devel/yajl 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_VARS= DSO_EXTMODS+=upload HTTP_UPLOAD_PROGRESS_GH_TUPLE= masterzen:nginx-upload-progress-module:68b3ab3: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_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 \ ${PATCHDIR}/extra-patch-src-http-modules-ngx_http_upstream_least_conn_module.c \ ${PATCHDIR}/extra-patch-src-http-ngx_http_upstream_round_robin.c \ ${PATCHDIR}/extra-patch-src-http-ngx_http_upstream_round_robin.h HTTP_UPSTREAM_FAIR_GH_TUPLE= jaygooby:nginx-upstream-fair:10ecdcf:upstreamfair HTTP_UPSTREAM_FAIR_VARS= DSO_EXTMODS+=upstreamfair HTTP_UPSTREAM_STICKY_IMPLIES= HTTP_SSL HTTP_UPSTREAM_STICKY_GH_TUPLE= dvershinin:nginx-sticky-module-ng:2753211:upstreamsticky HTTP_UPSTREAM_STICKY_VARS= DSO_EXTMODS+=upstreamsticky HTTP_VIDEO_THUMBEXTRACTOR_LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \ libavcodec.so:multimedia/ffmpeg \ libavutil.so:multimedia/ffmpeg \ libswscale.so:multimedia/ffmpeg HTTP_VIDEO_THUMBEXTRACTOR_USES= jpeg HTTP_VIDEO_THUMBEXTRACTOR_GH_TUPLE= wandenberg:nginx-video-thumbextractor-module:e81f850:vte 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_VARS= DSO_EXTMODS+=mod_zip ICONV_IMPLIES= DEVEL_KIT ICONV_USES= iconv ICONV_GH_TUPLE= calio:iconv-nginx-module:v0.14:iconv ICONV_VARS= DSO_EXTMODS+=iconv ICONV_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-calio-iconv-nginx-module-config LET_GH_TUPLE= baysao:nginx-let-module:c1f23aa:let LET_VARS= DSO_EXTMODS+=let # YOU MUST UPDATE www/lua-resty-core IF YOU UPDATE THIS MODULE LUA_IMPLIES= DEVEL_KIT LUA_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty LUA_RUN_DEPENDS= lua-resty-core>0:www/lua-resty-core LUA_CONFIGURE_ENV= LUAJIT_INC=${LOCALBASE}/include/luajit-2.1 \ LUAJIT_LIB=${LOCALBASE}/lib LUA_GH_TUPLE= openresty:lua-nginx-module:v0.10.29:lua LUA_VARS= DSO_EXTMODS+=lua LUASTREAM_IMPLIES= DEVEL_KIT LUASTREAM_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty LUASTREAM_RUN_DEPENDS= lua-resty-core>0:www/lua-resty-core LUASTREAM_CONFIGURE_ENV=LUAJIT_INC=${LOCALBASE}/include/luajit-2.1 \ LUAJIT_LIB=${LOCALBASE}/lib LUASTREAM_GH_TUPLE= openresty:stream-lua-nginx-module:v0.0.16:luastream LUASTREAM_VARS= DSO_EXTMODS+=luastream LINK_GH_TUPLE= Taymindis:nginx-link-function:3.2.4:link LINK_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-link-function-config \ ${PATCHDIR}/extra-patch-ngx_link_func_module.c LINK_VARS= DSO_EXTMODS+=link MEMC_GH_TUPLE= openresty:memc-nginx-module:v0.19:memc MEMC_VARS= DSO_EXTMODS+=memc MODSECURITY3_IMPLIES= HTTP_ADDITION HTTP_IMAGE_FILTER HTTP_GUNZIP_FILTER HTTP_XSLT MODSECURITY3_LIB_DEPENDS= libmodsecurity.so:security/modsecurity3 MODSECURITY3_GH_TUPLE= SpiderLabs:ModSecurity-nginx:v1.0.3:modsecurity3 MODSECURITY3_VARS= DSO_EXTMODS+=modsecurity3 NAXSI_NGINX_VER= 1.6 NAXSI_GH_TUPLE= wargio:naxsi:${NAXSI_NGINX_VER}:naxsi \ libinjection:libinjection:4aa3894: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 -NJS_GH_TUPLE= nginx:njs:0.9.6:njs +NJS_GH_TUPLE= nginx:njs:0.9.8:njs NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx NJS_IMPLIES= STREAM NJS_XML_IMPLIES= HTTP NJS NJS_XML_LIB_DEPENDS= libxml2.so:textproc/libxml2 \ libxslt.so:textproc/libxslt OTEL_GH_TUPLE= osokin:nginx-otel:51273ec:otel OTEL_VARS= DSO_EXTMODS+=otel OTEL_SUBDIR=/ OTEL_LIB_DEPENDS= libabsl_base.so:devel/abseil \ libcares.so:dns/c-ares \ libgrpc.so:devel/grpc \ libopentelemetry_common.so:devel/opentelemetry-cpp \ libprotobuf.so:devel/protobuf \ libre2.so:devel/re2 OTEL_BUILD_DEPENDS= ${LOCALBASE}/include/opentelemetry/proto/common/v1/common.proto:devel/opentelemetry-proto OTEL_CONFIGURE_ENV+= NGX_OTEL_PROTO_DIR=${PREFIX}/include PASSENGER_NGINX_VER= 6.1.2 PASSENGER_MASTER_SITES= https://s3.amazonaws.com/phusion-passenger/releases/:passenger PASSENGER_DISTFILES= passenger-${PASSENGER_NGINX_VER}.tar.gz:passenger PASSENGER_BUILD_DEPENDS=${LOCALBASE}/bin/rake:devel/rubygem-rake PASSENGER_CATEGORIES= ruby PASSENGER_CFLAGS= -DNDEBUG PASSENGER_CONFIGURE_ENV=OPTIMIZE="yes" EXTRA_PRE_CXXFLAGS="-std=c++14" PASSENGER_EXTRA_PATCHES=${PATCHDIR}/extra-patch-passenger-build-nginx.rb \ ${PATCHDIR}/extra-patch-passenger-disable-telemetry \ ${PATCHDIR}/extra-patch-passenger-Configuration.c PASSENGER_RAKE_BIN= ${LOCALBASE}/bin/rake PASSENGER_USES= ruby PASSENGER_VARS= WRKSRC_passenger=${WRKDIR}/passenger-${PASSENGER_NGINX_VER} \ DSO_EXTDIRS+=passenger-${PASSENGER_NGINX_VER}/src/nginx_module POSTGRES_USES= pgsql 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_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_VARS= DSO_EXTMODS+=rdsjson REDIS2_GH_TUPLE= openresty:redis2-nginx-module:v0.15:redis2 REDIS2_VARS= DSO_EXTMODS+=redis2 RTMP_GH_TUPLE= arut:nginx-rtmp-module:v1.2.2:rtmp RTMP_VARS= DSO_EXTMODS+=rtmp SET_MISC_IMPLIES= DEVEL_KIT SET_MISC_GH_TUPLE= openresty:set-misc-nginx-module:3937e7b:setmisc SET_MISC_VARS= DSO_EXTMODS+=setmisc SFLOW_GH_TUPLE= sflow:nginx-sflow-module:543c72a: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 SHIBBOLETH_GH_TUPLE= nginx-shib:nginx-http-shibboleth:be12df5:shibboleth 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_VARS= DSO_EXTMODS+=srcache STS_IMPLIES= STREAM STS_GH_TUPLE= vozlt:nginx-module-sts:3c10d42:sts STS_VARS= DSO_EXTMODS+=sts VOD_GH_TUPLE= diogoazevedos:nginx-vod-module:b9b4b44:vod VOD_LIB_DEPENDS= libxml2.so:textproc/libxml2 \ libavutil.so:multimedia/ffmpeg VOD_USES= iconv VOD_VARS= DSO_EXTMODS+=vod VTS_GH_TUPLE= vozlt:nginx-module-vts:bf64dbf:vts VTS_VARS= DSO_EXTMODS+=vts XSS_GH_TUPLE= openresty:xss-nginx-module:v0.06:xss XSS_VARS= DSO_EXTMODS+=xss XSS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-xss-nginx-module-config WEBSOCKIFY_GH_TUPLE= tg123:websockify-nginx-module:c11bc9a:websockify WEBSOCKIFY_VARS= DSO_EXTMODS+=websockify ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd ZSTD_CONFIGURE_ENV= ZSTD_INC=${LOCALBASE}/include \ ZSTD_LIB=${LOCALBASE}/lib ZSTD_GH_TUPLE= tokers:zstd-nginx-module:f4ba115:zstd ZSTD_VARS= DSO_EXTMODS+=zstd diff --git a/www/nginx/distinfo b/www/nginx/distinfo index 70b7098dce9b..41323d4cb59a 100644 --- a/www/nginx/distinfo +++ b/www/nginx/distinfo @@ -1,141 +1,141 @@ -TIMESTAMP = 1774552697 -SHA256 (nginx-1.28.3.tar.gz) = 2c96a946bfb0882a21744ed429770a2123ae1828c7c48665092993ddee91a918 -SIZE (nginx-1.28.3.tar.gz) = 1284562 +TIMESTAMP = 1778747884 +SHA256 (nginx-1.30.1.tar.gz) = 99765000d974896b31ca5882d8c279ce3fe7ef6f5c6f9f0a967ed7fd3407f9cc +SIZE (nginx-1.30.1.tar.gz) = 1325173 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae SIZE (nginx_mogilefs_module-1.0.4.tar.gz) = 11208 SHA256 (ngx_http_redis-0.3.9.tar.gz) = 21f87540f0a44b23ffa5df16fb3d788bc90803b255ef14f9c26e3847a6f26f46 SIZE (ngx_http_redis-0.3.9.tar.gz) = 13051 SHA256 (passenger-6.1.2.tar.gz) = 94400a52e536cfdd8acf2accb47badb7a67dc309452f1b05600da67343f25bf8 SIZE (passenger-6.1.2.tar.gz) = 7429067 SHA256 (msva-nginx_ajp_module-fcbb2cc_GH0.tar.gz) = 522e94c59f5783f281d868ede2adf325bf2f8ffb9e62cf8451d4b9ac0516916c SIZE (msva-nginx_ajp_module-fcbb2cc_GH0.tar.gz) = 110807 SHA256 (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = c949d4be6f3442c8e2937046448dc8d8def25c0e0fa6f4e805144cea45eabe80 SIZE (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = 11280 SHA256 (anomalizer-ngx_aws_auth-21931b2_GH0.tar.gz) = d8a2422da96a638e9a911e4edb592954d9c0fe1576456fec9809ef4e2a0a863d SIZE (anomalizer-ngx_aws_auth-21931b2_GH0.tar.gz) = 15580 SHA256 (google-ngx_brotli-a71f931_GH0.tar.gz) = b3312a045d5303a40d02beb34711b8ca27f7b72d647e9ee2012a8eddd14d9b22 SIZE (google-ngx_brotli-a71f931_GH0.tar.gz) = 16376 SHA256 (nginx-modules-ngx_cache_purge-a84b0f3_GH0.tar.gz) = ddfd4fdd99075d906b7b75c49f56ec96b76df7951dfa54502e0f83890447031f SIZE (nginx-modules-ngx_cache_purge-a84b0f3_GH0.tar.gz) = 17162 SHA256 (vision5-ngx_devel_kit-v0.3.3_GH0.tar.gz) = faa2fcd5168b10764d35081356511d5f84db5c526a1aa4b6add2db94b6853b2b SIZE (vision5-ngx_devel_kit-v0.3.3_GH0.tar.gz) = 66561 SHA256 (openresty-drizzle-nginx-module-3504fc6_GH0.tar.gz) = 86076735597f14db28cffabc0ab1f233cd51aab7cf112c56e267783e7814fc65 SIZE (openresty-drizzle-nginx-module-3504fc6_GH0.tar.gz) = 51596 SHA256 (ZigzagAK-ngx_dynamic_upstream-960eef2_GH0.tar.gz) = 86e7c6ed6dba2d4c5f5b87ecb91f25ccdb7a08b8a88236e632114f830b9e354b SIZE (ZigzagAK-ngx_dynamic_upstream-960eef2_GH0.tar.gz) = 23003 SHA256 (openresty-echo-nginx-module-5a402aa_GH0.tar.gz) = bb2a4b1a0e5ffa0203c1be854e663fc92cee0d7b5e0f7a38c0e163ae9124a38f SIZE (openresty-echo-nginx-module-5a402aa_GH0.tar.gz) = 53336 SHA256 (openresty-encrypted-session-nginx-module-v0.09_GH0.tar.gz) = fe9b95acf9726aefd71bf0aca6c11bee007f1da67e64be9b21a7131f0ed75ba6 SIZE (openresty-encrypted-session-nginx-module-v0.09_GH0.tar.gz) = 11847 SHA256 (ogarrett-nginx-fips-check-module-6cb4270_GH0.tar.gz) = d52fbb0f2819cd91b710ad85e6c8b452fdca6a5d81b0694d6637adba3fc2382c SIZE (ogarrett-nginx-fips-check-module-6cb4270_GH0.tar.gz) = 6494 SHA256 (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 5c1869d55897075adb3fdf840b21060dc54669a1f840a36d1539acc7e59dd106 SIZE (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 11090 SHA256 (nieoding-nginx-gridfs-059bdc3_GH0.tar.gz) = 9b059b5ae7b602d12d32d5ebe2700827ea625f22c0fb3b9956242e11de63845b SIZE (nieoding-nginx-gridfs-059bdc3_GH0.tar.gz) = 4674 SHA256 (openresty-headers-more-nginx-module-06dc0be_GH0.tar.gz) = 883b1e31d59f3eb1e76b34259711ad65a3443102973dcf22df329397f3d5eaa4 SIZE (openresty-headers-more-nginx-module-06dc0be_GH0.tar.gz) = 29438 SHA256 (dvershinin-nginx_accept_language_module-5683967_GH0.tar.gz) = a58feb576f2231498b8a3863d3c6fba45c7d48bc48735fa714e07a7bfbedb6e3 SIZE (dvershinin-nginx_accept_language_module-5683967_GH0.tar.gz) = 3425 SHA256 (atomx-nginx-http-auth-digest-274490c_GH0.tar.gz) = 0839c33c2f8d519f92daae274f62cf87eb68415d562c6500ee3e3721ce80557c SIZE (atomx-nginx-http-auth-digest-274490c_GH0.tar.gz) = 17815 SHA256 (stnoonan-spnego-http-auth-nginx-module-3575542_GH0.tar.gz) = 6d710f97bef58b2d5dc54445c0e48103786425f6d4ab18cf30a2168904d0ba62 SIZE (stnoonan-spnego-http-auth-nginx-module-3575542_GH0.tar.gz) = 24680 SHA256 (kvspb-nginx-auth-ldap-83c059b_GH0.tar.gz) = e76e9e117ad51af578a68fa7a30c256178796bb271fa77f01c93281a92b09921 SIZE (kvspb-nginx-auth-ldap-83c059b_GH0.tar.gz) = 18547 SHA256 (sto-ngx_http_auth_pam_module-v1.5.3_GH0.tar.gz) = 882018fea8d6955ab3fe294aafa8ebb1fdff4eac313c29583fef02c6de76fae7 SIZE (sto-ngx_http_auth_pam_module-v1.5.3_GH0.tar.gz) = 7084 SHA256 (arut-nginx-dav-ext-module-v3.0.0_GH0.tar.gz) = d2499d94d82d4e4eac8425d799e52883131ae86a956524040ff2fd230ef9f859 SIZE (arut-nginx-dav-ext-module-v3.0.0_GH0.tar.gz) = 14558 SHA256 (openresty-nginx-eval-module-582bd25_GH0.tar.gz) = 014bedb2b334ba8e8e23b4c660590357f8055dbed7b9b017e4cc2937876a8822 SIZE (openresty-nginx-eval-module-582bd25_GH0.tar.gz) = 14849 SHA256 (aperezdc-ngx-fancyindex-v0.5.2_GH0.tar.gz) = c3dd84d8ba0b8daeace3041ef5987e3fb96e9c7c17df30c9ffe2fe3aa2a0ca31 SIZE (aperezdc-ngx-fancyindex-v0.5.2_GH0.tar.gz) = 29052 SHA256 (alibaba-nginx-http-footer-filter-1.2.2_GH0.tar.gz) = 3493b54460c59370f9f60c6e662862752f1920fc6e684f7a66bb2b3260692813 SIZE (alibaba-nginx-http-footer-filter-1.2.2_GH0.tar.gz) = 3934 SHA256 (leev-ngx_http_geoip2_module-3.4_GH0.tar.gz) = ad72fc23348d715a330994984531fab9b3606e160483236737f9a4a6957d9452 SIZE (leev-ngx_http_geoip2_module-3.4_GH0.tar.gz) = 8877 SHA256 (ip2location-ip2location-nginx-2df35fb_GH0.tar.gz) = 86d6d6d6b4437ecc621c5aac7bd5475dffd33afb70a51c5ea3c7f341ded46efb SIZE (ip2location-ip2location-nginx-2df35fb_GH0.tar.gz) = 5462 SHA256 (ip2location-ip2proxy-nginx-02ce447_GH0.tar.gz) = edbafe23087f019364f9d1c1c615fdbc5116ec727c49bf442e3e4b39441fc4cc SIZE (ip2location-ip2proxy-nginx-02ce447_GH0.tar.gz) = 5177 SHA256 (nginx-modules-ngx_http_json_status_module-1d2f303_GH0.tar.gz) = fdc34e0e712d28f4452ce3858ba05a38cc00703f14502095189c4a1063a36997 SIZE (nginx-modules-ngx_http_json_status_module-1d2f303_GH0.tar.gz) = 6736 SHA256 (kr-nginx-notice-3c95966_GH0.tar.gz) = e829fc94178cc8c91fef15a1fc44ee7ac162c13eddc0bba4c9427aaa23386885 SIZE (kr-nginx-notice-3c95966_GH0.tar.gz) = 3343 SHA256 (slact-nchan-v1.3.6_GH0.tar.gz) = ba0b7cc6b710a20ce1ed2554caf56154035291aaf115e407d7a6bb699fde42df SIZE (slact-nchan-v1.3.6_GH0.tar.gz) = 761436 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 (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 (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 (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 SIZE (baysao-nginx-let-module-c1f23aa_GH0.tar.gz) = 20617 SHA256 (Taymindis-nginx-link-function-3.2.4_GH0.tar.gz) = 20c3679199ba7efe1598f03b2fa0b13591226363c8dd7930d7f02702cd5abada SIZE (Taymindis-nginx-link-function-3.2.4_GH0.tar.gz) = 139656 SHA256 (openresty-lua-nginx-module-v0.10.29_GH0.tar.gz) = ca2c2122b909529bf9d1a89e9a5763835a2bd2629def8cb279c550f638f0a78f SIZE (openresty-lua-nginx-module-v0.10.29_GH0.tar.gz) = 892502 SHA256 (openresty-stream-lua-nginx-module-v0.0.16_GH0.tar.gz) = 3b1103cf5ee940ea94711eae1a7ccc1a161273ec9a08eb415f1d45ad385f967d SIZE (openresty-stream-lua-nginx-module-v0.0.16_GH0.tar.gz) = 395259 SHA256 (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 8c2bdbe875e4f5225d0778bfb09a2668f9281d7de6218c7b462a7ba2cee06fe8 SIZE (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 34654 SHA256 (SpiderLabs-ModSecurity-nginx-v1.0.3_GH0.tar.gz) = 32a42256616cc674dca24c8654397390adff15b888b77eb74e0687f023c8751b SIZE (SpiderLabs-ModSecurity-nginx-v1.0.3_GH0.tar.gz) = 34063 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 (nginx-njs-0.9.6_GH0.tar.gz) = 713e931d1ffcd337f6304dc55e512dcf2099ba4cc3a996c9ea14f22d5d9cdd79 -SIZE (nginx-njs-0.9.6_GH0.tar.gz) = 953437 +SHA256 (nginx-njs-0.9.8_GH0.tar.gz) = 016cea70b70f0abcf894366bd555e34ea839b920fac1b085fb063a2ecccc8672 +SIZE (nginx-njs-0.9.8_GH0.tar.gz) = 967795 SHA256 (osokin-nginx-otel-51273ec_GH0.tar.gz) = a2107ba0be94c8561ae50773163c7946a58e508be46920f588d05a347c867d9c SIZE (osokin-nginx-otel-51273ec_GH0.tar.gz) = 28076 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 (nginx-shib-nginx-http-shibboleth-be12df5_GH0.tar.gz) = aff9830b5de78dd9ce32cd2c55c5cf9173c99fe1a1d2190407c96668e7517bab SIZE (nginx-shib-nginx-http-shibboleth-be12df5_GH0.tar.gz) = 23872 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 (vozlt-nginx-module-sts-3c10d42_GH0.tar.gz) = 748b67ceb82b3b843ae915bf7863fd08b7c2427c045e5ec540242d050f7b30d0 SIZE (vozlt-nginx-module-sts-3c10d42_GH0.tar.gz) = 352431 SHA256 (diogoazevedos-nginx-vod-module-b9b4b44_GH0.tar.gz) = 6fb69766c735d271735192c324b28698659e65490c78561ac3bd20b52c0c90be SIZE (diogoazevedos-nginx-vod-module-b9b4b44_GH0.tar.gz) = 446738 SHA256 (vozlt-nginx-module-vts-bf64dbf_GH0.tar.gz) = d2782c75e39cb2ecf68453922b43ab2295adb6a35fa6a0f9c14173f70d22d7b1 SIZE (vozlt-nginx-module-vts-bf64dbf_GH0.tar.gz) = 180394 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 (tokers-zstd-nginx-module-f4ba115_GH0.tar.gz) = 20045e8ac80e2cc9fd3659573153cb1f22d98a653a10fe939a4be0e90160826a SIZE (tokers-zstd-nginx-module-f4ba115_GH0.tar.gz) = 55848 diff --git a/www/nginx/files/extra-patch-src-http-ngx_http_upstream_round_robin.c b/www/nginx/files/extra-patch-src-http-ngx_http_upstream_round_robin.c index e5012b098309..b2588f7a9ff4 100644 --- a/www/nginx/files/extra-patch-src-http-ngx_http_upstream_round_robin.c +++ b/www/nginx/files/extra-patch-src-http-ngx_http_upstream_round_robin.c @@ -1,101 +1,138 @@ ---- src/http/ngx_http_upstream_round_robin.c.orig 2016-02-24 14:53:24 UTC -+++ src/http/ngx_http_upstream_round_robin.c -@@ -9,6 +9,9 @@ - #include +--- src/http/ngx_http_upstream_round_robin.c.orig ++++ src/http/ngx_http_upstream_round_robin.c 2026-05-04 16:03:21.659464946 +0000 +@@ -10,6 +10,10 @@ #include + #include +#if (NGX_HTTP_UPSTREAM_CHECK) +#include "ngx_http_upstream_check_module.h" +#endif ++ - #define ngx_http_upstream_tries(p) ((p)->number \ - + ((p)->next ? (p)->next->number : 0)) -@@ -96,7 +99,14 @@ ngx_http_upstream_init_round_robin(ngx_c - peer[n].fail_timeout = server[i].fail_timeout; + #define ngx_http_upstream_tries(p) ((p)->tries \ + + ((p)->next ? (p)->next->tries : 0)) +@@ -196,6 +200,16 @@ + peer[n].down = server[i].down; + peer[n].server = server[i].name; + ++#if (NGX_HTTP_UPSTREAM_CHECK) ++ if (!server[i].down) { ++ peer[n].check_index = ++ ngx_http_upstream_check_add_peer(cf, us, ++ &server[i].addrs[0]); ++ } else { ++ peer[n].check_index = (ngx_uint_t) NGX_ERROR; ++ } ++#endif ++ + #if (NGX_HTTP_UPSTREAM_SID) + if (ngx_http_upstream_create_sid(cf, &peer[n], &server[i].sid) + != NGX_OK) +@@ -225,6 +239,16 @@ peer[n].down = server[i].down; peer[n].server = server[i].name; -- + +#if (NGX_HTTP_UPSTREAM_CHECK) + if (!server[i].down) { + peer[n].check_index = -+ ngx_http_upstream_check_add_peer(cf, us, &server[i].addrs[j]); ++ ngx_http_upstream_check_add_peer(cf, us, ++ &server[i].addrs[j]); + } else { + peer[n].check_index = (ngx_uint_t) NGX_ERROR; + } +#endif - *peerp = &peer[n]; - peerp = &peer[n].next; - n++; -@@ -159,7 +169,15 @@ ngx_http_upstream_init_round_robin(ngx_c - peer[n].fail_timeout = server[i].fail_timeout; ++ + #if (NGX_HTTP_UPSTREAM_SID) + if (ngx_http_upstream_create_sid(cf, &peer[n], &server[i].sid) + != NGX_OK) +@@ -338,6 +362,16 @@ peer[n].down = server[i].down; peer[n].server = server[i].name; -- + +#if (NGX_HTTP_UPSTREAM_CHECK) + if (!server[i].down) { + peer[n].check_index = -+ ngx_http_upstream_check_add_peer(cf, us, &server[i].addrs[j]); ++ ngx_http_upstream_check_add_peer(cf, us, ++ &server[i].addrs[0]); ++ } else { ++ peer[n].check_index = (ngx_uint_t) NGX_ERROR; + } -+ else { ++#endif ++ + #if (NGX_HTTP_UPSTREAM_SID) + if (ngx_http_upstream_create_sid(cf, &peer[n], &server[i].sid) + != NGX_OK) +@@ -367,6 +401,16 @@ + peer[n].down = server[i].down; + peer[n].server = server[i].name; + ++#if (NGX_HTTP_UPSTREAM_CHECK) ++ if (!server[i].down) { ++ peer[n].check_index = ++ ngx_http_upstream_check_add_peer(cf, us, ++ &server[i].addrs[j]); ++ } else { + peer[n].check_index = (ngx_uint_t) NGX_ERROR; + } +#endif - *peerp = &peer[n]; - peerp = &peer[n].next; - n++; -@@ -225,6 +243,9 @@ ngx_http_upstream_init_round_robin(ngx_c - peer[i].current_weight = 0; ++ + #if (NGX_HTTP_UPSTREAM_SID) + if (ngx_http_upstream_create_sid(cf, &peer[n], &server[i].sid) + != NGX_OK) +@@ -442,6 +486,9 @@ + peer[i].max_conns = 0; peer[i].max_fails = 1; peer[i].fail_timeout = 10; +#if (NGX_HTTP_UPSTREAM_CHECK) + peer[i].check_index = (ngx_uint_t) NGX_ERROR; +#endif *peerp = &peer[i]; peerp = &peer[i].next; } -@@ -339,6 +360,9 @@ ngx_http_upstream_create_round_robin_pee - peer[0].current_weight = 0; +@@ -624,6 +671,9 @@ + peer[0].max_conns = 0; peer[0].max_fails = 1; peer[0].fail_timeout = 10; +#if (NGX_HTTP_UPSTREAM_CHECK) + peer[0].check_index = (ngx_uint_t) NGX_ERROR; +#endif peers->peer = peer; } else { -@@ -381,6 +405,9 @@ ngx_http_upstream_create_round_robin_pee - peer[i].current_weight = 0; +@@ -658,6 +708,9 @@ + peer[i].max_conns = 0; peer[i].max_fails = 1; peer[i].fail_timeout = 10; +#if (NGX_HTTP_UPSTREAM_CHECK) + peer[i].check_index = (ngx_uint_t) NGX_ERROR; +#endif *peerp = &peer[i]; peerp = &peer[i].next; } -@@ -441,6 +468,12 @@ ngx_http_upstream_get_round_robin_peer(n - goto failed; - } - +@@ -733,6 +786,12 @@ + if (peer->max_conns && peer->conns >= peer->max_conns) { + goto failed; + } ++ +#if (NGX_HTTP_UPSTREAM_CHECK) -+ if (ngx_http_upstream_check_peer_down(peer->check_index)) { -+ goto failed; -+ } ++ if (ngx_http_upstream_check_peer_down(peer->check_index)) { ++ goto failed; ++ } +#endif -+ - rrp->current = peer; - - } else { -@@ -542,6 +575,12 @@ ngx_http_upstream_get_peer(ngx_http_upst + #if (NGX_HTTP_UPSTREAM_SID) + } + #endif +@@ -870,6 +929,12 @@ continue; } +#if (NGX_HTTP_UPSTREAM_CHECK) + if (ngx_http_upstream_check_peer_down(peer->check_index)) { + continue; + } +#endif + if (peer->max_fails && peer->fails >= peer->max_fails && now - peer->checked <= peer->fail_timeout) + diff --git a/www/nginx/version.mk b/www/nginx/version.mk index bbe792b57f68..0163b0501dd8 100644 --- a/www/nginx/version.mk +++ b/www/nginx/version.mk @@ -1 +1 @@ -NGINX_VERSION= 1.28.3 +NGINX_VERSION= 1.30.1