www/nginx: update 1.21.6 -> 1.22.0

Also, update third-party modules: o) http_push from 1.2.12 to 1.2.15 o) lua from 0.10.20 to 0.10.21 o) njs from 0.7.3 to 0.7.4
NetBSD · May 25, 2022 · ed1c7d5 · ed1c7d5
1 parent 2c82900
commit ed1c7d5
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 20 deletions.
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.80 2022/05/10 18:08:52 nia Exp $
+# $NetBSD: Makefile,v 1.81 2022/05/25 11:02:14 osa Exp $
 
-DISTNAME=	nginx-1.21.6
-PKGREVISION=	9
+DISTNAME=	nginx-1.22.0
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/
 DISTFILES=	${DEFAULT_DISTFILES}

diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.76 2022/04/12 13:15:28 osa Exp $
+$NetBSD: distinfo,v 1.77 2022/05/25 11:02:14 osa Exp $
 
 BLAKE2s (array-var-nginx-module-0.05.tar.gz) = 2f9af1e0eb209b7c20aa58cd8ec2afb1eb1cc122c5f4ea169e34131c463c1c26
 SHA512 (array-var-nginx-module-0.05.tar.gz) = 7c9fa9b76bc7cd2473ceae6d5ffb8de26993be9293ea967908d6c4550e086affa7016df4c936fb0b79f1142dc0aa1a5f2058d417e6433b5a3497a45d7e866e84
@@ -15,18 +15,18 @@ 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.20.tar.gz) = fc165f5b7495dc54ecbf43666fa6feda733c0c0776d816353bec6f8458ec03f6
-SHA512 (lua-nginx-module-0.10.20.tar.gz) = f11154d82ed9e15fc156971318f8e81fd873ec887370921c58da777061caf00dfb51b2eca3afba3b82d2330f285508f9885649a993c6091e1283f9d2179d10af
-Size (lua-nginx-module-0.10.20.tar.gz) = 668516 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 (naxsi-1.3.tar.gz) = d3c819d8fbd2a896c56138f028b92fa4b26a51168ff24334f76e3d1d07626927
 SHA512 (naxsi-1.3.tar.gz) = d7aac69b5eceeb1b0db4741201159ade1e0e7f6f7c3e8c4afa2f8959c6c00c3b5285d5185747c2fb0b1400efda02e96799836315e7e492bb4a059b14acb2142d
 Size (naxsi-1.3.tar.gz) = 235626 bytes
-BLAKE2s (nchan-1.2.12.tar.gz) = 1505dd8fa8562643e0b7cfb1c34e12c6044bd604eced52eb6d968ebca9b39d75
-SHA512 (nchan-1.2.12.tar.gz) = 1378ecf7499603319f432a8ea4693f0bc7a18713cd02b7ed9eecd8dfa76b54dcef475b7b028ddfd2750dcb01e2ac73f8605a96950398fbea31ffa8b22fcacfc0
-Size (nchan-1.2.12.tar.gz) = 716150 bytes
-BLAKE2s (nginx-1.21.6.tar.gz) = cc9128aaf36be8c2d678588db95cd623b67746683364729f13e645a0192ed4dd
-SHA512 (nginx-1.21.6.tar.gz) = 10b0cdd13b26687104bf11e6b850fd851e9d8881bdf67f72c062d956e661da4d70482e6ec3123405b324ad7ed821a8bcc67b742dce9f59e972407fa437ddcad4
-Size (nginx-1.21.6.tar.gz) = 1073364 bytes
+BLAKE2s (nchan-1.2.15.tar.gz) = bfc1c98de14aeb709fd0309b5350d885c62ed072867fe289e18dffedd5371eb4
+SHA512 (nchan-1.2.15.tar.gz) = 1323a285724052dd08a317fd25cbf0061b9b7afb73bf922a9a90f4317391eb0984dc5f4160769da0bd7f68a1627832c500d434f967fc5d7f759cb3c0260d1dbb
+Size (nchan-1.2.15.tar.gz) = 734488 bytes
+BLAKE2s (nginx-1.22.0.tar.gz) = 4d1b3995f370925e767fefb1a8744db73f77ef7089479e7f765c136719bda370
+SHA512 (nginx-1.22.0.tar.gz) = 074782dba9cd5f8f493fbb57e20bda6dc9171814d919a47ee9f825d93f12c9f9d496e25d063c983191b55ad6a236bcef252ce16ecc1d253dc8b23433557559b1
+Size (nginx-1.22.0.tar.gz) = 1073322 bytes
 BLAKE2s (nginx-dav-ext-module-3.0.0.tar.gz) = 8e823ffd605d4fca00eb3ca92a0954ca35fb178397e0b990fea7d47580ee582f
 SHA512 (nginx-dav-ext-module-3.0.0.tar.gz) = d0193ba90f1ef46c4e470630c4394bdf99d94fd2e3bd8be6cb2ba1655ec59944b1269025f032b79dc2c6dad366e54389ef6a6da2ddeb91d535a4027f2162fbde
 Size (nginx-dav-ext-module-3.0.0.tar.gz) = 14558 bytes
