www/nginx-devel: update 1.25.4 -> 1.25.5 (+)

Fix building third-party naxsi module.

<Changelog>

*) Feature: virtual servers in the stream module.

*) Feature: the ngx_stream_pass_module.

*) Feature: the "deferred", "accept_filter", and "setfib" parameters of
   the "listen" directive in the stream module.

*) Feature: cache line size detection for some architectures.
   Thanks to Piotr Sikora.

*) Feature: support for Homebrew on Apple Silicon.
   Thanks to Piotr Sikora.

*) Bugfix: Windows cross-compilation bugfixes and improvements.
   Thanks to Piotr Sikora.

*) Bugfix: unexpected connection closure while using 0-RTT in QUIC.
   Thanks to Vladimir Khomutov.

</Changelog>

6 files changed, 24 insertions, 10 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index d29d25f9adde..9a244c1c123f 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -1,6 +1,5 @@
 PORTNAME?=	nginx
-PORTVERSION=	1.25.4
-PORTREVISION=	7
+PORTVERSION=	1.25.5
 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 b0d3d1827451..503e676388ff 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -36,7 +36,8 @@ CACHE_PURGE_VARS=	DSO_EXTMODS+=cache_purge
 CT_IMPLIES=		HTTP_SSL
 CT_GH_TUPLE=		grahamedgecombe:nginx-ct:93e9884:ct
 CT_VARS=		DSO_EXTMODS+=ct
-CT_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-nginx-ct-LibreSSL
+CT_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-nginx-ct-LibreSSL \
+			${PATCHDIR}/extra-patch-ngx_stream_ssl_ct_module.c
 
 ECHO_GH_TUPLE=		openresty:echo-nginx-module:5a402aa:echo
 ECHO_VARS=		DSO_EXTMODS+=echo
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 3e1eceeccc46..39a6daca4441 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1712524092
-SHA256 (nginx-1.25.4.tar.gz) = 760729901acbaa517996e681ee6ea259032985e37c2768beef80df3a877deed9
-SIZE (nginx-1.25.4.tar.gz) = 1236273
+TIMESTAMP = 1713445894
+SHA256 (nginx-1.25.5.tar.gz) = 2fe2294f8af4144e7e842eaea884182a84ee7970e11046ba98194400902bbec0
+SIZE (nginx-1.25.5.tar.gz) = 1244060
 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
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 9aeec390a0de..bdd074b620dd 100644
--- a/www/nginx-devel/files/extra-patch-naxsi-libinjection__sqli_c
+++ b/www/nginx-devel/files/extra-patch-naxsi-libinjection__sqli_c
@@ -1,5 +1,5 @@
---- ../libinjection-51f3a96/src/libinjection_sqli.c.orig	2023-05-30 15:47:57.333208000 -0400
-+++ ../libinjection-51f3a96/src/libinjection_sqli.c	2023-05-30 15:49:52.273873000 -0400
+--- ../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 @@
  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 a73cf8f4e085..8fa8a4785527 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.5/naxsi_src/config.orig	2023-09-27 09:43:18.644606000 -0400
-+++ ../naxsi-1.5/naxsi_src/config	2023-09-27 09:44:37.585970000 -0400
+--- ../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
 @@ -24,11 +24,6 @@
  "
  
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
new file mode 100644
index 000000000000..b3df57b24218
--- /dev/null
+++ b/www/nginx-devel/files/extra-patch-ngx_stream_ssl_ct_module.c
@@ -0,0 +1,14 @@
+--- ../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;