summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAgostino Sarubbo <ago@gentoo.org>2013-01-20 19:56:46 +0000
committerAgostino Sarubbo <ago@gentoo.org>2013-01-20 19:56:46 +0000
commit55125b1812757234ea18d450c85ee9c5be6cd5ce (patch)
treebf31ac9a7d7f1b47ab37092fb018aecdc649369d /www-servers/nginx
parentFix parallel build, bug#452942 (diff)
downloadgentoo-2-55125b1812757234ea18d450c85ee9c5be6cd5ce.tar.gz
gentoo-2-55125b1812757234ea18d450c85ee9c5be6cd5ce.tar.bz2
gentoo-2-55125b1812757234ea18d450c85ee9c5be6cd5ce.zip
Stable for x86, wrt bug #453218
(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'www-servers/nginx')
-rw-r--r--www-servers/nginx/ChangeLog5
-rw-r--r--www-servers/nginx/nginx-1.2.6-r1.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index b3b45e6e1436..1941a83f4db9 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for www-servers/nginx
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.340 2013/01/13 11:08:42 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.341 2013/01/20 19:56:46 ago Exp $
+
+ 20 Jan 2013; Agostino Sarubbo <ago@gentoo.org> nginx-1.2.6-r1.ebuild:
+ Stable for x86, wrt bug #453218
*nginx-1.3.11 (13 Jan 2013)
*nginx-1.2.6-r1 (13 Jan 2013)
diff --git a/www-servers/nginx/nginx-1.2.6-r1.ebuild b/www-servers/nginx/nginx-1.2.6-r1.ebuild
index 757b4413c87f..ab6450a150a3 100644
--- a/www-servers/nginx/nginx-1.2.6-r1.ebuild
+++ b/www-servers/nginx/nginx-1.2.6-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.2.6-r1.ebuild,v 1.1 2013/01/13 11:08:42 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.2.6-r1.ebuild,v 1.2 2013/01/20 19:56:46 ago Exp $
EAPI="4"
@@ -103,7 +103,7 @@ SRC_URI="http://nginx.org/download/${P}.tar.gz
LICENSE="BSD-2 BSD SSLeay MIT GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif fastcgi
geo gzip limit_req limit_conn map memcached proxy referer rewrite scgi ssi