From nobody Wed Dec 29 18:16:41 2021 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 391191908982; Wed, 29 Dec 2021 18:16:42 +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 4JPKNn5bXZz4nmH; Wed, 29 Dec 2021 18:16:41 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 9C9C815F3; Wed, 29 Dec 2021 18:16:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BTIGftv002044; Wed, 29 Dec 2021 18:16:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BTIGfwu002043; Wed, 29 Dec 2021 18:16:41 GMT (envelope-from git) Date: Wed, 29 Dec 2021 18:16:41 GMT Message-Id: <202112291816.1BTIGfwu002043@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: 2c513be320c8 - main - www/nginx-devel: update from 1.21.4 to 1.21.5. 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: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c513be320c898d676bd08329a1389096e2249d5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640801801; 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=5R13IgorTMRK/DN9Ho+Z8Sh6t3BeVFPKIs82k2Gb6Zo=; b=UbrBHYWDHmOc7qi0n4l18e2PUoH60NyfgtXxxQ7SKRpT5GKrog3mGD43DOaXaoh4Pc2jby owqGtvt35Tm2udf0Xmfuz2+A0Fa85QE4M3Bcpd0crf0YH8YIonjtr9WDthaIO3h60tr8oW uB1prpp4/Yl2Uv8cMJUqVaCjV6v/a2ywLPvVRiplIBYkshVuzS8jZ6HH2pS+WJhaGX0lsN 9yrP/93HMJjCXs+tsiXEA00IorxYIjEI7NJjaYCgunqQRNokrqw0O5eUQemcHDN48VUXAB z5V2OW1O57mTRT7fLcEy30lNIvkl6i0+kHLxcp1cT8gi003lyVeAF7/FA0eSfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640801801; a=rsa-sha256; cv=none; b=Majx+8dF3ajS19Xl2a3Gvp00N94QOTcVwAhjq8aVCSoBzXZ79LTPLZdv1HeQ4kbfeujJ4O Yq0Fnj3Yze0vpLM217EPvgcdGjjlMP+TCSabJU9yshN1ZfxknSA23lT5GJc28K8O4JGyA1 n/88ijP4Zv1oJCa2K0SwfvZf+To//jwa/RZBuKP7A3NoQlk9W5UrbL5LMEiJ9i08KH1l5j nNTdEvEIGLSr77IHLdCyih66ujMJR1jVeO4Qr3n1NyVZLbsjziiCFyVuF2Pnk1y9YpI3+q EqExNQzpcVZ7g6/ww+S73DH4h018PxMpD1x7mDsIEys0hApHkOdx8U9VMMiT1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=2c513be320c898d676bd08329a1389096e2249d5 commit 2c513be320c898d676bd08329a1389096e2249d5 Author: Sergey A. Osokin AuthorDate: 2021-12-29 18:16:02 +0000 Commit: Sergey A. Osokin CommitDate: 2021-12-29 18:16:31 +0000 www/nginx-devel: update from 1.21.4 to 1.21.5. Please note: it's possible to build the recent version of nginx with PCRE2 library, but several third-party modules have some build issues, so let's keep www/nginx-devel depends on PCRE1 library for now, but keep in mind it needs to switched to the modern, i.e. second, version of PCRE. Changes with nginx 1.21.5 *) Change: now nginx is built with the PCRE2 library by default. *) Change: now nginx always uses sendfile(SF_NODISKIO) on FreeBSD. *) Feature: support for sendfile(SF_NOCACHE) on FreeBSD. *) Feature: the $ssl_curve variable. *) Bugfix: connections might hang when using HTTP/2 without SSL with the "sendfile" and "aio" directives. Changes with njs 0.7.1 nginx modules: *) Change: the "js_include" directive deprecated since 0.4.0 was removed. *) Change: PCRE/PCRE2-specific code was moved to the modules. This ensures that njs uses the same RegExp library as nginx. Core: *) Feature: extended "fs" module. Added stat(), fstat() and friends. *) Change: default RegExp engine for CLI is switched to PCRE2. *) Bugfix: fixed decodeURI() and decodeURIComponent() with invalid byte strings. The bug was introduced in 0.4.3. *) Bugfix: fixed heap-use-after-free in await frame. The bug was introduced in 0.7.0. *) Bugfix: fixed WebCrypto sign() and verify() methods with OpenSSL 3.0. *) Bugfix: fixed exception throwing when RegExp match fails. The bug was introduced in 0.1.15. *) Bugfix: fixed catching of exception thrown in try block of async function. The bug was introduced in 0.7.0. *) Bugfix: fixed execution of async function in synchronous context. The bug was introduced in 0.7.0. *) Bugfix: fixed function redeclaration in CLI when interactive mode is on. The bug was introduced in 0.6.2. *) Bugfix: fixed typeof operator with DataView object. *) Bugfix: eliminated information leak in Buffer.from(). --- www/nginx-devel/Makefile | 11 ++++++----- www/nginx-devel/Makefile.extmod | 2 +- www/nginx-devel/distinfo | 10 +++++----- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index f5c5eac910cb..24eb3bed05bf 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -1,8 +1,7 @@ # Created by: Sergey A. Osokin PORTNAME?= nginx -PORTVERSION= 1.21.4 -PORTREVISION= 1 +PORTVERSION= 1.21.5 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa @@ -154,7 +153,7 @@ HTTP_PERL_VARS= DSO_BASEMODS+=http_perl_module HTTP_RANDOM_INDEX_CONFIGURE_ON= --with-http_random_index_module HTTP_REALIP_CONFIGURE_ON= --with-http_realip_module HTTP_REWRITE_LIB_DEPENDS= libpcre.so:devel/pcre -HTTP_REWRITE_CONFIGURE_ON= --with-pcre +HTTP_REWRITE_CONFIGURE_ON= --with-pcre --without-pcre2 HTTP_REWRITE_CONFIGURE_OFF= --without-http_rewrite_module HTTP_SECURE_LINK_CONFIGURE_ON= --with-http_secure_link_module HTTP_SLICE_CONFIGURE_ON= --with-http_slice_module @@ -307,7 +306,9 @@ pre-configure-SMALL_LIGHT-on: ( cd ${WRKSRC_small_light} && ./setup ) do-configure-NJS-on: - ( cd ${WRKSRC_njs} && ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} ) + ( cd ${WRKSRC_njs} && ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} --no-pcre2 \ + && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} njs \ + && ${MV} build/njs ${WRKSRC_njs} ) .if !target(do-install) do-install: @@ -344,7 +345,7 @@ do-install-NAXSI-on: ${STAGEDIR}${ETCDIR} do-install-NJS-on: - ${INSTALL_PROGRAM} ${WRKSRC_njs}/build/njs ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_PROGRAM} ${WRKSRC_njs}/njs ${STAGEDIR}${PREFIX}/sbin .endif .if !target(post-install) diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod index 95995623743c..43a4b041bc0e 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -244,7 +244,7 @@ NAXSI_NGINX_VER= 1.3 NAXSI_GH_TUPLE= nbs-system:naxsi:${NAXSI_NGINX_VER}:naxsi NAXSI_VARS= DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_src -NJS_GH_TUPLE= nginx:njs:0.7.0:njs +NJS_GH_TUPLE= nginx:njs:0.7.1:njs NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx NJS_USES= libedit diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo index 1514e9269f2a..cc0704cbebb6 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1638983725 -SHA256 (nginx-1.21.4.tar.gz) = d1f72f474e71bcaaf465dcc7e6f7b6a4705e4b1ed95c581af31df697551f3bfe -SIZE (nginx-1.21.4.tar.gz) = 1070260 +TIMESTAMP = 1640793367 +SHA256 (nginx-1.21.5.tar.gz) = b20f3bf533a518a6f0f3a7967dfeed872d268d31e4cc121a0001329602ddcfbb +SIZE (nginx-1.21.5.tar.gz) = 1072633 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae SIZE (nginx_mogilefs_module-1.0.4.tar.gz) = 11208 SHA256 (nginx_mod_h264_streaming-2.2.7.tar.gz) = 6d974ba630cef59de1f60996c66b401264a345d25988a76037c2856cec756c19 @@ -111,8 +111,8 @@ SHA256 (SpiderLabs-ModSecurity-nginx-v1.0.2_GH0.tar.gz) = f8d3ff15520df736c5e20e SIZE (SpiderLabs-ModSecurity-nginx-v1.0.2_GH0.tar.gz) = 33767 SHA256 (nbs-system-naxsi-1.3_GH0.tar.gz) = 439c8677372d2597b4360bbcc10bc86490de1fc75695b193ad5df154a214d628 SIZE (nbs-system-naxsi-1.3_GH0.tar.gz) = 235626 -SHA256 (nginx-njs-0.7.0_GH0.tar.gz) = 3f0fe7d77600a9c54000ce101dd51f44811964502641ae505e38c1bbf595e6f1 -SIZE (nginx-njs-0.7.0_GH0.tar.gz) = 575477 +SHA256 (nginx-njs-0.7.1_GH0.tar.gz) = f5493b444ef54f1edba85c7adcbb1132e61c36d47de8f7a8d351965cad6d5486 +SIZE (nginx-njs-0.7.1_GH0.tar.gz) = 583195 SHA256 (opentracing-contrib-nginx-opentracing-842d21f_GH0.tar.gz) = d15d5d4caa2b864fb820c9c6e373adb3eab10cfe2e5a39e98727245db4cc92c4 SIZE (opentracing-contrib-nginx-opentracing-842d21f_GH0.tar.gz) = 676206 SHA256 (konstruxi-ngx_postgres-8aa7359_GH0.tar.gz) = c69ad4495de7c7883ebc23e1e6c4cc83a4ac6a7fddd4d5c12e49d33b65f7c50b