updated for version 7.2-251

diff --git a/src/auto/configure b/src/auto/configure
index 1049c0ceb300a8da736c4beb8b27b99eef12f4ca..85d7da56413514dea1dc2c2d78f267b9f7867f1e 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -17135,7 +17135,7 @@ $as_echo "no" >&6; }
       { $as_echo "$as_me:$LINENO: checking whether we need -D_FORTIFY_SOURCE=1" >&5
 $as_echo_n "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; }
   if test "$gccmajor" -gt "3"; then
-    CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=1"
+    CFLAGS=`echo "$CFLAGS -D_FORTIFY_SOURCE=1" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g' -e 's/-D_FORTIFY_SOURCE=2//g'`
     { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
   else

diff --git a/src/configure.in b/src/configure.in
index 1ad32d7a3a1b0d4b2c8d9797a3eb6b7bcdaeae94..fa58c6e75014df07a4ae96249aa76314f63a0e9b 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -3233,7 +3233,7 @@ if test "$GCC" = yes; then
   dnl declared as char x[1] but actually longer.  Introduced in gcc 4.0.
   AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1)
   if test "$gccmajor" -gt "3"; then
-    CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=1"
+    CFLAGS=`echo "$CFLAGS -D_FORTIFY_SOURCE=1" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g' -e 's/-D_FORTIFY_SOURCE=2//g'`
     AC_MSG_RESULT(yes)
   else
     AC_MSG_RESULT(no)

diff --git a/src/version.c b/src/version.c
index b0318481c98751ee306941b07c0d65eee07cbcba..16e319d1d46c9d550abe77f44f2a491b91073bf9 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    251,
 /**/
     250,
 /**/