git: 817d2bd2b8bc - main - www/nginx-devel: update OTel module to the recent commit
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 17 Sep 2023 20:07:17 UTC
The branch main has been updated by osa:
URL: https://cgit.FreeBSD.org/ports/commit/?id=817d2bd2b8bc8ff1e27b8120b70bd06eb9845d43
commit 817d2bd2b8bc8ff1e27b8120b70bd06eb9845d43
Author: Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2023-09-17 20:06:20 +0000
Commit: Sergey A. Osokin <osa@FreeBSD.org>
CommitDate: 2023-09-17 20:07:12 +0000
www/nginx-devel: update OTel module to the recent commit
Bump PORTREVISION.
---
www/nginx-devel/Makefile | 5 +---
www/nginx-devel/Makefile.extmod | 3 +-
www/nginx-devel/distinfo | 6 ++--
.../files/extra-patch-nginx-otel-config | 34 ----------------------
4 files changed, 5 insertions(+), 43 deletions(-)
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 3039e40225ae..fd26a2717d2b 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -1,6 +1,6 @@
PORTNAME?= nginx
PORTVERSION= 1.25.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
LOCAL/osa
@@ -324,9 +324,6 @@ pre-configure-SMALL_LIGHT-on:
do-configure-NJS-on:
( cd ${WRKSRC_njs} && ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${NJS_CONFIGURE_ARGS} )
-post-configure-OTEL-on:
- ${CAT} ${WRKSRC_otel}/src/modules.c >${WRKSRC}/objs/ngx_otel_module_modules.c
-
.if !target(do-install)
do-install:
${MKDIR} ${STAGEDIR}${ETCDIR}
diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod
index 06adb9f018d1..3179ad66a4b1 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -248,7 +248,7 @@ 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:f58abc0:otel
+OTEL_GH_TUPLE= osokin:nginx-otel:dc52126:otel
OTEL_VARS= DSO_EXTMODS+=otel OTEL_SUBDIR=/
OTEL_LIB_DEPENDS= libabsl_base.so:devel/abseil \
libcares.so:dns/c-ares \
@@ -258,7 +258,6 @@ OTEL_LIB_DEPENDS= libabsl_base.so:devel/abseil \
libre2.so:devel/re2
OTEL_BUILD_DEPENDS= ${LOCALBASE}/include/opentelemetry/proto/common/v1/common.proto:devel/opentelemetry-proto
OTEL_CONFIGURE_ENV+= NGX_OTEL_PROTO_DIR=${PREFIX}/include
-OTEL_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-otel-config
PASSENGER_NGINX_VER= 6.0.18
PASSENGER_CATEGORIES= ruby
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 75a5a3f1346e..1f9bf0eafec8 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1694883296
+TIMESTAMP = 1694980577
SHA256 (nginx-1.25.2.tar.gz) = 05dd6d9356d66a74e61035f2a42162f8c754c97cf1ba64e7a801ba158d6c0711
SIZE (nginx-1.25.2.tar.gz) = 1214903
SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
@@ -109,8 +109,8 @@ SHA256 (nginx-njs-0.8.1_GH0.tar.gz) = 0450d9652d3cfe7dd9f802d6f790a3616e1612eef4
SIZE (nginx-njs-0.8.1_GH0.tar.gz) = 729780
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-f58abc0_GH0.tar.gz) = 38cf4ce454fccf174cfabf655861cda6e5aced593dad46b0f2894fb7c664d3b2
-SIZE (osokin-nginx-otel-f58abc0_GH0.tar.gz) = 30364
+SHA256 (osokin-nginx-otel-dc52126_GH0.tar.gz) = 3f167a1b955864b6a22b9e5206a6cdea5ecc775dffdda66ef8f5b70b20ff701d
+SIZE (osokin-nginx-otel-dc52126_GH0.tar.gz) = 30372
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
diff --git a/www/nginx-devel/files/extra-patch-nginx-otel-config b/www/nginx-devel/files/extra-patch-nginx-otel-config
deleted file mode 100644
index acc11ca78cd0..000000000000
--- a/www/nginx-devel/files/extra-patch-nginx-otel-config
+++ /dev/null
@@ -1,34 +0,0 @@
---- ../nginx-otel-f58abc0/config.orig 2023-09-16 12:52:34.000000000 -0400
-+++ ../nginx-otel-f58abc0/config 2023-09-16 21:19:32.540843000 -0400
-@@ -223,7 +223,7 @@
- ngx_feature_run=no
- ngx_feature_incs="#include <grpc/support/log.h>"
- ngx_feature_path="/usr/include"
--ngx_feature_libs="-lgrpc -lgpr"
-+ngx_feature_libs="-lgrpc -lgpr -lgrpc++"
- ngx_feature_test="gpr_log_verbosity_init();"
-
- autocppfeature
-@@ -236,19 +236,18 @@
- ngx_feature_path="/usr/local/include"
-
- if [ $NGX_RPATH = YES ]; then
-- ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lgrpc -lgpr"
-+ ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lgrpc -lgpr -lgrpc++"
- else
-- ngx_feature_libs="-L/usr/local/lib -lgrpc -lgpr"
-+ ngx_feature_libs="-L/usr/local/lib -lgrpc -lgpr -lgrpc++"
- fi
-
- autocppfeature
- fi
-
- if [ $ngx_found = yes ]; then
-- ngx_module_libs="$ngx_module_libs -lgrpc -lgpr"
-+ ngx_module_libs="$ngx_module_libs -lgrpc -lgpr -lgrpc++"
- fi
-
--#ngx_module_libs="$ngx_module_libs -lupb -lz -lm -lrt -lssl -lcrypto"
- ngx_module_libs="$ngx_module_libs -lz -lm -lrt -lssl -lcrypto"
-
- . auto/module