1 To: [email protected]

     2 Subject: Patch 7.2.316

     3 Fcc: outbox

     4 From: Bram Moolenaar <[email protected]>

     5 Mime-Version: 1.0

     6 Content-Type: text/plain; charset=UTF-8

     7 Content-Transfer-Encoding: 8bit

     8 ------------

     9 

    10 Patch 7.2.316

    11 Problem:    May get multiple _FORTIFY_SOURCE arguments. (Tony Mechelynck)

    12 Solution:   First remove all these arguments and then add the one we want.

    13 	    (Dominique Pelle)

    14 Files:	    src/auto/configure, src/configure.in

    15 

    16 

    17 *** ../vim-7.2.315/src/auto/configure	2009-12-02 17:59:08.000000000 +0100

    18 --- src/auto/configure	2009-12-16 17:05:59.000000000 +0100

    19 ***************

    20 *** 17185,17194 ****

    21       { $as_echo "$as_me:$LINENO: result: no" >&5

    22   $as_echo "no" >&6; }

    23     fi

    24 !       { $as_echo "$as_me:$LINENO: checking whether we need -D_FORTIFY_SOURCE=1" >&5

    25   $as_echo_n "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; }

    26     if test "$gccmajor" -gt "3"; then

    27 !     CFLAGS=`echo "$CFLAGS -D_FORTIFY_SOURCE=1" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g' -e 's/-D_FORTIFY_SOURCE=2//g'`

    28       { $as_echo "$as_me:$LINENO: result: yes" >&5

    29   $as_echo "yes" >&6; }

    30     else

    31 --- 17185,17194 ----

    32       { $as_echo "$as_me:$LINENO: result: no" >&5

    33   $as_echo "no" >&6; }

    34     fi

    35 !         { $as_echo "$as_me:$LINENO: checking whether we need -D_FORTIFY_SOURCE=1" >&5

    36   $as_echo_n "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; }

    37     if test "$gccmajor" -gt "3"; then

    38 !     CFLAGS=`echo "$CFLAGS" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=.//g' -e 's/-D_FORTIFY_SOURCE=.//g' -e 's/$/ -D_FORTIFY_SOURCE=1/'`

    39       { $as_echo "$as_me:$LINENO: result: yes" >&5

    40   $as_echo "yes" >&6; }

    41     else

    42 *** ../vim-7.2.315/src/configure.in	2009-12-02 17:59:08.000000000 +0100

    43 --- src/configure.in	2009-12-16 17:05:55.000000000 +0100

    44 ***************

    45 *** 3241,3249 ****

    46     fi

    47     dnl -D_FORTIFY_SOURCE=2 crashes Vim on strcpy(buf, "000") when buf is

    48     dnl declared as char x[1] but actually longer.  Introduced in gcc 4.0.

    49     AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1)

    50     if test "$gccmajor" -gt "3"; then

    51 !     CFLAGS=`echo "$CFLAGS -D_FORTIFY_SOURCE=1" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g' -e 's/-D_FORTIFY_SOURCE=2//g'`

    52       AC_MSG_RESULT(yes)

    53     else

    54       AC_MSG_RESULT(no)

    55 --- 3241,3250 ----

    56     fi

    57     dnl -D_FORTIFY_SOURCE=2 crashes Vim on strcpy(buf, "000") when buf is

    58     dnl declared as char x[1] but actually longer.  Introduced in gcc 4.0.

    59 +   dnl Also remove duplicate _FORTIFY_SOURCE arguments.

    60     AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1)

    61     if test "$gccmajor" -gt "3"; then

    62 !     CFLAGS=`echo "$CFLAGS" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=.//g' -e 's/-D_FORTIFY_SOURCE=.//g' -e 's/$/ -D_FORTIFY_SOURCE=1/'`

    63       AC_MSG_RESULT(yes)

    64     else

    65       AC_MSG_RESULT(no)

    66 *** ../vim-7.2.315/src/version.c	2009-12-02 17:59:08.000000000 +0100

    67 --- src/version.c	2009-12-16 17:12:25.000000000 +0100

    68 ***************

    69 *** 683,684 ****

    70 --- 683,686 ----

    71   {   /* Add new patch number below this line */

    72 + /**/

    73 +     316,

    74   /**/

    75 

    76 -- 

    77 Have you heard about the new Beowulf cluster? It's so fast, it executes

    78 an infinite loop in 6 seconds.

    79 

    80  /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net   \\\

    81 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\

    82 \\\        download, build and distribute -- http://www.A-A-P.org        ///

    83  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///