aboutsummaryrefslogtreecommitdiff
path: root/www/freenginx-devel
diff options
context:
space:
mode:
Diffstat (limited to 'www/freenginx-devel')
-rw-r--r--www/freenginx-devel/Makefile1
-rw-r--r--www/freenginx-devel/Makefile.extmod19
-rw-r--r--www/freenginx-devel/Makefile.ignore36
-rw-r--r--www/freenginx-devel/Makefile.options.desc1
-rw-r--r--www/freenginx-devel/distinfo20
-rw-r--r--www/freenginx-devel/files/extra-patch-ngx_http_echo_timer.c14
-rw-r--r--www/freenginx-devel/files/extra-patch-ngx_http_upload_module.c26
-rw-r--r--www/freenginx-devel/files/extra-patch-ngx_http_vhost_traffic_status_module.c14
-rw-r--r--www/freenginx-devel/files/extra-patch-ngx_otel_module.cpp14
-rw-r--r--www/freenginx-devel/files/extra-patch-passenger-Configuration.c20
-rw-r--r--www/freenginx-devel/files/nginx.in3
-rw-r--r--www/freenginx-devel/pkg-plist2
12 files changed, 105 insertions, 65 deletions
diff --git a/www/freenginx-devel/Makefile b/www/freenginx-devel/Makefile
index f6c640990f29..0467c0358cea 100644
--- a/www/freenginx-devel/Makefile
+++ b/www/freenginx-devel/Makefile
@@ -1,6 +1,7 @@
PORTNAME= freenginx
PORTVERSION= ${NGINX_VERSION}
.include "version.mk"
+PORTREVISION= 14
CATEGORIES= www
MASTER_SITES= https://freenginx.org/download/ \
LOCAL/osa
diff --git a/www/freenginx-devel/Makefile.extmod b/www/freenginx-devel/Makefile.extmod
index a9ce4011126c..80db115b7e5b 100644
--- a/www/freenginx-devel/Makefile.extmod
+++ b/www/freenginx-devel/Makefile.extmod
@@ -10,7 +10,7 @@ OPTIONS_GROUP_THIRDPARTYGRP= AJP BROTLI CACHE_PURGE \
HTTP_IP2PROXY HTTP_JSON_STATUS HTTP_MOGILEFS HTTP_NOTICE HTTP_PUSH \
HTTP_PUSH_STREAM HTTP_REDIS HTTP_SLICE_AHEAD HTTP_SUBS_FILTER HTTP_TARANTOOL \
HTTP_UPLOAD HTTP_UPLOAD_PROGRESS HTTP_UPSTREAM_FAIR HTTP_UPSTREAM_STICKY \
- HTTP_VIDEO_THUMBEXTRACTOR HTTP_ZIP ICONV LET LINK LUA \
+ HTTP_VIDEO_THUMBEXTRACTOR HTTP_ZIP ICONV KEYVAL LET LINK LUA \
LUASTREAM MEMC MODSECURITY3 NATS NAXSI PASSENGER POSTGRES RDS_CSV RDS_JSON \
REDIS2 RTMP SET_MISC SFLOW SHIBBOLETH SLOWFS_CACHE SRCACHE STS \
VOD VTS XSS WEBSOCKIFY ZSTD
@@ -30,7 +30,7 @@ BROTLI_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_brotli_filter_config
CACHE_PURGE_GH_TUPLE= nginx-modules:ngx_cache_purge:a84b0f3:cache_purge
CACHE_PURGE_VARS= DSO_EXTMODS+=cache_purge
-ECHO_GH_TUPLE= openresty:echo-nginx-module:4eeda3c:echo
+ECHO_GH_TUPLE= openresty:echo-nginx-module:b0f344b:echo
ECHO_VARS= DSO_EXTMODS+=echo
DRIZZLE_LIB_DEPENDS= libdrizzle.so:databases/libdrizzle
@@ -158,6 +158,7 @@ HTTP_TARANTOOL_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_tarantool-config
HTTP_UPLOAD_GH_TUPLE= fdintino:nginx-upload-module:96e6460:upload
HTTP_UPLOAD_VARS= DSO_EXTMODS+=upload
+HTTP_UPLOAD_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_upload_module.c
HTTP_UPLOAD_PROGRESS_GH_TUPLE= masterzen:nginx-upload-progress-module:v0.9.3:uploadprogress
HTTP_UPLOAD_PROGRESS_VARS= DSO_EXTMODS+=uploadprogress
@@ -188,6 +189,9 @@ ICONV_GH_TUPLE= calio:iconv-nginx-module:v0.14:iconv
ICONV_VARS= DSO_EXTMODS+=iconv
ICONV_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-calio-iconv-nginx-module-config
+KEYVAL_GH_TUPLE= kjdev:nginx-keyval:bb04325:keyval
+KEYVAL_VARS= DSO_EXTMODS+=keyval
+
LET_GH_TUPLE= baysao:nginx-let-module:c1f23aa:let
LET_VARS= DSO_EXTMODS+=let
@@ -197,7 +201,7 @@ LUA_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty
LUA_RUN_DEPENDS= lua-resty-core>0:www/lua-resty-core
LUA_CONFIGURE_ENV= LUAJIT_INC=${LOCALBASE}/include/luajit-2.1 \
LUAJIT_LIB=${LOCALBASE}/lib
-LUA_GH_TUPLE= openresty:lua-nginx-module:v0.10.28:lua
+LUA_GH_TUPLE= openresty:lua-nginx-module:de02114:lua
LUA_VARS= DSO_EXTMODS+=lua
LUASTREAM_IMPLIES= DEVEL_KIT
@@ -205,7 +209,7 @@ LUASTREAM_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty
LUASTREAM_RUN_DEPENDS= lua-resty-core>0:www/lua-resty-core
LUASTREAM_CONFIGURE_ENV=LUAJIT_INC=${LOCALBASE}/include/luajit-2.1 \
LUAJIT_LIB=${LOCALBASE}/lib
-LUASTREAM_GH_TUPLE= openresty:stream-lua-nginx-module:v0.0.16:luastream
+LUASTREAM_GH_TUPLE= openresty:stream-lua-nginx-module:v0.0.17:luastream
LUASTREAM_VARS= DSO_EXTMODS+=luastream
LINK_GH_TUPLE= Taymindis:nginx-link-function:3.2.4:link
@@ -232,7 +236,7 @@ NAXSI_VARS= DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_src
NAXSI_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-naxsi-libinjection__sqli_c \
${PATCHDIR}/extra-patch-naxsi_config
-NJS_GH_TUPLE= nginx:njs:0.9.1:njs
+NJS_GH_TUPLE= nginx:njs:0.9.4:njs
NJS_CONFIGURE_ON= --with-cc-opt="-I ${LOCALBASE}/include/quickjs"
NJS_LIB_DEPENDS= libquickjs.so:lang/quickjs \
libxml2.so:textproc/libxml2 \
@@ -252,6 +256,7 @@ OTEL_LIB_DEPENDS= libabsl_base.so:devel/abseil \
libre2.so:devel/re2
OTEL_BUILD_DEPENDS= ${LOCALBASE}/include/opentelemetry/proto/common/v1/common.proto:devel/opentelemetry-proto
OTEL_CONFIGURE_ENV+= NGX_OTEL_PROTO_DIR=${PREFIX}/include
+OTEL_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_otel_module.cpp
PASSENGER_NGINX_VER= 6.0.27
PASSENGER_CATEGORIES= ruby
@@ -263,7 +268,8 @@ 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-disable-telemetry \
+ ${PATCHDIR}/extra-patch-passenger-Configuration.c
POSTGRES_USES= pgsql
POSTGRES_GH_TUPLE= konstruxi:ngx_postgres:8aa7359:postgres
@@ -313,6 +319,7 @@ VOD_VARS= DSO_EXTMODS+=vod
VTS_GH_TUPLE= vozlt:nginx-module-vts:c382342:vts
VTS_VARS= DSO_EXTMODS+=vts
+VTS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_vhost_traffic_status_module.c
XSS_GH_TUPLE= openresty:xss-nginx-module:de2d87a:xss
XSS_VARS= DSO_EXTMODS+=xss
diff --git a/www/freenginx-devel/Makefile.ignore b/www/freenginx-devel/Makefile.ignore
index 2fcd24c282bb..e28b60dd751c 100644
--- a/www/freenginx-devel/Makefile.ignore
+++ b/www/freenginx-devel/Makefile.ignore
@@ -1,39 +1,3 @@
-.if ${PORT_OPTIONS:MECHO}
-IGNORE= echo module: patching is required
-.endif
-
-.if ${PORT_OPTIONS:MHTTP_UPLOAD}
-IGNORE= upload module: patching is required
-.endif
-
-.if ${PORT_OPTIONS:MLUA}
-IGNORE= lua module: patching is required
-.endif
-
.if ${PORT_OPTIONS:MLUASTREAM}
IGNORE= lua stream module: patching is required
.endif
-
-.if ${PORT_OPTIONS:MOTEL}
-IGNORE= otel module: patching is required
-.endif
-
-.if ${PORT_OPTIONS:MPASSENGER}
-IGNORE= passenger module: patching is required
-.endif
-
-.if ${PORT_OPTIONS:MSET_MISC}
-IGNORE= set_misc module: patching is required
-.endif
-
-.if ${PORT_OPTIONS:MSTS}
-IGNORE= sts module: patching is required
-.endif
-
-.if ${PORT_OPTIONS:MVOD}
-IGNORE= vod module: patching is required
-.endif
-
-.if ${PORT_OPTIONS:MVTS}
-IGNORE= vts module: patching is required
-.endif
diff --git a/www/freenginx-devel/Makefile.options.desc b/www/freenginx-devel/Makefile.options.desc
index 8271048c0d59..88cfd36a84f2 100644
--- a/www/freenginx-devel/Makefile.options.desc
+++ b/www/freenginx-devel/Makefile.options.desc
@@ -73,6 +73,7 @@ HTTP_XSLT_DESC= Enable http_xslt module
HTTP_ZIP_DESC= 3rd party http_zip module
ICONV_DESC= 3rd party iconv module
IPV6_DESC= Enable IPv6 support
+KEYVAL_DESC= 3rd party keyval module
LET_DESC= 3rd party let module
LINK_DESC= 3rd party link function module
LUA_DESC= 3rd party lua module
diff --git a/www/freenginx-devel/distinfo b/www/freenginx-devel/distinfo
index 2b86aa7775b8..4df0ebb69738 100644
--- a/www/freenginx-devel/distinfo
+++ b/www/freenginx-devel/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1760882414
+TIMESTAMP = 1762355261
SHA256 (freenginx-1.29.2.tar.gz) = b2645b829146bf509937423c993d1596214df46c4afdd146543f379151aaed59
SIZE (freenginx-1.29.2.tar.gz) = 1241366
SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
@@ -19,8 +19,8 @@ SHA256 (openresty-drizzle-nginx-module-c631276_GH0.tar.gz) = 215ebeb3bad3a907f13
SIZE (openresty-drizzle-nginx-module-c631276_GH0.tar.gz) = 51675
SHA256 (ZigzagAK-ngx_dynamic_upstream-ab67fe7_GH0.tar.gz) = 4610da3ce9c35e3eef0e6d12a6285b9c8020f6d44fb094b4af94c1275bc01156
SIZE (ZigzagAK-ngx_dynamic_upstream-ab67fe7_GH0.tar.gz) = 22991
-SHA256 (openresty-echo-nginx-module-4eeda3c_GH0.tar.gz) = 64093d606c7bc61a26ca49bfa7c4a2dacec6013ce158463a377592a6f7224444
-SIZE (openresty-echo-nginx-module-4eeda3c_GH0.tar.gz) = 53544
+SHA256 (openresty-echo-nginx-module-b0f344b_GH0.tar.gz) = d10b5b2e58065e79e28b1c4e572196f0b8b53acc2e1ee6902a667faec72d7885
+SIZE (openresty-echo-nginx-module-b0f344b_GH0.tar.gz) = 53548
SHA256 (openresty-encrypted-session-nginx-module-7ffe4ec_GH0.tar.gz) = 1848ee88be81350326918930463e0f2be2013ab76ae589d01f00fd81c5da0c07
SIZE (openresty-encrypted-session-nginx-module-7ffe4ec_GH0.tar.gz) = 11899
SHA256 (ogarrett-nginx-fips-check-module-6cb4270_GH0.tar.gz) = d52fbb0f2819cd91b710ad85e6c8b452fdca6a5d81b0694d6637adba3fc2382c
@@ -85,14 +85,16 @@ SHA256 (vince2678-mod_zip-39dc908_GH0.tar.gz) = bc5c3d725268abbe1c5c38de5b18a4ad
SIZE (vince2678-mod_zip-39dc908_GH0.tar.gz) = 30275
SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b8b9f355c05c0790226512f6732348a2404d48531688a1fc04ce6768163bf462
SIZE (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = 13133
+SHA256 (kjdev-nginx-keyval-bb04325_GH0.tar.gz) = 7b941fcdba02aed9b69497e93e1954fe570d73362f4867a478b6f97fe518e554
+SIZE (kjdev-nginx-keyval-bb04325_GH0.tar.gz) = 24551
SHA256 (baysao-nginx-let-module-c1f23aa_GH0.tar.gz) = 7393809d5d8877812da1bd5b5fbd1d8b00bc85e71f2f387c344f007773e49050
SIZE (baysao-nginx-let-module-c1f23aa_GH0.tar.gz) = 20617
SHA256 (Taymindis-nginx-link-function-3.2.4_GH0.tar.gz) = 20c3679199ba7efe1598f03b2fa0b13591226363c8dd7930d7f02702cd5abada
SIZE (Taymindis-nginx-link-function-3.2.4_GH0.tar.gz) = 139656
-SHA256 (openresty-lua-nginx-module-v0.10.28_GH0.tar.gz) = 634827d54de6216cb0502d14f76610788b3a3e33160e91d5578d6db0d9a34a20
-SIZE (openresty-lua-nginx-module-v0.10.28_GH0.tar.gz) = 869217
-SHA256 (openresty-stream-lua-nginx-module-v0.0.16_GH0.tar.gz) = 3b1103cf5ee940ea94711eae1a7ccc1a161273ec9a08eb415f1d45ad385f967d
-SIZE (openresty-stream-lua-nginx-module-v0.0.16_GH0.tar.gz) = 395259
+SHA256 (openresty-lua-nginx-module-de02114_GH0.tar.gz) = b5db3168855df3dc9b65510e1e2e0da7d7cff29c81d1de7796a799042180ccc5
+SIZE (openresty-lua-nginx-module-de02114_GH0.tar.gz) = 892583
+SHA256 (openresty-stream-lua-nginx-module-v0.0.17_GH0.tar.gz) = 09cf5b90904a575b90c16d5cf861b978ef2dbe6d5340e5eb3707e2d2a3ac5cdc
+SIZE (openresty-stream-lua-nginx-module-v0.0.17_GH0.tar.gz) = 413563
SHA256 (openresty-memc-nginx-module-v0.20_GH0.tar.gz) = a42dd56dd6e2144755a127bcd2a6cc1a488258dc5cdb751d6a3e5dd5b6989239
SIZE (openresty-memc-nginx-module-v0.20_GH0.tar.gz) = 34736
SHA256 (owasp-modsecurity-ModSecurity-nginx-fd28e6a_GH0.tar.gz) = deafee4e4145a73b9369999e261368b34d4f7ff1be2596a559abd9e1d5df5526
@@ -103,8 +105,8 @@ SHA256 (wargio-naxsi-1.7_GH0.tar.gz) = adee817da71913f64a9fb0fca142d9520bb0e5014
SIZE (wargio-naxsi-1.7_GH0.tar.gz) = 1132392
SHA256 (libinjection-libinjection-b9fcaaf_GH0.tar.gz) = 7812e1316b61a7a7d3a65a57a07c6d5235ac40fe35e6edda983f31a44661a38e
SIZE (libinjection-libinjection-b9fcaaf_GH0.tar.gz) = 2218207
-SHA256 (nginx-njs-0.9.1_GH0.tar.gz) = 61365eea69c6862fc8a5b5df531503ae49499f6bcd5af932496b84850a2824a4
-SIZE (nginx-njs-0.9.1_GH0.tar.gz) = 966480
+SHA256 (nginx-njs-0.9.4_GH0.tar.gz) = 7b3a9f14b0f09311d9031c2a252cb0e23c06baac2e586a7d12c75aa6cba4ca0e
+SIZE (nginx-njs-0.9.4_GH0.tar.gz) = 939082
SHA256 (osokin-nginx-otel-3a655df_GH0.tar.gz) = 71ee1561303c289d4562148f8719b60796c36abe16de1b3c10d10b8e6f03a952
SIZE (osokin-nginx-otel-3a655df_GH0.tar.gz) = 27169
SHA256 (konstruxi-ngx_postgres-8aa7359_GH0.tar.gz) = c69ad4495de7c7883ebc23e1e6c4cc83a4ac6a7fddd4d5c12e49d33b65f7c50b
diff --git a/www/freenginx-devel/files/extra-patch-ngx_http_echo_timer.c b/www/freenginx-devel/files/extra-patch-ngx_http_echo_timer.c
deleted file mode 100644
index 572581a0f1b6..000000000000
--- a/www/freenginx-devel/files/extra-patch-ngx_http_echo_timer.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../echo-nginx-module-4eeda3c/src/ngx_http_echo_timer.c.orig 2025-10-21 16:47:54.085370000 -0400
-+++ ../echo-nginx-module-4eeda3c/src/ngx_http_echo_timer.c 2025-10-21 16:50:55.878182000 -0400
-@@ -32,9 +32,8 @@
- ngx_http_set_ctx(r, ctx, ngx_http_echo_module);
- }
-
-- if (ctx->timer_begin.sec == 0) {
-- ctx->timer_begin.sec = r->start_sec;
-- ctx->timer_begin.msec = (ngx_msec_t) r->start_msec;
-+ if (ctx->timer_begin.time == 0) {
-+ ctx->timer_begin.time = r->start_time;
- }
-
- /* force the ngx timer to update */
diff --git a/www/freenginx-devel/files/extra-patch-ngx_http_upload_module.c b/www/freenginx-devel/files/extra-patch-ngx_http_upload_module.c
new file mode 100644
index 000000000000..36649990a8f0
--- /dev/null
+++ b/www/freenginx-devel/files/extra-patch-ngx_http_upload_module.c
@@ -0,0 +1,26 @@
+--- ../nginx-upload-module-96e6460/ngx_http_upload_module.c.orig 2025-11-02 20:25:39.277074000 -0500
++++ ../nginx-upload-module-96e6460/ngx_http_upload_module.c 2025-11-02 20:31:22.912698000 -0500
+@@ -989,7 +989,11 @@
+ if (u->limit_rate) {
+ remaining = ((ssize_t) r->headers_in.content_length_n) - u->received;
+ next_buf_size = (buf_read_size > remaining) ? remaining : buf_read_size;
++#if defined freenginx && nginx_version >= 1029000
++ limit = u->limit_rate * (ngx_time() - ((ngx_current_msec - r->start_time) / 1000) + 1) - (u->received + next_buf_size);
++#else
+ limit = u->limit_rate * (ngx_time() - r->start_sec + 1) - (u->received + next_buf_size);
++#endif
+ if (limit < 0) {
+ rev->delayed = 1;
+ ngx_add_timer(rev, (ngx_msec_t) ((limit * -1000 / u->limit_rate) + 1));
+@@ -3370,7 +3373,11 @@
+ }
+
+ if (u->limit_rate) {
++#if defined freenginx && nginx_version >= 1029000
++ limit = u->limit_rate * (ngx_time() - ((ngx_current_msec - r->start_time) / 1000) + 1) - u->received;
++#else
+ limit = u->limit_rate * (ngx_time() - r->start_sec + 1) - u->received;
++#endif
+
+ if (limit < 0) {
+ c->read->delayed = 1;
diff --git a/www/freenginx-devel/files/extra-patch-ngx_http_vhost_traffic_status_module.c b/www/freenginx-devel/files/extra-patch-ngx_http_vhost_traffic_status_module.c
new file mode 100644
index 000000000000..50eca3992c88
--- /dev/null
+++ b/www/freenginx-devel/files/extra-patch-ngx_http_vhost_traffic_status_module.c
@@ -0,0 +1,14 @@
+--- ../nginx-module-vts-c382342/src/ngx_http_vhost_traffic_status_module.c.orig 2025-11-02 09:49:45.010029000 -0500
++++ ../nginx-module-vts-c382342/src/ngx_http_vhost_traffic_status_module.c 2025-11-02 09:56:01.011946000 -0500
+@@ -354,7 +354,11 @@
+ tp = ngx_timeofday();
+
+ ms = (ngx_msec_int_t)
++#if (defined freenginx && nginx_version >= 1029000)
++ (tp->sec * 1000 + tp->msec - r->start_time);
++#else
+ ((tp->sec - r->start_sec) * 1000 + (tp->msec - r->start_msec));
++#endif
+ return ngx_max(ms, 0);
+ }
+
diff --git a/www/freenginx-devel/files/extra-patch-ngx_otel_module.cpp b/www/freenginx-devel/files/extra-patch-ngx_otel_module.cpp
new file mode 100644
index 000000000000..0024171deaec
--- /dev/null
+++ b/www/freenginx-devel/files/extra-patch-ngx_otel_module.cpp
@@ -0,0 +1,14 @@
+--- ../nginx-otel-3a655df/src/ngx_otel_module.cpp.orig 2024-12-19 17:07:23.000000000 -0500
++++ ../nginx-otel-3a655df/src/ngx_otel_module.cpp 2025-10-31 11:50:12.604868000 -0400
+@@ -512,7 +512,11 @@
+ try {
+ BatchExporter::SpanInfo info{
+ getSpanName(r), ctx->current, ctx->parent.spanId,
++#if defined freenginx
++ (toNanoSec(now->sec, now->msec) - ((ngx_current_msec - r->start_time) * 1000000)),
++#else
+ toNanoSec(r->start_sec, r->start_msec),
++#endif
+ toNanoSec(now->sec, now->msec)};
+
+ bool ok = gExporter->add(info, [r](BatchExporter::Span& span) {
diff --git a/www/freenginx-devel/files/extra-patch-passenger-Configuration.c b/www/freenginx-devel/files/extra-patch-passenger-Configuration.c
new file mode 100644
index 000000000000..1c53ea086717
--- /dev/null
+++ b/www/freenginx-devel/files/extra-patch-passenger-Configuration.c
@@ -0,0 +1,20 @@
+--- ../passenger-6.0.27/src/nginx_module/Configuration.c.orig 2013-10-26 20:00:00.000000000 -0400
++++ ../passenger-6.0.27/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/freenginx-devel/files/nginx.in b/www/freenginx-devel/files/nginx.in
index 7da8670ba17e..4ebb8e3886ae 100644
--- a/www/freenginx-devel/files/nginx.in
+++ b/www/freenginx-devel/files/nginx.in
@@ -47,6 +47,8 @@ _tmpprefix="%%NGINX_TMPDIR%%"
required_files=%%PREFIX%%/etc/freenginx/nginx.conf
extra_commands="reload configtest upgrade gracefulstop"
+: ${nginx_svcj_options:="net_basic"}
+
[ -z "$nginx_enable" ] && nginx_enable="NO"
[ -z "$nginxlimits_enable" ] && nginxlimits_enable="NO"
[ -z "$nginxlimits_args" ] && nginxlimits_args="-e -U %%WWWOWN%%"
@@ -67,6 +69,7 @@ if [ -n "$2" ]; then
required_files="${nginx_configfile}"
eval nginx_enable="\${nginx_${profile}_enable:-${nginx_enable}}"
eval nginx_flags="\${nginx_${profile}_flags:-${nginx_flags}}"
+ eval nginx_svcj_options="\${nginx_${profile}_svcj_options:-${nginx_svcj_options}}"
eval nginxlimits_enable="\${nginxlimits_${profile}_enable:-${nginxlimits_enable}}"
eval nginxlimits_args="\${nginxlimits_${profile}_args:-${nginxlimits_args}}"
nginx_flags="-c ${nginx_configfile} -g \"pid ${pidfile};\" ${nginx_flags}"
diff --git a/www/freenginx-devel/pkg-plist b/www/freenginx-devel/pkg-plist
index 5f579f5c05c8..26363bf4ec84 100644
--- a/www/freenginx-devel/pkg-plist
+++ b/www/freenginx-devel/pkg-plist
@@ -54,6 +54,8 @@
%%DSO%%%%HTTP%%%%HTTP_GEOIP2%%libexec/freenginx/ngx_http_geoip2_module.so
%%DSO%%%%HTTP%%%%NJS%%libexec/freenginx/ngx_http_js_module.so
%%DSO%%%%ICONV%%libexec/freenginx/ngx_http_iconv_module.so
+%%DSO%%%%KEYVAL%%libexec/freenginx/ngx_http_keyval_module.so
+%%DSO%%%%KEYVAL%%libexec/freenginx/ngx_stream_keyval_module.so
%%DSO%%%%LET%%libexec/freenginx/ngx_http_let_module.so
%%DSO%%%%LINK%%libexec/freenginx/ngx_http_link_func_module.so
%%DSO%%%%LUA%%libexec/freenginx/ngx_http_lua_module.so
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-11 22:13:54 +0000