Update from 3.0.7 to 3.0.8:

1) www/rubygem-passenger;

2) passenger support for www/nginx and www/nginx-devel;

Also add patch for fix NULL pointer crash that occurs when
HTTP 1.0 Host header isn't given, obtained from passenger's
upstream.

Approved by:	maintainer [1]

10 files changed, 132 insertions, 19 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 9b95e9d90af8..e38c82d947b9 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -465,11 +465,12 @@ CONFIGURE_ARGS+=--with-pcre
 .endif
 
 .if defined(WITH_PASSENGER_MODULE)
-PASSENGER_VERSION=	3.0.7
+PASSENGER_VERSION=	3.0.8
 MASTER_SITES+=	RF/passenger/:passenger
 DISTFILES+=	passenger-${PASSENGER_VERSION}.tar.gz:passenger
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/ext/nginx
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-passenger::build::nginx.rb
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-passenger::build::nginx.rb \
+		${PATCHDIR}/extra-patch-passenger::ext::nginx::ContentHandler.c
 .if !defined(WITH_DEBUG)
 CONFIGURE_ENV+=	OPTIMIZE="yes"
 CFLAGS+=	-DNDEBUG
@@ -630,7 +631,8 @@ post-patch:
 		${WRKDIR}/passenger-${PASSENGER_VERSION}/build/config.rb
 	@${REINPLACE_CMD} \
 		's!-I/usr/include/libev!!; \
-		s!-lev!!' \
+		s!-lev!!; \
+		s!-Iext/libev!!' \
 		${WRKDIR}/passenger-${PASSENGER_VERSION}/build/common_library.rb
 	@${REINPLACE_CMD} 's!-lpthread!${PTHREAD_LIBS}!g' \
 		${WRKDIR}/passenger-${PASSENGER_VERSION}/lib/phusion_passenger/platform_info/compiler.rb
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 02ca05564d2b..4e2ee7ea6702 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -58,8 +58,8 @@ SHA256 (chaoslawful-lua-nginx-module-v0.2.0-0-g8e7d37e.tar.gz) = abdd6409962a93a
 SIZE (chaoslawful-lua-nginx-module-v0.2.0-0-g8e7d37e.tar.gz) = 94607
 SHA256 (agentzh-memc-nginx-module-v0.12-0-g4f1952c.tar.gz) = e0f604e20312bbd30ac88b2d83faa54f4668e6f6227762d2fc14e1d37df0b1de
 SIZE (agentzh-memc-nginx-module-v0.12-0-g4f1952c.tar.gz) = 36414
-SHA256 (passenger-3.0.7.tar.gz) = 021972c7f4fecd80042e7fc1d8f19ee3008a5491a3b1d34958b2b7ed42bddc85
-SIZE (passenger-3.0.7.tar.gz) = 2830376
+SHA256 (passenger-3.0.8.tar.gz) = ccef21dc97b54de17c1d44644b2bc67b7732a860ff67206a4c557727311a8349
+SIZE (passenger-3.0.8.tar.gz) = 2362561
 SHA256 (ngx_postgres-0.8.tar.gz) = 321de5ddfe95da45550a2b1d29cfcd425ed7d7d63edb0e086406486675d04283
 SIZE (ngx_postgres-0.8.tar.gz) = 40108
 SHA256 (agentzh-redis2-nginx-module-v0.07-0-g6f7fc37.tar.gz) = 3fbc76fbf60e02e879184b28cb9e834a4bb8f10ecd073ebd3cc585c469650b1a
diff --git a/www/nginx-devel/files/extra-patch-passenger::build::nginx.rb b/www/nginx-devel/files/extra-patch-passenger::build::nginx.rb
index fc556de2dee6..f6b0bb80b97a 100644
--- a/www/nginx-devel/files/extra-patch-passenger::build::nginx.rb
+++ b/www/nginx-devel/files/extra-patch-passenger::build::nginx.rb
@@ -1,5 +1,5 @@
---- ../passenger-3.0.7/build/nginx.rb.orig	2010-12-07 13:57:32.000000000 +0300
-+++ ../passenger-3.0.7/build/nginx.rb	2010-12-07 13:58:13.000000000 +0300
+--- ../passenger-3.0.8/build/nginx.rb.orig	2010-12-07 13:57:32.000000000 +0300
++++ ../passenger-3.0.8/build/nginx.rb	2010-12-07 13:58:13.000000000 +0300
 @@ -23,10 +23,7 @@
  
  desc "Build Nginx helper agent"
