CVS commit: pkgsrc/www/freenginx-devel

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

Module Name:    pkgsrc
Committed By:   osa
Date:           Thu Dec 25 18:01:01 UTC 2025

Modified Files:
        pkgsrc/www/freenginx-devel: Makefile PLIST distinfo options.mk

Log Message:
www/freenginx-devel: update from 1.29.3 to 1.29.4

Convert base geoip modules to dynamic.

Sponsored by:   tipi.work

<ChangeLog>

*) Feature: support for GeoIP2 databases in the MaxMind DB (MMDB) format
   in the ngx_http_geoip_module and ngx_stream_geoip_module modules; the
   "geoip_set" directive.

*) Bugfix: disk cache size might be calculated incorrectly on the XFS
   file system with the "largeio" mount option.

*) Bugfix: of minor potential bugs.

</ChangeLog>


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/freenginx-devel/Makefile \
    pkgsrc/www/freenginx-devel/PLIST pkgsrc/www/freenginx-devel/distinfo \
    pkgsrc/www/freenginx-devel/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/freenginx-devel/Makefile
diff -u pkgsrc/www/freenginx-devel/Makefile:1.1 pkgsrc/www/freenginx-devel/Makefile:1.2
--- pkgsrc/www/freenginx-devel/Makefile:1.1     Fri Nov 21 17:19:48 2025
+++ pkgsrc/www/freenginx-devel/Makefile Thu Dec 25 18:01:00 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2025/11/21 17:19:48 osa Exp $
+# $NetBSD: Makefile,v 1.2 2025/12/25 18:01:00 osa Exp $
 
-DISTNAME=      freenginx-1.29.3
+DISTNAME=      freenginx-1.29.4
 PKGNAME=       ${DISTNAME:S/-/-devel-/1}
 CATEGORIES=    www
 MASTER_SITES=  https://freenginx.org/download/
Index: pkgsrc/www/freenginx-devel/PLIST
diff -u pkgsrc/www/freenginx-devel/PLIST:1.1 pkgsrc/www/freenginx-devel/PLIST:1.2
--- pkgsrc/www/freenginx-devel/PLIST:1.1        Fri Nov 21 17:19:48 2025
+++ pkgsrc/www/freenginx-devel/PLIST    Thu Dec 25 18:01:01 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2025/11/21 17:19:48 osa Exp $
+@comment $NetBSD: PLIST,v 1.2 2025/12/25 18:01:01 osa Exp $
 ${PLIST.dso}${PLIST.ndk}libexec/freenginx/ndk_http_module.so
 ${PLIST.dso}${PLIST.arrayvar}libexec/freenginx/ngx_http_array_var_module.so
 ${PLIST.dso}${PLIST.brotli}libexec/freenginx/ngx_http_brotli_filter_module.so
@@ -9,6 +9,7 @@ ${PLIST.dso}${PLIST.dav}libexec/freengin
 ${PLIST.dso}${PLIST.echo}libexec/freenginx/ngx_http_echo_module.so
 ${PLIST.dso}${PLIST.encses}libexec/freenginx/ngx_http_encrypted_session_module.so
 ${PLIST.dso}${PLIST.forminput}libexec/freenginx/ngx_http_form_input_module.so
+${PLIST.dso}${PLIST.geoip}libexec/freenginx/ngx_http_geoip_module.so
 ${PLIST.dso}${PLIST.geoip2}libexec/freenginx/ngx_http_geoip2_module.so
 ${PLIST.dso}${PLIST.headmore}libexec/freenginx/ngx_http_headers_more_filter_module.so
 ${PLIST.dso}${PLIST.imagefilter}libexec/freenginx/ngx_http_image_filter_module.so
@@ -24,6 +25,7 @@ ${PLIST.dso}${PLIST.vts}libexec/freengin
 ${PLIST.dso}${PLIST.mail}libexec/freenginx/ngx_mail_module.so
 ${PLIST.dso}${PLIST.nchan}libexec/freenginx/ngx_nchan_module.so
 ${PLIST.dso}${PLIST.rtmp}libexec/freenginx/ngx_rtmp_module.so
+${PLIST.dso}${PLIST.geoip}libexec/freenginx/ngx_stream_geoip_module.so
 ${PLIST.dso}${PLIST.geoip2}libexec/freenginx/ngx_stream_geoip2_module.so
 ${PLIST.dso}${PLIST.njs}libexec/freenginx/ngx_stream_js_module.so
 ${PLIST.dso}${PLIST.stream}libexec/freenginx/ngx_stream_module.so
Index: pkgsrc/www/freenginx-devel/distinfo
diff -u pkgsrc/www/freenginx-devel/distinfo:1.1 pkgsrc/www/freenginx-devel/distinfo:1.2
--- pkgsrc/www/freenginx-devel/distinfo:1.1     Fri Nov 21 17:19:48 2025
+++ pkgsrc/www/freenginx-devel/distinfo Thu Dec 25 18:01:01 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2025/11/21 17:19:48 osa Exp $
+$NetBSD: distinfo,v 1.2 2025/12/25 18:01:01 osa Exp $
 
 BLAKE2s (array-var-nginx-module-0.06.tar.gz) = fa6ad2a2ce3c3eba3f69287b224e9c01fcaca29a083394ab74f2f655d3e2138b
 SHA512 (array-var-nginx-module-0.06.tar.gz) = bc72158856a1be18a26ee04c6b5b0f0a20bcce688610a493bf31e2a133e7eb12e11f7c18197a09a72b1513f6a08348ee5281b9d5b84cf43603539040ebd23c26
