summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris PeBenito <pebenito@gentoo.org>2004-06-21 17:59:55 +0000
committerChris PeBenito <pebenito@gentoo.org>2004-06-21 17:59:55 +0000
commitc11e07b5b4a3e0da369bc0d077ad67f173cf2aaf (patch)
treeb542eca5d2096f32819f4c09a629d8e6187698ca /app-admin/setools
parentupdated patches cause version bump (Manifest recommit) (diff)
downloadgentoo-2-c11e07b5b4a3e0da369bc0d077ad67f173cf2aaf.tar.gz
gentoo-2-c11e07b5b4a3e0da369bc0d077ad67f173cf2aaf.tar.bz2
gentoo-2-c11e07b5b4a3e0da369bc0d077ad67f173cf2aaf.zip
Fix for compiles that are USE="-selinux".
Diffstat (limited to 'app-admin/setools')
-rw-r--r--app-admin/setools/ChangeLog5
-rw-r--r--app-admin/setools/setools-1.3.1.ebuild9
2 files changed, 12 insertions, 2 deletions
diff --git a/app-admin/setools/ChangeLog b/app-admin/setools/ChangeLog
index 8efceca251d4..1301a2b92b61 100644
--- a/app-admin/setools/ChangeLog
+++ b/app-admin/setools/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-admin/setools
# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.19 2004/05/24 20:21:04 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.20 2004/06/21 17:59:55 pebenito Exp $
+
+ 21 Jun 2004; Chris PeBenito <pebenito@gentoo.org> setools-1.3.1.ebuild:
+ Fix for compiles that are USE="-selinux".
24 May 2004; Chris PeBenito <pebenito@gentoo.org> setools-1.3.1.ebuild:
Fix sandbox violations.
diff --git a/app-admin/setools/setools-1.3.1.ebuild b/app-admin/setools/setools-1.3.1.ebuild
index b27da8e3f6d1..06c2db870a0c 100644
--- a/app-admin/setools/setools-1.3.1.ebuild
+++ b/app-admin/setools/setools-1.3.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-1.3.1.ebuild,v 1.3 2004/05/31 19:21:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-1.3.1.ebuild,v 1.4 2004/06/21 17:59:55 pebenito Exp $
DESCRIPTION="SELinux policy tools"
HOMEPAGE="http://www.tresys.com/selinux_policy_tools.html"
@@ -51,6 +51,13 @@ src_unpack() {
sed -i -e 's,-Z system_u:object_r:seuser_conf_t,,g' ${S}/seuser/Makefile
sed -i -e 's,-Z system_u:object_r:policy_src_t,,g' ${S}/seuser/Makefile
+ # dont do findcon or replcon if USE=-selinux
+ if ! use selinux; then
+ einfo "Disabling replcon and findcon"
+ sed -i -e '/^SE_CMDS/s/replcon//' ${S}/secmds/Makefile
+ sed -i -e '/^SE_CMDS/s/findcon//' ${S}/secmds/Makefile
+ fi
+
# set policy dir in seuser.conf
sed -i -e '/^policy_dir/d' -e '/^user_file/d' ${S}/seuser/seuser.conf
echo "policy_dir ${POLICYDIR}" >> ${S}/seuser/seuser.conf