Date: Mon, 09 Mar 2026 19:19:49 +0000 From: Jochen Neumeister <joneum@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 59b4b5b7ad82 - main - www/*nginx*: Update 3-party modul passenger Message-ID: <69af1d55.2277f.3b876b6a@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by joneum: URL: https://cgit.FreeBSD.org/ports/commit/?id=59b4b5b7ad8252574160961acdc37d760a148722 commit 59b4b5b7ad8252574160961acdc37d760a148722 Author: Jochen Neumeister <joneum@FreeBSD.org> AuthorDate: 2026-03-09 19:17:26 +0000 Commit: Jochen Neumeister <joneum@FreeBSD.org> CommitDate: 2026-03-09 19:19:40 +0000 www/*nginx*: Update 3-party modul passenger Update third-party modul passenger to 6.1.2 PR: 292546 Sponsored by: Netzkommune GmbH --- www/freenginx/Makefile.extmod | 21 ++++++++++++--------- www/freenginx/distinfo | 6 +++--- .../files/extra-patch-passenger-Configuration.c | 22 ++++++++++++++++++++++ .../files/extra-patch-passenger-build-nginx.rb | 4 ++-- .../files/extra-patch-passenger-disable-telemetry | 4 ++-- www/nginx-devel/Makefile.extmod | 17 ++++++++++------- www/nginx-devel/distinfo | 6 +++--- .../files/extra-patch-passenger-Configuration.c | 20 ++++++++++++++++++++ .../files/extra-patch-passenger-build-nginx.rb | 4 ++-- .../files/extra-patch-passenger-disable-telemetry | 4 ++-- www/nginx-full/Makefile | 2 +- www/nginx/Makefile.extmod | 17 ++++++++++------- www/nginx/distinfo | 6 +++--- .../files/extra-patch-passenger-Configuration.c | 20 ++++++++++++++++++++ .../files/extra-patch-passenger-build-nginx.rb | 4 ++-- .../files/extra-patch-passenger-disable-telemetry | 4 ++-- 16 files changed, 116 insertions(+), 45 deletions(-) diff --git a/www/freenginx/Makefile.extmod b/www/freenginx/Makefile.extmod index 95a9d0b53a75..08de7c14f85d 100644 --- a/www/freenginx/Makefile.extmod +++ b/www/freenginx/Makefile.extmod @@ -258,17 +258,20 @@ OTEL_LIB_DEPENDS= libabsl_base.so:devel/abseil \ OTEL_BUILD_DEPENDS= ${LOCALBASE}/include/opentelemetry/proto/common/v1/common.proto:devel/opentelemetry-proto OTEL_CONFIGURE_ENV+= NGX_OTEL_PROTO_DIR=${PREFIX}/include -PASSENGER_NGINX_VER= 6.0.23 -PASSENGER_CATEGORIES= ruby -PASSENGER_USES= ruby +PASSENGER_NGINX_VER= 6.1.2 +PASSENGER_MASTER_SITES= https://s3.amazonaws.com/phusion-passenger/releases/:passenger +PASSENGER_DISTFILES= passenger-${PASSENGER_NGINX_VER}.tar.gz:passenger PASSENGER_BUILD_DEPENDS=${LOCALBASE}/bin/rake:devel/rubygem-rake -PASSENGER_RAKE_BIN= ${LOCALBASE}/bin/rake -PASSENGER_MASTER_SITES= https://s3.amazonaws.com/phusion-passenger/releases/:passenger -PASSENGER_DISTFILES= passenger-${PASSENGER_NGINX_VER}.tar.gz:passenger -PASSENGER_VARS= WRKSRC_passenger=${WRKDIR}/passenger-${PASSENGER_NGINX_VER} \ - DSO_EXTDIRS+=passenger-${PASSENGER_NGINX_VER}/src/nginx_module +PASSENGER_CATEGORIES= ruby +PASSENGER_CFLAGS= -DNDEBUG +PASSENGER_CONFIGURE_ENV=OPTIMIZE="yes" EXTRA_PRE_CXXFLAGS="-std=c++14" PASSENGER_EXTRA_PATCHES=${PATCHDIR}/extra-patch-passenger-build-nginx.rb \ - ${PATCHDIR}/extra-patch-passenger-disable-telemetry + ${PATCHDIR}/extra-patch-passenger-disable-telemetry \ + ${PATCHDIR}/extra-patch-passenger-Configuration.c +PASSENGER_RAKE_BIN= ${LOCALBASE}/bin/rake +PASSENGER_USES= ruby +PASSENGER_VARS= WRKSRC_passenger=${WRKDIR}/passenger-${PASSENGER_NGINX_VER} \ + DSO_EXTDIRS+=passenger-${PASSENGER_NGINX_VER}/src/nginx_module POSTGRES_USES= pgsql POSTGRES_GH_TUPLE= konstruxi:ngx_postgres:8aa7359:postgres diff --git a/www/freenginx/distinfo b/www/freenginx/distinfo index 1e88423bf92c..c485dfca78dd 100644 --- a/www/freenginx/distinfo +++ b/www/freenginx/distinfo @@ -1,12 +1,12 @@ -TIMESTAMP = 1772658418 +TIMESTAMP = 1773079744 SHA256 (freenginx-1.28.0.tar.gz) = 28651bf51ff95de027262d7af23000e5862fb3d1b2252ac83d97ce4c9a4a18a2 SIZE (freenginx-1.28.0.tar.gz) = 1228344 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae SIZE (nginx_mogilefs_module-1.0.4.tar.gz) = 11208 SHA256 (ngx_http_redis-0.3.9.tar.gz) = 21f87540f0a44b23ffa5df16fb3d788bc90803b255ef14f9c26e3847a6f26f46 SIZE (ngx_http_redis-0.3.9.tar.gz) = 13051 -SHA256 (passenger-6.0.23.tar.gz) = 897555224fb11340677780d929b5099da62303b1ae15f2e7c65cd3f6d3e7920c -SIZE (passenger-6.0.23.tar.gz) = 8298217 +SHA256 (passenger-6.1.2.tar.gz) = 94400a52e536cfdd8acf2accb47badb7a67dc309452f1b05600da67343f25bf8 +SIZE (passenger-6.1.2.tar.gz) = 7429067 SHA256 (msva-nginx_ajp_module-fcbb2cc_GH0.tar.gz) = 522e94c59f5783f281d868ede2adf325bf2f8ffb9e62cf8451d4b9ac0516916c SIZE (msva-nginx_ajp_module-fcbb2cc_GH0.tar.gz) = 110807 SHA256 (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = c949d4be6f3442c8e2937046448dc8d8def25c0e0fa6f4e805144cea45eabe80 diff --git a/www/freenginx/files/extra-patch-passenger-Configuration.c b/www/freenginx/files/extra-patch-passenger-Configuration.c new file mode 100644 index 000000000000..5b2b4f45b103 --- /dev/null +++ b/www/freenginx/files/extra-patch-passenger-Configuration.c @@ -0,0 +1,22 @@ +--- ../passenger-6.1.2/src/nginx_module/Configuration.c.orig 2026-03-09 20:02:40.671082000 +0100 ++++ ../passenger-6.1.2/src/nginx_module/Configuration.c 2026-03-09 20:07:45.710035000 +0100 +@@ -225,7 +225,7 @@ passenger_create_loc_conf(ngx_conf_t *cf) + conf->upstream_config.send_lowat = NGX_CONF_UNSET_SIZE; + conf->upstream_config.buffer_size = NGX_CONF_UNSET_SIZE; + #if NGINX_VERSION_NUM >= 1027000 +- conf->upstream_config.limit_rate = NGX_CONF_UNSET_PTR; ++ conf->upstream_config.limit_rate = NGX_CONF_UNSET_SIZE; + #elif NGINX_VERSION_NUM >= 1007007 + conf->upstream_config.limit_rate = NGX_CONF_UNSET_SIZE; + #endif +@@ -468,8 +468,8 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, + 16 * 1024); + + #if NGINX_VERSION_NUM >= 1027000 +- ngx_conf_merge_ptr_value(conf->upstream_config.limit_rate, +- prev->upstream_config.limit_rate, NULL); ++ ngx_conf_merge_size_value(conf->upstream_config.limit_rate, ++ prev->upstream_config.limit_rate, 0); + #elif NGINX_VERSION_NUM >= 1007007 + ngx_conf_merge_size_value(conf->upstream_config.limit_rate, + prev->upstream_config.limit_rate, 0); diff --git a/www/freenginx/files/extra-patch-passenger-build-nginx.rb b/www/freenginx/files/extra-patch-passenger-build-nginx.rb index 34ad92f207b2..8676c67d119c 100644 --- a/www/freenginx/files/extra-patch-passenger-build-nginx.rb +++ b/www/freenginx/files/extra-patch-passenger-build-nginx.rb @@ -1,5 +1,5 @@ ---- ../passenger-6.0.23/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400 -+++ ../passenger-6.0.23/build/nginx.rb 2016-05-09 18:21:22.426777000 -0400 +--- ../passenger-6.1.2/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400 ++++ ../passenger-6.1.2/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/freenginx/files/extra-patch-passenger-disable-telemetry b/www/freenginx/files/extra-patch-passenger-disable-telemetry index 302ae5bf765d..90f70bb7c2c4 100644 --- a/www/freenginx/files/extra-patch-passenger-disable-telemetry +++ b/www/freenginx/files/extra-patch-passenger-disable-telemetry @@ -1,5 +1,5 @@ ---- ../passenger-6.0.23/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig 2018-12-03 12:23:06.980728000 -0500 -+++ ../passenger-6.0.23/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb 2018-12-03 12:23:32.978924000 -0500 +--- ../passenger-6.1.2/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig 2018-12-03 12:23:06.980728000 -0500 ++++ ../passenger-6.1.2/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb 2018-12-03 12:23:32.978926000 -0500 @@ -204,7 +204,7 @@ :name => 'passenger_disable_anonymous_telemetry', :scope => :global, diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod index 83fcba4a2e39..91473d542f12 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -261,17 +261,20 @@ OTEL_LIB_DEPENDS= libabsl_base.so:devel/abseil \ OTEL_BUILD_DEPENDS= ${LOCALBASE}/include/opentelemetry/proto/common/v1/common.proto:devel/opentelemetry-proto OTEL_CONFIGURE_ENV+= NGX_OTEL_PROTO_DIR=${PREFIX}/include -PASSENGER_NGINX_VER= 6.0.27 -PASSENGER_CATEGORIES= ruby -PASSENGER_USES= ruby -PASSENGER_BUILD_DEPENDS=${LOCALBASE}/bin/rake:devel/rubygem-rake -PASSENGER_RAKE_BIN= ${LOCALBASE}/bin/rake +PASSENGER_NGINX_VER= 6.1.2 PASSENGER_MASTER_SITES= https://s3.amazonaws.com/phusion-passenger/releases/:passenger PASSENGER_DISTFILES= passenger-${PASSENGER_NGINX_VER}.tar.gz:passenger +PASSENGER_BUILD_DEPENDS=${LOCALBASE}/bin/rake:devel/rubygem-rake +PASSENGER_CATEGORIES= ruby +PASSENGER_CFLAGS= -DNDEBUG +PASSENGER_CONFIGURE_ENV=OPTIMIZE="yes" EXTRA_PRE_CXXFLAGS="-std=c++14" +PASSENGER_EXTRA_PATCHES=${PATCHDIR}/extra-patch-passenger-build-nginx.rb \ + ${PATCHDIR}/extra-patch-passenger-disable-telemetry \ + ${PATCHDIR}/extra-patch-passenger-Configuration.c +PASSENGER_RAKE_BIN= ${LOCALBASE}/bin/rake +PASSENGER_USES= ruby PASSENGER_VARS= WRKSRC_passenger=${WRKDIR}/passenger-${PASSENGER_NGINX_VER} \ DSO_EXTDIRS+=passenger-${PASSENGER_NGINX_VER}/src/nginx_module -PASSENGER_EXTRA_PATCHES=${PATCHDIR}/extra-patch-passenger-build-nginx.rb \ - ${PATCHDIR}/extra-patch-passenger-disable-telemetry POSTGRES_USES= pgsql POSTGRES_GH_TUPLE= konstruxi:ngx_postgres:8aa7359:postgres diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo index bc7058d48562..35e99b35265f 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,10 +1,10 @@ -TIMESTAMP = 1772874509 +TIMESTAMP = 1772887796 SHA256 (nginx-1.29.5.tar.gz) = 6744768a4114880f37b13a0443244e731bcb3130c0a065d7e37d8fd589ade374 SIZE (nginx-1.29.5.tar.gz) = 1310203 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae SIZE (nginx_mogilefs_module-1.0.4.tar.gz) = 11208 -SHA256 (passenger-6.0.27.tar.gz) = 82c830aee98feece09e84309c2d0c6bb3f7b22a3c8e33cfe93b5e0d498615d0f -SIZE (passenger-6.0.27.tar.gz) = 7548637 +SHA256 (passenger-6.1.2.tar.gz) = 94400a52e536cfdd8acf2accb47badb7a67dc309452f1b05600da67343f25bf8 +SIZE (passenger-6.1.2.tar.gz) = 7429067 SHA256 (msva-nginx_ajp_module-fcbb2cc_GH0.tar.gz) = 522e94c59f5783f281d868ede2adf325bf2f8ffb9e62cf8451d4b9ac0516916c SIZE (msva-nginx_ajp_module-fcbb2cc_GH0.tar.gz) = 110807 SHA256 (openresty-array-var-nginx-module-v0.06_GH0.tar.gz) = 2c3577265d1d51a2d0646311b9c651520a74455253b6f7a5776af79e9bff5cb1 diff --git a/www/nginx-devel/files/extra-patch-passenger-Configuration.c b/www/nginx-devel/files/extra-patch-passenger-Configuration.c new file mode 100644 index 000000000000..9cf6f6d37488 --- /dev/null +++ b/www/nginx-devel/files/extra-patch-passenger-Configuration.c @@ -0,0 +1,20 @@ +--- ../passenger-6.1.2/src/nginx_module/Configuration.c.orig 2013-10-26 20:00:00.000000000 -0400 ++++ ../passenger-6.1.2/src/nginx_module/Configuration.c 2025-11-02 20:09:05.651562000 -0500 +@@ -224,7 +224,7 @@ + + conf->upstream_config.send_lowat = NGX_CONF_UNSET_SIZE; + conf->upstream_config.buffer_size = NGX_CONF_UNSET_SIZE; +- #if NGINX_VERSION_NUM >= 1027000 ++ #if NGINX_VERSION_NUM >= 1027000 && !defined freenginx + conf->upstream_config.limit_rate = NGX_CONF_UNSET_PTR; + #elif NGINX_VERSION_NUM >= 1007007 + conf->upstream_config.limit_rate = NGX_CONF_UNSET_SIZE; +@@ -467,7 +467,7 @@ + prev->upstream_config.buffer_size, + 16 * 1024); + +- #if NGINX_VERSION_NUM >= 1027000 ++ #if NGINX_VERSION_NUM >= 1027000 && !defined freenginx + ngx_conf_merge_ptr_value(conf->upstream_config.limit_rate, + prev->upstream_config.limit_rate, NULL); + #elif NGINX_VERSION_NUM >= 1007007 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 73223329c8a7..8676c67d119c 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.27/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400 -+++ ../passenger-6.0.27/build/nginx.rb 2016-05-09 18:21:22.426777000 -0400 +--- ../passenger-6.1.2/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400 ++++ ../passenger-6.1.2/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 b676e7f886c9..90f70bb7c2c4 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.27/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig 2018-12-03 12:23:06.980728000 -0500 -+++ ../passenger-6.0.27/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb 2018-12-03 12:23:32.978926000 -0500 +--- ../passenger-6.1.2/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig 2018-12-03 12:23:06.980728000 -0500 ++++ ../passenger-6.1.2/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb 2018-12-03 12:23:32.978926000 -0500 @@ -204,7 +204,7 @@ :name => 'passenger_disable_anonymous_telemetry', :scope => :global, diff --git a/www/nginx-full/Makefile b/www/nginx-full/Makefile index 12cdc6c3156d..2aa07336f5d9 100644 --- a/www/nginx-full/Makefile +++ b/www/nginx-full/Makefile @@ -1,5 +1,5 @@ PORTNAME= nginx -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -full MAINTAINER= joneum@FreeBSD.org diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod index cb1569e468d3..ef50adae79cc 100644 --- a/www/nginx/Makefile.extmod +++ b/www/nginx/Makefile.extmod @@ -253,17 +253,20 @@ OTEL_LIB_DEPENDS= libabsl_base.so:devel/abseil \ OTEL_BUILD_DEPENDS= ${LOCALBASE}/include/opentelemetry/proto/common/v1/common.proto:devel/opentelemetry-proto OTEL_CONFIGURE_ENV+= NGX_OTEL_PROTO_DIR=${PREFIX}/include -PASSENGER_NGINX_VER= 6.0.27 -PASSENGER_CATEGORIES= ruby -PASSENGER_USES= ruby -PASSENGER_BUILD_DEPENDS=${LOCALBASE}/bin/rake:devel/rubygem-rake -PASSENGER_RAKE_BIN= ${LOCALBASE}/bin/rake +PASSENGER_NGINX_VER= 6.1.2 PASSENGER_MASTER_SITES= https://s3.amazonaws.com/phusion-passenger/releases/:passenger PASSENGER_DISTFILES= passenger-${PASSENGER_NGINX_VER}.tar.gz:passenger +PASSENGER_BUILD_DEPENDS=${LOCALBASE}/bin/rake:devel/rubygem-rake +PASSENGER_CATEGORIES= ruby +PASSENGER_CFLAGS= -DNDEBUG +PASSENGER_CONFIGURE_ENV=OPTIMIZE="yes" EXTRA_PRE_CXXFLAGS="-std=c++14" +PASSENGER_EXTRA_PATCHES=${PATCHDIR}/extra-patch-passenger-build-nginx.rb \ + ${PATCHDIR}/extra-patch-passenger-disable-telemetry \ + ${PATCHDIR}/extra-patch-passenger-Configuration.c +PASSENGER_RAKE_BIN= ${LOCALBASE}/bin/rake +PASSENGER_USES= ruby PASSENGER_VARS= WRKSRC_passenger=${WRKDIR}/passenger-${PASSENGER_NGINX_VER} \ DSO_EXTDIRS+=passenger-${PASSENGER_NGINX_VER}/src/nginx_module -PASSENGER_EXTRA_PATCHES=${PATCHDIR}/extra-patch-passenger-build-nginx.rb \ - ${PATCHDIR}/extra-patch-passenger-disable-telemetry POSTGRES_USES= pgsql POSTGRES_GH_TUPLE= konstruxi:ngx_postgres:8aa7359:postgres diff --git a/www/nginx/distinfo b/www/nginx/distinfo index 09136d4d45da..2cef4d7b31cd 100644 --- a/www/nginx/distinfo +++ b/www/nginx/distinfo @@ -1,12 +1,12 @@ -TIMESTAMP = 1772225455 +TIMESTAMP = 1772887627 SHA256 (nginx-1.28.2.tar.gz) = 20e5e0f2c917acfb51120eec2fba9a4ba4e1e10fd28465067cc87a7d81a829a3 SIZE (nginx-1.28.2.tar.gz) = 1282351 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae SIZE (nginx_mogilefs_module-1.0.4.tar.gz) = 11208 SHA256 (ngx_http_redis-0.3.9.tar.gz) = 21f87540f0a44b23ffa5df16fb3d788bc90803b255ef14f9c26e3847a6f26f46 SIZE (ngx_http_redis-0.3.9.tar.gz) = 13051 -SHA256 (passenger-6.0.27.tar.gz) = 82c830aee98feece09e84309c2d0c6bb3f7b22a3c8e33cfe93b5e0d498615d0f -SIZE (passenger-6.0.27.tar.gz) = 7548637 +SHA256 (passenger-6.1.2.tar.gz) = 94400a52e536cfdd8acf2accb47badb7a67dc309452f1b05600da67343f25bf8 +SIZE (passenger-6.1.2.tar.gz) = 7429067 SHA256 (msva-nginx_ajp_module-fcbb2cc_GH0.tar.gz) = 522e94c59f5783f281d868ede2adf325bf2f8ffb9e62cf8451d4b9ac0516916c SIZE (msva-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-Configuration.c b/www/nginx/files/extra-patch-passenger-Configuration.c new file mode 100644 index 000000000000..9cf6f6d37488 --- /dev/null +++ b/www/nginx/files/extra-patch-passenger-Configuration.c @@ -0,0 +1,20 @@ +--- ../passenger-6.1.2/src/nginx_module/Configuration.c.orig 2013-10-26 20:00:00.000000000 -0400 ++++ ../passenger-6.1.2/src/nginx_module/Configuration.c 2025-11-02 20:09:05.651562000 -0500 +@@ -224,7 +224,7 @@ + + conf->upstream_config.send_lowat = NGX_CONF_UNSET_SIZE; + conf->upstream_config.buffer_size = NGX_CONF_UNSET_SIZE; +- #if NGINX_VERSION_NUM >= 1027000 ++ #if NGINX_VERSION_NUM >= 1027000 && !defined freenginx + conf->upstream_config.limit_rate = NGX_CONF_UNSET_PTR; + #elif NGINX_VERSION_NUM >= 1007007 + conf->upstream_config.limit_rate = NGX_CONF_UNSET_SIZE; +@@ -467,7 +467,7 @@ + prev->upstream_config.buffer_size, + 16 * 1024); + +- #if NGINX_VERSION_NUM >= 1027000 ++ #if NGINX_VERSION_NUM >= 1027000 && !defined freenginx + ngx_conf_merge_ptr_value(conf->upstream_config.limit_rate, + prev->upstream_config.limit_rate, NULL); + #elif NGINX_VERSION_NUM >= 1007007 diff --git a/www/nginx/files/extra-patch-passenger-build-nginx.rb b/www/nginx/files/extra-patch-passenger-build-nginx.rb index 73223329c8a7..8676c67d119c 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.27/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400 -+++ ../passenger-6.0.27/build/nginx.rb 2016-05-09 18:21:22.426777000 -0400 +--- ../passenger-6.1.2/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400 ++++ ../passenger-6.1.2/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/files/extra-patch-passenger-disable-telemetry b/www/nginx/files/extra-patch-passenger-disable-telemetry index 935f6a5425e5..82f4f1acba3a 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.27/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig 2018-12-03 12:23:06.980728000 -0500 -+++ ../passenger-6.0.27/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb 2018-12-03 12:23:32.978924000 -0500 +--- ../passenger-6.1.2/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig 2018-12-03 12:23:06.980728000 -0500 ++++ ../passenger-6.1.2/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,home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69af1d55.2277f.3b876b6a>