git: 32338cb4e4a0 - main - www/nginx-devel: Security update to 1.31.7

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jochen Neumeister <joneum_at_FreeBSD.org>
Date: Thu, 15 Oct 2026 09:22:24 UTC
The branch main has been updated by joneum:

URL: https://cgit.FreeBSD.org/ports/commit/?id=32338cb4e4a0909d79b59b423431264eaf20a4ab

commit 32338cb4e4a0909d79b59b423431264eaf20a4ab
Author:     Jochen Neumeister <joneum@FreeBSD.org>
AuthorDate: 2026-10-15 09:17:12 +0000
Commit:     Jochen Neumeister <joneum@FreeBSD.org>
CommitDate: 2026-10-15 09:18:05 +0000

    www/nginx-devel: Security update to 1.31.7
    
    The same five security fixes as 1.30.6: CVE-2026-15176, CVE-2026-93479,
    CVE-2026-95101, CVE-2026-97629 and CVE-2026-97205.
    
    1.31.7 also lets the bundled geoip modules read MaxMind DB databases, which
    the new HTTP_GEOIP and STREAM_GEOIP options enable; both are off by default
    and pull net/libmaxminddb.
    
    https://nginx.org/en/CHANGES
    
    Security:       CVE-2026-15176
    Security:       CVE-2026-93479
    Security:       CVE-2026-95101
    Security:       CVE-2026-97629
    Security:       CVE-2026-97205
    Sponsored by:   Netzkommune GmbH
---
 www/nginx-devel/Makefile              | 17 ++++++++++-------
 www/nginx-devel/Makefile.options.desc |  2 ++
 www/nginx-devel/distinfo              |  6 +++---
 www/nginx-devel/pkg-plist             |  2 ++
 www/nginx-devel/version.mk            |  2 +-
 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 56c0c0086579..a413a8a54152 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -1,7 +1,6 @@
 PORTNAME?=	nginx
 PORTVERSION=	${NGINX_VERSION}
 .include "version.mk"
-PORTREVISION=	6
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/
 PKGNAMESUFFIX?=	-devel
@@ -68,15 +67,15 @@ 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_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 \
-	HTTPV3_OSSL
+	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 HTTPV3_OSSL
 
 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 NJS_QJS NJS_XML OTEL THREADS WWW
@@ -145,6 +144,8 @@ 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_LIB_DEPENDS=		libmaxminddb.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
@@ -190,6 +191,8 @@ MAIL_SSL_USES=			ssl
 MAIL_SSL_CONFIGURE_ON=		--with-mail_ssl_module
 STREAM_VARS=			DSO_BASEMODS+=stream
 STREAM_CONFIGURE_ON=		--with-stream
+STREAM_GEOIP_LIB_DEPENDS=	libmaxminddb.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/nginx-devel/Makefile.options.desc b/www/nginx-devel/Makefile.options.desc
index 81b0d498ac9d..40a311a43927 100644
--- a/www/nginx-devel/Makefile.options.desc
+++ b/www/nginx-devel/Makefile.options.desc
@@ -41,6 +41,7 @@ HTTP_FANCYINDEX_DESC=		3rd party http_fancyindex module
 HTTP_FLV_DESC=			Enable http_flv module
 HTTP_FOOTER_DESC=		3rd party http_footer module
 HTTP_GEOIP2_DESC=		3rd party geoip2 module
+HTTP_GEOIP_DESC=		Enable http_geoip module (MaxMind DB)
 HTTP_GUNZIP_FILTER_DESC=	Enable http_gunzip_filter module
 HTTP_GZIP_STATIC_DESC=		Enable http_gzip_static module
 HTTP_IMAGE_FILTER_DESC=		Enable http_image_filter module
@@ -106,6 +107,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 (MaxMind DB)
 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/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 30df50312134..a84a6299f377 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1789538673
-SHA256 (nginx-1.31.6.tar.gz) = 974ed5298a5e398e008704ed5db284e655fc270c596493dbccada452448fc9f1
-SIZE (nginx-1.31.6.tar.gz) = 1373124
+TIMESTAMP = 1792016871
+SHA256 (nginx-1.31.7.tar.gz) = 89ea8a3dc171511f7325043b50e4c036248d9fad5feb7ec809c0b82d5df42c65
+SIZE (nginx-1.31.7.tar.gz) = 1392370
 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae
 SIZE (nginx_mogilefs_module-1.0.4.tar.gz) = 11208
 SHA256 (passenger-6.1.2.tar.gz) = 94400a52e536cfdd8acf2accb47badb7a67dc309452f1b05600da67343f25bf8
diff --git a/www/nginx-devel/pkg-plist b/www/nginx-devel/pkg-plist
index d42f3f3f5388..04ca5ef185ad 100644
--- a/www/nginx-devel/pkg-plist
+++ b/www/nginx-devel/pkg-plist
@@ -33,6 +33,7 @@
 %%DSO%%%%HTTP_EVAL%%libexec/nginx/ngx_http_eval_module.so
 %%DSO%%%%HTTP_FANCYINDEX%%libexec/nginx/ngx_http_fancyindex_module.so
 %%DSO%%%%HTTP_FOOTER%%libexec/nginx/ngx_http_footer_filter_module.so
+%%DSO%%%%HTTP_GEOIP%%libexec/nginx/ngx_http_geoip_module.so
 %%DSO%%%%HTTP_IMAGE_FILTER%%libexec/nginx/ngx_http_image_filter_module.so
 %%DSO%%%%HTTP_IP2LOCATION%%libexec/nginx/ngx_http_ip2location_module.so
 %%DSO%%%%HTTP_IP2PROXY%%libexec/nginx/ngx_http_ip2proxy_module.so
@@ -79,6 +80,7 @@
 %%DSO%%%%STREAM%%%%HTTP_GEOIP2%%libexec/nginx/ngx_stream_geoip2_module.so
 %%DSO%%%%STREAM%%%%NJS%%libexec/nginx/ngx_stream_js_module.so
 %%DSO%%%%STREAM%%libexec/nginx/ngx_stream_module.so
+%%DSO%%%%STREAM_GEOIP%%libexec/nginx/ngx_stream_geoip_module.so
 %%DSO%%%%STS%%libexec/nginx/ngx_http_stream_server_traffic_status_module.so
 %%DSO%%%%STS%%libexec/nginx/ngx_stream_server_traffic_status_module.so
 %%DSO%%%%VOD%%libexec/nginx/ngx_http_vod_module.so
diff --git a/www/nginx-devel/version.mk b/www/nginx-devel/version.mk
index 1c7dd0e6c93d..97b344b41855 100644
--- a/www/nginx-devel/version.mk
+++ b/www/nginx-devel/version.mk
@@ -1 +1 @@
-NGINX_VERSION=	1.31.6
+NGINX_VERSION=	1.31.7