Date: Mon, 24 Nov 2025 00:02:03 +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: ec5a7ba69015 - main - www/freenginx-devel: update third-party OTEL module Message-ID: <6923a07b.a5ef.3359bce0@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=ec5a7ba69015f361c7e529f36400ed0277553bf4 commit ec5a7ba69015f361c7e529f36400ed0277553bf4 Author: Sergey A. Osokin <osa@FreeBSD.org> AuthorDate: 2025-11-24 00:00:18 +0000 Commit: Sergey A. Osokin <osa@FreeBSD.org> CommitDate: 2025-11-24 00:01:56 +0000 www/freenginx-devel: update third-party OTEL module Remove needless patch, it's added to the upstream. Bump PORTREVISION. Sponsored by: tipi.work --- www/freenginx-devel/Makefile | 2 +- www/freenginx-devel/Makefile.extmod | 3 +-- www/freenginx-devel/distinfo | 6 +++--- www/freenginx-devel/files/extra-patch-ngx_otel_module.cpp | 14 -------------- 4 files changed, 5 insertions(+), 20 deletions(-) diff --git a/www/freenginx-devel/Makefile b/www/freenginx-devel/Makefile index a48a3577afff..d8a5b1d28823 100644 --- a/www/freenginx-devel/Makefile +++ b/www/freenginx-devel/Makefile @@ -1,7 +1,7 @@ PORTNAME= freenginx PORTVERSION= ${NGINX_VERSION} .include "version.mk" -PORTREVISION= 1 +PORTREVISION= 2 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 a393266512a2..f8eb7415537c 100644 --- a/www/freenginx-devel/Makefile.extmod +++ b/www/freenginx-devel/Makefile.extmod @@ -246,7 +246,7 @@ NJS_QJS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-njs-auto-quickjs \ NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx NJS_IMPLIES= HTTP STREAM -OTEL_GH_TUPLE= osokin:nginx-otel:3a655df:otel +OTEL_GH_TUPLE= osokin:nginx-otel:51273ec:otel OTEL_VARS= DSO_EXTMODS+=otel OTEL_SUBDIR=/ OTEL_LIB_DEPENDS= libabsl_base.so:devel/abseil \ libcares.so:dns/c-ares \ @@ -256,7 +256,6 @@ OTEL_LIB_DEPENDS= libabsl_base.so:devel/abseil \ libre2.so:devel/re2 OTEL_BUILD_DEPENDS= ${LOCALBASE}/include/opentelemetry/proto/common/v1/common.proto:devel/opentelemetry-proto OTEL_CONFIGURE_ENV+= NGX_OTEL_PROTO_DIR=${PREFIX}/include -OTEL_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_otel_module.cpp PASSENGER_NGINX_VER= 6.0.27 PASSENGER_CATEGORIES= ruby diff --git a/www/freenginx-devel/distinfo b/www/freenginx-devel/distinfo index cfef2ad4aae7..f8071e336c30 100644 --- a/www/freenginx-devel/distinfo +++ b/www/freenginx-devel/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1763828625 +TIMESTAMP = 1763942092 SHA256 (freenginx-1.29.3.tar.gz) = 55989cea3352d937d6d96c9af8b943f3a3f3a0220f35ede7a5b605a3d86b029a SIZE (freenginx-1.29.3.tar.gz) = 1243956 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae @@ -111,8 +111,8 @@ SHA256 (libinjection-libinjection-b9fcaaf_GH0.tar.gz) = 7812e1316b61a7a7d3a65a57 SIZE (libinjection-libinjection-b9fcaaf_GH0.tar.gz) = 2218207 SHA256 (nginx-njs-0.9.4_GH0.tar.gz) = 7b3a9f14b0f09311d9031c2a252cb0e23c06baac2e586a7d12c75aa6cba4ca0e SIZE (nginx-njs-0.9.4_GH0.tar.gz) = 939082 -SHA256 (osokin-nginx-otel-3a655df_GH0.tar.gz) = 71ee1561303c289d4562148f8719b60796c36abe16de1b3c10d10b8e6f03a952 -SIZE (osokin-nginx-otel-3a655df_GH0.tar.gz) = 27169 +SHA256 (osokin-nginx-otel-51273ec_GH0.tar.gz) = a2107ba0be94c8561ae50773163c7946a58e508be46920f588d05a347c867d9c +SIZE (osokin-nginx-otel-51273ec_GH0.tar.gz) = 28076 SHA256 (konstruxi-ngx_postgres-8aa7359_GH0.tar.gz) = c69ad4495de7c7883ebc23e1e6c4cc83a4ac6a7fddd4d5c12e49d33b65f7c50b SIZE (konstruxi-ngx_postgres-8aa7359_GH0.tar.gz) = 48544 SHA256 (openresty-rds-csv-nginx-module-6a90686_GH0.tar.gz) = 92068b96a9cf152e8f10db2b661a031adbb2a29db4b075773c2495846d4c926c diff --git a/www/freenginx-devel/files/extra-patch-ngx_otel_module.cpp b/www/freenginx-devel/files/extra-patch-ngx_otel_module.cpp deleted file mode 100644 index 0024171deaec..000000000000 --- a/www/freenginx-devel/files/extra-patch-ngx_otel_module.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- ../nginx-otel-3a655df/src/ngx_otel_module.cpp.orig 2024-12-19 17:07:23.000000000 -0500 -+++ ../nginx-otel-3a655df/src/ngx_otel_module.cpp 2025-10-31 11:50:12.604868000 -0400 -@@ -512,7 +512,11 @@ - try { - BatchExporter::SpanInfo info{ - getSpanName(r), ctx->current, ctx->parent.spanId, -+#if defined freenginx -+ (toNanoSec(now->sec, now->msec) - ((ngx_current_msec - r->start_time) * 1000000)), -+#else - toNanoSec(r->start_sec, r->start_msec), -+#endif - toNanoSec(now->sec, now->msec)}; - - bool ok = gExporter->add(info, [r](BatchExporter::Span& span) {home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6923a07b.a5ef.3359bce0>