Tue Jun 1 10:53:46 2021 UTC ()
nginx: updated to 1.20.1

Changes with nginx 1.20.1

*) Security: 1-byte memory overwrite might occur during DNS server
   response processing if the "resolver" directive was used, allowing an
   attacker who is able to forge UDP packets from the DNS server to
   cause worker process crash or, potentially, arbitrary code execution
   (CVE-2021-23017).

nginx-rtmp-module v1.2.2:
Fixed segfaults.


(adam)
diff -r1.100 -r1.101 pkgsrc/www/nginx/Makefile
diff -r1.86 -r1.87 pkgsrc/www/nginx/distinfo
diff -r1.69 -r1.70 pkgsrc/www/nginx/options.mk
cvs diff -r1.100 -r1.101 pkgsrc/www/nginx/Makefile (expand / switch to unified diff)

--- pkgsrc/www/nginx/Makefile 2021/05/24 19:55:17 1.100
+++ pkgsrc/www/nginx/Makefile 2021/06/01 10:53:46 1.101
@@ -1,9 +1,8 @@ @@ -1,9 +1,8 @@
1# $NetBSD: Makefile,v 1.100 2021/05/24 19:55:17 wiz Exp $ 1# $NetBSD: Makefile,v 1.101 2021/06/01 10:53:46 adam Exp $
2 2
3DISTNAME= nginx-1.20.0 3DISTNAME= nginx-1.20.1
4 4
5MAINTAINER= joerg@NetBSD.org 5MAINTAINER= joerg@NetBSD.org
6 6
7PKGREVISION= 1 
8.include "../../www/nginx/Makefile.common" 7.include "../../www/nginx/Makefile.common"
9.include "../../mk/bsd.pkg.mk" 8.include "../../mk/bsd.pkg.mk"
cvs diff -r1.86 -r1.87 pkgsrc/www/nginx/distinfo (expand / switch to unified diff)