@@ -12,9 +12,9 @@ Size (fdintino-nginx-upload-module-96e64
 BLAKE2s (form-input-nginx-module-0.12.tar.gz) = b08fc95c3e15bfdc0846e2d1e8157171954f353bd301f4ac4aca56113620e91d
 SHA512 (form-input-nginx-module-0.12.tar.gz) = 1c5c5ab74156cac09da44a2dcdd84f7c03c9919a23a847e63613e00e3781ecd73d5ad12446174b4fdef9d064257a31570a8dbcccc00d8266f7048e3dcde0362e
 Size (form-input-nginx-module-0.12.tar.gz) = 11090 bytes
-BLAKE2s (freenginx-1.29.3.tar.gz) = c1b79fdac2beb207c0253468d0c6606fab5c16aa6f5d57dfbef1c9d2a0919ae1
-SHA512 (freenginx-1.29.3.tar.gz) = 8d25142848744e676441bd3e635e24957f6a70488eb9882fbd5cf51a0fe7015ff6dee45e309c267f0248803f1a29a30bf0b6a507ac9959869eb83cad2cb2d8ed
-Size (freenginx-1.29.3.tar.gz) = 1243956 bytes
+BLAKE2s (freenginx-1.29.4.tar.gz) = 536de3761bfd74227eaedadae8c49ede7ce5fdbbe0543af31a917db94d8fe99e
+SHA512 (freenginx-1.29.4.tar.gz) = 5428c050cea8cadd53a9447b1ca2231d6e53dca8ac6bec24798568cc570fa975080108a7be3334a1f33dcbf195d628bad04f73e0e96f3d75c0660a88f3fd6e16
+Size (freenginx-1.29.4.tar.gz) = 1249883 bytes
 BLAKE2s (google-ngx_brotli-a71f931_GH.tar.gz) = c30d6cbd94abb6f5c1d48275ed964e32f43d9cadd602f95b227a40e62dadbd0d
 SHA512 (google-ngx_brotli-a71f931_GH.tar.gz) = 1cb73a89b53b29d37cbc4d811d5d5cd7b051ec4db98900f593abc8d5b53761b95713212e083334785d9625d4705a78ed476113b244476a9cd5f46dcd9f1177ff
 Size (google-ngx_brotli-a71f931_GH.tar.gz) = 16376 bytes
Index: pkgsrc/www/freenginx-devel/options.mk
diff -u pkgsrc/www/freenginx-devel/options.mk:1.1 pkgsrc/www/freenginx-devel/options.mk:1.2
--- pkgsrc/www/freenginx-devel/options.mk:1.1   Fri Nov 21 17:19:48 2025
+++ pkgsrc/www/freenginx-devel/options.mk       Thu Dec 25 18:01:01 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2025/11/21 17:19:48 osa Exp $
+# $NetBSD: options.mk,v 1.2 2025/12/25 18:01:01 osa Exp $
 
 CODELOAD_SITE_GITHUB=          https://codeload.github.com/
 
@@ -14,7 +14,7 @@ PKG_SUPPORTED_OPTIONS+=       nginx-stream-ssl
 PKG_SUGGESTED_OPTIONS= nginx-auth-request nginx-brotli nginx-gzip nginx-http2 nginx-http3 nginx-memcache
 PKG_SUGGESTED_OPTIONS+=        nginx-realip nginx-slice nginx-status nginx-ssl nginx-uwsgi
 
-PLIST_VARS+=           arrayvar brotli cprg dav dso echo encses forminput geoip2
+PLIST_VARS+=           arrayvar brotli cprg dav dso echo encses forminput geoip geoip2
 PLIST_VARS+=           gssapi headmore imagefilter lua mail naxsi nchan ndk njs
 PLIST_VARS+=           perl redis rtmp setmisc stream sts upload uwsgi vts
 
@@ -140,12 +140,16 @@ CONFIGURE_ARGS+=  --with-http_flv_module
 
 .if !empty(PKG_OPTIONS:Mnginx-geoip)
 .include "../../net/GeoIP/buildlink3.mk"
+.include "../../geography/libmaxminddb/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-http_geoip_module
 SUBST_CLASSES+=                fix-geo
 SUBST_STAGE.fix-geo=   pre-configure
 SUBST_FILES.fix-geo=   auto/lib/geoip/conf
 SUBST_SED.fix-geo=     -e 's,/usr/pkg,${BUILDLINK_PREFIX.GeoIP},g'
 SUBST_NOOP_OK.fix-geo= yes
+DSO_BASEMODS+=         http_geoip_module
+DSO_BASEMODS+=         stream_geoip_module
+PLIST.geoip=           yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mnginx-http2)