aboutsummaryrefslogtreecommitdiff
path: root/www/freenginx-devel
diff options
context:
space:
mode:
Diffstat (limited to 'www/freenginx-devel')
-rw-r--r--www/freenginx-devel/Makefile2
-rw-r--r--www/freenginx-devel/Makefile.extmod14
-rw-r--r--www/freenginx-devel/Makefile.ignore20
-rw-r--r--www/freenginx-devel/Makefile.options.desc1
-rw-r--r--www/freenginx-devel/distinfo8
-rw-r--r--www/freenginx-devel/files/extra-patch-ngx_http_lua_subrequest.c26
-rw-r--r--www/freenginx-devel/files/extra-patch-ngx_http_lua_time.c24
-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-passenger-Configuration.c20
-rw-r--r--www/freenginx-devel/pkg-plist2
11 files changed, 78 insertions, 79 deletions
diff --git a/www/freenginx-devel/Makefile b/www/freenginx-devel/Makefile
index a5a168969732..0467c0358cea 100644
--- a/www/freenginx-devel/Makefile
+++ b/www/freenginx-devel/Makefile
@@ -1,7 +1,7 @@
PORTNAME= freenginx
PORTVERSION= ${NGINX_VERSION}
.include "version.mk"
-PORTREVISION= 8
+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 b71054ba1d7c..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
@@ -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,10 +201,8 @@ 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.29:lua
+LUA_GH_TUPLE= openresty:lua-nginx-module:de02114:lua
LUA_VARS= DSO_EXTMODS+=lua
-LUA_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_lua_time.c \
- ${PATCHDIR}/extra-patch-ngx_http_lua_subrequest.c
LUASTREAM_IMPLIES= DEVEL_KIT
LUASTREAM_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty
@@ -266,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
@@ -316,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 9bcaafc1fc7c..e28b60dd751c 100644
--- a/www/freenginx-devel/Makefile.ignore
+++ b/www/freenginx-devel/Makefile.ignore
@@ -1,23 +1,3 @@
-.if ${PORT_OPTIONS:MHTTP_UPLOAD}
-IGNORE= upload module: patching is required
-.endif
-
.if ${PORT_OPTIONS:MLUASTREAM}
IGNORE= lua stream module: patching is required
.endif
-
-.if ${PORT_OPTIONS:MPASSENGER}
-IGNORE= passenger 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 8c83df6f4eab..4df0ebb69738 100644
--- a/www/freenginx-devel/distinfo
+++ b/www/freenginx-devel/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1762060812
+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
@@ -85,12 +85,14 @@ 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.29_GH0.tar.gz) = ca2c2122b909529bf9d1a89e9a5763835a2bd2629def8cb279c550f638f0a78f
-SIZE (openresty-lua-nginx-module-v0.10.29_GH0.tar.gz) = 892502
+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
diff --git a/www/freenginx-devel/files/extra-patch-ngx_http_lua_subrequest.c b/www/freenginx-devel/files/extra-patch-ngx_http_lua_subrequest.c
deleted file mode 100644
index 16a33862ee26..000000000000
--- a/www/freenginx-devel/files/extra-patch-ngx_http_lua_subrequest.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- ../lua-nginx-module-0.10.29/src/ngx_http_lua_subrequest.c.orig 2025-11-01 23:46:33.237622000 -0400
-+++ ../lua-nginx-module-0.10.29/src/ngx_http_lua_subrequest.c 2025-11-01 23:52:42.602198000 -0400
-@@ -1373,7 +1373,9 @@
- ngx_str_t *uri, ngx_str_t *args, ngx_http_request_t **psr,
- ngx_http_post_subrequest_t *ps, ngx_uint_t flags)
- {
-+#if !defined freenginx
- ngx_time_t *tp;
-+#endif
- ngx_connection_t *c;
- ngx_http_request_t *sr;
- ngx_http_core_srv_conf_t *cscf;
-@@ -1501,9 +1503,13 @@
- sr->subrequests = r->subrequests - 1;
- #endif
-
-+#if defined freenginx
-+ sr->start_time = ngx_current_msec;
-+#else
- tp = ngx_timeofday();
- sr->start_sec = tp->sec;
- sr->start_msec = tp->msec;
-+#endif
-
- r->main->count++;
-
diff --git a/www/freenginx-devel/files/extra-patch-ngx_http_lua_time.c b/www/freenginx-devel/files/extra-patch-ngx_http_lua_time.c
deleted file mode 100644
index cc330b2e3c5c..000000000000
--- a/www/freenginx-devel/files/extra-patch-ngx_http_lua_time.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- ../lua-nginx-module-0.10.29/src/ngx_http_lua_time.c.orig 2025-01-17 00:24:35.000000000 -0500
-+++ ../lua-nginx-module-0.10.29/src/ngx_http_lua_time.c 2025-11-02 00:11:45.551096000 -0400
-@@ -28,7 +28,21 @@
- double
- ngx_http_lua_ffi_req_start_time(ngx_http_request_t *r)
- {
-+#if defined freenginx
-+ ngx_time_t *tp;
-+
-+ tp = ngx_timeofday();
-+ tp->sec -= (ngx_current_msec - r->start_time) / 1000;
-+ tp->msec -= (ngx_current_msec - r->start_time) % 1000;
-+ if (tp->msec > NGX_MAX_INT_T_VALUE) {
-+ tp->msec += 1000;
-+ tp->sec -= 1;
-+ }
-+
-+ return tp->sec + tp->msec / 1000.0;
-+#else
- return r->start_sec + r->start_msec / 1000.0;
-+#endif
- }
-
-
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-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/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-08 13:47:33 +0000