From bd7e86c3797bbb521b262b110d99f80a5f94e3de Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Thu, 1 Dec 2005 18:16:50 +0000
Subject: [PATCH] - Fixes for dovecot and saslauthd

---
 .cvsignore            |  1 +
 modules-targeted.conf |  2 +-
 selinux-policy.spec   | 16 +++++++++-------
 sources               |  2 +-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index e6b65313..cb5e4eac 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -5,3 +5,4 @@ serefpolicy-2.0.3.tgz
 serefpolicy-2.0.4.tgz
 serefpolicy-2.0.5.tgz
 serefpolicy-2.0.6.tgz
+serefpolicy-2.0.7.tgz
diff --git a/modules-targeted.conf b/modules-targeted.conf
index b8e9fede..5380d708 100644
--- a/modules-targeted.conf
+++ b/modules-targeted.conf
@@ -534,7 +534,7 @@ ftp = base
 #
 # General Purpose Mouse driver
 # 
-gpm = off
+gpm = on
 
 # Layer: services
 # Module: mta
diff --git a/selinux-policy.spec b/selinux-policy.spec
index 75487935..148fb4ba 100644
--- a/selinux-policy.spec
+++ b/selinux-policy.spec
@@ -9,8 +9,8 @@
 %define CHECKPOLICYVER 1.27.17-7
 Summary: SELinux policy configuration
 Name: selinux-policy
-Version: 2.0.6
-Release: 2
+Version: 2.0.7
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: serefpolicy-%{version}.tgz
@@ -93,11 +93,13 @@ install -m0644 ${RPM_SOURCE_DIR}/setrans-%1.conf ${RPM_BUILD_ROOT}%{_sysconfdir}
 %config %{_sysconfdir}/selinux/%1/contexts/files/media
 
 %define saveFileContext() \
-. %{_sysconfdir}/selinux/config; \
-FILE_CONTEXT=%{_sysconfdir}/selinux/%1/contexts/files/file_contexts; \
-if [ "${SELINUXTYPE}" == %1 -a -f ${FILE_CONTEXT} ]; then \
-	cp -f ${FILE_CONTEXT} ${FILE_CONTEXT}.pre; \
-fi 
+if [ -s /etc/selinux/config ]; then \
+	. %{_sysconfdir}/selinux/config; \
+	FILE_CONTEXT=%{_sysconfdir}/selinux/%1/contexts/files/file_contexts; \
+	if [ "${SELINUXTYPE}" == %1 -a -f ${FILE_CONTEXT} ]; then \
+		cp -f ${FILE_CONTEXT} ${FILE_CONTEXT}.pre; \
+	fi \
+fi
 
 %define rebuildpolicy() \
 semodule -b /usr/share/selinux/%1/base.pp -s %1 \
diff --git a/sources b/sources
index 05bce2a1..f1c11c9e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1dfcb3c6d69195ee83fc92a98b4b9f1b  serefpolicy-2.0.6.tgz
+320ba2ffe3b4c3cd5065c525c0f36167  serefpolicy-2.0.7.tgz