From nobody Thu Aug 22 02:40:15 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wq6qz67rrz5TMrV; Thu, 22 Aug 2024 02:40:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wq6qz57KNz4btf; Thu, 22 Aug 2024 02:40:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724294415; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cdKD4gka/sZcOgwn+4KBGeXgS+4kPVjuBdvK7L2oVUo=; b=njn7CNeKuzadpE9maGzdn86eLZKrvUhseeW7py4q892kU1XVL9PhMQWCIhsVjNVVTn1b3B 2JnJpkNvfcM74ynqlysbxyxuLvtYj0afJt+U1hYCEzEPntoHaR8BPP5VGdaP1xBwiYgg0+ qz3nacNb75msKcL6v/iZ7B23eVldqaMoUaU7TJzaD709fyg8SCrMuq9SQ2Scws7/eNacWo 17+ZHlXadbjtUziE3XqeRsrn+s45GqVv2fUzZXnnZJD46jhspXTBotPb0hZkFY4kaRDgLm nCwmOdmMbSM7YwW8/wD8Sj+7mpGbW77ofBNu8ktKR3+5Mhh/nsZSvnm81Fm3vw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724294415; a=rsa-sha256; cv=none; b=h0oQDBV5VskFTLgna8qWH5llDnnBGz5xgsubHNB21MXbavOnhW584YwgwB4iEb/4yVEfYU kU1nACe+MLA+73U9nPnAhs1C0rVDP0cJ49AZZ7fubXc31/VuFczFz/e1/fGNXKkqo9w+za 3DRnSzsJfEM9eullA+3L4XeFJTPcOQ8ImGwaf+6U3D+sbwcP/a06o/ZUfONn82a5xqrVDQ xUabQHCOF0s9V+YVU+0j3iPfUmZmLPsOlbQ/hgia0AtFnAk8fDJgzoUaLFx2p9LAv0oZgx cMi7/Z4uHEURgDRJ/FexhWCJ7dDqc3CAx3CPR84K1sntWwrgmVEuTDlU+/LetA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724294415; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cdKD4gka/sZcOgwn+4KBGeXgS+4kPVjuBdvK7L2oVUo=; b=jnqZn5FSG9gtaaaXi8yIgki185awqC+l4Wx5/c9bKB3Y5p9/D6PzvsCCHkVBK6QARIHB3j kT9fZzZ7Lw1XF+QXtBQMWgDMYlfY75dDU1f3BKR5gtiA5QH+AWeXI3Hfmuu5K4WeF4Tzqs haQbkN+ci2pQ5qnvnBqYJ+CnvcVQaZ3ugR+Av68aWoKOrAdueCJKWLkrz6obHlUyyZw+zG OpkQKFFf6peLCx+h8pIddkQdYqeGzRz6tKcdkawfgAAYgF1LdDuG9ocjQPNouU4WV2fcLk ffExGAsgk9LBmBzHbRNBJ8IeHfXR3+eZeRqy0/xPxo7Z3/oI+LcyM6zeCS/P1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Wq6qz4WRHz18Xb; Thu, 22 Aug 2024 02:40:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47M2eF97014268; Thu, 22 Aug 2024 02:40:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47M2eFVa014259; Thu, 22 Aug 2024 02:40:15 GMT (envelope-from git) Date: Thu, 22 Aug 2024 02:40:15 GMT Message-Id: <202408220240.47M2eFVa014259@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: e3cf069b9865 - main - www/nginx-devel: update third-party passenger module to 6.0.23 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e3cf069b986587d1499111843e2130b41fc99f75 Auto-Submitted: auto-generated The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=e3cf069b986587d1499111843e2130b41fc99f75 commit e3cf069b986587d1499111843e2130b41fc99f75 Author: Sergey A. Osokin AuthorDate: 2024-08-22 02:39:44 +0000 Commit: Sergey A. Osokin 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