From owner-svn-ports-head@freebsd.org Sun Apr 8 21:11:09 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F170EFA3C6C; Sun, 8 Apr 2018 21:11:08 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A38AE688CA; Sun, 8 Apr 2018 21:11:08 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9CCE3153CC; Sun, 8 Apr 2018 21:11:08 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w38LB8t5042563; Sun, 8 Apr 2018 21:11:08 GMT (envelope-from osa@FreeBSD.org) Received: (from osa@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w38LB88l042560; Sun, 8 Apr 2018 21:11:08 GMT (envelope-from osa@FreeBSD.org) Message-Id: <201804082111.w38LB88l042560@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: osa set sender to osa@FreeBSD.org using -f From: "Sergey A. Osokin" Date: Sun, 8 Apr 2018 21:11:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r466832 - in head/www/nginx-devel: . files X-SVN-Group: ports-head X-SVN-Commit-Author: osa X-SVN-Commit-Paths: in head/www/nginx-devel: . files X-SVN-Commit-Revision: 466832 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Apr 2018 21:11:09 -0000 Author: osa Date: Sun Apr 8 21:11:08 2018 New Revision: 466832 URL: https://svnweb.freebsd.org/changeset/ports/466832 Log: Upgrade from 1.13.10 to 1.13.11. While I'm here upgrade next third-party modules to their recent version: o) passenger; o) njs. *) Feature: the "proxy_protocol" parameter of the "listen" directive now supports the PROXY protocol version 2. *) Bugfix: nginx could not be built with OpenSSL 1.1.1 statically on Linux. *) Bugfix: in the "http_404", "http_500", etc. parameters of the "proxy_next_upstream" directive. Modified: head/www/nginx-devel/Makefile head/www/nginx-devel/distinfo head/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Sun Apr 8 21:08:44 2018 (r466831) +++ head/www/nginx-devel/Makefile Sun Apr 8 21:11:08 2018 (r466832) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nginx -PORTVERSION= 1.13.10 +PORTVERSION= 1.13.11 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ MASTER_SITES+= LOCAL/osa @@ -919,7 +919,7 @@ CONFIGURE_ARGS+=--without-http_rewrite_module \ .endif .if ${PORT_OPTIONS:MPASSENGER} -PASSENGER_VERSION= 5.2.1 +PASSENGER_VERSION= 5.2.3 MASTER_SITES+= http://s3.amazonaws.com/phusion-passenger/releases/:passenger DISTFILES+= passenger-${PASSENGER_VERSION}.tar.gz:passenger .if ${PORT_OPTIONS:MDSO} @@ -1073,7 +1073,7 @@ CONFIGURE_ARGS+=--with-http_v2_module .if ${PORT_OPTIONS:MNJS} GH_ACCOUNT+= nginx:njs GH_PROJECT+= njs:njs -GH_TAGNAME+= 3995aba:njs +GH_TAGNAME+= 7dcacb4:njs .if ${PORT_OPTIONS:MDSO} CONFIGURE_ARGS+=--add-dynamic-module=${WRKSRC_njs}/nginx .else Modified: head/www/nginx-devel/distinfo ============================================================================== --- head/www/nginx-devel/distinfo Sun Apr 8 21:08:44 2018 (r466831) +++ head/www/nginx-devel/distinfo Sun Apr 8 21:11:08 2018 (r466832) @@ -1,6 +1,6 @@ -TIMESTAMP = 1521762706 -SHA256 (nginx-1.13.10.tar.gz) = 336182104d90be3c40c874f7f06f87dbb357da1dc74ea573ad081a0f29a94885 -SIZE (nginx-1.13.10.tar.gz) = 1014863 +TIMESTAMP = 1523221346 +SHA256 (nginx-1.13.11.tar.gz) = 35799c974644d2896b34ba876461dfd142c1b11f06f5aa57d255a77d4da36f05 +SIZE (nginx-1.13.11.tar.gz) = 1016189 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c SIZE (ngx_cache_purge-2.3.tar.gz) = 12248 SHA256 (nginx_mogilefs_module-1.0.4.tar.gz) = 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae @@ -15,8 +15,8 @@ SHA256 (08a395c66e42.tar.gz) = 53e440737ed1aff1f09fae1 SIZE (08a395c66e42.tar.gz) = 120603 SHA256 (modsecurity-2.9.2.tar.gz) = 41a8f73476ec891f3a9e8736b98b64ea5c2105f1ce15ea57a1f05b4bf2ffaeb5 SIZE (modsecurity-2.9.2.tar.gz) = 4298993 -SHA256 (passenger-5.2.1.tar.gz) = d725a705124dad1ae9a4ce61d76566061dc80abd4ec7a652489f09a8de60e481 -SIZE (passenger-5.2.1.tar.gz) = 4978302 +SHA256 (passenger-5.2.3.tar.gz) = 0a06a2c75688a0e6c85717fb67b57940bebca5e56b7c76337c50b8c3d024345b +SIZE (passenger-5.2.3.tar.gz) = 6956101 SHA256 (ngx_slowfs_cache-1.10.tar.gz) = 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1 SIZE (ngx_slowfs_cache-1.10.tar.gz) = 11809 SHA256 (giom-nginx_accept_language_module-2f69842_GH0.tar.gz) = 5534ca63cdfc2a7dc4e1cbf9c2d54d3ed3f0e6c86b4a95be48ec0a3f41cc1eb0 @@ -123,8 +123,8 @@ SHA256 (vozlt-nginx-module-vts-v0.1.15_GH0.tar.gz) = 5 SIZE (vozlt-nginx-module-vts-v0.1.15_GH0.tar.gz) = 371128 SHA256 (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 958bd8de773601d8d3138501cc4be0420f1c818a3987a70cc9c0023371e432cf SIZE (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 11477 -SHA256 (nginx-njs-3995aba_GH0.tar.gz) = 89e575eef9ce0fa3fb99e779f313d82e5c175f856dee9b6d304276d7e2ee3924 -SIZE (nginx-njs-3995aba_GH0.tar.gz) = 232281 +SHA256 (nginx-njs-7dcacb4_GH0.tar.gz) = 67f5b41c375ed0fe1b63b29ed678b0ceba138608d98dcb80f54575b77bac5bd3 +SIZE (nginx-njs-7dcacb4_GH0.tar.gz) = 251527 SHA256 (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = c949d4be6f3442c8e2937046448dc8d8def25c0e0fa6f4e805144cea45eabe80 SIZE (openresty-array-var-nginx-module-v0.05_GH0.tar.gz) = 11280 SHA256 (eustas-ngx_brotli-6a11744_GH0.tar.gz) = e8a34dd30ff08a23cb7060d026e4e63cf33fb9e3c3a05eb5126fafb1732a51a9 @@ -133,5 +133,3 @@ SHA256 (calio-form-input-nginx-module-v0.12_GH0.tar.gz SIZE (calio-form-input-nginx-module-v0.12_GH0.tar.gz) = 11090 SHA256 (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = b8b9f355c05c0790226512f6732348a2404d48531688a1fc04ce6768163bf462 SIZE (calio-iconv-nginx-module-v0.14_GH0.tar.gz) = 13133 -SHA256 (SpiderLabs-ModSecurity-nginx-c0ae166_GH0.tar.gz) = 06790c202c7b11b8d17c3d92b3d9cf505db80fda0864d37db03508f8393ed2bb -SIZE (SpiderLabs-ModSecurity-nginx-c0ae166_GH0.tar.gz) = 26298 Modified: head/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb ============================================================================== --- head/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb Sun Apr 8 21:08:44 2018 (r466831) +++ head/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb Sun Apr 8 21:11:08 2018 (r466832) @@ -1,5 +1,5 @@ ---- ../passenger-5.2.1/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400 -+++ ../passenger-5.2.1/build/nginx.rb 2016-05-09 18:21:22.426777000 -0400 +--- ../passenger-5.2.3/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400 ++++ ../passenger-5.2.3/build/nginx.rb 2016-05-09 18:21:22.426777000 -0400 @@ -33,13 +33,12 @@ desc "Build Nginx support files" task :nginx => [