Tue May 7 14:15:29 2024 UTC (20d)
www/nginx: update 1.24.0 -> 1.26.0

<ChangeLog>

*) 1.26.x stable branch.

</ChangeLog>


(osa)
diff -r1.152 -r1.153 pkgsrc/www/nginx/Makefile
diff -r1.117 -r1.118 pkgsrc/www/nginx/distinfo
diff -r1.101 -r1.102 pkgsrc/www/nginx/options.mk
cvs diff -r1.152 -r1.153 pkgsrc/www/nginx/Makefile (expand / switch to unified diff)

--- pkgsrc/www/nginx/Makefile 2024/05/07 13:43:55 1.152
+++ pkgsrc/www/nginx/Makefile 2024/05/07 14:15:29 1.153
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.152 2024/05/07 13:43:55 osa Exp $ 1# $NetBSD: Makefile,v 1.153 2024/05/07 14:15:29 osa Exp $
2 2
3DISTNAME= nginx-1.24.0 3DISTNAME= nginx-1.26.0
4PKGREVISION= 18 
5CATEGORIES= www 4CATEGORIES= www
6MASTER_SITES= https://nginx.org/download/ 5MASTER_SITES= https://nginx.org/download/
7DISTFILES= ${DEFAULT_DISTFILES} 6DISTFILES= ${DEFAULT_DISTFILES}
8 7
9MAINTAINER= osa@NetBSD.org 8MAINTAINER= osa@NetBSD.org
10HOMEPAGE= https://nginx.org/ 9HOMEPAGE= https://nginx.org/
11COMMENT= Lightweight HTTP server and mail proxy server 10COMMENT= Lightweight HTTP server and mail proxy server
12LICENSE= 2-clause-bsd 11LICENSE= 2-clause-bsd
13 12
14CONFLICTS= nginx-devel-[0-9]* 13CONFLICTS= nginx-devel-[0-9]*
15 14
16.include "../../mk/bsd.prefs.mk" 15.include "../../mk/bsd.prefs.mk"
17 16
cvs diff -r1.117 -r1.118 pkgsrc/www/nginx/distinfo (expand / switch to unified diff)

