* Mon Sep 8 2008 Dan Walsh <dwalsh@redhat.com> 2.0.55-4

- Fix fixfiles to correct unlabeled_t files and remove .? files
This commit is contained in:
Daniel J Walsh 2008-09-08 18:09:36 +00:00
parent ac5ad8648b
commit f015700775
2 changed files with 11 additions and 8 deletions

View File

@ -71,19 +71,22 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po
strings_list_free(list1); strings_list_free(list1);
diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.55/scripts/fixfiles diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.55/scripts/fixfiles
--- nsapolicycoreutils/scripts/fixfiles 2008-08-28 09:34:24.000000000 -0400 --- nsapolicycoreutils/scripts/fixfiles 2008-08-28 09:34:24.000000000 -0400
+++ policycoreutils-2.0.55/scripts/fixfiles 2008-09-08 13:45:29.000000000 -0400 +++ policycoreutils-2.0.55/scripts/fixfiles 2008-09-08 14:08:57.000000000 -0400
@@ -141,12 +141,13 @@ @@ -139,14 +139,14 @@
LogReadOnly
${SETFILES} -q ${OUTFILES} ${SYSLOGFLAG} ${FORCEFLAG} $* ${FC} ${FILESYSTEMSRW} 2>&1 >> $LOGFILE
rm -rf /tmp/gconfd-* /tmp/pulse-* /tmp/orbit-* rm -rf /tmp/gconfd-* /tmp/pulse-* /tmp/orbit-*
find /tmp -context "*:file_t*" -exec chcon -t tmp_t {} \; -find /tmp -context "*:file_t*" -exec chcon -t tmp_t {} \;
find /var/tmp -context "*:file_t*" -exec chcon -t tmp_t {} \; -find /var/tmp -context "*:file_t*" -exec chcon -t tmp_t {} \;
+find /var/tmp -context "*:unlabeled_t*" -exec chcon -t tmp_t {} \; +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 {} \;
exit $? exit $?
} }
fullrelabel() { fullrelabel() {
logit "Cleaning out /tmp" logit "Cleaning out /tmp"
- rm -rf /tmp/.??* /tmp/* - rm -rf /tmp/.??* /tmp/*
+ rm -rf /tmp/.[^.]* /tmp/* + find /tmp/ -mindepth 1 -print0 | xargs -0 /bin/rm -f
LogReadOnly LogReadOnly
restore restore
} }

View File

@ -6,7 +6,7 @@
Summary: SELinux policy core utilities Summary: SELinux policy core utilities
Name: policycoreutils Name: policycoreutils
Version: 2.0.55 Version: 2.0.55
Release: 3%{?dist} Release: 4%{?dist}
License: GPLv2+ License: GPLv2+
Group: System Environment/Base Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@ -192,7 +192,7 @@ if [ "$1" -ge "1" ]; then
fi fi
%changelog %changelog
* Mon Sep 8 2008 Dan Walsh <dwalsh@redhat.com> 2.0.55-3 * Mon Sep 8 2008 Dan Walsh <dwalsh@redhat.com> 2.0.55-4
- Fix fixfiles to correct unlabeled_t files and remove .? files - Fix fixfiles to correct unlabeled_t files and remove .? files
* Wed Sep 3 2008 Dan Walsh <dwalsh@redhat.com> 2.0.55-2 * Wed Sep 3 2008 Dan Walsh <dwalsh@redhat.com> 2.0.55-2