CVS commit: pkgsrc/www/freenginx

["Sergey A. Osokin" <osa%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   osa
Date:           Wed Jul  8 19:19:01 UTC 2026

Modified Files:
        pkgsrc/www/freenginx: Makefile distinfo options.mk
Added Files:
        pkgsrc/www/freenginx/patches: extra-patch-njs-quickjs
Removed Files:
        pkgsrc/www/freenginx/patches: extra-patch-auto-quickjs

Log Message:
www/freenginx: third-party modules management (+)

Update cache_purge module and njs modules to their recent versions (merge
changes from www/freenginx-devel).

Bump PKGREVISION.

Sponsored by:   tipi.work


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/www/freenginx/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/freenginx/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/freenginx/options.mk
cvs rdiff -u -r1.3 -r0 pkgsrc/www/freenginx/patches/extra-patch-auto-quickjs
cvs rdiff -u -r0 -r1.1 pkgsrc/www/freenginx/patches/extra-patch-njs-quickjs

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

Modified files:

Index: pkgsrc/www/freenginx/Makefile
diff -u pkgsrc/www/freenginx/Makefile:1.9 pkgsrc/www/freenginx/Makefile:1.10
--- pkgsrc/www/freenginx/Makefile:1.9   Wed Jun  3 13:46:38 2026
+++ pkgsrc/www/freenginx/Makefile       Wed Jul  8 19:19:00 2026
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2026/06/03 13:46:38 osa Exp $
+# $NetBSD: Makefile,v 1.10 2026/07/08 19:19:00 osa Exp $
 
 DISTNAME=      freenginx-1.30.1
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  https://freenginx.org/download/
 DISTFILES=     ${DEFAULT_DISTFILES}
@@ -113,7 +114,7 @@ post-patch:
                ${WRKSRC}/..${NAXSI_SUBDIR}/libinjection/src/libinjection_sqli.c
 .endif
 .if !empty(PKG_OPTIONS:Mnginx-njs)
-       cd ${WRKSRC} && ${PATCH} < ${PATCHDIR}/extra-patch-auto-quickjs
+       cd ${WRKSRC} && ${PATCH} < ${PATCHDIR}/extra-patch-njs-quickjs
 .endif
 .if !empty(PKG_OPTIONS:Mnginx-upload)
        cd ${WRKSRC} && ${PATCH} < ${PATCHDIR}/extra-patch-ngx_http_upload_module.c

Index: pkgsrc/www/freenginx/distinfo
diff -u pkgsrc/www/freenginx/distinfo:1.8 pkgsrc/www/freenginx/distinfo:1.9
--- pkgsrc/www/freenginx/distinfo:1.8   Wed Jun  3 13:46:38 2026
+++ pkgsrc/www/freenginx/distinfo       Wed Jul  8 19:19:00 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2026/06/03 13:46:38 osa Exp $
+$NetBSD: distinfo,v 1.9 2026/07/08 19:19:00 osa Exp $
 
 BLAKE2s (array-var-nginx-module-0.06.tar.gz) = fa6ad2a2ce3c3eba3f69287b224e9c01fcaca29a083394ab74f2f655d3e2138b
 SHA512 (array-var-nginx-module-0.06.tar.gz) = bc72158856a1be18a26ee04c6b5b0f0a20bcce688610a493bf31e2a133e7eb12e11f7c18197a09a72b1513f6a08348ee5281b9d5b84cf43603539040ebd23c26
@@ -33,18 +33,18 @@ Size (nginx-dav-ext-module-3.0.0.tar.gz)
 BLAKE2s (nginx-rtmp-module-1.2.2.tar.gz) = 5de03b71bb16b4129f1a2a99446f65ef6eeb3fd48bfc925e94fc27e99da3c069
 SHA512 (nginx-rtmp-module-1.2.2.tar.gz) = 3f8c803221854c4b1a06aadc6313fbfec74bd7179c0ee51d4365b26ffa8875881a6e1e48f777a9c9efbb9170ab7478a82920d5448a2c2df485503d37bb03ab81
 Size (nginx-rtmp-module-1.2.2.tar.gz) = 519934 bytes
-BLAKE2s (ngx_cache_purge-2.5.3.tar.gz) = c10c8c9b61b0c993fe62f8ab89e0d6f34d47a041878e32ce4fd9c228a2b7221e
-SHA512 (ngx_cache_purge-2.5.3.tar.gz) = aebc9b19a3e7dda3b57e6bd6d86a5ab66d25e05cf5c6c99c71234c789700eb9da8e29529b8b2abf3d775ff3c2610e695fc88e647738769f0d3730bcafc3be38b
-Size (ngx_cache_purge-2.5.3.tar.gz) = 17156 bytes
+BLAKE2s (ngx_cache_purge-3.0.2.tar.gz) = 60254aefca5ea6d366a00e8b0c8fa7aa83c5bfc843dded727a0d5addff050519
+SHA512 (ngx_cache_purge-3.0.2.tar.gz) = e59c3215df6a3a9036e8ba41a24b91ca2b2d2fe6cd62cfe5108b68328e1df597b77e4015fa4940ee9dd0c47f18d696d54aceb5a0a35e1c101491f9cbadb8b6bb
+Size (ngx_cache_purge-3.0.2.tar.gz) = 42151 bytes
 BLAKE2s (ngx_devel_kit-0.3.4.tar.gz) = f9436d20966f090c6e0b50dd5a28151e2cd27f825d46c12f860a1b61ab7d43bd
 SHA512 (ngx_devel_kit-0.3.4.tar.gz) = 6bc2f4d3b7ad22527e6c7c343884f8b0d5810ae9b7b09d6c2988b50afbd9c7a79e387667bfb980e93c5e204c163544f79634b2862895d8ee004a4393245ee185
 Size (ngx_devel_kit-0.3.4.tar.gz) = 66474 bytes
 BLAKE2s (ngx_http_geoip2_module-3.4.tar.gz) = eb14ed670788d4cc46037719ebab29e1c0da53cadbb0da10198e76255d924273
 SHA512 (ngx_http_geoip2_module-3.4.tar.gz) = 18dea21e5ae2647bea1fc448058a1b773c936917245edef8d861d5e23ed92e9a3b1ec4ef43ffb2ece7b5899d787910adcf4fbd39f84d7e8d7c54759e2fee5b72
 Size (ngx_http_geoip2_module-3.4.tar.gz) = 8877 bytes
-BLAKE2s (njs-0.9.9.tar.gz) = 7e3bbbd6b7a2737fe4976ad21779c62992934bda85dc5856a043181f3bd84200
-SHA512 (njs-0.9.9.tar.gz) = 67b921c127fabb0ac0a8e53f63291af3227db0d2a9d67f32bfc853072403d9634f19ef736513a4007673fc98e1d3be8a5b3ac4832b04956852e43706891c38be
-Size (njs-0.9.9.tar.gz) = 994273 bytes
+BLAKE2s (njs-1.0.0.tar.gz) = 112eb493fc5739cfa8c07e0e2a78d56fa1aec13166a9a1697ee35c41e7faa697
+SHA512 (njs-1.0.0.tar.gz) = 11ed2e1b0d6e781e7030d46b27dddb96f53b2ceb92ef7811e025a40b8e9bf0996577200cde50bedfe85586478e9830472c0de37f79897d9446f4e23225dff668
+Size (njs-1.0.0.tar.gz) = 1011616 bytes
 BLAKE2s (openresty-echo-nginx-module-b0f344b_GH.tar.gz) = e1ed241e7d3e57024f666bc8489f83575664121a01ef9424b7d7bf4a1f8cdc3f
 SHA512 (openresty-echo-nginx-module-b0f344b_GH.tar.gz) = ef5150094fda342eec018273eb312b16fb7731474e96865374c98dafe7a507fcf9c7e5fd2766d3296afb11e0348e4b20a973d20303052a71bdec7c92bd088d38
 Size (openresty-echo-nginx-module-b0f344b_GH.tar.gz) = 53548 bytes

Index: pkgsrc/www/freenginx/options.mk
diff -u pkgsrc/www/freenginx/options.mk:1.6 pkgsrc/www/freenginx/options.mk:1.7
--- pkgsrc/www/freenginx/options.mk:1.6 Thu May 21 10:37:15 2026
+++ pkgsrc/www/freenginx/options.mk     Wed Jul  8 19:19:00 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2026/05/21 10:37:15 osa Exp $
+# $NetBSD: options.mk,v 1.7 2026/07/08 19:19:00 osa Exp $
 
 CODELOAD_SITE_GITHUB=          https://codeload.github.com/
 
@@ -357,7 +357,7 @@ CONFIGURE_ARGS+=    --with-http_auth_reques
 .endif
 
 .if !empty(PKG_OPTIONS:Mnginx-cache-purge) || make(makesum) || make(mdi) || make(distclean)
-CPRG_VERSION=          2.5.3
+CPRG_VERSION=          3.0.2
 CPRG_DISTNAME=         ngx_cache_purge-${CPRG_VERSION}
 CPRG_DISTFILE=         ${CPRG_DISTNAME}.tar.gz
 SITES.${CPRG_DISTFILE}=        -${MASTER_SITE_GITHUB:=nginx-modules/ngx_cache_purge/archive/}${CPRG_VERSION}.tar.gz
@@ -387,7 +387,7 @@ PLIST.rtmp=         yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mnginx-njs) || make(makesum) || make(mdi) || make(distclean)
-NJS_VERSION=           0.9.9
+NJS_VERSION=           1.0.0
 NJS_DISTNAME=          njs-${NJS_VERSION}
 NJS_DISTFILE=          ${NJS_DISTNAME}.tar.gz
 SITES.${NJS_DISTFILE}= -${MASTER_SITE_GITHUB:=nginx/njs/archive/}${NJS_VERSION}.tar.gz

