From nobody Sun Sep 17 20:07:17 2023 X-Original-To: dev-commits-ports-all@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 4Rpf9212jWz4tj8n; Sun, 17 Sep 2023 20:07:18 +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 4Rpf920byWz4vvY; Sun, 17 Sep 2023 20:07:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694981238; 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=QfKWZ9ynYZghMbQZFnuMdwL2zNQM34aN8+xYxywoHY4=; b=NV+5O91Jh7KMkuzMt2KLAgDL1uRGv6yiuPZ52qMPjyYnv/smu72bijOEFEWv4r4YtJRxok MyOanVXvd2qyZA2Lu1odgzjztmBhe5RUFsyltQBIPHWc2NtUMg3PPN24rVWQUptYO0/zEK fYWGg4z6t/S3H8bpunEPSJqqgY8ZHL8371f/mdKEunaTqiyPKGhIk8wLBzlY4r1vWxCQyN yt3LT10ykAx7SV/kGWyU5BfB/FKkj1dfRm+oFNopypypV++lCThr2a4ELnUjwdKcfiarfE PSCqpF6UhbRfnbIJRn5xnqn1TJkvComyWGwbw+B0t117UhqCMxrxFp0c9ecdgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694981238; a=rsa-sha256; cv=none; b=s8VBvX9rkdjR5SVhK03vinFRP4EyB1HNDvxnSQJ9dbWqGUyluS3FVOGuLwDxpopLPi5F2M OFkoJkmoAWveUP8eCO34Gcet+ff6HrEn7tnOYCKdWcr6z/NYkSsGoI9THXBbNKKw122GPB g/bQcWMVaB7naENeqOaSD7sZZ/V7CfMfdbQK+bS5h9bKFN964rFfcu2FG76adqp7ijtE2d khDT+xeicEtOYsrLbMZYzq7+lI8zf6sasjAImsJV/sdpYYa8+4qvIwvBLZn1Ue+XGdXKlj lAbKc37gUYd5AFPc9X3vbsExIv+M5frfpKB/UzlL0xVGr8GlYC/WcyH8QKB1hw== 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=1694981238; 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=QfKWZ9ynYZghMbQZFnuMdwL2zNQM34aN8+xYxywoHY4=; b=ccW+IM6d8iQfu/s7NSTvY0kkaIjc2Vq0o9JDaz0Iyz0PHqMxO/NN2WG8Mu70XPDw2845Y8 LXvyBIumsz/Y7DsUewj3nQkvsLbkUPpqQDgWETUj+hap9dj5ds2D/SUBfrYFOIVhSrXrsT KL9M0ZWuInlk1C3xBajKe6YyaZG+dsFZi2N34yP+4Bx5b/Eebw0xNuKDt04nbDJpdU6bDC pNN7mf/g1yG7Ra0DYjnNKKp1nKywLIr1fOwy1LS1NzQmIQK9hOSDWG/XpqDuQ4iTNczwt2 xSpsgW+6GKUeqwv+DpM+WC+GiIkO157DcA+6w/q6zMWucoH+FW6uI/i34AwDuw== 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 4Rpf916my7z12VL; Sun, 17 Sep 2023 20:07:17 +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 38HK7HA7073215; Sun, 17 Sep 2023 20:07:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38HK7HZK073212; Sun, 17 Sep 2023 20:07:17 GMT (envelope-from git) Date: Sun, 17 Sep 2023 20:07:17 GMT Message-Id: <202309172007.38HK7HZK073212@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: 817d2bd2b8bc - main - www/nginx-devel: update OTel module to the recent commit List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 817d2bd2b8bc8ff1e27b8120b70bd06eb9845d43 Auto-Submitted: auto-generated The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=817d2bd2b8bc8ff1e27b8120b70bd06eb9845d43 commit 817d2bd2b8bc8ff1e27b8120b70bd06eb9845d43 Author: Sergey A. Osokin AuthorDate: 2023-09-17 20:06:20 +0000 Commit: Sergey A. Osokin 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 " - 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