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/system/
Date: Sat, 29 Dec 2012 18:24:55
Message-Id: 1356792014.22c79cd0b9f0f73601207b181243881d530250a8.SwifT@gentoo
1 commit: 22c79cd0b9f0f73601207b181243881d530250a8
2 Author: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
3 AuthorDate: Sat Dec 29 14:40:14 2012 +0000
4 Commit: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
5 CommitDate: Sat Dec 29 14:40:14 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=22c79cd0
7
8 Move gentoo specifics down
9
10 Moving the Gentoo specific changes on the policy downwards so that most upstream
11 patches can be easily applied.
12
13 ---
14 policy/modules/system/udev.fc | 17 +++++++++++------
15 1 files changed, 11 insertions(+), 6 deletions(-)
16
17 diff --git a/policy/modules/system/udev.fc b/policy/modules/system/udev.fc
18 index 69d48c8..2cf756c 100644
19 --- a/policy/modules/system/udev.fc
20 +++ b/policy/modules/system/udev.fc
21 @@ -9,7 +9,6 @@
22 /etc/udev/rules.d(/.*)? gen_context(system_u:object_r:udev_rules_t,s0)
23 /etc/udev/scripts/.+ -- gen_context(system_u:object_r:udev_helper_exec_t,s0)
24
25 -/lib/udev/udevd -- gen_context(system_u:object_r:udev_exec_t,s0)
26 /lib/udev/udev-acl -- gen_context(system_u:object_r:udev_exec_t,s0)
27
28 ifdef(`distro_debian',`
29 @@ -27,16 +26,22 @@ ifdef(`distro_redhat',`
30 /sbin/start_udev -- gen_context(system_u:object_r:udev_exec_t,s0)
31 ')
32
33 -/usr/bin/udevadm -- gen_context(system_u:object_r:udev_exec_t,s0)
34 /usr/bin/udevinfo -- gen_context(system_u:object_r:udev_exec_t,s0)
35
36 -/usr/lib/systemd/systemd-udevd -- gen_context(system_u:object_r:udev_exec_t,s0)
37 +/usr/lib/systemd/systemd-udevd -- gen_context(system_u:object_r:udev_exec_t,s0)
38
39 /var/run/PackageKit/udev(/.*)? gen_context(system_u:object_r:udev_var_run_t,s0)
40 -/var/run/udev(/.*)? gen_context(system_u:object_r:udev_var_run_t,s0)
41 -/var/run/udev/rules\.d(/.*)? gen_context(system_u:object_r:udev_tbl_t,s0)
42 -/var/run/udev/data(/.*)? gen_context(system_u:object_r:udev_tbl_t,s0)
43
44 ifdef(`distro_debian',`
45 /var/run/xen-hotplug -d gen_context(system_u:object_r:udev_var_run_t,s0)
46 ')
47 +
48 +ifdef(`distro_gentoo',`
49 +/lib/udev/udevd -- gen_context(system_u:object_r:udev_exec_t,s0)
50 +
51 +/usr/bin/udevadm -- gen_context(system_u:object_r:udev_exec_t,s0)
52 +
53 +/var/run/udev(/.*)? gen_context(system_u:object_r:udev_var_run_t,s0)
54 +/var/run/udev/rules\.d(/.*)? gen_context(system_u:object_r:udev_tbl_t,s0)
55 +/var/run/udev/data(/.*)? gen_context(system_u:object_r:udev_tbl_t,s0)
56 +')