Date: Thu, 22 Aug 2024 02:40:15 GMT From: "Sergey A. Osokin" <osa@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: e3cf069b9865 - main - www/nginx-devel: update third-party passenger module to 6.0.23 Message-ID: <202408220240.47M2eFVa014259@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=e3cf069b986587d1499111843e2130b41fc99f75 commit e3cf069b986587d1499111843e2130b41fc99f75 Author: Sergey A. Osokin <osa@FreeBSD.org> AuthorDate: 2024-08-22 02:39:44 +0000 Commit: Sergey A. Osokin <osa@FreeBSD.org> CommitDate: 2024-08-22 02:40:09 +0000 www/nginx-devel: update third-party passenger module to 6.0.23 Bump PORTREVISION. --- www/nginx-devel/Makefile | 1 + www/nginx-devel/Makefile.extmod | 5 ++-- www/nginx-devel/distinfo | 6 ++--- .../files/extra-patch-passenger-build-nginx.rb | 4 ++-- .../files/extra-patch-passenger-disable-telemetry | 4 ++-- ...tch-passenger_src_nginx__module_Configuration.c | 27 ---------------------- 6 files changed, 10 insertions(+), 37 deletions(-) diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 34abf506ef46..7f457b7b3d39 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -1,5 +1,6 @@ PORTNAME?= nginx PORTVERSION= 1.27.1 +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 d1f242730a7e..cdb035920ebc 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -264,7 +264,7 @@ 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.22 +PASSENGER_NGINX_VER= 6.0.23 PASSENGER_CATEGORIES= ruby PASSENGER_USES= ruby PASSENGER_BUILD_DEPENDS=${LOCALBASE}/bin/rake:devel/rubygem-rake @@ -274,8 +274,7 @@ 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_EXTRA_PATCHES=${PATCHDIR}/extra-patch-passenger-build-nginx.rb \ - ${PATCHDIR}/extra-patch-passenger-disable-telemetry \ - ${PATCHDIR}/extra-patch-passenger_src_nginx__module_Configuration.c + ${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 06ccf0bf70a9..78c67c345988 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,12 +1,12 @@ -TIMESTAMP = 1724287541 +TIMESTAMP = 1724293472 SHA256 (nginx-1.27.1.tar.gz) = bd7ba68a6ce1ea3768b771c7e2ab4955a59fb1b1ae8d554fedb6c2304104bdfc SIZE (nginx-1.27.1.tar.gz) = 1245244 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.22.tar.gz) = 1fc2a89196fc83469b10fea1ac7b57002fb9bf2552d70f03b780c92d7d9ed044 -SIZE (passenger-6.0.22.tar.gz) = 8296503 +SHA256 (passenger-6.0.23.tar.gz) = 897555224fb11340677780d929b5099da62303b1ae15f2e7c65cd3f6d3e7920c +SIZE (passenger-6.0.23.tar.gz) = 8298217 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-devel/files/extra-patch-passenger-build-nginx.rb b/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb index 95bf79da0865..34ad92f207b2 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.22/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400 -+++ ../passenger-6.0.22/build/nginx.rb 2016-05-09 18:21:22.426777000 -0400 +--- ../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 @@ -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 ca2ed9f0700a..302ae5bf765d 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.22/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig 2018-12-03 12:23:06.980728000 -0500 -+++ ../passenger-6.0.22/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb 2018-12-03 12:23:32.978924000 -0500 +--- ../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 @@ -204,7 +204,7 @@ :name => 'passenger_disable_anonymous_telemetry', :scope => :global, diff --git a/www/nginx-devel/files/extra-patch-passenger_src_nginx__module_Configuration.c b/www/nginx-devel/files/extra-patch-passenger_src_nginx__module_Configuration.c deleted file mode 100644 index 3d18184dd55e..000000000000 --- a/www/nginx-devel/files/extra-patch-passenger_src_nginx__module_Configuration.c +++ /dev/null @@ -1,27 +0,0 @@ ---- ../passenger-6.0.22/src/nginx_module/Configuration.c.orig 2013-10-26 20:00:00.000000000 -0400 -+++ ../passenger-6.0.22/src/nginx_module/Configuration.c 2024-06-04 10:53:52.178855000 -0400 -@@ -224,8 +224,10 @@ - - conf->upstream_config.send_lowat = NGX_CONF_UNSET_SIZE; - conf->upstream_config.buffer_size = NGX_CONF_UNSET_SIZE; -- #if NGINX_VERSION_NUM >= 1007007 -- conf->upstream_config.limit_rate = NGX_CONF_UNSET_SIZE; -+ #if NGINX_VERSION_NUM >= 1027000 -+ conf->upstream_config.limit_rate = NGX_CONF_UNSET_PTR; -+ #elif NGINX_VERSION_NUM >= 1007007 -+ conf->upstream_config.limit_rate = NGX_CONF_UNSET_SiZE; - #endif - - conf->upstream_config.busy_buffers_size_conf = NGX_CONF_UNSET_SIZE; -@@ -465,7 +467,10 @@ - prev->upstream_config.buffer_size, - 16 * 1024); - -- #if NGINX_VERSION_NUM >= 1007007 -+ #if NGINX_VERSION_NUM >= 1027000 -+ ngx_conf_merge_ptr_value(conf->upstream_config.limit_rate, -+ prev->upstream_config.limit_rate, NULL); -+ #elif NGINX_VERSION_NUM >= 1007007 - ngx_conf_merge_size_value(conf->upstream_config.limit_rate, - prev->upstream_config.limit_rate, 0); - #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202408220240.47M2eFVa014259>