rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.101, 1.102 policycoreutils.spec, 1.139, 1.140

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Sep 13 16:38:55 UTC 2005


Author: dwalsh

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

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Tue Sep 13 2005 Dan Walsh <dwalsh at redhat.com> 1.26-2
- Fix restorecon to exit with error code


policycoreutils-rhat.patch:
 restorecon/restorecon   |binary
 restorecon/restorecon.c |    1 -
 restorecon/restorecon.o |binary
 scripts/fixfiles        |    8 ++++++--
 setfiles/setfiles.8     |    3 +++
 setfiles/setfiles.c     |    4 ++--
 6 files changed, 11 insertions(+), 5 deletions(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- policycoreutils-rhat.patch	6 Sep 2005 21:19:01 -0000	1.101
+++ policycoreutils-rhat.patch	13 Sep 2005 16:38:52 -0000	1.102
@@ -1,6 +1,19 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.25.7/scripts/fixfiles
---- nsapolicycoreutils/scripts/fixfiles	2005-08-25 16:18:08.000000000 -0400
-+++ policycoreutils-1.25.7/scripts/fixfiles	2005-09-01 11:48:00.000000000 -0400
+Binary files nsapolicycoreutils/restorecon/restorecon and policycoreutils-1.26/restorecon/restorecon differ
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-1.26/restorecon/restorecon.c
+--- nsapolicycoreutils/restorecon/restorecon.c	2005-09-12 16:33:30.000000000 -0400
++++ policycoreutils-1.26/restorecon/restorecon.c	2005-09-13 12:26:38.452608000 -0400
+@@ -259,7 +259,6 @@
+ int main(int argc, char **argv) {
+   int i=0;
+   char *file_name=NULL;
+-  int errors=0;
+   int file=0;
+   int opt;
+   char buf[PATH_MAX];
+Binary files nsapolicycoreutils/restorecon/restorecon.o and policycoreutils-1.26/restorecon/restorecon.o differ
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.26/scripts/fixfiles
+--- nsapolicycoreutils/scripts/fixfiles	2005-09-12 16:33:30.000000000 -0400
++++ policycoreutils-1.26/scripts/fixfiles	2005-09-13 12:24:33.357828000 -0400
 @@ -61,7 +61,11 @@
  if [ -f ${PREFC} -a -x /usr/bin/diff ]; then
  	TEMPFILE=`mktemp ${FC}.XXXXXXXXXX`
@@ -23,9 +36,9 @@
  fi
  }
  #
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setfiles/setfiles.8 policycoreutils-1.25.7/setfiles/setfiles.8
---- nsapolicycoreutils/setfiles/setfiles.8	2005-03-17 10:29:50.000000000 -0500
-+++ policycoreutils-1.25.7/setfiles/setfiles.8	2005-09-01 11:48:00.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setfiles/setfiles.8 policycoreutils-1.26/setfiles/setfiles.8
+--- nsapolicycoreutils/setfiles/setfiles.8	2005-09-12 16:33:30.000000000 -0400
++++ policycoreutils-1.26/setfiles/setfiles.8	2005-09-13 12:24:33.362823000 -0400
 @@ -35,6 +35,9 @@
  .B \-q
  suppress non-error output.
@@ -36,9 +49,9 @@
  .B \-e directory
  directory to exclude (repeat option for more than one directory.)
  .TP 
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-1.25.7/setfiles/setfiles.c
---- nsapolicycoreutils/setfiles/setfiles.c	2005-09-01 11:26:48.000000000 -0400
-+++ policycoreutils-1.25.7/setfiles/setfiles.c	2005-09-01 11:48:00.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-1.26/setfiles/setfiles.c
+--- nsapolicycoreutils/setfiles/setfiles.c	2005-09-12 16:33:30.000000000 -0400
++++ policycoreutils-1.26/setfiles/setfiles.c	2005-09-13 12:24:33.369820000 -0400
 @@ -198,8 +198,8 @@
  void usage(const char * const name)
  {


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- policycoreutils.spec	12 Sep 2005 20:37:18 -0000	1.139
+++ policycoreutils.spec	13 Sep 2005 16:38:52 -0000	1.140
@@ -4,7 +4,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.26
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -88,6 +88,9 @@
 %config(noreplace) %{_sysconfdir}/sestatus.conf
 
 %changelog
+* Tue Sep 13 2005 Dan Walsh <dwalsh at redhat.com> 1.26-2
+- Fix restorecon to exit with error code
+
 * Mon Sep 12 2005 Dan Walsh <dwalsh at redhat.com> 1.26-1
 	* Updated version for release.
 




More information about the fedora-cvs-commits mailing list