[diffutils] Fixed build failure.
Tim Waugh
twaugh at fedoraproject.org
Mon Jul 23 16:35:27 UTC 2012
commit 850062d256ade1b909a2c6cd774ae33bfa8559ad
Author: Tim Waugh <twaugh at redhat.com>
Date: Mon Jul 23 17:35:12 2012 +0100
Fixed build failure.
diffutils-stdio-gets.patch | 30 ++++++++++++++++++++++++++++++
diffutils.spec | 9 ++++++++-
2 files changed, 38 insertions(+), 1 deletions(-)
---
diff --git a/diffutils-stdio-gets.patch b/diffutils-stdio-gets.patch
new file mode 100644
index 0000000..8d7d5a3
--- /dev/null
+++ b/diffutils-stdio-gets.patch
@@ -0,0 +1,30 @@
+diff -up diffutils-3.2/lib/stdio.in.h.stdio-gets diffutils-3.2/lib/stdio.in.h
+--- diffutils-3.2/lib/stdio.in.h.stdio-gets 2012-07-23 17:29:22.311787651 +0100
++++ diffutils-3.2/lib/stdio.in.h 2012-07-23 17:29:58.316908463 +0100
+@@ -681,26 +681,6 @@ _GL_WARN_ON_USE (getline, "getline is un
+ # endif
+ #endif
+
+-#if @GNULIB_GETS@
+-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
+-# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+-# undef gets
+-# define gets rpl_gets
+-# endif
+-_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1)));
+-_GL_CXXALIAS_RPL (gets, char *, (char *s));
+-# else
+-_GL_CXXALIAS_SYS (gets, char *, (char *s));
+-# undef gets
+-# endif
+-_GL_CXXALIASWARN (gets);
+-/* It is very rare that the developer ever has full control of stdin,
+- so any use of gets warrants an unconditional warning. Assume it is
+- always declared, since it is required by C89. */
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+-#endif
+-
+-
+ #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
+ struct obstack;
+ /* Grow an obstack with formatted output. Return the number of
diff --git a/diffutils.spec b/diffutils.spec
index 1e7dc3d..02f9f5c 100644
--- a/diffutils.spec
+++ b/diffutils.spec
@@ -1,12 +1,13 @@
Summary: A GNU collection of diff utilities
Name: diffutils
Version: 3.2
-Release: 8%{?dist}
+Release: 9%{?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-ppc-float.patch
+Patch3: diffutils-stdio-gets.patch
License: GPLv2+
Requires(post): info
Requires(preun): info
@@ -35,6 +36,9 @@ Install diffutils if you need to compare text files.
# Applied upstream gnulib fix for float test on ppc (bug #733536).
%patch2 -p1 -b .ppc-float
+# Fixed build failure.
+%patch3 -p1 -b .stdio-gets
+
%build
%configure
make PR_PROGRAM=%{_bindir}/pr
@@ -68,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
%{_infodir}/diffutils.info*gz
%changelog
+* Mon Jul 23 2012 Tim Waugh <twaugh at redhat.com> 3.2-9
+- Fixed build failure.
+
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list