diff options
| author | Sergey A. Osokin <osa@FreeBSD.org> | 2024-04-18 13:06:46 -0400 |
|---|---|---|
| committer | Sergey A. Osokin <osa@FreeBSD.org> | 2024-04-18 13:07:41 -0400 |
| commit | d83020dff1f7eaab1c8ca0ec8385e9569656cee3 (patch) | |
| tree | 62264b89e530e86d371d6a4260b97090a61fd5f0 /www/nginx-devel/files | |
| parent | devel/py-virtualenv: Update to 20.25.3 (diff) | |
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>
Diffstat (limited to 'www/nginx-devel/files')
3 files changed, 18 insertions, 4 deletions
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; |