CVS commit: pkgsrc/www/nginx

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

Module Name:    pkgsrc
Committed By:   osa
Date:           Tue May  7 14:15:29 UTC 2024

Modified Files:
        pkgsrc/www/nginx: Makefile distinfo options.mk

Log Message:
www/nginx: update 1.24.0 -> 1.26.0

<ChangeLog>

*) 1.26.x stable branch.

</ChangeLog>


To generate a diff of this commit:
cvs rdiff -u -r1.152 -r1.153 pkgsrc/www/nginx/Makefile
cvs rdiff -u -r1.117 -r1.118 pkgsrc/www/nginx/distinfo
cvs rdiff -u -r1.101 -r1.102 pkgsrc/www/nginx/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/nginx/Makefile
diff -u pkgsrc/www/nginx/Makefile:1.152 pkgsrc/www/nginx/Makefile:1.153
--- pkgsrc/www/nginx/Makefile:1.152     Tue May  7 13:43:55 2024
+++ pkgsrc/www/nginx/Makefile   Tue May  7 14:15:29 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.152 2024/05/07 13:43:55 osa Exp $
+# $NetBSD: Makefile,v 1.153 2024/05/07 14:15:29 osa Exp $
 
-DISTNAME=      nginx-1.24.0
-PKGREVISION=   18
+DISTNAME=      nginx-1.26.0
 CATEGORIES=    www
 MASTER_SITES=  https://nginx.org/download/
 DISTFILES=     ${DEFAULT_DISTFILES}

Index: pkgsrc/www/nginx/distinfo
diff -u pkgsrc/www/nginx/distinfo:1.117 pkgsrc/www/nginx/distinfo:1.118
--- pkgsrc/www/nginx/distinfo:1.117     Tue May  7 13:43:55 2024
+++ pkgsrc/www/nginx/distinfo   Tue May  7 14:15:29 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.117 2024/05/07 13:43:55 osa Exp $
+$NetBSD: distinfo,v 1.118 2024/05/07 14:15:29 osa Exp $
 
 BLAKE2s (array-var-nginx-module-0.06.tar.gz) = fa6ad2a2ce3c3eba3f69287b224e9c01fcaca29a083394ab74f2f655d3e2138b
 SHA512 (array-var-nginx-module-0.06.tar.gz) = bc72158856a1be18a26ee04c6b5b0f0a20bcce688610a493bf31e2a133e7eb12e11f7c18197a09a72b1513f6a08348ee5281b9d5b84cf43603539040ebd23c26
@@ -24,9 +24,9 @@ Size (nbs-system-naxsi-d714f16_GH.tar.gz
 BLAKE2s (nchan-1.3.6.tar.gz) = 1409be69d5589d3643a7cb1f3dd1e4bc8d58c4be801234d52738090c04469255
 SHA512 (nchan-1.3.6.tar.gz) = 0f1c25d460dcf4e3407a1ef4bfcefe17eba7b0ff250f267e5bde0eb4298e9596c1e6992fc58fe35d8420888065353bf3883a1f1bbc5e607a00128992eb1ee6d2
 Size (nchan-1.3.6.tar.gz) = 761436 bytes
-BLAKE2s (nginx-1.24.0.tar.gz) = 05ecd7f1710da91508b7bc0db8632b1347f6f1b87aecf7633e76e8f65f95569a
-SHA512 (nginx-1.24.0.tar.gz) = 1114e37de5664a8109c99cfb2faa1f42ff8ac63c932bcf3780d645e5ed32c0b2ac446f80305b4465994c8f9430604968e176ae464fd80f632d1cb2c8f6007ff3
-Size (nginx-1.24.0.tar.gz) = 1112471 bytes
+BLAKE2s (nginx-1.26.0.tar.gz) = f08cfa731c8dabcc66655c830563ef21c3165e8abe5affe1d1cea181ba11679f
+SHA512 (nginx-1.26.0.tar.gz) = 1f604a4a29f1b74eb56de7f1d8b0e5610fa055280b4ad2d3550c56926460de24da81b17485cffb358d8814061d4a9db1e0e5079af7921f1dc329e283e2775791
+Size (nginx-1.26.0.tar.gz) = 1244118 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

Index: pkgsrc/www/nginx/options.mk
diff -u pkgsrc/www/nginx/options.mk:1.101 pkgsrc/www/nginx/options.mk:1.102
--- pkgsrc/www/nginx/options.mk:1.101   Tue May  7 13:43:55 2024
+++ pkgsrc/www/nginx/options.mk Tue May  7 14:15:29 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.101 2024/05/07 13:43:55 osa Exp $
+# $NetBSD: options.mk,v 1.102 2024/05/07 14:15:29 osa Exp $
 
 CODELOAD_SITE_GITHUB=          https://codeload.github.com/
 
@@ -6,12 +6,12 @@ PKG_OPTIONS_VAR=      PKG_OPTIONS.nginx
 PKG_SUPPORTED_OPTIONS= array-var auth-request cache-purge dav debug
 PKG_SUPPORTED_OPTIONS+=        dso echo encrypted-session flv form-input
 PKG_SUPPORTED_OPTIONS+=        geoip geoip2 gssapi gtools gzip headers-more http2
-PKG_SUPPORTED_OPTIONS+=        image-filter luajit mail-proxy memcache
+PKG_SUPPORTED_OPTIONS+=        http3 image-filter luajit mail-proxy memcache
 PKG_SUPPORTED_OPTIONS+=        naxsi njs njs-xml perl push realip redis rtmp
 PKG_SUPPORTED_OPTIONS+=        secure-link set-misc slice ssl status
 PKG_SUPPORTED_OPTIONS+=        stream-ssl-preread sts sub upload uwsgi vts
 
-PKG_SUGGESTED_OPTIONS= auth-request gzip http2 memcache realip
+PKG_SUGGESTED_OPTIONS= auth-request gzip http2 http3 memcache realip
 PKG_SUGGESTED_OPTIONS+=        slice status ssl uwsgi
 
 PKG_OPTIONS_LEGACY_OPTS+=      v2:http2
@@ -96,6 +96,10 @@ SUBST_NOOP_OK.fix-geo=       yes
 CONFIGURE_ARGS+=       --with-http_v2_module
 .endif
 
+.if !empty(PKG_OPTIONS:Mhttp3)
+CONFIGURE_ARGS+=       --with-http_v3_module
+.endif
+
 .if !empty(PKG_OPTIONS:Msub)
 CONFIGURE_ARGS+=       --with-http_sub_module
 .endif