Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 12 Jul 2017 02:29:05 +0000 (UTC)
From:      "Sergey A. Osokin" <osa@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r445563 - in branches/2017Q3/www: nginx nginx-devel nginx-devel/files nginx/files rubygem-passenger
Message-ID:  <201707120229.v6C2T5cP017847@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: osa
Date: Wed Jul 12 02:29:05 2017
New Revision: 445563
URL: https://svnweb.freebsd.org/changeset/ports/445563

Log:
  MFH: r444824 r445024 r445025 r445556
  
  Upgrade from 1.13.1 to 1.13.2.
  
  <ChangeLog>
  
  *) Change: nginx now returns 200 instead of 416 when a range starting
     with 0 is requested from an empty file.
  
  *) Feature: the "add_trailer" directive.
     Thanks to Piotr Sikora.
  
  *) Bugfix: nginx could not be built on Cygwin and NetBSD; the bug had
     appeared in 1.13.0.
  
  *) Bugfix: nginx could not be built under MSYS2 / MinGW 64-bit.
     Thanks to Orgad Shaneh.
  
  *) Bugfix: a segmentation fault might occur in a worker process when
     using SSI with many includes and proxy_pass with variables.
  
  *) Bugfix: in the ngx_http_v2_module.
     Thanks to Piotr Sikora.
  
  </ChangeLog>
  
  Update from 5.1.4 to 5.1.5:
  
  o) www/rubygem-passenger;
  o) third-party passenger modules for www/nginx and www/nginx-devel.
  
  Upgrade third-party clojure module from 0.4.4 to 0.4.5.
  
  Security upgrade to 1.13.3.
  
  Security:	CVE-2017-7529
  
  Approved by:	ports-secteam

Deleted:
  branches/2017Q3/www/nginx-devel/files/extra-patch-src-c-ngx_http_clojure_socket.c
  branches/2017Q3/www/nginx/files/extra-patch-src-c-ngx_http_clojure_socket.c
Modified:
  branches/2017Q3/www/nginx-devel/Makefile
  branches/2017Q3/www/nginx-devel/distinfo
  branches/2017Q3/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb
  branches/2017Q3/www/nginx/Makefile
  branches/2017Q3/www/nginx/distinfo
  branches/2017Q3/www/nginx/files/extra-patch-passenger-build-nginx.rb
  branches/2017Q3/www/rubygem-passenger/Makefile
  branches/2017Q3/www/rubygem-passenger/distinfo
Directory Properties:
  branches/2017Q3/   (props changed)

Modified: branches/2017Q3/www/nginx-devel/Makefile
==============================================================================
--- branches/2017Q3/www/nginx-devel/Makefile	Wed Jul 12 02:22:20 2017	(r445562)
+++ branches/2017Q3/www/nginx-devel/Makefile	Wed Jul 12 02:29:05 2017	(r445563)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nginx
-PORTVERSION=	1.13.1
+PORTVERSION=	1.13.3
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/
 MASTER_SITES+=	LOCAL/osa
@@ -428,13 +428,12 @@ JAVA_VERSION=	1.8
 JAVA_VENDOR=	openjdk
 JAVA_BUILD=	yes
 JAVA_RUN=	yes
-NGINX_CLOJURE_VERSION=	0.4.4
+NGINX_CLOJURE_VERSION=	0.4.5
 GH_ACCOUNT+=	nginx-clojure:clojure
 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}
@@ -918,7 +917,7 @@ CONFIGURE_ARGS+=--without-http_rewrite_module \
 .endif
 
 .if ${PORT_OPTIONS:MPASSENGER}
-PASSENGER_VERSION=	5.1.4
+PASSENGER_VERSION=	5.1.5
 MASTER_SITES+=	http://s3.amazonaws.com/phusion-passenger/releases/:passenger
 DISTFILES+=	passenger-${PASSENGER_VERSION}.tar.gz:passenger
 .if !empty(PORT_OPTIONS:MDSO)

Modified: branches/2017Q3/www/nginx-devel/distinfo
==============================================================================
--- branches/2017Q3/www/nginx-devel/distinfo	Wed Jul 12 02:22:20 2017	(r445562)
+++ branches/2017Q3/www/nginx-devel/distinfo	Wed Jul 12 02:29:05 2017	(r445563)
@@ -1,6 +1,6 @@
-TIMESTAMP = 1497052311
-SHA256 (nginx-1.13.1.tar.gz) = a5856c72a6609a4dc68c88a7f3c33b79e6693343b62952e021e043fe347b6776
-SIZE (nginx-1.13.1.tar.gz) = 984142
+TIMESTAMP = 1499818490
+SHA256 (nginx-1.13.3.tar.gz) = 5b73f98004c302fb8e4a172abf046d9ce77739a82487e4873b39f9b0dcbb0d72
+SIZE (nginx-1.13.3.tar.gz) = 985931
 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,8 @@ 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 (passenger-5.1.4.tar.gz) = 6e8460143fff88c7ae833b43ff5389c0b0d2654ee38ab1ac62e24a3814416de0
