CVS commit: pkgsrc/www/nginx

["Juraj Lutter" <otis%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   otis
Date:           Wed Dec 16 20:32:01 UTC 2020

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

Log Message:
nginx: Update naxsi to 1.3

Changes for naxsi 1.3:
  - Fixed regression on FILE_EXT confusion
  - Documented id 19 and 20 to rules


To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 pkgsrc/www/nginx/Makefile
cvs rdiff -u -r1.82 -r1.83 pkgsrc/www/nginx/distinfo
cvs rdiff -u -r1.66 -r1.67 pkgsrc/www/nginx/options.mk

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

Modified files:

Index: pkgsrc/www/nginx/Makefile
diff -u pkgsrc/www/nginx/Makefile:1.96 pkgsrc/www/nginx/Makefile:1.97
--- pkgsrc/www/nginx/Makefile:1.96      Wed Dec  2 10:34:09 2020
+++ pkgsrc/www/nginx/Makefile   Wed Dec 16 20:32:01 2020
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.96 2020/12/02 10:34:09 otis Exp $
+# $NetBSD: Makefile,v 1.97 2020/12/16 20:32:01 otis Exp $
 
 DISTNAME=      nginx-1.18.0
 
 MAINTAINER=    joerg%NetBSD.org@localhost
 
-PKGREVISION= 7
+PKGREVISION= 8
 .include "../../www/nginx/Makefile.common"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/nginx/distinfo
diff -u pkgsrc/www/nginx/distinfo:1.82 pkgsrc/www/nginx/distinfo:1.83
--- pkgsrc/www/nginx/distinfo:1.82      Wed Dec  2 10:34:09 2020
+++ pkgsrc/www/nginx/distinfo   Wed Dec 16 20:32:01 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.82 2020/12/02 10:34:09 otis Exp $
+$NetBSD: distinfo,v 1.83 2020/12/16 20:32:01 otis Exp $
 
 SHA1 (array-var-nginx-module-0.05.tar.gz) = c69fac77814947009ab783a471783b3c95a63a26
 RMD160 (array-var-nginx-module-0.05.tar.gz) = 89bd4efc04864e3e90781588a337338951ec8733
@@ -24,10 +24,10 @@ SHA1 (lua-nginx-module-0.10.19.tar.gz) =
 RMD160 (lua-nginx-module-0.10.19.tar.gz) = cd8171fcadbd8f77692ab63b35d7ec66ca66983b
 SHA512 (lua-nginx-module-0.10.19.tar.gz) = 6b258bdcb45f99f9cec3df14fa6747704ab1f0005f8a2ccd4440f8ec477e3dcbf6026e1acffc9d5fecb79605248168a77bd2a26d67c98c7d5cc336f9474ef68c
 Size (lua-nginx-module-0.10.19.tar.gz) = 666942 bytes
-SHA1 (naxsi-1.2.tar.gz) = 4060c6c15668d59e76790e5850fceef7ce8c11d5
-RMD160 (naxsi-1.2.tar.gz) = 8d55803633efc679ecf1c0e6d9efe4f464346d9f
-SHA512 (naxsi-1.2.tar.gz) = 517849b9578d4ffb13b88f17d4c6818ed3b1970165609a2100daa35eb0a9327fe225710bf543be5aedad1d6078f2d4a8b5982738b12aaf51380fa71976b93885
-Size (naxsi-1.2.tar.gz) = 233496 bytes
+SHA1 (naxsi-1.3.tar.gz) = 53b347687ade9a54f19c0bf41f6c63ae56901789
+RMD160 (naxsi-1.3.tar.gz) = c8c9190fcf4e93c504e8815a813c30ee697daded
+SHA512 (naxsi-1.3.tar.gz) = d7aac69b5eceeb1b0db4741201159ade1e0e7f6f7c3e8c4afa2f8959c6c00c3b5285d5185747c2fb0b1400efda02e96799836315e7e492bb4a059b14acb2142d
+Size (naxsi-1.3.tar.gz) = 235626 bytes
 SHA1 (nginx-1.18.0.tar.gz) = 47b2c5ccd12e2a7088b03d629ff6b9ab18215180
 RMD160 (nginx-1.18.0.tar.gz) = 224ad8782243ddd1f702bad11f2da38b60e31a38
 SHA512 (nginx-1.18.0.tar.gz) = 8c21eeb62ab6e32e436932500f700bd2fb99fd2d29e43c08a5bfed4714c189c29c7141db551fcd5d2437303b7439f71758f7407dfd3e801e704e45e7daa78ddb

Index: pkgsrc/www/nginx/options.mk
diff -u pkgsrc/www/nginx/options.mk:1.66 pkgsrc/www/nginx/options.mk:1.67
--- pkgsrc/www/nginx/options.mk:1.66    Wed Dec  2 10:34:09 2020
+++ pkgsrc/www/nginx/options.mk Wed Dec 16 20:32:01 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.66 2020/12/02 10:34:09 otis Exp $
+# $NetBSD: options.mk,v 1.67 2020/12/16 20:32:01 otis Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.nginx
 PKG_SUPPORTED_OPTIONS= array-var auth-request cache-purge dav debug
@@ -18,7 +18,7 @@ PLIST_VARS+=          naxsi perl uwsgi
 
 # documentation says naxsi must be the first module
 .if !empty(PKG_OPTIONS:Mnaxsi) || make(makesum) || make(mdi) || make(distclean)
-NAXSI_VERSION=                 1.2
+NAXSI_VERSION=                 1.3
 NAXSI_DISTNAME=                        naxsi-${NAXSI_VERSION}
 NAXSI_DISTFILE=                        ${NAXSI_DISTNAME}.tar.gz
 SITES.${NAXSI_DISTFILE}=       -${MASTER_SITE_GITHUB:=nbs-system/naxsi/archive/}${NAXSI_VERSION}.tar.gz