CVS commit: pkgsrc/www/nginx

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/www/nginx
From: "Sergey A. Osokin" <osa%netbsd.org@localhost>
Date: Wed, 23 Apr 2025 18:33:05 +0000

Module Name:    pkgsrc
Committed By:   osa
Date:           Wed Apr 23 18:33:05 UTC 2025

Modified Files:
        pkgsrc/www/nginx: Makefile distinfo options.mk
        pkgsrc/www/nginx/patches: patch-conf_nginx.conf

Log Message:
www/nginx: update to the recent stable version, 1.28.0.

There's a huge list of changes since 1.26.3, so here it's:
https://github.com/nginx/nginx/compare/release-1.26.3...release-1.28.0

Merge all changes have been made for www/nginx-devel to www/nginx.
These two pkgsrces are identical now (except their package names
and revisions).


To generate a diff of this commit:
cvs rdiff -u -r1.174 -r1.175 pkgsrc/www/nginx/Makefile
cvs rdiff -u -r1.132 -r1.133 pkgsrc/www/nginx/distinfo
cvs rdiff -u -r1.116 -r1.117 pkgsrc/www/nginx/options.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/nginx/patches/patch-conf_nginx.conf

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

Modified files:

Index: pkgsrc/www/nginx/Makefile
diff -u pkgsrc/www/nginx/Makefile:1.174 pkgsrc/www/nginx/Makefile:1.175
--- pkgsrc/www/nginx/Makefile:1.174     Thu Apr 17 21:52:50 2025
+++ pkgsrc/www/nginx/Makefile   Wed Apr 23 18:33:05 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.174 2025/04/17 21:52:50 wiz Exp $
+# $NetBSD: Makefile,v 1.175 2025/04/23 18:33:05 osa Exp $
 
-DISTNAME=      nginx-1.26.3
-PKGREVISION=   2
+DISTNAME=      nginx-1.28.0
 CATEGORIES=    www
 MASTER_SITES=  https://nginx.org/download/
 DISTFILES=     ${DEFAULT_DISTFILES}

Index: pkgsrc/www/nginx/distinfo
diff -u pkgsrc/www/nginx/distinfo:1.132 pkgsrc/www/nginx/distinfo:1.133
--- pkgsrc/www/nginx/distinfo:1.132     Thu Apr 17 15:14:32 2025
+++ pkgsrc/www/nginx/distinfo   Wed Apr 23 18:33:05 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.132 2025/04/17 15:14:32 osa Exp $
+$NetBSD: distinfo,v 1.133 2025/04/23 18:33:05 osa Exp $
 
 BLAKE2s (1ac658f44afc9240f13e9d6c1c9d5a7816299e8e.patch) = 6c3880dc781886fb1f4190fa9b8f1459246cc5d157aaed3b9a24cc7abaf7c5a1
 SHA512 (1ac658f44afc9240f13e9d6c1c9d5a7816299e8e.patch) = b780bea19736f5db844f11b0b407c159cc6ba7326b50177cefde6f8ee875238d3618e50d29b132a66fe98103cb5656f33895e5989d98d4cdc26cfeaa7f12865f
