2008-11-24 09:54:48 +00:00
|
|
|
Summary: Utility for modifying/upgrading files
|
2004-09-09 09:54:08 +00:00
|
|
|
Name: patch
|
2010-01-04 13:10:46 +00:00
|
|
|
Version: 2.6.1
|
2011-02-08 11:35:21 +00:00
|
|
|
Release: 7%{?dist}
|
2007-08-29 14:24:24 +00:00
|
|
|
License: GPLv2+
|
2004-09-09 09:54:08 +00:00
|
|
|
URL: http://www.gnu.org/software/patch/patch.html
|
|
|
|
|
Group: Development/Tools
|
2009-11-16 10:05:01 +00:00
|
|
|
Source: ftp://ftp.gnu.org/gnu/patch/patch-%{version}.tar.xz
|
|
|
|
|
Patch1: patch-2.5.4-sigsegv.patch
|
2010-08-06 16:08:49 +00:00
|
|
|
Patch2: patch-get-arg.patch
|
2011-02-08 11:35:21 +00:00
|
|
|
Patch3: patch-CVE-2010-4651.patch
|
2009-11-16 10:05:01 +00:00
|
|
|
Patch100: patch-selinux.patch
|
2007-08-29 14:24:24 +00:00
|
|
|
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
2004-09-09 09:54:08 +00:00
|
|
|
|
2008-06-12 10:22:54 +00:00
|
|
|
BuildRequires: libselinux-devel
|
2010-01-04 13:10:46 +00:00
|
|
|
BuildRequires: ed
|
2008-06-12 10:22:54 +00:00
|
|
|
|
2004-09-09 09:54:08 +00:00
|
|
|
%description
|
|
|
|
|
The patch program applies diff files to originals. The diff command
|
|
|
|
|
is used to compare an original to a changed file. Diff lists the
|
|
|
|
|
changes made to the file. A person who has the original file can then
|
|
|
|
|
use the patch command with the diff file to add the changes to their
|
|
|
|
|
original file (patching the file).
|
|
|
|
|
|
|
|
|
|
Patch should be installed because it is a common way of upgrading
|
|
|
|
|
applications.
|
|
|
|
|
|
|
|
|
|
%prep
|
|
|
|
|
%setup -q
|
2010-03-03 16:53:46 +00:00
|
|
|
|
|
|
|
|
# Avoid segfault.
|
2009-11-16 10:05:01 +00:00
|
|
|
%patch1 -p1 -b .sigsegv
|
2010-03-03 16:53:46 +00:00
|
|
|
|
2010-08-06 16:08:49 +00:00
|
|
|
# Fixed argument type for --get (bug #553624).
|
|
|
|
|
%patch2 -p1 -b .get-arg
|
|
|
|
|
|
2011-02-08 11:35:21 +00:00
|
|
|
# Applied upstream patch to fix CVE-2010-4651 so that malicious
|
|
|
|
|
# patches cannot create files above the current directory
|
|
|
|
|
# (bug #667529).
|
|
|
|
|
%patch3 -p1 -b .CVE-2010-4651
|
|
|
|
|
|
2010-03-03 16:53:46 +00:00
|
|
|
# SELinux support.
|
2009-11-16 10:05:01 +00:00
|
|
|
%patch100 -p1 -b .selinux
|
2004-09-09 09:54:08 +00:00
|
|
|
|
|
|
|
|
%build
|
2004-09-09 09:54:15 +00:00
|
|
|
CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
|
2010-03-12 22:08:39 +00:00
|
|
|
%ifarch sparcv9
|
|
|
|
|
CFLAGS=`echo $CFLAGS|sed -e 's|-fstack-protector||g'`
|
|
|
|
|
%endif
|
2004-09-09 09:54:08 +00:00
|
|
|
%configure
|
2011-01-04 12:50:12 +00:00
|
|
|
make %{?_smp_mflags}
|
2004-09-09 09:54:08 +00:00
|
|
|
|
2009-11-16 10:05:01 +00:00
|
|
|
%check
|
|
|
|
|
make check
|
|
|
|
|
|
2004-09-09 09:54:08 +00:00
|
|
|
%install
|
|
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
%makeinstall
|
|
|
|
|
|
|
|
|
|
%clean
|
|
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
|
|
%files
|
2007-12-03 12:03:11 +00:00
|
|
|
%defattr(-,root,root,-)
|
2010-03-03 16:53:46 +00:00
|
|
|
%doc COPYING NEWS README
|
2007-12-03 12:03:11 +00:00
|
|
|
%{_bindir}/*
|
2004-09-09 09:54:08 +00:00
|
|
|
%{_mandir}/*/*
|
|
|
|
|
|
|
|
|
|
%changelog
|
2011-02-08 11:35:21 +00:00
|
|
|
* Tue Feb 8 2011 Tim Waugh <twaugh@redhat.com> 2.6.1-7
|
|
|
|
|
- Applied upstream patch to fix CVE-2010-4651 so that malicious
|
|
|
|
|
patches cannot create files above the current directory
|
|
|
|
|
(bug #667529).
|
|
|
|
|
|
2011-01-04 12:50:12 +00:00
|
|
|
* Tue Jan 4 2011 Tim Waugh <twaugh@redhat.com> 2.6.1-5
|
|
|
|
|
- Use smp_mflags correctly (bug #665770).
|
|
|
|
|
|
2010-08-16 16:44:01 +00:00
|
|
|
* Mon Aug 16 2010 Tim Waugh <twaugh@redhat.com> 2.6.1-4
|
|
|
|
|
- Another fix for the selinux patch (bug #618215).
|
|
|
|
|
|
2010-08-06 16:08:49 +00:00
|
|
|
* Fri Aug 6 2010 Tim Waugh <twaugh@redhat.com> 2.6.1-3
|
2010-08-06 15:59:40 +00:00
|
|
|
- Fixed interpretation of return value from getfilecon().
|
2010-08-06 16:08:49 +00:00
|
|
|
- Fixed argument type for --get (bug #553624).
|
|
|
|
|
|
2010-08-06 16:27:06 +00:00
|
|
|
* Wed Mar 10 2010 Dennis Gilmore <dennis@ausil.us>
|
|
|
|
|
- using -fstack-projector causes weirdness on 32 bit sparc so disabling for now
|
|
|
|
|
|
2010-03-03 16:53:46 +00:00
|
|
|
* Wed Mar 3 2010 Tim Waugh <twaugh@redhat.com> 2.6.1-2
|
|
|
|
|
- Added comments for all patches.
|
|
|
|
|
- Ship COPYING file.
|
|
|
|
|
- Removed sparc ifdefs in spec file.
|
|
|
|
|
|
2010-01-04 13:10:46 +00:00
|
|
|
* Mon Jan 4 2010 Tim Waugh <twaugh@redhat.com> 2.6.1-1
|
|
|
|
|
- 2.6.1 (bug #551569). No longer need best-name patch.
|
|
|
|
|
|
2009-12-24 14:06:35 +00:00
|
|
|
* Thu Dec 24 2009 Tim Waugh <twaugh@redhat.com> 2.6-2
|
|
|
|
|
- Applied upstream patch to prevent incorrect filename being chosen
|
|
|
|
|
when adding a new file (bug #549122).
|
|
|
|
|
|
2009-11-16 10:05:01 +00:00
|
|
|
* Mon Nov 16 2009 Tim Waugh <twaugh@redhat.com> 2.6-1
|
|
|
|
|
- 2.6. No longer need stderr, suffix, stripcr, parse, allow-spaces,
|
|
|
|
|
ifdef, program_name, or posix-backup patches.
|
|
|
|
|
|
2009-07-25 23:17:49 +00:00
|
|
|
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5.4-40
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
|
|
|
|
|
2009-04-29 16:39:13 +00:00
|
|
|
* Wed Apr 29 2009 Tim Waugh <twaugh@redhat.com> 2.5.4-39
|
|
|
|
|
- Fixed operation when SELinux is disabled (bug #498102). Patch from
|
|
|
|
|
Jan Kratochvil.
|
|
|
|
|
|
2009-02-26 09:59:43 +00:00
|
|
|
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5.4-38
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
|
|
|
|
|
2009-02-17 15:36:59 +00:00
|
|
|
* Tue Feb 17 2009 Tim Waugh <twaugh@redhat.com> 2.5.4-37
|
|
|
|
|
- Don't set SELinux file context if it is already correct.
|
|
|
|
|
|
2008-11-24 09:54:48 +00:00
|
|
|
* Mon Nov 24 2008 Tim Waugh <twaugh@redhat.com> 2.5.4-36
|
|
|
|
|
- Better summary.
|
|
|
|
|
|
2008-06-30 12:02:59 +00:00
|
|
|
* Mon Jun 30 2008 Tim Waugh <twaugh@redhat.com> 2.5.4-35
|
|
|
|
|
- Don't fail if setfilecon() returns EPERM (bug #453365), although the
|
|
|
|
|
setfilecon man page suggests that ENOTSUP will be returned in this
|
|
|
|
|
case.
|
|
|
|
|
|
2008-06-16 11:00:21 +00:00
|
|
|
* Mon Jun 16 2008 Tim Waugh <twaugh@redhat.com> 2.5.4-34
|
|
|
|
|
- Only write simple backups for each file once during a run
|
|
|
|
|
(bug #234822).
|
|
|
|
|
|
2008-06-12 10:14:43 +00:00
|
|
|
* Thu Jun 12 2008 Tim Waugh <twaugh@redhat.com> 2.5.4-33
|
2008-06-12 10:22:54 +00:00
|
|
|
- Fix selinux patch and apply it. Build requires libselinux-devel.
|
2008-06-12 10:14:43 +00:00
|
|
|
|
2008-02-08 13:39:40 +00:00
|
|
|
* Fri Feb 8 2008 Tim Waugh <twaugh@redhat.com> 2.5.4-32
|
|
|
|
|
- Applied patch from 2.5.9 to allow spaces in filenames (bug #431887).
|
|
|
|
|
|
2007-12-03 12:03:11 +00:00
|
|
|
* Mon Dec 3 2007 Tim Waugh <twaugh@redhat.com> 2.5.4-31
|
|
|
|
|
- Convert spec file to UTF-8 (bug #226233).
|
|
|
|
|
- Use _bindir macro in %%files (bug #226233).
|
|
|
|
|
- Parallel make (bug #226233).
|
|
|
|
|
- Better defattr declaration (bug #226233).
|
|
|
|
|
|
2007-10-04 16:05:37 +00:00
|
|
|
* Thu Oct 4 2007 Tim Waugh <twaugh@redhat.com>
|
|
|
|
|
- Beginnings of an SELinux patch (bug #165799); not applied yet.
|
|
|
|
|
|
2007-08-29 14:24:24 +00:00
|
|
|
* Wed Aug 29 2007 Tim Waugh <twaugh@redhat.com> 2.5.4-30
|
|
|
|
|
- Added dist tag.
|
|
|
|
|
- More specific license tag.
|
|
|
|
|
- Fixed summary.
|
|
|
|
|
- Better buildroot tag.
|
|
|
|
|
|
2006-07-12 07:39:20 +00:00
|
|
|
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 2.5.4-29.2.2
|
|
|
|
|
- rebuild
|
|
|
|
|
|
2006-02-11 04:56:48 +00:00
|
|
|
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 2.5.4-29.2.1
|
|
|
|
|
- bump again for double-long bug on ppc(64)
|
|
|
|
|
|
2006-02-07 13:24:37 +00:00
|
|
|
* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 2.5.4-29.2
|
|
|
|
|
- rebuilt for new gcc4.1 snapshot and glibc changes
|
|
|
|
|
|
2005-12-09 22:42:39 +00:00
|
|
|
* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
|
|
|
|
|
- rebuilt
|
|
|
|
|
|
2005-09-08 21:54:08 +00:00
|
|
|
* Thu Sep 8 2005 Tim Waugh <twaugh@redhat.com> 2.5.4-29
|
|
|
|
|
- Remove SELinux patch for now (bug #167822).
|
2005-09-08 20:55:46 +00:00
|
|
|
|
2005-09-07 08:06:48 +00:00
|
|
|
* Wed Sep 7 2005 Tim Waugh <twaugh@redhat.com> 2.5.4-27
|
2005-09-07 08:08:36 +00:00
|
|
|
- Applied patch from Ulrich Drepper to fix string overread (bug #167675).
|
2005-09-07 08:06:48 +00:00
|
|
|
|
2005-09-06 15:29:23 +00:00
|
|
|
* Tue Sep 6 2005 Tim Waugh <twaugh@redhat.com> 2.5.4-26
|
2005-09-06 15:28:55 +00:00
|
|
|
- Preserve SELinux file contexts (bug #165799).
|
|
|
|
|
|
2005-08-11 12:02:57 +00:00
|
|
|
* Thu Aug 11 2005 Tim Waugh <twaugh@redhat.com> 2.5.4-25
|
2005-08-11 12:02:10 +00:00
|
|
|
- Fixed CRLF detection (bug #154283).
|
|
|
|
|
|
2005-05-04 10:32:49 +00:00
|
|
|
* Wed May 4 2005 Tim Waugh <twaugh@redhat.com> 2.5.4-24
|
|
|
|
|
- Reverted last change (bug #154283, bug #156762).
|
|
|
|
|
|
2005-04-29 15:42:30 +00:00
|
|
|
* Fri Apr 29 2005 Tim Waugh <twaugh@redhat.com> 2.5.4-23
|
|
|
|
|
- Applied patch from Toshio Kuratomi to avoid problems with DOS-format
|
|
|
|
|
newlines (bug #154283).
|
|
|
|
|
|
2005-03-02 15:07:53 +00:00
|
|
|
* Wed Mar 2 2005 Tim Waugh <twaugh@redhat.com> 2.5.4-22
|
|
|
|
|
- Rebuild for new GCC.
|
|
|
|
|
|
2005-02-09 12:20:07 +00:00
|
|
|
* Wed Feb 9 2005 Tim Waugh <twaugh@redhat.com> 2.5.4-21
|
|
|
|
|
- Rebuilt.
|
|
|
|
|
|
2004-09-09 09:56:19 +00:00
|
|
|
* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
|
|
|
|
|
- rebuilt
|
|
|
|
|
|
2004-09-09 09:56:08 +00:00
|
|
|
* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
|
|
|
|
|
- rebuilt
|
|
|
|
|
|
2004-09-09 09:55:49 +00:00
|
|
|
* Sat Oct 25 2003 Tim Waugh <twaugh@redhat.com> 2.5.4-18
|
|
|
|
|
- Rebuilt.
|
|
|
|
|
|
|
|
|
|
* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
|
|
|
|
|
- rebuilt
|
|
|
|
|
|
2004-09-09 09:55:11 +00:00
|
|
|
* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
|
|
|
|
|
- rebuilt
|
|
|
|
|
|
|
|
|
|
* Wed Nov 20 2002 Tim Powers <timp@redhat.com>
|
|
|
|
|
- rebuilt in current collinst
|
|
|
|
|
|
2004-09-09 09:55:07 +00:00
|
|
|
* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
|
|
|
|
|
- automated rebuild
|
|
|
|
|
|
2004-09-09 09:55:03 +00:00
|
|
|
* Thu May 23 2002 Tim Powers <timp@redhat.com>
|
|
|
|
|
- automated rebuild
|
|
|
|
|
|
2004-09-09 09:54:49 +00:00
|
|
|
* Tue Apr 9 2002 Tim Waugh <twaugh@redhat.com> 2.5.4-12
|
|
|
|
|
- Fix error reporting when given bad options (bug #62981).
|
|
|
|
|
|
2004-09-09 09:54:42 +00:00
|
|
|
* Tue Mar 5 2002 Tim Waugh <twaugh@redhat.com> 2.5.4-11
|
|
|
|
|
- s/Copyright:/License:/.
|
|
|
|
|
- Fix -D behaviour (bug #60688).
|
|
|
|
|
|
|
|
|
|
* Tue May 29 2001 Tim Waugh <twaugh@redhat.com> 2.5.4-10
|
2004-09-09 09:54:22 +00:00
|
|
|
- Merge Mandrake patch:
|
|
|
|
|
- fix possible segfault
|
|
|
|
|
|
2004-09-09 09:54:15 +00:00
|
|
|
* Fri Dec 1 2000 Tim Waugh <twaugh@redhat.com>
|
|
|
|
|
- Rebuild because of fileutils bug.
|
|
|
|
|
|
|
|
|
|
* Thu Nov 2 2000 Tim Waugh <twaugh@redhat.com>
|
|
|
|
|
- use .orig as default suffix, as per man page and previous behaviour
|
|
|
|
|
(bug #20202).
|
|
|
|
|
- use better patch for this, from maintainer.
|
|
|
|
|
|
|
|
|
|
* Wed Oct 4 2000 Tim Waugh <twaugh@redhat.com>
|
|
|
|
|
- actually use the RPM_OPT_FLAGS
|
|
|
|
|
|
2004-09-09 09:54:08 +00:00
|
|
|
* Wed Jul 12 2000 Prospector <bugzilla@redhat.com>
|
|
|
|
|
- automatic rebuild
|
|
|
|
|
|
2007-12-03 12:03:11 +00:00
|
|
|
* Tue Jun 13 2000 Trond Eivind Glomsrød <teg@redhat.com>
|
2004-09-09 09:54:08 +00:00
|
|
|
- Use %%makeinstall, %%{_tmppath} and %%{_mandir}
|
|
|
|
|
|
2007-12-03 12:03:11 +00:00
|
|
|
* Fri May 12 2000 Trond Eivind Glomsrød <teg@redhat.com>
|
2004-09-09 09:54:08 +00:00
|
|
|
- added URL
|
|
|
|
|
|
|
|
|
|
* Wed Feb 16 2000 Bernhard Rosenkraenzer <bero@redhat.com>
|
|
|
|
|
- 2.5.4
|
|
|
|
|
- Fix up LFS support on Alpha (Bug #5732)
|
|
|
|
|
|
|
|
|
|
* Mon Feb 7 2000 Bill Nottingham <notting@redhat.com>
|
|
|
|
|
- handle compressed manpages
|
|
|
|
|
|
|
|
|
|
* Sun Jun 06 1999 Alan Cox <alan@redhat.com>
|
|
|
|
|
- Fix the case where stderr isnt flushed for ask(). Now the 'no such file'
|
|
|
|
|
appears before the skip patch question, not at the very end, Doh!
|
|
|
|
|
|
|
|
|
|
* Mon Mar 22 1999 Jeff Johnson <jbj@redhat.com>
|
|
|
|
|
- (ultra?) sparc was getting large file system support.
|
|
|
|
|
|
|
|
|
|
* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com>
|
|
|
|
|
- auto rebuild in the new build environment (release 7)
|
|
|
|
|
|
|
|
|
|
* Fri Dec 18 1998 Cristian Gafton <gafton@redhat.com>
|
|
|
|
|
- build against glibc 2.1
|
|
|
|
|
|
|
|
|
|
* Tue Sep 1 1998 Jeff Johnson <jbj@redhat.com>
|
|
|
|
|
- bump release to preserve newer than back-ported 4.2.
|
|
|
|
|
|
|
|
|
|
* Tue Jun 09 1998 Prospector System <bugs@redhat.com>
|
|
|
|
|
- translations modified for de, fr
|
|
|
|
|
|
|
|
|
|
* Tue Jun 9 1998 Jeff Johnson <jbj@redhat.com>
|
|
|
|
|
- Fix for problem #682 segfault.
|
|
|
|
|
|
|
|
|
|
* Fri Apr 24 1998 Prospector System <bugs@redhat.com>
|
|
|
|
|
- translations modified for de, fr, tr
|
|
|
|
|
|
|
|
|
|
* Tue Apr 07 1998 Cristian Gafton <gafton@redhat.com>
|
|
|
|
|
- added buildroot
|
|
|
|
|
|
|
|
|
|
* Wed Oct 21 1997 Cristian Gafton <gafton@redhat.com>
|
|
|
|
|
- updated to 2.5
|
|
|
|
|
|
|
|
|
|
* Mon Jun 02 1997 Erik Troan <ewt@redhat.com>
|
|
|
|
|
- built against glibc
|
