[gentoo-commits] proj/hardened-dev:master commit in: sec-policy/selinux-apm/, sec-policy/selinux-acpi/

[gentoo-commits] proj/hardened-dev:master commit in: sec-policy/selinux-apm/, sec-policy/selinux-acpi/

[Sven Vermeulen]

commit:     c8480427c0f64a3cb674805a3f9be5095e892d72
Author:     Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
AuthorDate: Sat Aug 13 07:20:28 2011 +0000
Commit:     Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
CommitDate: Sat Aug 13 07:20:28 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=c8480427

ACPI module does not exist, instead we should use APM module

---
 sec-policy/selinux-acpi/ChangeLog                  |    3 +++
 .../selinux-acpi/selinux-acpi-2.20110726.ebuild    |   12 ++++++------
 sec-policy/selinux-apm/ChangeLog                   |    3 +++
 .../selinux-apm/selinux-apm-2.20110726.ebuild      |    3 ++-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/sec-policy/selinux-acpi/ChangeLog b/sec-policy/selinux-acpi/ChangeLog
index c72c8f8..dfc0642 100644
--- a/sec-policy/selinux-acpi/ChangeLog
+++ b/sec-policy/selinux-acpi/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-acpi/ChangeLog,v 1.14 2011/06/04 15:55:12 blueness Exp $
 
+  13 Aug 2011; <swift@gentoo.org> selinux-acpi-2.20110726.ebuild:
+  Depend on selinux-apm, acpi is no SELinux module
+
   04 Jun 2011; Anthony G. Basile <blueness@gentoo.org>
   -selinux-acpi-2.20090730.ebuild, -selinux-acpi-2.20091215.ebuild,
   -selinux-acpi-20080525.ebuild:

diff --git a/sec-policy/selinux-acpi/selinux-acpi-2.20110726.ebuild b/sec-policy/selinux-acpi/selinux-acpi-2.20110726.ebuild
index 5278d43..06fcfe8 100644
--- a/sec-policy/selinux-acpi/selinux-acpi-2.20110726.ebuild
+++ b/sec-policy/selinux-acpi/selinux-acpi-2.20110726.ebuild
@@ -3,11 +3,11 @@
 # $Header: $
 EAPI="4"
 
-IUSE=""
-MODS="acpi"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for acpi"
+DEPEND=">=sec-policy/selinux-apm-2.20110726"
 
+IUSE=""
+DESCRIPTION="SELinux policy for ACPI (meta-package for apm)"
+HOMEPAGE="http://hardened.gentoo.org/selinux"
 KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="public-domain"

diff --git a/sec-policy/selinux-apm/ChangeLog b/sec-policy/selinux-apm/ChangeLog
index 6598aff..70c4905 100644
--- a/sec-policy/selinux-apm/ChangeLog
+++ b/sec-policy/selinux-apm/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-apm/ChangeLog,v 1.2 2011/06/02 12:04:17 blueness Exp $
 
+  13 Aug 2011; <swift@gentoo.org> selinux-apm-2.20110726.ebuild:
+  Block on selinux-acpi
+
   02 Jun 2011; Anthony G. Basile <blueness@gentoo.org>
   selinux-apm-2.20101213.ebuild:
   Stable amd64 x86

diff --git a/sec-policy/selinux-apm/selinux-apm-2.20110726.ebuild b/sec-policy/selinux-apm/selinux-apm-2.20110726.ebuild
index 79fe8d1..62a926c 100644
--- a/sec-policy/selinux-apm/selinux-apm-2.20110726.ebuild
+++ b/sec-policy/selinux-apm/selinux-apm-2.20110726.ebuild
@@ -9,5 +9,6 @@ MODS="apm"
 inherit selinux-policy-2
 
 DESCRIPTION="SELinux policy for apm"
-
 KEYWORDS="~amd64 ~x86"
+DEPEND="=sec-policy/selinux-base-policy-2.20110726-r1
+	!<sec-policy/selinux-acpi-2.20110726"