Update passenger and its third-party module from

6.0.4 to 6.0.5.

Bump PORTREVISION for www/nginx-devel.

10 files changed, 29 insertions, 159 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 12ecfe3574af..f9a6bc51b191 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.19.0
-PORTREVISION=	2
+PORTREVISION=	3
 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 56fbddbbbf38..a46148a6fd5c 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -232,7 +232,7 @@ OPENTRACING_LIB_DEPENDS=	libopentracing.so:devel/libopentracing
 OPENTRACING_VARS=		DSO_EXTMODS+=opentracing OPENTRACING_SUBDIR=/opentracing
 OPENTRACING_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-nginx-opentracing-opentracing-config
 
-PASSENGER_NGINX_VER=	6.0.4
+PASSENGER_NGINX_VER=	6.0.5
 PASSENGER_CATEGORIES=	ruby
 PASSENGER_USE=		ruby=yes
 PASSENGER_BUILD_DEPENDS=${LOCALBASE}/bin/rake:devel/rubygem-rake
@@ -242,8 +242,7 @@ PASSENGER_DISTFILES=	passenger-${PASSENGER_NGINX_VER}.tar.gz:passenger
 PASSENGER_VARS=		WRKSRC_passenger=${WRKDIR}/passenger-${PASSENGER_NGINX_VER} \
 			DSO_EXTDIRS+=passenger-${PASSENGER_NGINX_VER}/src/nginx_module
 PASSENGER_EXTRA_PATCHES=${PATCHDIR}/extra-patch-passenger-build-nginx.rb \
-			${PATCHDIR}/extra-patch-passenger-disable-telemetry \
-			${PATCHDIR}/extra-patch-passenger-system-calls
+			${PATCHDIR}/extra-patch-passenger-disable-telemetry
 
 POSTGRES_USES=		pgsql
 POSTGRES_GH_TUPLE=	konstruxi:ngx_postgres:8aa7359:postgres
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 18400f0356ac..f38d82bcf0c7 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1591365189
+TIMESTAMP = 1591366465
 SHA256 (nginx-1.19.0.tar.gz) = 44a616171fcd7d7ad7c6af3e6f3ad0879b54db5a5d21be874cd458b5691e36c8
 SIZE (nginx-1.19.0.tar.gz) = 1043748
 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
@@ -9,8 +9,8 @@ SHA256 (ngx_http_redis-0.3.9.tar.gz) = 21f87540f0a44b23ffa5df16fb3d788bc90803b25
 SIZE (ngx_http_redis-0.3.9.tar.gz) = 13051
 SHA256 (ngx_http_response-0.3.tar.gz) = 0835584029f053051c624adbe33a826ab0205c9d85a02af6019e6b57607e9045
 SIZE (ngx_http_response-0.3.tar.gz) = 2244