-SIZE (passenger-5.1.4.tar.gz) = 5403636
+SHA256 (passenger-5.1.5.tar.gz) = ea4139d2f0d9f7aa6488be966ffbfe602f80764a47b7077892d92324bff5eb47
+SIZE (passenger-5.1.5.tar.gz) = 5126337
 SHA256 (ngx_slowfs_cache-1.10.tar.gz) = 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1
 SIZE (ngx_slowfs_cache-1.10.tar.gz) = 11809
 SHA256 (giom-nginx_accept_language_module-2f69842_GH0.tar.gz) = 5534ca63cdfc2a7dc4e1cbf9c2d54d3ed3f0e6c86b4a95be48ec0a3f41cc1eb0
@@ -33,8 +33,8 @@ SHA256 (yaoweibin-nginx_ajp_module-bf6cd93_GH0.tar.gz)
 SIZE (yaoweibin-nginx_ajp_module-bf6cd93_GH0.tar.gz) = 109704
 SHA256 (anomalizer-ngx_aws_auth-1e62670_GH0.tar.gz) = db7ceef4ae22cf5bfaf5abae64830dfeef203ca85f9f40f7d1f1d90f277478c0
 SIZE (anomalizer-ngx_aws_auth-1e62670_GH0.tar.gz) = 8260
-SHA256 (nginx-clojure-nginx-clojure-v0.4.4_GH0.tar.gz) = 642ebf4724fa7c3efd5349e60b442ac8671497406834804c903ec548bfdcb691
-SIZE (nginx-clojure-nginx-clojure-v0.4.4_GH0.tar.gz) = 603856
+SHA256 (nginx-clojure-nginx-clojure-v0.4.5_GH0.tar.gz) = c6d500f935dde5f87a6eb47ca473094a8ee2c9b4bb4578c9f99ccdc70a12d59e
+SIZE (nginx-clojure-nginx-clojure-v0.4.5_GH0.tar.gz) = 602064
 SHA256 (grahamedgecombe-nginx-ct-v1.3.2_GH0.tar.gz) = b4ceae549b9dbf84b2e511633982e4efeee0388e3b7a038a8bac555008a77b88
 SIZE (grahamedgecombe-nginx-ct-v1.3.2_GH0.tar.gz) = 6844
 SHA256 (openresty-echo-nginx-module-46334b3_GH0.tar.gz) = 00d42a5f562a0be5570110d9b70c8f2cace93b292421a6f994cf4ec76a8979f0

Modified: branches/2017Q3/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb
==============================================================================
--- branches/2017Q3/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb	Wed Jul 12 02:22:20 2017	(r445562)
+++ branches/2017Q3/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb	Wed Jul 12 02:29:05 2017	(r445563)
@@ -1,5 +1,5 @@
---- ../passenger-5.1.4/build/nginx.rb.orig	2013-10-26 18:00:00.000000000 -0400
-+++ ../passenger-5.1.4/build/nginx.rb	2016-05-09 18:21:22.426777000 -0400
+--- ../passenger-5.1.5/build/nginx.rb.orig	2013-10-26 18:00:00.000000000 -0400
++++ ../passenger-5.1.5/build/nginx.rb	2016-05-09 18:21:22.426777000 -0400
 @@ -33,13 +33,12 @@
  desc "Build Nginx support files"
  task :nginx => [

Modified: branches/2017Q3/www/nginx/Makefile
==============================================================================
--- branches/2017Q3/www/nginx/Makefile	Wed Jul 12 02:22:20 2017	(r445562)
+++ branches/2017Q3/www/nginx/Makefile	Wed Jul 12 02:29:05 2017	(r445563)
@@ -426,13 +426,12 @@ JAVA_VERSION=	1.8
 JAVA_VENDOR=	openjdk
 JAVA_BUILD=	yes
 JAVA_RUN=	yes
-NGINX_CLOJURE_VERSION=	0.4.4
+NGINX_CLOJURE_VERSION=	0.4.5
 GH_ACCOUNT+=	nginx-clojure:clojure
 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}
@@ -916,7 +915,7 @@ CONFIGURE_ARGS+=--without-http_rewrite_module \
 .endif
 
 .if ${PORT_OPTIONS:MPASSENGER}
-PASSENGER_VERSION=	5.1.4
+PASSENGER_VERSION=	5.1.5
 MASTER_SITES+=	http://s3.amazonaws.com/phusion-passenger/releases/:passenger
 DISTFILES+=	passenger-${PASSENGER_VERSION}.tar.gz:passenger
 .if !empty(PORT_OPTIONS:MDSO)

