git: e602636c7594 - main - www/nginx: Update third-party modul passenger

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jochen Neumeister <joneum_at_FreeBSD.org>
Date: Sun, 08 Sep 2024 09:47:42 UTC
The branch main has been updated by joneum:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e602636c7594abcd65097ae3b75870dc277bcdb8

commit e602636c7594abcd65097ae3b75870dc277bcdb8
Author:     Jochen Neumeister <joneum@FreeBSD.org>
AuthorDate: 2024-09-08 09:46:00 +0000
Commit:     Jochen Neumeister <joneum@FreeBSD.org>
CommitDate: 2024-09-08 09:47:19 +0000

    www/*nginx*: Update third-party modul passenger
    
    update third-party passenger module to 6.0.23
    
    Sponsored by: Netzkommune GmbH
---
 www/freenginx-devel/Makefile                       |  2 +-
 www/freenginx-devel/Makefile.extmod                |  5 ++--
 www/freenginx-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 ----------------------
 www/freenginx/Makefile                             |  2 +-
 www/freenginx/Makefile.extmod                      |  2 +-
 www/freenginx/distinfo                             |  6 ++---
 .../files/extra-patch-passenger-build-nginx.rb     |  4 ++--
 .../files/extra-patch-passenger-disable-telemetry  |  4 ++--
 www/nginx-full/Makefile                            |  2 +-
 www/nginx/Makefile                                 |  2 +-
 www/nginx/Makefile.extmod                          |  2 +-
 www/nginx/distinfo                                 |  6 ++---
 .../files/extra-patch-passenger-build-nginx.rb     |  4 ++--
 .../files/extra-patch-passenger-disable-telemetry  |  4 ++--
 17 files changed, 29 insertions(+), 57 deletions(-)

diff --git a/www/freenginx-devel/Makefile b/www/freenginx-devel/Makefile
index 46312968d779..a2f09c619f0a 100644
--- a/www/freenginx-devel/Makefile
+++ b/www/freenginx-devel/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	freenginx
 PORTVERSION=	1.27.2
-PORTREVISION?=	4
+PORTREVISION?=	5
 CATEGORIES=	www
 MASTER_SITES=	https://freenginx.org/download/ \
 		LOCAL/joneum
diff --git a/www/freenginx-devel/Makefile.extmod b/www/freenginx-devel/Makefile.extmod
index 451c958e3d9f..e4bef3d53b0b 100644
--- a/www/freenginx-devel/Makefile.extmod
+++ b/www/freenginx-devel/Makefile.extmod
@@ -259,7 +259,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
@@ -269,8 +269,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/freenginx-devel/distinfo b/www/freenginx-devel/distinfo
index 89c642a0e098..fdfdf17ca5ee 100644
--- a/www/freenginx-devel/distinfo
+++ b/www/freenginx-devel/distinfo
@@ -1,12 +1,12 @@
-TIMESTAMP = 1721104628
+TIMESTAMP = 1725787707
 SHA256 (freenginx-1.27.2.tar.gz) = e43500ff3e75a33a101a253cc252e7ebadc4a3d17e04951e77e719dda68b97d1
 SIZE (freenginx-1.27.2.tar.gz) = 1224762
 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/freenginx-devel/files/extra-patch-passenger-build-nginx.rb b/www/freenginx-devel/files/extra-patch-passenger-build-nginx.rb
index 95bf79da0865..34ad92f207b2 100644
--- a/www/freenginx-devel/files/extra-patch-passenger-build-nginx.rb
+++ b/www/freenginx-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/freenginx-devel/files/extra-patch-passenger-disable-telemetry b/www/freenginx-devel/files/extra-patch-passenger-disable-telemetry
index ca2ed9f0700a..302ae5bf765d 100644
--- a/www/freenginx-devel/files/extra-patch-passenger-disable-telemetry
+++ b/www/freenginx-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/freenginx-devel/files/extra-patch-passenger_src_nginx__module_Configuration.c b/www/freenginx-devel/files/extra-patch-passenger_src_nginx__module_Configuration.c
deleted file mode 100644
index 3d18184dd55e..000000000000
--- a/www/freenginx-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
diff --git a/www/freenginx/Makefile b/www/freenginx/Makefile
index 20627f7b47a9..c6b860c377ba 100644
--- a/www/freenginx/Makefile
+++ b/www/freenginx/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	nginx
 PORTVERSION=	1.26.0
-PORTREVISION?=	5
+PORTREVISION?=	6
 CATEGORIES=	www
 MASTER_SITES=	https://freenginx.org/download/ \
 		LOCAL/joneum
diff --git a/www/freenginx/Makefile.extmod b/www/freenginx/Makefile.extmod
index 04c4e69416e7..009a84ac09ca 100644
--- a/www/freenginx/Makefile.extmod
+++ b/www/freenginx/Makefile.extmod
@@ -258,7 +258,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.20
+PASSENGER_NGINX_VER=	6.0.23
 PASSENGER_CATEGORIES=	ruby
 PASSENGER_USES=		ruby
 PASSENGER_BUILD_DEPENDS=${LOCALBASE}/bin/rake:devel/rubygem-rake
diff --git a/www/freenginx/distinfo b/www/freenginx/distinfo
index e954901395eb..24415d318a99 100644
--- a/www/freenginx/distinfo
+++ b/www/freenginx/distinfo
@@ -1,12 +1,12 @@
-TIMESTAMP = 1723884408
+TIMESTAMP = 1725310577
 SHA256 (nginx-1.26.0.tar.gz) = d2e6c8439d6c6db5015d8eaab2470ab52aef85a7bf363182879977e084370497
 SIZE (nginx-1.26.0.tar.gz) = 1244118
 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.20.tar.gz) = fa8d9a37edb92f4a8f064b3005b57bccf10392ce4eb067838883206060e27107
-SIZE (passenger-6.0.20.tar.gz) = 8476308
+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/freenginx/files/extra-patch-passenger-build-nginx.rb b/www/freenginx/files/extra-patch-passenger-build-nginx.rb
index 40db3ee74183..34ad92f207b2 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.20/build/nginx.rb.orig	2013-10-26 18:00:00.000000000 -0400
-+++ ../passenger-6.0.20/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/freenginx/files/extra-patch-passenger-disable-telemetry b/www/freenginx/files/extra-patch-passenger-disable-telemetry
index 5b01b146eb5d..302ae5bf765d 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.20/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig	2018-12-03 12:23:06.980728000 -0500
-+++ ../passenger-6.0.20/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-full/Makefile b/www/nginx-full/Makefile
index 1818f696243e..6e5e56a3ee69 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 b/www/nginx/Makefile
index 6587494d76d1..6cb74d00fb4c 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	nginx
 PORTVERSION=	1.26.2
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \
diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod
index 86bc28b1d229..6e008ebb341b 100644
--- a/www/nginx/Makefile.extmod
+++ b/www/nginx/Makefile.extmod
@@ -259,7 +259,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.20
+PASSENGER_NGINX_VER=	6.0.23
 PASSENGER_CATEGORIES=	ruby
 PASSENGER_USES=		ruby
 PASSENGER_BUILD_DEPENDS=${LOCALBASE}/bin/rake:devel/rubygem-rake
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 1ab4a3b58d1e..8e7819805d9e 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -1,12 +1,12 @@
-TIMESTAMP = 1725153598
+TIMESTAMP = 1725305461
 SHA256 (nginx-1.26.2.tar.gz) = 627fe086209bba80a2853a0add9d958d7ebbdffa1a8467a5784c9a6b4f03d738
 SIZE (nginx-1.26.2.tar.gz) = 1244789
 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.20.tar.gz) = fa8d9a37edb92f4a8f064b3005b57bccf10392ce4eb067838883206060e27107
-SIZE (passenger-6.0.20.tar.gz) = 8476308
+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/files/extra-patch-passenger-build-nginx.rb b/www/nginx/files/extra-patch-passenger-build-nginx.rb
index 40db3ee74183..34ad92f207b2 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.20/build/nginx.rb.orig	2013-10-26 18:00:00.000000000 -0400
-+++ ../passenger-6.0.20/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/files/extra-patch-passenger-disable-telemetry b/www/nginx/files/extra-patch-passenger-disable-telemetry
index 5b01b146eb5d..302ae5bf765d 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.20/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig	2018-12-03 12:23:06.980728000 -0500
-+++ ../passenger-6.0.20/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,