Merge the r517639 for third-party passenger module from the

www/nginx to fix the build. (*)

While I'm here sort pkg-plist.

Bump PORTREVISION.

PR:		241753 (*)

4 files changed, 76 insertions, 24 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index a3e5aed2498f..62489c591110 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.17.5
-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 f3d8bac365c3..5fb5e7ee73a5 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -245,7 +245,8 @@ 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-disable-telemetry \
+			${PATCHDIR}/extra-patch-passenger-system-calls
 
 POSTGRES_USES=		pgsql
 POSTGRES_GH_TUPLE=	FRiCKLE:ngx_postgres:1.0rc7:postgres
diff --git a/www/nginx-devel/files/extra-patch-passenger-system-calls b/www/nginx-devel/files/extra-patch-passenger-system-calls
new file mode 100644
index 000000000000..6ce971b856c0
--- /dev/null
+++ b/www/nginx-devel/files/extra-patch-passenger-system-calls
@@ -0,0 +1,52 @@
+--- ../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/nginx-devel/pkg-plist b/www/nginx-devel/pkg-plist
index 2b64ef71ab1d..ab19988f24d6 100644
--- a/www/nginx-devel/pkg-plist
+++ b/www/nginx-devel/pkg-plist
@@ -1,24 +1,24 @@
-%%FASTDFS%%@sample etc/fdfs/mod_fastdfs.conf.sample
-@sample %%ETCDIR%%/fastcgi_params-dist %%ETCDIR%%/fastcgi_params
 %%ETCDIR%%/koi-utf
 %%ETCDIR%%/koi-win
-%%NAXSI%%%%ETCDIR%%/naxsi_core.rules
-@sample %%ETCDIR%%/scgi_params-dist %%ETCDIR%%/scgi_params
-@sample %%ETCDIR%%/uwsgi_params-dist %%ETCDIR%%/uwsgi_params
-%%MODSECURITY%%%%ETCDIR%%/unicode.mapping
 %%ETCDIR%%/win-utf
+%%FASTDFS%%@sample etc/fdfs/mod_fastdfs.conf.sample
+%%MODSECURITY%%%%ETCDIR%%/unicode.mapping
+%%NAXSI%%%%ETCDIR%%/naxsi_core.rules
+@sample %%ETCDIR%%/fastcgi_params-dist %%ETCDIR%%/fastcgi_params
 @sample %%ETCDIR%%/mime.types-dist %%ETCDIR%%/mime.types
 @sample %%ETCDIR%%/nginx.conf-dist %%ETCDIR%%/nginx.conf
+@sample %%ETCDIR%%/scgi_params-dist %%ETCDIR%%/scgi_params
+@sample %%ETCDIR%%/uwsgi_params-dist %%ETCDIR%%/uwsgi_params
 %%DSO%%%%ARRAYVAR%%libexec/nginx/ngx_http_array_var_module.so
 %%DSO%%%%AWS_AUTH%%libexec/nginx/ngx_http_aws_auth_module.so
 %%DSO%%%%BROTLI%%libexec/nginx/ngx_http_brotli_filter_module.so
 %%DSO%%%%BROTLI%%libexec/nginx/ngx_http_brotli_static_module.so
 %%DSO%%%%CLOJURE%%libexec/nginx/ngx_http_clojure_module.so
-%%DSO%%%%CT%%libexec/nginx/ngx_ssl_ct_module.so
 %%DSO%%%%CT%%libexec/nginx/ngx_http_ssl_ct_module.so
-%%DSO%%%%ECHO%%libexec/nginx/ngx_http_echo_module.so
-%%DSO%%%%DYNAMIC_UPSTREAM%%libexec/nginx/ngx_dynamic_upstream_module.so
+%%DSO%%%%CT%%libexec/nginx/ngx_ssl_ct_module.so
 %%DSO%%%%DEVEL_KIT%%libexec/nginx/ndk_http_module.so
+%%DSO%%%%DYNAMIC_UPSTREAM%%libexec/nginx/ngx_dynamic_upstream_module.so
+%%DSO%%%%ECHO%%libexec/nginx/ngx_http_echo_module.so
 %%DSO%%%%ENCRYPTSESSION%%libexec/nginx/ngx_http_encrypted_session_module.so
 %%DSO%%%%FASTDFS%%libexec/nginx/ngx_http_fastdfs_module.so
 %%DSO%%%%FORMINPUT%%libexec/nginx/ngx_http_form_input_module.so
@@ -29,24 +29,22 @@
 %%DSO%%%%HTTP_AUTH_PAM%%libexec/nginx/ngx_http_auth_pam_module.so
 %%DSO%%%%HTTP_EVAL%%libexec/nginx/ngx_http_eval_module.so
 %%DSO%%%%HTTP_FANCYINDEX%%libexec/nginx/ngx_http_fancyindex_module.so
