From owner-svn-ports-head@freebsd.org Wed Feb 10 00:03:50 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BB098AA2451; Wed, 10 Feb 2016 00:03:50 +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 mx1.freebsd.org (Postfix) with ESMTPS id 7C93218EE; Wed, 10 Feb 2016 00:03:50 +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 u1A03nhE017558; Wed, 10 Feb 2016 00:03:49 GMT (envelope-from osa@FreeBSD.org) Received: (from osa@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1A03nVk017556; Wed, 10 Feb 2016 00:03:49 GMT (envelope-from osa@FreeBSD.org) Message-Id: <201602100003.u1A03nVk017556@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: osa set sender to osa@FreeBSD.org using -f From: "Sergey A. Osokin" Date: Wed, 10 Feb 2016 00:03:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408605 - head/www/nginx-devel X-SVN-Group: ports-head 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.20 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: Wed, 10 Feb 2016 00:03:50 -0000 Author: osa Date: Wed Feb 10 00:03:49 2016 New Revision: 408605 URL: https://svnweb.freebsd.org/changeset/ports/408605 Log: Upgrade from 1.9.10 to 1.9.11. Due to internal changes (TCP support in resolver) I've just added several hacks for some third-party module. These changes should be removed once modules will be updated. *) Feature: TCP support in resolver. *) Feature: dynamic modules. *) Bugfix: the $request_length variable did not include size of request headers when using HTTP/2. *) Bugfix: in the ngx_http_v2_module. Modified: head/www/nginx-devel/Makefile head/www/nginx-devel/distinfo Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Tue Feb 9 23:11:37 2016 (r408604) +++ head/www/nginx-devel/Makefile Wed Feb 10 00:03:49 2016 (r408605) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nginx -PORTVERSION= 1.9.10 +PORTVERSION= 1.9.11 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ MASTER_SITES+= LOCAL/osa @@ -1008,6 +1008,14 @@ post-patch: 's!--std=c99!-DMONGO_HAVE_STDINT!' \ ${WRKSRC_gridfs}/config .endif +.if ${PORT_OPTIONS:MLUA} + @${REINPLACE_CMD} \ + 's!ngx_udp_connection_t!ngx_resolver_connection_t!g; \ + s!udp_connections!connections!g; \ + s!udp_connection.connection!udp_connection.udp!g; \ + s!uc->connection!uc->udp!g' \ + ${WRKSRC_lua}/src/ngx_http_lua_socket_udp.* +.endif .if ${PORT_OPTIONS:MPASSENGER} @${REINPLACE_CMD} \ '177,179s!true!false!' \ @@ -1031,6 +1039,20 @@ post-patch: 's!%%PREFIX%%!${LOCALBASE}!g' \ ${WRKDIR}/nginx-sflow-module-${NGINX_SFLOW_VERSION}/ngx_http_sflow_config.h .endif +.if ${PORT_OPTIONS:MSTATSD} + @${REINPLACE_CMD} \ + 's!ngx_udp_connection_t!ngx_resolver_connection_t!g; \ + s!uc->connection!uc->udp!g; \ + s!e->udp_connection->connection!e->udp_connection->udp!g' \ + ${WRKSRC_statsd}/ngx_http_statsd.c +.endif +.if ${PORT_OPTIONS:MUDPLOG} + @${REINPLACE_CMD} \ + 's!ngx_udp_connection_t!ngx_resolver_connection_t!g; \ + s!uc->connection!uc->udp!g; \ + s!e->udp_connection->connection!e->udp_connection->udp!g' \ + ${WRKDIR}/nginx_udplog_module-${NGINX_UDPLOG_VERSION}/ngx_http_udplog_module.c +.endif .if ${PORT_OPTIONS:MICONV} @${REINPLACE_CMD} \ 's!%%PREFIX%%!${LOCALBASE}!g' \ Modified: head/www/nginx-devel/distinfo ============================================================================== --- head/www/nginx-devel/distinfo Tue Feb 9 23:11:37 2016 (r408604) +++ head/www/nginx-devel/distinfo Wed Feb 10 00:03:49 2016 (r408605) @@ -1,5 +1,5 @@ -SHA256 (nginx-1.9.10.tar.gz) = fb14d76844cab0a5a0880768be28965e74f9956790f618c454ef6098e26631d9 -SIZE (nginx-1.9.10.tar.gz) = 889267 +SHA256 (nginx-1.9.11.tar.gz) = 6a5c72f4afaf57a6db064bba0965d72335f127481c5d4e64ee8714e7b368a51f +SIZE (nginx-1.9.11.tar.gz) = 895373 SHA256 (nginx-accesskey-2.0.3.tar.gz) = d9e94321e78a02de16c57f3e048fd31059fd8116ed03d6de7180f435c52502b1 SIZE (nginx-accesskey-2.0.3.tar.gz) = 2632 SHA256 (ngx_http_auth_pam_module-1.2.tar.gz) = 5a85970ba61a99f55a26d2536a11d512b39bbd622f5737d25a9a8c10db81efa9