From 316313f3e5ae5cfeba24340a8f39d5776b9730b7 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Fri, 13 May 2005 18:50:07 +0000
Subject: [PATCH] * Fri Apr 29 2005 Dan Walsh <dwalsh@redhat.com> 1.23.7-1 -
 Change -f flag in fixfiles to remove stuff from /tmp - Change -F flag to pass
 -F flag  to restorecon/fixfiles.  (IE Force relabel).

---
 .cvsignore                 |  1 +
 policycoreutils-rhat.patch | 84 ++++----------------------------------
 policycoreutils.spec       |  4 +-
 sources                    |  2 +-
 4 files changed, 13 insertions(+), 78 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index a891ae9..bec77ea 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -34,3 +34,4 @@ policycoreutils-1.23.4.tgz
 policycoreutils-1.23.5.tgz
 policycoreutils-1.23.6.tgz
 policycoreutils-1.23.7.tgz
+policycoreutils-1.23.8.tgz
diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch
index b8c1673..75a56d1 100644
--- a/policycoreutils-rhat.patch
+++ b/policycoreutils-rhat.patch
@@ -1,80 +1,12 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.23.6/scripts/fixfiles
---- nsapolicycoreutils/scripts/fixfiles	2005-03-15 08:44:43.000000000 -0500
-+++ policycoreutils-1.23.6/scripts/fixfiles	2005-04-29 10:40:15.000000000 -0400
-@@ -24,6 +24,7 @@
- # Set global Variables
- #
- fullFlag=0
-+FORCEFLAG=""
- DIRS=""
- RPMILES=""
- OUTFILES=""
-@@ -108,16 +109,16 @@
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.23.7/scripts/fixfiles
+--- nsapolicycoreutils/scripts/fixfiles	2005-04-29 14:11:23.000000000 -0400
++++ policycoreutils-1.23.7/scripts/fixfiles	2005-05-13 12:26:21.000000000 -0400
+@@ -164,7 +164,7 @@
  fi
- if [ ! -z "$RPMFILES" ]; then
-     for i in `echo $RPMFILES | sed 's/,/ /g'`; do
--	rpmlist $i | ${RESTORECON} ${OUTFILES} -R $1 -v -f - 2>&1 >> $LOGFILE
-+	rpmlist $i | ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $1 -v -f - 2>&1 >> $LOGFILE
-     done
-     exit $?
- fi
- if [ ! -z "$DIRS" ]; then
--    ${RESTORECON} ${OUTFILES} -R $1 -v $DIRS 2>&1 >> $LOGFILE
-+    ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $1 -v $DIRS 2>&1 >> $LOGFILE
-     exit $?
- fi
- LogReadOnly
--${SETFILES} ${OUTFILES} ${SYSLOGFLAG} $1 -v ${FC} ${FILESYSTEMSRW} 2>&1 >> $LOGFILE
-+${SETFILES} ${OUTFILES} ${SYSLOGFLAG} ${FORCEFLAG} $1 -v ${FC} ${FILESYSTEMSRW} 2>&1 >> $LOGFILE
- exit $?
- }
  
-@@ -165,9 +166,9 @@
  # See how we were called.
- while getopts "C:Fo:R:l:" i; do
+-while getopts "C:Fo:R:l:" i; do
++while getopts "C:Ffo:R:l:" i; do
      case "$i" in
--	F)
--	fullFlag=1
--	;;
-+	f)
-+		fullFlag=1
-+		;;
-         R)
- 		RPMFILES=$OPTARG
- 		;;
-@@ -180,6 +181,9 @@
-         C)
- 		PREFC=$OPTARG
- 		;;
-+	F)
-+		FORCEFLAG="-F"
-+		;;
- 	*)
- 	    usage
- 	    exit 1
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles.8 policycoreutils-1.23.6/scripts/fixfiles.8
---- nsapolicycoreutils/scripts/fixfiles.8	2005-03-15 08:44:43.000000000 -0500
-+++ policycoreutils-1.23.6/scripts/fixfiles.8	2005-04-29 10:41:45.000000000 -0400
-@@ -3,9 +3,9 @@
- fixfiles \- fix file security contexts.
- 
- .SH "SYNOPSIS"
--.B fixfiles [ -R rpmpackagename[,rpmpackagename...] ] [ -C PREVIOUS_FILECONTEXT ] [-l logfile ] [-o outputfile ] { check | restore | [-F] relabel }"
-+.B fixfiles [-F] [ -R rpmpackagename[,rpmpackagename...] ] [ -C PREVIOUS_FILECONTEXT ] [-l logfile ] [-o outputfile ] { check | restore | [-F] relabel }"
- 
--.B fixfiles [-l logfile ] [-o outputfile ] { check | restore|[-F] relabel } [[dir/file] ... ] 
-+.B fixfiles [-F] [-l logfile ] [-o outputfile ] { check | restore|[-f] relabel } [[dir/file] ... ] 
- 
- .SH "DESCRIPTION"
- This manual page describes the
-@@ -31,6 +31,10 @@
- 
- .TP 
- .B -F
-+Force  reset  of  context to match file_context for customizable files
-+
-+.TP 
-+.B -f
- Don't prompt for removal of /tmp directory.
- 
- .TP 
+ 	f)
+ 		fullFlag=1
diff --git a/policycoreutils.spec b/policycoreutils.spec
index 3b43050..abcd3b5 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -2,11 +2,12 @@
 %define libsepolver 1.5.1-1
 Summary: SELinux policy core utilities.
 Name: policycoreutils
-Version: 1.23.7
+Version: 1.23.8
 Release: 1
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
+Patch: policycoreutils-rhat.patch
 
 Prefix: %{_prefix}
 BuildRequires: libselinux-devel >= %{libselinuxver} pam-devel libsepol-devel >= %{libsepolver}
@@ -33,6 +34,7 @@ context.
 
 %prep
 %setup -q
+%patch -p1 -b .rhat
 
 %build
 make CFLAGS="%{optflags}" all 
diff --git a/sources b/sources
index c0f6d77..3efeb6a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-931b23ad70a0678df025cb26f6162ae8  policycoreutils-1.23.7.tgz
+af850a62d49fb5b5fcb30807301847b9  policycoreutils-1.23.8.tgz