Gentoo Archives: gentoo-commits

From: Sven Vermeulen <sven.vermeulen@××××××.be>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/contrib/
Date: Tue, 25 Dec 2012 20:31:36
Message-Id: 1356460115.a52c5ebf5ad888924265992c9945a9f07e46c9fc.SwifT@gentoo
1 commit: a52c5ebf5ad888924265992c9945a9f07e46c9fc
2 Author: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
3 AuthorDate: Tue Dec 25 18:28:35 2012 +0000
4 Commit: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
5 CommitDate: Tue Dec 25 18:28:35 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=a52c5ebf
7
8 Move distro_gentoo stuff towards the end of the file (easier upstream patching)
9
10 ---
11 policy/modules/contrib/qemu.te | 18 ++++++++++++------
12 1 files changed, 12 insertions(+), 6 deletions(-)
13
14 diff --git a/policy/modules/contrib/qemu.te b/policy/modules/contrib/qemu.te
15 index e21eee6..ebec831 100644
16 --- a/policy/modules/contrib/qemu.te
17 +++ b/policy/modules/contrib/qemu.te
18 @@ -27,12 +27,6 @@ role qemu_roles types qemu_t;
19 # Local policy
20 #
21
22 -ifdef(`distro_gentoo',`
23 - optional_policy(`
24 - vde_connect(qemu_t)
25 - ')
26 -')
27 -
28 tunable_policy(`qemu_full_network',`
29 corenet_udp_sendrecv_generic_if(qemu_t)
30 corenet_udp_sendrecv_generic_node(qemu_t)
31 @@ -61,3 +55,15 @@ optional_policy(`
32 allow unconfined_qemu_t self:process { execstack execmem };
33 allow unconfined_qemu_t qemu_exec_t:file execmod;
34 ')
35 +
36 +ifdef(`distro_gentoo',`
37 +
38 + #################################
39 + #
40 + # Local policy
41 + #
42 +
43 + optional_policy(`
44 + vde_connect(qemu_t)
45 + ')
46 +')