1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-29 10:18:30 +00:00

Accordingly update passenger from 2.2.14 to 2.2.15 for:

o) www/nginx and www/nginx-devel	[1]
o) www/rubygem-passenger		[2]

Remove needless patch.

[1] Do not bump PORTREVISION.
[2] Approved by:	Jacob Atzen aka jatzen at gmail dot com (maintainer)

Feature safe:		yes
This commit is contained in:
Sergey A. Osokin 2010-06-30 17:35:58 +00:00
parent 672d75d729
commit 9b4375aa3e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=257218
7 changed files with 12 additions and 29 deletions

View File

@ -389,7 +389,7 @@ CONFIGURE_ARGS+=--with-pcre
.endif
.if defined(WITH_PASSENGER_MODULE)
PASSENGER_VERSION= 2.2.14
PASSENGER_VERSION= 2.2.15
MASTER_SITES+= RF/passenger/:passenger
DISTFILES+= passenger-${PASSENGER_VERSION}.tar.gz:passenger
CONFIGURE_ARGS+=--add-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/ext/nginx

View File

@ -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.14.tar.gz) = 296205978dffe1de3c35bf844c2bc3c7
SHA256 (passenger-2.2.14.tar.gz) = 9d23b509324a0d00c3e1aac1402a36ffa2470edf8dd13ab999bf260287481d2b
SIZE (passenger-2.2.14.tar.gz) = 2207394
MD5 (passenger-2.2.15.tar.gz) = a156bb47e79b00d063d08fc5715dec0c
SHA256 (passenger-2.2.15.tar.gz) = 95a9f61070d268ecaa311539d8e28b348765ca0e1528665ef928fc4b4bcc1436
SIZE (passenger-2.2.15.tar.gz) = 2128473
MD5 (ngx_slowfs_cache-1.5.tar.gz) = 165c93b1adc6b5cebc2b2aa28f881682
SHA256 (ngx_slowfs_cache-1.5.tar.gz) = 8f3d1afd6bcaaeba89bc4f9d5e5ba3e2b334bf8e7e5b56bd37f25b5cbac8d828
SIZE (ngx_slowfs_cache-1.5.tar.gz) = 9785

View File

@ -381,7 +381,7 @@ CONFIGURE_ARGS+=--with-pcre
.endif
.if defined(WITH_PASSENGER_MODULE)
PASSENGER_VERSION= 2.2.14
PASSENGER_VERSION= 2.2.15
MASTER_SITES+= RF/passenger/:passenger
DISTFILES+= passenger-${PASSENGER_VERSION}.tar.gz:passenger
CONFIGURE_ARGS+=--add-module=${WRKDIR}/passenger-${PASSENGER_VERSION}/ext/nginx
@ -481,8 +481,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} < \

View File

@ -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.14.tar.gz) = 296205978dffe1de3c35bf844c2bc3c7
SHA256 (passenger-2.2.14.tar.gz) = 9d23b509324a0d00c3e1aac1402a36ffa2470edf8dd13ab999bf260287481d2b
SIZE (passenger-2.2.14.tar.gz) = 2207394
MD5 (passenger-2.2.15.tar.gz) = a156bb47e79b00d063d08fc5715dec0c
SHA256 (passenger-2.2.15.tar.gz) = 95a9f61070d268ecaa311539d8e28b348765ca0e1528665ef928fc4b4bcc1436
SIZE (passenger-2.2.15.tar.gz) = 2128473
MD5 (ngx_slowfs_cache-1.5.tar.gz) = 165c93b1adc6b5cebc2b2aa28f881682
SHA256 (ngx_slowfs_cache-1.5.tar.gz) = 8f3d1afd6bcaaeba89bc4f9d5e5ba3e2b334bf8e7e5b56bd37f25b5cbac8d828
SIZE (ngx_slowfs_cache-1.5.tar.gz) = 9785

View File

@ -1,15 +0,0 @@
--- ../passenger-2.2.14/ext/nginx/StaticContentHandler.c.orig 2010-06-04 14:37:15.000000000 +0400
+++ ../passenger-2.2.14/ext/nginx/StaticContentHandler.c 2010-06-07 16:59:47.000000000 +0400
@@ -67,12 +67,6 @@
return NGX_DECLINED;
}
- #if NGINX_VERSION_NUM < 8038
- if (r->zero_in_uri) {
- return NGX_DECLINED;
- }
- #endif
-
log = r->connection->log;
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0,

View File

@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= passenger
PORTVERSION= 2.2.14
PORTVERSION= 2.2.15
CATEGORIES= www rubygems
MASTER_SITES= RG
PKGNAMEPREFIX= rubygem-

View File

@ -1,3 +1,3 @@
MD5 (rubygem/passenger-2.2.14.gem) = 066d023d7548695b116e17cd35e5a516
SHA256 (rubygem/passenger-2.2.14.gem) = ef37e4d697f6f7f66859f2f2fe82efbbd043e8e4bc2f27e94679998b648bdcfd
SIZE (rubygem/passenger-2.2.14.gem) = 2126848
MD5 (rubygem/passenger-2.2.15.gem) = fd0e1a0ebcf97af7e238c405a6b70235
SHA256 (rubygem/passenger-2.2.15.gem) = 0cb62d667001e383c70a23cf25587948c7c959d852c43343ea30aa54e39ff79f
SIZE (rubygem/passenger-2.2.15.gem) = 2127360