@@ -15,21 +15,21 @@ Size (encrypted-session-nginx-module-0.0
 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 (headers-more-nginx-module-0.37.tar.gz) = 0c41b4b1f8b3a12c9c55d4e18892592e4fa7499f98525a432ac54cc38951a725
-SHA512 (headers-more-nginx-module-0.37.tar.gz) = 0cc2fffe506194d439e3669644d41b7943e2c3cffa3483eb70b92067930b358d506a14646eff8362b191a11c624db29f6b53d830876929dcb4ce1c9d7b2bc40d
-Size (headers-more-nginx-module-0.37.tar.gz) = 29433 bytes
+BLAKE2s (headers-more-nginx-module-0.38.tar.gz) = cef0db963a951c8e33f2fadadcd262552a266f876d1f2585703392da292933df
+SHA512 (headers-more-nginx-module-0.38.tar.gz) = 90948a79b88bbe2004dc1a53a5189474405787d518ba4e0ee802992b29372f3d08a3a1cf3dc0d5a2089de38b3a99e6133a4d6ac2feaf018f7b23600d7ef23948
+Size (headers-more-nginx-module-0.38.tar.gz) = 29472 bytes
 BLAKE2s (lua-nginx-module-0.10.28.tar.gz) = 0e8b2e8ee0d43905385ca90bf9233e213c78f131ae90f16e64555679c01776e5
 SHA512 (lua-nginx-module-0.10.28.tar.gz) = 176d7516bebbdb3a5d3bb3ee627a7d63d59f23a7df8dcaef2195edb875ce438700ae97fb2ad1d17a30519bbbc6d6ee8c742dbc1b37d3e4f4da2187acb9c16aaa
 Size (lua-nginx-module-0.10.28.tar.gz) = 869217 bytes
-BLAKE2s (naxsi-1.6-src-with-deps.tar.gz) = 77344405cc235d38328223d325194eee58d0124271a9fcd785de3477a8db52ce
-SHA512 (naxsi-1.6-src-with-deps.tar.gz) = c41e1a51b5642af1cb640b15e9415e073692d7a3baf4d3fceae260cdf9af2a976b3090b40756ce10e162bec6efc9fbc7306569e173bfbe4aab4ac7bcbdd8a075
-Size (naxsi-1.6-src-with-deps.tar.gz) = 3352718 bytes
+BLAKE2s (naxsi-1.7-src-with-deps.tar.gz) = 9283a2193c536ba4ef4b28389313623729e4c0c343f62c8a4d683bf377e0fe4a
+SHA512 (naxsi-1.7-src-with-deps.tar.gz) = 78db1b06e4956854af0e31037db4607c4cc3d06316300af026c1e4349475c85e375bf963718c2def505396d30766f008182128060f0cfc4bb37f06896689fdd2
+Size (naxsi-1.7-src-with-deps.tar.gz) = 3366176 bytes
 BLAKE2s (nchan-1.3.7.tar.gz) = 27da0a52c9123186a321a01b02cb004eed0623110aafa6737dd43ceeff766010
 SHA512 (nchan-1.3.7.tar.gz) = 585c6f9107b84354e7f6c587f85cf554dd5c213b1e3baa75e0aee0b28520afb9cffff1812c32e81541a1f25773fc58d1b92ce6bd9d85accc12f37841633eb79b
 Size (nchan-1.3.7.tar.gz) = 665133 bytes
-BLAKE2s (nginx-1.26.3.tar.gz) = 9c2092ecd456538171132739dd0f7fa13a6cef8ea62d91f0803a125bbae3fc08
-SHA512 (nginx-1.26.3.tar.gz) = cd780e495796bf7413e54a6730d11d55127b0ca6563acf5c75eb2698f62cddbbf5ba61820c57b2316c0bb789fcfd17f98a27a84b525ed50f304d1b1043ffa05d
-Size (nginx-1.26.3.tar.gz) = 1260179 bytes
+BLAKE2s (nginx-1.28.0.tar.gz) = 0cc61c40ca7d17bffc6de6a9132a2cecdc0b3d0d9da70290500284a3e35b1fcf
+SHA512 (nginx-1.28.0.tar.gz) = 07d1ef078a73009c2aff0a5729a57f58f26512b71377715ef72cecdb249ef2ff69dd44df3d755a1de2a2721ee604e8a6cfac30a4cf8a45f0890b1746b68ee4d5
+Size (nginx-1.28.0.tar.gz) = 1280111 bytes
 BLAKE2s (nginx-dav-ext-module-3.0.0.tar.gz) = 8e823ffd605d4fca00eb3ca92a0954ca35fb178397e0b990fea7d47580ee582f
 SHA512 (nginx-dav-ext-module-3.0.0.tar.gz) = d0193ba90f1ef46c4e470630c4394bdf99d94fd2e3bd8be6cb2ba1655ec59944b1269025f032b79dc2c6dad366e54389ef6a6da2ddeb91d535a4027f2162fbde
 Size (nginx-dav-ext-module-3.0.0.tar.gz) = 14558 bytes
@@ -39,9 +39,9 @@ Size (nginx-rtmp-module-1.2.2.tar.gz) = 
 BLAKE2s (nginx-upload-module-2.3.0.tar.gz) = cf47b0c86487450473223a5ec793e294b1dd3dcf8a22a02c2a7a0014aff25545
 SHA512 (nginx-upload-module-2.3.0.tar.gz) = a0da355888398f86a6b5d065e58c05f9e057589ee785be9f515d77d7a020ae5a7b0656f5af30fb3b026f457326db2e26f4fed29026221ec5fc8156ef8586da25
 Size (nginx-upload-module-2.3.0.tar.gz) = 40139 bytes
-BLAKE2s (ngx_cache_purge-2.5.1.tar.gz) = f89badfa0dbc3c338129291d7c56f978d6db0348d5aaa0d723000881ae9b7b8d
-SHA512 (ngx_cache_purge-2.5.1.tar.gz) = 3ad37b4a251fb85a9a384f87fea5ca640166e3d7173c6ed9a857b191ae5f2e93819483b5d423fcafe8a10239b571677b342cc2d2d5d62315816f1316d7d5bb76
-Size (ngx_cache_purge-2.5.1.tar.gz) = 16614 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_devel_kit-0.3.3.tar.gz) = 6d64ff7ddf46f95911b21c78322705bec4e6c6eec069ecc70bb0ae31c0fde54f
 SHA512 (ngx_devel_kit-0.3.3.tar.gz) = a255e3a4a9b902b3e15140dc88bbbb152b0a9cdc64604152de41e1b254e81aa2a1e2c95c06cb4905c1520886acf9070031d63913b53fe98b034f8adad2bccf61
 Size (ngx_devel_kit-0.3.3.tar.gz) = 66561 bytes
