summaryrefslogtreecommitdiff
path: root/www/nginx-devel
diff options
context:
space:
mode:
authorSergey A. Osokin <osa@FreeBSD.org>2025-04-10 20:16:11 -0400
committerSergey A. Osokin <osa@FreeBSD.org>2025-04-10 20:16:40 -0400
commit9a42667e8c10d1b2b75d866dc5b0bfc62e26656b (patch)
treebb5759481d833da0a6fb6cc9fb5ec115ba121a28 /www/nginx-devel
parentdevel/rubygem-daemon_controller: update from 1.2.0 to 3.0.0 (diff)
www/nginx-devel: update third-party passenger module to 6.0.27
Bump PORTREVISION.
Diffstat (limited to 'www/nginx-devel')
-rw-r--r--www/nginx-devel/Makefile4
-rw-r--r--www/nginx-devel/Makefile.extmod5
-rw-r--r--www/nginx-devel/distinfo6
-rw-r--r--www/nginx-devel/files/extra-patch-passenger-build-nginx.rb4
-rw-r--r--www/nginx-devel/files/extra-patch-passenger-disable-telemetry4
-rw-r--r--www/nginx-devel/files/extra-patch-passenger-implementation.cpp14
6 files changed, 11 insertions, 26 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index cf281358c711..cc0c61a86107 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -1,6 +1,6 @@
PORTNAME?= nginx
PORTVERSION= 1.27.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
LOCAL/osa
@@ -308,7 +308,7 @@ post-patch-NJS_QJS-on:
post-patch-PASSENGER-on:
@${REINPLACE_CMD} \
- '168,170s!true!false!' \
+ '176,178s!true!false!' \
${WRKSRC_PASSENGER}/build/basics.rb
@${REINPLACE_CMD} \
's!-I/usr/include/libev!!; \
diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod
index 433e0d336d05..2c0b2bf99e34 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.26
+PASSENGER_NGINX_VER= 6.0.27
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-implementation.cpp
+ ${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 b686bd5873a2..baac570d318e 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,12 +1,12 @@
-TIMESTAMP = 1743275239
+TIMESTAMP = 1744298004
SHA256 (nginx-1.27.4.tar.gz) = 294816f879b300e621fa4edd5353dd1ec00badb056399eceb30de7db64b753b2
SIZE (nginx-1.27.4.tar.gz) = 1277177
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.26.tar.gz) = c69312230d4467a30d7a8abd25ee04250df3e332432871c6bd561ef5eea3d485
-SIZE (passenger-6.0.26.tar.gz) = 8323901
+SHA256 (passenger-6.0.27.tar.gz) = 82c830aee98feece09e84309c2d0c6bb3f7b22a3c8e33cfe93b5e0d498615d0f
+SIZE (passenger-6.0.27.tar.gz) = 7548637
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-build-nginx.rb b/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb
index 3e4d08220b44..73223329c8a7 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.26/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400
-+++ ../passenger-6.0.26/build/nginx.rb 2016-05-09 18:21:22.426777000 -0400
+--- ../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
@@ -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 3aab752d6588..b676e7f886c9 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.26/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig 2018-12-03 12:23:06.980728000 -0500
-+++ ../passenger-6.0.26/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb 2018-12-03 12:23:32.978926000 -0500
+--- ../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
@@ -204,7 +204,7 @@
:name => 'passenger_disable_anonymous_telemetry',
:scope => :global,
diff --git a/www/nginx-devel/files/extra-patch-passenger-implementation.cpp b/www/nginx-devel/files/extra-patch-passenger-implementation.cpp
deleted file mode 100644
index eb53a83ac1d3..000000000000
--- a/www/nginx-devel/files/extra-patch-passenger-implementation.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../passenger-6.0.26/src/cxx_supportlib/oxt/implementation.cpp.orig 2013-10-26 20:00:00.000000000 -0400
-+++ ../passenger-6.0.26/src/cxx_supportlib/oxt/implementation.cpp 2025-02-04 14:00:31.804615000 -0500
-@@ -397,9 +397,9 @@
-
- static void
- set_native_thread_name(const string &name) {
-- #if defined(__linux__)
-+ #if defined(__linux__) || defined(__FreeBSD__)
- pthread_setname_np(pthread_self(), name.c_str());
-- #elif defined(__APPLE__) || defined(__FreeBSD__)
-+ #elif defined(__APPLE__)
- pthread_setname_np(name.c_str());
- #endif
- }