CVS commit: pkgsrc/www/nginx

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Nov 13 10:59:55 UTC 2024

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

Log Message:
nginx: Change naxsi upstream to one that works.

The older nbs-system one causes syntax errors in the config file.  Perform
some cleanup while here.  Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.162 -r1.163 pkgsrc/www/nginx/Makefile
cvs rdiff -u -r1.124 -r1.125 pkgsrc/www/nginx/distinfo
cvs rdiff -u -r1.106 -r1.107 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.162 pkgsrc/www/nginx/Makefile:1.163
--- pkgsrc/www/nginx/Makefile:1.162     Wed Nov 13 10:56:36 2024
+++ pkgsrc/www/nginx/Makefile   Wed Nov 13 10:59:55 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.162 2024/11/13 10:56:36 wiz Exp $
+# $NetBSD: Makefile,v 1.163 2024/11/13 10:59:55 jperkin Exp $
 
 DISTNAME=      nginx-1.26.2
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    www
 MASTER_SITES=  https://nginx.org/download/
 DISTFILES=     ${DEFAULT_DISTFILES}
@@ -120,7 +120,7 @@ do-install:
        ${INSTALL_DATA} ${WRKSRC}/html/index.html ${DESTDIR}${EGDIR}/html/index.html
        ${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
 .if !empty(PKG_OPTIONS:Mnaxsi)
-       ${INSTALL_DATA} ${WRKDIR}/${NAXSI_DISTNAME}/naxsi_config/naxsi_core.rules ${DESTDIR}${EGDIR}/conf
+       ${INSTALL_DATA} ${WRKDIR}/naxsi_rules/naxsi_core.rules ${DESTDIR}${EGDIR}/conf
 .endif
 .if !empty(PKG_OPTIONS:Mperl)
        ${INSTALL_LIB_DIR} ${DESTDIR}${PERL5_INSTALLVENDORARCH}/auto/nginx

Index: pkgsrc/www/nginx/distinfo
diff -u pkgsrc/www/nginx/distinfo:1.124 pkgsrc/www/nginx/distinfo:1.125
--- pkgsrc/www/nginx/distinfo:1.124     Wed Nov 13 10:56:36 2024
+++ pkgsrc/www/nginx/distinfo   Wed Nov 13 10:59:55 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.124 2024/11/13 10:56:36 wiz Exp $
+$NetBSD: distinfo,v 1.125 2024/11/13 10:59:55 jperkin Exp $
 
 BLAKE2s (1ac658f44afc9240f13e9d6c1c9d5a7816299e8e.patch) = 6c3880dc781886fb1f4190fa9b8f1459246cc5d157aaed3b9a24cc7abaf7c5a1
 SHA512 (1ac658f44afc9240f13e9d6c1c9d5a7816299e8e.patch) = b780bea19736f5db844f11b0b407c159cc6ba7326b50177cefde6f8ee875238d3618e50d29b132a66fe98103cb5656f33895e5989d98d4cdc26cfeaa7f12865f
@@ -21,9 +21,9 @@ Size (headers-more-nginx-module-0.37.tar
 BLAKE2s (lua-nginx-module-0.10.26.tar.gz) = a8b1a1209f11e15165db96a8459d5639debaf79e83231cf3d2640b8dcbaae20b
 SHA512 (lua-nginx-module-0.10.26.tar.gz) = 9abf00844ef00ce1dc5ff08d6fe4ddccf843f2ad2de6fd450854b38a66b45add71e814205dba9b19225b9165e67eb93578e83e5fe37af4e0c891e61e6a6bfb3d
 Size (lua-nginx-module-0.10.26.tar.gz) = 745785 bytes
-BLAKE2s (nbs-system-naxsi-d714f16_GH.tar.gz) = ca56821b8bfac03429fc8adaf30302ac70c31b48b865918139ecdacb24eb4156
-SHA512 (nbs-system-naxsi-d714f16_GH.tar.gz) = 84abd90f3971450b9413546809332e263c4332b625a0b51f8b342adb407e1e5bc81a2b0b75e2d50e87d63d20d0c3f271391c9d4821f0d01069a133b066bfb05b
-Size (nbs-system-naxsi-d714f16_GH.tar.gz) = 236940 bytes
+BLAKE2s (naxsi-1.6-src-with-deps.tar.gz) = 77344405cc235d38328223d325194eee58d0124271a9fcd785de3477a8db52ce
+SHA512 (naxsi-1.6-src-with-deps.tar.gz) = c41e1a51b5642af1cb640b15e9415e073692d7a3baf4d3fceae260cdf9af2a976b3090b40756ce10e162bec6efc9fbc7306569e173bfbe4aab4ac7bcbdd8a075
+Size (naxsi-1.6-src-with-deps.tar.gz) = 3352718 bytes
 BLAKE2s (nchan-1.3.6.tar.gz) = 1409be69d5589d3643a7cb1f3dd1e4bc8d58c4be801234d52738090c04469255
 SHA512 (nchan-1.3.6.tar.gz) = 0f1c25d460dcf4e3407a1ef4bfcefe17eba7b0ff250f267e5bde0eb4298e9596c1e6992fc58fe35d8420888065353bf3883a1f1bbc5e607a00128992eb1ee6d2
 Size (nchan-1.3.6.tar.gz) = 761436 bytes

Index: pkgsrc/www/nginx/options.mk
diff -u pkgsrc/www/nginx/options.mk:1.106 pkgsrc/www/nginx/options.mk:1.107
--- pkgsrc/www/nginx/options.mk:1.106   Wed Nov 13 10:56:36 2024
+++ pkgsrc/www/nginx/options.mk Wed Nov 13 10:59:55 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.106 2024/11/13 10:56:36 wiz Exp $
+# $NetBSD: options.mk,v 1.107 2024/11/13 10:59:55 jperkin Exp $
 
 CODELOAD_SITE_GITHUB=          https://codeload.github.com/
 
@@ -33,16 +33,12 @@ _addextmod=         add-module
 
 # documentation says naxsi must be the first module
 .if !empty(PKG_OPTIONS:Mnaxsi) || make(makesum) || make(mdi) || make(distclean)
-NAXSI_GH_ACCOUNT=              nbs-system
-NAXSI_GH_PROJECT=              naxsi
-NAXSI_VERSION=                 d714f16
-NAXSI_DISTNAME=                        ${NAXSI_GH_PROJECT}-${NAXSI_VERSION}
-NAXSI_DISTFILE=                        ${NAXSI_GH_ACCOUNT}-${NAXSI_DISTNAME}_GH.tar.gz
-SITES.${NAXSI_DISTFILE}=       -${CODELOAD_SITE_GITHUB:=${NAXSI_GH_ACCOUNT}/${NAXSI_GH_PROJECT}/tar.gz/${NAXSI_VERSION}?dummy=${NAXSI_DISTFILE}}
+NAXSI_VERSION=                 1.6
+NAXSI_DISTFILE=                        naxsi-${NAXSI_VERSION}-src-with-deps.tar.gz
+SITES.${NAXSI_DISTFILE}=       ${MASTER_SITE_GITHUB:=wargio/naxsi/releases/download/${NAXSI_VERSION}/}
 DISTFILES+=                    ${NAXSI_DISTFILE}
 PLIST.naxsi=                   yes
 DSO_EXTMODS+=                  naxsi
-NAXSI_SUBDIR=                  /naxsi_src
 .endif
 
 .if !empty(PKG_OPTIONS:Mdebug)