svn commit: r452318 - in head/www/nginx: . files

[Jochen Neumeister]

Author: joneum
Date: Wed Oct 18 08:22:45 2017
New Revision: 452318
URL: https://svnweb.freebsd.org/changeset/ports/452318

Log:
  www/nginx: Update from 1.12.1 to 1.12.2
  
  - Changelog:
  
      *) Bugfix: client SSL connections were immediately closed if deferred
         accept and the "proxy_protocol" parameter of the "listen" directive
         were used.
  
      *) Bugfix: client connections might be dropped during configuration
         testing when using the "reuseport" parameter of the "listen"
         directive on Linux.
  
      *) Bugfix: incorrect response length was returned on 32-bit platforms
         when requesting more than 4 gigabytes with multiple ranges.
  
      *) Bugfix: switching to the next upstream server in the stream module
         did not work when using the "ssl_preread" directive.
  
      *) Bugfix: when using HTTP/2 client request body might be corrupted.
  
      *) Bugfix: in handling of client addresses when using unix domain
         sockets.
  
  Update passanger from 5.1.8 to 5.1.11. There was an security advisory:
  	https://blog.phusion.nl/2017/10/13/passenger-security-advisory-5-1-11/
  
  Approved by:	tz (mentor)
  MFH:		2017Q4
  Differential Revision:	https://reviews.freebsd.org/D12706

Modified:
  head/www/nginx/Makefile
  head/www/nginx/distinfo
  head/www/nginx/files/extra-patch-passenger-build-nginx.rb

Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile	Wed Oct 18 06:53:43 2017	(r452317)
+++ head/www/nginx/Makefile	Wed Oct 18 08:22:45 2017	(r452318)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nginx
-PORTVERSION=	1.12.1
-PORTREVISION?=	2
+PORTVERSION=	1.12.2
 PORTEPOCH=	2
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/
@@ -932,7 +931,7 @@ CONFIGURE_ARGS+=--without-http_rewrite_module \
 .endif
 
 .if ${PORT_OPTIONS:MPASSENGER}
-PASSENGER_VERSION=	5.1.8
+PASSENGER_VERSION=	5.1.11
 MASTER_SITES+=	http://s3.amazonaws.com/phusion-passenger/releases/:passenger
 DISTFILES+=	passenger-${PASSENGER_VERSION}.tar.gz:passenger
 .if !empty(PORT_OPTIONS:MDSO)

Modified: head/www/nginx/distinfo
==============================================================================
--- head/www/nginx/distinfo	Wed Oct 18 06:53:43 2017	(r452317)
+++ head/www/nginx/distinfo	Wed Oct 18 08:22:45 2017	(r452318)
@@ -1,6 +1,6 @@
-TIMESTAMP = 1504807697
-SHA256 (nginx-1.12.1.tar.gz) = 8793bf426485a30f91021b6b945a9fd8a84d87d17b566562c3797aba8fac76fb
-SIZE (nginx-1.12.1.tar.gz) = 981093
+TIMESTAMP = 1508248850
+SHA256 (nginx-1.12.2.tar.gz) = 305f379da1d5fb5aefa79e45c829852ca6983c7cd2a79328f8e084a324cf0416
+SIZE (nginx-1.12.2.tar.gz) = 981687
 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,6 @@ SHA256 (08a395c66e42.tar.gz) = 53e440737ed1aff1f09fae1
 SIZE (08a395c66e42.tar.gz) = 120603
 SHA256 (modsecurity-2.9.1.tar.gz) = 958cc5a7a7430f93fac0fd6f8b9aa92fc1801efce0cda797d6029d44080a9b24
 SIZE (modsecurity-2.9.1.tar.gz) = 4261212
-SHA256 (SpiderLabs-ModSecurity-nginx-abbf2c4_GH0.tar.gz) = 3d216e7c282213cd64b4671fe86d9057a3f318f692f4f906c695eee619c82228
-SIZE (SpiderLabs-ModSecurity-nginx-abbf2c4_GH0.tar.gz) = 25917
 SHA256 (passenger-5.1.8.tar.gz) = fef10e4a34c3faa48306c21c0789ee4d4d56fc0e30205cc470a91b486b7a4a7d
 SIZE (passenger-5.1.8.tar.gz) = 5234529
 SHA256 (ngx_slowfs_cache-1.10.tar.gz) = 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1
@@ -131,3 +129,5 @@ 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-abbf2c4_GH0.tar.gz) = 3d216e7c282213cd64b4671fe86d9057a3f318f692f4f906c695eee619c82228
+SIZE (SpiderLabs-ModSecurity-nginx-abbf2c4_GH0.tar.gz) = 25917

Modified: head/www/nginx/files/extra-patch-passenger-build-nginx.rb
==============================================================================
--- head/www/nginx/files/extra-patch-passenger-build-nginx.rb	Wed Oct 18 06:53:43 2017	(r452317)
+++ head/www/nginx/files/extra-patch-passenger-build-nginx.rb	Wed Oct 18 08:22:45 2017	(r452318)
@@ -1,5 +1,5 @@
---- ../passenger-5.1.8/build/nginx.rb.orig	2013-10-26 18:00:00.000000000 -0400
-+++ ../passenger-5.1.8/build/nginx.rb	2016-05-09 18:21:22.426777000 -0400
+--- ../passenger-5.1.11/build/nginx.rb.orig	2013-10-26 18:00:00.000000000 -0400
++++ ../passenger-5.1.11/build/nginx.rb	2016-05-09 18:21:22.426777000 -0400
 @@ -33,13 +33,12 @@
  desc "Build Nginx support files"
  task :nginx => [