Update passenger and it's modules for www/nginx and

www/nginx-devel ports to 5.3.7.

12 files changed, 27 insertions, 57 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 2d1330876f90..f4d0d7a4a6f9 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.15.7
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/ \
 		LOCAL/osa
diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod
index 2c2ded589609..6ee523d23645 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -222,7 +222,7 @@ NAXSI_VARS=		DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_src
 NJS_GH_TUPLE=		nginx:njs:ca2bcd2:njs
 NJS_VARS=		DSO_EXTMODS+=njs NJS_SUBDIR=/nginx
 
-PASSENGER_NGINX_VER=	5.3.5
+PASSENGER_NGINX_VER=	5.3.7
 PASSENGER_CATEGORIES=	ruby
 PASSENGER_USE=		ruby=yes
 PASSENGER_BUILD_DEPENDS=${LOCALBASE}/bin/rake:devel/rubygem-rake
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 58cd9c783e93..a1930f9ce0e9 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1543358883
+TIMESTAMP = 1543359412
 SHA256 (nginx-1.15.7.tar.gz) = 8f22ea2f6c0e0a221b6ddc02b6428a3ff708e2ad55f9361102b1c9f4142bdf93
 SIZE (nginx-1.15.7.tar.gz) = 1026732
 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c
@@ -13,8 +13,8 @@ SHA256 (ngx_http_response-0.3.tar.gz) = 0835584029f053051c624adbe33a826ab0205c9d
 SIZE (ngx_http_response-0.3.tar.gz) = 2244
 SHA256 (modsecurity-2.9.2.tar.gz) = 41a8f73476ec891f3a9e8736b98b64ea5c2105f1ce15ea57a1f05b4bf2ffaeb5
 SIZE (modsecurity-2.9.2.tar.gz) = 4298993
-SHA256 (passenger-5.3.5.tar.gz) = 2a257b1902691736dcee5d193784f45d44c8709ee2ed039d89eb3fedfe07cca1
-SIZE (passenger-5.3.5.tar.gz) = 7217952
+SHA256 (passenger-5.3.7.tar.gz) = ff9185257feafd6c2d982652dd1bbd06118895012f6e799ce170b7c855f7b5cb
+SIZE (passenger-5.3.7.tar.gz) = 7195477
 SHA256 (ngx_slowfs_cache-1.10.tar.gz) = 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1
 SIZE (ngx_slowfs_cache-1.10.tar.gz) = 11809
 SHA256 (yaoweibin-nginx_ajp_module-bf6cd93_GH0.tar.gz) = 9e3f78ea73e2d606a95ee64fd3affa4c249f9b342e66b6b11b63061791f28316
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 0a969ffedfea..5ddaafbec28d 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-5.3.5/build/nginx.rb.orig	2013-10-26 18:00:00.000000000 -0400
-+++ ../passenger-5.3.5/build/nginx.rb	2016-05-09 18:21:22.426777000 -0400
+--- ../passenger-5.3.7/build/nginx.rb.orig	2013-10-26 18:00:00.000000000 -0400
++++ ../passenger-5.3.7/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/Makefile b/www/nginx/Makefile
index 03fddc7978e2..1cd254e52aea 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.14.1
-PORTREVISION?=	3
+PORTREVISION?=	4
 PORTEPOCH=	2
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/ \
diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod
index b5767855ae22..ebda9a5cc1f7 100644
--- a/www/nginx/Makefile.extmod
+++ b/www/nginx/Makefile.extmod
@@ -226,7 +226,7 @@ NAXSI_VARS=		DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_src
 NJS_GH_TUPLE=		nginx:njs:992e93d:njs
 NJS_VARS=		DSO_EXTMODS+=njs NJS_SUBDIR=/nginx
 
-PASSENGER_NGINX_VER=	5.3.5
+PASSENGER_NGINX_VER=	5.3.7
 PASSENGER_CATEGORIES=	ruby
 PASSENGER_USE=		ruby=yes
 PASSENGER_BUILD_DEPENDS=	${LOCALBASE}/bin/rake:devel/rubygem-rake
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 662dbd198eb9..329cdb2e00ae 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1542300703
+TIMESTAMP = 1543362482
 SHA256 (nginx-1.14.1.tar.gz) = bf09974130c0d41c0a811decc17a96ec2f58cdc8bbacb771de8d38c9ba14a4a4
 SIZE (nginx-1.14.1.tar.gz) = 1014040
 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c
