From f5480c8d833b434d63354bd32e784b3ffb9e9d54 Mon Sep 17 00:00:00 2001 From: "Sergey A. Osokin" Date: Tue, 24 Nov 2020 16:26:40 +0000 Subject: [PATCH] Update third-party passenger module from 6.0.6 to 6.0.7. ChangeLog: https://github.com/phusion/passenger/compare/release-6.0.6...release-6.0.7 Bump PORTREVISION. --- www/nginx-devel/Makefile | 1 + www/nginx-devel/Makefile.extmod | 2 +- www/nginx-devel/distinfo | 6 +++--- www/nginx-devel/files/extra-patch-passenger-build-nginx.rb | 4 ++-- .../files/extra-patch-passenger-disable-telemetry | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index fd1b2168e6ce..1e224f74405b 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -3,6 +3,7 @@ PORTNAME?= nginx PORTVERSION= 1.19.5 +PORTREVISION= 1 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 e0b819109427..c983bbdb0bfa 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -239,7 +239,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.6 +PASSENGER_NGINX_VER= 6.0.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 7952845d8dfb..477ab81c4ad2 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1606233691 +TIMESTAMP = 1606234799 SHA256 (nginx-1.19.5.tar.gz) = 5c0a46afd6c452d4443f6ec0767f4d5c3e7c499e55a60cd6542b35a61eda799c SIZE (nginx-1.19.5.tar.gz) = 1055590 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.6.tar.gz) = fbf89ebfacc079bdf6466567eabc9eb741a5abd8f230133311f7a40fff763842 -SIZE (passenger-6.0.6.tar.gz) = 7347506 +SHA256 (passenger-6.0.7.tar.gz) = e1e723cc6eae054afcd1585d734cfb167e5c33a8629b83976ee21257080e9b13 +SIZE (passenger-6.0.7.tar.gz) = 7352163 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 bf91d3ba4e3d..7e792c5e5fd5 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.6/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400 -+++ ../passenger-6.0.6/build/nginx.rb 2016-05-09 18:21:22.426777000 -0400 +--- ../passenger-6.0.7/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400 ++++ ../passenger-6.0.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-devel/files/extra-patch-passenger-disable-telemetry b/www/nginx-devel/files/extra-patch-passenger-disable-telemetry index a0ee98301824..3891ebb09f58 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.6/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig 2018-12-03 12:23:06.980728000 -0500 -+++ ../passenger-6.0.6/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb 2018-12-03 12:23:32.978924000 -0500 +--- ../passenger-6.0.7/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig 2018-12-03 12:23:06.980728000 -0500 ++++ ../passenger-6.0.7/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,