From ac51aead2a73a8f9e7d462e0cf3bee95651456a6 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 10:34:56 +0000
Subject: auto-import changelog data from policycoreutils-1.13-1.src.rpm

* Fri May 21 2004 Dan Walsh <dwalsh@redhat.com> 1.13-1
- Update to latest from NSA
- Change fixfiles to prompt before deleteing /tmp files

* Tue May 18 2004 Dan Walsh <dwalsh@redhat.com> 1.12-2
- have restorecon ingnore <<none>>
- Hand matchpathcon the file status

* Fri May 14 2004 Dan Walsh <dwalsh@redhat.com> 1.12-1
- Update to match NSA

* Mon May 10 2004 Dan Walsh <dwalsh@redhat.com> 1.11-4
- Move location of log file to /var/tmp

* Mon May 10 2004 Dan Walsh <dwalsh@redhat.com> 1.11-3
- Better grep command for bind

---

diff --git a/.cvsignore b/.cvsignore
index ac23da9..99d2154 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-policycoreutils-1.11.tgz
+policycoreutils-1.13.tgz
diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch
index e704806..3bc2929 100644
--- a/policycoreutils-rhat.patch
+++ b/policycoreutils-rhat.patch
@@ -1,29 +1,61 @@
---- policycoreutils-1.11/scripts/fixfiles.rhat	2004-05-05 09:36:40.000000000 -0400
-+++ policycoreutils-1.11/scripts/fixfiles	2004-05-07 10:41:27.721773064 -0400
-@@ -21,20 +21,22 @@
- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+--- policycoreutils-1.13/scripts/fixfiles.rhat	2004-05-21 14:26:51.000000000 -0400
++++ policycoreutils-1.13/scripts/fixfiles	2004-05-21 15:00:08.069273944 -0400
+@@ -22,21 +22,38 @@
  
  FC=/etc/security/selinux/file_contexts
-+LOGFILE=`mktemp /tmp/fixfiles.XXXXXXXXXX`  || exit 1
-+echo "logging to $LOGFILE"
+ LOGFILE=`mktemp /var/tmp/fixfiles.XXXXXXXXXX`  || exit 1
+-echo "logging to $LOGFILE"
  SETFILES=/usr/sbin/setfiles
--FILESYSTEMS=`mount | awk '/(ext[23]| xfs).*rw/{print $3}';`
-+FILESYSTEMS=`mount | grep -v "context=" | grep -v bind | awk '/(ext[23]| xfs).*rw/{print $3}';`
+ FILESYSTEMS=`mount | grep -v "context=" | egrep -v '\((|.*,)bind(,.*|)\)' | awk '/(ext[23]| xfs).*rw/{print $3}';`
  checkLabels () {
--${SETFILES} -v -n ${FC} ${FILESYSTEMS}
-+${SETFILES} -v -n ${FC} ${FILESYSTEMS} 2>&1 | tee $LOGFILE
++echo "logging to $LOGFILE"
+ ${SETFILES} -v -n ${FC} ${FILESYSTEMS} 2>&1 | tee $LOGFILE
  }
  
  restoreLabels () {
--${SETFILES} -v ${FC} ${FILESYSTEMS}
-+${SETFILES} -v ${FC} ${FILESYSTEMS} 2>&1 | tee $LOGFILE
++echo "logging to $LOGFILE"
+ ${SETFILES} -v ${FC} ${FILESYSTEMS} 2>&1 | tee $LOGFILE
  }
  
  relabel() {
++echo "logging to $LOGFILE"
  echo "Cleaning out /tmp"
  rm -rf /tmp/.??* /tmp/*
--${SETFILES} ${FC} ${FILESYSTEMS}
-+${SETFILES} ${FC} ${FILESYSTEMS} 2>&1 | tee $LOGFILE
+-${SETFILES} ${FC} ${FILESYSTEMS} 2>&1 | tee $LOGFILE
++${SETFILES} -v ${FC} ${FILESYSTEMS} 2>&1 | tee $LOGFILE
++}
++relabelCheck() {
++echo -n "
++Files in the /tmp directory may be labeled incorrectly, this command 
++can remove all files in /tmp.  If you choose to remove files from /tmp, 
++a reboot will be required after completion.
++
++Do you wish to clean out the /tmp directory [N]? "
++read answer
++if [ "$answer" = y -o  "$answer" = Y ]; then 
++    relabel
++else
++    restoreLabels
++fi
++
  }
  
  # See how we were called.
+@@ -48,10 +65,15 @@
+ 		restoreLabels
+ 		;;
+ 	relabel)
+-		relabel
++		relabelCheck
+ 		;;
++        -F)
++	     if "$1" = "relabel"; then
++		 relabel
++	     fi
++	     ;;
+ 	*)
+-        	echo $"Usage: $0 {check|restore|relabel}"
++        	echo $"Usage: $0 {check|restore|[-F] relabel}"
+ 		exit 1
+ esac
+ exit $?
diff --git a/policycoreutils.spec b/policycoreutils.spec
index 43b8f2a..85259f8 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -1,7 +1,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
-Version: 1.11
-Release: 2
+Version: 1.13
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -30,7 +30,7 @@ context.
 
 %prep
 %setup -q
-%patch1 -p1 
+%patch1 -p1 -b .rhat
 
 %build
 make all 
@@ -72,6 +72,23 @@ rm -rf ${RPM_BUILD_ROOT}
 %config(noreplace) %{_sysconfdir}/sestatus.conf
 
 %changelog
+* Fri May 21 2004 Dan Walsh <dwalsh@redhat.com> 1.13-1
+- Update to latest from NSA
+- Change fixfiles to prompt before deleteing /tmp files
+
+* Tue May 18 2004 Dan Walsh <dwalsh@redhat.com> 1.12-2
+- have restorecon ingnore <<none>>
+- Hand matchpathcon the file status
+
+* Thu May 14 2004 Dan Walsh <dwalsh@redhat.com> 1.12-1
+- Update to match NSA
+
+* Mon May 10 2004 Dan Walsh <dwalsh@redhat.com> 1.11-4
+- Move location of log file to /var/tmp
+
+* Mon May 10 2004 Dan Walsh <dwalsh@redhat.com> 1.11-3
+- Better grep command for bind
+
 * Fri May 7 2004 Dan Walsh <dwalsh@redhat.com> 1.11-2
 - Eliminate bind and context mounts
 
diff --git a/sources b/sources
index e9aac2e..88dc260 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b879c0815805fc6274c59027cfc6e483  policycoreutils-1.11.tgz
+69324b20d6fc1ddb7ad3c504ef7dc2a3  policycoreutils-1.13.tgz