git: a540b918b786 - main - www/nginx-devel: update third-party lua module 0.10.22 -> 0.10.23rc1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 19 Jan 2023 17:10:32 UTC
The branch main has been updated by osa:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a540b918b786e512989ba5c096d343753cc88b42
commit a540b918b786e512989ba5c096d343753cc88b42
Author: Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2023-01-19 17:09:00 +0000
Commit: Sergey A. Osokin <osa@FreeBSD.org>
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 <hnakamur@gmail.com>
-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
- }
-
-