[selinux-policy] - Allow cobblerd to list cobler appache content

[Daniel J Walsh]

commit c849c843057983aca4a12167587f2b552578d6ce
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Fri Oct 15 11:35:17 2010 -0400

    - Allow cobblerd to list cobler appache content

 policy-F14.patch    |    9 ++++++++-
 selinux-policy.spec |    7 ++++---
 2 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/policy-F14.patch b/policy-F14.patch
index a168177..f52b337 100644
--- a/policy-F14.patch
+++ b/policy-F14.patch
@@ -16810,7 +16810,7 @@ index 293e08d..e3787fb 100644
 +	')
  ')
 diff --git a/policy/modules/services/cobbler.te b/policy/modules/services/cobbler.te
-index 0258b48..c4d678b 100644
+index 0258b48..8fde016 100644
 --- a/policy/modules/services/cobbler.te
 +++ b/policy/modules/services/cobbler.te
 @@ -6,13 +6,35 @@ policy_module(cobbler, 1.1.0)
@@ -17031,6 +17031,13 @@ index 0258b48..c4d678b 100644
  ')
  
  ########################################
+@@ -124,5 +231,6 @@ optional_policy(`
+ #
+ 
+ apache_content_template(cobbler)
++list_dirs_pattern(cobblerd_t, httpd_cobbler_content_t, httpd_cobbler_content_t)
+ manage_dirs_pattern(cobblerd_t, httpd_cobbler_content_rw_t, httpd_cobbler_content_rw_t)
+ manage_files_pattern(cobblerd_t, httpd_cobbler_content_rw_t, httpd_cobbler_content_rw_t)
 diff --git a/policy/modules/services/consolekit.if b/policy/modules/services/consolekit.if
 index 42c6bd7..ac43a92 100644
 --- a/policy/modules/services/consolekit.if
diff --git a/selinux-policy.spec b/selinux-policy.spec
index 493bce8..c28bcc9 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -21,12 +21,11 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.9.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
 patch: policy-F14.patch
-patch2: telepathy_removal.patch
 Source1: modules-targeted.conf
 Source2: booleans-targeted.conf
 Source3: Makefile.devel
@@ -204,7 +203,6 @@ Based off of reference policy: Checked out revision  2.20091117
 %prep 
 %setup -n serefpolicy-%{version} -q
 %patch -p1
-%patch2 -p1
 
 %install
 mkdir selinux_config
@@ -472,6 +470,9 @@ exit 0
 %endif
 
 %changelog
+* Fri Oct 15 2010 Dan Walsh <dwalsh at redhat.com> 3.9.7-3
+- Allow cobblerd to list cobler appache content
+
 * Fri Oct 15 2010 Dan Walsh <dwalsh at redhat.com> 3.9.7-2
 - Fixup for the latest version of upowed
 - Dontaudit sandbox sending SIGNULL to desktop apps