@@ -15,8 +15,8 @@ SHA256 (08a395c66e42.tar.gz) = 53e440737ed1aff1f09fae150219a45f16add0c8d6e84546c
 SIZE (08a395c66e42.tar.gz) = 120603
 SHA256 (modsecurity-2.9.2.tar.gz) = 41a8f73476ec891f3a9e8736b98b64ea5c2105f1ce15ea57a1f05b4bf2ffaeb5
 SIZE (modsecurity-2.9.2.tar.gz) = 4298993
-SHA256 (passenger-5.3.5.tar.gz) = 2a257b1902691736dcee5d193784f45d44c8709ee2ed039d89eb3fedfe07cca1
-SIZE (passenger-5.3.5.tar.gz) = 7217952
+SHA256 (passenger-5.3.7.tar.gz) = ff9185257feafd6c2d982652dd1bbd06118895012f6e799ce170b7c855f7b5cb
+SIZE (passenger-5.3.7.tar.gz) = 7195477
 SHA256 (ngx_slowfs_cache-1.10.tar.gz) = 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1
 SIZE (ngx_slowfs_cache-1.10.tar.gz) = 11809
 SHA256 (yaoweibin-nginx_ajp_module-bf6cd93_GH0.tar.gz) = 9e3f78ea73e2d606a95ee64fd3affa4c249f9b342e66b6b11b63061791f28316
