Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1657795164209720"
MIME-Version: 1.0
Date: Thu, 14 Jul 2022 10:39:24 +0000
From: "Sergey A. Osokin" <osa@netbsd.org>
Subject: CVS commit: pkgsrc/www/nginx
To: pkgsrc-changes@NetBSD.org
Reply-To: osa@netbsd.org
Message-Id: <20220714103924.93027FB1A@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1657795164209720
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	osa
Date:		Thu Jul 14 10:39:24 UTC 2022

Modified Files:
	pkgsrc/www/nginx: Makefile PLIST distinfo options.mk

Log Message:
www/nginx: update NGINX JavaScript module to 0.7.5

Fix PLIST for the third-party upload module.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 pkgsrc/www/nginx/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/www/nginx/PLIST
cvs rdiff -u -r1.96 -r1.97 pkgsrc/www/nginx/distinfo
cvs rdiff -u -r1.81 -r1.82 pkgsrc/www/nginx/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1657795164209720
Content-Disposition: inline
Content-Length: 4580
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/www/nginx/Makefile
diff -u pkgsrc/www/nginx/Makefile:1.118 pkgsrc/www/nginx/Makefile:1.119
--- pkgsrc/www/nginx/Makefile:1.118	Tue Jun 28 11:37:07 2022
+++ pkgsrc/www/nginx/Makefile	Thu Jul 14 10:39:24 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.118 2022/06/28 11:37:07 wiz Exp $
+# $NetBSD: Makefile,v 1.119 2022/07/14 10:39:24 osa Exp $
 
 DISTNAME=	nginx-1.22.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/
 DISTFILES=	${DEFAULT_DISTFILES}

Index: pkgsrc/www/nginx/PLIST
diff -u pkgsrc/www/nginx/PLIST:1.14 pkgsrc/www/nginx/PLIST:1.15
--- pkgsrc/www/nginx/PLIST:1.14	Mon Mar 14 02:49:09 2022
+++ pkgsrc/www/nginx/PLIST	Thu Jul 14 10:39:24 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2022/03/14 02:49:09 osa Exp $
+@comment $NetBSD: PLIST,v 1.15 2022/07/14 10:39:24 osa Exp $
 ${PLIST.dso}${PLIST.arrayvar}libexec/nginx/ngx_http_array_var_module.so
 ${PLIST.dso}${PLIST.cprg}libexec/nginx/ngx_http_cache_purge_module.so
 ${PLIST.dso}${PLIST.dav}libexec/nginx/ngx_http_dav_ext_module.so
@@ -20,6 +20,7 @@ ${PLIST.dso}${PLIST.perl}libexec/nginx/n
 ${PLIST.dso}${PLIST.rtmp}libexec/nginx/ngx_rtmp_module.so
 ${PLIST.dso}${PLIST.setmisc}libexec/nginx/ngx_http_set_misc_module.so
 ${PLIST.dso}${PLIST.stream}libexec/nginx/ngx_stream_module.so
+${PLIST.dso}${PLIST.upload}libexec/nginx/ngx_http_upload_module.so
 ${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/nginx/nginx.${SOEXT}
 ${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/nginx.pm
 man/man8/nginx.8

Index: pkgsrc/www/nginx/distinfo
diff -u pkgsrc/www/nginx/distinfo:1.96 pkgsrc/www/nginx/distinfo:1.97
--- pkgsrc/www/nginx/distinfo:1.96	Wed May 25 10:48:47 2022
+++ pkgsrc/www/nginx/distinfo	Thu Jul 14 10:39:24 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.96 2022/05/25 10:48:47 osa Exp $
+$NetBSD: distinfo,v 1.97 2022/07/14 10:39:24 osa Exp $
 
 BLAKE2s (array-var-nginx-module-0.05.tar.gz) = 2f9af1e0eb209b7c20aa58cd8ec2afb1eb1cc122c5f4ea169e34131c463c1c26
 SHA512 (array-var-nginx-module-0.05.tar.gz) = 7c9fa9b76bc7cd2473ceae6d5ffb8de26993be9293ea967908d6c4550e086affa7016df4c936fb0b79f1142dc0aa1a5f2058d417e6433b5a3497a45d7e866e84
@@ -45,9 +45,9 @@ Size (ngx_devel_kit-0.3.1.tar.gz) = 6654
 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.4.tar.gz) = e8ff0c01aa86b983c5bde06f932f6f45ff20e8dd112c48f42672f00f3e5e5aae
-SHA512 (njs-0.7.4.tar.gz) = a6dbdcc38b9c14bbaffb782c9adf04c57806ac2c0c8fb2a07e573db0e60e38b670668a88498cb609e22b1ea0bf67ec4c343e9965ff33374172c9a10521365aff
-Size (njs-0.7.4.tar.gz) = 589203 bytes
+BLAKE2s (njs-0.7.5.tar.gz) = 03706004202f68f9095eed4bb78e9700258d7a363454a38222dc9977197ec4c4
+SHA512 (njs-0.7.5.tar.gz) = e33dbb285ff6216acddcd213fdbd73ffadd5730680bcec742b1598fa57b4d100da32c913b1c2648b3e87867fc29bf11075d70fa5655f85c62e42eb0a48d177f1
+Size (njs-0.7.5.tar.gz) = 592998 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

Index: pkgsrc/www/nginx/options.mk
diff -u pkgsrc/www/nginx/options.mk:1.81 pkgsrc/www/nginx/options.mk:1.82
--- pkgsrc/www/nginx/options.mk:1.81	Wed May 25 13:57:02 2022
+++ pkgsrc/www/nginx/options.mk	Thu Jul 14 10:39:24 2022
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.81 2022/05/25 13:57:02 osa Exp $
+# $NetBSD: options.mk,v 1.82 2022/07/14 10:39:24 osa Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.nginx
 PKG_SUPPORTED_OPTIONS=	array-var auth-request cache-purge dav debug
@@ -19,7 +19,7 @@ PKG_OPTIONS_GROUP.pcre=		pcre pcre2
 
 PLIST_VARS+=		arrayvar cprg dav dso echo encses forminput geoip2
 PLIST_VARS+=		headmore imagefilter lua mail naxsi nchan ndk njs
-PLIST_VARS+=		perl rtmp setmisc stream uwsgi
+PLIST_VARS+=		perl rtmp setmisc stream upload uwsgi
 
 .include "../../mk/bsd.options.mk"
 
@@ -328,7 +328,7 @@ PLIST.rtmp=		yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mnjs) || make(makesum) || make(mdi) || make(distclean)
-NJS_VERSION=		0.7.4
+NJS_VERSION=		0.7.5
 NJS_DISTNAME=		njs-${NJS_VERSION}
 NJS_DISTFILE=		${NJS_DISTNAME}.tar.gz
 NJS_CONFIGURE_ARGS=	--no-pcre2


--_----------=_1657795164209720--