diff --git a/www/nginx-devel/files/extra-patch-passenger::ext::nginx::ContentHandler.c b/www/nginx-devel/files/extra-patch-passenger::ext::nginx::ContentHandler.c
new file mode 100644
index 000000000000..b71bd650bbb9
--- /dev/null
+++ b/www/nginx-devel/files/extra-patch-passenger::ext::nginx::ContentHandler.c
@@ -0,0 +1,54 @@
+--- ../passenger-3.0.8/ext/nginx/ContentHandler.c.orig	2011-08-10 10:35:24.000000000 +0400
++++ ../passenger-3.0.8/ext/nginx/ContentHandler.c	2011-08-10 10:36:35.000000000 +0400
+@@ -336,6 +336,7 @@
+     ngx_table_elt_t               *header;
+     ngx_http_script_code_pt        code;
+     ngx_http_script_engine_t       e, le;
++    ngx_http_core_srv_conf_t      *cscf;
+     passenger_loc_conf_t          *slcf;
+     passenger_main_conf_t         *main_conf;
+     passenger_context_t           *context;
+@@ -344,6 +345,7 @@
+         ngx_http_ssl_srv_conf_t   *ssl_conf;
+     #endif
+     
++    cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
+     slcf = ngx_http_get_module_loc_conf(r, ngx_http_passenger_module);
+     main_conf = &passenger_main_conf;
+     context = ngx_http_get_module_ctx(r, ngx_http_passenger_module);
+@@ -415,11 +417,15 @@
+     }
+     
+     /* SERVER_NAME; must be equal to HTTP_HOST without the port part */
+-    tmp = memchr(r->headers_in.host->value.data, ':', r->headers_in.host->value.len);
+-    if (tmp == NULL) {
+-        server_name_len = r->headers_in.host->value.len;
++    if (r->headers_in.host != NULL) {
++        tmp = memchr(r->headers_in.host->value.data, ':', r->headers_in.host->value.len);
++        if (tmp == NULL) {
++            server_name_len = r->headers_in.host->value.len;
++        } else {
++            server_name_len = (int) ((const u_char *) tmp - r->headers_in.host->value.data);
++        }
+     } else {
+-        server_name_len = (int) ((const u_char *) tmp - r->headers_in.host->value.data);
++        server_name_len = cscf->server_name.len;
+     }
+     len += sizeof("SERVER_NAME") + server_name_len + 1;
+     
+@@ -650,8 +656,13 @@
+     
+     /* SERVER_NAME */
+     b->last = ngx_copy(b->last, "SERVER_NAME", sizeof("SERVER_NAME"));
+-    b->last = ngx_copy(b->last, r->headers_in.host->value.data,
+-                       server_name_len);
++    if (r->headers_in.host != NULL) {
++        b->last = ngx_copy(b->last, r->headers_in.host->value.data,
++                           server_name_len);
++    } else {
++        b->last = ngx_copy(b->last, cscf->server_name.data,
++                           server_name_len);
++    }
+     b->last = ngx_copy(b->last, "", 1);
+     
+     /* Various other HTTP headers. */
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index d6727902a3db..0a72b7f223d6 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -464,11 +464,12 @@ CONFIGURE_ARGS+=--with-pcre
 .endif
 
 .if defined(WITH_PASSENGER_MODULE)
-PASSENGER_VERSION=	3.0.7
+PASSENGER_VERSION=	3.0.8
 MASTER_SITES+=	RF/passenger/:passenger
 DISTFILES+=	passenger-${PASSENGER_VERSION}.tar.gz:passenger
 CONFIGURE_ARGS+=--add-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/ext/nginx
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-passenger::build::nginx.rb
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-passenger::build::nginx.rb \
+		${PATCHDIR}/extra-patch-passenger::ext::nginx::ContentHandler.c
 .if !defined(WITH_DEBUG)
 CONFIGURE_ENV+=	OPTIMIZE="yes"
 CFLAGS+=	-DNDEBUG
@@ -629,7 +630,8 @@ post-patch:
 		${WRKDIR}/passenger-${PASSENGER_VERSION}/build/config.rb
 	@${REINPLACE_CMD} \
 		's!-I/usr/include/libev!!; \
-		s!-lev!!' \
+		s!-lev!!; \
+		s!-Iext/libev!!' \
 		${WRKDIR}/passenger-${PASSENGER_VERSION}/build/common_library.rb
 	@${REINPLACE_CMD} 's!-lpthread!${PTHREAD_LIBS}!g' \
 		${WRKDIR}/passenger-${PASSENGER_VERSION}/lib/phusion_passenger/platform_info/compiler.rb
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 02ca05564d2b..4e2ee7ea6702 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -58,8 +58,8 @@ SHA256 (chaoslawful-lua-nginx-module-v0.2.0-0-g8e7d37e.tar.gz) = abdd6409962a93a
 SIZE (chaoslawful-lua-nginx-module-v0.2.0-0-g8e7d37e.tar.gz) = 94607
 SHA256 (agentzh-memc-nginx-module-v0.12-0-g4f1952c.tar.gz) = e0f604e20312bbd30ac88b2d83faa54f4668e6f6227762d2fc14e1d37df0b1de
 SIZE (agentzh-memc-nginx-module-v0.12-0-g4f1952c.tar.gz) = 36414
-SHA256 (passenger-3.0.7.tar.gz) = 021972c7f4fecd80042e7fc1d8f19ee3008a5491a3b1d34958b2b7ed42bddc85
-SIZE (passenger-3.0.7.tar.gz) = 2830376
+SHA256 (passenger-3.0.8.tar.gz) = ccef21dc97b54de17c1d44644b2bc67b7732a860ff67206a4c557727311a8349
+SIZE (passenger-3.0.8.tar.gz) = 2362561
 SHA256 (ngx_postgres-0.8.tar.gz) = 321de5ddfe95da45550a2b1d29cfcd425ed7d7d63edb0e086406486675d04283
 SIZE (ngx_postgres-0.8.tar.gz) = 40108
 SHA256 (agentzh-redis2-nginx-module-v0.07-0-g6f7fc37.tar.gz) = 3fbc76fbf60e02e879184b28cb9e834a4bb8f10ecd073ebd3cc585c469650b1a
diff --git a/www/nginx/files/extra-patch-passenger::build::nginx.rb b/www/nginx/files/extra-patch-passenger::build::nginx.rb
index fc556de2dee6..f6b0bb80b97a 100644
--- a/www/nginx/files/extra-patch-passenger::build::nginx.rb
+++ b/www/nginx/files/extra-patch-passenger::build::nginx.rb
@@ -1,5 +1,5 @@
---- ../passenger-3.0.7/build/nginx.rb.orig	2010-12-07 13:57:32.000000000 +0300
-+++ ../passenger-3.0.7/build/nginx.rb	2010-12-07 13:58:13.000000000 +0300
+--- ../passenger-3.0.8/build/nginx.rb.orig	2010-12-07 13:57:32.000000000 +0300
++++ ../passenger-3.0.8/build/nginx.rb	2010-12-07 13:58:13.000000000 +0300
 @@ -23,10 +23,7 @@
  
  desc "Build Nginx helper agent"
diff --git a/www/nginx/files/extra-patch-passenger::ext::nginx::ContentHandler.c b/www/nginx/files/extra-patch-passenger::ext::nginx::ContentHandler.c
new file mode 100644
index 000000000000..b71bd650bbb9
--- /dev/null
+++ b/www/nginx/files/extra-patch-passenger::ext::nginx::ContentHandler.c
@@ -0,0 +1,54 @@
+--- ../passenger-3.0.8/ext/nginx/ContentHandler.c.orig	2011-08-10 10:35:24.000000000 +0400
++++ ../passenger-3.0.8/ext/nginx/ContentHandler.c	2011-08-10 10:36:35.000000000 +0400
+@@ -336,6 +336,7 @@
+     ngx_table_elt_t               *header;
+     ngx_http_script_code_pt        code;
+     ngx_http_script_engine_t       e, le;
++    ngx_http_core_srv_conf_t      *cscf;
+     passenger_loc_conf_t          *slcf;
+     passenger_main_conf_t         *main_conf;
+     passenger_context_t           *context;
+@@ -344,6 +345,7 @@
+         ngx_http_ssl_srv_conf_t   *ssl_conf;
+     #endif
+     
++    cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
+     slcf = ngx_http_get_module_loc_conf(r, ngx_http_passenger_module);
+     main_conf = &passenger_main_conf;
+     context = ngx_http_get_module_ctx(r, ngx_http_passenger_module);
+@@ -415,11 +417,15 @@
+     }
+     
+     /* SERVER_NAME; must be equal to HTTP_HOST without the port part */
+-    tmp = memchr(r->headers_in.host->value.data, ':', r->headers_in.host->value.len);
+-    if (tmp == NULL) {
+-        server_name_len = r->headers_in.host->value.len;
++    if (r->headers_in.host != NULL) {
++        tmp = memchr(r->headers_in.host->value.data, ':', r->headers_in.host->value.len);
++        if (tmp == NULL) {
++            server_name_len = r->headers_in.host->value.len;
++        } else {
++            server_name_len = (int) ((const u_char *) tmp - r->headers_in.host->value.data);
++        }
+     } else {
+-        server_name_len = (int) ((const u_char *) tmp - r->headers_in.host->value.data);
++        server_name_len = cscf->server_name.len;
+     }
+     len += sizeof("SERVER_NAME") + server_name_len + 1;
+     
+@@ -650,8 +656,13 @@
+     
+     /* SERVER_NAME */
+     b->last = ngx_copy(b->last, "SERVER_NAME", sizeof("SERVER_NAME"));
+-    b->last = ngx_copy(b->last, r->headers_in.host->value.data,
+-                       server_name_len);
++    if (r->headers_in.host != NULL) {
++        b->last = ngx_copy(b->last, r->headers_in.host->value.data,
++                           server_name_len);
++    } else {
++        b->last = ngx_copy(b->last, cscf->server_name.data,
++                           server_name_len);
++    }
+     b->last = ngx_copy(b->last, "", 1);
+     
+     /* Various other HTTP headers. */
diff --git a/www/rubygem-passenger/Makefile b/www/rubygem-passenger/Makefile
index 838f56673a59..6c79b088280d 100644
--- a/www/rubygem-passenger/Makefile
+++ b/www/rubygem-passenger/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	passenger
-PORTVERSION=	3.0.7
+PORTVERSION=	3.0.8
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 PKGNAMEPREFIX=	rubygem-
@@ -87,7 +87,7 @@ post-install:
 		s!g++!${CXX}!g; \
 		s!#{PlatformInfo.debugging_cflags}!${CFLAGS}!g; \
 		s!-O2!!g; \
-		42s!true!false!' \
+		43s!true!false!' \
 		${PREFIX}/${GEM_LIB_DIR}/build/config.rb
 .if !defined(WITH_DEBUG)
 	@${REINPLACE_CMD} \
@@ -104,7 +104,8 @@ post-install:
 		's!#{LIBEV_LIBS}!-L${LOCALBASE}/lib -lev!g' \
 		${PREFIX}/${GEM_LIB_DIR}/build/agents.rb
 	@${REINPLACE_CMD} \
-		'263s!/usr/include/libev!${LOCALBASE}/include!; \
+		's!-Iext/libev!!; \
+		263s!/usr/include/libev!${LOCALBASE}/include!; \
 		264s!-lev!-L${LOCALBASE}/lib -lev!' \
 		${PREFIX}/${GEM_LIB_DIR}/build/common_library.rb
 
diff --git a/www/rubygem-passenger/distinfo b/www/rubygem-passenger/distinfo
index 14e52a9c458f..995146082c12 100644
--- a/www/rubygem-passenger/distinfo
+++ b/www/rubygem-passenger/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/passenger-3.0.7.gem) = ee15ba38addce748c11f59d8efaf38f325373ac77ea4d12413ac14519b2c2bd2
-SIZE (rubygem/passenger-3.0.7.gem) = 2833408
+SHA256 (rubygem/passenger-3.0.8.gem) = 5ae7b247c6dd5c451629ac7647ae9ec83e8cb9786f0659720478fdc2529e7ca7
+SIZE (rubygem/passenger-3.0.8.gem) = 2358784