diff --git a/www/nginx/files/extra-patch-passenger-build-nginx.rb b/www/nginx/files/extra-patch-passenger-build-nginx.rb
index ecca09fda32a..018b9de4c428 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-5.3.5/build/nginx.rb.orig	2018-05-20 08:43:19.389262000 +0200
-+++ ../passenger-5.3.5/build/nginx.rb	2018-05-20 09:11:27.500253000 +0200
+--- ../passenger-5.3.7/build/nginx.rb.orig	2018-05-20 08:43:19.389262000 +0200
++++ ../passenger-5.3.7/build/nginx.rb	2018-05-20 09:11:27.500253000 +0200
 @@ -39,13 +39,12 @@ auto_generated_sources = %w(
  desc "Build Nginx support files"
  task :nginx => [
diff --git a/www/rubygem-passenger/Makefile b/www/rubygem-passenger/Makefile
index a34dfd158920..e651062e4b03 100644
--- a/www/rubygem-passenger/Makefile
+++ b/www/rubygem-passenger/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	passenger
-PORTVERSION=	5.3.5
-PORTREVISION=	1
+PORTVERSION=	5.3.7
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMEPREFIX=	rubygem-
@@ -39,21 +38,7 @@ USES+=		apache:2.2+
 USE_RUBY=	yes
 RAKE_BIN=	${LOCALBASE}/bin/rake
 USES+=		cpe gem libtool python:env shebangfix ssl
-SHEBANG_FILES=	\
-	src/cxx_supportlib/vendor-copy/libuv/gyp_uv.py \
-	dev/vagrant/nginx_start \
-	dev/vagrant/provision.sh \
-	dev/ci/run-tests-with-docker \
-	dev/ci/tests/debian/run \
-	dev/ci/tests/rpm/run \
-	dev/ci/scripts/setup-host-natively.sh \
-	dev/ci/scripts/docker-entrypoint-stage2.sh \
-	dev/ci/scripts/inituidgid \
-	dev/ci/scripts/debug-console-wrapper.sh \
-	dev/ci/scripts/run-tests-natively-stage2.sh \
-	dev/ci/scripts/docker-entrypoint.sh \
-	dev/ci/run-tests-natively \
-	dev/ci/setup-host
+SHEBANG_FILES=	src/cxx_supportlib/vendor-copy/libuv/gyp_uv.py
 
 LIB_DEPENDS+=	libuv.so:devel/libuv \
 		libcurl.so:ftp/curl \
@@ -78,12 +63,6 @@ SYMLINK_SUB_LIST=	PASSENGER_INSTALL_DIR="${PREFIX}/${GEMS_DIR}/${PORTNAME}"
 SYMLINK_SUB_LIST_OFF=	PASSENGER_INSTALL_DIR="${PREFIX}/${GEM_LIB_DIR}"
 
 pre-patch:
-.if ${FLAVOR} == nginx
-	@${ECHO_CMD}
-	@${ECHO_CMD} "Do not forget compile www/nginx"
-	@${ECHO_CMD} "with PASSENGER_MODULE support"
-	@${ECHO_CMD}
-.endif
 	@${REINPLACE_CMD} \
 		's!-Wall!!g; \
 		s!gcc!${CC}!g; \
diff --git a/www/rubygem-passenger/distinfo b/www/rubygem-passenger/distinfo
index 3bcdef472213..3f3a235304df 100644
--- a/www/rubygem-passenger/distinfo
+++ b/www/rubygem-passenger/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1537823017
-SHA256 (rubygem/passenger-5.3.5.gem) = b8c84f92be4fb40bc9a1a455ce95db9fa8f354db01aa923c80afe2b3f255f31e
-SIZE (rubygem/passenger-5.3.5.gem) = 7134720
+TIMESTAMP = 1543359462
+SHA256 (rubygem/passenger-5.3.7.gem) = 7399b1ef7bc826f6e06d9143b1f802bb585ee393f5c8bfa18a58b6d2e9c24213
+SIZE (rubygem/passenger-5.3.7.gem) = 7114240
diff --git a/www/rubygem-passenger/files/patch-src-agent-Core-SecurityUpdateChecker.h b/www/rubygem-passenger/files/patch-src-agent-Core-SecurityUpdateChecker.h
deleted file mode 100644
index 588640bc5919..000000000000
--- a/www/rubygem-passenger/files/patch-src-agent-Core-SecurityUpdateChecker.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/agent/Core/SecurityUpdateChecker.h.orig	2018-11-03 10:06:51 UTC
-+++ src/agent/Core/SecurityUpdateChecker.h
-@@ -256,9 +256,11 @@ private:
- 				error.append(" for proxy address " + sessionState.config["proxy_url"].asString());
- 				break;
- 
-+#if LIBCURL_VERSION_NUM < 0x073e00
- 			case CURLE_SSL_CACERT:
- 				// Peer certificate cannot be authenticated with given / known CA certificates. This would happen
- 				// for MITM but could also be a truststore issue.
-+#endif
- 			case CURLE_PEER_FAILED_VERIFICATION:
- 				// The remote server's SSL certificate or SSH md5 fingerprint was deemed not OK.
- 				error.append(" while connecting to " + sessionState.configRlz.url
diff --git a/www/rubygem-passenger/files/pkg-message-nginx.in b/www/rubygem-passenger/files/pkg-message-nginx.in
index e79125579daf..5d869e24ac40 100644
--- a/www/rubygem-passenger/files/pkg-message-nginx.in
+++ b/www/rubygem-passenger/files/pkg-message-nginx.in
@@ -1,6 +1,11 @@
+The nginx flavor of this port installs passenger core binaries only,
+to make it works with nginx make sure www/nginx or www/nginx-devel
+port has been compiled with third-party PASSENGER module support and
+installed into a system.
+
 #####################################################################
 
-Please edit your nginx configuration file, and add these lines:
+Please edit a nginx configuration file, and add these lines:
 
    server {
        root %%PASSENGER_INSTALL_DIR%%;
@@ -9,8 +14,7 @@ Please edit your nginx configuration file, and add these lines:
        passenger_sticky_sessions on;
    }
    
-After you restart nginx, you are ready to deploy any number of Ruby on Rails
-applications on nginx, without any further Ruby on Rails-specific
-configuration!
+Once nginx restarts it's possible to deploy a Ruby on Rails
+application without any further Ruby on Rails-specific configuration!
 
 #####################################################################