From owner-svn-ports-all@freebsd.org Wed May 25 23:43:25 2016 Return-Path: Delivered-To: svn-ports-all@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 AA9CAB4A716; Wed, 25 May 2016 23:43:25 +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 5E58C1AE2; Wed, 25 May 2016 23:43:25 +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 u4PNhOY4047584; Wed, 25 May 2016 23:43:24 GMT (envelope-from osa@FreeBSD.org) Received: (from osa@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4PNhOOh047579; Wed, 25 May 2016 23:43:24 GMT (envelope-from osa@FreeBSD.org) Message-Id: <201605252343.u4PNhOOh047579@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: osa set sender to osa@FreeBSD.org using -f From: "Sergey A. Osokin" Date: Wed, 25 May 2016 23:43:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415868 - in head/www/nginx-devel: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 May 2016 23:43:25 -0000 Author: osa Date: Wed May 25 23:43:23 2016 New Revision: 415868 URL: https://svnweb.freebsd.org/changeset/ports/415868 Log: Upgrade from 1.10.0 to 1.11.0. *) Feature: the "transparent" parameter of the "proxy_bind", "fastcgi_bind", "memcached_bind", "scgi_bind", and "uwsgi_bind" directives. *) Feature: the $request_id variable. *) Feature: the "map" directive supports combinations of multiple variables as resulting values. *) Feature: now nginx checks if EPOLLRDHUP events are supported by kernel, and optimizes connection handling accordingly if the "epoll" method is used. *) Feature: the "ssl_certificate" and "ssl_certificate_key" directives can be specified multiple times to load certificates of different types (for example, RSA and ECDSA). *) Feature: the "ssl_ecdh_curve" directive now allows specifying a list of curves when using OpenSSL 1.0.2 or newer; by default a list built into OpenSSL is used. *) Change: to use DHE ciphers it is now required to specify parameters using the "ssl_dhparam" directive. *) Feature: the $proxy_protocol_port variable. *) Feature: the $realip_remote_port variable in the ngx_http_realip_module. *) Feature: the ngx_http_realip_module is now able to set the client port in addition to the address. *) Change: the "421 Misdirected Request" response now used when rejecting requests to a virtual server different from one negotiated during an SSL handshake; this improves interoperability with some HTTP/2 clients when using client certificates. *) Change: HTTP/2 clients can now start sending request body immediately; the "http2_body_preread_size" directive controls size of the buffer used before nginx will start reading client request body. *) Bugfix: cached error responses were not updated when using the "proxy_cache_bypass" directive. Added: head/www/nginx-devel/files/extra-patch-ngx_inet_slab.c (contents, props changed) head/www/nginx-devel/files/extra-patch-ngx_rtmp_core_module.c (contents, props changed) head/www/nginx-devel/files/extra-patch-src-c-ngx_http_clojure_socket.c (contents, props changed) Modified: head/www/nginx-devel/Makefile head/www/nginx-devel/distinfo Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Wed May 25 22:31:53 2016 (r415867) +++ head/www/nginx-devel/Makefile Wed May 25 23:43:23 2016 (r415868) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= nginx -PORTVERSION= 1.10.0 -PORTREVISION= 3 +PORTVERSION= 1.11.0 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ MASTER_SITES+= LOCAL/osa @@ -412,6 +411,7 @@ GH_PROJECT+= nginx-clojure:clojure GH_TAGNAME+= v${NGINX_CLOJURE_VERSION}:clojure CONFIGURE_ENV+= "JNI_INCS=-I${LOCALBASE}/openjdk8/include -I${LOCALBASE}/openjdk8/include/freebsd" CONFIGURE_ARGS+=--add-module=${WRKSRC_clojure}/src/c +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src-c-ngx_http_clojure_socket.c .endif .if ${PORT_OPTIONS:MCT} @@ -747,6 +747,7 @@ CONFIGURE_ARGS+=--add-dynamic-module=${W .else CONFIGURE_ARGS+=--add-module=${WRKSRC_dyn_upstream} .endif +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_inet_slab.c .endif .if ${PORT_OPTIONS:MARRAYVAR} || ${PORT_OPTIONS:MENCRYPTSESSION} || ${PORT_OPTIONS:MFORMINPUT} || ${PORT_OPTIONS:MICONV} || ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MSET_MISC} @@ -894,6 +895,7 @@ GH_ACCOUNT+= arut:rtmp GH_PROJECT+= nginx-rtmp-module:rtmp GH_TAGNAME+= v${NGINX_RTMP_VERSION}:rtmp CONFIGURE_ARGS+=--add-module=${WRKSRC_rtmp} +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_rtmp_core_module.c .endif .if ${PORT_OPTIONS:MSET_MISC} Modified: head/www/nginx-devel/distinfo ============================================================================== --- head/www/nginx-devel/distinfo Wed May 25 22:31:53 2016 (r415867) +++ head/www/nginx-devel/distinfo Wed May 25 23:43:23 2016 (r415868) @@ -1,5 +1,6 @@ -SHA256 (nginx-1.10.0.tar.gz) = 8ed647c3dd65bc4ced03b0e0f6bf9e633eff6b01bac772bcf97077d58bc2be4d -SIZE (nginx-1.10.0.tar.gz) = 908954 +TIMESTAMP = 1464123738 +SHA256 (nginx-1.11.0.tar.gz) = 6ca0e7bf540cdae387ce9470568c2c3a826bc7e7f12def1ae7d20b66f4065a99 +SIZE (nginx-1.11.0.tar.gz) = 913282 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 Added: head/www/nginx-devel/files/extra-patch-ngx_inet_slab.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx-devel/files/extra-patch-ngx_inet_slab.c Wed May 25 23:43:23 2016 (r415868) @@ -0,0 +1,29 @@ +--- ../ngx_dynamic_upstream-0.1.3/src/ngx_inet_slab.c.orig 2016-05-25 19:27:27.204200000 -0400 ++++ ../ngx_dynamic_upstream-0.1.3/src/ngx_inet_slab.c 2016-05-25 19:28:07.177622000 -0400 +@@ -250,7 +250,7 @@ + return NGX_ERROR; + } + +- ngx_memcpy(sin, u->sockaddr, sizeof(struct sockaddr_in)); ++ ngx_memcpy(sin, &u->sockaddr, sizeof(struct sockaddr_in)); + + u->addrs[0].sockaddr = (struct sockaddr *) sin; + u->addrs[0].socklen = sizeof(struct sockaddr_in); +@@ -277,7 +277,7 @@ + + u->family = u->addrs[0].sockaddr->sa_family; + u->socklen = u->addrs[0].socklen; +- ngx_memcpy(u->sockaddr, u->addrs[0].sockaddr, u->addrs[0].socklen); ++ ngx_memcpy(&u->sockaddr, u->addrs[0].sockaddr, u->addrs[0].socklen); + + switch (u->family) { + +@@ -405,7 +405,7 @@ + return NGX_ERROR; + } + +- ngx_memcpy(sin6, u->sockaddr, sizeof(struct sockaddr_in6)); ++ ngx_memcpy(sin6, &u->sockaddr, sizeof(struct sockaddr_in6)); + + u->addrs[0].sockaddr = (struct sockaddr *) sin6; + u->addrs[0].socklen = sizeof(struct sockaddr_in6); Added: head/www/nginx-devel/files/extra-patch-ngx_rtmp_core_module.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx-devel/files/extra-patch-ngx_rtmp_core_module.c Wed May 25 23:43:23 2016 (r415868) @@ -0,0 +1,20 @@ +--- ../nginx-rtmp-module-1.1.7/ngx_rtmp_core_module.c.orig 2016-05-25 19:25:35.779720000 -0400 ++++ ../nginx-rtmp-module-1.1.7/ngx_rtmp_core_module.c 2016-05-25 19:26:28.055352000 -0400 +@@ -545,7 +545,7 @@ + break; + } + +- if (ngx_memcmp(ls[i].sockaddr + off, u.sockaddr + off, len) != 0) { ++ if (ngx_memcmp(ls[i].sockaddr + off, &u.sockaddr + off, len) != 0) { + continue; + } + +@@ -565,7 +565,7 @@ + + ngx_memzero(ls, sizeof(ngx_rtmp_listen_t)); + +- ngx_memcpy(ls->sockaddr, u.sockaddr, u.socklen); ++ ngx_memcpy(ls->sockaddr, &u.sockaddr, u.socklen); + + ls->socklen = u.socklen; + ls->wildcard = u.wildcard; Added: head/www/nginx-devel/files/extra-patch-src-c-ngx_http_clojure_socket.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx-devel/files/extra-patch-src-c-ngx_http_clojure_socket.c Wed May 25 23:43:23 2016 (r415868) @@ -0,0 +1,11 @@ +--- ../nginx-clojure-0.4.4/src/c/ngx_http_clojure_socket.c.orig 2016-05-24 17:39:48.898351000 -0400 ++++ ../nginx-clojure-0.4.4/src/c/ngx_http_clojure_socket.c 2016-05-25 19:23:44.584704000 -0400 +@@ -317,7 +317,7 @@ + } + u->resolved->host.data = url->host.data; + u->resolved->host.len = url->host.len; +- ngx_http_clojure_socket_upstream_connect(u, (struct sockaddr *)url->sockaddr, url->socklen); ++ ngx_http_clojure_socket_upstream_connect(u, &url->sockaddr, url->socklen); + } + + static void ngx_http_clojure_socket_upstream_connect_inner(ngx_http_clojure_socket_upstream_t *u) {