rpms/patch
7
0
Fork 0
Code Issues Pull Requests Releases Activity

add patch to fix sigbus in merge code yes the %{sparc} macro, not sure we

Browse Source 
really need to handle sparc different here
This commit is contained in:
Dennis Gilmore 2010-03-10 18:00:04 +00:00
parent 5b79fc3348
commit 5e47e3921e
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
patch-2.6.1-merge-sigbus.patch Normal file
View File

@ -0,0 +1,11 @@
--- 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;
}

9
patch.spec
View File

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