Added files:

Index: pkgsrc/www/freenginx/patches/extra-patch-njs-quickjs
diff -u /dev/null pkgsrc/www/freenginx/patches/extra-patch-njs-quickjs:1.1
--- /dev/null   Wed Jul  8 19:19:01 2026
+++ pkgsrc/www/freenginx/patches/extra-patch-njs-quickjs        Wed Jul  8 19:19:00 2026
@@ -0,0 +1,28 @@
+--- ../njs-1.0.0/auto/quickjs.orig     2026-06-23 11:18:04.000000000 -0400
++++ ../njs-1.0.0/auto/quickjs  2026-06-28 13:23:46.299804429 -0400
+@@ -42,9 +42,9 @@
+     fi
+ 
+     if [ $njs_found = no ]; then
+-        njs_feature="QuickJS library -I/usr/include/quickjs/ -L/usr/lib/quickjs/ -lquickjs"
+-        njs_feature_incs="$NJS_QUICKJS_DEFAULT_INCS /usr/include/quickjs/"
+-        njs_feature_libs="-L/usr/lib/quickjs/ -lquickjs -lm -ldl -lpthread"
++        njs_feature="QuickJS library -I/usr/pkg/include/quickjs -L/usr/pkg/lib -lquickjs"
++        njs_feature_incs="$NJS_QUICKJS_DEFAULT_INCS /usr/include/quickjs"
++        njs_feature_libs="-L/usr/pkg/lib -lquickjs -lm -lpthread"
+ 
+         . auto/feature
+     fi
+--- ../njs-1.0.0/nginx/config.orig     2026-06-28 13:01:43.273373787 -0400
++++ ../njs-1.0.0/nginx/config  2026-06-28 13:02:46.754225650 -0400
+@@ -60,8 +60,8 @@
+     fi
+ 
+     if [ $ngx_found = no ]; then
+-        ngx_feature="QuickJS library -I/usr/include/quickjs/ -L/usr/lib/quickjs/ -lquickjs"
+-        ngx_feature_libs="-L/usr/lib/quickjs/ -lquickjs -lm -ldl -lpthread"
++        ngx_feature="QuickJS library -I/usr/pkg/include/quickjs/ -L/usr/pkg/lib/ -lquickjs"
++        ngx_feature_libs="-L/usr/pkg/lib/quickjs/ -lquickjs -lm -lpthread"
+ 
+         . auto/feature
+     fi