From 1aa6d7bef27063aefc494b24229fa354d8424c6c Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Tue, 22 Jan 2008 20:50:27 +0000
Subject: [PATCH] * Tue Jan 22 2008 Dan Walsh <dwalsh@redhat.com> 2.0.35-4 -
 Add support in fixfiles for ext4 ext4dev and gfs2

---
 policycoreutils-rhat.patch | 21 +++++++++++++++++----
 policycoreutils.spec       |  5 ++++-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch
index a295d7b..65a7b45 100644
--- a/policycoreutils-rhat.patch
+++ b/policycoreutils-rhat.patch
@@ -687,12 +687,25 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po
      gettext.install('policycoreutils')
 diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.35/scripts/fixfiles
 --- nsapolicycoreutils/scripts/fixfiles	2007-12-10 21:42:28.000000000 -0500
-+++ policycoreutils-2.0.35/scripts/fixfiles	2008-01-21 14:10:48.000000000 -0500
-@@ -90,9 +90,9 @@
++++ policycoreutils-2.0.35/scripts/fixfiles	2008-01-22 15:48:58.000000000 -0500
+@@ -36,8 +36,8 @@
+ LOGGER=/usr/sbin/logger
+ SETFILES=/sbin/setfiles
+ RESTORECON=/sbin/restorecon
+-FILESYSTEMSRW=`mount | grep -v "context=" | egrep -v '\((|.*,)bind(,.*|)\)' | awk '/(ext[23]| xfs | jfs ).*\(rw/{print $3}';`
+-FILESYSTEMSRO=`mount | grep -v "context=" | egrep -v '\((|.*,)bind(,.*|)\)' | awk '/(ext[23]| xfs | jfs ).*\(ro/{print $3}';`
++FILESYSTEMSRW=`mount | grep -v "context=" | egrep -v '\((|.*,)bind(,.*|)\)' | awk '/(ext[234]| ext4dev | gfs2 | xfs | jfs ).*\(rw/{print $3}';`
++FILESYSTEMSRO=`mount | grep -v "context=" | egrep -v '\((|.*,)bind(,.*|)\)' | awk '/(ext[234]| ext4dev | gfs2 | xfs | jfs ).*\(ro/{print $3}';`
+ FILESYSTEMS="$FILESYSTEMSRW $FILESYSTEMSRO"
+ SELINUXTYPE="targeted"
+ if [ -e /etc/selinux/config ]; then
+@@ -89,10 +89,10 @@
+                fi; \
              done | \
  	while read pattern ; do sh -c "find $pattern" \
- 		      ! \( -fstype ext2 -o -fstype ext3 -o -fstype jfs -o -fstype xfs \) -prune  -o \
+-		      ! \( -fstype ext2 -o -fstype ext3 -o -fstype jfs -o -fstype xfs \) -prune  -o \
 -		      \( -wholename /home -o -wholename /root -o -wholename /tmp -wholename /dev \) -prune -o -print; \
++		      ! \( -fstype ext2 -o -fstype ext3 -o -fstype ext4 -o -fstype ext4dev  -o -fstype gfs2 -o -fstype jfs -o -fstype xfs \) -prune  -o \
 +		      \( -wholename /home -o -wholename /root -o -wholename /tmp -wholename /dev \) -prune -o -print0; \
  		      done 2> /dev/null | \
 -	 ${RESTORECON} $2 -f - 
@@ -712,7 +725,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po
 -	    ${RESTORECON} ${OUTFILES} ${FORCEFLAG} $* -f - 2>&1 >> $LOGFILE
 -	done
 +	/usr/bin/find "$FILEPATH" \
-+	    ! \( -fstype ext2 -o -fstype ext3 -o -fstype jfs -o -fstype xfs \) -prune  -o -print0 | \
++	    ! \( -fstype ext2 -o -fstype ext3 -o -fstype ext4 -o -fstype ext4dev -o -fstype gfs2 -o -fstype jfs -o -fstype xfs \) -prune  -o -print0 | \
 +	    ${RESTORECON} ${OUTFILES} ${FORCEFLAG} $* -0 -f - 2>&1 >> $LOGFILE
      else
 -	${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $* $DIRS 2>&1 >> $LOGFILE
diff --git a/policycoreutils.spec b/policycoreutils.spec
index d982d84..bacbaee 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.35
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -193,6 +193,9 @@ if [ "$1" -ge "1" ]; then
 fi
 
 %changelog
+* Tue Jan 22 2008 Dan Walsh <dwalsh@redhat.com> 2.0.35-4
+- Add support in fixfiles for ext4 ext4dev and gfs2
+
 * Mon Jan 21 2008 Dan Walsh <dwalsh@redhat.com> 2.0.35-3
 - Allow files with spaces to be used by setfiles