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