rpms/diffutils
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Applied upstream gnulib patch to avoid -Wformat-security warning (bug #1037038).

Browse Source 
Resolves: rhbz#1037038
This commit is contained in:
Tim Waugh 2013-12-04 13:45:07 +00:00
parent 5b4e2e345c
commit 445a625327
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
diffutils-format-security.patch Normal file
View File

@ -0,0 +1,17 @@
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"

11
diffutils.spec
View File

@ -1,13 +1,14 @@
Summary: A GNU collection of diff utilities Summary: A GNU collection of diff utilities
Name: diffutils Name: diffutils
Version: 3.3 Version: 3.3
Release: 4%{?dist} Release: 5%{?dist}
Group: Applications/Text Group: Applications/Text
URL: http://www.gnu.org/software/diffutils/diffutils.html URL: http://www.gnu.org/software/diffutils/diffutils.html
Source: ftp://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.xz Source: ftp://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.xz
Patch1: diffutils-cmp-s-empty.patch Patch1: diffutils-cmp-s-empty.patch
Patch2: diffutils-mkdir_p.patch Patch2: diffutils-mkdir_p.patch
Patch4: diffutils-i18n.patch Patch4: diffutils-i18n.patch
Patch5: diffutils-format-security.patch
License: GPLv3+ License: GPLv3+
Requires(post): info Requires(post): info
Requires(preun): info Requires(preun): info
@ -39,6 +40,10 @@ Install diffutils if you need to compare text files.
%patch4 -p1 -b .i18n %patch4 -p1 -b .i18n
# Applied upstream gnulib patch to avoid -Wformat-security warning
# (bug #1037038).
%patch5 -p1 -b .format-security
# Run autoreconf for aarch64 support (bug #925256). # Run autoreconf for aarch64 support (bug #925256).
autoreconf autoreconf
@ -75,6 +80,10 @@ rm -rf $RPM_BUILD_ROOT
%{_infodir}/diffutils.info*gz %{_infodir}/diffutils.info*gz
%changelog %changelog
* Wed Dec 4 2013 Tim Waugh <twaugh@redhat.com> 3.3-5
- Applied upstream gnulib patch to avoid -Wformat-security warning
(bug #1037038).
* Wed Oct 23 2013 Tim Waugh <twaugh@redhat.com> 3.3-4 * Wed Oct 23 2013 Tim Waugh <twaugh@redhat.com> 3.3-4
- Fixed multibyte handling logic for diff -Z (bug #1012075). - Fixed multibyte handling logic for diff -Z (bug #1012075).