git: 1d54f79867bd - main - www/freenginx-devel: update from 1.29.3 to 1.29.4

From: Sergey A. Osokin <osa_at_FreeBSD.org>
Date: Tue, 16 Dec 2025 19:10:01 UTC 
The branch main has been updated by osa:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1d54f79867bd32baf2a5c1c751b149aad344bcaf

commit 1d54f79867bd32baf2a5c1c751b149aad344bcaf
Author:     Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2025-12-16 19:09:20 +0000
Commit:     Sergey A. Osokin <osa@FreeBSD.org>
CommitDate: 2025-12-16 19:09:54 +0000

    www/freenginx-devel: update from 1.29.3 to 1.29.4
    
    Enable the updated geoip module.
    
    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>
---
 www/freenginx-devel/Makefile              | 10 ++++++++--
 www/freenginx-devel/Makefile.options.desc |  2 ++
 www/freenginx-devel/distinfo              |  6 +++---
 www/freenginx-devel/pkg-plist             |  4 +++-
 www/freenginx-devel/version.mk            |  2 +-
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/www/freenginx-devel/Makefile b/www/freenginx-devel/Makefile
index ad12b4dfeffe..d79c410c2168 100644
--- a/www/freenginx-devel/Makefile
+++ b/www/freenginx-devel/Makefile
@@ -69,7 +69,7 @@ NO_OPTIONS_SORT=	yes
 OPTIONS_GROUP=	HTTPGRP MAILGRP STREAMGRP
 # Modules that are part of the base nginx distribution
 OPTIONS_GROUP_HTTPGRP=	GOOGLE_PERFTOOLS HTTP HTTP_ADDITION HTTP_AUTH_REQ \
-	HTTP_CACHE HTTP_DAV HTTP_DEGRADATION HTTP_FLV HTTP_GUNZIP_FILTER \
+	HTTP_CACHE HTTP_DAV HTTP_DEGRADATION HTTP_FLV HTTP_GEOIP HTTP_GUNZIP_FILTER \
 	HTTP_GZIP_STATIC HTTP_IMAGE_FILTER HTTP_MP4 HTTP_PERL \
 	HTTP_RANDOM_INDEX HTTP_REALIP HTTP_SECURE_LINK HTTP_SLICE HTTP_SSL \
 	HTTP_STATUS HTTP_SUB HTTP_XSLT HTTPV2 HTTPV3 HTTPV3_BORING HTTPV3_LSSL \
@@ -77,7 +77,7 @@ OPTIONS_GROUP_HTTPGRP=	GOOGLE_PERFTOOLS HTTP HTTP_ADDITION HTTP_AUTH_REQ \
 
 OPTIONS_GROUP_MAILGRP=	MAIL MAIL_IMAP MAIL_POP3 MAIL_SMTP MAIL_SSL
 
-OPTIONS_GROUP_STREAMGRP=	STREAM STREAM_REALIP STREAM_SSL \
+OPTIONS_GROUP_STREAMGRP=	STREAM STREAM_GEOIP STREAM_REALIP STREAM_SSL \
 	STREAM_SSL_PREREAD
 
 OPTIONS_DEFINE=		DEBUG DEBUGLOG DSO FILE_AIO IPV6 NJS OTEL THREADS WWW
@@ -146,6 +146,9 @@ HTTP_CACHE_CONFIGURE_OFF=	--without-http-cache
 HTTP_DAV_CONFIGURE_ON=		--with-http_dav_module
 HTTP_DEGRADATION_CONFIGURE_ON=	--with-http_degradation_module
 HTTP_FLV_CONFIGURE_ON=		--with-http_flv_module
+HTTP_GEOIP_CONFIGURE_ON=	--with-http_geoip_module
+HTTP_GEOIP_LIB_DEPENDS=		libmaxmind.so:net/libmaxminddb
+HTTP_GEOIP_VARS=		DSO_BASEMODS+=http_geoip_module
 HTTP_GZIP_STATIC_CONFIGURE_ON=	--with-http_gzip_static_module
 HTTP_GUNZIP_FILTER_CONFIGURE_ON=--with-http_gunzip_module
 HTTP_IMAGE_FILTER_LIB_DEPENDS=	libgd.so:graphics/gd
@@ -191,6 +194,9 @@ MAIL_SSL_USES=			ssl
 MAIL_SSL_CONFIGURE_ON=		--with-mail_ssl_module
 STREAM_VARS=			DSO_BASEMODS+=stream
 STREAM_CONFIGURE_ON=		--with-stream
+STREAM_GEOIP_CONFIGURE_ON=	--with-stream_geoip_module
+STREAM_GEOIP_LIB_DEPENDS=	libmaxmind.so:net/libmaxminddb
+STREAM_GEOIP_VARS=		DSO_BASEMODS+=stream_geoip_module
 STREAM_REALIP_CONFIGURE_ON=	--with-stream_realip_module
 STREAM_SSL_USES=		ssl
 STREAM_SSL_CONFIGURE_ON=	--with-stream_ssl_module