-%%DSO%%%%HTTP%%%%HTTP_GEOIP2%%libexec/nginx/ngx_http_geoip2_module.so
-%%DSO%%%%STREAM%%%%HTTP_GEOIP2%%libexec/nginx/ngx_stream_geoip2_module.so
 %%DSO%%%%HTTP_IMAGE_FILTER%%libexec/nginx/ngx_http_image_filter_module.so
 %%DSO%%%%HTTP_PERL%%libexec/nginx/ngx_http_perl_module.so
 %%DSO%%%%HTTP_PUSH%%libexec/nginx/ngx_nchan_module.so
 %%DSO%%%%HTTP_REDIS%%libexec/nginx/ngx_http_redis_module.so
 %%DSO%%%%HTTP_TARANTOOL%%libexec/nginx/ngx_http_tnt_module.so
-%%DSO%%%%HTTP_UPLOAD%%libexec/nginx/ngx_http_upload_module.so
 %%DSO%%%%HTTP_UPLOAD_PROGRESS%%libexec/nginx/ngx_http_uploadprogress_module.so
+%%DSO%%%%HTTP_UPLOAD%%libexec/nginx/ngx_http_upload_module.so
 %%DSO%%%%HTTP_UPSTREAM_FAIR%%libexec/nginx/ngx_http_upstream_fair_module.so
 %%DSO%%%%HTTP_XSLT%%libexec/nginx/ngx_http_xslt_filter_module.so
+%%DSO%%%%HTTP%%%%HTTP_GEOIP2%%libexec/nginx/ngx_http_geoip2_module.so
+%%DSO%%%%HTTP%%%%NJS%%libexec/nginx/ngx_http_js_module.so
 %%DSO%%%%ICONV%%libexec/nginx/ngx_http_iconv_module.so
 %%DSO%%%%LUA%%libexec/nginx/ngx_http_lua_module.so
 %%DSO%%%%MAIL%%libexec/nginx/ngx_mail_module.so
 %%DSO%%%%MEMC%%libexec/nginx/ngx_http_memc_module.so
 %%DSO%%%%NAXSI%%libexec/nginx/ngx_http_naxsi_module.so
-%%DSO%%%%HTTP%%%%NJS%%libexec/nginx/ngx_http_js_module.so
-%%DSO%%%%STREAM%%%%NJS%%libexec/nginx/ngx_stream_js_module.so
 %%DSO%%%%PASSENGER%%libexec/nginx/ngx_http_passenger_module.so
 %%DSO%%%%REDIS2%%libexec/nginx/ngx_http_redis2_module.so
 %%DSO%%%%RTMP%%libexec/nginx/ngx_rtmp_module.so
@@ -54,8 +52,17 @@
 %%DSO%%%%SHIBBOLETH%%libexec/nginx/ngx_http_shibboleth_module.so
 %%DSO%%%%SMALL_LIGHT%%libexec/nginx/ngx_http_small_light_module.so
 %%DSO%%%%SRCACHE%%libexec/nginx/ngx_http_srcache_filter_module.so
+%%DSO%%%%STREAM%%%%NJS%%libexec/nginx/ngx_stream_js_module.so
 %%DSO%%%%STREAM%%libexec/nginx/ngx_stream_module.so
 %%DSO%%%%VOD%%libexec/nginx/ngx_http_vod_module.so
+%%HTTP_PERL%%%%SITE_ARCH%%/auto/nginx/nginx.so
+%%HTTP_PERL%%%%SITE_ARCH%%/nginx.pm
+%%NJS%%sbin/njs
+sbin/nginx
+share/vim/vimfiles/ftdetect/nginx.vim
+share/vim/vimfiles/ftplugin/nginx.vim
+share/vim/vimfiles/indent/nginx.vim
+share/vim/vimfiles/syntax/nginx.vim
 %%WWW%%@postexec mkdir -p -m 755 %D/www/nginx-dist
 %%WWW%%@postexec if [ ! -d %D/www/nginx/ ] ; then ln -fs %D/www/nginx-dist %D/www/nginx; fi
 %%WWW%%www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING
@@ -63,14 +70,6 @@
 %%WWW%%www/nginx-dist/50x.html
 %%WWW%%@postexec chmod a-w %D/www/nginx-dist
 %%WWW%%@postunexec if [ -L %D/www/nginx ]; then rm -f %D/www/nginx; fi
-sbin/nginx
-%%NJS%%sbin/njs
-share/vim/vimfiles/ftdetect/nginx.vim
-share/vim/vimfiles/ftplugin/nginx.vim
-share/vim/vimfiles/indent/nginx.vim
-share/vim/vimfiles/syntax/nginx.vim
 @dir %%NGINX_TMPDIR%%
 @dir %%NGINX_LOGDIR%%
 man/man8/nginx.8.gz
-%%HTTP_PERL%%%%SITE_ARCH%%/auto/nginx/nginx.so
-%%HTTP_PERL%%%%SITE_ARCH%%/nginx.pm