From 47188d4c5412e61941af58e3caf70ec521f9c3da Mon Sep 17 00:00:00 2001 From: "Sergey A. Osokin" Date: Fri, 5 Jun 2020 22:23:22 +0000 Subject: Update passenger and its third-party module from 6.0.4 to 6.0.5. Bump PORTREVISION for www/nginx-devel. --- .../files/extra-patch-passenger-system-calls | 52 ---------------------- 1 file changed, 52 deletions(-) delete mode 100644 www/nginx-devel/files/extra-patch-passenger-system-calls (limited to 'www/nginx-devel/files/extra-patch-passenger-system-calls') 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(); - } -- cgit v1.2.3