git: 547f06cc6ccd - main - www/nginx-devel: third-party modules management

From: Sergey A. Osokin <osa_at_FreeBSD.org>
Date: Sun, 25 Sep 2022 13:40:01 UTC
The branch main has been updated by osa:

URL: https://cgit.FreeBSD.org/ports/commit/?id=547f06cc6ccd50bd0faccac782562febbce20402

commit 547f06cc6ccd50bd0faccac782562febbce20402
Author:     Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2022-09-25 13:38:02 +0000
Commit:     Sergey A. Osokin <osa@FreeBSD.org>
CommitDate: 2022-09-25 13:39:56 +0000

    www/nginx-devel: third-party modules management
    
    o) update third-party lua module 0.10.21 -> 0.10.22
    o) update third-party http_shibboleth to the recent commit
    
    Bump PORTREVISION.
---
 www/nginx-devel/Makefile                           |  2 +-
 www/nginx-devel/Makefile.extmod                    |  4 ++--
 www/nginx-devel/distinfo                           | 10 +++++-----
 www/nginx-devel/files/extra-patch-lua-nginx-module | 12 ++++++------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index ffe2ef3f631d..f120fb399770 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -1,6 +1,6 @@
 PORTNAME?=	nginx
 PORTVERSION=	1.23.1
-PORTREVISION=	6
+PORTREVISION=	7
 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 91847e3b5ee1..fabb3c6d1c00 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -226,7 +226,7 @@ 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.21:lua
+LUA_GH_TUPLE=		openresty:lua-nginx-module:v0.10.22:lua
 LUA_VARS=		DSO_EXTMODS+=lua
 LUA_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-lua-nginx-module:-p1
 
@@ -297,7 +297,7 @@ SFLOW_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-ngx_http_sflow_config.c \
 			${PATCHDIR}/extra-patch-ngx_http_sflow_config.h \
 			${PATCHDIR}/extra-patch-ngx_http_sflow_module.c
 
-SHIBBOLETH_GH_TUPLE=	nginx-shib:nginx-http-shibboleth:2e99740:shibboleth
+SHIBBOLETH_GH_TUPLE=	nginx-shib:nginx-http-shibboleth:86489a3:shibboleth
 SHIBBOLETH_VARS=	DSO_EXTMODS+=shibboleth
 
 SLOWFS_CACHE_GH_TUPLE=	baysao:ngx_slowfs_cache:d011a18:slowfs_cache
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index b8a3f26c394e..5177335b7b7a 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1663381157
+TIMESTAMP = 1664111770
 SHA256 (nginx-1.23.1.tar.gz) = 5eee1bd1c23e3b9477a45532f1f36ae6178b43d571a9607e6953cef26d5df1e2
 SIZE (nginx-1.23.1.tar.gz) = 1104352
 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.21_GH0.tar.gz) = 9db756000578efaecb43bea4fc6cf631aaa80988d86ffe5d3afeb9927895ffad
-SIZE (openresty-lua-nginx-module-v0.10.21_GH0.tar.gz) = 690938
+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-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
@@ -125,8 +125,8 @@ SHA256 (openresty-set-misc-nginx-module-3937e7b_GH0.tar.gz) = cb3a4675ab6b8741e5
 SIZE (openresty-set-misc-nginx-module-3937e7b_GH0.tar.gz) = 29335
 SHA256 (sflow-nginx-sflow-module-543c72a_GH0.tar.gz) = 95efdb1f6cfd6c32c577707f693eb6795c6f21ae062842bf84fe762d8b842955
 SIZE (sflow-nginx-sflow-module-543c72a_GH0.tar.gz) = 29504
-SHA256 (nginx-shib-nginx-http-shibboleth-2e99740_GH0.tar.gz) = 5a75aeb801331abafd05b512490ab6074fb59c8e88ea3159200de0ae083a4813
-SIZE (nginx-shib-nginx-http-shibboleth-2e99740_GH0.tar.gz) = 23241
+SHA256 (nginx-shib-nginx-http-shibboleth-86489a3_GH0.tar.gz) = e498c0eb1ffa246eb51b1a8ee7a103d64cc73cd8f7cc4236cb63b2d41b7457b5
+SIZE (nginx-shib-nginx-http-shibboleth-86489a3_GH0.tar.gz) = 23611
 SHA256 (baysao-ngx_slowfs_cache-d011a18_GH0.tar.gz) = 6ae8abb01a2aff788e75ec68621cb0159148a6f73730a84b30b0bdbc6cdc1758
 SIZE (baysao-ngx_slowfs_cache-d011a18_GH0.tar.gz) = 11186
 SHA256 (kawakibi-ngx_small_light-2f5e1d0_GH0.tar.gz) = bb7b4943a2db89a6a7020850db123a9e0bea784aa6ce14261aa5f7121f96c3f4
diff --git a/www/nginx-devel/files/extra-patch-lua-nginx-module b/www/nginx-devel/files/extra-patch-lua-nginx-module
index b2a22d723d1f..46c7b291c1f2 100644
--- a/www/nginx-devel/files/extra-patch-lua-nginx-module
+++ b/www/nginx-devel/files/extra-patch-lua-nginx-module
@@ -9,10 +9,10 @@ Subject: [PATCH] bugfix: update handling of multiple headers changed in nginx
  src/ngx_http_lua_headers_out.c | 64 ++++++++++++++++++++++++++++++++++
  2 files changed, 110 insertions(+)
 
-diff --git a/../lua-nginx-module-0.10.21/src/ngx_http_lua_headers_in.c b/src/ngx_http_lua_headers_in.c
+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.21/src/ngx_http_lua_headers_in.c
-+++ b/../lua-nginx-module-0.10.21/src/ngx_http_lua_headers_in.c
+--- 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
@@ -83,10 +83,10 @@ index a55d9cac7..440548140 100644
  }
  
  
-diff --git a/../lua-nginx-module-0.10.21/src/ngx_http_lua_headers_out.c b/src/ngx_http_lua_headers_out.c
+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.21/src/ngx_http_lua_headers_out.c
-+++ b/../lua-nginx-module-0.10.21/src/ngx_http_lua_headers_out.c
+--- 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)