rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.409, 1.410 policycoreutils.spec, 1.593, 1.594

[Daniel J Walsh]

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5432

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Mon Feb 23 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-2
- Add /root/.ssh to restorecond.conf
- fixfiles -R package should recursively fix files


policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.409
retrieving revision 1.410
diff -u -r1.409 -r1.410
--- policycoreutils-rhat.patch	18 Feb 2009 21:54:38 -0000	1.409
+++ policycoreutils-rhat.patch	23 Feb 2009 16:34:14 -0000	1.410
@@ -1,9 +1,32 @@
-diff --exclude-from=exclude --exclude=sepolgen-1.0.15 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.61/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.62/Makefile
 --- nsapolicycoreutils/Makefile	2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.61/Makefile	2009-01-20 09:49:03.000000000 -0500
++++ policycoreutils-2.0.62/Makefile	2009-02-18 16:52:27.000000000 -0500
 @@ -1,4 +1,4 @@
 -SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
 +SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
  
  INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
  
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.62/restorecond/restorecond.conf
+--- nsapolicycoreutils/restorecond/restorecond.conf	2009-02-18 16:44:47.000000000 -0500
++++ policycoreutils-2.0.62/restorecond/restorecond.conf	2009-02-23 11:32:21.000000000 -0500
+@@ -5,3 +5,7 @@
+ /var/run/utmp
+ /var/log/wtmp
+ ~/*
++/root/.ssh
++/root/.ssh/*
++
++
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.62/scripts/fixfiles
+--- nsapolicycoreutils/scripts/fixfiles	2009-02-18 16:44:47.000000000 -0500
++++ policycoreutils-2.0.62/scripts/fixfiles	2009-02-19 10:07:49.000000000 -0500
+@@ -122,7 +122,7 @@
+ fi
+ if [ ! -z "$RPMFILES" ]; then
+     for i in `echo "$RPMFILES" | sed 's/,/ /g'`; do
+-	rpmlist $i | ${RESTORECON} ${OUTFILES} ${FORCEFLAG} $* -i -f - 2>&1 >> $LOGFILE
++	rpmlist $i | ${RESTORECON} ${OUTFILES} ${FORCEFLAG} $* -R -i -f - 2>&1 >> $LOGFILE
+     done
+     exit $?
+ fi


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.593
retrieving revision 1.594
diff -u -r1.593 -r1.594
--- policycoreutils.spec	18 Feb 2009 21:54:39 -0000	1.593
+++ policycoreutils.spec	23 Feb 2009 16:34:14 -0000	1.594
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.62
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -221,6 +221,10 @@
 fi
 
 %changelog
+* Mon Feb 23 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-2
+- Add /root/.ssh to restorecond.conf
+- fixfiles -R package should recursively fix files
+
 * Wed Feb 18 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-1
 - Update to upstream
 	* Add btrfs to fixfiles from Dan Walsh.