Date: Mon, 12 Jan 2026 20:33:27 +0000 From: Sergey A. Osokin <osa@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 80c974cb19c8 - main - www/freenginx-devel: third-party modules management (+) Message-ID: <69655a97.b018.7f88ea69@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=80c974cb19c8af811dadd8ec25378d996109ca48 commit 80c974cb19c8af811dadd8ec25378d996109ca48 Author: Sergey A. Osokin <osa@FreeBSD.org> AuthorDate: 2026-01-12 20:32:27 +0000 Commit: Sergey A. Osokin <osa@FreeBSD.org> CommitDate: 2026-01-12 20:32:27 +0000 www/freenginx-devel: third-party modules management (+) - update vts module to its recent snapshot Remove upstreamed patch. Sponsored by: tipi.work --- www/freenginx-devel/Makefile | 2 +- www/freenginx-devel/Makefile.extmod | 3 +-- www/freenginx-devel/distinfo | 6 +++--- .../extra-patch-ngx_http_vhost_traffic_status_module.c | 14 -------------- 4 files changed, 5 insertions(+), 20 deletions(-) diff --git a/www/freenginx-devel/Makefile b/www/freenginx-devel/Makefile index 54667425478b..9a4eb9abb7c8 100644 --- a/www/freenginx-devel/Makefile +++ b/www/freenginx-devel/Makefile @@ -1,7 +1,7 @@ PORTNAME= freenginx PORTVERSION= ${NGINX_VERSION} .include "version.mk" -PORTREVISION= 7 +PORTREVISION= 8 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 b71ac5b5e15c..696ce7613e37 100644 --- a/www/freenginx-devel/Makefile.extmod +++ b/www/freenginx-devel/Makefile.extmod @@ -316,9 +316,8 @@ VOD_LIB_DEPENDS= libxml2.so:textproc/libxml2 \ VOD_USES= iconv VOD_VARS= DSO_EXTMODS+=vod -VTS_GH_TUPLE= vozlt:nginx-module-vts:c382342:vts +VTS_GH_TUPLE= vozlt:nginx-module-vts:37d319f: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/distinfo b/www/freenginx-devel/distinfo index f67ceac63bfc..b4cc4c8f200a 100644 --- a/www/freenginx-devel/distinfo +++ b/www/freenginx-devel/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1767885483 +TIMESTAMP = 1768249468 SHA256 (freenginx-1.29.4.tar.gz) = 51a596451e334b51ce8cef1291b576ed601ed557e1b500e6c1a77a469d603e27 SIZE (freenginx-1.29.4.tar.gz) = 1249883 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae @@ -137,8 +137,8 @@ SHA256 (vozlt-nginx-module-sts-3c10d42_GH0.tar.gz) = 748b67ceb82b3b843ae915bf786 SIZE (vozlt-nginx-module-sts-3c10d42_GH0.tar.gz) = 352431 SHA256 (kaltura-nginx-vod-module-26f0687_GH0.tar.gz) = 7c098d4b1c0f0a3d694ece364fa190d5c88a920352e4c3e9377ae3b38904a08b SIZE (kaltura-nginx-vod-module-26f0687_GH0.tar.gz) = 475372 -SHA256 (vozlt-nginx-module-vts-c382342_GH0.tar.gz) = 1252c7fe0636d658172055d7e2598487479a54adc00e90af6b23ddb4b6641952 -SIZE (vozlt-nginx-module-vts-c382342_GH0.tar.gz) = 184988 +SHA256 (vozlt-nginx-module-vts-37d319f_GH0.tar.gz) = 9ffe9ac5cd3716bb12832926bb78cd12d4e47b4c9e78a64658e0bf13a4cacfde +SIZE (vozlt-nginx-module-vts-37d319f_GH0.tar.gz) = 185334 SHA256 (tg123-websockify-nginx-module-c11bc9a_GH0.tar.gz) = aca454bffcee2476dc92682ebfb8c0378a271fda178be7e945d648419d220758 SIZE (tg123-websockify-nginx-module-c11bc9a_GH0.tar.gz) = 14646 SHA256 (openresty-xss-nginx-module-de2d87a_GH0.tar.gz) = f830c9300d751046e2592c74d09f39ac4b4b4567078c96c24951de5554861b5e 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 deleted file mode 100644 index 50eca3992c88..000000000000 --- a/www/freenginx-devel/files/extra-patch-ngx_http_vhost_traffic_status_module.c +++ /dev/null @@ -1,14 +0,0 @@ ---- ../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); - } -home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69655a97.b018.7f88ea69>