aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/nginx-devel/Makefile4
-rw-r--r--www/nginx-devel/distinfo6
-rw-r--r--www/nginx-devel/files/extra-patch-StaticContentHandler.c13
-rw-r--r--www/nginx/Makefile2
-rw-r--r--www/nginx/distinfo6
-rw-r--r--www/rubygem-passenger/Makefile3
-rw-r--r--www/rubygem-passenger/distinfo6
7 files changed, 12 insertions, 28 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 405d65660a30..97c4d3a3f4f8 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -384,7 +384,7 @@ CONFIGURE_ARGS+=--with-pcre
.endif
.if defined(WITH_PASSENGER_MODULE)
-PASSENGER_VERSION= 2.2.11
+PASSENGER_VERSION= 2.2.12
MASTER_SITES+= RF/passenger/:passenger
DISTFILES+= passenger-${PASSENGER_VERSION}.tar.gz:passenger
CONFIGURE_ARGS+=--add-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/ext/nginx
@@ -484,8 +484,6 @@ post-patch:
@${REINPLACE_CMD} '377s!-g!${CXXFLAGS}!; \
s!-lpthread!${PTHREAD_LIBS}!g' \
${WRKDIR}/passenger-${PASSENGER_VERSION}/lib/phusion_passenger/platform_info.rb
- @${PATCH} ${PATCH_ARGS} < \
- ${PATCHDIR}/extra-patch-StaticContentHandler.c
.endif
.if defined(WITH_HTTP_UPSTREAM_HASH)
@${PATCH} ${PATCH_ARGS} < \
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index d277e8ddeaca..41fa7bc45ca3 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -70,9 +70,9 @@ SIZE (mod_zip-1.1.5.tar.gz) = 19126
MD5 (ngx_http_memc_module-0.08.tar.gz) = b18562b966fc2ae116762612da704407
SHA256 (ngx_http_memc_module-0.08.tar.gz) = 1d786ba382d3fa5f0036d1831c8a21e1c787f5aa64ebec50820510bf72f2ccce
SIZE (ngx_http_memc_module-0.08.tar.gz) = 92182
-MD5 (passenger-2.2.11.tar.gz) = 3eb0aa6360c6f537d1eb6eb1f26cc8eb
-SHA256 (passenger-2.2.11.tar.gz) = 9d4aa14a4dfe9daa713aa19a787e1a5bee0db9f3625e17ffebe1e5325aa20a88
-SIZE (passenger-2.2.11.tar.gz) = 2058085
+MD5 (passenger-2.2.12.tar.gz) = 6d8970045f8f4d5e7f14d3adfcb52216
+SHA256 (passenger-2.2.12.tar.gz) = cfc29ba222c156fce0ea8b51e2b8172e8ffe204b643a3f58d1092ba31e9587ac
+SIZE (passenger-2.2.12.tar.gz) = 2116626
MD5 (ngx_slowfs_cache-1.4.tar.gz) = 0aafe80f856682a94f016fb4bb5dd3c6
SHA256 (ngx_slowfs_cache-1.4.tar.gz) = 0e71a916832b1aa7586f973df1a731621c2bcb5198352525d95643615c9f422c
SIZE (ngx_slowfs_cache-1.4.tar.gz) = 9741
diff --git a/www/nginx-devel/files/extra-patch-StaticContentHandler.c b/www/nginx-devel/files/extra-patch-StaticContentHandler.c
deleted file mode 100644
index fd5e0b3822ec..000000000000
--- a/www/nginx-devel/files/extra-patch-StaticContentHandler.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../passenger-2.2.11/ext/nginx/StaticContentHandler.c.orig 2010-05-24 20:19:23.000000000 +0400
-+++ ../passenger-2.2.11/ext/nginx/StaticContentHandler.c 2010-05-24 20:20:17.000000000 +0400
-@@ -66,10 +66,6 @@
- return NGX_DECLINED;
- }
-
-- if (r->zero_in_uri) {
-- return NGX_DECLINED;
-- }
--
- log = r->connection->log;
-
- ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0,
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 994a73c303a5..6153c263c627 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -372,7 +372,7 @@ CONFIGURE_ARGS+=--with-pcre
.endif
.if defined(WITH_PASSENGER_MODULE)
-PASSENGER_VERSION= 2.2.11
+PASSENGER_VERSION= 2.2.12
MASTER_SITES+= RF/passenger/:passenger
DISTFILES+= passenger-${PASSENGER_VERSION}.tar.gz:passenger
CONFIGURE_ARGS+=--add-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/ext/nginx
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 4a3c3419dc4b..149def3d6347 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -70,9 +70,9 @@ SIZE (mod_zip-1.1.5.tar.gz) = 19126
MD5 (ngx_http_memc_module-0.08.tar.gz) = b18562b966fc2ae116762612da704407
SHA256 (ngx_http_memc_module-0.08.tar.gz) = 1d786ba382d3fa5f0036d1831c8a21e1c787f5aa64ebec50820510bf72f2ccce
SIZE (ngx_http_memc_module-0.08.tar.gz) = 92182
-MD5 (passenger-2.2.11.tar.gz) = 3eb0aa6360c6f537d1eb6eb1f26cc8eb
-SHA256 (passenger-2.2.11.tar.gz) = 9d4aa14a4dfe9daa713aa19a787e1a5bee0db9f3625e17ffebe1e5325aa20a88
-SIZE (passenger-2.2.11.tar.gz) = 2058085
+MD5 (passenger-2.2.12.tar.gz) = 6d8970045f8f4d5e7f14d3adfcb52216
+SHA256 (passenger-2.2.12.tar.gz) = cfc29ba222c156fce0ea8b51e2b8172e8ffe204b643a3f58d1092ba31e9587ac
+SIZE (passenger-2.2.12.tar.gz) = 2116626
MD5 (ngx_slowfs_cache-1.4.tar.gz) = 0aafe80f856682a94f016fb4bb5dd3c6
SHA256 (ngx_slowfs_cache-1.4.tar.gz) = 0e71a916832b1aa7586f973df1a731621c2bcb5198352525d95643615c9f422c
SIZE (ngx_slowfs_cache-1.4.tar.gz) = 9741
diff --git a/www/rubygem-passenger/Makefile b/www/rubygem-passenger/Makefile
index 868d4d541f61..3bdb1130f8f6 100644
--- a/www/rubygem-passenger/Makefile
+++ b/www/rubygem-passenger/Makefile
@@ -5,8 +5,7 @@
# $FreeBSD$
PORTNAME= passenger
-PORTVERSION= 2.2.11
-PORTREVISION= 2
+PORTVERSION= 2.2.12
CATEGORIES= www rubygems
MASTER_SITES= RG
PKGNAMEPREFIX= rubygem-
diff --git a/www/rubygem-passenger/distinfo b/www/rubygem-passenger/distinfo
index ff4221a2277f..e75be95481fe 100644
--- a/www/rubygem-passenger/distinfo
+++ b/www/rubygem-passenger/distinfo
@@ -1,3 +1,3 @@
-MD5 (rubygem/passenger-2.2.11.gem) = 505ab2d6f42fcc576dfe1d03b89f844c
-SHA256 (rubygem/passenger-2.2.11.gem) = d48f34d0fe14012325ed3b29fa4e1d761e270e26c31463c75eedea3aa36f5bc6
-SIZE (rubygem/passenger-2.2.11.gem) = 2054144
+MD5 (rubygem/passenger-2.2.12.gem) = 068e4faf5a65bc592e72d0150b8f7ecd
+SHA256 (rubygem/passenger-2.2.12.gem) = c4fe7d34b52fa6fb8944e39bb33a31f993a256efaf68c9e26291f2bfd285f1ae
+SIZE (rubygem/passenger-2.2.12.gem) = 2118144