# HG changeset patch # User Michael Schloh von Bennewitz # Date 1346494630 -7200 # Node ID 9d74c60eb90eae23390d21f596e19f7c9b99ab4b # Parent f6c0237e8f1cdf4d4540d8bcadf8f9ef26f0c3a9 Back out attempt to repair gets(3) redefinition and correct rather by avoiding detection of gets(3) as a method with no macro, otherwise leading to definition of HAVE_RAW_DECL_GETS and redefition of gets(3) in lib/stdio.h(.in) caused by 'a split double-inclusion guard' and a seemingly multiple '#include_next ' reference. Quatch. diff -r f6c0237e8f1c -r 9d74c60eb90e lftp/lftp.patch --- a/lftp/lftp.patch Fri Aug 31 21:14:33 2012 +0200 +++ b/lftp/lftp.patch Sat Sep 01 12:17:10 2012 +0200 @@ -30,19 +30,3 @@ #elif defined(HAVE_TERMCAP_H) # include #endif -Index: lib/stdio.in.h ---- lib/stdio.in.h.orig 2012-07-03 15:29:29.000000000 +0200 -+++ lib/stdio.in.h 2012-08-03 14:31:28.929658700 +0200 -@@ -704,8 +704,12 @@ - removed it. */ - #undef gets - #if HAVE_RAW_DECL_GETS -+#ifdef __cplusplus -+_GL_WARN_ON_USE (std::gets, "gets is a security hole - use fgets instead"); -+#else - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); - #endif -+#endif - - - #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@ diff -r f6c0237e8f1c -r 9d74c60eb90e lftp/lftp.spec --- a/lftp/lftp.spec Fri Aug 31 21:14:33 2012 +0200 +++ b/lftp/lftp.spec Sat Sep 01 12:17:10 2012 +0200 @@ -58,6 +58,9 @@ %prep %setup -q %patch -p0 + %{l_shtool} subst \ + -e 's;\(for gl_func in .*\) gets;\1;' \ + configure %build srcdir=`pwd`