summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris PeBenito <pebenito@gentoo.org>2004-02-07 05:45:20 +0000
committerChris PeBenito <pebenito@gentoo.org>2004-02-07 05:45:20 +0000
commit66323eb6048eb9a9483d0a962ad647b694effae0 (patch)
treed80d121aa9e208ee70a97d006bb1f52923a5fc96 /app-admin
parentMask again as it have some issues. (diff)
downloadhistorical-66323eb6048eb9a9483d0a962ad647b694effae0.tar.gz
historical-66323eb6048eb9a9483d0a962ad647b694effae0.tar.bz2
historical-66323eb6048eb9a9483d0a962ad647b694effae0.zip
Fix seuser file contexts and conf file.
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/setools/ChangeLog5
-rw-r--r--app-admin/setools/Manifest4
-rw-r--r--app-admin/setools/setools-1.2.ebuild9
3 files changed, 13 insertions, 5 deletions
diff --git a/app-admin/setools/ChangeLog b/app-admin/setools/ChangeLog
index bb36ff1424bc..ed15a7a4f116 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.11 2004/02/06 04:48:25 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/ChangeLog,v 1.12 2004/02/07 05:45:20 pebenito Exp $
+
+ 06 Feb 2004; Chris PeBenito <pebenito@gentoo.org> setools-1.2.ebuild:
+ Fix seuser file contexts and conf file.
*setools-1.2 (05 Feb 2004)
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 7796598f5e93..c5a6787ad303 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,5 +1,5 @@
-MD5 bd6fc99f6f9e9c2415445629b4b76e73 ChangeLog 1758
-MD5 716dc0c247e74274ff2d426ab88a01b6 setools-1.2.ebuild 3184
+MD5 490a024b752b56fb148ed744de160756 ChangeLog 1873
+MD5 f36a4fc4ee6a985e03fbfe0668b069dc setools-1.2.ebuild 3404
MD5 7d030e939434c24f4affee294efcc78f setools-1.1.1.ebuild 3185
MD5 418c2991b69fcf9d551aba29ae6f2b2e metadata.xml 505
MD5 16a0e1619330aed5a839a2f9ff83a256 files/digest-setools-1.2 60
diff --git a/app-admin/setools/setools-1.2.ebuild b/app-admin/setools/setools-1.2.ebuild
index e1929e40eed8..3a880098da18 100644
--- a/app-admin/setools/setools-1.2.ebuild
+++ b/app-admin/setools/setools-1.2.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.2.ebuild,v 1.1 2004/02/06 04:48:25 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-1.2.ebuild,v 1.2 2004/02/07 05:45:20 pebenito Exp $
DESCRIPTION="SELinux policy tools"
HOMEPAGE="http://www.tresys.com/selinux_policy_tools.html"
@@ -42,12 +42,17 @@ src_unpack() {
sed -i -e "s: policy-install::g" ${S}/seuser/Makefile
# fix up the file contexts
- sed -i -e 's:local/selinux/::' -e 's:local/::' ${S}/policy/seuser.fc
+ sed -i -e 's:/usr/apol:/usr/lib/apol:' ${S}/policy/seuser.fc
# ensure install -Z isn't used
sed -i -e 's,-Z system_u:object_r:seuser_exec_t,,g' ${S}/seuser/Makefile
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
+
+ # 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
+ echo "user_file ${POLICYDIR}/users" >> ${S}/seuser/seuser.conf
}
src_compile() {