From aa4225a30f8c1c29413f1d23ecdeaa13c658bb44 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Tue, 13 Sep 2005 16:38:52 +0000
Subject: [PATCH] * Tue Sep 13 2005 Dan Walsh <dwalsh@redhat.com> 1.26-2 - Fix
 restorecon to exit with error code

---
 policycoreutils-rhat.patch | 31 ++++++++++++++++++++++---------
 policycoreutils.spec       |  5 ++++-
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch
index 6de48fa..7bdd650 100644
--- a/policycoreutils-rhat.patch
+++ b/policycoreutils-rhat.patch
@@ -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 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policyc
  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 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setfiles/setfiles.8 poli
  .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)
  {
diff --git a/policycoreutils.spec b/policycoreutils.spec
index b5023e8..3d67f13 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -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 @@ rm -rf ${RPM_BUILD_ROOT}
 %config(noreplace) %{_sysconfdir}/sestatus.conf
 
 %changelog
+* Tue Sep 13 2005 Dan Walsh <dwalsh@redhat.com> 1.26-2
+- Fix restorecon to exit with error code
+
 * Mon Sep 12 2005 Dan Walsh <dwalsh@redhat.com> 1.26-1
 	* Updated version for release.