[policycoreutils] Change fixfiles restore to delete unlabeled sockets in /tmp

[Daniel J Walsh]

commit 588030fc2cdb0cc6621ae7e5a67d9e6a7f37aa0e
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Mon Apr 18 13:18:18 2011 -0400

    Change fixfiles restore to delete unlabeled sockets in /tmp

 policycoreutils-rhat.patch |    4 ++--
 policycoreutils.spec       |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch
index b182a09..16bb3d4 100644
--- a/policycoreutils-rhat.patch
+++ b/policycoreutils-rhat.patch
@@ -3194,7 +3194,7 @@ index 3f9efba..7c6d75a 100644
 +/etc/selinux/{SELINUXTYPE}/seusers
  
 diff --git a/policycoreutils/scripts/fixfiles b/policycoreutils/scripts/fixfiles
-index ae519fc..706184d 100755
+index ae519fc..8e47d94 100755
 --- a/policycoreutils/scripts/fixfiles
 +++ b/policycoreutils/scripts/fixfiles
 @@ -21,6 +21,44 @@
@@ -3325,7 +3325,7 @@ index ae519fc..706184d 100755
  find /tmp \( -context "*:file_t*" -o -context "*:unlabeled_t*" \) -exec chcon -t tmp_t {} \;
  find /var/tmp \( -context "*:file_t*" -o -context "*:unlabeled_t*" \) -exec chcon -t tmp_t {} \;
 +find /var/run \( -context "*:file_t*" -o -context "*:unlabeled_t*" \) -exec chcon -t var_run_t {} \;
-+find /var/lib/debug \( -context "*:file_t*" -o -context "*:unlabeled_t*" \) -exec chcon -t lib_t {} \;
++[ -e /var/lib/debug ] && find /var/lib/debug \( -context "*:file_t*" -o -context "*:unlabeled_t*" \) -exec chcon -t lib_t {} \;
  exit $?
  }
  
diff --git a/policycoreutils.spec b/policycoreutils.spec
index 144abe2..bc235fb 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -7,7 +7,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.86
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group:	 System Environment/Base
 # Based on git repository with tag 20101221
@@ -331,7 +331,7 @@ fi
 exit 0
 
 %changelog
-* Mon Apr 18 2011 Dan Walsh <dwalsh at redhat.com> 2.0.86-3
+* Mon Apr 18 2011 Dan Walsh <dwalsh at redhat.com> 2.0.86-4
 - Change fixfiles restore to delete unlabeled sockets in /tmp
 
 * Mon Apr 18 2011 Dan Walsh <dwalsh at redhat.com> 2.0.86-2