From nobody Thu Jan 19 17:10:32 2023 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 4NyTfJ6lH8z2v8h9; Thu, 19 Jan 2023 17:10:32 +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 4NyTfJ6D0nz3wSY; Thu, 19 Jan 2023 17:10:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674148232; 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=YwvJJp4X6/9qCtAWvrjK4Dz5PkWOlAkF0TvfqF5voCw=; b=b5hBrpU4DxpGyrI19fsljJUWH2B8pipd9MTj1fCH9Lx5xb0p4mChlUGRI8NZP0VppAlIwd qH4Vxjr2qCiYXI3OvSfTtoxd/aif2/gkJWd3dkM53wadNb+4zn2IcA20T5ojIKoD7mHqri dsRGmiu8ImNPnmi0HpAcd2xFWw+owPWxImyOjbEzpIeTdlwy+usGE/D+XmG0mx7QTlirRq 4QYoeeXevnmaTeXK0jQ7AcbhgJMcX9gPXflH9njTMQIrH/csAgGqNAAW5KDDAR64UIUEBM 9sEnQLoDJplQwa8kuChs+t68FMSQFjaZR72r/RZJw3IIetlPVkso7/5B6j0zZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674148232; 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=YwvJJp4X6/9qCtAWvrjK4Dz5PkWOlAkF0TvfqF5voCw=; b=isXzyms8JqB3t/RnPd9l0PsBrMRtKEfRNFnUW0sM+TlY5t+fJNUAaLcSJ1bgVD7MB5bbab 60EtpB7oV13yhIyp7xc5yuqxemHefH5zjbQz67I7FtKaEZ0x6p7mmUt3rdamKs5bcs91eK B+1euc+XE5ec4pjgEfGysTwhH9T5YhB4ElhIObWsVoDNzVHju4X8vZwrtktZEriAKy1I5I flFGJdUVYUu0EKg9m+DJwpSJo9M5okg/0RBk2+FkK21YMh03fNigleMq6DawxQFBbTHx1K zWFW5SOS2aNB++Ycl5M5i7TwXHCYNlsKyky7760pdpt+i52zWPzu6p8gnJwnBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674148232; a=rsa-sha256; cv=none; b=nv1+soXoq3KwElp0oWjO8mDE0/+5+e6vFqsor1hvnx1ZR67FWycGzd0JtrxdQiXz+mriRn /Kbt4P4npE2FX1RTmLM1R+a52cw8tDMYYGv8eqeZjy9P6YYnL/nWXLmXo/T+AU9pmlAPP+ XDEQBB9MZrDKIsCRzVWFvIvcPgSR+o0I6Nwyu2U06uL3b+xL4a7pmxSa6cI3l1y2EZqMPP D9q2wTTHDiVjwR9vOGYgFIHPccA7hG2hBN3SbxjtNIiMxXES32WcUIlhCZi8/fCfkUzB10 FyYbD9AIdDViPornxcZoXC7nQ8/v2D5DBh51fnlqr+/gCPY5SBpymQIrq2aJDw== 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 4NyTfJ5Gxvzxy8; Thu, 19 Jan 2023 17:10:32 +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 30JHAW6r064017; Thu, 19 Jan 2023 17:10:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30JHAWKu064016; Thu, 19 Jan 2023 17:10:32 GMT (envelope-from git) Date: Thu, 19 Jan 2023 17:10:32 GMT Message-Id: <202301191710.30JHAWKu064016@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: a540b918b786 - main - www/nginx-devel: update third-party lua module 0.10.22 -> 0.10.23rc1 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: a540b918b786e512989ba5c096d343753cc88b42 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=a540b918b786e512989ba5c096d343753cc88b42 commit a540b918b786e512989ba5c096d343753cc88b42 Author: Sergey A. Osokin AuthorDate: 2023-01-19 17:09:00 +0000 Commit: Sergey A. Osokin CommitDate: 2023-01-19 17:10:27 +0000 www/nginx-devel: update third-party lua module 0.10.22 -> 0.10.23rc1 Remove the upstreamed patch. Bump PORTREVISION. --- www/nginx-devel/Makefile | 2 +- www/nginx-devel/Makefile.extmod | 3 +- www/nginx-devel/distinfo | 6 +- www/nginx-devel/files/extra-patch-lua-nginx-module | 167 --------------------- 4 files changed, 5 insertions(+), 173 deletions(-) diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index ce5802323abe..70e180825ba4 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME?= nginx PORTVERSION= 1.23.3 -PORTREVISION= 1 +PORTREVISION= 2 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 e382edad9cc0..a3932ff06b34 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -226,9 +226,8 @@ LUA_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty LUA_RUN_DEPENDS= lua-resty-core>0:www/lua-resty-core LUA_CONFIGURE_ENV= LUAJIT_INC=${LOCALBASE}/include/luajit-2.1 \ LUAJIT_LIB=${LOCALBASE}/lib -LUA_GH_TUPLE= openresty:lua-nginx-module:v0.10.22:lua +LUA_GH_TUPLE= openresty:lua-nginx-module:v0.10.23rc1:lua LUA_VARS= DSO_EXTMODS+=lua -LUA_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-lua-nginx-module:-p1 LINK_GH_TUPLE= Taymindis:nginx-link-function:3.2.4:link LINK_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nginx-link-function-config \ diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo index 7a7bcf74e93c..522a802ee0df 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1674144697 +TIMESTAMP = 1674147529 SHA256 (nginx-1.23.3.tar.gz) = 75cb5787dbb9fae18b14810f91cc4343f64ce4c24e27302136fb52498042ba54 SIZE (nginx-1.23.3.tar.gz) = 1108958 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae @@ -99,8 +99,8 @@ SHA256 (baysao-nginx-let-module-c1f23aa_GH0.tar.gz) = 7393809d5d8877812da1bd5b5f SIZE (baysao-nginx-let-module-c1f23aa_GH0.tar.gz) = 20617 SHA256 (Taymindis-nginx-link-function-3.2.4_GH0.tar.gz) = 20c3679199ba7efe1598f03b2fa0b13591226363c8dd7930d7f02702cd5abada SIZE (Taymindis-nginx-link-function-3.2.4_GH0.tar.gz) = 139656 -SHA256 (openresty-lua-nginx-module-v0.10.22_GH0.tar.gz) = 294d3d4b2d14fda1b8c539ff86f90047d203df861eb9a1ac44ec5c679ef55408 -SIZE (openresty-lua-nginx-module-v0.10.22_GH0.tar.gz) = 690975 +SHA256 (openresty-lua-nginx-module-v0.10.23rc1_GH0.tar.gz) = 8fd7ec5f5b5f638c5115126469744a07c67c0bc8c5a8006a95c98c6e97b0208d +SIZE (openresty-lua-nginx-module-v0.10.23rc1_GH0.tar.gz) = 724095 SHA256 (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 8c2bdbe875e4f5225d0778bfb09a2668f9281d7de6218c7b462a7ba2cee06fe8 SIZE (openresty-memc-nginx-module-v0.19_GH0.tar.gz) = 34654 SHA256 (SpiderLabs-ModSecurity-nginx-v1.0.3_GH0.tar.gz) = 32a42256616cc674dca24c8654397390adff15b888b77eb74e0687f023c8751b diff --git a/www/nginx-devel/files/extra-patch-lua-nginx-module b/www/nginx-devel/files/extra-patch-lua-nginx-module deleted file mode 100644 index 46c7b291c1f2..000000000000 --- a/www/nginx-devel/files/extra-patch-lua-nginx-module +++ /dev/null @@ -1,167 +0,0 @@ -From b6d167cf1a93c0c885c28db5a439f2404874cb26 Mon Sep 17 00:00:00 2001 -From: Hiroaki Nakamura -Date: Tue, 28 Jun 2022 14:37:24 +0900 -Subject: [PATCH] bugfix: update handling of multiple headers changed in nginx - 1.23.0 (#2063) - ---- - src/ngx_http_lua_headers_in.c | 46 ++++++++++++++++++++++++ - src/ngx_http_lua_headers_out.c | 64 ++++++++++++++++++++++++++++++++++ - 2 files changed, 110 insertions(+) - -diff --git a/../lua-nginx-module-0.10.22/src/ngx_http_lua_headers_in.c b/src/ngx_http_lua_headers_in.c -index a55d9cac7..440548140 100644 ---- a/../lua-nginx-module-0.10.22/src/ngx_http_lua_headers_in.c -+++ b/../lua-nginx-module-0.10.22/src/ngx_http_lua_headers_in.c -@@ -152,9 +152,15 @@ static ngx_http_lua_set_header_t ngx_http_lua_set_handlers[] = { - ngx_http_set_builtin_header }, - #endif - -+#if defined(nginx_version) && nginx_version >= 1023000 -+ { ngx_string("Cookie"), -+ offsetof(ngx_http_headers_in_t, cookie), -+ ngx_http_set_builtin_multi_header }, -+#else - { ngx_string("Cookie"), - offsetof(ngx_http_headers_in_t, cookies), - ngx_http_set_builtin_multi_header }, -+#endif - - { ngx_null_string, 0, ngx_http_set_header } - }; -@@ -580,6 +586,45 @@ static ngx_int_t - ngx_http_set_builtin_multi_header(ngx_http_request_t *r, - ngx_http_lua_header_val_t *hv, ngx_str_t *value) - { -+#if defined(nginx_version) && nginx_version >= 1023000 -+ ngx_table_elt_t **headers, **ph, *h; -+ int nelts; -+ -+ headers = (ngx_table_elt_t **) ((char *) &r->headers_in + hv->offset); -+ -+ if (!hv->no_override && *headers != NULL) { -+ nelts = 0; -+ for (h = *headers; h; h = h->next) { -+ nelts++; -+ } -+ -+ *headers = NULL; -+ -+ dd("clear multi-value headers: %d", nelts); -+ } -+ -+ if (ngx_http_set_header_helper(r, hv, value, &h) == NGX_ERROR) { -+ return NGX_ERROR; -+ } -+ -+ if (value->len == 0) { -+ return NGX_OK; -+ } -+ -+ dd("new multi-value header: %p", h); -+ -+ if (*headers) { -+ for (ph = headers; *ph; ph = &(*ph)->next) { /* void */ } -+ *ph = h; -+ -+ } else { -+ *headers = h; -+ } -+ -+ h->next = NULL; -+ -+ return NGX_OK; -+#else - ngx_array_t *headers; - ngx_table_elt_t **v, *h; - -@@ -626,6 +671,7 @@ ngx_http_set_builtin_multi_header(ngx_http_request_t *r, - - *v = h; - return NGX_OK; -+#endif - } - - -diff --git a/../lua-nginx-module-0.10.22/src/ngx_http_lua_headers_out.c b/src/ngx_http_lua_headers_out.c -index 6e9f9c19a..571723d9a 100644 ---- a/../lua-nginx-module-0.10.22/src/ngx_http_lua_headers_out.c -+++ b/../lua-nginx-module-0.10.22/src/ngx_http_lua_headers_out.c -@@ -311,6 +311,69 @@ static ngx_int_t - ngx_http_set_builtin_multi_header(ngx_http_request_t *r, - ngx_http_lua_header_val_t *hv, ngx_str_t *value) - { -+#if defined(nginx_version) && nginx_version >= 1023000 -+ ngx_table_elt_t **headers, *h, *ho, **ph; -+ -+ headers = (ngx_table_elt_t **) ((char *) &r->headers_out + hv->offset); -+ -+ if (hv->no_override) { -+ for (h = *headers; h; h = h->next) { -+ if (!h->hash) { -+ h->value = *value; -+ h->hash = hv->hash; -+ return NGX_OK; -+ } -+ } -+ -+ goto create; -+ } -+ -+ /* override old values (if any) */ -+ -+ if (*headers) { -+ for (h = (*headers)->next; h; h = h->next) { -+ h->hash = 0; -+ h->value.len = 0; -+ } -+ -+ h = *headers; -+ -+ h->value = *value; -+ -+ if (value->len == 0) { -+ h->hash = 0; -+ -+ } else { -+ h->hash = hv->hash; -+ } -+ -+ return NGX_OK; -+ } -+ -+create: -+ -+ for (ph = headers; *ph; ph = &(*ph)->next) { /* void */ } -+ -+ ho = ngx_list_push(&r->headers_out.headers); -+ if (ho == NULL) { -+ return NGX_ERROR; -+ } -+ -+ ho->value = *value; -+ -+ if (value->len == 0) { -+ ho->hash = 0; -+ -+ } else { -+ ho->hash = hv->hash; -+ } -+ -+ ho->key = hv->key; -+ ho->next = NULL; -+ *ph = ho; -+ -+ return NGX_OK; -+#else - ngx_array_t *pa; - ngx_table_elt_t *ho, **ph; - ngx_uint_t i; -@@ -384,6 +447,7 @@ ngx_http_set_builtin_multi_header(ngx_http_request_t *r, - *ph = ho; - - return NGX_OK; -+#endif - } - -