Date: Mon, 13 Jul 2020 11:36:51 +0000 (UTC) From: Jochen Neumeister <joneum@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r542125 - in head/www/nginx: . files Message-ID: <202007131136.06DBapfA072162@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: joneum Date: Mon Jul 13 11:36:51 2020 New Revision: 542125 URL: https://svnweb.freebsd.org/changeset/ports/542125 Log: Merge from nginx-devel: Add third-party opentracing dynamic module. Sponsored by: Netzkommune GmbH Added: head/www/nginx/files/extra-patch-nginx-opentracing-opentracing-config (contents, props changed) Modified: head/www/nginx/Makefile head/www/nginx/Makefile.extmod head/www/nginx/Makefile.options.desc head/www/nginx/distinfo head/www/nginx/pkg-plist Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Mon Jul 13 10:52:49 2020 (r542124) +++ head/www/nginx/Makefile Mon Jul 13 11:36:51 2020 (r542125) @@ -3,7 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.18.0 -PORTREVISION?= 17 +PORTREVISION?= 18 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ @@ -88,7 +88,7 @@ OPTIONS_GROUP_HTTPGRP+= AJP AWS_AUTH BROTLI CACHE_PURG HTTP_RESPONSE 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 PASSENGER POSTGRES RDS_CSV \ + MEMC MODSECURITY3 NAXSI OPENTRACING PASSENGER POSTGRES RDS_CSV \ RDS_JSON REDIS2 RTMP SET_MISC SFLOW SHIBBOLETH SLOWFS_CACHE \ SMALL_LIGHT SRCACHE VOD VTS XSS WEBSOCKIFY OPTIONS_GROUP_MAILGRP= MAIL MAIL_IMAP MAIL_POP3 MAIL_SMTP MAIL_SSL Modified: head/www/nginx/Makefile.extmod ============================================================================== --- head/www/nginx/Makefile.extmod Mon Jul 13 10:52:49 2020 (r542124) +++ head/www/nginx/Makefile.extmod Mon Jul 13 11:36:51 2020 (r542125) @@ -232,6 +232,11 @@ NAXSI_VARS= DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_sr NJS_GH_TUPLE= nginx:njs:629027e:njs NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx +OPENTRACING_GH_TUPLE= opentracing-contrib:nginx-opentracing:2d81c29: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.5 PASSENGER_CATEGORIES= ruby PASSENGER_USE= ruby=yes Modified: head/www/nginx/Makefile.options.desc ============================================================================== --- head/www/nginx/Makefile.options.desc Mon Jul 13 10:52:49 2020 (r542124) +++ head/www/nginx/Makefile.options.desc Mon Jul 13 11:36:51 2020 (r542125) @@ -92,6 +92,7 @@ MEMC_DESC= 3rd party memc (memcached) module MODSECURITY3_DESC= 3rd party modsecurity3 module NAXSI_DESC= 3rd party naxsi module NJS_DESC= Enable http_javascript 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 Modified: head/www/nginx/distinfo ============================================================================== --- head/www/nginx/distinfo Mon Jul 13 10:52:49 2020 (r542124) +++ head/www/nginx/distinfo Mon Jul 13 11:36:51 2020 (r542125) @@ -1,4 +1,4 @@ -TIMESTAMP = 1591645713 +TIMESTAMP = 1594636332 SHA256 (nginx-1.18.0.tar.gz) = 4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99 SIZE (nginx-1.18.0.tar.gz) = 1039530 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c @@ -111,6 +111,8 @@ SHA256 (nbs-system-naxsi-0.56_GH0.tar.gz) = 0a66dcadd3 SIZE (nbs-system-naxsi-0.56_GH0.tar.gz) = 192120 SHA256 (nginx-njs-629027e_GH0.tar.gz) = ea541abadd1e928081f71a0e1a843d4ca6573cdf5dcb2004367062fc4b795cbf SIZE (nginx-njs-629027e_GH0.tar.gz) = 418481 +SHA256 (opentracing-contrib-nginx-opentracing-2d81c29_GH0.tar.gz) = b082bb8e0f4de2e3361c9cae79e266856de1e5b26a43611e08446b7c2bc0b2b4 +SIZE (opentracing-contrib-nginx-opentracing-2d81c29_GH0.tar.gz) = 664357 SHA256 (konstruxi-ngx_postgres-8aa7359_GH0.tar.gz) = c69ad4495de7c7883ebc23e1e6c4cc83a4ac6a7fddd4d5c12e49d33b65f7c50b SIZE (konstruxi-ngx_postgres-8aa7359_GH0.tar.gz) = 48544 SHA256 (openresty-rds-csv-nginx-module-v0.09_GH0.tar.gz) = 896be99c0cad50218417800a159e43ec088d6b58c099472ed3b3d7f179d6c0ea Added: head/www/nginx/files/extra-patch-nginx-opentracing-opentracing-config ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx/files/extra-patch-nginx-opentracing-opentracing-config Mon Jul 13 11:36:51 2020 (r542125) @@ -0,0 +1,8 @@ +--- ../nginx-opentracing-2d81c29/opentracing/config.orig 2020-05-07 18:34:12.853828000 -0400 ++++ ../nginx-opentracing-2d81c29/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" Modified: head/www/nginx/pkg-plist ============================================================================== --- head/www/nginx/pkg-plist Mon Jul 13 10:52:49 2020 (r542124) +++ head/www/nginx/pkg-plist Mon Jul 13 11:36:51 2020 (r542125) @@ -67,6 +67,7 @@ %%DSO%%%%NAXSI%%libexec/nginx/ngx_http_naxsi_module.so %%DSO%%%%HTTP%%%%NJS%%libexec/nginx/ngx_http_js_module.so %%DSO%%%%STREAM%%%%NJS%%libexec/nginx/ngx_stream_js_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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007131136.06DBapfA072162>