From 127906775b474bd5220ac1c72c992722236ef430 Mon Sep 17 00:00:00 2001 From: James Antill Date: Thu, 26 May 2022 12:40:11 -0400 Subject: [PATCH] Auto sync2gitlab import of patchutils-0.3.4-10.el8.src.rpm --- .gitignore | 1 + EMPTY | 1 - patchutils-bz1226985.patch | 51 +++++++ patchutils-format-str.patch | 21 +++ patchutils.spec | 279 ++++++++++++++++++++++++++++++++++++ sources | 1 + 6 files changed, 353 insertions(+), 1 deletion(-) create mode 100644 .gitignore delete mode 100644 EMPTY create mode 100644 patchutils-bz1226985.patch create mode 100644 patchutils-format-str.patch create mode 100644 patchutils.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a213f9d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/patchutils-0.3.4.tar.xz diff --git a/EMPTY b/EMPTY deleted file mode 100644 index 0519ecb..0000000 --- a/EMPTY +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/patchutils-bz1226985.patch b/patchutils-bz1226985.patch new file mode 100644 index 0000000..05cfd73 --- /dev/null +++ b/patchutils-bz1226985.patch @@ -0,0 +1,51 @@ +diff -up patchutils-0.3.4/Makefile.am.bz1226985 patchutils-0.3.4/Makefile.am +--- patchutils-0.3.4/Makefile.am.bz1226985 2015-04-14 17:32:18.000000000 +0100 ++++ patchutils-0.3.4/Makefile.am 2015-06-09 17:13:52.497904051 +0100 +@@ -216,7 +216,8 @@ TESTS = tests/newline1/run-test \ + tests/stdin/run-test \ + tests/splitdiffD/run-test \ + tests/fullheader1/run-test \ +- tests/fullheader2/run-test ++ tests/fullheader2/run-test \ ++ tests/fullheader3/run-test + + # These ones don't work yet. + # Feel free to send me patches. :-) +diff -up patchutils-0.3.4/src/filterdiff.c.bz1226985 patchutils-0.3.4/src/filterdiff.c +--- patchutils-0.3.4/src/filterdiff.c.bz1226985 2015-04-14 17:13:07.000000000 +0100 ++++ patchutils-0.3.4/src/filterdiff.c 2015-06-09 17:13:52.498904087 +0100 +@@ -910,7 +910,7 @@ out: + return ret; + } + +-#define MAX_HEADERS 5 ++#define MAX_HEADERS 6 + static int filterdiff (FILE *f, const char *patchname) + { + static unsigned long linenum = 1; +diff -up patchutils-0.3.4/tests/fullheader3/run-test.bz1226985 patchutils-0.3.4/tests/fullheader3/run-test +--- patchutils-0.3.4/tests/fullheader3/run-test.bz1226985 2015-06-09 17:13:52.498904087 +0100 ++++ patchutils-0.3.4/tests/fullheader3/run-test 2015-06-09 17:13:52.498904087 +0100 +@@ -0,0 +1,22 @@ ++#!/bin/sh ++ ++# This is a filterdiff(1) testcase. ++# Handle git format-patch output containing remove-file diffs. ++# From: https://bugzilla.redhat.com/show_bug.cgi?id=1226985 ++ ++. ${top_srcdir-.}/tests/common.sh ++ ++cat <<"EOF" > git-output ++diff --git a/a b/a ++deleted file mode 100644 ++index 7898192..0000000 ++--- a/a +++++ /dev/null ++@@ -1 +0,0 @@ ++-a ++EOF ++ ++${FILTERDIFF} git-output 2>errors >output || { cat errors; exit 1; } ++[ -s errors ] && { cat errors; exit 1; } ++cmp git-output output || exit 1 ++exit 0 diff --git a/patchutils-format-str.patch b/patchutils-format-str.patch new file mode 100644 index 0000000..88ba8c6 --- /dev/null +++ b/patchutils-format-str.patch @@ -0,0 +1,21 @@ +diff -up patchutils-0.3.4/src/filterdiff.c.format-str patchutils-0.3.4/src/filterdiff.c +--- patchutils-0.3.4/src/filterdiff.c.format-str 2017-05-15 11:54:20.203918650 +0100 ++++ patchutils-0.3.4/src/filterdiff.c 2017-05-15 11:54:58.631833806 +0100 +@@ -1355,7 +1355,7 @@ read_regex_file (const char *file) + char errstr[300]; + regerror (err, ®ex[num_regex - 1], errstr, + sizeof (errstr)); +- error (EXIT_FAILURE, 0, errstr); ++ error (EXIT_FAILURE, 0, "%s", errstr); + exit (1); + } + } +@@ -1613,7 +1613,7 @@ int main (int argc, char *argv[]) + char errstr[300]; + regerror (err, ®ex[num_regex - 1], errstr, + sizeof (errstr)); +- error (EXIT_FAILURE, 0, errstr); ++ error (EXIT_FAILURE, 0, "%s", errstr); + exit (1); + } + } diff --git a/patchutils.spec b/patchutils.spec new file mode 100644 index 0000000..8d66310 --- /dev/null +++ b/patchutils.spec @@ -0,0 +1,279 @@ +Summary: A collection of programs for manipulating patch files +Name: patchutils +Version: 0.3.4 +Release: 10%{?dist} +License: GPLv2+ +Group: Applications/System +URL: http://cyberelk.net/tim/patchutils/ +Source0: http://cyberelk.net/tim/data/patchutils/stable/%{name}-%{version}.tar.xz +Patch1: patchutils-bz1226985.patch +Patch2: patchutils-format-str.patch +Obsoletes: interdiff <= 0.0.10 +Provides: interdiff = 0.0.11 +BuildRequires: perl-generators +BuildRequires: xmlto +BuildRequires: automake, autoconf + +%description +This is a collection of programs that can manipulate patch files in +a variety of ways, such as interpolating between two pre-patches, +combining two incremental patches, fixing line numbers in hand-edited +patches, and simply listing the files modified by a patch. + +%prep +%setup -q + +# Fixed handling of delete-file diffs from git (bug #1226985). +%patch1 -p1 -b .bz1226985 + +# Don't use regerror() result as format string. +%patch2 -p1 -b .format-str + +autoreconf + +%build +touch doc/patchutils.xml +%configure +make %{?_smp_mflags} + +%check +make check + +%install +make DESTDIR=%{buildroot} install + +%clean +rm -rf %{buildroot} + +%files +%{!?_licensedir:%global license %doc} +%doc AUTHORS ChangeLog README BUGS NEWS +%license COPYING +%{_bindir}/* +%{_mandir}/*/* + +%changelog +* Thu Feb 08 2018 Fedora Release Engineering - 0.3.4-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 0.3.4-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0.3.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Mon May 15 2017 Tim Waugh - 0.3.4-7 +- Don't use regerror() result as format string. + +* Sat Feb 11 2017 Fedora Release Engineering - 0.3.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 0.3.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Aug 21 2015 Tim Waugh - 0.3.4-4 +- Spec file cleanups (bug #1251587). + +* Thu Jun 18 2015 Fedora Release Engineering - 0.3.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue Jun 9 2015 Tim Waugh - 0.3.4-2 +- Fixed handling of delete-file diffs from git (bug #1226985). + +* Mon Apr 20 2015 Tim Waugh - 0.3.4-1 +- 0.3.4. + +* Sun Aug 17 2014 Fedora Release Engineering - 0.3.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Fri Jun 06 2014 Fedora Release Engineering - 0.3.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Aug 03 2013 Fedora Release Engineering - 0.3.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Jul 17 2013 Petr Pisar - 0.3.3-3 +- Perl 5.18 rebuild + +* Thu Apr 11 2013 Tim Waugh 0.3.3-2 +- Fixed help output (bug #948973). +- Fixed changelog dates. + +* Tue Apr 2 2013 Tim Waugh 0.3.3-1 +- 0.3.3. + +* Thu Feb 14 2013 Fedora Release Engineering - 0.3.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Fri Jul 20 2012 Fedora Release Engineering - 0.3.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 0.3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Thu Feb 10 2011 Tim Waugh 0.3.2-1 +- 0.3.2. + +* Tue Feb 08 2011 Fedora Release Engineering - 0.3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sat Jul 25 2009 Fedora Release Engineering - 0.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Feb 26 2009 Fedora Release Engineering - 0.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Jan 23 2009 Tim Waugh 0.3.1-1 +- 0.3.1. + +* Wed Jul 2 2008 Tim Waugh 0.3.0-1 +- 0.3.0. + +* Wed Feb 13 2008 Tim Waugh 0.2.31-5 +- Rebuild for GCC 4.3. + +* Mon Dec 3 2007 Tim Waugh 0.2.31-4 +- Versioned obsoletes/provides (bug #226234). +- Created %%check section (bug #226234). +- Avoid %%makeinstall (bug #226234). +- Fixed defattr declaration (bug #226234). + +* Wed Aug 29 2007 Tim Waugh 0.2.31-3 +- Added dist tag. +- Better buildroot tag. +- More specific license tag. + +* Wed Jul 12 2006 Jesse Keating - 0.2.31-2.2.2 +- rebuild + +* Fri Feb 10 2006 Jesse Keating - 0.2.31-2.2.1 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 0.2.31-2.2 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Fri Jul 22 2005 Tim Waugh +- Better structure in XML documentation. + +* Tue Jul 19 2005 Tim Waugh 0.2.31-2 +- Rebuilt to pick up new man-pages stylesheet. + +* Mon Jun 13 2005 Tim Waugh 0.2.31-1 +- 0.2.31. + +* Wed Mar 2 2005 Tim Waugh 0.2.30-4 +- Rebuild for new GCC. + +* Mon Nov 22 2004 Tim Waugh 0.2.30-3 +- Moved last fix into docbook-style-xsl. + +* Mon Nov 22 2004 Jindrich Novy 0.2.30-2 +- fix flipdiff.1 man page (#139341) + +* Thu Jul 22 2004 Tim Waugh 0.2.30-1 +- 0.2.30. + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Apr 16 2004 Tim Waugh 0.2.29-2 +- Fix no-newline handling in filterdiff. + +* Mon Apr 5 2004 Tim Waugh 0.2.29-1 +- 0.2.29. + +* Wed Mar 10 2004 Tim Waugh 0.2.28-1 +- 0.2.28. + +* Thu Feb 26 2004 Tim Waugh 0.2.27-1 +- 0.2.27. + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Mon Jan 12 2004 Tim Waugh 0.2.26-1 +- 0.2.26. + +* Tue Jan 6 2004 Tim Waugh +- Ship AUTHORS and ChangeLog as well (bug #112936). + +* Mon Dec 15 2003 Tim Waugh 0.2.25-1 +- 0.2.25. + +* Wed Sep 3 2003 Tim Waugh +- Remove buildroot before installing. + +* Thu Jul 31 2003 Tim Waugh 0.2.24-2 +- Add support for -H in lsdiff/grepdiff (from CVS). + +* Fri Jul 25 2003 Tim Waugh 0.2.24-1 +- 0.2.24 (fixes bug #100795). + +* Thu Jun 5 2003 Elliot Lee +- rebuilt + +* Thu Jun 5 2003 Tim Waugh 0.2.23-2 +- Added patch from CVS which adds timestamp removal to filterdiff. + +* Thu Jun 5 2003 Tim Waugh 0.2.23-1.1 +- Rebuilt. + +* Thu Jun 5 2003 Tim Waugh 0.2.23-1 +- 0.2.23. Fixes bug #92320. + +* Sat Mar 8 2003 Tim Waugh 0.2.22-1 +- 0.2.22. + +* Thu Jan 23 2003 Tim Waugh 0.2.19-1 +- 0.2.19, incorporating all patches. + +* Wed Jan 22 2003 Tim Powers 0.2.18-3 +- rebuilt + +* Wed Jan 22 2003 Tim Waugh +- Apply editdiff patch from 0.2.19pre2. + +* Wed Jan 22 2003 Tim Waugh 0.2.18-2 +- Bug-fix for rediff. + +* Mon Dec 16 2002 Tim Waugh 0.2.18-1 +- Fix file_exists(). +- 0.2.18. + +* Wed Oct 16 2002 Tim Waugh 0.2.17-1 +- 0.2.17. + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Sat May 18 2002 Tim Waugh 0.2.14-1 +- 0.2.14. + +* Thu May 9 2002 Tim Waugh 0.2.13-1 +- 0.2.13. + +* Tue Apr 23 2002 Tim Waugh 0.2.13-0.pre1.1 +- 0.2.13pre1 (now handles diffutils 2.8.1 output). +- Run tests after build step. + +* Fri Apr 19 2002 Tim Waugh 0.2.12-1 +- 0.2.12. + +* Wed Mar 20 2002 Tim Waugh 0.2.11-2 +- Fix handling of context diffs so that it handles GNU diff's output + style. + +* Thu Mar 14 2002 Tim Waugh 0.2.11-1 +- 0.2.11. + +* Mon Mar 04 2002 Florian La Roche +- I need this. :-) + +* Tue Nov 27 2001 Tim Waugh +- Initial spec file. diff --git a/sources b/sources new file mode 100644 index 0000000..9c9dada --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (patchutils-0.3.4.tar.xz) = ede006122fad180b78feaf69294f1c40c0a764981fa581f1893abeeb0421f9d586fc33f79d065690a6bc6187a31f11311b086669879dde12c6e49c7c8a2aa440