diff --git a/www/nginx/Makefile b/www/nginx/Makefile index 89a27f369764..556ee8ab6706 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -3,7 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.12.2 -PORTREVISION?= 9 +PORTREVISION?= 10 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ @@ -928,7 +928,7 @@ CONFIGURE_ARGS+=--without-http_rewrite_module \ .endif .if ${PORT_OPTIONS:MPASSENGER} -PASSENGER_VERSION= 5.1.12 +PASSENGER_VERSION= 5.2.1 MASTER_SITES+= http://s3.amazonaws.com/phusion-passenger/releases/:passenger DISTFILES+= passenger-${PASSENGER_VERSION}.tar.gz:passenger .if ${PORT_OPTIONS:MDSO} diff --git a/www/nginx/distinfo b/www/nginx/distinfo index 40793fe33e9b..354906b2c59c 100644 --- a/www/nginx/distinfo +++ b/www/nginx/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1519589165 +TIMESTAMP = 1519982691 SHA256 (nginx-1.12.2.tar.gz) = 305f379da1d5fb5aefa79e45c829852ca6983c7cd2a79328f8e084a324cf0416 SIZE (nginx-1.12.2.tar.gz) = 981687 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.1.tar.gz) = 958cc5a7a7430f93fac0fd6f8b9aa92fc1801efce0cda797d6029d44080a9b24 SIZE (modsecurity-2.9.1.tar.gz) = 4261212 -SHA256 (passenger-5.1.12.tar.gz) = 1705bd6d1f9b9d055fb58b3545ca6f38ca6d222c07201f53c5014e0eb09f4495 -SIZE (passenger-5.1.12.tar.gz) = 4245993 +SHA256 (passenger-5.2.1.tar.gz) = d725a705124dad1ae9a4ce61d76566061dc80abd4ec7a652489f09a8de60e481 +SIZE (passenger-5.2.1.tar.gz) = 4978302 SHA256 (ngx_slowfs_cache-1.10.tar.gz) = 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1 SIZE (ngx_slowfs_cache-1.10.tar.gz) = 11809 SHA256 (giom-nginx_accept_language_module-2f69842_GH0.tar.gz) = 5534ca63cdfc2a7dc4e1cbf9c2d54d3ed3f0e6c86b4a95be48ec0a3f41cc1eb0 diff --git a/www/nginx/files/extra-patch-passenger-build-nginx.rb b/www/nginx/files/extra-patch-passenger-build-nginx.rb index aec25007bcf0..65382c7b0096 100644 --- a/www/nginx/files/extra-patch-passenger-build-nginx.rb +++ b/www/nginx/files/extra-patch-passenger-build-nginx.rb @@ -1,6 +1,6 @@ ---- ../passenger-5.1.12/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400 -+++ ../passenger-5.1.12/build/nginx.rb 2016-05-09 18:21:22.426777000 -0400 -@@ -33,13 +33,12 @@ +--- ../passenger-5.2.1/build/nginx.rb.orig 2018-03-03 21:21:23.833026000 +0100 ++++ ../passenger-5.2.1/build/nginx.rb 2018-03-03 21:25:02.268013000 +0100 +@@ -39,13 +39,12 @@ auto_generated_sources = %w( desc "Build Nginx support files" task :nginx => [ :nginx_without_native_support, @@ -15,7 +15,7 @@ ].compact # Workaround for https://github.com/jimweirich/rake/issues/274 -@@ -47,7 +46,6 @@ +@@ -53,7 +52,6 @@ task :_nginx => :nginx task :nginx_without_native_support => [ auto_generated_sources, @@ -23,7 +23,7 @@ COMMON_LIBRARY.only(*NGINX_LIBS_SELECTOR).link_objects ].flatten -@@ -55,7 +53,6 @@ +@@ -61,7 +59,6 @@ task :nginx_without_native_support => [ # it also creates a namespace:clean task to clean up the output_dir task :nginx_dynamic_without_native_support => [ auto_generated_sources,