Modified: branches/2017Q3/www/nginx/distinfo
==============================================================================
--- branches/2017Q3/www/nginx/distinfo	Wed Jul 12 02:22:20 2017	(r445562)
+++ branches/2017Q3/www/nginx/distinfo	Wed Jul 12 02:29:05 2017	(r445563)
@@ -15,8 +15,8 @@ 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 (passenger-5.1.4.tar.gz) = 6e8460143fff88c7ae833b43ff5389c0b0d2654ee38ab1ac62e24a3814416de0
-SIZE (passenger-5.1.4.tar.gz) = 5403636
+SHA256 (passenger-5.1.5.tar.gz) = ea4139d2f0d9f7aa6488be966ffbfe602f80764a47b7077892d92324bff5eb47
+SIZE (passenger-5.1.5.tar.gz) = 5126337
 SHA256 (ngx_slowfs_cache-1.10.tar.gz) = 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1
 SIZE (ngx_slowfs_cache-1.10.tar.gz) = 11809
 SHA256 (giom-nginx_accept_language_module-2f69842_GH0.tar.gz) = 5534ca63cdfc2a7dc4e1cbf9c2d54d3ed3f0e6c86b4a95be48ec0a3f41cc1eb0
@@ -33,8 +33,8 @@ SHA256 (yaoweibin-nginx_ajp_module-bf6cd93_GH0.tar.gz)
 SIZE (yaoweibin-nginx_ajp_module-bf6cd93_GH0.tar.gz) = 109704
 SHA256 (anomalizer-ngx_aws_auth-1e62670_GH0.tar.gz) = db7ceef4ae22cf5bfaf5abae64830dfeef203ca85f9f40f7d1f1d90f277478c0
 SIZE (anomalizer-ngx_aws_auth-1e62670_GH0.tar.gz) = 8260
-SHA256 (nginx-clojure-nginx-clojure-v0.4.4_GH0.tar.gz) = 642ebf4724fa7c3efd5349e60b442ac8671497406834804c903ec548bfdcb691
-SIZE (nginx-clojure-nginx-clojure-v0.4.4_GH0.tar.gz) = 603856
+SHA256 (nginx-clojure-nginx-clojure-v0.4.5_GH0.tar.gz) = c6d500f935dde5f87a6eb47ca473094a8ee2c9b4bb4578c9f99ccdc70a12d59e
+SIZE (nginx-clojure-nginx-clojure-v0.4.5_GH0.tar.gz) = 602064
 SHA256 (grahamedgecombe-nginx-ct-v1.3.2_GH0.tar.gz) = b4ceae549b9dbf84b2e511633982e4efeee0388e3b7a038a8bac555008a77b88
 SIZE (grahamedgecombe-nginx-ct-v1.3.2_GH0.tar.gz) = 6844
 SHA256 (openresty-echo-nginx-module-46334b3_GH0.tar.gz) = 00d42a5f562a0be5570110d9b70c8f2cace93b292421a6f994cf4ec76a8979f0

Modified: branches/2017Q3/www/nginx/files/extra-patch-passenger-build-nginx.rb
==============================================================================
--- branches/2017Q3/www/nginx/files/extra-patch-passenger-build-nginx.rb	Wed Jul 12 02:22:20 2017	(r445562)
+++ branches/2017Q3/www/nginx/files/extra-patch-passenger-build-nginx.rb	Wed Jul 12 02:29:05 2017	(r445563)
@@ -1,5 +1,5 @@
---- ../passenger-5.1.4/build/nginx.rb.orig	2013-10-26 18:00:00.000000000 -0400
-+++ ../passenger-5.1.4/build/nginx.rb	2016-05-09 18:21:22.426777000 -0400
+--- ../passenger-5.1.5/build/nginx.rb.orig	2013-10-26 18:00:00.000000000 -0400
++++ ../passenger-5.1.5/build/nginx.rb	2016-05-09 18:21:22.426777000 -0400
 @@ -33,13 +33,12 @@
  desc "Build Nginx support files"
  task :nginx => [

Modified: branches/2017Q3/www/rubygem-passenger/Makefile
==============================================================================
--- branches/2017Q3/www/rubygem-passenger/Makefile	Wed Jul 12 02:22:20 2017	(r445562)
+++ branches/2017Q3/www/rubygem-passenger/Makefile	Wed Jul 12 02:29:05 2017	(r445563)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	passenger
-PORTVERSION=	5.1.4
+PORTVERSION=	5.1.5
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMEPREFIX=	rubygem-

Modified: branches/2017Q3/www/rubygem-passenger/distinfo
==============================================================================
--- branches/2017Q3/www/rubygem-passenger/distinfo	Wed Jul 12 02:22:20 2017	(r445562)
+++ branches/2017Q3/www/rubygem-passenger/distinfo	Wed Jul 12 02:29:05 2017	(r445563)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494707375
-SHA256 (rubygem/passenger-5.1.4.gem) = 7cd11aa8e249fa8810e54a293b7b025706d87d464104317931d866536164836b
-SIZE (rubygem/passenger-5.1.4.gem) = 5412864
+TIMESTAMP = 1498919476
+SHA256 (rubygem/passenger-5.1.5.gem) = 2245ddd0dc5288c677d3e9a2cef628d124fda1d4fed1c5a202db9e6f7a9840ed
+SIZE (rubygem/passenger-5.1.5.gem) = 5132800



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707120229.v6C2T5cP017847>