pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

pkg/61027: www/nginx 1.30.7 builds against previous version of brotli



>Number:         61027
>Category:       pkg
>Synopsis:       www/nginx 1.30.7 builds against previous version of brotli
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Nov 19 03:35:00 +0000 2026
>Originator:     gemelen
>Release:        trunk
>Organization:
>Environment:
Darwin embla 27.2.0 Darwin Kernel Version 27.2.0: Wed Oct 14 23:47:07 PDT 2026; root:xnu-13432.41.4~25/RELEASE_ARM64_T8132 arm64
>Description:
Latest to the moment change in www/nginx (https://mail-index.netbsd.org/pkgsrc-changes/2026/11/18/msg360380.html) upgraded only the Nginx version itself, while it still builds against brotli of a71f931 (https://github.com/google/ngx_brotli/commits/master/) which misses the latest change in brotli with its own CVE fix.
>How-To-Repeat:
n/a
>Fix:
git diff --relative=www/nginx

diff --git a/Makefile b/Makefile
index 1eb14195e9e0..8d8532e398e4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.202 2026/11/18 21:33:26 kim Exp $
 
 DISTNAME=	nginx-1.30.7
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/
 DISTFILES=	${DEFAULT_DISTFILES}
diff --git a/distinfo b/distinfo
index e2e3ccd0ee40..72ca94e1d585 100644
--- a/distinfo
+++ b/distinfo
@@ -12,9 +12,9 @@ Size (encrypted-session-nginx-module-0.09.tar.gz) = 11847 bytes
 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 (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
+BLAKE2s (google-ngx_brotli-53e0fb5_GH.tar.gz) = 4282fe17bc8ba772847a107d77eb40151ada8d803f1833ff5f5c4679e5ee3ebe
+SHA512 (google-ngx_brotli-53e0fb5_GH.tar.gz) = 40d1a7954b097b6e036b7258fef3a1ea8d34745227cb6d8d6565cffa31dd030955b9b389baac8b2c17fabdad7777735c9215f45ff60d63da23a55fd292c444e5
+Size (google-ngx_brotli-53e0fb5_GH.tar.gz) = 16381 bytes
 BLAKE2s (headers-more-nginx-module-0.39.tar.gz) = 29c90cc57f236c5e9ff69e0a39522ba3ec0d42d23d1592b730f5e1336aa14d64
 SHA512 (headers-more-nginx-module-0.39.tar.gz) = b73099bc1d088afc2ccb13e97ad8dd2210cdb6c8355b348007042f23c4bb3ec239e9521f29cb4e82d09b930d8b6a46ccdc7fb75438bf180342d8c53727971c1e
 Size (headers-more-nginx-module-0.39.tar.gz) = 29616 bytes
diff --git a/options.mk b/options.mk
index ff811bf33900..89caeab84e69 100644
--- a/options.mk
+++ b/options.mk
@@ -102,7 +102,7 @@ SUBST_NOOP_OK.fix-ssl=	yes
 .include "../../archivers/brotli/buildlink3.mk"
 BROTLI_GH_ACCOUNT=		google
 BROTLI_GH_PROJECT=		ngx_brotli
-BROTLI_VERSION=			a71f931
+BROTLI_VERSION=			53e0fb5
 BROTLI_DISTNAME=		${BROTLI_GH_PROJECT}-${BROTLI_VERSION}
 BROTLI_DISTFILE=		${BROTLI_GH_ACCOUNT}-${BROTLI_DISTNAME}_GH.tar.gz
 SITES.${BROTLI_DISTFILE}=	-${CODELOAD_SITE_GITHUB:=${BROTLI_GH_ACCOUNT}/${BROTLI_GH_PROJECT}/tar.gz/${BROTLI_VERSION}?dummy=${BROTLI_DISTFILE}}
diff --git a/patches/extra-patch-ngx_brotli_filter_config b/patches/extra-patch-ngx_brotli_filter_config
index 46b49e49c8d5..c5083bec48a8 100644
--- a/patches/extra-patch-ngx_brotli_filter_config
+++ b/patches/extra-patch-ngx_brotli_filter_config
@@ -1,5 +1,5 @@
---- ../ngx_brotli-a71f931/filter/config.orig	2023-10-09 02:44:27.000000000 -0400
-+++ ../ngx_brotli-a71f931/filter/config	2025-09-08 09:29:11.776714842 -0400
+--- ../ngx_brotli-53e0fb5/filter/config.orig	2023-10-09 02:44:27.000000000 -0400
++++ ../ngx_brotli-53e0fb5/filter/config	2025-09-08 09:29:11.776714842 -0400
 @@ -42,33 +42,16 @@
  ngx_module_type=HTTP_FILTER
  ngx_module_name=ngx_http_brotli_filter_module




Home | Main Index | Thread Index | Old Index