Back out attempt to repair gets(3) redefinition and correct rather by

Sat, 01 Sep 2012 12:17:10 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Sat, 01 Sep 2012 12:17:10 +0200
changeset 653
9d74c60eb90e
parent 652
f6c0237e8f1c
child 654
9da33cc654ba

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 <stdio.h>' reference. Quatch.

lftp/lftp.patch file | annotate | diff | comparison | revisions
lftp/lftp.spec file | annotate | diff | comparison | revisions
     1.1 --- a/lftp/lftp.patch	Fri Aug 31 21:14:33 2012 +0200
     1.2 +++ b/lftp/lftp.patch	Sat Sep 01 12:17:10 2012 +0200
     1.3 @@ -30,19 +30,3 @@
     1.4   #elif defined(HAVE_TERMCAP_H)
     1.5   # include <termcap.h>
     1.6   #endif
     1.7 -Index: lib/stdio.in.h
     1.8 ---- lib/stdio.in.h.orig	2012-07-03 15:29:29.000000000 +0200
     1.9 -+++ lib/stdio.in.h	2012-08-03 14:31:28.929658700 +0200
    1.10 -@@ -704,8 +704,12 @@
    1.11 -    removed it.  */
    1.12 - #undef gets
    1.13 - #if HAVE_RAW_DECL_GETS
    1.14 -+#ifdef __cplusplus
    1.15 -+_GL_WARN_ON_USE (std::gets, "gets is a security hole - use fgets instead");
    1.16 -+#else
    1.17 - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
    1.18 - #endif
    1.19 -+#endif
    1.20 - 
    1.21 - 
    1.22 - #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
     2.1 --- a/lftp/lftp.spec	Fri Aug 31 21:14:33 2012 +0200
     2.2 +++ b/lftp/lftp.spec	Sat Sep 01 12:17:10 2012 +0200
     2.3 @@ -58,6 +58,9 @@
     2.4  %prep
     2.5      %setup -q
     2.6      %patch -p0
     2.7 +    %{l_shtool} subst \
     2.8 +        -e 's;\(for gl_func in .*\) gets;\1;' \
     2.9 +        configure
    2.10  
    2.11  %build
    2.12      srcdir=`pwd`

mercurial