git: 87e508ab8184 - main - www/freenginx-devel: update third-party lua module (+)
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 05 Nov 2025 15:14:28 UTC
The branch main has been updated by osa:
URL: https://cgit.FreeBSD.org/ports/commit/?id=87e508ab8184dea38e18cd3b54d081aa6ec3232c
commit 87e508ab8184dea38e18cd3b54d081aa6ec3232c
Author: Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2025-11-05 15:12:27 +0000
Commit: Sergey A. Osokin <osa@FreeBSD.org>
CommitDate: 2025-11-05 15:12:27 +0000
www/freenginx-devel: update third-party lua module (+)
to its recent snapshot. The patches have been added to the upstream,
so the module builds just fine.
Bump PORTREVISION.
Sponsored by: tipi.work
---
www/freenginx-devel/Makefile | 2 +-
www/freenginx-devel/Makefile.extmod | 4 +---
www/freenginx-devel/distinfo | 6 ++---
.../files/extra-patch-ngx_http_lua_subrequest.c | 26 ----------------------
.../files/extra-patch-ngx_http_lua_time.c | 24 --------------------
5 files changed, 5 insertions(+), 57 deletions(-)
diff --git a/www/freenginx-devel/Makefile b/www/freenginx-devel/Makefile
index 24d7e7ae53a8..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= 13
+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 1853a7b7cba3..80db115b7e5b 100644
--- a/www/freenginx-devel/Makefile.extmod
+++ b/www/freenginx-devel/Makefile.extmod
@@ -201,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
diff --git a/www/freenginx-devel/distinfo b/www/freenginx-devel/distinfo
index 89f3f5294346..4df0ebb69738 100644
--- a/www/freenginx-devel/distinfo
+++ b/www/freenginx-devel/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1762353810
+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
@@ -91,8 +91,8 @@ SHA256 (baysao-nginx-let-module-c1f23aa_GH0.tar.gz) = 7393809d5d8877812da1bd5b5f
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
- }
-
-