summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris PeBenito <pebenito@gentoo.org>2008-01-13 21:26:20 +0000
committerChris PeBenito <pebenito@gentoo.org>2008-01-13 21:26:20 +0000
commit43deabec3388a5a14c2df44aaf8948a9e6a88f0e (patch)
tree488b1ceb2f7f2d906f98a7923698577ab2eaf857
parentVersion bump to new 2.4 series (diff)
downloadhistorical-43deabec3388a5a14c2df44aaf8948a9e6a88f0e.tar.gz
historical-43deabec3388a5a14c2df44aaf8948a9e6a88f0e.tar.bz2
historical-43deabec3388a5a14c2df44aaf8948a9e6a88f0e.zip
unmask acl USE in selinux profile.
-rw-r--r--profiles/selinux/make.defaults4
-rw-r--r--profiles/selinux/use.mask5
2 files changed, 3 insertions, 6 deletions
diff --git a/profiles/selinux/make.defaults b/profiles/selinux/make.defaults
index c200af1a4a39..46a49d1b4781 100644
--- a/profiles/selinux/make.defaults
+++ b/profiles/selinux/make.defaults
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/make.defaults,v 1.3 2006/10/08 18:37:25 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/make.defaults,v 1.4 2008/01/13 21:26:20 pebenito Exp $
#
# System-wide defaults for the Portage system
# See portage(5) manpage
@@ -10,7 +10,7 @@
# has a conditional dependency on java (which it does,) then a JDK will be
# pulled in during *emerge system*!
-USE="selinux"
+USE="-acl selinux"
FEATURES="selinux sesandbox"
POLICYDIR="/etc/security/selinux/src/policy"
diff --git a/profiles/selinux/use.mask b/profiles/selinux/use.mask
index c040dbbb9b50..ba7214814f29 100644
--- a/profiles/selinux/use.mask
+++ b/profiles/selinux/use.mask
@@ -1,6 +1,6 @@
# Copyright 2004-2006 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/use.mask,v 1.8 2007/07/27 02:20:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/use.mask,v 1.9 2008/01/13 21:26:20 pebenito Exp $
# This file masks out USE flags that are simply NOT allowed in the default
# profile for any architecture. This works, for example, if a non-default
@@ -10,9 +10,6 @@
-hardened
-selinux
-# disallow posix acl since this is SELinux
-acl
-
# amd64 only:
emul-linux-x86