Received: by mail.netbsd.org (Postfix, from userid 605) id 4EF9F84EA8; Wed, 29 Mar 2023 08:32:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7A77F84E8F for ; Wed, 29 Mar 2023 08:32:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id XEjf6tMj6pCj for ; Wed, 29 Mar 2023 08:32:53 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 0142984EDB for ; Wed, 29 Mar 2023 08:32:52 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id F3200F9F4; Wed, 29 Mar 2023 08:32:52 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_168007877257460" MIME-Version: 1.0 Date: Wed, 29 Mar 2023 08:32:52 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/www/nginx-devel To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20230329083252.F3200F9F4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_168007877257460 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Wed Mar 29 08:32:52 UTC 2023 Modified Files: pkgsrc/www/nginx-devel: Makefile PLIST distinfo options.mk Removed Files: pkgsrc/www/nginx-devel/patches: extra-patch-lua-nginx-module Log Message: nginx-devel: updated to 1.23.4 Changes with nginx 1.23.4 28 Mar 2023 *) Change: now TLSv1.3 protocol is enabled by default. *) Change: now nginx issues a warning if protocol parameters of a listening socket are redefined. *) Change: now nginx closes connections with lingering if pipelining was used by the client. *) Feature: byte ranges support in the ngx_http_gzip_static_module. *) Bugfix: port ranges in the "listen" directive did not work; the bug had appeared in 1.23.3. Thanks to Valentin Bartenev. *) Bugfix: incorrect location might be chosen to process a request if a prefix location longer than 255 characters was used in the configuration. *) Bugfix: non-ASCII characters in file names on Windows were not supported by the ngx_http_autoindex_module, the ngx_http_dav_module, and the "include" directive. *) Change: the logging level of the "data length too long", "length too short", "bad legacy version", "no shared signature algorithms", "bad digest length", "missing sigalgs extension", "encrypted length too long", "bad length", "bad key update", "mixed handshake and non handshake data", "ccs received early", "data between ccs and finished", "packet length too long", "too many warn alerts", "record too small", and "got a fin before a ccs" SSL errors has been lowered from "crit" to "info". *) Bugfix: a socket leak might occur when using HTTP/2 and the "error_page" directive to redirect errors with code 400. *) Bugfix: messages about logging to syslog errors did not contain information that the errors happened while logging to syslog. Thanks to Safar Safarly. *) Workaround: "gzip filter failed to use preallocated memory" alerts appeared in logs when using zlib-ng. *) Bugfix: in the mail proxy server. To generate a diff of this commit: cvs rdiff -u -r1.97 -r1.98 pkgsrc/www/nginx-devel/Makefile cvs rdiff -u -r1.9 -r1.10 pkgsrc/www/nginx-devel/PLIST cvs rdiff -u -r1.88 -r1.89 pkgsrc/www/nginx-devel/distinfo cvs rdiff -u -r1.15 -r1.16 pkgsrc/www/nginx-devel/options.mk cvs rdiff -u -r1.2 -r0 \ pkgsrc/www/nginx-devel/patches/extra-patch-lua-nginx-module Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_168007877257460 Content-Disposition: inline Content-Length: 12600 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/nginx-devel/Makefile diff -u pkgsrc/www/nginx-devel/Makefile:1.97 pkgsrc/www/nginx-devel/Makefile:1.98 --- pkgsrc/www/nginx-devel/Makefile:1.97 Sun Jan 29 21:18:05 2023 +++ pkgsrc/www/nginx-devel/Makefile Wed Mar 29 08:32:52 2023 @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.97 2023/01/29 21:18:05 ryoon Exp $ +# $NetBSD: Makefile,v 1.98 2023/03/29 08:32:52 adam Exp $ -DISTNAME= nginx-1.23.3 +DISTNAME= nginx-1.23.4 PKGNAME= ${DISTNAME:S/-/-devel-/1} -PKGREVISION= 2 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ DISTFILES= ${DEFAULT_DISTFILES} @@ -97,9 +96,6 @@ SOEXT= so PLIST_SUBST+= SOEXT=${SOEXT} post-patch: -.if !empty(PKG_OPTIONS:Mluajit) - (cd ${WRKSRC}/ && patch -p1 <${PATCHDIR}/extra-patch-lua-nginx-module) -.endif .if !empty(PKG_OPTIONS:Mnaxsi) (cd ${WRKSRC}/ && patch <${PATCHDIR}/extra-patch-naxsi_runtime.c) .endif Index: pkgsrc/www/nginx-devel/PLIST diff -u pkgsrc/www/nginx-devel/PLIST:1.9 pkgsrc/www/nginx-devel/PLIST:1.10 --- pkgsrc/www/nginx-devel/PLIST:1.9 Thu Jul 14 10:21:20 2022 +++ pkgsrc/www/nginx-devel/PLIST Wed Mar 29 08:32:52 2023 @@ -1,4 +1,7 @@ -@comment $NetBSD: PLIST,v 1.9 2022/07/14 10:21:20 osa Exp $ +@comment $NetBSD: PLIST,v 1.10 2023/03/29 08:32:52 adam Exp $ +${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/nginx/nginx.${SOEXT} +${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/nginx.pm +${PLIST.dso}${PLIST.ndk}libexec/nginx/ndk_http_module.so ${PLIST.dso}${PLIST.arrayvar}libexec/nginx/ngx_http_array_var_module.so ${PLIST.dso}${PLIST.cprg}libexec/nginx/ngx_http_cache_purge_module.so ${PLIST.dso}${PLIST.dav}libexec/nginx/ngx_http_dav_ext_module.so @@ -6,23 +9,20 @@ ${PLIST.dso}${PLIST.echo}libexec/nginx/n ${PLIST.dso}${PLIST.encses}libexec/nginx/ngx_http_encrypted_session_module.so ${PLIST.dso}${PLIST.forminput}libexec/nginx/ngx_http_form_input_module.so ${PLIST.dso}${PLIST.geoip2}libexec/nginx/ngx_http_geoip2_module.so -${PLIST.dso}${PLIST.geoip2}libexec/nginx/ngx_stream_geoip2_module.so ${PLIST.dso}${PLIST.headmore}libexec/nginx/ngx_http_headers_more_filter_module.so ${PLIST.dso}${PLIST.imagefilter}libexec/nginx/ngx_http_image_filter_module.so +${PLIST.dso}${PLIST.njs}libexec/nginx/ngx_http_js_module.so ${PLIST.dso}${PLIST.lua}libexec/nginx/ngx_http_lua_module.so -${PLIST.dso}${PLIST.mail}libexec/nginx/ngx_mail_module.so ${PLIST.dso}${PLIST.naxsi}libexec/nginx/ngx_http_naxsi_module.so -${PLIST.dso}${PLIST.nchan}libexec/nginx/ngx_nchan_module.so -${PLIST.dso}${PLIST.ndk}libexec/nginx/ndk_http_module.so -${PLIST.dso}${PLIST.njs}libexec/nginx/ngx_http_js_module.so -${PLIST.dso}${PLIST.njs}libexec/nginx/ngx_stream_js_module.so ${PLIST.dso}${PLIST.perl}libexec/nginx/ngx_http_perl_module.so -${PLIST.dso}${PLIST.rtmp}libexec/nginx/ngx_rtmp_module.so ${PLIST.dso}${PLIST.setmisc}libexec/nginx/ngx_http_set_misc_module.so -${PLIST.dso}${PLIST.stream}libexec/nginx/ngx_stream_module.so ${PLIST.dso}${PLIST.upload}libexec/nginx/ngx_http_upload_module.so -${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/nginx/nginx.${SOEXT} -${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/nginx.pm +${PLIST.dso}${PLIST.mail}libexec/nginx/ngx_mail_module.so +${PLIST.dso}${PLIST.nchan}libexec/nginx/ngx_nchan_module.so +${PLIST.dso}${PLIST.rtmp}libexec/nginx/ngx_rtmp_module.so +${PLIST.dso}${PLIST.geoip2}libexec/nginx/ngx_stream_geoip2_module.so +${PLIST.dso}${PLIST.njs}libexec/nginx/ngx_stream_js_module.so +${PLIST.dso}${PLIST.stream}libexec/nginx/ngx_stream_module.so man/man8/nginx.8 sbin/nginx share/examples/nginx/conf/fastcgi.conf Index: pkgsrc/www/nginx-devel/distinfo diff -u pkgsrc/www/nginx-devel/distinfo:1.88 pkgsrc/www/nginx-devel/distinfo:1.89 --- pkgsrc/www/nginx-devel/distinfo:1.88 Tue Dec 13 17:53:02 2022 +++ pkgsrc/www/nginx-devel/distinfo Wed Mar 29 08:32:52 2023 @@ -1,29 +1,32 @@ -$NetBSD: distinfo,v 1.88 2022/12/13 17:53:02 osa Exp $ +$NetBSD: distinfo,v 1.89 2023/03/29 08:32:52 adam Exp $ -BLAKE2s (array-var-nginx-module-0.05.tar.gz) = 2f9af1e0eb209b7c20aa58cd8ec2afb1eb1cc122c5f4ea169e34131c463c1c26 -SHA512 (array-var-nginx-module-0.05.tar.gz) = 7c9fa9b76bc7cd2473ceae6d5ffb8de26993be9293ea967908d6c4550e086affa7016df4c936fb0b79f1142dc0aa1a5f2058d417e6433b5a3497a45d7e866e84 -Size (array-var-nginx-module-0.05.tar.gz) = 11280 bytes -BLAKE2s (echo-nginx-module-0.62.tar.gz) = 8dc4bfc7e905f35b12cd432dca98067b03fd6f2cffd36ffe93158738ab5d32dc -SHA512 (echo-nginx-module-0.62.tar.gz) = 240896b1c559a71ca6ca87136d8535edd25b1d65ebb80d46080ad41c09ed1cec9737828f9efe260782294d660cea66cf402f4e75bba3fed26f3a94de0ae2f89b -Size (echo-nginx-module-0.62.tar.gz) = 53329 bytes +BLAKE2s (array-var-nginx-module-0.06.tar.gz) = fa6ad2a2ce3c3eba3f69287b224e9c01fcaca29a083394ab74f2f655d3e2138b +SHA512 (array-var-nginx-module-0.06.tar.gz) = bc72158856a1be18a26ee04c6b5b0f0a20bcce688610a493bf31e2a133e7eb12e11f7c18197a09a72b1513f6a08348ee5281b9d5b84cf43603539040ebd23c26 +Size (array-var-nginx-module-0.06.tar.gz) = 12005 bytes +BLAKE2s (echo-nginx-module-0.63.tar.gz) = 851331998dffdd3dfa9873c2cce5ae81bf7522047c6066fe805b5c74abb62a08 +SHA512 (echo-nginx-module-0.63.tar.gz) = c325ac4e3f3f735739e156d8c7ada503b34475c62533b4830231ff1b42c25cb0c841aae06b3448b589c2ab35da8d211436ed194d6fd062cad925af8152c5e789 +Size (echo-nginx-module-0.63.tar.gz) = 53421 bytes BLAKE2s (encrypted-session-nginx-module-0.09.tar.gz) = 696be087d7aa0144d212f2753423489677e78ba3bb97dbfeb30cadbe08cd7b0a SHA512 (encrypted-session-nginx-module-0.09.tar.gz) = 399ce2690e85ee27802e8031954a1a3aa3fdc9246e17323a72a298d235931a8dbebdcb121ac8788e074872df0ef5b5a8a3d512b17fbe860b38f696ce42de3655 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 (lua-nginx-module-0.10.22.tar.gz) = 745f552a68bdccc5a3ea869970ebaad7dcf7c850b41124233871ea2168d58761 -SHA512 (lua-nginx-module-0.10.22.tar.gz) = 03e2504e8bc80efaf4af819ed9345285ca42ceecc647eda225e3be3b1e3617435f3949aa8034341955d8cce4826af9d1a8615b914109834f6b6b20e78be35ef9 -Size (lua-nginx-module-0.10.22.tar.gz) = 690975 bytes +BLAKE2s (headers-more-nginx-module-0.34.tar.gz) = 3456270e8df3c2a16fefbc3f57aa085415b5e0614e8ffff418adc5dc12d3cc99 +SHA512 (headers-more-nginx-module-0.34.tar.gz) = 2c0c140feeb29f0154a223dc3020ff956f894d63e0232a7bc0ca33fcb26f8b807bda868159ae30b6cac7456ec25b831c3d299ea18e234202ae5d14c1ff471a4b +Size (headers-more-nginx-module-0.34.tar.gz) = 28827 bytes +BLAKE2s (lua-nginx-module-0.10.24.tar.gz) = 9523e4b9ba5fec4ce7919ea6a65d561fc4094bddf83186827cf46a063d1ade8f +SHA512 (lua-nginx-module-0.10.24.tar.gz) = 1959ef30d616f957847484c0bc32cc072206fbb8cf4da84a52529eb9bbd270f53a1b718716cb410aff2e0cae5d1833bc74bed80257c36ae82ba7caf872665c9d +Size (lua-nginx-module-0.10.24.tar.gz) = 724961 bytes BLAKE2s (nbs-system-naxsi-29793dc_GH.tar.gz) = 561b875a1d01bef80a45580268a56f90ef7dfd74acfa01a7ab1ab667486e4abb SHA512 (nbs-system-naxsi-29793dc_GH.tar.gz) = 8c943daa14ee9a0d308bf6425e28123860bdd5db269ad0e481126915538fa3fcdf6607e1692b7819c9eec4a1206ec19060f5b85ee11d93e713f60a8870fc5d26 Size (nbs-system-naxsi-29793dc_GH.tar.gz) = 236932 bytes BLAKE2s (nchan-1.3.0.tar.gz) = fd45ccebd86c9808522dabefb8c202747f428ed04b46225282f344fbfd52f0b2 SHA512 (nchan-1.3.0.tar.gz) = c8cd3eb0b06fc0f17b5a9013d32f5a6d5a8252015b3ac27fbf74a7a1b97bc7ae78c5c8cdd7372e36f5f9d137b59635f007d836746282c85c4a972b6984ba2bef Size (nchan-1.3.0.tar.gz) = 745161 bytes -BLAKE2s (nginx-1.23.3.tar.gz) = c4f1bed48cd9c9862839a38af27d703ec3715d3720446168c652a66e9e4b6f83 -SHA512 (nginx-1.23.3.tar.gz) = da5f473ac213f8947f40f0a69820bf981157432fe9d29cf71fe30225dadd05f5814309034f0411ea15fb70bece8ceefc0cb0b2588096c1a9496c2a36fa425d9f -Size (nginx-1.23.3.tar.gz) = 1108958 bytes +BLAKE2s (nginx-1.23.4.tar.gz) = bf30f7ee181033f19fdd3b7198e7d50378e1b37977d70088d91fa043a467376d +SHA512 (nginx-1.23.4.tar.gz) = 542a53cae32bf5c7d4d09a4940793e603e0b3c7a8a4ca2bcec84e64bc298fcf0e58297338d1ae0cd28889c4a3e359f3f48532b0addaf7d223f796ed81c3054e8 +Size (nginx-1.23.4.tar.gz) = 1112403 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 @@ -45,9 +48,6 @@ Size (ngx_http_geoip2_module-3.4.tar.gz) BLAKE2s (njs-0.7.9.tar.gz) = de8d5fc4e85629bae7649bac0b5cdc713cfb1b9be50ac7569d55e28fd37d8d0c SHA512 (njs-0.7.9.tar.gz) = d535dd17802edd444733b59488034feb07fa696599724e05b59df1c289a4584abf90ab2b719bb950aad9dad93654943418949ccf7710a5361d2d867ee2d986f2 Size (njs-0.7.9.tar.gz) = 617115 bytes -BLAKE2s (openresty-headers-more-nginx-module-d502e41_GH.tar.gz) = e9f0980c98791d082ee1fbb08960000811a41359c843bf822c2afd4787db86f3 -SHA512 (openresty-headers-more-nginx-module-d502e41_GH.tar.gz) = 8d0c59793507cf4bc53c0bc8e30fa2245c46dd5a31c07cc4e1505acd7b27508c31fce41c69cb7e3d33071e4944b87d4d9ff4e42195887a2d9feaa0e1ad25e75e -Size (openresty-headers-more-nginx-module-d502e41_GH.tar.gz) = 28824 bytes 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 Index: pkgsrc/www/nginx-devel/options.mk diff -u pkgsrc/www/nginx-devel/options.mk:1.15 pkgsrc/www/nginx-devel/options.mk:1.16 --- pkgsrc/www/nginx-devel/options.mk:1.15 Thu Nov 17 16:04:27 2022 +++ pkgsrc/www/nginx-devel/options.mk Wed Mar 29 08:32:52 2023 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.15 2022/11/17 16:04:27 osa Exp $ +# $NetBSD: options.mk,v 1.16 2023/03/29 08:32:52 adam Exp $ CODELOAD_SITE_GITHUB= https://codeload.github.com/ @@ -164,12 +164,14 @@ DISTFILES+= ${NDK_DISTFILE} .endif .if !empty(PKG_OPTIONS:Mluajit) || make(makesum) || make(mdi) || make(distclean) -LUA_VERSION= 0.10.22 +LUA_VERSION= 0.10.24 LUA_DISTNAME= lua-nginx-module-${LUA_VERSION} LUA_DISTFILE= ${LUA_DISTNAME}.tar.gz SITES.${LUA_DISTFILE}= -${MASTER_SITE_GITHUB:=openresty/lua-nginx-module/archive/}v${LUA_VERSION}.tar.gz DISTFILES+= ${LUA_DISTFILE} .include "../../lang/LuaJIT2/buildlink3.mk" +DEPENDS+= lua-resty-core>=0.1.26:../../www/lua-resty-core +DEPENDS+= lua-resty-lrucache>=0.13:../../www/lua-resty-lrucache CONFIGURE_ENV+= LUAJIT_LIB=${PREFIX}/lib CONFIGURE_ENV+= LUAJIT_INC=${PREFIX}/include/luajit-2.0 DSO_EXTMODS+= lua @@ -177,7 +179,7 @@ PLIST.lua= yes .endif .if !empty(PKG_OPTIONS:Mecho) || make(makesum) || make(mdi) || make(distclean) -ECHOMOD_VERSION= 0.62 +ECHOMOD_VERSION= 0.63 ECHOMOD_DISTNAME= echo-nginx-module-${ECHOMOD_VERSION} ECHOMOD_DISTFILE= ${ECHOMOD_DISTNAME}.tar.gz SITES.${ECHOMOD_DISTFILE}= -${MASTER_SITE_GITHUB:=openresty/echo-nginx-module/archive/}v${ECHOMOD_VERSION}.tar.gz @@ -208,7 +210,7 @@ PLIST.geoip2= yes .endif .if !empty(PKG_OPTIONS:Marray-var) || make(makesum) || make(mdi) || make(distclean) -ARRAYVAR_VERSION= 0.05 +ARRAYVAR_VERSION= 0.06 ARRAYVAR_DISTNAME= array-var-nginx-module-${ARRAYVAR_VERSION} ARRAYVAR_DISTFILE= ${ARRAYVAR_DISTNAME}.tar.gz SITES.${ARRAYVAR_DISTFILE}= -${MASTER_SITE_GITHUB:=openresty/array-var-nginx-module/archive/}v${ARRAYVAR_VERSION}.tar.gz @@ -238,12 +240,10 @@ PLIST.forminput= yes .endif .if !empty(PKG_OPTIONS:Mheaders-more) || make(makesum) || make(mdi) || make(distclean) -HEADMORE_GH_ACCOUNT= openresty -HEADMORE_GH_PROJECT= headers-more-nginx-module -HEADMORE_GH_TAG= d502e41 -HEADMORE_DISTNAME= ${HEADMORE_GH_PROJECT}-${HEADMORE_GH_TAG} -HEADMORE_DISTFILE= ${HEADMORE_GH_ACCOUNT}-${HEADMORE_DISTNAME}_GH.tar.gz -SITES.${HEADMORE_DISTFILE}= -${CODELOAD_SITE_GITHUB:=${HEADMORE_GH_ACCOUNT}/${HEADMORE_GH_PROJECT}/tar.gz/${HEADMORE_VERSION}?dummy=${HEADMORE_DISTFILE}} +HEADMORE_VERSION= 0.34 +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 DISTFILES+= ${HEADMORE_DISTFILE} DSO_EXTMODS+= headmore PLIST.headmore= yes --_----------=_168007877257460--