rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.348, 1.349 policycoreutils.spec, 1.497, 1.498
Daniel J Walsh (dwalsh)
fedora-extras-commits at redhat.com
Tue Jan 22 20:50:58 UTC 2008
- Previous message (by thread): rpms/hedgewars/devel .cvsignore, 1.2, 1.3 hedgewars.spec, 1.4, 1.5 sources, 1.2, 1.3
- Next message (by thread): rpms/perl-SNMP-Info/devel perl-SNMP-Info.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dwalsh
Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22673
Modified Files:
policycoreutils-rhat.patch policycoreutils.spec
Log Message:
* Tue Jan 22 2008 Dan Walsh <dwalsh at redhat.com> 2.0.35-4
- Add support in fixfiles for ext4 ext4dev and gfs2
policycoreutils-rhat.patch:
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -r1.348 -r1.349
--- policycoreutils-rhat.patch 21 Jan 2008 21:04:53 -0000 1.348
+++ policycoreutils-rhat.patch 22 Jan 2008 20:50:27 -0000 1.349
@@ -687,12 +687,25 @@
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 @@
- ${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
Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.497
retrieving revision 1.498
diff -u -r1.497 -r1.498
--- policycoreutils.spec 21 Jan 2008 21:04:53 -0000 1.497
+++ policycoreutils.spec 22 Jan 2008 20:50:27 -0000 1.498
@@ -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 @@
fi
%changelog
+* Tue Jan 22 2008 Dan Walsh <dwalsh at redhat.com> 2.0.35-4
+- Add support in fixfiles for ext4 ext4dev and gfs2
+
* Mon Jan 21 2008 Dan Walsh <dwalsh at redhat.com> 2.0.35-3
- Allow files with spaces to be used by setfiles
- Previous message (by thread): rpms/hedgewars/devel .cvsignore, 1.2, 1.3 hedgewars.spec, 1.4, 1.5 sources, 1.2, 1.3
- Next message (by thread): rpms/perl-SNMP-Info/devel perl-SNMP-Info.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list