git: b2ad75a2b920 - main - www/nginx-devel: remove third-party opentracing module (+)
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 29 Feb 2024 20:52:50 UTC
The branch main has been updated by osa:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b2ad75a2b920e1659afd54e5313e46f1f35bcd28
commit b2ad75a2b920e1659afd54e5313e46f1f35bcd28
Author: Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2024-02-29 20:49:56 +0000
Commit: Sergey A. Osokin <osa@FreeBSD.org>
CommitDate: 2024-02-29 20:52:44 +0000
www/nginx-devel: remove third-party opentracing module (+)
Similar functionality is available with OTEL module, also
devel/libopentracing port is EOLed today.
Bump PORTREVISION.
---
www/nginx-devel/Makefile | 2 +-
www/nginx-devel/Makefile.extmod | 7 +------
www/nginx-devel/Makefile.options.desc | 1 -
www/nginx-devel/distinfo | 4 +---
www/nginx-devel/pkg-plist | 1 -
5 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 7536af77bc49..2a757536dd7a 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -1,6 +1,6 @@
PORTNAME?= nginx
PORTVERSION= 1.25.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
LOCAL/osa
diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod
index f98fe1e8c522..377c10efcf0b 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -11,7 +11,7 @@ OPTIONS_GROUP_THIRDPARTYGRP= AJP AWS_AUTH BROTLI CACHE_PURGE CT \
HTTP_PUSH_STREAM HTTP_REDIS HTTP_SLICE_AHEAD HTTP_SUBS_FILTER HTTP_TARANTOOL \
HTTP_UPLOAD HTTP_UPLOAD_PROGRESS HTTP_UPSTREAM_CHECK HTTP_UPSTREAM_FAIR \
HTTP_UPSTREAM_STICKY HTTP_VIDEO_THUMBEXTRACTOR HTTP_ZIP ICONV LET LINK LUA MEMC \
- MODSECURITY3 NAXSI OPENTRACING PASSENGER POSTGRES RDS_CSV RDS_JSON \
+ MODSECURITY3 NAXSI PASSENGER POSTGRES RDS_CSV RDS_JSON \
REDIS2 RTMP SET_MISC SFLOW SHIBBOLETH SLOWFS_CACHE SRCACHE STS \
VOD VTS XSS WEBSOCKIFY
@@ -237,11 +237,6 @@ NJS_XML_IMPLIES= NJS
NJS_XML_LIB_DEPENDS= libxml2.so:textproc/libxml2 \
libxslt.so:textproc/libxslt
-OPENTRACING_GH_TUPLE= opentracing-contrib:nginx-opentracing:v0.24.0:opentracing
-OPENTRACING_LIB_DEPENDS= libopentracing.so:devel/libopentracing
-OPENTRACING_VARS= DSO_EXTMODS+=opentracing OPENTRACING_SUBDIR=/opentracing
-OPENTRACING_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-opentracing-opentracing-config
-
OTEL_GH_TUPLE= osokin:nginx-otel:8f0857d:otel
OTEL_VARS= DSO_EXTMODS+=otel OTEL_SUBDIR=/
OTEL_LIB_DEPENDS= libabsl_base.so:devel/abseil \
diff --git a/www/nginx-devel/Makefile.options.desc b/www/nginx-devel/Makefile.options.desc
index dd7ef896ef34..3eeae052f659 100644
--- a/www/nginx-devel/Makefile.options.desc
+++ b/www/nginx-devel/Makefile.options.desc
@@ -89,7 +89,6 @@ MODSECURITY3_DESC= 3rd party modsecurity3 module
NAXSI_DESC= 3rd party naxsi module
NJS_DESC= Enable javascript (NJS) module
NJS_XML_DESC= Enable XML functionality in NJS module
-OPENTRACING_DESC= 3rd party opentracing module
OTEL_DESC= Enable OpenTELemetry module
PASSENGER_DESC= 3rd party passenger module
POSTGRES_DESC= 3rd party postgres module
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index e1b6b9779c53..fadf3b846799 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1708552086
+TIMESTAMP = 1709239742
SHA256 (nginx-1.25.4.tar.gz) = 760729901acbaa517996e681ee6ea259032985e37c2768beef80df3a877deed9
SIZE (nginx-1.25.4.tar.gz) = 1236273
SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
@@ -105,8 +105,6 @@ SHA256 (libinjection-libinjection-4aa3894_GH0.tar.gz) = ededea133e89e238ef2e60d0
SIZE (libinjection-libinjection-4aa3894_GH0.tar.gz) = 2218294
SHA256 (nginx-njs-0.8.2_GH0.tar.gz) = 6f17387db8df90b6e3382d280455962ff85fa2b1a32d91c2ce1fd1af5a854d72
SIZE (nginx-njs-0.8.2_GH0.tar.gz) = 733916
-SHA256 (opentracing-contrib-nginx-opentracing-v0.24.0_GH0.tar.gz) = 5328c5f37e0615b5252aed51b9cd40f3d14989d995ad54134076aeda4ab9b280
-SIZE (opentracing-contrib-nginx-opentracing-v0.24.0_GH0.tar.gz) = 679417
SHA256 (osokin-nginx-otel-8f0857d_GH0.tar.gz) = bbf93813928460bdaf78f752f74ecc6c34d13078e97fdffcaa29dbd8689314fc
SIZE (osokin-nginx-otel-8f0857d_GH0.tar.gz) = 30197
SHA256 (konstruxi-ngx_postgres-8aa7359_GH0.tar.gz) = c69ad4495de7c7883ebc23e1e6c4cc83a4ac6a7fddd4d5c12e49d33b65f7c50b
diff --git a/www/nginx-devel/pkg-plist b/www/nginx-devel/pkg-plist
index 4eab2d359735..e6fa32c9e48d 100644
--- a/www/nginx-devel/pkg-plist
+++ b/www/nginx-devel/pkg-plist
@@ -64,7 +64,6 @@
%%DSO%%%%MEMC%%libexec/nginx/ngx_http_memc_module.so
%%DSO%%%%MODSECURITY3%%libexec/nginx/ngx_http_modsecurity_module.so
%%DSO%%%%NAXSI%%libexec/nginx/ngx_http_naxsi_module.so
-%%DSO%%%%OPENTRACING%%libexec/nginx/ngx_http_opentracing_module.so
%%DSO%%%%OTEL%%libexec/nginx/ngx_otel_module.so
%%DSO%%%%PASSENGER%%libexec/nginx/ngx_http_passenger_module.so
%%DSO%%%%POSTGRES%%libexec/nginx/ngx_postgres_module.so