Date: Tue, 11 Aug 2020 15:38:32 +0000 (UTC) From: "Sergey A. Osokin" <osa@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r544689 - head/www/nginx-devel Message-ID: <202008111538.07BFcWpZ070359@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Tue Aug 11 15:38:32 2020 New Revision: 544689 URL: https://svnweb.freebsd.org/changeset/ports/544689 Log: Update nginx from 1.19.1 to 1.19.2. Update njs module from 0.4.2 to 0.4.3. While I'm here soften some variables and target definitions to prepare the port for a separate build of dynamic modules. <Changelog for nginx 1.19.2> *) Change: now nginx starts closing keepalive connections before all free worker connections are exhausted, and logs a warning about this to the error log. *) Change: optimization of client request body reading when using chunked transfer encoding. *) Bugfix: memory leak if the "ssl_ocsp" directive was used. *) Bugfix: "zero size buf in output" alerts might appear in logs if a FastCGI server returned an incorrect response; the bug had appeared in 1.19.1. *) Bugfix: a segmentation fault might occur in a worker process if different large_client_header_buffers sizes were used in different virtual servers. *) Bugfix: SSL shutdown might not work. *) Bugfix: "SSL_shutdown() failed (SSL: ... bad write retry)" messages might appear in logs. *) Bugfix: in the ngx_http_slice_module. *) Bugfix: in the ngx_http_xslt_filter_module. </Changelog> <Changelog for njs 0.4.3> Core: *) Feature: added Query String module. *) Feature: improved fs.mkdir() to support recursive directory creation. Thanks to Artem S. Povalyukhin. *) Feature: improved fs.rmdir() to support recursive directory removal. Thanks to Artem S. Povalyukhin. *) Feature: introduced UTF-8 decoder according to WHATWG encoding spec. *) Feature: added TextEncoder/TextDecoder implementation. *) Bugfix: fixed parsing return statement without semicolon. *) Bugfix: fixed njs_number_to_int32() for big-endian platforms. *) Bugfix: fixed unit test on big-endian platforms. *) Bugfix: fixed regexp-literals parsing with '=' characters. *) Bugfix: fixed pre/post increment/decrement in assignment operations. </Changelog> Modified: head/www/nginx-devel/Makefile head/www/nginx-devel/Makefile.extmod head/www/nginx-devel/distinfo Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Tue Aug 11 15:34:08 2020 (r544688) +++ head/www/nginx-devel/Makefile Tue Aug 11 15:38:32 2020 (r544689) @@ -1,9 +1,8 @@ # Created by: Sergey A. Osokin <osa@FreeBSD.org> # $FreeBSD$ -PORTNAME= nginx -PORTVERSION= 1.19.1 -PORTREVISION= 3 +PORTNAME?= nginx +PORTVERSION= 1.19.2 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa @@ -13,8 +12,8 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER?= osa@FreeBSD.org COMMENT?= Robust and small WWW server -LICENSE= BSD2CLAUSE -LICENSE_FILE= ${WRKSRC}/LICENSE +LICENSE?= BSD2CLAUSE +LICENSE_FILE?= ${WRKSRC}/LICENSE CONFLICTS_INSTALL= nginx @@ -39,8 +38,8 @@ CONFLICTS?= nginx-1.* \ nginx-full-1.* \ nginx-lite-1.* \ nginx-naxsi-1.* -USE_RC_SUBR= nginx -SUB_FILES= pkg-message +USE_RC_SUBR?= nginx +SUB_FILES?= pkg-message SUB_LIST+= WWWOWN=${WWWOWN} \ WWWGRP=${WWWGRP} \ NGINX_RUNDIR=${NGINX_RUNDIR} \ @@ -327,6 +326,7 @@ post-patch-VOD-on: pre-configure-SMALL_LIGHT-on: ( cd ${WRKSRC_small_light} && ./setup ) +.if !target(do-install) do-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${MKDIR} ${STAGEDIR}${NGINX_TMPDIR} @@ -362,7 +362,9 @@ do-install-NAXSI-on: do-install-NJS-on: ${INSTALL_PROGRAM} ${WRKSRC_njs}/build/njs ${STAGEDIR}${PREFIX}/sbin +.endif +.if !target(post-install) post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/vim/vimfiles cd ${WRKSRC}/contrib/vim && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/vim/vimfiles @@ -373,5 +375,6 @@ post-install-WWW-on: ${MKDIR} ${STAGEDIR}${PREFIX}/www/nginx-dist (cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/nginx-dist && \ ${TOUCH} ${STAGEDIR}${PREFIX}/www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING) +.endif .include <bsd.port.post.mk> Modified: head/www/nginx-devel/Makefile.extmod ============================================================================== --- head/www/nginx-devel/Makefile.extmod Tue Aug 11 15:34:08 2020 (r544688) +++ head/www/nginx-devel/Makefile.extmod Tue Aug 11 15:38:32 2020 (r544689) @@ -224,7 +224,7 @@ NAXSI_NGINX_VER= 0.56 NAXSI_GH_TUPLE= nbs-system:naxsi:${NAXSI_NGINX_VER}:naxsi NAXSI_VARS= DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_src -NJS_GH_TUPLE= nginx:njs:0.4.2:njs +NJS_GH_TUPLE= nginx:njs:0.4.3:njs NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx OPENTRACING_GH_TUPLE= opentracing-contrib:nginx-opentracing:2d81c29:opentracing Modified: head/www/nginx-devel/distinfo ============================================================================== --- head/www/nginx-devel/distinfo Tue Aug 11 15:34:08 2020 (r544688) +++ head/www/nginx-devel/distinfo Tue Aug 11 15:38:32 2020 (r544689) @@ -1,6 +1,6 @@ -TIMESTAMP = 1594832290 -SHA256 (nginx-1.19.1.tar.gz) = a004776c64ed3c5c7bc9b6116ba99efab3265e6b81d49a57ca4471ff90655492 -SIZE (nginx-1.19.1.tar.gz) = 1047223 +TIMESTAMP = 1597159495 +SHA256 (nginx-1.19.2.tar.gz) = 7c1f7bb13e79433ee930c597d272a64bc6e30c356a48524f38fd34fa88d62473 +SIZE (nginx-1.19.2.tar.gz) = 1048727 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae SIZE (nginx_mogilefs_module-1.0.4.tar.gz) = 11208 SHA256 (nginx_mod_h264_streaming-2.2.7.tar.gz) = 6d974ba630cef59de1f60996c66b401264a345d25988a76037c2856cec756c19 @@ -109,8 +109,8 @@ SHA256 (SpiderLabs-ModSecurity-nginx-v1.0.1_GH0.tar.gz SIZE (SpiderLabs-ModSecurity-nginx-v1.0.1_GH0.tar.gz) = 31920 SHA256 (nbs-system-naxsi-0.56_GH0.tar.gz) = 0a66dcadd32432460fab180be9f2efe24e911e3798917b2787ee710e02901eb4 SIZE (nbs-system-naxsi-0.56_GH0.tar.gz) = 192120 -SHA256 (nginx-njs-0.4.2_GH0.tar.gz) = 04f3f79cabdd3dcd3412607b1e70775a6516567e6a93beaa1e8f31f5431cb574 -SIZE (nginx-njs-0.4.2_GH0.tar.gz) = 446191 +SHA256 (nginx-njs-0.4.3_GH0.tar.gz) = 463df8004ccbc4a7420c7fc501260ff9b273c69f4a8b6a21a39836c9d47f36d4 +SIZE (nginx-njs-0.4.3_GH0.tar.gz) = 460997 SHA256 (opentracing-contrib-nginx-opentracing-2d81c29_GH0.tar.gz) = b082bb8e0f4de2e3361c9cae79e266856de1e5b26a43611e08446b7c2bc0b2b4 SIZE (opentracing-contrib-nginx-opentracing-2d81c29_GH0.tar.gz) = 664357 SHA256 (konstruxi-ngx_postgres-8aa7359_GH0.tar.gz) = c69ad4495de7c7883ebc23e1e6c4cc83a4ac6a7fddd4d5c12e49d33b65f7c50b
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008111538.07BFcWpZ070359>