www/nginx: sync with upstream

Taken from: FreeBSD
opnsense2 · Dec 20, 2021 · 5fe15fb · 5fe15fb
1 parent f441e06
commit 5fe15fb
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.20.2
-PORTREVISION?=	1
+PORTREVISION?=	2
 PORTEPOCH=	2
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \

diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod
@@ -245,7 +245,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.8
+PASSENGER_NGINX_VER=	6.0.12
 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
@@ -1,4 +1,4 @@
-TIMESTAMP = 1637664572
+TIMESTAMP = 1639934924
 SHA256 (nginx-1.20.2.tar.gz) = 958876757782190a1653e14dc26dfc7ba263de310e04c113e11e97d1bef45a42
 SIZE (nginx-1.20.2.tar.gz) = 1062124
 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.8.tar.gz) = 1e73767025b299c6f8421c2a0df1ca7163b767de47ffab0c6239deb7b809d16d
-SIZE (passenger-6.0.8.tar.gz) = 7567855
+SHA256 (passenger-6.0.12.tar.gz) = 4d15063dea6bce195e251d2b42e7bb67fab0049b8d6c423188566bc11ce9a8ad
+SIZE (passenger-6.0.12.tar.gz) = 8234023
 SHA256 (yaoweibin-nginx_ajp_module-fcbb2cc_GH0.tar.gz) = 522e94c59f5783f281d868ede2adf325bf2f8ffb9e62cf8451d4b9ac0516916c
 SIZE (yaoweibin-nginx_ajp_module-fcbb2cc_GH0.tar.gz) = 110807
 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
@@ -1,5 +1,5 @@
---- ../passenger-6.0.8/build/nginx.rb.orig	2018-05-20 08:43:19.389262000 +0200
-+++ ../passenger-6.0.8/build/nginx.rb	2018-05-20 09:11:27.500253000 +0200
+--- ../passenger-6.0.12/build/nginx.rb.orig	2018-05-20 08:43:19.389262000 +0200
++++ ../passenger-6.0.12/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
@@ -1,5 +1,5 @@
---- ../passenger-6.0.8/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig	2018-12-03 12:23:06.980728000 -0500
-+++ ../passenger-6.0.8/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb	2018-12-03 12:23:32.978924000 -0500
+--- ../passenger-6.0.12/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig	2018-12-03 12:23:06.980728000 -0500
++++ ../passenger-6.0.12/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,