Gentoo Archives: gentoo-commits

From: Jason Zaman <perfinion@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sec-policy/selinux-base-policy/
Date: Sat, 04 Jun 2016 08:49:32
Message-Id: 1465030136.b65c47d23d4d567a767bedb6a30eb59a349dc6f2.perfinion@gentoo
1 commit: b65c47d23d4d567a767bedb6a30eb59a349dc6f2
2 Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jun 4 08:24:25 2016 +0000
4 Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 4 08:48:56 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b65c47d2
7
8 sec-policy/selinux-base-policy: Add systemd useflag and module
9
10 Package-Manager: portage-2.2.28
11
12 .../selinux-base-policy/selinux-base-policy-9999.ebuild | 12 +++++++++---
13 1 file changed, 9 insertions(+), 3 deletions(-)
14
15 diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
16 index 21b98bd..062dec6 100644
17 --- a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
18 +++ b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild
19 @@ -1,4 +1,4 @@
20 -# Copyright 1999-2015 Gentoo Foundation
21 +# Copyright 1999-2016 Gentoo Foundation
22 # Distributed under the terms of the GNU General Public License v2
23 # $Id$
24 EAPI="5"
25 @@ -20,9 +20,9 @@ fi
26 HOMEPAGE="https://www.gentoo.org/proj/en/hardened/selinux/"
27 DESCRIPTION="SELinux policy for core modules"
28
29 -IUSE="+unconfined"
30 +IUSE="systemd +unconfined"
31
32 -RDEPEND="=sec-policy/selinux-base-${PVR}"
33 +RDEPEND="=sec-policy/selinux-base-${PVR}[systemd?]"
34 PDEPEND="unconfined? ( sec-policy/selinux-unconfined )"
35 DEPEND=""
36
37 @@ -35,6 +35,12 @@ S="${WORKDIR}/"
38 # itself), when reworked reinclude it. Only postinstall (where -b base.pp is
39 # added) needs to remain then.
40
41 +pkg_setup() {
42 + if use systemd; then
43 + MODS="${MODS} systemd"
44 + fi
45 +}
46 +
47 pkg_pretend() {
48 for i in ${POLICY_TYPES}; do
49 if [[ "${i}" == "targeted" ]] && ! use unconfined; then