vim/patches/vim-7.3.368.patch0

   1 To: vim_dev@googlegroups.com
   2 Subject: Patch 7.3.368
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 7.3.368
  11 Problem:    Gcc complains about redefining _FORTIFY_SOURCE.
  12 Solution:   Undefine it before redefining it.
  13 Files:      src/Makefile, src/configure.in, src/auto/configure
  14
  15
  16 *** ../vim-7.3.367/src/Makefile 2011-10-20 16:35:25.000000000 +0200
  17 --- src/Makefile        2011-12-08 15:16:13.000000000 +0100
  18 ***************
  19 *** 561,568 ****
  20   #CFLAGS = -g -O2 '-DSTARTUPTIME="vimstartup"' -fno-strength-reduce -Wall -Wmissing-prototypes
  21
  22   # Use this with GCC to check for mistakes, unused arguments, etc.
  23 ! #CFLAGS = -g -Wall -Wextra -Wmissing-prototypes -Wunreachable-code -D_FORTIFY_SOURCE=1
  24 ! #CFLAGS = -g -O2 -Wall -Wextra -Wmissing-prototypes -D_FORTIFY_SOURCE=1 -DU_DEBUG
  25   #PYTHON_CFLAGS_EXTRA = -Wno-missing-field-initializers
  26   #MZSCHEME_CFLAGS_EXTRA = -Wno-unreachable-code -Wno-unused-parameter
  27
  28 --- 561,568 ----
  29   #CFLAGS = -g -O2 '-DSTARTUPTIME="vimstartup"' -fno-strength-reduce -Wall -Wmissing-prototypes
  30
  31   # Use this with GCC to check for mistakes, unused arguments, etc.
  32 ! #CFLAGS = -g -Wall -Wextra -Wmissing-prototypes -Wunreachable-code -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1
  33 ! #CFLAGS = -g -O2 -Wall -Wextra -Wmissing-prototypes -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -DU_DEBUG
  34   #PYTHON_CFLAGS_EXTRA = -Wno-missing-field-initializers
  35   #MZSCHEME_CFLAGS_EXTRA = -Wno-unreachable-code -Wno-unused-parameter
  36
  37 *** ../vim-7.3.367/src/configure.in     2011-09-02 12:27:20.000000000 +0200
  38 --- src/configure.in    2011-12-01 20:23:22.000000000 +0100
  39 ***************
  40 *** 3584,3592 ****
  41     dnl -D_FORTIFY_SOURCE=2 crashes Vim on strcpy(buf, "000") when buf is
  42     dnl declared as char x[1] but actually longer.  Introduced in gcc 4.0.
  43     dnl Also remove duplicate _FORTIFY_SOURCE arguments.
  44     AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1)
  45     if test "$gccmajor" -gt "3"; then
  46 !     CFLAGS=`echo "$CFLAGS" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=.//g' -e 's/-D_FORTIFY_SOURCE=.//g' -e 's/$/ -D_FORTIFY_SOURCE=1/'`
  47       AC_MSG_RESULT(yes)
  48     else
  49       AC_MSG_RESULT(no)
  50 --- 3584,3593 ----
  51     dnl -D_FORTIFY_SOURCE=2 crashes Vim on strcpy(buf, "000") when buf is
  52     dnl declared as char x[1] but actually longer.  Introduced in gcc 4.0.
  53     dnl Also remove duplicate _FORTIFY_SOURCE arguments.
  54 +   dnl And undefine it first to avoid a warning.
  55     AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1)
  56     if test "$gccmajor" -gt "3"; then
  57 !     CFLAGS=`echo "$CFLAGS" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=.//g' -e 's/-D_FORTIFY_SOURCE=.//g' -e 's/$/ -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1/'`
  58       AC_MSG_RESULT(yes)
  59     else
  60       AC_MSG_RESULT(no)
  61 *** ../vim-7.3.367/src/auto/configure   2011-09-02 12:27:20.000000000 +0200
  62 --- src/auto/configure  2011-12-01 20:24:02.000000000 +0100
  63 ***************
  64 *** 12483,12492 ****
  65       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  66   $as_echo "no" >&6; }
  67     fi
  68 !         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need -D_FORTIFY_SOURCE=1" >&5
  69   $as_echo_n "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; }
  70     if test "$gccmajor" -gt "3"; then
  71 !     CFLAGS=`echo "$CFLAGS" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=.//g' -e 's/-D_FORTIFY_SOURCE=.//g' -e 's/$/ -D_FORTIFY_SOURCE=1/'`
  72       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  73   $as_echo "yes" >&6; }
  74     else
  75 --- 12483,12492 ----
  76       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  77   $as_echo "no" >&6; }
  78     fi
  79 !           { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need -D_FORTIFY_SOURCE=1" >&5
  80   $as_echo_n "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; }
  81     if test "$gccmajor" -gt "3"; then
  82 !     CFLAGS=`echo "$CFLAGS" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=.//g' -e 's/-D_FORTIFY_SOURCE=.//g' -e 's/$/ -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1/'`
  83       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  84   $as_echo "yes" >&6; }
  85     else
  86 *** ../vim-7.3.367/src/version.c        2011-12-08 15:14:04.000000000 +0100
  87 --- src/version.c       2011-12-08 15:15:13.000000000 +0100
  88 ***************
  89 *** 716,717 ****
  90 --- 716,719 ----
  91   {   /* Add new patch number below this line */
  92 + /**/
  93 +     368,
  94   /**/
  95
  96 --
  97 hundred-and-one symptoms of being an internet addict:
  98 248. You sign your letters with your e-mail address instead of your name.
  99
 100  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
 101 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
 102 \\\  an exciting new programming language -- http://www.Zimbu.org        ///
 103  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///