rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.231, 1.232 policycoreutils.spec, 1.312, 1.313

[fedora-cvs-commits at redhat.com]

Author: dwalsh

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20744

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Wed Sep 13 2006 Dan Walsh <dwalsh at redhat.com> 1.30.28-8
- Fix fixfiles handling of -o


policycoreutils-rhat.patch:
 audit2allow/audit2allow      |    2 -
 audit2allow/avc.py           |    2 -
 newrole/newrole.c            |    1 
 restorecon/restorecon.8      |   11 ++++++---
 restorecon/restorecon.c      |   48 +++++++++++++++++++++++--------------------
 restorecond/restorecond.init |    6 ++---
 scripts/chcat                |    2 -
 scripts/fixfiles             |   18 ++++++++--------
 scripts/fixfiles.8           |    8 +++----
 scripts/genhomedircon        |    2 -
 secon/Makefile               |    4 +--
 semanage/semanage            |    2 -
 semanage/semanage.8          |    4 +--
 semanage/seobject.py         |    2 -
 setfiles/setfiles.8          |    6 ++---
 setfiles/setfiles.c          |   28 ++++++++-----------------
 16 files changed, 72 insertions(+), 74 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -r1.231 -r1.232
--- policycoreutils-rhat.patch	11 Sep 2006 20:58:46 -0000	1.231
+++ policycoreutils-rhat.patch	13 Sep 2006 10:33:47 -0000	1.232
@@ -238,7 +238,7 @@
  #
 diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.30.28/scripts/fixfiles
 --- nsapolicycoreutils/scripts/fixfiles	2006-09-01 22:32:11.000000000 -0400
-+++ policycoreutils-1.30.28/scripts/fixfiles	2006-09-08 09:12:12.000000000 -0400
++++ policycoreutils-1.30.28/scripts/fixfiles	2006-09-13 06:32:03.000000000 -0400
 @@ -117,8 +117,8 @@
      exit $?
  fi
@@ -263,6 +263,27 @@
      fi
  
      exit $?
+@@ -170,9 +170,9 @@
+ }
+ 
+ usage() {
+-      	echo $"Usage: $0 [-l logfile ] [-o outputfile ] { check | restore|[-F] relabel } [[dir] ... ] "
++      	echo $"Usage: $0 [-l logfile ] [-o] { check | restore|[-F] relabel } [[dir] ... ] "
+ 	echo or
+-      	echo $"Usage: $0 -R rpmpackage[,rpmpackage...] -C PREVIOUS_FILECONTEXT [-l logfile ] [-o outputfile ] { check | restore }"
++      	echo $"Usage: $0 -R rpmpackage[,rpmpackage...] -C PREVIOUS_FILECONTEXT [-l logfile ] [-o] { check | restore }"
+ }
+ 
+ if [ $# = 0 ]; then
+@@ -181,7 +181,7 @@
+ fi
+ 
+ # See how we were called.
+-while getopts "C:Ffo:R:l:" i; do
++while getopts "C:FfoR:l:" i; do
+     case "$i" in
+ 	f)
+ 		fullFlag=1
 @@ -190,7 +190,7 @@
  		RPMFILES=$OPTARG
  		;;
@@ -281,6 +302,32 @@
      if [ $OPTIND -le $# ]; then
  	    usage
      fi
+diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/scripts/fixfiles.8 policycoreutils-1.30.28/scripts/fixfiles.8
+--- nsapolicycoreutils/scripts/fixfiles.8	2006-08-28 16:58:19.000000000 -0400
++++ policycoreutils-1.30.28/scripts/fixfiles.8	2006-09-13 06:31:17.000000000 -0400
+@@ -3,9 +3,9 @@
+ fixfiles \- fix file security contexts.
+ 
+ .SH "SYNOPSIS"
+-.B fixfiles [-F] [ -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] { check | restore | [-F] relabel }"
+ 
+-.B fixfiles [-F] [-l logfile ] [-o outputfile ] { check | restore|[-f] relabel } [[dir/file] ... ] 
++.B fixfiles [-F] [-l logfile ] [-o] { check | restore|[-f] relabel } [[dir/file] ... ] 
+ 
+ .SH "DESCRIPTION"
+ This manual page describes the
+@@ -26,8 +26,8 @@
+ .B -l logfile
+ Save the output to the specified logfile
+ .TP 
+-.B -o outputfile
+-Save all files that have file_context that differs from the default, in outputfile.
++.B -o 
++Print all files that have file_context that differs from the default.
+ 
+ .TP 
+ .B -F
 diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.30.28/scripts/genhomedircon
 --- nsapolicycoreutils/scripts/genhomedircon	2006-08-28 16:58:19.000000000 -0400
 +++ policycoreutils-1.30.28/scripts/genhomedircon	2006-09-08 09:12:12.000000000 -0400


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -r1.312 -r1.313
--- policycoreutils.spec	11 Sep 2006 14:29:15 -0000	1.312
+++ policycoreutils.spec	13 Sep 2006 10:33:47 -0000	1.313
@@ -5,7 +5,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.30.28
-Release: 7
+Release: 8
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -122,6 +122,9 @@
 [ -x /sbin/service ] && /sbin/service restorecond condrestart
 
 %changelog
+* Wed Sep 13 2006 Dan Walsh <dwalsh at redhat.com> 1.30.28-8
+- Fix fixfiles handling of -o
+
 * Mon Sep 11 2006 Dan Walsh <dwalsh at redhat.com> 1.30.28-7
 - Make restorecon return the number of changes files if you use the -n flag