3.5 (bug #1365325).
This commit is contained in:
Tim Waugh
parent
c7eed45830
commit
4387dd65d0
1
.gitignore
vendored
1
.gitignore
vendored
@ -3,3 +3,4 @@ diffutils-2.8.1.tar.gz
|
||||
/diffutils-3.1.tar.xz
|
||||
/diffutils-3.2.tar.xz
|
||||
/diffutils-3.3.tar.xz
|
||||
/diffutils-3.5.tar.xz
|
||||
|
||||
16
diffutils-3.5.tar.xz.sig
Normal file
16
diffutils-3.5.tar.xz.sig
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIcBAABCgAGBQJXuT2mAAoJEH/Z/MsAC+7uECsP/0wVZOh74XKI0Y4XPxqhgKou
|
||||
L/uFMgqpq2P9Uwr8jnJCr3xsKWCHYSYXOjmzbQ21wkqDWynT+NbLRcH4HLvO6vU3
|
||||
EWtoBor7UG0weTDanNfRBFjVLWsHsDWJj7VGMja9OAkXjpqo0f+iYHHIbJ+oKlIY
|
||||
gzNqUdjGg8RpsvNapz4XuTsoUNDrTtVOy/k9xHUZCw/h1cZBVpaAU8MEE3MReab6
|
||||
pOn660BlVqT50vMd09FKRuTLktJ2LBFZ6x+xdPBJm5LFdUFqClbiNaNv+idhlvfB
|
||||
GC8qjBr4WhuCtGpJKLFADTOZ8UOxcmx2sNz0ypiQrLT1UkTUtY3B0ADnzWuMEcwx
|
||||
eaPNzdJhPExY64i7MA2vc2MxlRb7omj8kI+n0rBpiFKLMI3x3ZWf6Papg/acYbJg
|
||||
0NHQkqdc82gH3vsp5DX/wNn+3TNwks9ziVt7Jervk7uQqWaDLrah3waBN3q5UWsk
|
||||
HLAlkhb94Ahi+cNMk1oiNKqT+en3AhZ/7O6imKzTM8bTk27Ek7q3ThLfBeUKcp2O
|
||||
j1aaPbaDGEL9pZZDCeuZCSdRZDGMY+spGNYRC4pmYCL9C2LsH5jtX5ob9gQsPHt3
|
||||
XFsi5l83i5N3amwzb2OdSTEwM0xgPX8TmcN435409gvz/VVmeSmx5jhHb9m8SLSk
|
||||
SrDXEuf5yKX8J8HXVMgt
|
||||
=e0eV
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,12 +0,0 @@
|
||||
diff -up diffutils-3.3/src/diff.c.FILE... diffutils-3.3/src/diff.c
|
||||
--- diffutils-3.3/src/diff.c.FILE... 2014-03-27 09:12:05.333317315 +0000
|
||||
+++ diffutils-3.3/src/diff.c 2014-03-27 09:13:08.274564402 +0000
|
||||
@@ -947,7 +947,7 @@ static char const * const option_help_ms
|
||||
N_(" --help display this help and exit"),
|
||||
N_("-v, --version output version information and exit"),
|
||||
"",
|
||||
- N_("FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE...' or 'FILE... DIR'."),
|
||||
+ N_("FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'."),
|
||||
N_("If --from-file or --to-file is given, there are no restrictions on FILE(s)."),
|
||||
N_("If a FILE is '-', read standard input."),
|
||||
N_("Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."),
|
||||
@ -1,17 +0,0 @@
|
||||
diff -up diffutils-3.3/gnulib-tests/test-xvasprintf.c.format-security diffutils-3.3/gnulib-tests/test-xvasprintf.c
|
||||
--- diffutils-3.3/gnulib-tests/test-xvasprintf.c.format-security 2013-03-22 04:20:50.000000000 +0000
|
||||
+++ diffutils-3.3/gnulib-tests/test-xvasprintf.c 2013-12-04 13:43:09.927443499 +0000
|
||||
@@ -16,6 +16,13 @@
|
||||
|
||||
/* Written by Bruno Haible <bruno@clisp.org>, 2007. */
|
||||
|
||||
+/* Tell GCC not to warn about the specific edge cases tested here. */
|
||||
+#if (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) || 4 < __GNUC__
|
||||
+# pragma GCC diagnostic ignored "-Wformat-zero-length"
|
||||
+# pragma GCC diagnostic ignored "-Wformat-nonliteral"
|
||||
+# pragma GCC diagnostic ignored "-Wformat-security"
|
||||
+#endif
|
||||
+
|
||||
#include <config.h>
|
||||
|
||||
#include "xvasprintf.h"
|
||||
@ -1,12 +0,0 @@
|
||||
diff -up diffutils-3.3/po/Makefile.in.in.mkdir_p diffutils-3.3/po/Makefile.in.in
|
||||
--- diffutils-3.3/po/Makefile.in.in.mkdir_p 2013-03-26 11:25:58.869375066 +0000
|
||||
+++ diffutils-3.3/po/Makefile.in.in 2013-03-26 11:26:00.114379442 +0000
|
||||
@@ -42,7 +42,7 @@ INSTALL_DATA = @INSTALL_DATA@
|
||||
mkinstalldirs = $(SHELL) @install_sh@ -d
|
||||
install_sh = $(SHELL) @install_sh@
|
||||
MKDIR_P = @MKDIR_P@
|
||||
-mkdir_p = @mkdir_p@
|
||||
+mkdir_p = @MKDIR_P@
|
||||
|
||||
GMSGFMT_ = @GMSGFMT@
|
||||
GMSGFMT_no = @GMSGFMT@
|
||||
@ -1,22 +1,19 @@
|
||||
Summary: A GNU collection of diff utilities
|
||||
Name: diffutils
|
||||
Version: 3.3
|
||||
Release: 13%{?dist}
|
||||
Version: 3.5
|
||||
Release: 1%{?dist}
|
||||
Group: Applications/Text
|
||||
URL: http://www.gnu.org/software/diffutils/diffutils.html
|
||||
Source: ftp://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.xz
|
||||
Patch1: diffutils-cmp-s-empty.patch
|
||||
Patch2: diffutils-mkdir_p.patch
|
||||
Patch3: diffutils-FILE....patch
|
||||
Patch4: diffutils-i18n.patch
|
||||
Patch5: diffutils-format-security.patch
|
||||
Patch2: diffutils-i18n.patch
|
||||
License: GPLv3+
|
||||
Requires(post): info
|
||||
Requires(preun): info
|
||||
Provides: bundled(gnulib)
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildRequires: help2man
|
||||
BuildRequires: autoconf, automake
|
||||
BuildRequires: autoconf, automake, texinfo
|
||||
|
||||
%description
|
||||
Diffutils includes four utilities: diff, cmp, diff3 and sdiff. Diff
|
||||
@ -36,17 +33,7 @@ Install diffutils if you need to compare text files.
|
||||
# For 'cmp -s', compare file sizes only if both non-zero (bug #563618).
|
||||
%patch1 -p1 -b .cmp-s-empty
|
||||
|
||||
# Work around @mkdir_p@ build issue.
|
||||
%patch2 -p1 -b .mkdir_p
|
||||
|
||||
# Fix --help output and man page (bug #1079076).
|
||||
%patch3 -p1 -b .FILE...
|
||||
|
||||
%patch4 -p1 -b .i18n
|
||||
|
||||
# Applied upstream gnulib patch to avoid -Wformat-security warning
|
||||
# (bug #1037038).
|
||||
%patch5 -p1 -b .format-security
|
||||
%patch2 -p1 -b .i18n
|
||||
|
||||
# Run autoreconf for aarch64 support (bug #925256).
|
||||
autoreconf
|
||||
@ -88,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_infodir}/diffutils.info*gz
|
||||
|
||||
%changelog
|
||||
* Wed Sep 21 2016 Tim Waugh <twaugh@redhat.com> - 3.5-1
|
||||
- 3.5 (bug #1365325).
|
||||
|
||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.3-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user