svn commit: r397595 - head/www/nginx-devel

[Sergey A. Osokin]

Author: osa
Date: Tue Sep 22 22:08:59 2015
New Revision: 397595
URL: https://svnweb.freebsd.org/changeset/ports/397595

Log:
  Upgrade from 1.9.4 to 1.9.5.
  Welcome to HTTP/2!
  SPDY support has been removed.
  
  <ChangeLog>
  
  *) Feature: the ngx_http_v2_module (replaces ngx_http_spdy_module).
     Thanks to Dropbox and Automattic for sponsoring this work.
  
  *) Change: now the "output_buffers" directive uses two buffers by
     default.
  
  *) Change: now nginx limits subrequests recursion, not simultaneous
     subrequests.
  
  *) Change: now nginx checks the whole cache key when returning a
     response from cache.
     Thanks to Gena Makhomed and Sergey Brester.
  
  *) Bugfix: "header already sent" alerts might appear in logs when using
     cache; the bug had appeared in 1.7.5.
  
  *) Bugfix: "writev() failed (4: Interrupted system call)" errors might
     appear in logs when using CephFS and the "timer_resolution" directive
     on Linux.
  
  *) Bugfix: in invalid configurations handling.
     Thanks to Markus Linnala.
  
  *) Bugfix: a segmentation fault occurred in a worker process if the
     "sub_filter" directive was used at http level; the bug had appeared
     in 1.9.4.
  
  </ChangeLog>

Modified:
  head/www/nginx-devel/Makefile
  head/www/nginx-devel/distinfo

Modified: head/www/nginx-devel/Makefile
==============================================================================
--- head/www/nginx-devel/Makefile	Tue Sep 22 21:39:34 2015	(r397594)
+++ head/www/nginx-devel/Makefile	Tue Sep 22 22:08:59 2015	(r397595)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nginx
-PORTVERSION=	1.9.4
+PORTVERSION=	1.9.5
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/
 MASTER_SITES+=	LOCAL/osa
@@ -51,7 +51,6 @@ OPTIONS_DEFINE=	\
 	MAIL_POP3 \
 	MAIL_SMTP \
 	MAIL_SSL \
-	SPDY \
 	HTTPV2 \
 	STREAM \
 	STREAM_SSL \
@@ -147,7 +146,6 @@ MAIL_IMAP_DESC=			Enable IMAP4 proxy mod
 MAIL_POP3_DESC=			Enable POP3 proxy module
 MAIL_SMTP_DESC=			Enable SMTP proxy module
 MAIL_SSL_DESC=			Enable mail_ssl module
-SPDY_DESC=			Enable SPDY protocol support (SSL req.)
 HTTPV2_DESC=			Enable HTTP/2 protocol support (SSL req.)
 STREAM_DESC=			Enable stream module
 STREAM_SSL_DESC=		Enable stream_ssl module (SSL req.)
@@ -843,25 +841,11 @@ GH_TAGNAME+=	v${NGINX_XSS_VERSION}:xss
 CONFIGURE_ARGS+=--add-module=${WRKSRC_xss}
 .endif
 
-.if ${PORT_OPTIONS:MSPDY} && ${PORT_OPTIONS:MHTTPV2}
-IGNORE=		current HTTP/2 implementation replaces SPDY module support, please disable SPDY
-.endif
-
-.if ${PORT_OPTIONS:MSPDY}
-NGINX_OPENSSL=	yes
-USE_HTTP_SSL=	yes
-CONFIGURE_ARGS+=--with-http_spdy_module
-.endif
-
 .if ${PORT_OPTIONS:MHTTPV2}
 NGINX_OPENSSL=	yes
 USE_HTTP_SSL=	yes
 CONFIGURE_ARGS+=--with-http_v2_module
 USE_OPENSSL_PORT=	yes
-NGINX_HTTPV2_VERSION=	6
-PATCH_SITES+=	http://nginx.org/patches/http2/:httpv2
-PATCHFILES+=	patch.http2-v${NGINX_HTTPV2_VERSION}_${PORTVERSION}.txt:httpv2
-PATCH_DIST_STRIP=	-p1
 .endif
 
 .if ${PORT_OPTIONS:MSTREAM}
@@ -943,11 +927,6 @@ GROUPS?=${WWWGRP}
 
 .if defined(NGINX_OPENSSL)
 USE_OPENSSL=	yes
-.if ${PORT_OPTIONS:MSPDY}
-.if ${OSVERSION} < 1000028
-WITH_OPENSSL_PORT=	yes
-.endif
-.endif
 .endif
 
 pre-everything::

Modified: head/www/nginx-devel/distinfo
==============================================================================
--- head/www/nginx-devel/distinfo	Tue Sep 22 21:39:34 2015	(r397594)
+++ head/www/nginx-devel/distinfo	Tue Sep 22 22:08:59 2015	(r397595)
@@ -1,5 +1,5 @@
-SHA256 (nginx-1.9.4.tar.gz) = 479b0c03747ee6b2d4a21046f89b06d178a2881ea80cfef160451325788f2ba8
-SIZE (nginx-1.9.4.tar.gz) = 866423
+SHA256 (nginx-1.9.5.tar.gz) = 48e2787a6b245277e37cb7c5a31b1549a0bbacf288aa4731baacf9eaacdb481b
+SIZE (nginx-1.9.5.tar.gz) = 884023
 SHA256 (nginx-accesskey-2.0.3.tar.gz) = d9e94321e78a02de16c57f3e048fd31059fd8116ed03d6de7180f435c52502b1
 SIZE (nginx-accesskey-2.0.3.tar.gz) = 2632
 SHA256 (kvspb-nginx-auth-ldap-928856aa95_GH0.tar.gz) = de21b7d9ef0953e96736f6b02d11236c46b138a0bc7889725e8b31f7482e67de
@@ -118,5 +118,3 @@ SHA256 (calio-iconv-nginx-module-v0.10_G
 SIZE (calio-iconv-nginx-module-v0.10_GH0.tar.gz) = 12513
 SHA256 (nginx-shib-nginx-http-shibboleth-v20150121_GH0.tar.gz) = e38a19bb4d30e5487c013c4b6b3e3d5b96de82d63b776471cc2c381a5d00374d
 SIZE (nginx-shib-nginx-http-shibboleth-v20150121_GH0.tar.gz) = 10106
-SHA256 (patch.http2-v6_1.9.4.txt) = e7068d5af7eb6b493bb3945cd35fc8f9f90643337ec69a3fbff14ba922eceb44
-SIZE (patch.http2-v6_1.9.4.txt) = 338333