diff options
Diffstat (limited to 'www/nginx-devel/files')
3 files changed, 4 insertions, 56 deletions
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 ad018bbf0e46..b0d51ce6bc63 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.4/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400 -+++ ../passenger-6.0.4/build/nginx.rb 2016-05-09 18:21:22.426777000 -0400 +--- ../passenger-6.0.5/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400 ++++ ../passenger-6.0.5/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 233b5c9428eb..3905e741c67d 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.4/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig 2018-12-03 12:23:06.980728000 -0500 -+++ ../passenger-6.0.4/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb 2018-12-03 12:23:32.978924000 -0500 +--- ../passenger-6.0.5/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig 2018-12-03 12:23:06.980728000 -0500 ++++ ../passenger-6.0.5/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-system-calls b/www/nginx-devel/files/extra-patch-passenger-system-calls deleted file mode 100644 index 6ce971b856c0..000000000000 --- a/www/nginx-devel/files/extra-patch-passenger-system-calls +++ /dev/null @@ -1,52 +0,0 @@ ---- ../passenger-6.0.4/src/cxx_supportlib/oxt/system_calls.cpp.original 2019-11-15 01:35:57.674449000 +0200 -+++ ../passenger-6.0.4/src/cxx_supportlib/oxt/system_calls.cpp 2019-11-15 01:36:06.053234000 +0200 -@@ -132,15 +132,15 @@ - _my_errno = errno; \ - } while ((error_expression) \ - && _my_errno == EINTR \ -- && (!this_thread::syscalls_interruptable() \ -- || !(_intr_requested = this_thread::interruption_requested())) \ -+ && (!boost::this_thread::syscalls_interruptable() \ -+ || !(_intr_requested = boost::this_thread::interruption_requested())) \ - ); \ - if (OXT_LIKELY(ctx != NULL)) { \ - ctx->syscall_interruption_lock.lock(); \ - } \ - if ((error_expression) \ - && _my_errno == EINTR \ -- && this_thread::syscalls_interruptable() \ -+ && boost::this_thread::syscalls_interruptable() \ - && _intr_requested) { \ - throw thread_interrupted(); \ - } \ -@@ -284,8 +284,8 @@ - } - if (ret == -1 - && errno == EINTR -- && this_thread::syscalls_interruptable() -- && this_thread::interruption_requested()) { -+ && boost::this_thread::syscalls_interruptable() -+ && boost::this_thread::interruption_requested()) { - throw thread_interrupted(); - } else { - return ret; -@@ -662,8 +662,8 @@ - } - } while (ret == -1 - && e == EINTR -- && (!this_thread::syscalls_interruptable() -- || !(intr_requested = this_thread::interruption_requested())) -+ && (!boost::this_thread::syscalls_interruptable() -+ || !(intr_requested = boost::this_thread::interruption_requested())) - ); - - if (OXT_UNLIKELY(ctx != NULL)) { -@@ -672,7 +672,7 @@ - - if (ret == -1 - && e == EINTR -- && this_thread::syscalls_interruptable() -+ && boost::this_thread::syscalls_interruptable() - && intr_requested) { - throw thread_interrupted(); - } |