summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Vermeulen <swift@gentoo.org>2014-11-02 12:45:15 +0000
committerSven Vermeulen <swift@gentoo.org>2014-11-02 12:45:15 +0000
commit7c42986795e9ba6f71a54cef0b8264c7dd41b712 (patch)
treea6594a50c29275b81484ed4a6f21f841c5a9e629 /www-servers/nginx
parentInitial commit (diff)
downloadgentoo-2-7c42986795e9ba6f71a54cef0b8264c7dd41b712.tar.gz
gentoo-2-7c42986795e9ba6f71a54cef0b8264c7dd41b712.tar.bz2
gentoo-2-7c42986795e9ba6f71a54cef0b8264c7dd41b712.zip
Remove sec-policy/selinux-* dependency from DEPEND but keep in RDEPEND (bug #527698)
(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 0x2EDD52403B68AF47)
Diffstat (limited to 'www-servers/nginx')
-rw-r--r--www-servers/nginx/ChangeLog6
-rw-r--r--www-servers/nginx/nginx-1.7.6.ebuild7
2 files changed, 9 insertions, 4 deletions
diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index 4611e57e9942..0e4db8b73539 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-servers/nginx
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.396 2014/10/17 07:08:47 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.397 2014/11/02 12:45:15 swift Exp $
+
+ 02 Nov 2014; Sven Vermeulen <swift@gentoo.org> nginx-1.7.6.ebuild:
+ Remove sec-policy/selinux-* dependency from DEPEND but keep in RDEPEND (bug
+ #527698)
17 Oct 2014; Tiziano Müller <dev-zero@gentoo.org> -nginx-1.7.4.ebuild:
Drop old & vulnerable version.
diff --git a/www-servers/nginx/nginx-1.7.6.ebuild b/www-servers/nginx/nginx-1.7.6.ebuild
index c0d82f6c27dc..be174e1ddbe6 100644
--- a/www-servers/nginx/nginx-1.7.6.ebuild
+++ b/www-servers/nginx/nginx-1.7.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.7.6.ebuild,v 1.4 2014/10/15 19:03:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.7.6.ebuild,v 1.5 2014/11/02 12:45:15 swift Exp $
EAPI="5"
@@ -211,7 +211,6 @@ done
CDEPEND="
pcre? ( >=dev-libs/libpcre-4.2 )
pcre-jit? ( >=dev-libs/libpcre-8.20[jit] )
- selinux? ( sec-policy/selinux-nginx )
ssl? ( dev-libs/openssl )
http-cache? ( userland_GNU? ( dev-libs/openssl ) )
nginx_modules_http_geoip? ( dev-libs/geoip )
@@ -229,7 +228,9 @@ CDEPEND="
nginx_modules_http_metrics? ( dev-libs/yajl )
nginx_modules_http_dav_ext? ( dev-libs/expat )
nginx_modules_http_security? ( >=dev-libs/libxml2-2.7.8 dev-libs/apr-util www-servers/apache )"
-RDEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-nginx )
+"
DEPEND="${CDEPEND}
arm? ( dev-libs/libatomic_ops )
libatomic? ( dev-libs/libatomic_ops )"