| 1 |
commit: 8253183963f78c69d401d0740f2f35d4cc7726b4 |
| 2 |
Author: Jason Zaman <jason <AT> perfinion <DOT> com> |
| 3 |
AuthorDate: Tue Dec 2 21:20:40 2014 +0000 |
| 4 |
Commit: Jason Zaman <gentoo <AT> perfinion <DOT> com> |
| 5 |
CommitDate: Tue Dec 2 21:20:40 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=82531839 |
| 7 |
|
| 8 |
remove things that have been upstreamed |
| 9 |
|
| 10 |
--- |
| 11 |
policy/modules/admin/bootloader.fc | 4 ---- |
| 12 |
policy/modules/admin/sudo.if | 7 ------- |
| 13 |
policy/modules/kernel/corecommands.fc | 2 -- |
| 14 |
policy/modules/services/xserver.fc | 7 ------- |
| 15 |
policy/modules/system/authlogin.if | 34 ---------------------------------- |
| 16 |
policy/modules/system/fstools.fc | 2 -- |
| 17 |
policy/modules/system/ipsec.fc | 4 ---- |
| 18 |
7 files changed, 60 deletions(-) |
| 19 |
|
| 20 |
diff --git a/policy/modules/admin/bootloader.fc b/policy/modules/admin/bootloader.fc |
| 21 |
index 6bd044c..d908d56 100644 |
| 22 |
--- a/policy/modules/admin/bootloader.fc |
| 23 |
+++ b/policy/modules/admin/bootloader.fc |
| 24 |
@@ -11,7 +11,3 @@ |
| 25 |
/usr/sbin/grub2?-install -- gen_context(system_u:object_r:bootloader_exec_t,s0) |
| 26 |
/usr/sbin/grub2?-mkconfig -- gen_context(system_u:object_r:bootloader_exec_t,s0) |
| 27 |
/usr/sbin/grub2?-probe -- gen_context(system_u:object_r:bootloader_exec_t,s0) |
| 28 |
- |
| 29 |
-ifdef(`distro_gentoo',` |
| 30 |
-/usr/sbin/grub2?-mkconfig -- gen_context(system_u:object_r:bootloader_exec_t,s0) |
| 31 |
-') |
| 32 |
|
| 33 |
diff --git a/policy/modules/admin/sudo.if b/policy/modules/admin/sudo.if |
| 34 |
index c6140e3..56ce11c 100644 |
| 35 |
--- a/policy/modules/admin/sudo.if |
| 36 |
+++ b/policy/modules/admin/sudo.if |
| 37 |
@@ -160,13 +160,6 @@ template(`sudo_role_template',` |
| 38 |
optional_policy(` |
| 39 |
fprintd_dbus_chat($1_sudo_t) |
| 40 |
') |
| 41 |
- |
| 42 |
- ifdef(`distro_gentoo',` |
| 43 |
- # Set ownership of ts directory (timestamp keeping) |
| 44 |
- allow $1_sudo_t self:capability { chown }; |
| 45 |
- # Create /var/run/sudo |
| 46 |
- auth_pid_filetrans_pam_var_run($1_sudo_t, dir, "sudo") |
| 47 |
- ') |
| 48 |
') |
| 49 |
|
| 50 |
######################################## |
| 51 |
|
| 52 |
diff --git a/policy/modules/kernel/corecommands.fc b/policy/modules/kernel/corecommands.fc |
| 53 |
index e61b52b..fdf1915 100644 |
| 54 |
--- a/policy/modules/kernel/corecommands.fc |
| 55 |
+++ b/policy/modules/kernel/corecommands.fc |
| 56 |
@@ -422,6 +422,4 @@ ifdef(`distro_suse',` |
| 57 |
ifdef(`distro_gentoo',` |
| 58 |
/usr/lib/python-exec/python-exec2 -- gen_context(system_u:object_r:bin_t,s0) |
| 59 |
/usr/lib/python-exec/python.*/.* -- gen_context(system_u:object_r:bin_t,s0) |
| 60 |
- |
| 61 |
-/usr/lib/xfce4/notifyd/xfce4-notifyd -- gen_context(system_u:object_r:bin_t,s0) |
| 62 |
') |
| 63 |
|
| 64 |
diff --git a/policy/modules/services/xserver.fc b/policy/modules/services/xserver.fc |
| 65 |
index 49eeac1..5ef36fb 100644 |
| 66 |
--- a/policy/modules/services/xserver.fc |
| 67 |
+++ b/policy/modules/services/xserver.fc |
| 68 |
@@ -128,11 +128,4 @@ ifdef(`distro_suse',` |
| 69 |
|
| 70 |
ifdef(`distro_gentoo',` |
| 71 |
HOME_DIR/\.local/share/xorg(/.*)? gen_context(system_u:object_r:xserver_xdg_data_home_t,s0) |
| 72 |
- |
| 73 |
-/etc/lightdm/Xsession -- gen_context(system_u:object_r:xsession_exec_t,s0) |
| 74 |
- |
| 75 |
-/var/cache/lightdm(/.*)? gen_context(system_u:object_r:xdm_var_lib_t,s0) |
| 76 |
-/var/lib/lightdm(/.*)? gen_context(system_u:object_r:xdm_var_lib_t,s0) |
| 77 |
-/var/log/lightdm(/.*)? gen_context(system_u:object_r:xserver_log_t,s0) |
| 78 |
-/var/run/lightdm(/.*)? gen_context(system_u:object_r:xdm_var_run_t,s0) |
| 79 |
') |
| 80 |
|
| 81 |
diff --git a/policy/modules/system/authlogin.if b/policy/modules/system/authlogin.if |
| 82 |
index 41004c5..f05d7bf 100644 |
| 83 |
--- a/policy/modules/system/authlogin.if |
| 84 |
+++ b/policy/modules/system/authlogin.if |
| 85 |
@@ -1836,37 +1836,3 @@ interface(`auth_unconfined',` |
| 86 |
typeattribute $1 can_write_shadow_passwords; |
| 87 |
typeattribute $1 can_relabelto_shadow_passwords; |
| 88 |
') |
| 89 |
- |
| 90 |
-# Should be in an ifdef distro_gentoo but that is not supported in the global if file |
| 91 |
- |
| 92 |
-######################################## |
| 93 |
-## <summary> |
| 94 |
-## Create specified objects in |
| 95 |
-## pid directories with the pam var |
| 96 |
-## run file type using a |
| 97 |
-## file type transition. |
| 98 |
-## </summary> |
| 99 |
-## <param name="domain"> |
| 100 |
-## <summary> |
| 101 |
-## Domain allowed access. |
| 102 |
-## </summary> |
| 103 |
-## </param> |
| 104 |
-## <param name="object_class"> |
| 105 |
-## <summary> |
| 106 |
-## Class of the object being created. |
| 107 |
-## </summary> |
| 108 |
-## </param> |
| 109 |
-## <param name="name" optional="true"> |
| 110 |
-## <summary> |
| 111 |
-## The name of the object being created. |
| 112 |
-## </summary> |
| 113 |
-## </param> |
| 114 |
-# |
| 115 |
-interface(`auth_pid_filetrans_pam_var_run',` |
| 116 |
- gen_require(` |
| 117 |
- type pam_var_run_t; |
| 118 |
- ') |
| 119 |
- |
| 120 |
- files_pid_filetrans($1, pam_var_run_t, $2, $3) |
| 121 |
-') |
| 122 |
- |
| 123 |
|
| 124 |
diff --git a/policy/modules/system/fstools.fc b/policy/modules/system/fstools.fc |
| 125 |
index fb132f9..be77216 100644 |
| 126 |
--- a/policy/modules/system/fstools.fc |
| 127 |
+++ b/policy/modules/system/fstools.fc |
| 128 |
@@ -66,6 +66,4 @@ |
| 129 |
ifdef(`distro_gentoo',` |
| 130 |
/sbin/mkfs\.f2fs -- gen_context(system_u:object_r:fsadm_exec_t,s0) |
| 131 |
/usr/sbin/mkfs\.f2fs -- gen_context(system_u:object_r:fsadm_exec_t,s0) |
| 132 |
-/usr/sbin/gdisk -- gen_context(system_u:object_r:fsadm_exec_t,s0) |
| 133 |
-/usr/sbin/efibootmgr -- gen_context(system_u:object_r:fsadm_exec_t,s0) |
| 134 |
') |
| 135 |
|
| 136 |
diff --git a/policy/modules/system/ipsec.fc b/policy/modules/system/ipsec.fc |
| 137 |
index 47f9327..0f1e351 100644 |
| 138 |
--- a/policy/modules/system/ipsec.fc |
| 139 |
+++ b/policy/modules/system/ipsec.fc |
| 140 |
@@ -41,7 +41,3 @@ |
| 141 |
|
| 142 |
/var/run/pluto(/.*)? gen_context(system_u:object_r:ipsec_var_run_t,s0) |
| 143 |
/var/run/racoon\.pid -- gen_context(system_u:object_r:ipsec_var_run_t,s0) |
| 144 |
- |
| 145 |
-ifdef(`distro_gentoo',` |
| 146 |
-/var/lib/racoon(/.*)? gen_context(system_u:object_r:ipsec_var_run_t,s0) |
| 147 |
-') |
Archives