@@ -42,9 +42,9 @@ Size (ngx_devel_kit-0.3.1.tar.gz) = 66542 bytes
 BLAKE2s (ngx_http_geoip2_module-3.3.tar.gz) = cfa0bbf88d6b5f21129fc9f653d30516d782ca474a68159d367017b96e05b330
 SHA512 (ngx_http_geoip2_module-3.3.tar.gz) = 06963b598c54e22d75ce837fb222f5aa6c9494c29e558ff46f1205d7159fc305414bfac4ed3288c836dcbf7628d92f26458e1992d34fc2f4b73275a32847bdc0
 Size (ngx_http_geoip2_module-3.3.tar.gz) = 8509 bytes
-BLAKE2s (njs-0.7.3.tar.gz) = bc5fc802c6eadffe1a125c5cfe25c702260c7c874aa7b91b222b23f7763a4a53
-SHA512 (njs-0.7.3.tar.gz) = 73e78ebfe0060699e3d9fc4a777245a3630f14b5fe67eee205f03699f76850b4de6f6a4185e1054ddd59014c3fe2801962993a8f50f841ce8e6d138d0d841086
-Size (njs-0.7.3.tar.gz) = 586271 bytes
+BLAKE2s (njs-0.7.4.tar.gz) = e8ff0c01aa86b983c5bde06f932f6f45ff20e8dd112c48f42672f00f3e5e5aae
+SHA512 (njs-0.7.4.tar.gz) = a6dbdcc38b9c14bbaffb782c9adf04c57806ac2c0c8fb2a07e573db0e60e38b670668a88498cb609e22b1ea0bf67ec4c343e9965ff33374172c9a10521365aff
+Size (njs-0.7.4.tar.gz) = 589203 bytes
 BLAKE2s (set-misc-nginx-module-0.33.tar.gz) = 306eb7a96ce5650c7e97a91e9cdba48d154d10cf6445d31193ffab889054d893
 SHA512 (set-misc-nginx-module-0.33.tar.gz) = 1ff4c947538a5bd5f9d6adcd87b37f2702f5cc90e3342bc08359cbe8f290b705a3a2daa3dedfb1df3ce4bc19478c8fcac07081c4a53a804fc2862d50078278dc
 Size (set-misc-nginx-module-0.33.tar.gz) = 30084 bytes

diff --git a/www/nginx-devel/options.mk b/www/nginx-devel/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2022/05/10 18:08:52 nia Exp $
+# $NetBSD: options.mk,v 1.6 2022/05/25 11:02:14 osa Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.nginx-devel
 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.20
+LUA_VERSION=		0.10.21
 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
@@ -252,7 +252,7 @@ CONFIGURE_ARGS+=	--without-http_uwsgi_module
 .endif
 
 .if !empty(PKG_OPTIONS:Mpush) || make(makesum) || make(mdi) || make(distclean)
-PUSH_VERSION=		1.2.12
+PUSH_VERSION=		1.2.15
 PUSH_DISTNAME=		nchan-${PUSH_VERSION}
 PUSH_DISTFILE=		${PUSH_DISTNAME}.tar.gz
 SITES.${PUSH_DISTFILE}=	-${MASTER_SITE_GITHUB:=slact/nchan/archive/}v${PUSH_VERSION}.tar.gz
@@ -328,7 +328,7 @@ PLIST.rtmp=		yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mnjs) || make(makesum) || make(mdi) || make(distclean)
-NJS_VERSION=		0.7.3
+NJS_VERSION=		0.7.4
 NJS_DISTNAME=		njs-${NJS_VERSION}
 NJS_DISTFILE=		${NJS_DISTNAME}.tar.gz
 NJS_CONFIGURE_ARGS=	--no-pcre2