summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAgostino Sarubbo <ago@gentoo.org>2013-05-13 19:52:22 +0000
committerAgostino Sarubbo <ago@gentoo.org>2013-05-13 19:52:22 +0000
commitdc6cb117dd0b4219e993f0e29e1fddfbef10f9ec (patch)
treea027a5fd4ee20badca992bf25876d05c941f9e6b
parentVersion bump (diff)
downloadgentoo-2-dc6cb117dd0b4219e993f0e29e1fddfbef10f9ec.tar.gz
gentoo-2-dc6cb117dd0b4219e993f0e29e1fddfbef10f9ec.tar.bz2
gentoo-2-dc6cb117dd0b4219e993f0e29e1fddfbef10f9ec.zip
Stable for amd64, wrt bug #468870
(Portage version: 2.1.11.63/cvs/Linux x86_64, RepoMan options: --include-arches="amd64", signed Manifest commit with key 7194459F)
-rw-r--r--www-servers/nginx/ChangeLog5
-rw-r--r--www-servers/nginx/nginx-1.4.1-r2.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index dd57ef0b0f53..51c4f2878c62 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.354 2013/05/13 17:23:25 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.355 2013/05/13 19:52:22 ago Exp $
+
+ 13 May 2013; Agostino Sarubbo <ago@gentoo.org> nginx-1.4.1-r2.ebuild:
+ Stable for amd64, wrt bug #468870
13 May 2013; Jason A. Donenfeld <zx2c4@gentoo.org> nginx-1.4.1-r2.ebuild:
Use epatch_user to allow custom patches from users.
diff --git a/www-servers/nginx/nginx-1.4.1-r2.ebuild b/www-servers/nginx/nginx-1.4.1-r2.ebuild
index 7d35e6219c56..1e344d6f6351 100644
--- a/www-servers/nginx/nginx-1.4.1-r2.ebuild
+++ b/www-servers/nginx/nginx-1.4.1-r2.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.4.1-r2.ebuild,v 1.2 2013/05/13 17:23:25 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.4.1-r2.ebuild,v 1.3 2013/05/13 19:52:22 ago Exp $
EAPI="5"
@@ -110,7 +110,7 @@ SRC_URI="http://nginx.org/download/${P}.tar.gz
LICENSE="BSD-2 BSD SSLeay MIT GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~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