lftp/lftp.patch

Wed, 29 Aug 2012 21:07:25 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Wed, 29 Aug 2012 21:07:25 +0200
changeset 650
f4280ba8b3ac
parent 466
edc7e45b466a
child 653
9d74c60eb90e
permissions
-rw-r--r--

Correct flawed build condition assuming no preinstalled overriding bacula libs.

     1 Index: src/lftp_tinfo.cc
     2 --- src/lftp_tinfo.cc.orig	2008-11-27 06:56:39 +0100
     3 +++ src/lftp_tinfo.cc	2009-09-13 21:09:13 +0200
     4 @@ -23,20 +23,20 @@
     5  #include <config.h>
     7  extern "C" {
     8 -#if defined(HAVE_CURSES_H)
     9 -# include <curses.h>
    10 -# if defined(HAVE_TERM_H)
    11 -#  include <term.h>
    12 -# elif defined(HAVE_NCURSES_TERM_H)
    13 -#  include <ncurses/term.h>
    14 -# endif
    15 -#elif defined(HAVE_NCURSES_CURSES_H)
    16 +#if defined(HAVE_NCURSES_CURSES_H)
    17  # include <ncurses/curses.h>
    18  # if defined(HAVE_NCURSES_TERM_H)
    19  #  include <ncurses/term.h>
    20  # elif defined(HAVE_TERM_H)
    21  #  include <term.h>
    22  # endif
    23 +#elif defined(HAVE_CURSES_H)
    24 +# include <curses.h>
    25 +# if defined(HAVE_TERM_H)
    26 +#  include <term.h>
    27 +# elif defined(HAVE_NCURSES_TERM_H)
    28 +#  include <ncurses/term.h>
    29 +# endif
    30  #elif defined(HAVE_TERMCAP_H)
    31  # include <termcap.h>
    32  #endif
    33 Index: lib/stdio.in.h
    34 --- lib/stdio.in.h.orig	2012-07-03 15:29:29.000000000 +0200
    35 +++ lib/stdio.in.h	2012-08-03 14:31:28.929658700 +0200
    36 @@ -704,8 +704,12 @@
    37     removed it.  */
    38  #undef gets
    39  #if HAVE_RAW_DECL_GETS
    40 +#ifdef __cplusplus
    41 +_GL_WARN_ON_USE (std::gets, "gets is a security hole - use fgets instead");
    42 +#else
    43  _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
    44  #endif
    45 +#endif
    48  #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@

mercurial