diff options
Diffstat (limited to 'www/nginx/files')
4 files changed, 4 insertions, 38 deletions
diff --git a/www/nginx/files/extra-patch-nginx-ct-LibreSSL b/www/nginx/files/extra-patch-nginx-ct-LibreSSL deleted file mode 100644 index 9aa89a463a9d..000000000000 --- a/www/nginx/files/extra-patch-nginx-ct-LibreSSL +++ /dev/null @@ -1,20 +0,0 @@ ---- ../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 @@ - #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 @@ - 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, - const unsigned char **out, size_t *outlen, X509 *x, size_t chainidx, diff --git a/www/nginx/files/extra-patch-ngx_stream_ssl_ct_module.c b/www/nginx/files/extra-patch-ngx_stream_ssl_ct_module.c deleted file mode 100644 index b3df57b24218..000000000000 --- a/www/nginx/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/files/extra-patch-passenger-build-nginx.rb b/www/nginx/files/extra-patch-passenger-build-nginx.rb index 34ad92f207b2..73223329c8a7 100644 --- a/www/nginx/files/extra-patch-passenger-build-nginx.rb +++ b/www/nginx/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.27/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400 ++++ ../passenger-6.0.27/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/files/extra-patch-passenger-disable-telemetry b/www/nginx/files/extra-patch-passenger-disable-telemetry index 302ae5bf765d..935f6a5425e5 100644 --- a/www/nginx/files/extra-patch-passenger-disable-telemetry +++ b/www/nginx/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.27/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig 2018-12-03 12:23:06.980728000 -0500 ++++ ../passenger-6.0.27/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, |