FreeBSD Mail Archives

Date:      Mon, 25 May 2026 17:08:24 +0000
From:      Jochen Neumeister <joneum@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: c08f758786ca - main - www/{nginx,nginx-devel,freenginx}: use lua-stream-nginx-module port
Message-ID:  <6a148208.377e7.517935e2@gitrepo.freebsd.org>

index | next in thread | raw e-mail


The branch main has been updated by joneum:

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

commit c08f758786ca1f2ab00ad6e728c8bf0d108e3b36
Author:     Jochen Neumeister <joneum@FreeBSD.org>
AuthorDate: 2026-05-25 17:04:33 +0000
Commit:     Jochen Neumeister <joneum@FreeBSD.org>
CommitDate: 2026-05-25 17:08:15 +0000

    www/{nginx,nginx-devel,freenginx}: use lua-stream-nginx-module port
    
    Replace the embedded LUASTREAM GH_TUPLE handling with a
    BUILD_DEPENDS on www/lua-stream-nginx-module and use the
    module sources from the dedicated port during the build.
    
    Add freenginx compatibility patches for lua-stream-nginx-module.
    
    Also update lua-stream-nginx-module to version 0.0.17.
    
    PR:     294426
    Sponsored by:   Netzkommune GmbH
---
 www/freenginx/Makefile                               |  7 ++++++-
 www/freenginx/Makefile.extmod                        |  3 ++-
 www/freenginx/distinfo                               |  4 +---
 .../files/patch-src_ngx__stream__lua__module.c       | 20 ++++++++++++++++++++
 .../files/patch-src_ngx__stream__lua__ssl__certby.c  | 11 +++++++++++
 .../files/patch-src_ngx__stream__lua__time.c         | 12 ++++++++++++
 www/nginx-devel/Makefile                             |  7 ++++++-
 www/nginx-devel/Makefile.extmod                      |  3 ++-
 www/nginx-devel/distinfo                             |  4 +---
 www/nginx/Makefile                                   |  7 ++++++-
 www/nginx/Makefile.extmod                            |  3 ++-
 www/nginx/distinfo                                   |  4 +---
 12 files changed, 70 insertions(+), 15 deletions(-)

diff --git a/www/freenginx/Makefile b/www/freenginx/Makefile
index 70bf36dfd9ef..cf8d4ce6be23 100644
--- a/www/freenginx/Makefile
+++ b/www/freenginx/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	freenginx
 PORTVERSION=	1.30.0
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	www
 MASTER_SITES=	https://freenginx.org/download/ \
 		LOCAL/joneum
@@ -325,6 +325,11 @@ post-patch-SFLOW-on:
 pre-configure-SMALL_LIGHT-on:
 	( cd ${WRKSRC_small_light} && ./setup )
 
+pre-configure-LUASTREAM-on:
+	@${RM} -rf ${WRKSRC_luastream}
+	@cd ${LOCALBASE}/share/nginx/modules/lua-stream-nginx-module && \
+		${COPYTREE_SHARE} . ${WRKSRC_luastream}
+
 do-configure-NJS-on:
 	( cd ${WRKSRC_njs} && ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${NJS_CONFIGURE_ARGS} )
 
diff --git a/www/freenginx/Makefile.extmod b/www/freenginx/Makefile.extmod
index fd8f2cd184f5..5ca5999a941c 100644
--- a/www/freenginx/Makefile.extmod
+++ b/www/freenginx/Makefile.extmod
@@ -216,7 +216,8 @@ 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.15:luastream
+LUASTREAM_BUILD_DEPENDS=lua-stream-nginx-module>=0.0.17:www/lua-stream-nginx-module
+WRKSRC_luastream=	${WRKDIR}/lua-stream-nginx-module
 LUASTREAM_VARS=		DSO_EXTMODS+=luastream
 
 LINK_GH_TUPLE=		Taymindis:nginx-link-function:3.2.4:link
diff --git a/www/freenginx/distinfo b/www/freenginx/distinfo
index 080ae347c797..862c0e1acc17 100644
--- a/www/freenginx/distinfo
+++ b/www/freenginx/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1779559613
+TIMESTAMP = 1779726341
 SHA256 (freenginx-1.30.0.tar.gz) = 104d8e9b2f4473b491af430273832561d8803a9cc297b5a7acd09beefddeb27e
 SIZE (freenginx-1.30.0.tar.gz) = 1252239
 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