--- pkgsrc/www/nginx/distinfo 2021/05/21 11:37:25 1.86
+++ pkgsrc/www/nginx/distinfo 2021/06/01 10:53:46 1.87
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.86 2021/05/21 11:37:25 adam Exp $ 1$NetBSD: distinfo,v 1.87 2021/06/01 10:53:46 adam Exp $
2 2
3SHA1 (array-var-nginx-module-0.05.tar.gz) = c69fac77814947009ab783a471783b3c95a63a26 3SHA1 (array-var-nginx-module-0.05.tar.gz) = c69fac77814947009ab783a471783b3c95a63a26
4RMD160 (array-var-nginx-module-0.05.tar.gz) = 89bd4efc04864e3e90781588a337338951ec8733 4RMD160 (array-var-nginx-module-0.05.tar.gz) = 89bd4efc04864e3e90781588a337338951ec8733
5SHA512 (array-var-nginx-module-0.05.tar.gz) = 7c9fa9b76bc7cd2473ceae6d5ffb8de26993be9293ea967908d6c4550e086affa7016df4c936fb0b79f1142dc0aa1a5f2058d417e6433b5a3497a45d7e866e84 5SHA512 (array-var-nginx-module-0.05.tar.gz) = 7c9fa9b76bc7cd2473ceae6d5ffb8de26993be9293ea967908d6c4550e086affa7016df4c936fb0b79f1142dc0aa1a5f2058d417e6433b5a3497a45d7e866e84
6Size (array-var-nginx-module-0.05.tar.gz) = 11280 bytes 6Size (array-var-nginx-module-0.05.tar.gz) = 11280 bytes
7SHA1 (echo-nginx-module-0.62.tar.gz) = 786ae3880fbf104e57ef4d92872fa9fa8e98623c 7SHA1 (echo-nginx-module-0.62.tar.gz) = 786ae3880fbf104e57ef4d92872fa9fa8e98623c
8RMD160 (echo-nginx-module-0.62.tar.gz) = 2a2099e0436702d42ed3bd74231c099661c14260 8RMD160 (echo-nginx-module-0.62.tar.gz) = 2a2099e0436702d42ed3bd74231c099661c14260
9SHA512 (echo-nginx-module-0.62.tar.gz) = 240896b1c559a71ca6ca87136d8535edd25b1d65ebb80d46080ad41c09ed1cec9737828f9efe260782294d660cea66cf402f4e75bba3fed26f3a94de0ae2f89b 9SHA512 (echo-nginx-module-0.62.tar.gz) = 240896b1c559a71ca6ca87136d8535edd25b1d65ebb80d46080ad41c09ed1cec9737828f9efe260782294d660cea66cf402f4e75bba3fed26f3a94de0ae2f89b
10Size (echo-nginx-module-0.62.tar.gz) = 53329 bytes 10Size (echo-nginx-module-0.62.tar.gz) = 53329 bytes
11SHA1 (encrypted-session-nginx-module-0.08.tar.gz) = 0e36e7ae2553f1ac5566e60021c535efa065c8ab 11SHA1 (encrypted-session-nginx-module-0.08.tar.gz) = 0e36e7ae2553f1ac5566e60021c535efa065c8ab
12RMD160 (encrypted-session-nginx-module-0.08.tar.gz) = becf8617c53c463f49ad853532ce5e4a3b35e073 12RMD160 (encrypted-session-nginx-module-0.08.tar.gz) = becf8617c53c463f49ad853532ce5e4a3b35e073
13SHA512 (encrypted-session-nginx-module-0.08.tar.gz) = 80651951edd69d202e991a66f531bbe0398b4f062e822bb7748411f5f597eb1d5827102ba477bb6cd2793274adf6f6d60dd89fde7645174b091143251197af69 13SHA512 (encrypted-session-nginx-module-0.08.tar.gz) = 80651951edd69d202e991a66f531bbe0398b4f062e822bb7748411f5f597eb1d5827102ba477bb6cd2793274adf6f6d60dd89fde7645174b091143251197af69
14Size (encrypted-session-nginx-module-0.08.tar.gz) = 11802 bytes 14Size (encrypted-session-nginx-module-0.08.tar.gz) = 11802 bytes
@@ -18,38 +18,38 @@ SHA512 (form-input-nginx-module-0.12.tar @@ -18,38 +18,38 @@ SHA512 (form-input-nginx-module-0.12.tar
18Size (form-input-nginx-module-0.12.tar.gz) = 11090 bytes 18Size (form-input-nginx-module-0.12.tar.gz) = 11090 bytes
19SHA1 (headers-more-nginx-module-0.33.tar.gz) = 7d6af910dae98f0dbc67bf77e82eab8b7da5d0b1 19SHA1 (headers-more-nginx-module-0.33.tar.gz) = 7d6af910dae98f0dbc67bf77e82eab8b7da5d0b1
20RMD160 (headers-more-nginx-module-0.33.tar.gz) = fb27195a722e81f533016e693b5a6616fd6b4f72 20RMD160 (headers-more-nginx-module-0.33.tar.gz) = fb27195a722e81f533016e693b5a6616fd6b4f72
21SHA512 (headers-more-nginx-module-0.33.tar.gz) = 13165b1b8d4be281b8bd2404fa48d456013d560bace094c81da08a35dc6a4f025a809a3ae3a42be6bbf67abbcbe41e0730aba06f905220f3baeb01e1192a7d37 21SHA512 (headers-more-nginx-module-0.33.tar.gz) = 13165b1b8d4be281b8bd2404fa48d456013d560bace094c81da08a35dc6a4f025a809a3ae3a42be6bbf67abbcbe41e0730aba06f905220f3baeb01e1192a7d37
22Size (headers-more-nginx-module-0.33.tar.gz) = 28130 bytes 22Size (headers-more-nginx-module-0.33.tar.gz) = 28130 bytes
23SHA1 (lua-nginx-module-0.10.19.tar.gz) = 1fa72fe33f6aa9884e5baf4724f112ac0a157da2 23SHA1 (lua-nginx-module-0.10.19.tar.gz) = 1fa72fe33f6aa9884e5baf4724f112ac0a157da2
24RMD160 (lua-nginx-module-0.10.19.tar.gz) = cd8171fcadbd8f77692ab63b35d7ec66ca66983b 24RMD160 (lua-nginx-module-0.10.19.tar.gz) = cd8171fcadbd8f77692ab63b35d7ec66ca66983b
25SHA512 (lua-nginx-module-0.10.19.tar.gz) = 6b258bdcb45f99f9cec3df14fa6747704ab1f0005f8a2ccd4440f8ec477e3dcbf6026e1acffc9d5fecb79605248168a77bd2a26d67c98c7d5cc336f9474ef68c 25SHA512 (lua-nginx-module-0.10.19.tar.gz) = 6b258bdcb45f99f9cec3df14fa6747704ab1f0005f8a2ccd4440f8ec477e3dcbf6026e1acffc9d5fecb79605248168a77bd2a26d67c98c7d5cc336f9474ef68c
26Size (lua-nginx-module-0.10.19.tar.gz) = 666942 bytes 26Size (lua-nginx-module-0.10.19.tar.gz) = 666942 bytes
27SHA1 (naxsi-1.3.tar.gz) = 53b347687ade9a54f19c0bf41f6c63ae56901789 27SHA1 (naxsi-1.3.tar.gz) = 53b347687ade9a54f19c0bf41f6c63ae56901789
28RMD160 (naxsi-1.3.tar.gz) = c8c9190fcf4e93c504e8815a813c30ee697daded 28RMD160 (naxsi-1.3.tar.gz) = c8c9190fcf4e93c504e8815a813c30ee697daded
29SHA512 (naxsi-1.3.tar.gz) = d7aac69b5eceeb1b0db4741201159ade1e0e7f6f7c3e8c4afa2f8959c6c00c3b5285d5185747c2fb0b1400efda02e96799836315e7e492bb4a059b14acb2142d 29SHA512 (naxsi-1.3.tar.gz) = d7aac69b5eceeb1b0db4741201159ade1e0e7f6f7c3e8c4afa2f8959c6c00c3b5285d5185747c2fb0b1400efda02e96799836315e7e492bb4a059b14acb2142d
30Size (naxsi-1.3.tar.gz) = 235626 bytes 30Size (naxsi-1.3.tar.gz) = 235626 bytes
31SHA1 (nginx-1.20.0.tar.gz) = 71dc4916e9ac7e15b03f7ea71577f72e0dd5dff1 31SHA1 (nginx-1.20.1.tar.gz) = 6b4ab4eff3c617e133819f43fdfc14708e593a79
32RMD160 (nginx-1.20.0.tar.gz) = 5fad14093c97be12ae0c3bd38930419c388134ed 32RMD160 (nginx-1.20.1.tar.gz) = 760aeac8ab9ae68ad2751765487e7cb831186a13
33SHA512 (nginx-1.20.0.tar.gz) = 06433bde23610ab27deeb6bf8c78148e4249b603d194c81e71a08fc159caead07ea659510286fb6d02668d53b9afcdaabdde8692480ae83de4a531adc1b930ca 33SHA512 (nginx-1.20.1.tar.gz) = 3d9fd4bf2740eaf20fcc3c77260a3556aaf9dff2879afc2dbb5fff364dea27313ffbc51d335e9fc9c0186a2a44dac055ef60fde0d411b8cf842fdf661478c961
34Size (nginx-1.20.0.tar.gz) = 1061070 bytes 34Size (nginx-1.20.1.tar.gz) = 1061461 bytes
35SHA1 (nginx-dav-ext-module-3.0.0.tar.gz) = 524407402df7e73df9def85345c8bea324dceede 35SHA1 (nginx-dav-ext-module-3.0.0.tar.gz) = 524407402df7e73df9def85345c8bea324dceede
36RMD160 (nginx-dav-ext-module-3.0.0.tar.gz) = 8d099215bde79492565a39c3c8feb7695138138e 36RMD160 (nginx-dav-ext-module-3.0.0.tar.gz) = 8d099215bde79492565a39c3c8feb7695138138e
37SHA512 (nginx-dav-ext-module-3.0.0.tar.gz) = d0193ba90f1ef46c4e470630c4394bdf99d94fd2e3bd8be6cb2ba1655ec59944b1269025f032b79dc2c6dad366e54389ef6a6da2ddeb91d535a4027f2162fbde 37SHA512 (nginx-dav-ext-module-3.0.0.tar.gz) = d0193ba90f1ef46c4e470630c4394bdf99d94fd2e3bd8be6cb2ba1655ec59944b1269025f032b79dc2c6dad366e54389ef6a6da2ddeb91d535a4027f2162fbde
38Size (nginx-dav-ext-module-3.0.0.tar.gz) = 14558 bytes 38Size (nginx-dav-ext-module-3.0.0.tar.gz) = 14558 bytes
39SHA1 (nginx-rtmp-module-1.2.1.tar.gz) = 7c6ae1afc117e3bf946b0d81f99d41fe538a7245 39SHA1 (nginx-rtmp-module-1.2.2.tar.gz) = fb5cf748d87dd448576d73b057855fc12cad9896
40RMD160 (nginx-rtmp-module-1.2.1.tar.gz) = 5fc0b4ac0b2c0a6d70957a5256754db8a9e934cf 40RMD160 (nginx-rtmp-module-1.2.2.tar.gz) = a19f42e4f15214fd11ac8f334468dc400b86b5bd
41SHA512 (nginx-rtmp-module-1.2.1.tar.gz) = 4a0af5e9afa4deb0b53de8de7ddb2cfa6430d372e1ef9e421f01b509548bd134d427345442ac1ce667338cc2a1484dc2ab732e316e878ac7d3537dc527d5f922 41SHA512 (nginx-rtmp-module-1.2.2.tar.gz) = 3f8c803221854c4b1a06aadc6313fbfec74bd7179c0ee51d4365b26ffa8875881a6e1e48f777a9c9efbb9170ab7478a82920d5448a2c2df485503d37bb03ab81
42Size (nginx-rtmp-module-1.2.1.tar.gz) = 519919 bytes 42Size (nginx-rtmp-module-1.2.2.tar.gz) = 519934 bytes
43SHA1 (nginx_http_push_module-1.2.8.tar.gz) = 1593ae77fc8dd98bc4a9ba2fb78675fd0dedf9d9 43SHA1 (nginx_http_push_module-1.2.8.tar.gz) = 1593ae77fc8dd98bc4a9ba2fb78675fd0dedf9d9
44RMD160 (nginx_http_push_module-1.2.8.tar.gz) = d59a130768a63280b86f760af0cedf7066fdd2f9 44RMD160 (nginx_http_push_module-1.2.8.tar.gz) = d59a130768a63280b86f760af0cedf7066fdd2f9
45SHA512 (nginx_http_push_module-1.2.8.tar.gz) = bea5ce8669f43f752a42f5988125ac1beb7c7904e780605f7706bbb03e9ab4f30a2bcbcddac5bc1c67cff4d92f798023ec320e8d9a2db47953f9f7b08b5ad882 45SHA512 (nginx_http_push_module-1.2.8.tar.gz) = bea5ce8669f43f752a42f5988125ac1beb7c7904e780605f7706bbb03e9ab4f30a2bcbcddac5bc1c67cff4d92f798023ec320e8d9a2db47953f9f7b08b5ad882
46Size (nginx_http_push_module-1.2.8.tar.gz) = 681604 bytes 46Size (nginx_http_push_module-1.2.8.tar.gz) = 681604 bytes
47SHA1 (ngx_cache_purge-2.5.1.tar.gz) = 12069184d255a99a5039a7e9b1299945c6767acc 47SHA1 (ngx_cache_purge-2.5.1.tar.gz) = 12069184d255a99a5039a7e9b1299945c6767acc
48RMD160 (ngx_cache_purge-2.5.1.tar.gz) = 35848113b920593bc99d34b1dfffd4292ce02c58 48RMD160 (ngx_cache_purge-2.5.1.tar.gz) = 35848113b920593bc99d34b1dfffd4292ce02c58
49SHA512 (ngx_cache_purge-2.5.1.tar.gz) = 3ad37b4a251fb85a9a384f87fea5ca640166e3d7173c6ed9a857b191ae5f2e93819483b5d423fcafe8a10239b571677b342cc2d2d5d62315816f1316d7d5bb76 49SHA512 (ngx_cache_purge-2.5.1.tar.gz) = 3ad37b4a251fb85a9a384f87fea5ca640166e3d7173c6ed9a857b191ae5f2e93819483b5d423fcafe8a10239b571677b342cc2d2d5d62315816f1316d7d5bb76
50Size (ngx_cache_purge-2.5.1.tar.gz) = 16614 bytes 50Size (ngx_cache_purge-2.5.1.tar.gz) = 16614 bytes
51SHA1 (ngx_devel_kit-0.3.1.tar.gz) = e15316e13a7b19a3d2502becbb26043a464a135a 51SHA1 (ngx_devel_kit-0.3.1.tar.gz) = e15316e13a7b19a3d2502becbb26043a464a135a
52RMD160 (ngx_devel_kit-0.3.1.tar.gz) = 5c52a463544294096611aa9dec1c76e937a1aa23 52RMD160 (ngx_devel_kit-0.3.1.tar.gz) = 5c52a463544294096611aa9dec1c76e937a1aa23
53SHA512 (ngx_devel_kit-0.3.1.tar.gz) = de1e3349d8dd08e5982279b2219dc8a8006739f0409b8e0f5c50d93434beff1fbafba43e9c5ac85a5fab90afc5c0a7244a340610339c36f82f2cba7233e72de9 53SHA512 (ngx_devel_kit-0.3.1.tar.gz) = de1e3349d8dd08e5982279b2219dc8a8006739f0409b8e0f5c50d93434beff1fbafba43e9c5ac85a5fab90afc5c0a7244a340610339c36f82f2cba7233e72de9
54Size (ngx_devel_kit-0.3.1.tar.gz) = 66542 bytes 54Size (ngx_devel_kit-0.3.1.tar.gz) = 66542 bytes
55SHA1 (ngx_http_geoip2_module-3.3.tar.gz) = 6970ae247494c3890e166747752927c6450d0b32 55SHA1 (ngx_http_geoip2_module-3.3.tar.gz) = 6970ae247494c3890e166747752927c6450d0b32
cvs diff -r1.69 -r1.70 pkgsrc/www/nginx/options.mk (expand / switch to unified diff)

--- pkgsrc/www/nginx/options.mk 2021/04/16 07:09:34 1.69
+++ pkgsrc/www/nginx/options.mk 2021/06/01 10:53:46 1.70
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.69 2021/04/16 07:09:34 adam Exp $ 1# $NetBSD: options.mk,v 1.70 2021/06/01 10:53:46 adam Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.nginx 3PKG_OPTIONS_VAR= PKG_OPTIONS.nginx
4PKG_SUPPORTED_OPTIONS= array-var auth-request cache-purge dav debug 4PKG_SUPPORTED_OPTIONS= array-var auth-request cache-purge dav debug
5PKG_SUPPORTED_OPTIONS+= echo encrypted-session flv form-input 5PKG_SUPPORTED_OPTIONS+= echo encrypted-session flv form-input
6PKG_SUPPORTED_OPTIONS+= geoip geoip2 gtools gzip headers-more http2 6PKG_SUPPORTED_OPTIONS+= geoip geoip2 gtools gzip headers-more http2
7PKG_SUPPORTED_OPTIONS+= image-filter luajit mail-proxy memcache 7PKG_SUPPORTED_OPTIONS+= image-filter luajit mail-proxy memcache
8PKG_SUPPORTED_OPTIONS+= naxsi njs pcre perl push realip rtmp 8PKG_SUPPORTED_OPTIONS+= naxsi njs pcre perl push realip rtmp
9PKG_SUPPORTED_OPTIONS+= secure-link set-misc slice ssl status 9PKG_SUPPORTED_OPTIONS+= secure-link set-misc slice ssl status
10PKG_SUPPORTED_OPTIONS+= stream-ssl-preread sub uwsgi 10PKG_SUPPORTED_OPTIONS+= stream-ssl-preread sub uwsgi
11PKG_SUGGESTED_OPTIONS= pcre ssl 11PKG_SUGGESTED_OPTIONS= pcre ssl
12 12
13PKG_OPTIONS_LEGACY_OPTS+= v2:http2 13PKG_OPTIONS_LEGACY_OPTS+= v2:http2
14 14
@@ -262,27 +262,27 @@ SITES.${CPRG_DISTFILE}= -${MASTER_SITE_G @@ -262,27 +262,27 @@ SITES.${CPRG_DISTFILE}= -${MASTER_SITE_G
262DISTFILES+= ${CPRG_DISTFILE} 262DISTFILES+= ${CPRG_DISTFILE}
263CONFIGURE_ARGS+= --add-module=../${CPRG_DISTNAME} 263CONFIGURE_ARGS+= --add-module=../${CPRG_DISTNAME}
264.endif 264.endif
265 265
266.if !empty(PKG_OPTIONS:Msecure-link) 266.if !empty(PKG_OPTIONS:Msecure-link)
267CONFIGURE_ARGS+= --with-http_secure_link_module 267CONFIGURE_ARGS+= --with-http_secure_link_module
268.endif 268.endif
269 269
270.if !empty(PKG_OPTIONS:Mstream-ssl-preread) 270.if !empty(PKG_OPTIONS:Mstream-ssl-preread)
271CONFIGURE_ARGS+= --with-stream --with-stream_ssl_preread_module 271CONFIGURE_ARGS+= --with-stream --with-stream_ssl_preread_module
272.endif 272.endif
273 273
274.if !empty(PKG_OPTIONS:Mrtmp) || make(makesum) || make(mdi) || make(distclean) 274.if !empty(PKG_OPTIONS:Mrtmp) || make(makesum) || make(mdi) || make(distclean)
275RTMP_VERSION= 1.2.1 275RTMP_VERSION= 1.2.2
276RTMP_DISTNAME= nginx-rtmp-module-${RTMP_VERSION} 276RTMP_DISTNAME= nginx-rtmp-module-${RTMP_VERSION}
277RTMP_DISTFILE= ${RTMP_DISTNAME}.tar.gz 277RTMP_DISTFILE= ${RTMP_DISTNAME}.tar.gz
278SITES.${RTMP_DISTFILE}= -${MASTER_SITE_GITHUB:=arut/nginx-rtmp-module/archive/}v${RTMP_VERSION}.tar.gz 278SITES.${RTMP_DISTFILE}= -${MASTER_SITE_GITHUB:=arut/nginx-rtmp-module/archive/}v${RTMP_VERSION}.tar.gz
279DISTFILES+= ${RTMP_DISTFILE} 279DISTFILES+= ${RTMP_DISTFILE}
280CONFIGURE_ARGS+= --add-module=../${RTMP_DISTNAME} 280CONFIGURE_ARGS+= --add-module=../${RTMP_DISTNAME}
281.endif 281.endif
282 282
283.if !empty(PKG_OPTIONS:Mnjs) || make(makesum) || make(mdi) || make(distclean) 283.if !empty(PKG_OPTIONS:Mnjs) || make(makesum) || make(mdi) || make(distclean)
284NJS_VERSION= 0.5.0 284NJS_VERSION= 0.5.0
285NJS_DISTNAME= njs-${NJS_VERSION} 285NJS_DISTNAME= njs-${NJS_VERSION}
286NJS_DISTFILE= ${NJS_DISTNAME}.tar.gz 286NJS_DISTFILE= ${NJS_DISTNAME}.tar.gz
287SITES.${NJS_DISTFILE}= -${MASTER_SITE_GITHUB:=nginx/njs/archive/}${NJS_VERSION}.tar.gz 287SITES.${NJS_DISTFILE}= -${MASTER_SITE_GITHUB:=nginx/njs/archive/}${NJS_VERSION}.tar.gz
288DISTFILES+= ${NJS_DISTFILE} 288DISTFILES+= ${NJS_DISTFILE}