diff --git a/www/freenginx-devel/Makefile.options.desc b/www/freenginx-devel/Makefile.options.desc
index 88cfd36a84f2..6ed452818660 100644
--- a/www/freenginx-devel/Makefile.options.desc
+++ b/www/freenginx-devel/Makefile.options.desc
@@ -39,6 +39,7 @@ HTTP_EVAL_DESC=			3rd party eval module
 HTTP_FANCYINDEX_DESC=		3rd party http_fancyindex module
 HTTP_FLV_DESC=			Enable http_flv module
 HTTP_FOOTER_DESC=		3rd party http_footer module
+HTTP_GEOIP_DESC=		Enable http_geoip module
 HTTP_GEOIP2_DESC=		3rd party geoip2 module
 HTTP_GUNZIP_FILTER_DESC=	Enable http_gunzip_filter module
 HTTP_GZIP_STATIC_DESC=		Enable http_gzip_static module
@@ -103,6 +104,7 @@ SLOWFS_CACHE_DESC=		3rd party slowfs_cache module
 SRCACHE_DESC=			3rd party srcache module
 STREAMGRP_DESC=			Modules that require STREAM module
 STREAM_DESC=			Enable stream module
+STREAM_GEOIP_DESC=		Enable stream_geoip module
 STREAM_REALIP_DESC=		Enable stream_realip module
 STREAM_SSL_DESC=		Enable stream_ssl module (SSL req.)
 STREAM_SSL_PREREAD_DESC=	Enable stream_ssl_preread module (SSL req.)
diff --git a/www/freenginx-devel/distinfo b/www/freenginx-devel/distinfo
index f8071e336c30..d403f3deb326 100644
--- a/www/freenginx-devel/distinfo
+++ b/www/freenginx-devel/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1763942092
-SHA256 (freenginx-1.29.3.tar.gz) = 55989cea3352d937d6d96c9af8b943f3a3f3a0220f35ede7a5b605a3d86b029a
-SIZE (freenginx-1.29.3.tar.gz) = 1243956
+TIMESTAMP = 1765911692
+SHA256 (freenginx-1.29.4.tar.gz) = 51a596451e334b51ce8cef1291b576ed601ed557e1b500e6c1a77a469d603e27
+SIZE (freenginx-1.29.4.tar.gz) = 1249883
 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
 SIZE (nginx_mogilefs_module-1.0.4.tar.gz) = 11208
 SHA256 (passenger-6.0.27.tar.gz) = 82c830aee98feece09e84309c2d0c6bb3f7b22a3c8e33cfe93b5e0d498615d0f
diff --git a/www/freenginx-devel/pkg-plist b/www/freenginx-devel/pkg-plist
index e608ba17dd11..65d236edc4e8 100644
--- a/www/freenginx-devel/pkg-plist
+++ b/www/freenginx-devel/pkg-plist
@@ -32,6 +32,7 @@
 %%DSO%%%%HTTP_EVAL%%libexec/freenginx/ngx_http_eval_module.so
 %%DSO%%%%HTTP_FANCYINDEX%%libexec/freenginx/ngx_http_fancyindex_module.so
 %%DSO%%%%HTTP_FOOTER%%libexec/freenginx/ngx_http_footer_filter_module.so
+%%DSO%%%%HTTP_GEOIP%%libexec/freenginx/ngx_http_geoip_module.so
 %%DSO%%%%HTTP_IMAGE_FILTER%%libexec/freenginx/ngx_http_image_filter_module.so
 %%DSO%%%%HTTP_IP2LOCATION%%libexec/freenginx/ngx_http_ip2location_module.so
 %%DSO%%%%HTTP_IP2PROXY%%libexec/freenginx/ngx_http_ip2proxy_module.so
@@ -113,9 +114,10 @@
 %%DSO%%%%SHIBBOLETH%%libexec/freenginx/ngx_http_shibboleth_module.so
 %%DSO%%%%SLOWFS_CACHE%%libexec/freenginx/ngx_http_slowfs_module.so
 %%DSO%%%%SRCACHE%%libexec/freenginx/ngx_http_srcache_filter_module.so
+%%DSO%%%%STREAM%%libexec/freenginx/ngx_stream_module.so
 %%DSO%%%%STREAM%%%%HTTP_GEOIP2%%libexec/freenginx/ngx_stream_geoip2_module.so
 %%DSO%%%%STREAM%%%%NJS%%libexec/freenginx/ngx_stream_js_module.so
-%%DSO%%%%STREAM%%libexec/freenginx/ngx_stream_module.so
+%%DSO%%%%STREAM%%%%STREAM_GEOIP%%libexec/freenginx/ngx_stream_geoip_module.so
 %%DSO%%%%STS%%libexec/freenginx/ngx_http_stream_server_traffic_status_module.so
 %%DSO%%%%VOD%%libexec/freenginx/ngx_http_vod_module.so
 %%DSO%%%%VTS%%libexec/freenginx/ngx_http_vhost_traffic_status_module.so
diff --git a/www/freenginx-devel/version.mk b/www/freenginx-devel/version.mk
index 118d35007e58..456897405932 100644
--- a/www/freenginx-devel/version.mk
+++ b/www/freenginx-devel/version.mk
@@ -1 +1 @@
-NGINX_VERSION=	1.29.3
+NGINX_VERSION=	1.29.4