-SHA256 (passenger-6.0.4.tar.gz) = ec1e4b555c176642c1c316897177d54b6f7d369490280e8ee3e54644e40b250b
-SIZE (passenger-6.0.4.tar.gz) = 7347803
+SHA256 (passenger-6.0.5.tar.gz) = 94c25d5669c6cd1bc93854a020701c9869012eec621bce331bfe2d0c9c8c3532
+SIZE (passenger-6.0.5.tar.gz) = 7347149
 SHA256 (yaoweibin-nginx_ajp_module-a964a0b_GH0.tar.gz) = 0c786660ce2e5c6d23cf02e957786ad581a04cc6315145eb144ec271f7f81326
 SIZE (yaoweibin-nginx_ajp_module-a964a0b_GH0.tar.gz) = 109940
 SHA256 (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = c949d4be6f3442c8e2937046448dc8d8def25c0e0fa6f4e805144cea45eabe80
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();
- 	}
diff --git a/www/rubygem-passenger/Makefile b/www/rubygem-passenger/Makefile
index 80df183b6e4d..c42841fae41c 100644
--- a/www/rubygem-passenger/Makefile
+++ b/www/rubygem-passenger/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	passenger
-PORTVERSION=	6.0.4
-PORTREVISION=	1
+PORTVERSION=	6.0.5
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMEPREFIX=	rubygem-
diff --git a/www/rubygem-passenger/distinfo b/www/rubygem-passenger/distinfo
index 5764dc627461..ffcbecf5fe66 100644
--- a/www/rubygem-passenger/distinfo
+++ b/www/rubygem-passenger/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1568811279
-SHA256 (rubygem/passenger-6.0.4.gem) = 298806191e4e8995dbc0f94c3791b2b1916ca50b5993e04236df6f4108bfc2af
-SIZE (rubygem/passenger-6.0.4.gem) = 7262720
+TIMESTAMP = 1591366986
+SHA256 (rubygem/passenger-6.0.5.gem) = 9c6f406dd00c4a7c1169a235e454fe40e82ead83c775f488e0d34e809bcb5b76
+SIZE (rubygem/passenger-6.0.5.gem) = 7264256
diff --git a/www/rubygem-passenger/files/patch-freebsd13 b/www/rubygem-passenger/files/patch-freebsd13
deleted file mode 100644
index e05f91f21642..000000000000
--- a/www/rubygem-passenger/files/patch-freebsd13
+++ /dev/null
@@ -1,91 +0,0 @@
---- src/agent/Core/ApplicationPool/Pool/GarbageCollection.cpp.orig	2019-09-19 16:54:40.089339000 -0400
-+++ src/agent/Core/ApplicationPool/Pool/GarbageCollection.cpp	2019-09-19 16:54:58.167526000 -0400
-@@ -55,7 +55,7 @@
- 		self->garbageCollectionCond.timed_wait(lock,
- 			posix_time::seconds(5));
- 	}
--	while (!this_thread::interruption_requested()) {
-+	while (!boost::this_thread::interruption_requested()) {
- 		try {
- 			UPDATE_TRACE_POINT();
- 			unsigned long long sleepTime = self->realGarbageCollect();
---- src/agent/Core/ApplicationPool/Group/ProcessListManagement.cpp.orig	2019-09-19 16:53:35.309791000 -0400
-+++ src/agent/Core/ApplicationPool/Group/ProcessListManagement.cpp	2019-09-19 16:53:59.509027000 -0400
-@@ -305,7 +305,7 @@
- 	while (true) {
- 		assert(detachedProcessesCheckerActive);
- 
--		if (getLifeStatus() == SHUT_DOWN || this_thread::interruption_requested()) {
-+		if (getLifeStatus() == SHUT_DOWN || boost::this_thread::interruption_requested()) {
- 			UPDATE_TRACE_POINT();
- 			P_DEBUG("Stopping detached processes checker");
- 			detachedProcessesCheckerActive = false;
---- src/cxx_supportlib/oxt/system_calls.cpp.orig	2019-09-19 17:00:06.903986000 -0400
-+++ src/cxx_supportlib/oxt/system_calls.cpp	2019-09-19 17:02:32.106158000 -0400
-@@ -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();
- 	}
-@@ -748,14 +748,14 @@
- 	 * http://stackoverflow.com/questions/20410943/segmentation-fault-when-accessing-statically-initialized-thread-variable?noredirect=1#comment30483943_20410943
- 	 * https://bugzilla.redhat.com/show_bug.cgi?id=731228
- 	 */
--	__thread int this_thread::_syscalls_interruptable = 1;
-+	__thread int boost::this_thread::_syscalls_interruptable = 1;
- 
- 	bool
- 	boost::this_thread::syscalls_interruptable() {
- 		return _syscalls_interruptable;
- 	}
- #else
--	boost::thread_specific_ptr<bool> this_thread::_syscalls_interruptable;
-+	boost::thread_specific_ptr<bool> boost::this_thread::_syscalls_interruptable;
- 
- 	bool
- 	boost::this_thread::syscalls_interruptable() {
diff --git a/www/rubygem-passenger/files/patch-src-ruby_native_extension-extconf.rb b/www/rubygem-passenger/files/patch-src-ruby_native_extension-extconf.rb
new file mode 100644
index 000000000000..69f62791f332
--- /dev/null
+++ b/www/rubygem-passenger/files/patch-src-ruby_native_extension-extconf.rb
@@ -0,0 +1,15 @@
+--- src/ruby_native_extension/extconf.rb.orig	2020-06-05 11:51:04.865937000 -0400
++++ src/ruby_native_extension/extconf.rb	2020-06-05 13:22:43.694831000 -0400
+@@ -70,6 +70,12 @@
+ 		File.open("Makefile", "w") do |f|
+ 			f.write(makefile)
+ 		end
++	elsif RUBY_PLATFORM =~ /freebsd/
++		makefile = File.read("Makefile")
++		makefile.sub!(/-Wl,--compress-debug-sections=zlib/, "")
++		File.open("Makefile", "w") do |f|
++			f.write(makefile)
++		end
+ 	end
+ end
+