Compare commits
No commits in common. "c8s" and "c9-beta" have entirely different histories.
8
.gitignore
vendored
8
.gitignore
vendored
@ -1,7 +1 @@
|
||||
patchutils-0.2.30.tar.bz2
|
||||
patchutils-0.2.31.tar.bz2
|
||||
patchutils-0.3.0.tar.bz2
|
||||
patchutils-0.3.1.tar.bz2
|
||||
/patchutils-0.3.2.tar.bz2
|
||||
/patchutils-0.3.3.tar.xz
|
||||
/patchutils-0.3.4.tar.xz
|
||||
SOURCES/patchutils-0.4.2.tar.xz
|
||||
|
||||
1
.patchutils.metadata
Normal file
1
.patchutils.metadata
Normal file
@ -0,0 +1 @@
|
||||
0d4631a76b078c0b8cd8ebdf98982d3380125889 SOURCES/patchutils-0.4.2.tar.xz
|
||||
@ -1,18 +1,19 @@
|
||||
Summary: A collection of programs for manipulating patch files
|
||||
Name: patchutils
|
||||
Version: 0.3.4
|
||||
Release: 10%{?dist}
|
||||
Version: 0.4.2
|
||||
Release: 7%{?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
|
||||
Requires: patch
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc
|
||||
BuildRequires: perl-generators
|
||||
BuildRequires: xmlto
|
||||
BuildRequires: automake, autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: autoconf
|
||||
|
||||
%description
|
||||
This is a collection of programs that can manipulate patch files in
|
||||
@ -23,27 +24,16 @@ 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}
|
||||
%make_build
|
||||
|
||||
%check
|
||||
make check
|
||||
|
||||
%install
|
||||
make DESTDIR=%{buildroot} install
|
||||
%make_install
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%files
|
||||
%{!?_licensedir:%global license %doc}
|
||||
@ -53,6 +43,47 @@ rm -rf %{buildroot}
|
||||
%{_mandir}/*/*
|
||||
|
||||
%changelog
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.4.2-7
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.4.2-6
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.2-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Thu Oct 8 2020 Tim Waugh <twaugh@redhat.com> - 0.4.2-4
|
||||
- Fix build
|
||||
|
||||
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.2-3
|
||||
- Second attempt - Rebuilt for
|
||||
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Fri Jul 17 2020 Tim Waugh <twaugh@redhat.com> - 0.4.2-1
|
||||
- 0.4.2.
|
||||
|
||||
* Thu Jul 16 2020 Tim Waugh <twaugh@redhat.com> - 0.4.0-1
|
||||
- 0.4.0.
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.4-15
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.4-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.4-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Tue Jul 31 2018 Tim Waugh <twaugh@redhat.com> - 0.3.4-12
|
||||
- Requires patch (bug #1609946).
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.4-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.4-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
@ -1,6 +0,0 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-8
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
|
||||
Binary file not shown.
@ -1,51 +0,0 @@
|
||||
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
|
||||
@ -1,21 +0,0 @@
|
||||
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);
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user