From b5eae792c149366fec68bba8916ee53794260253 Mon Sep 17 00:00:00 2001 From: David Lutterkort Date: Aug 09 2012 19:22:55 +0000 Subject: Fix FTBFS on F18 --- diff --git a/augeas-0.10.0-03-no-gets.patch b/augeas-0.10.0-03-no-gets.patch new file mode 100644 index 0000000..30425d6 --- /dev/null +++ b/augeas-0.10.0-03-no-gets.patch @@ -0,0 +1,14 @@ +diff -up augeas-0.10.0/gnulib/lib/stdio.in.h.orig augeas-0.10.0/gnulib/lib/stdio.in.h +--- augeas-0.10.0/gnulib/lib/stdio.in.h.orig 2011-03-03 17:07:59.000000000 -0800 ++++ augeas-0.10.0/gnulib/lib/stdio.in.h 2012-08-09 12:18:51.817580091 -0700 +@@ -161,8 +161,10 @@ _GL_WARN_ON_USE (fflush, "fflush is not + /* 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. */ ++/* Don't mention gets at all + #undef gets + _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); ++*/ + + #if @GNULIB_FOPEN@ + # if @REPLACE_FOPEN@ diff --git a/augeas.spec b/augeas.spec index b0f4212..17c978c 100644 --- a/augeas.spec +++ b/augeas.spec @@ -1,6 +1,6 @@ Name: augeas Version: 0.10.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A library for changing configuration files Group: System Environment/Libraries @@ -16,6 +16,8 @@ Patch0: 0001-pkg-config-Augeas-requires-libxml2.patch # against the same version, and HASH is the git commit hash from upstream Patch1: augeas-0.10.0-01-055382d8.patch Patch2: augeas-0.10.0-02-075f8d35.patch +# Patch gnulib to not use gets +Patch3: augeas-0.10.0-03-no-gets.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -56,6 +58,7 @@ The libraries for %{name}. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %configure --disable-static @@ -98,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/augeas.pc %changelog +* Thu Aug 9 2012 David Lutterkort - 0.10.0-5 +- Add patch augeas-0.10.0-03-no-gets; FTBFS on F18 if gets is mentioned + * Wed Jul 18 2012 Fedora Release Engineering - 0.10.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild