From nobody Thu Apr 18 17:07:46 2024 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 4VL4363h32z5HDLl; Thu, 18 Apr 2024 17:07:46 +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 4VL43637cnz51fM; Thu, 18 Apr 2024 17:07:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713460066; 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=Xso//a+oUgPXCFuO7GSHAOFU+U3hbslu2xbCEweSDGQ=; b=ac30lttto+SiJwVbYlEJCA2Od+EcuUq8UVVREdYisUHwpZxJ05a73fB+ySKsd3fCfbBuHQ RiecSxSbOGhlSHzbM61r2zBaRsTzCBebXaqVN2WSSRDlNCIq7sS5fYMz7IQPzbW3yFhi/v XMbvmb3VNS1i80EOUoJ+jf7bscHDX1bdEe9G6whpcDZySngee1uL5Y5QwZIKqDgrQNgRVf xhOhVhqlEu8HwqCfwkdPyrXxbotsBslB71W0M5CPD3GLI9qyLBkuuzCmHgR5QYSGDLAlxc ObxegZYaOveqBmeqPTSzi/qTQXnDaqem5idm1/q9eqFCT4bBo+W1Etax33IYCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713460066; a=rsa-sha256; cv=none; b=TxioNMTdJRxH0/HrssA3N7zlVV6mJP7qIIR5PGm3UfyAN9ewPkze6aNP/7sFqA4ctlMOjF q6OvUIix0SFUF4GIAY3LSXKaElXAqzBUatcNjDo8PEOwAUVFL09AkavPMPQ07uevlDW5Qz 08bNdMQcZZlkxPpbu7JVbd9eMusQ/RaWEN7IESB7uLYQ2CzLumdNjEavvgS4XYt10AzK5z JyYAiVRG3yVb6dS1nj8HqkQzfuUM3hMxNyjSEXois3eZx8YhPBl6M1CRk5bSD+uSNp2lUy 8jSvIYiLyV5NyjuXtDdEHzMsRfhKEz9L/GHCUaZgQhzi6rW9sp7KRHmTtfYd+w== 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=1713460066; 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=Xso//a+oUgPXCFuO7GSHAOFU+U3hbslu2xbCEweSDGQ=; b=qtCSuqG5HI1H6iic1+lJrhsyVKmg+xuJdvytQ6IEZcSq274C3UbQPVwEyt1On1iUK8G6Cy B1ZxLxjOo52vjzr/3XYdbYSQSaXExo3NcLwclsMMcbddddc6/e/UdimAgyDcQh8QiEEqBi 0kqsuNG+vskksHI5bJzJSuIcdCCxduNdNp+SxW+jAw9VutmqoP+nxuq0GUi8arRDSFBlwv Ibw4lB9+rzStXW5H3cXFWkH6kTbhZHYLwZ6IjzVE+R4f+xRudRxESvpGYaEqpDK5f+Q51u t+aodtT0+4xgKXVGeryJGVhgfWRWIGoh2uP7bpWdSb3jKzeq0Gog+Xs4UhnNtw== 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 4VL4362kldzJ6J; Thu, 18 Apr 2024 17:07:46 +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 43IH7kSD098084; Thu, 18 Apr 2024 17:07:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43IH7kl2098081; Thu, 18 Apr 2024 17:07:46 GMT (envelope-from git) Date: Thu, 18 Apr 2024 17:07:46 GMT Message-Id: <202404181707.43IH7kl2098081@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: d83020dff1f7 - main - www/nginx-devel: update 1.25.4 -> 1.25.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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: d83020dff1f7eaab1c8ca0ec8385e9569656cee3 Auto-Submitted: auto-generated The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=d83020dff1f7eaab1c8ca0ec8385e9569656cee3 commit d83020dff1f7eaab1c8ca0ec8385e9569656cee3 Author: Sergey A. Osokin AuthorDate: 2024-04-18 17:06:46 +0000 Commit: Sergey A. Osokin CommitDate: 2024-04-18 17:07:41 +0000 www/nginx-devel: update 1.25.4 -> 1.25.5 (+) Fix building third-party naxsi module. *) Feature: virtual servers in the stream module. *) Feature: the ngx_stream_pass_module. *) Feature: the "deferred", "accept_filter", and "setfib" parameters of the "listen" directive in the stream module. *) Feature: cache line size detection for some architectures. Thanks to Piotr Sikora. *) Feature: support for Homebrew on Apple Silicon. Thanks to Piotr Sikora. *) Bugfix: Windows cross-compilation bugfixes and improvements. Thanks to Piotr Sikora. *) Bugfix: unexpected connection closure while using 0-RTT in QUIC. Thanks to Vladimir Khomutov. --- www/nginx-devel/Makefile | 3 +-- www/nginx-devel/Makefile.extmod | 3 ++- www/nginx-devel/distinfo | 6 +++--- .../files/extra-patch-naxsi-libinjection__sqli_c | 4 ++-- www/nginx-devel/files/extra-patch-naxsi_config | 4 ++-- .../files/extra-patch-ngx_stream_ssl_ct_module.c | 14 ++++++++++++++ 6 files changed, 24 insertions(+), 10 deletions(-) diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index d29d25f9adde..9a244c1c123f 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -1,6 +1,5 @@ PORTNAME?= nginx -PORTVERSION= 1.25.4 -PORTREVISION= 7 +PORTVERSION= 1.25.5 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod index b0d3d1827451..503e676388ff 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -36,7 +36,8 @@ CACHE_PURGE_VARS= DSO_EXTMODS+=cache_purge CT_IMPLIES= HTTP_SSL CT_GH_TUPLE= grahamedgecombe:nginx-ct:93e9884:ct CT_VARS= DSO_EXTMODS+=ct -CT_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-ct-LibreSSL +CT_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-ct-LibreSSL \ + ${PATCHDIR}/extra-patch-ngx_stream_ssl_ct_module.c ECHO_GH_TUPLE= openresty:echo-nginx-module:5a402aa:echo ECHO_VARS= DSO_EXTMODS+=echo diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo index 3e1eceeccc46..39a6daca4441 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1712524092 -SHA256 (nginx-1.25.4.tar.gz) = 760729901acbaa517996e681ee6ea259032985e37c2768beef80df3a877deed9 -SIZE (nginx-1.25.4.tar.gz) = 1236273 +TIMESTAMP = 1713445894 +SHA256 (nginx-1.25.5.tar.gz) = 2fe2294f8af4144e7e842eaea884182a84ee7970e11046ba98194400902bbec0 +SIZE (nginx-1.25.5.tar.gz) = 1244060 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae SIZE (nginx_mogilefs_module-1.0.4.tar.gz) = 11208 SHA256 (ngx_http_redis-0.3.9.tar.gz) = 21f87540f0a44b23ffa5df16fb3d788bc90803b255ef14f9c26e3847a6f26f46 diff --git a/www/nginx-devel/files/extra-patch-naxsi-libinjection__sqli_c b/www/nginx-devel/files/extra-patch-naxsi-libinjection__sqli_c index 9aeec390a0de..bdd074b620dd 100644 --- a/www/nginx-devel/files/extra-patch-naxsi-libinjection__sqli_c +++ b/www/nginx-devel/files/extra-patch-naxsi-libinjection__sqli_c @@ -1,5 +1,5 @@ ---- ../libinjection-51f3a96/src/libinjection_sqli.c.orig 2023-05-30 15:47:57.333208000 -0400 -+++ ../libinjection-51f3a96/src/libinjection_sqli.c 2023-05-30 15:49:52.273873000 -0400 +--- ../libinjection-4aa3894/src/libinjection_sqli.c.orig 2023-05-30 15:47:57.333208000 -0400 ++++ ../libinjection-4aa3894/src/libinjection_sqli.c 2023-05-30 15:49:52.273873000 -0400 @@ -305,8 +303,8 @@ static void st_assign(stoken_t * st, const char stype, size_t pos, size_t len, const char* value) diff --git a/www/nginx-devel/files/extra-patch-naxsi_config b/www/nginx-devel/files/extra-patch-naxsi_config index a73cf8f4e085..8fa8a4785527 100644 --- a/www/nginx-devel/files/extra-patch-naxsi_config +++ b/www/nginx-devel/files/extra-patch-naxsi_config @@ -1,5 +1,5 @@ ---- ../naxsi-1.5/naxsi_src/config.orig 2023-09-27 09:43:18.644606000 -0400 -+++ ../naxsi-1.5/naxsi_src/config 2023-09-27 09:44:37.585970000 -0400 +--- ../naxsi-1.6/naxsi_src/config.orig 2023-09-27 09:43:18.644606000 -0400 ++++ ../naxsi-1.6/naxsi_src/config 2023-09-27 09:44:37.585970000 -0400 @@ -24,11 +24,6 @@ " diff --git a/www/nginx-devel/files/extra-patch-ngx_stream_ssl_ct_module.c b/www/nginx-devel/files/extra-patch-ngx_stream_ssl_ct_module.c new file mode 100644 index 000000000000..b3df57b24218 --- /dev/null +++ b/www/nginx-devel/files/extra-patch-ngx_stream_ssl_ct_module.c @@ -0,0 +1,14 @@ +--- ../nginx-ct-93e9884/ngx_stream_ssl_ct_module.c.orig 2024-04-18 12:32:44.086600000 -0400 ++++ ../nginx-ct-93e9884/ngx_stream_ssl_ct_module.c 2024-04-18 12:37:40.764525000 -0400 +@@ -70,7 +70,11 @@ + + static char *ngx_stream_ssl_ct_merge_srv_conf(ngx_conf_t *cf, void *parent, + void *child) { ++#if nginx_version >= 1025005 ++ ngx_stream_ssl_srv_conf_t *ssl_conf = ngx_stream_conf_get_module_srv_conf(cf, ++#else + ngx_stream_ssl_conf_t *ssl_conf = ngx_stream_conf_get_module_srv_conf(cf, ++#endif + ngx_stream_ssl_module); + + ngx_array_t *certificates;