From 31675a3baf7a618fa3bc11e6d787e802096e9754 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Oct 14 2009 14:00:46 +0000
Subject: - Fix labeling for privoxy config files


---

diff --git a/policy-F12.patch b/policy-F12.patch
index c6f4ad6..c2c9da9 100644
--- a/policy-F12.patch
+++ b/policy-F12.patch
@@ -6882,7 +6882,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/kernel/filesystem.te serefpolicy-3.6.32/policy/modules/kernel/filesystem.te
 --- nsaserefpolicy/policy/modules/kernel/filesystem.te	2009-08-14 16:14:31.000000000 -0400
-+++ serefpolicy-3.6.32/policy/modules/kernel/filesystem.te	2009-10-13 11:34:04.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/kernel/filesystem.te	2009-10-14 09:29:50.000000000 -0400
 @@ -93,7 +93,7 @@
  type hugetlbfs_t;
  fs_type(hugetlbfs_t)
@@ -6892,16 +6892,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  
  type ibmasmfs_t;
  fs_type(ibmasmfs_t)
-@@ -170,7 +170,7 @@
- # where we want to label objects with a derived type.
+@@ -171,6 +171,7 @@
  fs_use_trans mqueue gen_context(system_u:object_r:tmpfs_t,s0);
  fs_use_trans shm gen_context(system_u:object_r:tmpfs_t,s0);
--fs_use_trans tmpfs gen_context(system_u:object_r:tmpfs_t,s0);
+ fs_use_trans tmpfs gen_context(system_u:object_r:tmpfs_t,s0);
 +fs_use_trans devtmpfs gen_context(system_u:object_r:tmpfs_t,s0);
  
  allow tmpfs_t noxattrfs:filesystem associate;
  
-@@ -250,9 +250,13 @@
+@@ -250,9 +251,13 @@
  genfscon ncpfs / gen_context(system_u:object_r:nfs_t,s0)
  genfscon reiserfs / gen_context(system_u:object_r:nfs_t,s0)
  genfscon panfs / gen_context(system_u:object_r:nfs_t,s0)
@@ -13594,6 +13593,18 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  miscfiles_read_localization(memcached_t)
  
  sysnet_dns_name_resolve(memcached_t)
+diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/milter.if serefpolicy-3.6.32/policy/modules/services/milter.if
+--- nsaserefpolicy/policy/modules/services/milter.if	2009-07-14 14:19:57.000000000 -0400
++++ serefpolicy-3.6.32/policy/modules/services/milter.if	2009-10-14 09:54:10.000000000 -0400
+@@ -35,6 +35,8 @@
+ 	# Create other data files and directories in the data directory
+ 	manage_files_pattern($1_milter_t, $1_milter_data_t, $1_milter_data_t)
+ 
++	files_read_etc_files($1_milter_t)
++
+ 	miscfiles_read_localization($1_milter_t)
+ 
+ 	logging_send_syslog_msg($1_milter_t)
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.fc serefpolicy-3.6.32/policy/modules/services/mta.fc
 --- nsaserefpolicy/policy/modules/services/mta.fc	2009-07-29 15:15:33.000000000 -0400
 +++ serefpolicy-3.6.32/policy/modules/services/mta.fc	2009-09-30 16:12:48.000000000 -0400