--- pkgsrc/www/nginx/distinfo 2024/05/07 13:43:55 1.117
+++ pkgsrc/www/nginx/distinfo 2024/05/07 14:15:29 1.118
@@ -1,42 +1,42 @@ @@ -1,42 +1,42 @@
1$NetBSD: distinfo,v 1.117 2024/05/07 13:43:55 osa Exp $ 1$NetBSD: distinfo,v 1.118 2024/05/07 14:15:29 osa Exp $
2 2
3BLAKE2s (array-var-nginx-module-0.06.tar.gz) = fa6ad2a2ce3c3eba3f69287b224e9c01fcaca29a083394ab74f2f655d3e2138b 3BLAKE2s (array-var-nginx-module-0.06.tar.gz) = fa6ad2a2ce3c3eba3f69287b224e9c01fcaca29a083394ab74f2f655d3e2138b
4SHA512 (array-var-nginx-module-0.06.tar.gz) = bc72158856a1be18a26ee04c6b5b0f0a20bcce688610a493bf31e2a133e7eb12e11f7c18197a09a72b1513f6a08348ee5281b9d5b84cf43603539040ebd23c26 4SHA512 (array-var-nginx-module-0.06.tar.gz) = bc72158856a1be18a26ee04c6b5b0f0a20bcce688610a493bf31e2a133e7eb12e11f7c18197a09a72b1513f6a08348ee5281b9d5b84cf43603539040ebd23c26
5Size (array-var-nginx-module-0.06.tar.gz) = 12005 bytes 5Size (array-var-nginx-module-0.06.tar.gz) = 12005 bytes
6BLAKE2s (echo-nginx-module-0.63.tar.gz) = 851331998dffdd3dfa9873c2cce5ae81bf7522047c6066fe805b5c74abb62a08 6BLAKE2s (echo-nginx-module-0.63.tar.gz) = 851331998dffdd3dfa9873c2cce5ae81bf7522047c6066fe805b5c74abb62a08
7SHA512 (echo-nginx-module-0.63.tar.gz) = c325ac4e3f3f735739e156d8c7ada503b34475c62533b4830231ff1b42c25cb0c841aae06b3448b589c2ab35da8d211436ed194d6fd062cad925af8152c5e789 7SHA512 (echo-nginx-module-0.63.tar.gz) = c325ac4e3f3f735739e156d8c7ada503b34475c62533b4830231ff1b42c25cb0c841aae06b3448b589c2ab35da8d211436ed194d6fd062cad925af8152c5e789
8Size (echo-nginx-module-0.63.tar.gz) = 53421 bytes 8Size (echo-nginx-module-0.63.tar.gz) = 53421 bytes
9BLAKE2s (encrypted-session-nginx-module-0.09.tar.gz) = 696be087d7aa0144d212f2753423489677e78ba3bb97dbfeb30cadbe08cd7b0a 9BLAKE2s (encrypted-session-nginx-module-0.09.tar.gz) = 696be087d7aa0144d212f2753423489677e78ba3bb97dbfeb30cadbe08cd7b0a
10SHA512 (encrypted-session-nginx-module-0.09.tar.gz) = 399ce2690e85ee27802e8031954a1a3aa3fdc9246e17323a72a298d235931a8dbebdcb121ac8788e074872df0ef5b5a8a3d512b17fbe860b38f696ce42de3655 10SHA512 (encrypted-session-nginx-module-0.09.tar.gz) = 399ce2690e85ee27802e8031954a1a3aa3fdc9246e17323a72a298d235931a8dbebdcb121ac8788e074872df0ef5b5a8a3d512b17fbe860b38f696ce42de3655
11Size (encrypted-session-nginx-module-0.09.tar.gz) = 11847 bytes 11Size (encrypted-session-nginx-module-0.09.tar.gz) = 11847 bytes
12BLAKE2s (form-input-nginx-module-0.12.tar.gz) = b08fc95c3e15bfdc0846e2d1e8157171954f353bd301f4ac4aca56113620e91d 12BLAKE2s (form-input-nginx-module-0.12.tar.gz) = b08fc95c3e15bfdc0846e2d1e8157171954f353bd301f4ac4aca56113620e91d
13SHA512 (form-input-nginx-module-0.12.tar.gz) = 1c5c5ab74156cac09da44a2dcdd84f7c03c9919a23a847e63613e00e3781ecd73d5ad12446174b4fdef9d064257a31570a8dbcccc00d8266f7048e3dcde0362e 13SHA512 (form-input-nginx-module-0.12.tar.gz) = 1c5c5ab74156cac09da44a2dcdd84f7c03c9919a23a847e63613e00e3781ecd73d5ad12446174b4fdef9d064257a31570a8dbcccc00d8266f7048e3dcde0362e
14Size (form-input-nginx-module-0.12.tar.gz) = 11090 bytes 14Size (form-input-nginx-module-0.12.tar.gz) = 11090 bytes
15BLAKE2s (headers-more-nginx-module-0.37.tar.gz) = 0c41b4b1f8b3a12c9c55d4e18892592e4fa7499f98525a432ac54cc38951a725 15BLAKE2s (headers-more-nginx-module-0.37.tar.gz) = 0c41b4b1f8b3a12c9c55d4e18892592e4fa7499f98525a432ac54cc38951a725
16SHA512 (headers-more-nginx-module-0.37.tar.gz) = 0cc2fffe506194d439e3669644d41b7943e2c3cffa3483eb70b92067930b358d506a14646eff8362b191a11c624db29f6b53d830876929dcb4ce1c9d7b2bc40d 16SHA512 (headers-more-nginx-module-0.37.tar.gz) = 0cc2fffe506194d439e3669644d41b7943e2c3cffa3483eb70b92067930b358d506a14646eff8362b191a11c624db29f6b53d830876929dcb4ce1c9d7b2bc40d
17Size (headers-more-nginx-module-0.37.tar.gz) = 29433 bytes 17Size (headers-more-nginx-module-0.37.tar.gz) = 29433 bytes
18BLAKE2s (lua-nginx-module-0.10.26.tar.gz) = a8b1a1209f11e15165db96a8459d5639debaf79e83231cf3d2640b8dcbaae20b 18BLAKE2s (lua-nginx-module-0.10.26.tar.gz) = a8b1a1209f11e15165db96a8459d5639debaf79e83231cf3d2640b8dcbaae20b
19SHA512 (lua-nginx-module-0.10.26.tar.gz) = 9abf00844ef00ce1dc5ff08d6fe4ddccf843f2ad2de6fd450854b38a66b45add71e814205dba9b19225b9165e67eb93578e83e5fe37af4e0c891e61e6a6bfb3d 19SHA512 (lua-nginx-module-0.10.26.tar.gz) = 9abf00844ef00ce1dc5ff08d6fe4ddccf843f2ad2de6fd450854b38a66b45add71e814205dba9b19225b9165e67eb93578e83e5fe37af4e0c891e61e6a6bfb3d
20Size (lua-nginx-module-0.10.26.tar.gz) = 745785 bytes 20Size (lua-nginx-module-0.10.26.tar.gz) = 745785 bytes
21BLAKE2s (nbs-system-naxsi-d714f16_GH.tar.gz) = ca56821b8bfac03429fc8adaf30302ac70c31b48b865918139ecdacb24eb4156 21BLAKE2s (nbs-system-naxsi-d714f16_GH.tar.gz) = ca56821b8bfac03429fc8adaf30302ac70c31b48b865918139ecdacb24eb4156
22SHA512 (nbs-system-naxsi-d714f16_GH.tar.gz) = 84abd90f3971450b9413546809332e263c4332b625a0b51f8b342adb407e1e5bc81a2b0b75e2d50e87d63d20d0c3f271391c9d4821f0d01069a133b066bfb05b 22SHA512 (nbs-system-naxsi-d714f16_GH.tar.gz) = 84abd90f3971450b9413546809332e263c4332b625a0b51f8b342adb407e1e5bc81a2b0b75e2d50e87d63d20d0c3f271391c9d4821f0d01069a133b066bfb05b
23Size (nbs-system-naxsi-d714f16_GH.tar.gz) = 236940 bytes 23Size (nbs-system-naxsi-d714f16_GH.tar.gz) = 236940 bytes
24BLAKE2s (nchan-1.3.6.tar.gz) = 1409be69d5589d3643a7cb1f3dd1e4bc8d58c4be801234d52738090c04469255 24BLAKE2s (nchan-1.3.6.tar.gz) = 1409be69d5589d3643a7cb1f3dd1e4bc8d58c4be801234d52738090c04469255
25SHA512 (nchan-1.3.6.tar.gz) = 0f1c25d460dcf4e3407a1ef4bfcefe17eba7b0ff250f267e5bde0eb4298e9596c1e6992fc58fe35d8420888065353bf3883a1f1bbc5e607a00128992eb1ee6d2 25SHA512 (nchan-1.3.6.tar.gz) = 0f1c25d460dcf4e3407a1ef4bfcefe17eba7b0ff250f267e5bde0eb4298e9596c1e6992fc58fe35d8420888065353bf3883a1f1bbc5e607a00128992eb1ee6d2
26Size (nchan-1.3.6.tar.gz) = 761436 bytes 26Size (nchan-1.3.6.tar.gz) = 761436 bytes
27BLAKE2s (nginx-1.24.0.tar.gz) = 05ecd7f1710da91508b7bc0db8632b1347f6f1b87aecf7633e76e8f65f95569a 27BLAKE2s (nginx-1.26.0.tar.gz) = f08cfa731c8dabcc66655c830563ef21c3165e8abe5affe1d1cea181ba11679f
28SHA512 (nginx-1.24.0.tar.gz) = 1114e37de5664a8109c99cfb2faa1f42ff8ac63c932bcf3780d645e5ed32c0b2ac446f80305b4465994c8f9430604968e176ae464fd80f632d1cb2c8f6007ff3 28SHA512 (nginx-1.26.0.tar.gz) = 1f604a4a29f1b74eb56de7f1d8b0e5610fa055280b4ad2d3550c56926460de24da81b17485cffb358d8814061d4a9db1e0e5079af7921f1dc329e283e2775791
29Size (nginx-1.24.0.tar.gz) = 1112471 bytes 29Size (nginx-1.26.0.tar.gz) = 1244118 bytes
30BLAKE2s (nginx-dav-ext-module-3.0.0.tar.gz) = 8e823ffd605d4fca00eb3ca92a0954ca35fb178397e0b990fea7d47580ee582f 30BLAKE2s (nginx-dav-ext-module-3.0.0.tar.gz) = 8e823ffd605d4fca00eb3ca92a0954ca35fb178397e0b990fea7d47580ee582f
31SHA512 (nginx-dav-ext-module-3.0.0.tar.gz) = d0193ba90f1ef46c4e470630c4394bdf99d94fd2e3bd8be6cb2ba1655ec59944b1269025f032b79dc2c6dad366e54389ef6a6da2ddeb91d535a4027f2162fbde 31SHA512 (nginx-dav-ext-module-3.0.0.tar.gz) = d0193ba90f1ef46c4e470630c4394bdf99d94fd2e3bd8be6cb2ba1655ec59944b1269025f032b79dc2c6dad366e54389ef6a6da2ddeb91d535a4027f2162fbde
32Size (nginx-dav-ext-module-3.0.0.tar.gz) = 14558 bytes 32Size (nginx-dav-ext-module-3.0.0.tar.gz) = 14558 bytes
33BLAKE2s (nginx-rtmp-module-1.2.2.tar.gz) = 5de03b71bb16b4129f1a2a99446f65ef6eeb3fd48bfc925e94fc27e99da3c069 33BLAKE2s (nginx-rtmp-module-1.2.2.tar.gz) = 5de03b71bb16b4129f1a2a99446f65ef6eeb3fd48bfc925e94fc27e99da3c069
34SHA512 (nginx-rtmp-module-1.2.2.tar.gz) = 3f8c803221854c4b1a06aadc6313fbfec74bd7179c0ee51d4365b26ffa8875881a6e1e48f777a9c9efbb9170ab7478a82920d5448a2c2df485503d37bb03ab81 34SHA512 (nginx-rtmp-module-1.2.2.tar.gz) = 3f8c803221854c4b1a06aadc6313fbfec74bd7179c0ee51d4365b26ffa8875881a6e1e48f777a9c9efbb9170ab7478a82920d5448a2c2df485503d37bb03ab81
35Size (nginx-rtmp-module-1.2.2.tar.gz) = 519934 bytes 35Size (nginx-rtmp-module-1.2.2.tar.gz) = 519934 bytes
36BLAKE2s (nginx-upload-module-2.3.0.tar.gz) = cf47b0c86487450473223a5ec793e294b1dd3dcf8a22a02c2a7a0014aff25545 36BLAKE2s (nginx-upload-module-2.3.0.tar.gz) = cf47b0c86487450473223a5ec793e294b1dd3dcf8a22a02c2a7a0014aff25545
37SHA512 (nginx-upload-module-2.3.0.tar.gz) = a0da355888398f86a6b5d065e58c05f9e057589ee785be9f515d77d7a020ae5a7b0656f5af30fb3b026f457326db2e26f4fed29026221ec5fc8156ef8586da25 37SHA512 (nginx-upload-module-2.3.0.tar.gz) = a0da355888398f86a6b5d065e58c05f9e057589ee785be9f515d77d7a020ae5a7b0656f5af30fb3b026f457326db2e26f4fed29026221ec5fc8156ef8586da25
38Size (nginx-upload-module-2.3.0.tar.gz) = 40139 bytes 38Size (nginx-upload-module-2.3.0.tar.gz) = 40139 bytes
39BLAKE2s (ngx_cache_purge-2.5.1.tar.gz) = f89badfa0dbc3c338129291d7c56f978d6db0348d5aaa0d723000881ae9b7b8d 39BLAKE2s (ngx_cache_purge-2.5.1.tar.gz) = f89badfa0dbc3c338129291d7c56f978d6db0348d5aaa0d723000881ae9b7b8d
40SHA512 (ngx_cache_purge-2.5.1.tar.gz) = 3ad37b4a251fb85a9a384f87fea5ca640166e3d7173c6ed9a857b191ae5f2e93819483b5d423fcafe8a10239b571677b342cc2d2d5d62315816f1316d7d5bb76 40SHA512 (ngx_cache_purge-2.5.1.tar.gz) = 3ad37b4a251fb85a9a384f87fea5ca640166e3d7173c6ed9a857b191ae5f2e93819483b5d423fcafe8a10239b571677b342cc2d2d5d62315816f1316d7d5bb76
41Size (ngx_cache_purge-2.5.1.tar.gz) = 16614 bytes 41Size (ngx_cache_purge-2.5.1.tar.gz) = 16614 bytes
42BLAKE2s (ngx_devel_kit-0.3.3.tar.gz) = 6d64ff7ddf46f95911b21c78322705bec4e6c6eec069ecc70bb0ae31c0fde54f 42BLAKE2s (ngx_devel_kit-0.3.3.tar.gz) = 6d64ff7ddf46f95911b21c78322705bec4e6c6eec069ecc70bb0ae31c0fde54f
cvs diff -r1.101 -r1.102 pkgsrc/www/nginx/options.mk (expand / switch to unified diff)