@@ -95,8 +95,6 @@ SHA256 (Taymindis-nginx-link-function-3.2.4_GH0.tar.gz) = 20c3679199ba7efe1598f0
 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-stream-lua-nginx-module-v0.0.15_GH0.tar.gz) = ecf5c2afd345149cef19bf2e3e196bf1c514ca85e778f853f80a379284b70de1
-SIZE (openresty-stream-lua-nginx-module-v0.0.15_GH0.tar.gz) = 394192
 SHA256 (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 8c2bdbe875e4f5225d0778bfb09a2668f9281d7de6218c7b462a7ba2cee06fe8
 SIZE (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 34654
 SHA256 (SpiderLabs-ModSecurity-nginx-v1.0.3_GH0.tar.gz) = 32a42256616cc674dca24c8654397390adff15b888b77eb74e0687f023c8751b
diff --git a/www/lua-stream-nginx-module/files/patch-src_ngx__stream__lua__module.c b/www/lua-stream-nginx-module/files/patch-src_ngx__stream__lua__module.c
new file mode 100644
index 000000000000..7b6af1ff42b2
--- /dev/null
+++ b/www/lua-stream-nginx-module/files/patch-src_ngx__stream__lua__module.c
@@ -0,0 +1,20 @@
+--- src/ngx_stream_lua_module.c.orig
++++ src/ngx_stream_lua_module.c
+@@ -916,7 +916,7 @@ ngx_stream_lua_merge_srv_conf(ngx_conf_t
+     ngx_stream_lua_srv_conf_t       *conf = child;
+ 
+ #if (NGX_STREAM_SSL)
+-#if defined(nginx_version) && nginx_version >= 1025005
++#if defined(nginx_version) && nginx_version >= 1025005 && !defined(freenginx)
+     ngx_stream_ssl_srv_conf_t       *sscf;
+ #else
+     ngx_stream_ssl_conf_t           *sscf;
+@@ -925,7 +925,7 @@ ngx_stream_lua_merge_srv_conf(ngx_conf_t
+     dd("merge srv conf");
+ 
+     sscf = ngx_stream_conf_get_module_srv_conf(cf, ngx_stream_ssl_module);
+-#if defined(nginx_version) && nginx_version >= 1025005
++#if defined(nginx_version) && nginx_version >= 1025005 && !defined(freenginx)
+     if (sscf && sscf->ssl.ctx) {
+ #else
+     if (sscf && sscf->listen) {
diff --git a/www/lua-stream-nginx-module/files/patch-src_ngx__stream__lua__ssl__certby.c b/www/lua-stream-nginx-module/files/patch-src_ngx__stream__lua__ssl__certby.c
new file mode 100644
index 000000000000..b986a924bd9f
--- /dev/null
+++ b/www/lua-stream-nginx-module/files/patch-src_ngx__stream__lua__ssl__certby.c
@@ -0,0 +1,11 @@
+--- src/ngx_stream_lua_ssl_certby.c.orig
++++ src/ngx_stream_lua_ssl_certby.c
+@@ -1554,7 +1554,7 @@ ngx_stream_lua_ffi_ssl_verify_client(ngx
+ 
+     ngx_stream_lua_ctx_t        *ctx;
+     ngx_ssl_conn_t              *ssl_conn;
+-#if defined(nginx_version) && nginx_version >= 1025005
++#if defined(nginx_version) && nginx_version >= 1025005 && !defined(freenginx)
+     ngx_stream_ssl_srv_conf_t   *sscf;
+ #else
+     ngx_stream_ssl_conf_t       *sscf;
diff --git a/www/lua-stream-nginx-module/files/patch-src_ngx__stream__lua__time.c b/www/lua-stream-nginx-module/files/patch-src_ngx__stream__lua__time.c
new file mode 100644
index 000000000000..79bd3eee4f57
--- /dev/null
+++ b/www/lua-stream-nginx-module/files/patch-src_ngx__stream__lua__time.c
@@ -0,0 +1,12 @@
+--- src/ngx_stream_lua_time.c.orig
++++ src/ngx_stream_lua_time.c
+@@ -36,7 +36,11 @@ ngx_stream_lua_ffi_now(void)
+ double
+ ngx_stream_lua_ffi_req_start_time(ngx_stream_lua_request_t *r)
+ {
++#if defined(freenginx)
++    return r->session->start_time / 1000.0;
++#else
+     return r->session->start_sec + r->session->start_msec / 1000.0;
++#endif
+ }
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 74b27d3e09ab..f1c5313495d8 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -1,7 +1,7 @@
 PORTNAME?=	nginx
 PORTVERSION=	${NGINX_VERSION}
 .include "version.mk"
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \
 		LOCAL/osa
@@ -335,6 +335,11 @@ post-patch-SFLOW-on:
 pre-configure-SMALL_LIGHT-on:
 	( cd ${WRKSRC_small_light} && ./setup )
 
+pre-configure-LUASTREAM-on:
+	@${RM} -rf ${WRKSRC_luastream}
+	@cd ${LOCALBASE}/share/nginx/modules/lua-stream-nginx-module && \
+		${COPYTREE_SHARE} . ${WRKSRC_luastream}
+
 do-configure-NJS-on:
 	( cd ${WRKSRC_njs} && ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${NJS_CONFIGURE_ARGS} )
 
diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod
index 1e25ee4faf63..22dc4671ee64 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -213,7 +213,8 @@ 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_BUILD_DEPENDS=lua-stream-nginx-module>=0.0.17:www/lua-stream-nginx-module
+WRKSRC_luastream=	${WRKDIR}/lua-stream-nginx-module
 LUASTREAM_VARS=		DSO_EXTMODS+=luastream
 
 LINK_GH_TUPLE=		Taymindis:nginx-link-function:3.2.4:link
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index cc4c308c16f1..1be8f7f0370f 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1779559553
+TIMESTAMP = 1779726360
 SHA256 (nginx-1.31.0.tar.gz) = 6d5b00d45393af2e4e7c52a442d2a198f0ccbc7678ed062a46f403edd833ebaa
 SIZE (nginx-1.31.0.tar.gz) = 1337335
 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
@@ -95,8 +95,6 @@ SHA256 (Taymindis-nginx-link-function-3.2.4_GH0.tar.gz) = 20c3679199ba7efe1598f0
 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-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-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
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 9864467cc229..4f215b18354b 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	nginx
 PORTVERSION=	${NGINX_VERSION}
 .include "version.mk"
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	3
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \
@@ -322,6 +322,11 @@ post-patch-SFLOW-on:
 pre-configure-SMALL_LIGHT-on:
 	( cd ${WRKSRC_small_light} && ./setup )
 
+pre-configure-LUASTREAM-on:
+	@${RM} -rf ${WRKSRC_luastream}
+	@cd ${LOCALBASE}/share/nginx/modules/lua-stream-nginx-module && \
+		${COPYTREE_SHARE} . ${WRKSRC_luastream}
+
 do-configure-NJS-on:
 	( cd ${WRKSRC_njs} && ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${NJS_CONFIGURE_ARGS} )
 
diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod
index 196a31cc5c01..cc6e1872d6ef 100644
--- a/www/nginx/Makefile.extmod
+++ b/www/nginx/Makefile.extmod
@@ -211,7 +211,8 @@ 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_BUILD_DEPENDS=lua-stream-nginx-module>=0.0.17:www/lua-stream-nginx-module
+WRKSRC_luastream=	${WRKDIR}/lua-stream-nginx-module
 LUASTREAM_VARS=		DSO_EXTMODS+=luastream
 
 LINK_GH_TUPLE=		Taymindis:nginx-link-function:3.2.4:link
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index daa16dfed5dc..94aa2824bbfb 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1779550230
+TIMESTAMP = 1779705140
 SHA256 (nginx-1.30.2.tar.gz) = 7df3090907fca3cc0e456d6dc00ceb230da74ea88026ceff0affc29dbbd9ac4c
 SIZE (nginx-1.30.2.tar.gz) = 1325247
 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
@@ -93,8 +93,6 @@ SHA256 (Taymindis-nginx-link-function-3.2.4_GH0.tar.gz) = 20c3679199ba7efe1598f0
 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-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-memc-nginx-module-v0.19_GH0.tar.gz) = 8c2bdbe875e4f5225d0778bfb09a2668f9281d7de6218c7b462a7ba2cee06fe8
 SIZE (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 34654
 SHA256 (SpiderLabs-ModSecurity-nginx-v1.0.3_GH0.tar.gz) = 32a42256616cc674dca24c8654397390adff15b888b77eb74e0687f023c8751b

home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a148208.377e7.517935e2>

Header And Logo

Peripheral Links

Site Navigation

Header And Logo

Peripheral Links

Search

Site Navigation