From a39aa6f7c74a967f818a8408dfbc92399de83314 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Aug 06 2010 16:33:44 +0000
Subject: Merge branch 'f13' into f14


---

diff --git a/patch-selinux.patch b/patch-selinux.patch
index 3c2774f..d88e222 100644
--- a/patch-selinux.patch
+++ b/patch-selinux.patch
@@ -83,7 +83,7 @@ diff -up patch-2.6/src/patch.c.selinux patch-2.6/src/patch.c
 +			  if (! inerrno && incontext)
 +			    {
 +			      security_context_t outcontext;
-+			      if (! getfilecon (outname, &outcontext) &&
++			      if (getfilecon (outname, &outcontext) != -1 &&
 +				  outcontext &&
 +				  strcmp(outcontext, incontext) && 
 +				  setfilecon (outname, incontext) != 0)
diff --git a/patch.spec b/patch.spec
index ad0c68c..b8fa01f 100644
--- a/patch.spec
+++ b/patch.spec
@@ -1,7 +1,7 @@
 Summary: Utility for modifying/upgrading files
 Name: patch
 Version: 2.6.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 URL: http://www.gnu.org/software/patch/patch.html
 Group: Development/Tools
@@ -38,6 +38,9 @@ applications.
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
+%ifarch sparcv9
+CFLAGS=`echo $CFLAGS|sed -e 's|-fstack-protector||g'`
+%endif
 %configure
 make %{?smp_mflags}
 
@@ -58,6 +61,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/*
 
 %changelog
+* Fri Aug  6 2010 Tim Waugh <twaugh@redhat.com> 2.6.1-4
+- Fixed interpretation of return value from getfilecon().
+- Fixed argument type for --get (bug #553624).
+
+* Fri Aug  6 2010 Dennis Gilmore <dennis@ausil.us>
+- using -fstack-projector causes weirdness on 32 bit sparc so disabling for now
+
 * Tue Jul 27 2010 Tim Waugh <twaugh@redhat.com> 2.6.1-3
 - Fixed argument type for --get (bug #553624).