@@ -57,15 +57,15 @@ Size (osokin-ngx_http_redis-59eb1c3_GH.t
 BLAKE2s (set-misc-nginx-module-0.33.tar.gz) = 306eb7a96ce5650c7e97a91e9cdba48d154d10cf6445d31193ffab889054d893
 SHA512 (set-misc-nginx-module-0.33.tar.gz) = 1ff4c947538a5bd5f9d6adcd87b37f2702f5cc90e3342bc08359cbe8f290b705a3a2daa3dedfb1df3ce4bc19478c8fcac07081c4a53a804fc2862d50078278dc
 Size (set-misc-nginx-module-0.33.tar.gz) = 30084 bytes
-BLAKE2s (stnoonan-spnego-http-auth-nginx-module-3575542_GH.tar.gz) = 3be4fa1c0c5af43255a0b8e267d9cf9f35b1d7ba4ee0343c5189e38b5af4975e
-SHA512 (stnoonan-spnego-http-auth-nginx-module-3575542_GH.tar.gz) = c15d3a772032a1a490860bd5cdb97779d2004683c754ec02ec21cb19a1d514afe518e12ea1078a22d973c54161211750b07c5e7d4ee103e9be92420b773395d7
-Size (stnoonan-spnego-http-auth-nginx-module-3575542_GH.tar.gz) = 24680 bytes
+BLAKE2s (stnoonan-spnego-http-auth-nginx-module-b62dadb_GH.tar.gz) = 53b3f171cb93a72bc8df123ae70a98fc2da22b63422f964bb9793f2642f97738
+SHA512 (stnoonan-spnego-http-auth-nginx-module-b62dadb_GH.tar.gz) = 59cdc8029df13ae548a917d6c6dd7336a442d91a5ef83ccdbfacca2a6a23683be422f7705c6172318c3febd5fe864b3392ab8ae636c9b0c1e8a3225e8bce7fe5
+Size (stnoonan-spnego-http-auth-nginx-module-b62dadb_GH.tar.gz) = 30460 bytes
 BLAKE2s (vozlt-nginx-module-sts-3c10d42_GH.tar.gz) = f04e586b926c030c8b8461823d3a0a38257c1b88f42012a0386826b6e1d0d6be
 SHA512 (vozlt-nginx-module-sts-3c10d42_GH.tar.gz) = f9253c5f71f28ac5e99a47e07ccb4136ea160399469cd3bfe026a9ff56e9a1ed94f612b3e66db369ada5d98fd1e9372bfdee9b6d76d9727d0c06189be7d9257d
 Size (vozlt-nginx-module-sts-3c10d42_GH.tar.gz) = 352431 bytes
-BLAKE2s (vozlt-nginx-module-vts-bf64dbf_GH.tar.gz) = 5373b024b607ce5e94a066d3ae1bf28637f9b527baecc76cebfc5e4481a8267b
-SHA512 (vozlt-nginx-module-vts-bf64dbf_GH.tar.gz) = 60dc620aced9f7fa73673648974dd29c4a530087e64da3421da9c6fe10a9fc48d585c04af816d220ccc99ea9e39f29d3519064a2ae437c6d1c61430d9be465bb
-Size (vozlt-nginx-module-vts-bf64dbf_GH.tar.gz) = 180394 bytes
+BLAKE2s (vozlt-nginx-module-vts-b6f6528_GH.tar.gz) = 5f629423a0e22028a5d131ed5b129723326745704876eb112f96ca3063c7d656
+SHA512 (vozlt-nginx-module-vts-b6f6528_GH.tar.gz) = d7877aab3487e943f0b4c56d5352d3639c961ecaf7191fcfd509955b2f9462513db031469f459e45d9ff6b456df920505ff4ef3111d6febda03395e6bb213947
+Size (vozlt-nginx-module-vts-b6f6528_GH.tar.gz) = 182368 bytes
 SHA1 (patch-auto_cc_conf) = 5e6a479ba419cd16dedeb3b4c47dc685d126ef6a
 SHA1 (patch-auto_install) = 3b3a0f9f4c005b707664554fa57a58c9e3b7de60
-SHA1 (patch-conf_nginx.conf) = 1235eecd13c30822c2124371f43b5d7450ac7bf5
+SHA1 (patch-conf_nginx.conf) = d2ca1954e9682b9d0007cc02e5841e3986ecf5c1

Index: pkgsrc/www/nginx/options.mk
diff -u pkgsrc/www/nginx/options.mk:1.116 pkgsrc/www/nginx/options.mk:1.117
--- pkgsrc/www/nginx/options.mk:1.116   Thu Apr 17 15:14:32 2025
+++ pkgsrc/www/nginx/options.mk Wed Apr 23 18:33:05 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.116 2025/04/17 15:14:32 osa Exp $
+# $NetBSD: options.mk,v 1.117 2025/04/23 18:33:05 osa Exp $
 
 CODELOAD_SITE_GITHUB=          https://codeload.github.com/
 
@@ -59,6 +59,7 @@ PKG_OPTIONS_LEGACY_OPTS+=     sub:nginx-sub
 PKG_OPTIONS_LEGACY_OPTS+=      upload:nginx-upload
 PKG_OPTIONS_LEGACY_OPTS+=      uwsgi:nginx-uwsgi
 PKG_OPTIONS_LEGACY_OPTS+=      vts:nginx-vts
+PKG_OPTIONS_LEGACY_OPTS+=      v2:http2
 
 .include "../../mk/bsd.options.mk"
 
@@ -73,7 +74,7 @@ _addextmod=           add-module
 
 # documentation says naxsi must be the first module
 .if !empty(PKG_OPTIONS:Mnginx-naxsi) || make(makesum) || make(mdi) || make(distclean)
-NAXSI_VERSION=                 1.6
+NAXSI_VERSION=                 1.7
 NAXSI_DISTFILE=                        naxsi-${NAXSI_VERSION}-src-with-deps.tar.gz
 SITES.${NAXSI_DISTFILE}=       ${MASTER_SITE_GITHUB:=wargio/naxsi/releases/download/${NAXSI_VERSION}/}
 DISTFILES+=                    ${NAXSI_DISTFILE}
@@ -266,7 +267,7 @@ PLIST.forminput=            yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mnginx-headers-more) || make(makesum) || make(mdi) || make(distclean)
-HEADMORE_VERSION=              0.37
+HEADMORE_VERSION=              0.38
 HEADMORE_DISTNAME=             headers-more-nginx-module-${HEADMORE_VERSION}
 HEADMORE_DISTFILE=             ${HEADMORE_DISTNAME}.tar.gz
 SITES.${HEADMORE_DISTFILE}=    -${MASTER_SITE_GITHUB:=openresty/headers-more-nginx-module/archive/}v${HEADMORE_VERSION}.tar.gz
