Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 8 May 2020 02:06:41 +0000 (UTC)
From:      "Sergey A. Osokin" <osa@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r534318 - in head/www/nginx-devel: . files
Message-ID:  <202005080206.04826f9k084388@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: osa
Date: Fri May  8 02:06:41 2020
New Revision: 534318
URL: https://svnweb.freebsd.org/changeset/ports/534318

Log:
  Add third-party opentracing dynamic module.
  
  Bump PORTREVISION.

Added:
  head/www/nginx-devel/files/extra-patch-nginx-opentracing-opentracing-config   (contents, props changed)
Modified:
  head/www/nginx-devel/Makefile
  head/www/nginx-devel/Makefile.extmod
  head/www/nginx-devel/Makefile.options.desc
  head/www/nginx-devel/distinfo
  head/www/nginx-devel/pkg-plist

Modified: head/www/nginx-devel/Makefile
==============================================================================
--- head/www/nginx-devel/Makefile	Fri May  8 01:35:57 2020	(r534317)
+++ head/www/nginx-devel/Makefile	Fri May  8 02:06:41 2020	(r534318)
@@ -3,7 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.18.0
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \
 		LOCAL/osa
@@ -89,9 +89,9 @@ OPTIONS_GROUP_HTTPGRP+=	AJP AWS_AUTH BROTLI CACHE_PURG
 	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 MODSECURITY \
-	MODSECURITY3 NAXSI NJS PASSENGER POSTGRES RDS_CSV RDS_JSON REDIS2 RTMP \
-	SET_MISC SFLOW SHIBBOLETH SLOWFS_CACHE SMALL_LIGHT SRCACHE VOD VTS XSS \
-	WEBSOCKIFY
+	MODSECURITY3 NAXSI NJS OPENTRACING PASSENGER POSTGRES RDS_CSV RDS_JSON \
+	REDIS2 RTMP SET_MISC SFLOW SHIBBOLETH SLOWFS_CACHE SMALL_LIGHT SRCACHE \
+	VOD VTS XSS WEBSOCKIFY
 OPTIONS_DEFINE=		DEBUG DEBUGLOG DSO FILE_AIO IPV6 THREADS WWW
 OPTIONS_DEFAULT?=	DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \
 		HTTP_DAV HTTP_FLV HTTP_GUNZIP_FILTER HTTP_GZIP_STATIC \

Modified: head/www/nginx-devel/Makefile.extmod
==============================================================================
--- head/www/nginx-devel/Makefile.extmod	Fri May  8 01:35:57 2020	(r534317)
+++ head/www/nginx-devel/Makefile.extmod	Fri May  8 02:06:41 2020	(r534318)
@@ -252,6 +252,11 @@ NAXSI_VARS=		DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_sr
 NJS_GH_TUPLE=		nginx:njs:0.4.0: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.4
 PASSENGER_CATEGORIES=	ruby
 PASSENGER_USE=		ruby=yes

Modified: head/www/nginx-devel/Makefile.options.desc
==============================================================================
--- head/www/nginx-devel/Makefile.options.desc	Fri May  8 01:35:57 2020	(r534317)
+++ head/www/nginx-devel/Makefile.options.desc	Fri May  8 02:06:41 2020	(r534318)
@@ -93,6 +93,7 @@ MODSECURITY3_DESC=		3rd party modsecurity3 module
 MODSECURITY_DESC=		3rd party mod_security 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-devel/distinfo
==============================================================================
--- head/www/nginx-devel/distinfo	Fri May  8 01:35:57 2020	(r534317)
+++ head/www/nginx-devel/distinfo	Fri May  8 02:06:41 2020	(r534318)
@@ -1,4 +1,4 @@
-TIMESTAMP = 1588694961
+TIMESTAMP = 1588902199
 SHA256 (nginx-1.18.0.tar.gz) = 4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99
 SIZE (nginx-1.18.0.tar.gz) = 1039530
 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
@@ -115,6 +115,8 @@ SHA256 (nbs-system-naxsi-0.56_GH0.tar.gz) = 0a66dcadd3
 SIZE (nbs-system-naxsi-0.56_GH0.tar.gz) = 192120
 SHA256 (nginx-njs-0.4.0_GH0.tar.gz) = 5c35dc18db01d4736501ef2e8ecf7d7d4c806a84117419849a92b1e1fa36673b
 SIZE (nginx-njs-0.4.0_GH0.tar.gz) = 418439
+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-devel/files/extra-patch-nginx-opentracing-opentracing-config
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/nginx-devel/files/extra-patch-nginx-opentracing-opentracing-config	Fri May  8 02:06:41 2020	(r534318)
@@ -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-devel/pkg-plist
==============================================================================
--- head/www/nginx-devel/pkg-plist	Fri May  8 01:35:57 2020	(r534317)
+++ head/www/nginx-devel/pkg-plist	Fri May  8 02:06:41 2020	(r534318)
@@ -70,6 +70,7 @@
 %%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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005080206.04826f9k084388>