diff options
| author |   Chris PeBenito <pebenito@gentoo.org> | 2004-06-21 17:59:55 +0000 |
|---|---|---|
| committer | Chris PeBenito <pebenito@gentoo.org> | 2004-06-21 17:59:55 +0000 |
| commit | 07a76e99cdedfb5313a1dfdbed151fa9cb197ac5 (patch) | |
| tree | 2ec0d9eeab17e4dee7fbc1ecd86db0f980b5f3c3 /app-admin/setools | |
| parent | updated patches cause version bump (diff) | |
| download | historical-07a76e99cdedfb5313a1dfdbed151fa9cb197ac5.tar.gz historical-07a76e99cdedfb5313a1dfdbed151fa9cb197ac5.tar.bz2 historical-07a76e99cdedfb5313a1dfdbed151fa9cb197ac5.zip | |
Fix for compiles that are USE="-selinux".
Diffstat (limited to 'app-admin/setools')
| -rw-r--r-- | app-admin/setools/ChangeLog | 5 | ||||
| -rw-r--r-- | app-admin/setools/Manifest | 16 | ||||
| -rw-r--r-- | app-admin/setools/setools-1.3.1.ebuild | 9 |
3 files changed, 25 insertions, 5 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/Manifest b/app-admin/setools/Manifest index f4e23fd78297..944a8917580c 100644 --- a/app-admin/setools/Manifest +++ b/app-admin/setools/Manifest @@ -1,4 +1,14 @@ -MD5 1bfbc399d1a514ceb99ce8364a062fb4 files/digest-setools-1.3.1 62 -MD5 1a2d77ab3320ab7e889912c39bfdf666 ChangeLog 2722 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 c4a40a77b86728d96aa2215985805220 ChangeLog 2840 MD5 418c2991b69fcf9d551aba29ae6f2b2e metadata.xml 505 -MD5 471c5676f5c20a90759362a53c907a39 setools-1.3.1.ebuild 3499 +MD5 2c34ec28bdfbd13f7d33f48f7ee151da setools-1.3.1.ebuild 3729 +MD5 1bfbc399d1a514ceb99ce8364a062fb4 files/digest-setools-1.3.1 62 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.2.4 (GNU/Linux) + +iD8DBQFA1yIxGFJQsIJWJy4RAj1xAJ9WcPL7XxBRvz+rkzN7kt66+qChJQCghELh +vRRLFeCNaNisdd4hAPiwS14= +=jCOM +-----END PGP SIGNATURE----- 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 |