From nobody Thu Feb 29 20:52:50 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tm3MQ4VwTz5CtJL; Thu, 29 Feb 2024 20:52:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tm3MQ2ZCFz4mcw; Thu, 29 Feb 2024 20:52:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709239970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g8r8637uEK2DnTELErmwGdM8zOCvhmmgRXjN29ze0Kk=; b=Hdk8qZ/OWdj92UHgJi56wTSvHnrpz73N/obiAEp6CDpchzFVffi43GFUxxQysLEr7Hx7J6 jw/pi6dPMO+d/p4lhimX0fxSnF1cdeUxsw+rMcu6QC4q44dWkFJ7JPi8ss7cyKPBpuUTid YBBXJZbNDYYl9yTOB5j3kV8mg0rjor4BCPj1sRXFwvxHDlg02c1efOz2TBWYUCUFKjd8ck qGM4o9Nqrl7QyBe+mR6sqU6lYosWeTQv3WpLVjdsmGUwbDvhIuhMVeR0fVRLo6BT03SZ3p fcGF3sFiVfaCH6kmmA/Bz0CMhEv9oUXZjeR3gSclBQi7iS2OyjLBU/ez/O+Pxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709239970; a=rsa-sha256; cv=none; b=FTcJPTxZVvRAbeiFkxsJkdMMmC5i/mk5x69K1ruuL5PNXqIaVa4uz32+H18FnSHQZbf9Ev HOlm3BcjrMgL/kGbfjqIyzG69qksnROa3x5Ztw96DFgALEAx2atEBbygyqyozUWwccrfz6 Exq8gOWAfkDcB2sH0suRqR6ERDaY65T9qjjVQsgtXNlYhOApcG5E8WYXB4Ve5iXpissoU2 i+SmW+MiSul/VpP+zaE33iTwStVHSUnA6QK92ZT4/dynNS8gt+cHZ5FPj+6tvqBYYnKTmg t1dl8DaxuzwD+vhuhjxBA2zICEt+H/9ODk9qSMQP4IMgU2YPU+5SP/XfNIieKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709239970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g8r8637uEK2DnTELErmwGdM8zOCvhmmgRXjN29ze0Kk=; b=f7yvZJn9r8G9CPWCX6s7lsSJNBsYGbbvIFkdglyC99rnrbh9l57DZ+Dkv9OFWN+qF94dZl XWff6ANE+lxI2SS6NaNOyMgzl5xCnjmmPDdaUvZMym0cT1EfwCPA0DkcDBggg/sA15NAI0 tPyNXHwU6sPNV+XGx0K1YNdSt1HY9eAfqoHcS71aw82Lv9ztQgNJmrEyhPw4/dvtteT80h mftqy9/P9lUIFKAcBKuon5D7KOXyzSS+k2juDoKKx1WcbCvHJSnLy4Xodhfn030GfF29Bd amkd1YmZn9mrm86cVj3FhfiPSOvj61/OHQ5y180GDjLa9wvElaiy7y22veLK2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tm3MQ27c2zxcb; Thu, 29 Feb 2024 20:52:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41TKqod2080725; Thu, 29 Feb 2024 20:52:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41TKqovO080722; Thu, 29 Feb 2024 20:52:50 GMT (envelope-from git) Date: Thu, 29 Feb 2024 20:52:50 GMT Message-Id: <202402292052.41TKqovO080722@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: b2ad75a2b920 - main - www/nginx-devel: remove third-party opentracing module (+) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b2ad75a2b920e1659afd54e5313e46f1f35bcd28 Auto-Submitted: auto-generated The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=b2ad75a2b920e1659afd54e5313e46f1f35bcd28 commit b2ad75a2b920e1659afd54e5313e46f1f35bcd28 Author: Sergey A. Osokin AuthorDate: 2024-02-29 20:49:56 +0000 Commit: Sergey A. Osokin 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