rpms/patch/F-12 patch-2.6.1-merge-sigbus.patch, NONE, 1.1 patch.spec, 1.43, 1.44

[Dennis Gilmore]

Author: ausil

Update of /cvs/pkgs/rpms/patch/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21307

Modified Files:
	patch.spec 
Added Files:
	patch-2.6.1-merge-sigbus.patch 
Log Message:
add patch to fix sigbus in merge code
yes the %{sparc} macro,  not sure we really need to handle sparc different here


patch-2.6.1-merge-sigbus.patch:
 bestmatch.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE patch-2.6.1-merge-sigbus.patch ---
--- patch-2.6.1/src/bestmatch.h.BAD	2010-03-10 17:55:53.000000000 +0000
+++ patch-2.6.1/src/bestmatch.h	2010-03-10 17:57:04.000000000 +0000
@@ -150,7 +150,7 @@
 
   done:
     if (py)
-      *py = ymax;
+      *py = (signed int)ymax;
     return c;
 }
 


Index: patch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/patch/F-12/patch.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- patch.spec	4 Jan 2010 13:59:04 -0000	1.43
+++ patch.spec	10 Mar 2010 18:00:04 -0000	1.44
@@ -1,12 +1,13 @@
 Summary: Utility for modifying/upgrading files
 Name: patch
 Version: 2.6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://www.gnu.org/software/patch/patch.html
 Group: Development/Tools
 Source: ftp://ftp.gnu.org/gnu/patch/patch-%{version}.tar.xz
 Patch1: patch-2.5.4-sigsegv.patch
+Patch2: patch-2.6.1-merge-sigbus.patch
 Patch100: patch-selinux.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -27,13 +28,14 @@ applications.
 %setup -q
 %patch1 -p1 -b .sigsegv
 %patch100 -p1 -b .selinux
+%patch2 -p1 -b .sigbus
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
 %configure
 
 # XXX unset CPPFLAGS on (ultra?)sparc to avoid large file system support
-%ifarch sparc sparc64
+%ifarch %{sparc}
 make CPPFLAGS=""
 %else
 make %{?smp_mflags}
@@ -56,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/*
 
 %changelog
+* Wed Mar 10 2010 Dennis Gilmore <dennis at ausil.us> 2.6.1-2
+- add patch to fix sigbus in merge code
+
 * Mon Jan  4 2010 Tim Waugh <twaugh at redhat.com> 2.6.1-1
 - 2.6.1 (bug #551569).  No longer need best-name patch.