@@ -330,7 +331,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.1
+CPRG_VERSION=          2.5.3
 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
@@ -390,7 +391,7 @@ PLIST.upload=                       yes
 .if !empty(PKG_OPTIONS:Mnginx-gssapi) || make(makesum) || make(mdi) || make(distclean)
 GSSAPI_GH_ACCOUNT=             stnoonan
 GSSAPI_GH_PROJECT=             spnego-http-auth-nginx-module
-GSSAPI_VERSION=                        3575542
+GSSAPI_VERSION=                        b62dadb
 GSSAPI_DISTNAME=               ${GSSAPI_GH_PROJECT}-${GSSAPI_VERSION}
 GSSAPI_DISTFILE=               ${GSSAPI_GH_ACCOUNT}-${GSSAPI_DISTNAME}_GH.tar.gz
 SITES.${GSSAPI_DISTFILE}=      -${CODELOAD_SITE_GITHUB:=${GSSAPI_GH_ACCOUNT}/${GSSAPI_GH_PROJECT}/tar.gz/${GSSAPI_VERSION}?dummy=${GSSAPI_DISTFILE}}
@@ -414,7 +415,7 @@ PLIST.sts=          yes
 .if !empty(PKG_OPTIONS:Mnginx-vts) || make(makesum) || make(mdi) || make(distclean)
 VTS_GH_ACCOUNT=                vozlt
 VTS_GH_PROJECT=                nginx-module-vts
