Update from 6.0.3 to 6.0.4.

7 files changed, 13 insertions, 13 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index bbbf6858f28f..4a1ecc3c104a 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.17.3
-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 9171560de225..13d46a655255 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -233,7 +233,7 @@ NAXSI_VARS=		DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_src
 NJS_GH_TUPLE=		nginx:njs:0.3.5:njs
 NJS_VARS=		DSO_EXTMODS+=njs NJS_SUBDIR=/nginx
 
-PASSENGER_NGINX_VER=	6.0.3
+PASSENGER_NGINX_VER=	6.0.4
 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 279518942767..2f845a4f6c39 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1568656400
+TIMESTAMP = 1568811851
 SHA256 (nginx-1.17.3.tar.gz) = 3b84fe1c2cf9ca22fde370e486a9ab16b6427df1b6ea62cdb61978c9f34d0f3c
 SIZE (nginx-1.17.3.tar.gz) = 1034586
 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.3.tar.gz) = 4192019d169d3f1dd82cc4714db6986df54c6ceb4ee1c8f253de78d1a6b62118
 SIZE (modsecurity-2.9.3.tar.gz) = 4307670
-SHA256 (passenger-6.0.3.tar.gz) = ee5de4165a8b9ea379b215b6570155b623e59a7ccd2755f98a23444df12e2dad
-SIZE (passenger-6.0.3.tar.gz) = 7347651
+SHA256 (passenger-6.0.4.tar.gz) = ec1e4b555c176642c1c316897177d54b6f7d369490280e8ee3e54644e40b250b
+SIZE (passenger-6.0.4.tar.gz) = 7347803
 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 d5e668e695bc..ad018bbf0e46 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.3/build/nginx.rb.orig	2013-10-26 18:00:00.000000000 -0400
-+++ ../passenger-6.0.3/build/nginx.rb	2016-05-09 18:21:22.426777000 -0400
+--- ../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
 @@ -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 aa8697fa5d49..233b5c9428eb 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.3/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig	2018-12-03 12:23:06.980728000 -0500
-+++ ../passenger-6.0.3/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb	2018-12-03 12:23:32.978924000 -0500
+--- ../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
 @@ -204,7 +204,7 @@
      :name     => 'passenger_disable_anonymous_telemetry',
      :scope    => :global,
diff --git a/www/rubygem-passenger/Makefile b/www/rubygem-passenger/Makefile
index 12dd06132315..7722b0473d4b 100644
--- a/www/rubygem-passenger/Makefile
+++ b/www/rubygem-passenger/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	passenger
-PORTVERSION=	6.0.3
+PORTVERSION=	6.0.4
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMEPREFIX=	rubygem-
diff --git a/www/rubygem-passenger/distinfo b/www/rubygem-passenger/distinfo
index 9cb3e9d58491..5764dc627461 100644
--- a/www/rubygem-passenger/distinfo
+++ b/www/rubygem-passenger/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1568655352
-SHA256 (rubygem/passenger-6.0.3.gem) = 87e498c07b19371e877cf8206456ac8377c92650d08d6734beaace12ccce3838
-SIZE (rubygem/passenger-6.0.3.gem) = 7262720
+TIMESTAMP = 1568811279
+SHA256 (rubygem/passenger-6.0.4.gem) = 298806191e4e8995dbc0f94c3791b2b1916ca50b5993e04236df6f4108bfc2af
+SIZE (rubygem/passenger-6.0.4.gem) = 7262720