From 618ed7aec9cf9f935e292a42a768fdf7f9a2512a Mon Sep 17 00:00:00 2001 From: Dan Walsh Date: Wed, 13 Oct 2010 10:00:44 -0400 Subject: [PATCH] - Update to upstream --- policy-F14.patch | 10 ++++++---- selinux-policy.spec | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/policy-F14.patch b/policy-F14.patch index 1ed8b30b..bf785d78 100644 --- a/policy-F14.patch +++ b/policy-F14.patch @@ -46901,7 +46901,7 @@ index 22ca011..df6b5de 100644 # diff --git a/policy/support/obj_perm_sets.spt b/policy/support/obj_perm_sets.spt -index effb6c5..a903444 100644 +index effb6c5..cabc009 100644 --- a/policy/support/obj_perm_sets.spt +++ b/policy/support/obj_perm_sets.spt @@ -28,7 +28,7 @@ define(`devfile_class_set', `{ chr_file blk_file }') @@ -46988,11 +46988,13 @@ index effb6c5..a903444 100644 define(`create_chr_file_perms',`{ getattr create }') define(`rename_chr_file_perms',`{ getattr rename }') define(`delete_chr_file_perms',`{ getattr unlink }') -@@ -306,6 +312,7 @@ define(`relabel_chr_file_perms',`{ getattr relabelfrom relabelto }') +@@ -305,7 +311,8 @@ define(`relabel_chr_file_perms',`{ getattr relabelfrom relabelto }') + # # Use (read and write) terminals # - define(`rw_term_perms', `{ getattr open read write append ioctl }') -+define(`rw_inherited_term_perms', `{ rw_term_perms -open }') +-define(`rw_term_perms', `{ getattr open read write append ioctl }') ++define(`rw_inherited_term_perms', `{ getattr read write append ioctl }') ++define(`rw_term_perms', `{ rw_inherited_term_perms open }') # # Sockets diff --git a/selinux-policy.spec b/selinux-policy.spec index 5a8be2a8..e946d68a 100644 --- a/selinux-policy.spec +++ b/selinux-policy.spec @@ -470,7 +470,7 @@ exit 0 %endif %changelog -* Tue Oct 12 2010 Dan Walsh 3.9.7-1 +* Wed Oct 13 2010 Dan Walsh 3.9.7-1 - Update to upstream * Tue Oct 12 2010 Dan Walsh 3.9.6-3