From ddc8588081c3288e5a28b72a486769dba913f148 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Sep 10 2009 15:38:44 +0000
Subject: - Update to upstream

- Fixes for devicekit_disk

---

diff --git a/policy-F12.patch b/policy-F12.patch
index 5ad3735..be1c56b 100644
--- a/policy-F12.patch
+++ b/policy-F12.patch
@@ -18808,7 +18808,7 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
 +')
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/virt.te serefpolicy-3.6.31/policy/modules/services/virt.te
 --- nsaserefpolicy/policy/modules/services/virt.te	2009-08-31 13:30:04.000000000 -0400
-+++ serefpolicy-3.6.31/policy/modules/services/virt.te	2009-09-09 15:38:24.000000000 -0400
++++ serefpolicy-3.6.31/policy/modules/services/virt.te	2009-09-10 11:38:03.000000000 -0400
 @@ -20,6 +20,28 @@
  ## </desc>
  gen_tunable(virt_use_samba, false)
@@ -18895,8 +18895,8 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  read_files_pattern(virtd_t, virt_etc_t, virt_etc_t)
  read_lnk_files_pattern(virtd_t, virt_etc_t, virt_etc_t)
  
-+manage_dirs_pattern(svirt_t, svirt_cache_t, svirt_cache_t)
-+manage_files_pattern(svirt_t, svirt_cache_t, svirt_cache_t)
++manage_dirs_pattern(virtd_t, svirt_cache_t, svirt_cache_t)
++manage_files_pattern(virtd_t, svirt_cache_t, svirt_cache_t)
 +
  manage_dirs_pattern(virtd_t, virt_etc_rw_t, virt_etc_rw_t)
  manage_files_pattern(virtd_t, virt_etc_rw_t, virt_etc_rw_t)
diff --git a/selinux-policy.spec b/selinux-policy.spec
index 4ca26a3..c9ca41b 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -20,7 +20,7 @@
 Summary: SELinux policy configuration
 Name: selinux-policy
 Version: 3.6.31
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -443,6 +443,10 @@ exit 0
 %endif
 
 %changelog
+* Thu Sep 10 2009 Dan Walsh <dwalsh@redhat.com> 3.6.31-2
+- Update to upstream
+- Fixes for devicekit_disk
+
 * Tue Sep 8 2009 Dan Walsh <dwalsh@redhat.com> 3.6.30-6
 - More fixes