summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorosa <osa@pkgsrc.org>2022-09-25 15:10:11 +0000
committerosa <osa@pkgsrc.org>2022-09-25 15:10:11 +0000
commit3c73ae0eb4dadd58c852498753ddbdd949f5aba3 (patch)
tree8392703841b600c4ddf6dda6a5e25e9573a51450
parenta810eb5c11663ce10eb4d2b8c9b269fca29b7564 (diff)
downloadpkgsrc-3c73ae0eb4dadd58c852498753ddbdd949f5aba3.tar.gz
www/nginx*: update third-party lua module 0.10.21 -> 0.10.22
ChangeLog: https://github.com/openresty/lua-nginx-module/compare/v0.10.21...v0.10.22 Bump PKGREVISIONs.
-rw-r--r--www/nginx-devel/Makefile4
-rw-r--r--www/nginx-devel/distinfo8
-rw-r--r--www/nginx-devel/options.mk4
-rw-r--r--www/nginx-devel/patches/extra-patch-lua-nginx-module12
-rw-r--r--www/nginx/Makefile4
-rw-r--r--www/nginx/distinfo8
-rw-r--r--www/nginx/options.mk4
7 files changed, 22 insertions, 22 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 6320be1ed8d..1acc15a5fc2 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.89 2022/08/30 18:00:49 osa Exp $
+# $NetBSD: Makefile,v 1.90 2022/09/25 15:10:11 osa Exp $
DISTNAME= nginx-1.23.1
-PKGREVISION= 1
+PKGREVISION= 2
PKGNAME= ${DISTNAME:S/-/-devel-/1}
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index a6003a42d30..326c20303ca 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.83 2022/08/30 18:00:49 osa Exp $
+$NetBSD: distinfo,v 1.84 2022/09/25 15:10:11 osa Exp $
BLAKE2s (array-var-nginx-module-0.05.tar.gz) = 2f9af1e0eb209b7c20aa58cd8ec2afb1eb1cc122c5f4ea169e34131c463c1c26
SHA512 (array-var-nginx-module-0.05.tar.gz) = 7c9fa9b76bc7cd2473ceae6d5ffb8de26993be9293ea967908d6c4550e086affa7016df4c936fb0b79f1142dc0aa1a5f2058d417e6433b5a3497a45d7e866e84
@@ -12,9 +12,9 @@ Size (encrypted-session-nginx-module-0.09.tar.gz) = 11847 bytes
BLAKE2s (form-input-nginx-module-0.12.tar.gz) = b08fc95c3e15bfdc0846e2d1e8157171954f353bd301f4ac4aca56113620e91d
SHA512 (form-input-nginx-module-0.12.tar.gz) = 1c5c5ab74156cac09da44a2dcdd84f7c03c9919a23a847e63613e00e3781ecd73d5ad12446174b4fdef9d064257a31570a8dbcccc00d8266f7048e3dcde0362e
Size (form-input-nginx-module-0.12.tar.gz) = 11090 bytes
-BLAKE2s (lua-nginx-module-0.10.21.tar.gz) = 26e07caf6902c84ee45e1a11aa6f516065259de68ee9819bb521345a4d99311a
-SHA512 (lua-nginx-module-0.10.21.tar.gz) = c7594be48a3a5a8cc7bbda9288cb836c4c854ad22f91766dba944316d471ab8857a6b6a52813eb041af81939df73614db54ccd3ed35af87036d76317ebbe2e97
-Size (lua-nginx-module-0.10.21.tar.gz) = 690938 bytes
+BLAKE2s (lua-nginx-module-0.10.22.tar.gz) = 745f552a68bdccc5a3ea869970ebaad7dcf7c850b41124233871ea2168d58761
+SHA512 (lua-nginx-module-0.10.22.tar.gz) = 03e2504e8bc80efaf4af819ed9345285ca42ceecc647eda225e3be3b1e3617435f3949aa8034341955d8cce4826af9d1a8615b914109834f6b6b20e78be35ef9
+Size (lua-nginx-module-0.10.22.tar.gz) = 690975 bytes
BLAKE2s (nbs-system-naxsi-29793dc_GH.tar.gz) = 561b875a1d01bef80a45580268a56f90ef7dfd74acfa01a7ab1ab667486e4abb
SHA512 (nbs-system-naxsi-29793dc_GH.tar.gz) = 8c943daa14ee9a0d308bf6425e28123860bdd5db269ad0e481126915538fa3fcdf6607e1692b7819c9eec4a1206ec19060f5b85ee11d93e713f60a8870fc5d26
Size (nbs-system-naxsi-29793dc_GH.tar.gz) = 236932 bytes
diff --git a/www/nginx-devel/options.mk b/www/nginx-devel/options.mk
index f0e164ca744..35363cc146e 100644
--- a/www/nginx-devel/options.mk
+++ b/www/nginx-devel/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2022/08/30 18:00:49 osa Exp $
+# $NetBSD: options.mk,v 1.13 2022/09/25 15:10:11 osa Exp $
CODELOAD_SITE_GITHUB= https://codeload.github.com/
@@ -164,7 +164,7 @@ DISTFILES+= ${NDK_DISTFILE}
.endif
.if !empty(PKG_OPTIONS:Mluajit) || make(makesum) || make(mdi) || make(distclean)
-LUA_VERSION= 0.10.21
+LUA_VERSION= 0.10.22
LUA_DISTNAME= lua-nginx-module-${LUA_VERSION}
LUA_DISTFILE= ${LUA_DISTNAME}.tar.gz
SITES.${LUA_DISTFILE}= -${MASTER_SITE_GITHUB:=openresty/lua-nginx-module/archive/}v${LUA_VERSION}.tar.gz
diff --git a/www/nginx-devel/patches/extra-patch-lua-nginx-module b/www/nginx-devel/patches/extra-patch-lua-nginx-module
index b2a22d723d1..46c7b291c1f 100644
--- a/www/nginx-devel/patches/extra-patch-lua-nginx-module
+++ b/www/nginx-devel/patches/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)
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index ba4b5766582..2be85b725bd 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.123 2022/08/30 18:00:49 osa Exp $
+# $NetBSD: Makefile,v 1.124 2022/09/25 15:10:11 osa Exp $
DISTNAME= nginx-1.22.0
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= www
MASTER_SITES= http://nginx.org/download/
DISTFILES= ${DEFAULT_DISTFILES}
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 7d917c7c400..f93d042d7f7 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.100 2022/08/30 18:00:49 osa Exp $
+$NetBSD: distinfo,v 1.101 2022/09/25 15:10:11 osa Exp $
BLAKE2s (array-var-nginx-module-0.05.tar.gz) = 2f9af1e0eb209b7c20aa58cd8ec2afb1eb1cc122c5f4ea169e34131c463c1c26
SHA512 (array-var-nginx-module-0.05.tar.gz) = 7c9fa9b76bc7cd2473ceae6d5ffb8de26993be9293ea967908d6c4550e086affa7016df4c936fb0b79f1142dc0aa1a5f2058d417e6433b5a3497a45d7e866e84
@@ -15,9 +15,9 @@ Size (form-input-nginx-module-0.12.tar.gz) = 11090 bytes
BLAKE2s (headers-more-nginx-module-0.33.tar.gz) = f5eeb6e12026236b9d4ab78866e33d5a81ed5f86344641407ce3a4f8b3310afd
SHA512 (headers-more-nginx-module-0.33.tar.gz) = 13165b1b8d4be281b8bd2404fa48d456013d560bace094c81da08a35dc6a4f025a809a3ae3a42be6bbf67abbcbe41e0730aba06f905220f3baeb01e1192a7d37
Size (headers-more-nginx-module-0.33.tar.gz) = 28130 bytes
-BLAKE2s (lua-nginx-module-0.10.21.tar.gz) = 26e07caf6902c84ee45e1a11aa6f516065259de68ee9819bb521345a4d99311a
-SHA512 (lua-nginx-module-0.10.21.tar.gz) = c7594be48a3a5a8cc7bbda9288cb836c4c854ad22f91766dba944316d471ab8857a6b6a52813eb041af81939df73614db54ccd3ed35af87036d76317ebbe2e97
-Size (lua-nginx-module-0.10.21.tar.gz) = 690938 bytes
+BLAKE2s (lua-nginx-module-0.10.22.tar.gz) = 745f552a68bdccc5a3ea869970ebaad7dcf7c850b41124233871ea2168d58761
+SHA512 (lua-nginx-module-0.10.22.tar.gz) = 03e2504e8bc80efaf4af819ed9345285ca42ceecc647eda225e3be3b1e3617435f3949aa8034341955d8cce4826af9d1a8615b914109834f6b6b20e78be35ef9
+Size (lua-nginx-module-0.10.22.tar.gz) = 690975 bytes
BLAKE2s (naxsi-1.3.tar.gz) = d3c819d8fbd2a896c56138f028b92fa4b26a51168ff24334f76e3d1d07626927
SHA512 (naxsi-1.3.tar.gz) = d7aac69b5eceeb1b0db4741201159ade1e0e7f6f7c3e8c4afa2f8959c6c00c3b5285d5185747c2fb0b1400efda02e96799836315e7e492bb4a059b14acb2142d
Size (naxsi-1.3.tar.gz) = 235626 bytes
diff --git a/www/nginx/options.mk b/www/nginx/options.mk
index c67ec490dc3..6ae1a524065 100644
--- a/www/nginx/options.mk
+++ b/www/nginx/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.85 2022/08/30 18:00:49 osa Exp $
+# $NetBSD: options.mk,v 1.86 2022/09/25 15:10:11 osa Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.nginx
PKG_SUPPORTED_OPTIONS= array-var auth-request cache-purge dav debug
@@ -160,7 +160,7 @@ DISTFILES+= ${NDK_DISTFILE}
.endif
.if !empty(PKG_OPTIONS:Mluajit) || make(makesum) || make(mdi) || make(distclean)
-LUA_VERSION= 0.10.21
+LUA_VERSION= 0.10.22
LUA_DISTNAME= lua-nginx-module-${LUA_VERSION}
LUA_DISTFILE= ${LUA_DISTNAME}.tar.gz
SITES.${LUA_DISTFILE}= -${MASTER_SITE_GITHUB:=openresty/lua-nginx-module/archive/}v${LUA_VERSION}.tar.gz