Date: Tue, 4 Feb 2025 19:29:39 GMT From: "Sergey A. Osokin" <osa@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 4e51506ec92c - main - www/nginx-devel: update third-party modules... Message-ID: <202502041929.514JTdrR032528@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=4e51506ec92c7ee330509ade93bb618c6f8101f3 commit 4e51506ec92c7ee330509ade93bb618c6f8101f3 Author: Sergey A. Osokin <osa@FreeBSD.org> AuthorDate: 2025-02-04 19:29:05 +0000 Commit: Sergey A. Osokin <osa@FreeBSD.org> CommitDate: 2025-02-04 19:29:32 +0000 www/nginx-devel: update third-party modules... to their recent snapshots or versions: o) array-var o) aws_auth o) ct o) echo o) dynamic_upstream o) encrypted-session o) headers_more o) http-auth-digest o) auth-ldap o) auth_pam o) eval o) fancyindex o) geoip2 o) ip2location o) http_json_status o) passenger Bump PORTREVISION. --- www/nginx-devel/Makefile | 6 +- www/nginx-devel/Makefile.extmod | 40 ++++++------- www/nginx-devel/distinfo | 70 +++++++++++----------- .../files/extra-patch-nginx-ct-LibreSSL | 23 ++++--- .../files/extra-patch-ngx_http_auth_ldap_module.c | 4 +- .../extra-patch-ngx_http_json_status_module-config | 4 +- .../files/extra-patch-ngx_stream_ssl_ct_module.c | 14 ----- .../files/extra-patch-passenger-build-nginx.rb | 4 +- .../files/extra-patch-passenger-disable-telemetry | 4 +- .../files/extra-patch-passenger-implementation.cpp | 14 +++++ ...xtra-patch-spnego-http-auth-nginx-module-config | 4 +- .../extra-patch-stream-lua-nginx-module_config | 10 ---- 12 files changed, 96 insertions(+), 101 deletions(-) diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 26d3f32fc988..a6241039920a 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME?= nginx PORTVERSION= 1.27.3 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa @@ -256,10 +256,6 @@ NJS_CONFIGURE_ARGS= --cc-opt="-I${LOCALBASE}/include/quickjs" \ --with-quickjs .endif -.if ${PORT_OPTIONS:MCT} -IGNORE= patching is required for the CT third-party module -.endif - pre-everything:: @${ECHO_MSG} .if ${PORT_OPTIONS:MHTTP_UPSTREAM_FAIR} diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod index f8f5d208d1e5..fe6a8bb2b83b 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -19,10 +19,10 @@ 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_GH_TUPLE= openresty:array-var-nginx-module:v0.06:arrayvar ARRAYVAR_VARS= DSO_EXTMODS+=arrayvar -AWS_AUTH_GH_TUPLE= anomalizer:ngx_aws_auth:21931b2:aws_auth +AWS_AUTH_GH_TUPLE= anomalizer:ngx_aws_auth:f3d9862:aws_auth AWS_AUTH_VARS= DSO_EXTMODS+=aws_auth BROTLI_LIB_DEPENDS= libbrotlicommon.so:archivers/brotli @@ -34,12 +34,11 @@ CACHE_PURGE_GH_TUPLE= nginx-modules:ngx_cache_purge:a84b0f3:cache_purge CACHE_PURGE_VARS= DSO_EXTMODS+=cache_purge CT_IMPLIES= HTTP_SSL -CT_GH_TUPLE= grahamedgecombe:nginx-ct:93e9884:ct +CT_GH_TUPLE= BenBE:nginx-ct:71bf4d2:ct CT_VARS= DSO_EXTMODS+=ct -CT_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-ct-LibreSSL \ - ${PATCHDIR}/extra-patch-ngx_stream_ssl_ct_module.c +CT_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-ct-LibreSSL -ECHO_GH_TUPLE= openresty:echo-nginx-module:5a402aa:echo +ECHO_GH_TUPLE= openresty:echo-nginx-module:4eeda3c:echo ECHO_VARS= DSO_EXTMODS+=echo DRIZZLE_LIB_DEPENDS= libdrizzle.so:databases/libdrizzle @@ -50,14 +49,14 @@ DRIZZLE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-openresty-drizzle-nginx-module-co DRIZZLE_VARS= DSO_EXTMODS+=drizzle DYNAMIC_UPSTREAM_IMPLIES= STREAM -DYNAMIC_UPSTREAM_GH_TUPLE= ZigzagAK:ngx_dynamic_upstream:960eef2:dynamic_upstream +DYNAMIC_UPSTREAM_GH_TUPLE= ZigzagAK:ngx_dynamic_upstream:ab67fe7: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_GH_TUPLE= openresty:encrypted-session-nginx-module:7ffe4ec:encryptsession ENCRYPTSESSION_VARS= DSO_EXTMODS+=encryptsession FIPS_CHECK_GH_TUPLE= ogarrett:nginx-fips-check-module:6cb4270:fipscheck @@ -72,25 +71,25 @@ 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_GH_TUPLE= openresty:headers-more-nginx-module:84a65d6: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_GH_TUPLE= atomx:nginx-http-auth-digest:ac91c88: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_GH_TUPLE= stnoonan:spnego-http-auth-nginx-module:b62dadb: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_GH_TUPLE= kvspb:nginx-auth-ldap:241200e: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_GH_TUPLE= sto:ngx_http_auth_pam_module:v1.5.5:auth_pam HTTP_AUTH_PAM_VARS= DSO_EXTMODS+=auth_pam HTTP_DAV_EXT_IMPLIES= HTTP_DAV @@ -100,22 +99,22 @@ 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_GH_TUPLE= openresty:nginx-eval-module:13425e8:eval HTTP_EVAL_VARS= DSO_EXTMODS+=eval -HTTP_FANCYINDEX_GH_TUPLE= aperezdc:ngx-fancyindex:v0.5.2:fancyindex +HTTP_FANCYINDEX_GH_TUPLE= aperezdc:ngx-fancyindex:cbc0d3f: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_GH_TUPLE= leev:ngx_http_geoip2_module:445df24: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_GH_TUPLE= ip2location:ip2location-nginx:5f2c59a:ip2location HTTP_IP2LOCATION_LIB_DEPENDS= libIP2Location.so:net/ip2location HTTP_IP2LOCATION_VARS= DSO_EXTMODS+=ip2location @@ -123,7 +122,7 @@ 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_GH_TUPLE= nginx-modules:ngx_http_json_status_module:c77dff4:json_status HTTP_JSON_STATUS_VARS= DSO_EXTMODS+=json_status HTTP_JSON_STATUS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_json_status_module-config @@ -262,7 +261,7 @@ OTEL_LIB_DEPENDS= libabsl_base.so:devel/abseil \ 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.0.23 +PASSENGER_NGINX_VER= 6.0.24 PASSENGER_CATEGORIES= ruby PASSENGER_USES= ruby PASSENGER_BUILD_DEPENDS=${LOCALBASE}/bin/rake:devel/rubygem-rake @@ -272,7 +271,8 @@ PASSENGER_DISTFILES= passenger-${PASSENGER_NGINX_VER}.tar.gz:passenger PASSENGER_VARS= WRKSRC_passenger=${WRKDIR}/passenger-${PASSENGER_NGINX_VER} \ DSO_EXTDIRS+=passenger-${PASSENGER_NGINX_VER}/src/nginx_module PASSENGER_EXTRA_PATCHES=${PATCHDIR}/extra-patch-passenger-build-nginx.rb \ - ${PATCHDIR}/extra-patch-passenger-disable-telemetry + ${PATCHDIR}/extra-patch-passenger-disable-telemetry \ + ${PATCHDIR}/extra-patch-passenger-implementation.cpp POSTGRES_USES= pgsql POSTGRES_GH_TUPLE= konstruxi:ngx_postgres:8aa7359:postgres diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo index 47317d36d299..494aaa57caf1 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,68 +1,68 @@ -TIMESTAMP = 1738687952 +TIMESTAMP = 1738694428 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 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.0.23.tar.gz) = 897555224fb11340677780d929b5099da62303b1ae15f2e7c65cd3f6d3e7920c -SIZE (passenger-6.0.23.tar.gz) = 8298217 +SHA256 (passenger-6.0.24.tar.gz) = 3bc636ecf3e337c9fad13842fa539dabab546d458dfe4e2ae7c83419e7b8839c +SIZE (passenger-6.0.24.tar.gz) = 8322829 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 (openresty-array-var-nginx-module-v0.06_GH0.tar.gz) = 2c3577265d1d51a2d0646311b9c651520a74455253b6f7a5776af79e9bff5cb1 +SIZE (openresty-array-var-nginx-module-v0.06_GH0.tar.gz) = 12005 +SHA256 (anomalizer-ngx_aws_auth-f3d9862_GH0.tar.gz) = 3e8cbb594abccb84ce9660d31e9d623b615eab3720bca206cfddeeab9eb2383e +SIZE (anomalizer-ngx_aws_auth-f3d9862_GH0.tar.gz) = 16080 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 (grahamedgecombe-nginx-ct-93e9884_GH0.tar.gz) = 72fdd125b9207cdda135f368095f85b943a78a4ff004d1cd217972e12b1571b2 -SIZE (grahamedgecombe-nginx-ct-93e9884_GH0.tar.gz) = 7224 +SHA256 (BenBE-nginx-ct-71bf4d2_GH0.tar.gz) = 15441194cf9ffee84394ac75f0c3ded8712ae07b0ee8194aa5ca47ec8f670321 +SIZE (BenBE-nginx-ct-71bf4d2_GH0.tar.gz) = 8212 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-c631276_GH0.tar.gz) = 215ebeb3bad3a907f13fbdae66a25939b6820bdba2f339394cbb9c8b8557308a SIZE (openresty-drizzle-nginx-module-c631276_GH0.tar.gz) = 51675 -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 (ZigzagAK-ngx_dynamic_upstream-ab67fe7_GH0.tar.gz) = 4610da3ce9c35e3eef0e6d12a6285b9c8020f6d44fb094b4af94c1275bc01156 +SIZE (ZigzagAK-ngx_dynamic_upstream-ab67fe7_GH0.tar.gz) = 22991 +SHA256 (openresty-echo-nginx-module-4eeda3c_GH0.tar.gz) = 64093d606c7bc61a26ca49bfa7c4a2dacec6013ce158463a377592a6f7224444 +SIZE (openresty-echo-nginx-module-4eeda3c_GH0.tar.gz) = 53544 +SHA256 (openresty-encrypted-session-nginx-module-7ffe4ec_GH0.tar.gz) = 1848ee88be81350326918930463e0f2be2013ab76ae589d01f00fd81c5da0c07 +SIZE (openresty-encrypted-session-nginx-module-7ffe4ec_GH0.tar.gz) = 11899 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 (openresty-headers-more-nginx-module-84a65d6_GH0.tar.gz) = e99175b8eddcaaaea94856c9a9a90036f8b959c016cedf42cbfbc9cdd63b035f +SIZE (openresty-headers-more-nginx-module-84a65d6_GH0.tar.gz) = 29468 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 (atomx-nginx-http-auth-digest-ac91c88_GH0.tar.gz) = 31b2a737d3d5d118a286a0b8a6e2637eda313dba07a9a5824e4c6e33ea6e2b80 +SIZE (atomx-nginx-http-auth-digest-ac91c88_GH0.tar.gz) = 17890 +SHA256 (stnoonan-spnego-http-auth-nginx-module-b62dadb_GH0.tar.gz) = 98fe1ef483a8bfbdd663d6d002a507f716be29c179f34bc2049e073d22557a5e +SIZE (stnoonan-spnego-http-auth-nginx-module-b62dadb_GH0.tar.gz) = 30460 +SHA256 (kvspb-nginx-auth-ldap-241200e_GH0.tar.gz) = d3aa3a5ead311b34059d6ab1b6d2cf3ac8269c47a87b768523c07381229db470 +SIZE (kvspb-nginx-auth-ldap-241200e_GH0.tar.gz) = 18541 +SHA256 (sto-ngx_http_auth_pam_module-v1.5.5_GH0.tar.gz) = 98a71617d9119ae784993e3789ce8766fdf2ff2479691f3dc6cf8d8763f8d364 +SIZE (sto-ngx_http_auth_pam_module-v1.5.5_GH0.tar.gz) = 7233 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 (openresty-nginx-eval-module-13425e8_GH0.tar.gz) = 48664ecd18041633829fc66b5e339ca7e75f44648c7bcbdd18e8cf8691a100bd +SIZE (openresty-nginx-eval-module-13425e8_GH0.tar.gz) = 14936 +SHA256 (aperezdc-ngx-fancyindex-cbc0d3f_GH0.tar.gz) = ded74515205e1e7a3a0175214bbe62ac3a13c21bd428084783d6345520bed782 +SIZE (aperezdc-ngx-fancyindex-cbc0d3f_GH0.tar.gz) = 30334 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 (leev-ngx_http_geoip2_module-445df24_GH0.tar.gz) = f19985b13e4095168a60aab5a1b29940ff586bf7571c61aa70ca7cd2f807850c +SIZE (leev-ngx_http_geoip2_module-445df24_GH0.tar.gz) = 8889 +SHA256 (ip2location-ip2location-nginx-5f2c59a_GH0.tar.gz) = 3eb29b516d80afcc5267ef436bd527b0810257437bce48bdfd6070dd10f1b767 +SIZE (ip2location-ip2location-nginx-5f2c59a_GH0.tar.gz) = 5506 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 (nginx-modules-ngx_http_json_status_module-c77dff4_GH0.tar.gz) = a071c50834142dc094a2915a5ac7bd80765d76bbe736fe291e40f593c8278f16 +SIZE (nginx-modules-ngx_http_json_status_module-c77dff4_GH0.tar.gz) = 6753 SHA256 (kr-nginx-notice-3c95966_GH0.tar.gz) = e829fc94178cc8c91fef15a1fc44ee7ac162c13eddc0bba4c9427aaa23386885 SIZE (kr-nginx-notice-3c95966_GH0.tar.gz) = 3343 SHA256 (slact-nchan-v1.3.7_GH0.tar.gz) = 6e82c673cedc7d33ee48ea1c198964fdcf6853bf851de797002199a496f08263 diff --git a/www/nginx-devel/files/extra-patch-nginx-ct-LibreSSL b/www/nginx-devel/files/extra-patch-nginx-ct-LibreSSL index 9aa89a463a9d..a3b500629983 100644 --- a/www/nginx-devel/files/extra-patch-nginx-ct-LibreSSL +++ b/www/nginx-devel/files/extra-patch-nginx-ct-LibreSSL @@ -1,20 +1,29 @@ ---- ../nginx-ct-93e9884/ngx_ssl_ct_module.c.orig 2017-07-23 08:03:35.000000000 -0400 -+++ ../nginx-ct-93e9884/ngx_ssl_ct_module.c 2018-04-24 16:58:27.698435000 -0400 -@@ -158,7 +158,7 @@ +--- ../nginx-ct-71bf4d2/ngx_ssl_ct_module.c.orig 2024-12-07 10:41:38.000000000 -0500 ++++ ../nginx-ct-71bf4d2/ngx_ssl_ct_module.c 2025-02-04 13:44:15.064346000 -0500 +@@ -135,7 +135,7 @@ + continue; + } + +-#ifndef OPENSSL_IS_BORINGSSL ++#if !defined(OPENSSL_IS_BORINGSSL) && !defined(LIBRESSL_VERSION_NUMBER) + /* associate the sct_list with the cert */ + X509_set_ex_data(cert, ngx_ssl_ct_sct_list_index, sct_list); + +@@ -165,7 +165,7 @@ #endif } -#ifndef OPENSSL_IS_BORINGSSL +#if !defined(OPENSSL_IS_BORINGSSL) && !defined(LIBRESSL_VERSION_NUMBER) /* add OpenSSL TLS extension */ - # if OPENSSL_VERSION_NUMBER >= 0x10101000L int context = SSL_EXT_CLIENT_HELLO -@@ -183,7 +183,7 @@ + | SSL_EXT_TLS1_2_SERVER_HELLO +@@ -181,7 +181,7 @@ return NGX_CONF_OK; } -#ifndef OPENSSL_IS_BORINGSSL +#if !defined(OPENSSL_IS_BORINGSSL) && !defined(LIBRESSL_VERSION_NUMBER) - # if OPENSSL_VERSION_NUMBER >= 0x10101000L - int ngx_ssl_ct_ext_cb(SSL *s, unsigned int ext_type, unsigned int context, + static int ngx_ssl_ct_ext_cb(SSL *s, unsigned int ext_type, unsigned int context, const unsigned char **out, size_t *outlen, X509 *x, size_t chainidx, + int *al, void *add_arg) { diff --git a/www/nginx-devel/files/extra-patch-ngx_http_auth_ldap_module.c b/www/nginx-devel/files/extra-patch-ngx_http_auth_ldap_module.c index d8bc2f7f65f3..0c5853d3d1dc 100644 --- a/www/nginx-devel/files/extra-patch-ngx_http_auth_ldap_module.c +++ b/www/nginx-devel/files/extra-patch-ngx_http_auth_ldap_module.c @@ -1,5 +1,5 @@ ---- ../nginx-auth-ldap-83c059b/ngx_http_auth_ldap_module.c.orig 2022-08-21 17:04:57.754760000 +0300 -+++ ../nginx-auth-ldap-83c059b/ngx_http_auth_ldap_module.c 2022-08-21 17:08:46.939318000 +0300 +--- ../nginx-auth-ldap-241200e/ngx_http_auth_ldap_module.c.orig 2022-08-21 17:04:57.754760000 +0300 ++++ ../nginx-auth-ldap-241200e/ngx_http_auth_ldap_module.c 2022-08-21 17:08:46.939318000 +0300 @@ -1779,6 +1779,7 @@ } diff --git a/www/nginx-devel/files/extra-patch-ngx_http_json_status_module-config b/www/nginx-devel/files/extra-patch-ngx_http_json_status_module-config index 84c4a62ef6cf..d80c30bb3333 100644 --- a/www/nginx-devel/files/extra-patch-ngx_http_json_status_module-config +++ b/www/nginx-devel/files/extra-patch-ngx_http_json_status_module-config @@ -1,5 +1,5 @@ ---- ../ngx_http_json_status_module-1d2f303/config.orig 2020-04-25 16:16:47.024292000 -0400 -+++ ../ngx_http_json_status_module-1d2f303/config 2020-04-25 16:18:39.461340000 -0400 +--- ../ngx_http_json_status_module-c77dff4/config.orig 2020-04-25 16:16:47.024292000 -0400 ++++ ../ngx_http_json_status_module-c77dff4/config 2020-04-25 16:18:39.461340000 -0400 @@ -1,4 +1,6 @@ ngx_addon_name=ngx_http_json_status_module -HTTP_MODULES="$HTTP_MODULES ngx_http_json_status_module" diff --git a/www/nginx-devel/files/extra-patch-ngx_stream_ssl_ct_module.c b/www/nginx-devel/files/extra-patch-ngx_stream_ssl_ct_module.c deleted file mode 100644 index b3df57b24218..000000000000 --- a/www/nginx-devel/files/extra-patch-ngx_stream_ssl_ct_module.c +++ /dev/null @@ -1,14 +0,0 @@ ---- ../nginx-ct-93e9884/ngx_stream_ssl_ct_module.c.orig 2024-04-18 12:32:44.086600000 -0400 -+++ ../nginx-ct-93e9884/ngx_stream_ssl_ct_module.c 2024-04-18 12:37:40.764525000 -0400 -@@ -70,7 +70,11 @@ - - static char *ngx_stream_ssl_ct_merge_srv_conf(ngx_conf_t *cf, void *parent, - void *child) { -+#if nginx_version >= 1025005 -+ ngx_stream_ssl_srv_conf_t *ssl_conf = ngx_stream_conf_get_module_srv_conf(cf, -+#else - ngx_stream_ssl_conf_t *ssl_conf = ngx_stream_conf_get_module_srv_conf(cf, -+#endif - ngx_stream_ssl_module); - - ngx_array_t *certificates; diff --git a/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb b/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb index 34ad92f207b2..9ba4af28515f 100644 --- a/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb +++ b/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb @@ -1,5 +1,5 @@ ---- ../passenger-6.0.23/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400 -+++ ../passenger-6.0.23/build/nginx.rb 2016-05-09 18:21:22.426777000 -0400 +--- ../passenger-6.0.24/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400 ++++ ../passenger-6.0.24/build/nginx.rb 2016-05-09 18:21:22.426777000 -0400 @@ -33,13 +33,12 @@ desc "Build Nginx support files" task :nginx => [ diff --git a/www/nginx-devel/files/extra-patch-passenger-disable-telemetry b/www/nginx-devel/files/extra-patch-passenger-disable-telemetry index 302ae5bf765d..38bbb6d73057 100644 --- a/www/nginx-devel/files/extra-patch-passenger-disable-telemetry +++ b/www/nginx-devel/files/extra-patch-passenger-disable-telemetry @@ -1,5 +1,5 @@ ---- ../passenger-6.0.23/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig 2018-12-03 12:23:06.980728000 -0500 -+++ ../passenger-6.0.23/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb 2018-12-03 12:23:32.978924000 -0500 +--- ../passenger-6.0.24/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig 2018-12-03 12:23:06.980728000 -0500 ++++ ../passenger-6.0.24/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb 2018-12-03 12:23:32.978924000 -0500 @@ -204,7 +204,7 @@ :name => 'passenger_disable_anonymous_telemetry', :scope => :global, diff --git a/www/nginx-devel/files/extra-patch-passenger-implementation.cpp b/www/nginx-devel/files/extra-patch-passenger-implementation.cpp new file mode 100644 index 000000000000..1082f5cdf228 --- /dev/null +++ b/www/nginx-devel/files/extra-patch-passenger-implementation.cpp @@ -0,0 +1,14 @@ +--- ../passenger-6.0.24/src/cxx_supportlib/oxt/implementation.cpp.orig 2013-10-26 20:00:00.000000000 -0400 ++++ ../passenger-6.0.24/src/cxx_supportlib/oxt/implementation.cpp 2025-02-04 14:00:31.804615000 -0500 +@@ -397,9 +397,9 @@ + + static void + set_native_thread_name(const string &name) { +- #if defined(__linux__) ++ #if defined(__linux__) || defined(__FreeBSD__) + pthread_setname_np(pthread_self(), name.c_str()); +- #elif defined(__APPLE__) || defined(__FreeBSD__) ++ #elif defined(__APPLE__) + pthread_setname_np(name.c_str()); + #endif + } diff --git a/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config b/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config index a54e89e58a23..9b4fdf8e99dd 100644 --- a/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config +++ b/www/nginx-devel/files/extra-patch-spnego-http-auth-nginx-module-config @@ -1,5 +1,5 @@ ---- ../spnego-http-auth-nginx-module-3575542/config.orig 2020-08-27 07:59:28.423636000 -0400 -+++ ../spnego-http-auth-nginx-module-3575542/config 2020-08-27 08:01:42.152121000 -0400 +--- ../spnego-http-auth-nginx-module-b62dadb/config.orig 2020-08-27 07:59:28.423636000 -0400 ++++ ../spnego-http-auth-nginx-module-b62dadb/config 2020-08-27 08:01:42.152121000 -0400 @@ -1,8 +1,9 @@ ngx_addon_name=ngx_http_auth_spnego_module -ngx_feature_libs="-lgssapi_krb5 -lkrb5 -lcom_err" diff --git a/www/nginx-devel/files/extra-patch-stream-lua-nginx-module_config b/www/nginx-devel/files/extra-patch-stream-lua-nginx-module_config deleted file mode 100644 index 673cc637edd7..000000000000 --- a/www/nginx-devel/files/extra-patch-stream-lua-nginx-module_config +++ /dev/null @@ -1,10 +0,0 @@ ---- ../stream-lua-nginx-module-0.0.16/config.orig 2024-06-03 15:08:47.791681000 -0400 -+++ ../stream-lua-nginx-module-0.0.16/config 2024-06-03 15:08:58.714542000 -0400 -@@ -411,6 +411,6 @@ - #NGX_DTRACE_PROVIDERS="$NGX_DTRACE_PROVIDERS $ngx_addon_dir/dtrace/ngx_lua_provider.d" - #NGX_TAPSET_SRCS="$NGX_TAPSET_SRCS $ngx_addon_dir/tapset/ngx_lua.stp" - --CORE_INCS="$CORE_INCS $ngx_addon_dir/src/api" -+CORE_INCS="$CORE_INCS src/stream $ngx_addon_dir/src/api" - - echo "/* DO NOT EDIT! This file was automatically generated by config */" > "$ngx_addon_dir/src/ngx_stream_lua_autoconf.h"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202502041929.514JTdrR032528>