--- pkgsrc/www/nginx/options.mk 2024/05/07 13:43:55 1.101
+++ pkgsrc/www/nginx/options.mk 2024/05/07 14:15:29 1.102
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1# $NetBSD: options.mk,v 1.101 2024/05/07 13:43:55 osa Exp $ 1# $NetBSD: options.mk,v 1.102 2024/05/07 14:15:29 osa Exp $
2 2
3CODELOAD_SITE_GITHUB= https://codeload.github.com/ 3CODELOAD_SITE_GITHUB= https://codeload.github.com/
4 4
5PKG_OPTIONS_VAR= PKG_OPTIONS.nginx 5PKG_OPTIONS_VAR= PKG_OPTIONS.nginx
6PKG_SUPPORTED_OPTIONS= array-var auth-request cache-purge dav debug 6PKG_SUPPORTED_OPTIONS= array-var auth-request cache-purge dav debug
7PKG_SUPPORTED_OPTIONS+= dso echo encrypted-session flv form-input 7PKG_SUPPORTED_OPTIONS+= dso echo encrypted-session flv form-input
8PKG_SUPPORTED_OPTIONS+= geoip geoip2 gssapi gtools gzip headers-more http2 8PKG_SUPPORTED_OPTIONS+= geoip geoip2 gssapi gtools gzip headers-more http2
9PKG_SUPPORTED_OPTIONS+= image-filter luajit mail-proxy memcache 9PKG_SUPPORTED_OPTIONS+= http3 image-filter luajit mail-proxy memcache
10PKG_SUPPORTED_OPTIONS+= naxsi njs njs-xml perl push realip redis rtmp 10PKG_SUPPORTED_OPTIONS+= naxsi njs njs-xml perl push realip redis rtmp
11PKG_SUPPORTED_OPTIONS+= secure-link set-misc slice ssl status 11PKG_SUPPORTED_OPTIONS+= secure-link set-misc slice ssl status
12PKG_SUPPORTED_OPTIONS+= stream-ssl-preread sts sub upload uwsgi vts 12PKG_SUPPORTED_OPTIONS+= stream-ssl-preread sts sub upload uwsgi vts
13 13
14PKG_SUGGESTED_OPTIONS= auth-request gzip http2 memcache realip 14PKG_SUGGESTED_OPTIONS= auth-request gzip http2 http3 memcache realip
15PKG_SUGGESTED_OPTIONS+= slice status ssl uwsgi 15PKG_SUGGESTED_OPTIONS+= slice status ssl uwsgi
16 16
17PKG_OPTIONS_LEGACY_OPTS+= v2:http2 17PKG_OPTIONS_LEGACY_OPTS+= v2:http2
18 18
19PLIST_VARS+= arrayvar cprg dav dso echo encses forminput geoip2 19PLIST_VARS+= arrayvar cprg dav dso echo encses forminput geoip2
20PLIST_VARS+= gssapi headmore imagefilter lua mail naxsi nchan ndk njs 20PLIST_VARS+= gssapi headmore imagefilter lua mail naxsi nchan ndk njs
21PLIST_VARS+= perl redis rtmp setmisc stream sts upload uwsgi vts 21PLIST_VARS+= perl redis rtmp setmisc stream sts upload uwsgi vts
22 22
23.include "../../mk/bsd.options.mk" 23.include "../../mk/bsd.options.mk"
24 24
25.if !empty(PKG_OPTIONS:Mdso) 25.if !empty(PKG_OPTIONS:Mdso)
26CONFIGURE_ARGS+= --modules-path=${PREFIX}/libexec/nginx 26CONFIGURE_ARGS+= --modules-path=${PREFIX}/libexec/nginx
27_addbasemod= =dynamic 27_addbasemod= =dynamic
@@ -86,26 +86,30 @@ CONFIGURE_ARGS+= --with-http_flv_module @@ -86,26 +86,30 @@ CONFIGURE_ARGS+= --with-http_flv_module
86.include "../../net/GeoIP/buildlink3.mk" 86.include "../../net/GeoIP/buildlink3.mk"
87CONFIGURE_ARGS+= --with-http_geoip_module 87CONFIGURE_ARGS+= --with-http_geoip_module
88SUBST_CLASSES+= fix-geo 88SUBST_CLASSES+= fix-geo
89SUBST_STAGE.fix-geo= pre-configure 89SUBST_STAGE.fix-geo= pre-configure
90SUBST_FILES.fix-geo= auto/lib/geoip/conf 90SUBST_FILES.fix-geo= auto/lib/geoip/conf
91SUBST_SED.fix-geo= -e 's,/usr/pkg,${BUILDLINK_PREFIX.GeoIP},g' 91SUBST_SED.fix-geo= -e 's,/usr/pkg,${BUILDLINK_PREFIX.GeoIP},g'
92SUBST_NOOP_OK.fix-geo= yes 92SUBST_NOOP_OK.fix-geo= yes
93.endif 93.endif
94 94
95.if !empty(PKG_OPTIONS:Mhttp2) 95.if !empty(PKG_OPTIONS:Mhttp2)
96CONFIGURE_ARGS+= --with-http_v2_module 96CONFIGURE_ARGS+= --with-http_v2_module
97.endif 97.endif
98 98
 99.if !empty(PKG_OPTIONS:Mhttp3)
 100CONFIGURE_ARGS+= --with-http_v3_module
 101.endif
 102
99.if !empty(PKG_OPTIONS:Msub) 103.if !empty(PKG_OPTIONS:Msub)
100CONFIGURE_ARGS+= --with-http_sub_module 104CONFIGURE_ARGS+= --with-http_sub_module
101.endif 105.endif
102 106
103.if !empty(PKG_OPTIONS:Mgtools) 107.if !empty(PKG_OPTIONS:Mgtools)
104CONFIGURE_ARGS+= --with-google_perftools_module 108CONFIGURE_ARGS+= --with-google_perftools_module
105.include "../../devel/gperftools/buildlink3.mk" 109.include "../../devel/gperftools/buildlink3.mk"
106.endif 110.endif
107 111
108.if !empty(PKG_OPTIONS:Mmail-proxy) 112.if !empty(PKG_OPTIONS:Mmail-proxy)
109DSO_BASEMODS+= mail 113DSO_BASEMODS+= mail
110PLIST.mail= yes 114PLIST.mail= yes
111.endif 115.endif