From owner-svn-ports-head@freebsd.org Wed Oct 12 00:44:53 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 C737DC0EC8F; Wed, 12 Oct 2016 00:44:53 +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 8717E91; Wed, 12 Oct 2016 00:44:53 +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 u9C0iqwH006870; Wed, 12 Oct 2016 00:44:52 GMT (envelope-from osa@FreeBSD.org) Received: (from osa@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9C0iqUH006864; Wed, 12 Oct 2016 00:44:52 GMT (envelope-from osa@FreeBSD.org) Message-Id: <201610120044.u9C0iqUH006864@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: osa set sender to osa@FreeBSD.org using -f From: "Sergey A. Osokin" Date: Wed, 12 Oct 2016 00:44:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r423811 - in head/www: nginx nginx-devel 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-head@freebsd.org X-Mailman-Version: 2.1.23 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, 12 Oct 2016 00:44:53 -0000 Author: osa Date: Wed Oct 12 00:44:51 2016 New Revision: 423811 URL: https://svnweb.freebsd.org/changeset/ports/423811 Log: Upgrade third-party upstream_sticky module to its latest version 08a395c66e42 to fix crashing with SIGSEGV. PR: 213113 Modified: head/www/nginx-devel/Makefile head/www/nginx-devel/distinfo head/www/nginx-devel/files/extra-patch-ngx_http_sticky_misc.c head/www/nginx/Makefile head/www/nginx/distinfo Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Wed Oct 12 00:31:28 2016 (r423810) +++ head/www/nginx-devel/Makefile Wed Oct 12 00:44:51 2016 (r423811) @@ -700,10 +700,10 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-patch- .if ${PORT_OPTIONS:MHTTP_UPSTREAM_STICKY} USE_HTTP_SSL= yes -NGINX_UPSTREAM_STICKY_VERSION= 1.2.4 +NGINX_UPSTREAM_STICKY_VERSION= 08a395c66e42 MASTER_SITES+= https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/:upstreamsticky DISTFILES+= ${NGINX_UPSTREAM_STICKY_VERSION}.tar.gz:upstreamsticky -CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-goodies-nginx-sticky-module-ng-c825ea7c5c91/ +CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-goodies-nginx-sticky-module-ng-${NGINX_UPSTREAM_STICKY_VERSION}/ EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-ngx_http_sticky_misc.c .endif Modified: head/www/nginx-devel/distinfo ============================================================================== --- head/www/nginx-devel/distinfo Wed Oct 12 00:31:28 2016 (r423810) +++ head/www/nginx-devel/distinfo Wed Oct 12 00:44:51 2016 (r423811) @@ -17,8 +17,8 @@ SHA256 (ngx_http_response-0.3.tar.gz) = SIZE (ngx_http_response-0.3.tar.gz) = 2244 SHA256 (nginx_upstream_fair-20090923.tar.gz) = ec9ed7f856263e17faadee3dc7209932364ded4e546b829841c2454aa432450b SIZE (nginx_upstream_fair-20090923.tar.gz) = 10024 -SHA256 (1.2.4.tar.gz) = f79521a25322cb4f504547a0b0f76fd9d024c14440e5d790e26dda70ea4f701a -SIZE (1.2.4.tar.gz) = 120448 +SHA256 (08a395c66e42.tar.gz) = 53e440737ed1aff1f09fae150219a45f16add0c8d6e84546cb7d80f73ebffd90 +SIZE (08a395c66e42.tar.gz) = 120603 SHA256 (modsecurity-2.9.1.tar.gz) = 958cc5a7a7430f93fac0fd6f8b9aa92fc1801efce0cda797d6029d44080a9b24 SIZE (modsecurity-2.9.1.tar.gz) = 4261212 SHA256 (passenger-5.0.30.tar.gz) = f367e0c1d808d7356c3749222194a72ea03efe61a3bf1b682bd05d47f087b4e3 Modified: head/www/nginx-devel/files/extra-patch-ngx_http_sticky_misc.c ============================================================================== --- head/www/nginx-devel/files/extra-patch-ngx_http_sticky_misc.c Wed Oct 12 00:31:28 2016 (r423810) +++ head/www/nginx-devel/files/extra-patch-ngx_http_sticky_misc.c Wed Oct 12 00:44:51 2016 (r423811) @@ -1,5 +1,5 @@ ---- ../nginx-goodies-nginx-sticky-module-ng-c825ea7c5c91/ngx_http_sticky_misc.c.orig 2016-07-10 11:39:07.943834000 -0400 -+++ ../nginx-goodies-nginx-sticky-module-ng-c825ea7c5c91/ngx_http_sticky_misc.c 2016-07-10 11:43:05.601078000 -0400 +--- ../nginx-goodies-nginx-sticky-module-ng-08a395c66e42/ngx_http_sticky_misc.c.orig 2016-07-10 11:39:07.943834000 -0400 ++++ ../nginx-goodies-nginx-sticky-module-ng-08a395c66e42/ngx_http_sticky_misc.c 2016-07-10 11:43:05.601078000 -0400 @@ -12,6 +12,14 @@ #include "ngx_http_sticky_misc.h" Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Wed Oct 12 00:31:28 2016 (r423810) +++ head/www/nginx/Makefile Wed Oct 12 00:44:51 2016 (r423811) @@ -698,10 +698,10 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-patch- .if ${PORT_OPTIONS:MHTTP_UPSTREAM_STICKY} USE_HTTP_SSL= yes -NGINX_UPSTREAM_STICKY_VERSION= 1.2.4 +NGINX_UPSTREAM_STICKY_VERSION= 08a395c66e42 MASTER_SITES+= https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/:upstreamsticky DISTFILES+= ${NGINX_UPSTREAM_STICKY_VERSION}.tar.gz:upstreamsticky -CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-goodies-nginx-sticky-module-ng-c825ea7c5c91/ +CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-goodies-nginx-sticky-module-ng-${NGINX_UPSTREAM_STICKY_VERSION}/ .endif .if ${PORT_OPTIONS:MHTTP_VIDEO_THUMBEXTRACTOR} Modified: head/www/nginx/distinfo ============================================================================== --- head/www/nginx/distinfo Wed Oct 12 00:31:28 2016 (r423810) +++ head/www/nginx/distinfo Wed Oct 12 00:44:51 2016 (r423811) @@ -17,8 +17,8 @@ SHA256 (ngx_http_response-0.3.tar.gz) = SIZE (ngx_http_response-0.3.tar.gz) = 2244 SHA256 (nginx_upstream_fair-20090923.tar.gz) = ec9ed7f856263e17faadee3dc7209932364ded4e546b829841c2454aa432450b SIZE (nginx_upstream_fair-20090923.tar.gz) = 10024 -SHA256 (1.2.4.tar.gz) = f79521a25322cb4f504547a0b0f76fd9d024c14440e5d790e26dda70ea4f701a -SIZE (1.2.4.tar.gz) = 120448 +SHA256 (08a395c66e42.tar.gz) = 53e440737ed1aff1f09fae150219a45f16add0c8d6e84546cb7d80f73ebffd90 +SIZE (08a395c66e42.tar.gz) = 120603 SHA256 (modsecurity-2.9.1.tar.gz) = 958cc5a7a7430f93fac0fd6f8b9aa92fc1801efce0cda797d6029d44080a9b24 SIZE (modsecurity-2.9.1.tar.gz) = 4261212 SHA256 (passenger-5.0.30.tar.gz) = f367e0c1d808d7356c3749222194a72ea03efe61a3bf1b682bd05d47f087b4e3