From nobody Mon Mar 11 11:32:45 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 4TtZQ53GSBz5Cnk6; Mon, 11 Mar 2024 11:32:45 +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 4TtZQ52jzCz44BC; Mon, 11 Mar 2024 11:32:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710156765; 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=gvPLzW/De5RC5ak08uyXrKniqaSdrKCkqcRXUTnoPyQ=; b=AzB15vhnKfJQWuFW0cssTzee5sAvA/y1BIZ+jWD14tveloiQjfi8b6Yvs/vMsWN+8MaGvh 5rrw28EBMs/rWWt+h+/1DIsMJl+6WhNCNobboElefjnKCAxDS83Qx9GiUtrgdIXV2OrWdy jNBoQrCdeW4+eX+KUgBNp48025CZ8RFHfQtScEepXjYqbljlEo3xsRJ1Tx3MAR3Erf0Pv5 VKBqRHUFEtMcC/NgmfrRRj2UP6FxE+wCTfiS2TLMxWE/r6HysgVamv7htCONsXpiH2rr3q /wbO1jyOiUh41S2g+hvzam59TU2MHph+Nt21KwPMkrba8X2wJj7uuISSMhP9Kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710156765; a=rsa-sha256; cv=none; b=wXxFSIAOvbRzuTkGTo2mriGfG/itMV0pHjBLuT2BgO0K1gVfwlqs/NX+VZWEH4i7gMGnSh OR4cnoRO84dwRmtTTeRDZTvN1/+6Dex/w7Az8BaGOF+14I2jzskcAVO1Ph6Kyq1fkiFXcf jTU66Rtfba8EG8nqyBFjqyzBvi10ZxbwHrR3laDfpcFRZOxwRTCkGNZW6Sh5JHlJQ1pRjy n2LL2LzuTTEUtisQNxuJOqdpccdWzV6f2s30vlEVNdFQ7PrSAULQijimycjd+2xPE6gFvV 6IqGDuVNw43SRgpMqQXpBpz+X0LfCvM+OP0RBWHIeMP6cYuVD+ue6bAtdzTPuw== 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=1710156765; 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=gvPLzW/De5RC5ak08uyXrKniqaSdrKCkqcRXUTnoPyQ=; b=k9SON1mAo70yFgoXdvnPkRh+VIk0YEg2Ecs4hK75SZL9Ydvr9BKDwVEPdPHabbeV82fpAt GTcYTDz6MBz+KNpLGfvhCsTvf2Ww64hoy/dPKJP/ubXeg6/WRy9YyJeU/93iBHCLbq77Jn XD2OgJboijUpi/ukVtt9KnPjvcfWojAg8aQqNVhgZ19i56sz/f26b4hXi3jmOlszubRLfc XGy8sMu1gHFTAH0s9Z9SEt+gipAs00F7qA6YcFRrT8qgAZCg9PR0M0T0bXl1XbGKR54lgB PhIc2aI1C++Inx1kjqDap6bOnmLemlTgW7c3pfqtlX2isd11xhmV1luwhY9UPQ== 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 4TtZQ52K20zSMM; Mon, 11 Mar 2024 11:32:45 +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 42BBWjtn026977; Mon, 11 Mar 2024 11:32:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42BBWjBM026975; Mon, 11 Mar 2024 11:32:45 GMT (envelope-from git) Date: Mon, 11 Mar 2024 11:32:45 GMT Message-Id: <202403111132.42BBWjBM026975@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jochen Neumeister Subject: git: 1909da24200c - main - www/nginx: 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: joneum X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1909da24200c5e089128880d453a26e3253d8b65 Auto-Submitted: auto-generated The branch main has been updated by joneum: URL: https://cgit.FreeBSD.org/ports/commit/?id=1909da24200c5e089128880d453a26e3253d8b65 commit 1909da24200c5e089128880d453a26e3253d8b65 Author: Jochen Neumeister AuthorDate: 2024-03-11 11:30:53 +0000 Commit: Jochen Neumeister CommitDate: 2024-03-11 11:32:34 +0000 www/nginx: remove third-party opentracing module (+) Similar functionality is available with OTEL module, also devel/libopentracing port is EOL. Reported by: osa via private Mail Sponsored by: Netzkomune GmbH --- www/nginx-full/Makefile | 4 ++-- www/nginx/Makefile | 2 +- www/nginx/Makefile.extmod | 11 +++-------- www/nginx/Makefile.options.desc | 1 - .../files/extra-patch-nginx-opentracing-opentracing-config | 8 -------- www/nginx/pkg-plist | 1 - 6 files changed, 6 insertions(+), 21 deletions(-) diff --git a/www/nginx-full/Makefile b/www/nginx-full/Makefile index 1ea70c9ef747..f0a4b7f91586 100644 --- a/www/nginx-full/Makefile +++ b/www/nginx-full/Makefile @@ -1,5 +1,5 @@ PORTNAME= nginx -PORTREVISION= 4 +PORTREVISION= 5 PKGNAMESUFFIX= -full MAINTAINER= joneum@FreeBSD.org @@ -31,7 +31,7 @@ OPTIONS_DEFAULT=DSO DEBUG DEBUGLOG FILE_AIO GOOGLE_PERFTOOLS \ HTTP_UPSTREAM_STICKY HTTP_VIDEO_THUMBEXTRACTOR HTTP_ZIP \ ARRAYVAR BROTLI DRIZZLE DYNAMIC_TLS DYNAMIC_HC DYNAMIC_UPSTREAM \ ENCRYPTSESSION FORMINPUT GRIDFS ICONV LET LINK LUA MEMC MODSECURITY3 \ - NAXSI OPENTRACING PASSENGER PCRE_ONE POSTGRES RDS_CSV RDS_JSON REDIS2 \ + NAXSI PASSENGER PCRE_ONE POSTGRES RDS_CSV RDS_JSON REDIS2 \ RTMP SET_MISC SFLOW SHIBBOLETH SLOWFS_CACHE SMALL_LIGHT \ SRCACHE STATSD VOD VTS UDPLOG X11 XSS WEBSOCKIFY diff --git a/www/nginx/Makefile b/www/nginx/Makefile index 3e431ec495d9..4d92fc92c11e 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -1,6 +1,6 @@ PORTNAME= nginx PORTVERSION= 1.24.0 -PORTREVISION?= 15 +PORTREVISION?= 16 PORTEPOCH= 3 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod index f3f6d0526210..2f68a38b8462 100644 --- a/www/nginx/Makefile.extmod +++ b/www/nginx/Makefile.extmod @@ -11,9 +11,9 @@ OPTIONS_GROUP_THIRDPARTYGRP= AJP AWS_AUTH BROTLI CACHE_PURGE CLOJURE COOKIE_FLAG 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 \ - REDIS2 RTMP SET_MISC SFLOW SHIBBOLETH SLOWFS_CACHE SRCACHE STS \ - VOD VTS XSS WEBSOCKIFY + MODSECURITY3 NAXSI PASSENGER POSTGRES RDS_CSV RDS_JSON REDIS2\ + RTMP SET_MISC SFLOW SHIBBOLETH SLOWFS_CACHE SRCACHE STS VOD VTS \ + XSS WEBSOCKIFY AJP_GH_TUPLE= msva:nginx_ajp_module:fcbb2cc:ajp AJP_VARS= DSO_EXTMODS+=ajp @@ -255,11 +255,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 - PASSENGER_NGINX_VER= 6.0.17 PASSENGER_CATEGORIES= ruby PASSENGER_USES= ruby diff --git a/www/nginx/Makefile.options.desc b/www/nginx/Makefile.options.desc index dc7f5a7c47a1..598e1f75a83f 100644 --- a/www/nginx/Makefile.options.desc +++ b/www/nginx/Makefile.options.desc @@ -93,7 +93,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 PASSENGER_DESC= 3rd party passenger module POSTGRES_DESC= 3rd party postgres module RDS_CSV_DESC= 3rd party rds_csv module diff --git a/www/nginx/files/extra-patch-nginx-opentracing-opentracing-config b/www/nginx/files/extra-patch-nginx-opentracing-opentracing-config deleted file mode 100644 index 1c40dd108b95..000000000000 --- a/www/nginx/files/extra-patch-nginx-opentracing-opentracing-config +++ /dev/null @@ -1,8 +0,0 @@ ---- ../nginx-opentracing-0.24.0/opentracing/config.orig 2020-05-07 18:34:12.853828000 -0400 -+++ ../nginx-opentracing-0.24.0/opentracing/config 2020-05-07 18:34:26.521814000 -0400 -@@ -34,4 +34,4 @@ - - . auto/module - --OT_NGX_SRCS="$ngx_module_srcs" -+#OT_NGX_SRCS="$ngx_module_srcs" diff --git a/www/nginx/pkg-plist b/www/nginx/pkg-plist index 1b784d1d3c92..94e0cd5e7946 100644 --- a/www/nginx/pkg-plist +++ b/www/nginx/pkg-plist @@ -68,7 +68,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%%%%PASSENGER%%libexec/nginx/ngx_http_passenger_module.so %%DSO%%%%POSTGRES%%libexec/nginx/ngx_postgres_module.so %%DSO%%%%RDS_CSV%%libexec/nginx/ngx_http_rds_csv_filter_module.so