-VTS_VERSION=           bf64dbf
+VTS_VERSION=           b6f6528
 VTS_DISTNAME=          ${VTS_GH_PROJECT}-${VTS_VERSION}
 VTS_DISTFILE=          ${VTS_GH_ACCOUNT}-${VTS_DISTNAME}_GH.tar.gz
 SITES.${VTS_DISTFILE}= -${CODELOAD_SITE_GITHUB:=${VTS_GH_ACCOUNT}/${VTS_GH_PROJECT}/tar.gz/${VTS_VERSION}?dummy=${VTS_DISTFILE}}

Index: pkgsrc/www/nginx/patches/patch-conf_nginx.conf
diff -u pkgsrc/www/nginx/patches/patch-conf_nginx.conf:1.2 pkgsrc/www/nginx/patches/patch-conf_nginx.conf:1.3
--- pkgsrc/www/nginx/patches/patch-conf_nginx.conf:1.2  Wed Nov 13 10:56:36 2024
+++ pkgsrc/www/nginx/patches/patch-conf_nginx.conf      Wed Apr 23 18:33:05 2025
@@ -1,5 +1,6 @@
-$NetBSD: patch-conf_nginx.conf,v 1.2 2024/11/13 10:56:36 wiz Exp $
+$NetBSD: patch-conf_nginx.conf,v 1.3 2025/04/23 18:33:05 osa Exp $
 
+Adapt config file for pkgsrc.
 
 --- conf/nginx.conf.orig       2014-04-24 12:52:24.000000000 +0000
 +++ conf/nginx.conf

Prev by Date: CVS commit: pkgsrc/www/nginx-devel
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/www/nginx-devel
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index