From 2fbeb784faf35e2acb86e10359d94b98d5b6f541 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Wed, 28 Jan 2009 22:23:18 +0000
Subject: [PATCH] - Fixes for wicd daemon

---
 modules-minimum.conf  |  6 ------
 modules-mls.conf      |  6 ------
 modules-targeted.conf |  6 ------
 policy-20090105.patch | 13 +++++++++++--
 selinux-policy.spec   |  2 +-
 5 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/modules-minimum.conf b/modules-minimum.conf
index 28611ef6..a791e4dc 100644
--- a/modules-minimum.conf
+++ b/modules-minimum.conf
@@ -1741,12 +1741,6 @@ netlabel = module
 # 
 zosremote = module
 
-# Layer: services
-# Module: pki
-#
-# 
-pki = module
-
 # Layer: services
 # Module: pingd
 #
diff --git a/modules-mls.conf b/modules-mls.conf
index 3577d014..4054839f 100644
--- a/modules-mls.conf
+++ b/modules-mls.conf
@@ -1749,12 +1749,6 @@ netlabel = module
 # 
 zosremote = module
 
-# Layer: services
-# Module: pki
-#
-# 
-pki = module
-
 # Layer: services
 # Module: pingd
 #
diff --git a/modules-targeted.conf b/modules-targeted.conf
index 28611ef6..a791e4dc 100644
--- a/modules-targeted.conf
+++ b/modules-targeted.conf
@@ -1741,12 +1741,6 @@ netlabel = module
 # 
 zosremote = module
 
-# Layer: services
-# Module: pki
-#
-# 
-pki = module
-
 # Layer: services
 # Module: pingd
 #
diff --git a/policy-20090105.patch b/policy-20090105.patch
index 4ae595d1..9b1a2e41 100644
--- a/policy-20090105.patch
+++ b/policy-20090105.patch
@@ -23121,7 +23121,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/xserver.te serefpolicy-3.6.3/policy/modules/services/xserver.te
 --- nsaserefpolicy/policy/modules/services/xserver.te	2009-01-19 11:06:49.000000000 -0500
-+++ serefpolicy-3.6.3/policy/modules/services/xserver.te	2009-01-28 12:09:22.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/services/xserver.te	2009-01-28 13:23:35.000000000 -0500
 @@ -34,6 +34,13 @@
  
  ## <desc>
@@ -25727,7 +25727,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/system/miscfiles.if serefpolicy-3.6.3/policy/modules/system/miscfiles.if
 --- nsaserefpolicy/policy/modules/system/miscfiles.if	2008-08-07 11:15:12.000000000 -0400
-+++ serefpolicy-3.6.3/policy/modules/system/miscfiles.if	2009-01-21 13:05:22.000000000 -0500
++++ serefpolicy-3.6.3/policy/modules/system/miscfiles.if	2009-01-28 13:24:09.000000000 -0500
 @@ -23,6 +23,45 @@
  
  ########################################
@@ -25774,6 +25774,15 @@ diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/pol
  ##	Read fonts.
  ## </summary>
  ## <param name="domain">
+@@ -62,7 +101,7 @@
+ 		type fonts_t;
+ 	')
+ 
+-	dontaudit $1 fonts_t:dir write;
++	dontaudit $1 fonts_t:dir { write setattr };
+ 	dontaudit $1 fonts_t:file write;
+ ')
+ 
 diff -b -B --ignore-all-space --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-3.6.3/policy/modules/system/modutils.te
 --- nsaserefpolicy/policy/modules/system/modutils.te	2009-01-05 15:39:43.000000000 -0500
 +++ serefpolicy-3.6.3/policy/modules/system/modutils.te	2009-01-21 10:30:56.000000000 -0500
diff --git a/selinux-policy.spec b/selinux-policy.spec
index 89154d08..a25d1507 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -203,7 +203,7 @@ touch %{buildroot}%{_sysconfdir}/selinux/config
 touch %{buildroot}%{_sysconfdir}/sysconfig/selinux
 
 # Always create policy module package directories
-mkdir -p %{buildroot}%{_usr}/share/selinux/{targeted,mls}/
+mkdir -p %{buildroot}%{_usr}/share/selinux/{targeted,mls,minimum,modules}/
 
 # Install devel
 make clean