summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJochen Neumeister <joneum@FreeBSD.org>2020-07-16 08:40:03 +0000
committerJochen Neumeister <joneum@FreeBSD.org>2020-07-16 08:40:03 +0000
commitb7c88beb9a063acfc7ab8bb251facc428e494f8a (patch)
tree6f245079997206d105ad02c23c94f7829f4d1d4f
parentUpdate kernel-headers to 3.10.0-1127.13.1.el7. (diff)
Update 3rd-party module passenger to 6.0.6
Sponsored by: Netzkommune GmbH
Notes
Notes: svn path=/head/; revision=542339
-rw-r--r--www/nginx/Makefile2
-rw-r--r--www/nginx/Makefile.extmod2
-rw-r--r--www/nginx/distinfo6
-rw-r--r--www/nginx/files/extra-patch-passenger-build-nginx.rb4
-rw-r--r--www/nginx/files/extra-patch-passenger-disable-telemetry4
5 files changed, 9 insertions, 9 deletions
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 5f95003deaec..2a907c2275df 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -3,7 +3,7 @@
PORTNAME= nginx
PORTVERSION= 1.18.0
-PORTREVISION?= 18
+PORTREVISION?= 19
PORTEPOCH= 2
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod
index e4f7955fbf00..dcd51a736e9f 100644
--- a/www/nginx/Makefile.extmod
+++ b/www/nginx/Makefile.extmod
@@ -237,7 +237,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.5
+PASSENGER_NGINX_VER= 6.0.6
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 32530dbd7746..ceba79c6adc6 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1594636332
+TIMESTAMP = 1594850007
SHA256 (nginx-1.18.0.tar.gz) = 4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99
SIZE (nginx-1.18.0.tar.gz) = 1039530
SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c
@@ -11,8 +11,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.5.tar.gz) = 94c25d5669c6cd1bc93854a020701c9869012eec621bce331bfe2d0c9c8c3532
-SIZE (passenger-6.0.5.tar.gz) = 7347149
+SHA256 (passenger-6.0.6.tar.gz) = fbf89ebfacc079bdf6466567eabc9eb741a5abd8f230133311f7a40fff763842
+SIZE (passenger-6.0.6.tar.gz) = 7347506
SHA256 (yaoweibin-nginx_ajp_module-bf6cd93_GH0.tar.gz) = 9e3f78ea73e2d606a95ee64fd3affa4c249f9b342e66b6b11b63061791f28316
SIZE (yaoweibin-nginx_ajp_module-bf6cd93_GH0.tar.gz) = 109704
SHA256 (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = c949d4be6f3442c8e2937046448dc8d8def25c0e0fa6f4e805144cea45eabe80
diff --git a/www/nginx/files/extra-patch-passenger-build-nginx.rb b/www/nginx/files/extra-patch-passenger-build-nginx.rb
index 3aedc7aec7b5..729732b493ab 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-6.0.5/build/nginx.rb.orig 2018-05-20 08:43:19.389262000 +0200
-+++ ../passenger-6.0.5/build/nginx.rb 2018-05-20 09:11:27.500253000 +0200
+--- ../passenger-6.0.6/build/nginx.rb.orig 2018-05-20 08:43:19.389262000 +0200
++++ ../passenger-6.0.6/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/nginx/files/extra-patch-passenger-disable-telemetry b/www/nginx/files/extra-patch-passenger-disable-telemetry
index 3905e741c67d..a0ee98301824 100644
--- a/www/nginx/files/extra-patch-passenger-disable-telemetry
+++ b/www/nginx/files/extra-patch-passenger-disable-telemetry
@@ -1,5 +1,5 @@
---- ../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
+--- ../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
@@ -204,7 +204,7 @@
:name => 'passenger_disable_anonymous_telemetry',
:scope => :global,