diff options
| author |   Benedikt Boehm <hollow@gentoo.org> | 2011-04-19 06:50:24 +0000 |
|---|---|---|
| committer | Benedikt Boehm <hollow@gentoo.org> | 2011-04-19 06:50:24 +0000 |
| commit | 22b650cd8a7af4f2fafc4b08d9df645e8425fafb (patch) | |
| tree | 38517a114ee27290157f053907ee8be7431a4ee8 /www-servers/nginx | |
| parent | Version bump. Fix linking against already installed gnucash libraries, bug #3... (diff) | |
| download | gentoo-2-22b650cd8a7af4f2fafc4b08d9df645e8425fafb.tar.gz gentoo-2-22b650cd8a7af4f2fafc4b08d9df645e8425fafb.tar.bz2 gentoo-2-22b650cd8a7af4f2fafc4b08d9df645e8425fafb.zip | |
fix QA warnings and wrong README paths
(Portage version: 2.2.0_alpha23/cvs/Linux x86_64)
Diffstat (limited to 'www-servers/nginx')
| -rw-r--r-- | www-servers/nginx/ChangeLog | 6 | ||||
| -rw-r--r-- | www-servers/nginx/files/nginx-0.8.32-ey-balancer.patch | 12 | ||||
| -rw-r--r-- | www-servers/nginx/nginx-1.0.0-r1.ebuild | 6 |
3 files changed, 14 insertions, 10 deletions
diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog index d8c27e368e2b..2449502d102a 100644 --- a/www-servers/nginx/ChangeLog +++ b/www-servers/nginx/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-servers/nginx # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.277 2011/04/18 08:48:22 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.278 2011/04/19 06:50:24 hollow Exp $ + + 19 Apr 2011; Benedikt Böhm <hollow@gentoo.org> + files/nginx-0.8.32-ey-balancer.patch, nginx-1.0.0-r1.ebuild: + fix QA warnings and wrong README paths *nginx-1.0.0-r1 (18 Apr 2011) diff --git a/www-servers/nginx/files/nginx-0.8.32-ey-balancer.patch b/www-servers/nginx/files/nginx-0.8.32-ey-balancer.patch index 2d9ff5996eb5..2a58e877d012 100644 --- a/www-servers/nginx/files/nginx-0.8.32-ey-balancer.patch +++ b/www-servers/nginx/files/nginx-0.8.32-ey-balancer.patch @@ -1,6 +1,6 @@ -diff -Naur ../nginx-0.8.32/src/http/ngx_http_upstream.c src/http/ngx_http_upstream.c ---- ../nginx-0.8.32/src/http/ngx_http_upstream.c 2009-12-23 10:31:16.000000000 -0500 -+++ src/http/ngx_http_upstream.c 2010-01-20 15:26:24.000000000 -0500 +diff -Naur a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c +--- a/src/http/ngx_http_upstream.c 2009-12-23 10:31:16.000000000 -0500 ++++ b/src/http/ngx_http_upstream.c 2010-01-20 15:26:24.000000000 -0500 @@ -24,8 +24,6 @@ static void ngx_http_upstream_wr_check_broken_connection(ngx_http_request_t *r); static void ngx_http_upstream_check_broken_connection(ngx_http_request_t *r, @@ -37,9 +37,9 @@ diff -Naur ../nginx-0.8.32/src/http/ngx_http_upstream.c src/http/ngx_http_upstre ngx_http_upstream_connect(ngx_http_request_t *r, ngx_http_upstream_t *u) { ngx_int_t rc; -diff -Naur ../nginx-0.8.32/src/http/ngx_http_upstream.h src/http/ngx_http_upstream.h ---- ../nginx-0.8.32/src/http/ngx_http_upstream.h 2009-12-23 09:22:17.000000000 -0500 -+++ src/http/ngx_http_upstream.h 2010-01-20 15:24:36.000000000 -0500 +diff -Naur a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h +--- a/src/http/ngx_http_upstream.h 2009-12-23 09:22:17.000000000 -0500 ++++ b/src/http/ngx_http_upstream.h 2010-01-20 15:24:36.000000000 -0500 @@ -321,6 +321,8 @@ ngx_int_t ngx_http_upstream_create(ngx_http_request_t *r); diff --git a/www-servers/nginx/nginx-1.0.0-r1.ebuild b/www-servers/nginx/nginx-1.0.0-r1.ebuild index e3db5cdb91bb..fc0511bde524 100644 --- a/www-servers/nginx/nginx-1.0.0-r1.ebuild +++ b/www-servers/nginx/nginx-1.0.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.0.0-r1.ebuild,v 1.1 2011/04/18 08:48:22 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.0.0-r1.ebuild,v 1.2 2011/04/19 06:50:24 hollow Exp $ EAPI="2" @@ -325,12 +325,12 @@ src_install() { if use nginx_modules_http_ey_balancer; then docinto ${HTTP_EY_BALANCER_MODULE_P} - dodoc "${WORKDIR}"/${HTTP_EY_BALANCER_MODULE_P}/README + dodoc "${WORKDIR}"/ry-nginx-ey-balancer-${HTTP_EY_BALANCER_MODULE_SHA1}/README fi if use nginx_modules_http_slowfs_cache; then docinto ${HTTP_SLOWFS_CACHE_MODULE_P} - dodoc "${WORKDIR}"/${HTTP_SLOWFS_CACHE_MODULE_P}/{CHANGES,README.md} + dodoc "${WORKDIR}"/${HTTP_SLOWFS_CACHE_MODULE_P}/{CHANGES,README} fi } |