git: ccfc18ee6e61 - main - www/nginx-module-lua-stream: Update to 0.0.19rc4

From: Jochen Neumeister <joneum_at_FreeBSD.org>
Date: Sun, 18 Oct 2026 18:04:04 UTC
The branch main has been updated by joneum:

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

commit ccfc18ee6e61ccb60f0624e3663338a0cf61f080
Author:     Jochen Neumeister <joneum@FreeBSD.org>
AuthorDate: 2026-10-18 18:03:20 +0000
Commit:     Jochen Neumeister <joneum@FreeBSD.org>
CommitDate: 2026-10-18 18:03:55 +0000

    www/nginx-module-lua-stream: Update to 0.0.19rc4
    
    lua-resty-core 0.1.34rc3 requires exactly this version; with 0.0.17 an nginx
    that loads the module refuses to start.  Three of the four local patches are
    upstream now.
    
    Sponsored by:   Netzkommune GmbH
---
 www/nginx-module-lua-stream/Makefile                 |  3 +--
 www/nginx-module-lua-stream/distinfo                 |  6 +++---
 .../files/patch-src_ngx__stream__lua__module.c       | 15 +++------------
 .../files/patch-src_ngx__stream__lua__ssl__certby.c  | 11 -----------
 ...atch-src_ngx__stream__lua__ssl__client__helloby.c | 11 -----------
 .../files/patch-src_ngx__stream__lua__time.c         | 20 --------------------
 www/nginx-module-lua-stream/pkg-plist                |  2 ++
 7 files changed, 9 insertions(+), 59 deletions(-)

diff --git a/www/nginx-module-lua-stream/Makefile b/www/nginx-module-lua-stream/Makefile
index f54e09bc94fa..ca6158b31cd4 100644
--- a/www/nginx-module-lua-stream/Makefile
+++ b/www/nginx-module-lua-stream/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	nginx-module-lua-stream
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.0.17
-PORTREVISION=	1
+DISTVERSION=	0.0.19rc4
 CATEGORIES=	www
 
 MAINTAINER=	joneum@FreeBSD.org
diff --git a/www/nginx-module-lua-stream/distinfo b/www/nginx-module-lua-stream/distinfo
index eda78a19aefc..65f22d62dcdb 100644
--- a/www/nginx-module-lua-stream/distinfo
+++ b/www/nginx-module-lua-stream/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1779703418
-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
+TIMESTAMP = 1792339189
+SHA256 (openresty-stream-lua-nginx-module-v0.0.19rc4_GH0.tar.gz) = 1d4c9d1febf8a31d883f8bf4658e82bd0b39d693f1b4e4de59282e6377d31eec
+SIZE (openresty-stream-lua-nginx-module-v0.0.19rc4_GH0.tar.gz) = 372006
diff --git a/www/nginx-module-lua-stream/files/patch-src_ngx__stream__lua__module.c b/www/nginx-module-lua-stream/files/patch-src_ngx__stream__lua__module.c
index 7b6af1ff42b2..5e4ea32716b7 100644
--- a/www/nginx-module-lua-stream/files/patch-src_ngx__stream__lua__module.c
+++ b/www/nginx-module-lua-stream/files/patch-src_ngx__stream__lua__module.c
@@ -1,20 +1,11 @@
---- src/ngx_stream_lua_module.c.orig
+--- src/ngx_stream_lua_module.c.orig	2026-10-18 16:01:57 UTC
 +++ 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
+@@ -948,7 +948,7 @@ ngx_stream_lua_merge_srv_conf(ngx_conf_t *cf, void *pa
      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 !defined (freenginx) && (defined(nginx_version) && nginx_version >= 1025005)
      if (sscf && sscf->ssl.ctx) {
  #else
      if (sscf && sscf->listen) {
diff --git a/www/nginx-module-lua-stream/files/patch-src_ngx__stream__lua__ssl__certby.c b/www/nginx-module-lua-stream/files/patch-src_ngx__stream__lua__ssl__certby.c
deleted file mode 100644
index b986a924bd9f..000000000000
--- a/www/nginx-module-lua-stream/files/patch-src_ngx__stream__lua__ssl__certby.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/nginx-module-lua-stream/files/patch-src_ngx__stream__lua__ssl__client__helloby.c b/www/nginx-module-lua-stream/files/patch-src_ngx__stream__lua__ssl__client__helloby.c
deleted file mode 100644
index 11e24199188d..000000000000
--- a/www/nginx-module-lua-stream/files/patch-src_ngx__stream__lua__ssl__client__helloby.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/ngx_stream_lua_ssl_client_helloby.c.orig	2025-10-24 14:55:36 UTC
-+++ src/ngx_stream_lua_ssl_client_helloby.c
-@@ -218,7 +218,7 @@ ngx_stream_lua_ssl_client_hello_handler(ngx_ssl_conn_t
-         return -1;
-     }
- 
--#if (nginx_version > 1029001)
-+#if (nginx_version > 1029001) && !defined(freenginx)
-     /* see commit 0373fe5d98c1515640 for more details */
-     rc = ngx_ssl_client_hello_callback(ssl_conn, al, arg);
- 
diff --git a/www/nginx-module-lua-stream/files/patch-src_ngx__stream__lua__time.c b/www/nginx-module-lua-stream/files/patch-src_ngx__stream__lua__time.c
deleted file mode 100644
index 329f72b65e39..000000000000
--- a/www/nginx-module-lua-stream/files/patch-src_ngx__stream__lua__time.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/ngx_stream_lua_time.c.orig	2025-10-24 14:55:36 UTC
-+++ src/ngx_stream_lua_time.c
-@@ -36,7 +36,17 @@ ngx_stream_lua_ffi_req_start_time(ngx_stream_lua_reque
- double
- ngx_stream_lua_ffi_req_start_time(ngx_stream_lua_request_t *r)
- {
-+#if defined(freenginx)
-+    ngx_time_t              *tp;
-+
-+    tp = ngx_timeofday();
-+
-+    return (tp->sec + tp->msec / 1000.0)
-+           - (double) (ngx_current_msec - r->session->start_time)
-+             / 1000.0;
-+#else
-     return r->session->start_sec + r->session->start_msec / 1000.0;
-+#endif
- }
- 
- 
diff --git a/www/nginx-module-lua-stream/pkg-plist b/www/nginx-module-lua-stream/pkg-plist
index f33f5bfb4e12..a74c335dd0e0 100644
--- a/www/nginx-module-lua-stream/pkg-plist
+++ b/www/nginx-module-lua-stream/pkg-plist
@@ -53,6 +53,8 @@ share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_phase.h
 share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_prereadby.c
 share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_prereadby.h
 share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_probe.h
+share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_proxy_ssl_certby.c
+share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_proxy_ssl_certby.h
 share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_proxy_ssl_verifyby.c
 share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_proxy_ssl_verifyby.h
 share/nginx/modules/nginx-module-lua-stream/src/ngx_stream_lua_regex.c