From ca7f68c34b95ed6ee68771cf458302a7147d7c7564c7a5d841a95a4edaaae7fc Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Tue, 3 Mar 2009 17:34:45 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/mpfr?expand=0&rev=14

---
 mpfr-2.4.0.patch | 535 +++++++++++++++++++++++++++++++++++++++++++++++
 mpfr.changes     |   6 +
 mpfr.spec        |   7 +-
 3 files changed, 547 insertions(+), 1 deletion(-)
 create mode 100644 mpfr-2.4.0.patch

diff --git a/mpfr-2.4.0.patch b/mpfr-2.4.0.patch
new file mode 100644
index 0000000..bc40b91
--- /dev/null
+++ b/mpfr-2.4.0.patch
@@ -0,0 +1,535 @@
+diff -Naurd mpfr-2.4.0-a/PATCHES mpfr-2.4.0-b/PATCHES
+--- mpfr-2.4.0-a/PATCHES	2009-01-26 12:52:01.000000000 +0000
++++ mpfr-2.4.0-b/PATCHES	2009-02-20 17:27:44.000000000 +0000
+@@ -0,0 +1 @@
++printf-hh-ll
+diff -Naurd mpfr-2.4.0-a/VERSION mpfr-2.4.0-b/VERSION
+--- mpfr-2.4.0-a/VERSION	2009-01-26 12:52:01.000000000 +0000
++++ mpfr-2.4.0-b/VERSION	2009-02-20 17:27:44.000000000 +0000
+@@ -1 +1 @@
+-2.4.0
++2.4.0-p1
+diff -Naurd mpfr-2.4.0-a/acinclude.m4 mpfr-2.4.0-b/acinclude.m4
+--- mpfr-2.4.0-a/acinclude.m4	2009-01-26 12:52:01.000000000 +0000
++++ mpfr-2.4.0-b/acinclude.m4	2009-01-26 12:52:01.000000000 +0000
+@@ -722,6 +722,16 @@
+          [AC_DEFINE([NPRINTF_J], 1, [gmp_printf cannot read intmax_t])])
+ fi
+ 
++MPFR_FUNC_PRINTF_SPEC([%hhd], [char], [
++#include <gmp.h>
++         ], [gmp_],,
++         [AC_DEFINE([NPRINTF_HH], 1, [gmp_printf cannot use 'hh' length modifier])])
++
++MPFR_FUNC_PRINTF_SPEC([%lld], [long long int], [
++#include <gmp.h>
++         ], [gmp_],,
++         [AC_DEFINE([NPRINTF_LL], 1, [gmp_printf cannot read long long int])])
++
+ MPFR_FUNC_PRINTF_SPEC([%.0Lf], [long double], [
+ #include <gmp.h>
+          ], [gmp_],,
+diff -Naurd mpfr-2.4.0-a/configure mpfr-2.4.0-b/configure
+--- mpfr-2.4.0-a/configure	2009-01-26 12:54:36.000000000 +0000
++++ mpfr-2.4.0-b/configure	2009-02-20 17:38:36.000000000 +0000
+@@ -24874,6 +24874,170 @@
+ fi
+ 
+ 
++{ $as_echo "$as_me:$LINENO: checking if gmp_printf supports \"%hhd\"" >&5
++$as_echo_n "checking if gmp_printf supports \"%hhd\"... " >&6; }
++if test "$cross_compiling" = yes; then
++  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&5
++$as_echo "$as_me: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }; }
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <stdio.h>
++
++#include <gmp.h>
++
++
++int
++main ()
++{
++
++  char s[256];
++  char a = 0;
++  return (gmp_sprintf (s, "%hhd", a) != 1) ? 1 : 0;
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
++
++else
++  $as_echo "$as_me: program exited with status $ac_status" >&5
++$as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++{ $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++
++cat >>confdefs.h <<\_ACEOF
++#define NPRINTF_HH 1
++_ACEOF
++
++fi
++rm -rf conftest.dSYM
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++
++
++
++
++
++{ $as_echo "$as_me:$LINENO: checking if gmp_printf supports \"%lld\"" >&5
++$as_echo_n "checking if gmp_printf supports \"%lld\"... " >&6; }
++if test "$cross_compiling" = yes; then
++  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&5
++$as_echo "$as_me: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }; }
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <stdio.h>
++
++#include <gmp.h>
++
++
++int
++main ()
++{
++
++  char s[256];
++  long long int a = 0;
++  return (gmp_sprintf (s, "%lld", a) != 1) ? 1 : 0;
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
++
++else
++  $as_echo "$as_me: program exited with status $ac_status" >&5
++$as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++{ $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++
++cat >>confdefs.h <<\_ACEOF
++#define NPRINTF_LL 1
++_ACEOF
++
++fi
++rm -rf conftest.dSYM
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++
++
++
++
++
+ { $as_echo "$as_me:$LINENO: checking if gmp_printf supports \"%.0Lf\"" >&5
+ $as_echo_n "checking if gmp_printf supports \"%.0Lf\"... " >&6; }
+ if test "$cross_compiling" = yes; then
+diff -Naurd mpfr-2.4.0-a/mpfr.h mpfr-2.4.0-b/mpfr.h
+--- mpfr-2.4.0-a/mpfr.h	2009-01-26 12:52:01.000000000 +0000
++++ mpfr-2.4.0-b/mpfr.h	2009-02-20 17:27:44.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 2
+ #define MPFR_VERSION_MINOR 4
+ #define MPFR_VERSION_PATCHLEVEL 0
+-#define MPFR_VERSION_STRING "2.4.0"
++#define MPFR_VERSION_STRING "2.4.0-p1"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-2.4.0-a/tests/tfprintf.c mpfr-2.4.0-b/tests/tfprintf.c
+--- mpfr-2.4.0-a/tests/tfprintf.c	2009-01-26 12:52:00.000000000 +0000
++++ mpfr-2.4.0-b/tests/tfprintf.c	2009-02-20 16:31:02.000000000 +0000
+@@ -146,6 +146,7 @@
+   short sh = -1;
+   unsigned short ush = 1;
+   int i = -1;
++  int j = 1;
+   unsigned int ui = 1;
+   long lo = -1;
+   unsigned long ulo = 1;
+@@ -179,12 +180,11 @@
+ 
+   limb[0] = limb[1] = limb[2] = ~ (mp_limb_t) 0;
+ 
+-  check_vfprintf (fout, "a. %Ra, b. %hhu, c. %u, d. %lx%hhn", mpfr, uch, ui,
+-                  ulo, &uch);
+-  check_length (1, uch, 28, hhu);
+-  check_vfprintf (fout, "a. %hhi, b. %Rb, c. %u, d. %li%ln", sch, mpfr, i,
++  check_vfprintf (fout, "a. %Ra, b. %u, c. %lx%n", mpfr, ui, ulo, &j);
++  check_length (1, j, 22, d);
++  check_vfprintf (fout, "a. %c, b. %Rb, c. %u, d. %li%ln", i, mpfr, i,
+                   lo, &ulo);
+-  check_length (2, ulo, 37, lu);
++  check_length (2, ulo, 36, lu);
+   check_vfprintf (fout, "a. %hi, b. %*f, c. %Re%hn", ush, 3, f, mpfr, &ush);
+   check_length (3, ush, 29, hu);
+   check_vfprintf (fout, "a. %hi, b. %f, c. %#.2Rf%n", sh, d, mpfr, &i);
+@@ -208,13 +208,18 @@
+   check_length (9, sz, 30, zu);
+ #endif
+ 
++#ifndef NPRINTF_HH
++  check_vfprintf (fout, "a. %hhi, b.%RA, c. %hhu%hhn", sch, mpfr, uch, &uch);
++  check_length (10, uch, 21, hhu);
++#endif
++
+ #if (__GNU_MP_VERSION * 10 + __GNU_MP_VERSION_MINOR) >= 42
+   /* The 'M' specifier was added in gmp 4.2.0 */
+   check_vfprintf (fout, "a. %Mx b. %Re%Mn", limb[0], mpfr, &limb[0]);
+   if (limb[0] != 14 + BITS_PER_MP_LIMB / 4 || limb[1] != ~ (mp_limb_t) 0
+       || limb[2] != ~ (mp_limb_t) 0)
+     {
+-      printf ("Error in test #10: mpfr_vfprintf did not print %d characters"
++      printf ("Error in test #11: mpfr_vfprintf did not print %d characters"
+               " as expected\n", 14 + (int) BITS_PER_MP_LIMB / 4);
+       exit (1);
+     }
+@@ -227,13 +232,13 @@
+   if (limb[0] != 14 + 3 * BITS_PER_MP_LIMB / 4 || limb[1] != (mp_limb_t) 0
+       || limb[2] != ~ (mp_limb_t) 0)
+     {
+-      printf ("Error in test #11: mpfr_vfprintf did not print %d characters"
++      printf ("Error in test #12: mpfr_vfprintf did not print %d characters"
+               " as expected\n", 14 + (int) BITS_PER_MP_LIMB / 4);
+       exit (1);
+     }
+ #endif
+ 
+-#ifdef HAVE_LONG_LONG
++#if defined(HAVE_LONG_LONG) && !defined(NPRINTF_LL)
+   {
+     long long llo = -1;
+     unsigned long long ullo = 1;
+diff -Naurd mpfr-2.4.0-a/tests/tprintf.c mpfr-2.4.0-b/tests/tprintf.c
+--- mpfr-2.4.0-a/tests/tprintf.c	2009-01-26 12:52:00.000000000 +0000
++++ mpfr-2.4.0-b/tests/tprintf.c	2009-02-20 16:31:02.000000000 +0000
+@@ -150,6 +150,7 @@
+   short sh = -1;
+   unsigned short ush = 1;
+   int i = -1;
++  int j = 1;
+   unsigned int ui = 1;
+   long lo = -1;
+   unsigned long ulo = 1;
+@@ -178,11 +179,10 @@
+   mpfr_set_f (mpfr, mpf, GMP_RNDN);
+   prec = mpfr_get_prec (mpfr);
+ 
+-  check_vprintf ("a. %Ra, b. %hhu, c. %u, d. %lx%hhn", mpfr, uch, ui, ulo,
+-                 &uch);
+-  check_length (1, uch, 28, hhu);
+-  check_vprintf ("a. %hhi, b. %Rb, c. %u, d. %li%ln", sch, mpfr, i, lo, &ulo);
+-  check_length (2, ulo, 37, lu);
++  check_vprintf ("a. %Ra, b. %u, c. %lx%n", mpfr, ui, ulo, &j);
++  check_length (1, j, 22, d);
++  check_vprintf ("a. %c, b. %Rb, c. %u, d. %li%ln", i, mpfr, i, lo, &ulo);
++  check_length (2, ulo, 36, lu);
+   check_vprintf ("a. %hi, b. %*f, c. %Re%hn", ush, 3, f, mpfr, &ush);
+   check_length (3, ush, 29, hu);
+   check_vprintf ("a. %hi, b. %f, c. %#.2Rf%n", sh, d, mpfr, &i);
+@@ -204,7 +204,12 @@
+   check_length (9, sz, 30, zu);
+ #endif
+ 
+-#ifdef HAVE_LONG_LONG
++#ifndef NPRINTF_HH
++  check_vprintf ("a. %hhi, b. %Ra, c. %hhu%hhn", sch, mpfr, uch, &uch);
++  check_length (10, uch, 22, hhu);
++#endif
++
++#if defined(HAVE_LONG_LONG) && !defined(NPRINTF_LL)
+   {
+     long long llo = -1;
+     unsigned long long ullo = 1;
+diff -Naurd mpfr-2.4.0-a/vasprintf.c mpfr-2.4.0-b/vasprintf.c
+--- mpfr-2.4.0-a/vasprintf.c	2009-01-26 12:52:01.000000000 +0000
++++ mpfr-2.4.0-b/vasprintf.c	2009-02-20 16:31:02.000000000 +0000
+@@ -235,10 +235,14 @@
+       break;
+     case 'h':
+       if (*++format == 'h')
++#ifndef NPRINTF_HH
+         {
+           ++format;
+           specinfo->arg_type = CHAR_ARG;
+         }
++#else
++        specinfo->arg_type = UNSUPPORTED;
++#endif
+       else
+         specinfo->arg_type = SHORT_ARG;
+       break;
+@@ -246,7 +250,7 @@
+       if (*++format == 'l')
+         {
+           ++format;
+-#ifdef HAVE_LONG_LONG
++#if defined (HAVE_LONG_LONG) && !defined(NPRINTF_LL)
+           specinfo->arg_type = LONG_LONG_ARG;
+ #else
+           specinfo->arg_type = UNSUPPORTED;
+diff -Naurd mpfr-2.4.0-a/version.c mpfr-2.4.0-b/version.c
+--- mpfr-2.4.0-a/version.c	2009-01-26 12:52:01.000000000 +0000
++++ mpfr-2.4.0-b/version.c	2009-02-20 17:27:44.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "2.4.0";
++  return "2.4.0-p1";
+ }
+diff -Naurd mpfr-2.4.0-a/PATCHES mpfr-2.4.0-b/PATCHES
+--- mpfr-2.4.0-a/PATCHES	2009-02-25 13:27:38.000000000 +0000
++++ mpfr-2.4.0-b/PATCHES	2009-02-25 13:42:26.000000000 +0000
+@@ -0,0 +1 @@
++mpfr_snprintf
+diff -Naurd mpfr-2.4.0-a/VERSION mpfr-2.4.0-b/VERSION
+--- mpfr-2.4.0-a/VERSION	2009-02-20 17:27:44.000000000 +0000
++++ mpfr-2.4.0-b/VERSION	2009-02-25 13:41:31.000000000 +0000
+@@ -1 +1 @@
+-2.4.0-p1
++2.4.0-p2
+diff -Naurd mpfr-2.4.0-a/mpfr.h mpfr-2.4.0-b/mpfr.h
+--- mpfr-2.4.0-a/mpfr.h	2009-02-20 17:27:44.000000000 +0000
++++ mpfr-2.4.0-b/mpfr.h	2009-02-25 13:41:31.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 2
+ #define MPFR_VERSION_MINOR 4
+ #define MPFR_VERSION_PATCHLEVEL 0
+-#define MPFR_VERSION_STRING "2.4.0-p1"
++#define MPFR_VERSION_STRING "2.4.0-p2"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-2.4.0-a/printf.c mpfr-2.4.0-b/printf.c
+--- mpfr-2.4.0-a/printf.c	2009-01-26 12:52:01.000000000 +0000
++++ mpfr-2.4.0-b/printf.c	2009-02-25 13:41:22.000000000 +0000
+@@ -154,16 +154,16 @@
+   int ret;
+   size_t min_size;
+ 
+-  /* C99 allows SIZE to be null */
+-  if (size == 0)
+-    return 0;
+-
+-  MPFR_ASSERTD (buf != NULL);
+-
+   GET_STR (ret, str, fmt);
+-  min_size = (size_t)ret < size ? (size_t)ret : size - 1;
+-  strncpy (buf, str, min_size);
+-  buf[min_size + 1] = '\0';
++
++  /* C99 allows SIZE to be zero */
++  if (size != 0)
++    {
++      MPFR_ASSERTN (buf != NULL);
++      min_size = (size_t)ret < size ? (size_t)ret : size - 1;
++      strncpy (buf, str, min_size);
++      buf[min_size] = '\0';
++    }
+ 
+   mpfr_free_str (str);
+   return ret;
+@@ -176,16 +176,17 @@
+   int ret;
+   int min_size;
+ 
+-  /* C99 allows SIZE to be null */
+-  if (size == 0)
+-    return 0;
++  GET_STR_VA (ret, str, fmt, ap);
+ 
+-  MPFR_ASSERTD (buf != NULL);
++  /* C99 allows SIZE to be zero */
++  if (size != 0)
++    {
++      MPFR_ASSERTN (buf != NULL);
++      min_size = (size_t)ret < size ? (size_t)ret : size - 1;
++      strncpy (buf, str, min_size);
++      buf[min_size] = '\0';
++    }
+ 
+-  GET_STR_VA (ret, str, fmt, ap);
+-  min_size = (size_t)ret < size ? (size_t)ret : size - 1;
+-  strncpy (buf, str, min_size);
+-  buf[min_size + 1] = '\0';
+   mpfr_free_str (str);
+   return ret;
+ }
+diff -Naurd mpfr-2.4.0-a/tests/tsprintf.c mpfr-2.4.0-b/tests/tsprintf.c
+--- mpfr-2.4.0-a/tests/tsprintf.c	2009-01-26 12:52:00.000000000 +0000
++++ mpfr-2.4.0-b/tests/tsprintf.c	2009-02-25 13:41:22.000000000 +0000
+@@ -72,21 +72,37 @@
+ 
+   /* test mpfr_snprintf */
+   p = (int) (randlimb () % n0);
+-  n1 = mpfr_snprintf (buffer, p, fmt, x);
+-  if ((p != 0 && n0 != n1) || (p == 0 && n1 != 0))
++  if (p == 0 && (randlimb () & 1) == 0)
++    {
++      n1 = mpfr_snprintf (NULL, 0, fmt, x);
++    }
++  else
++    {
++      buffer[p] = 17;
++      n1 = mpfr_snprintf (buffer, p, fmt, x);
++      if (buffer[p] != 17)
++        {
++          printf ("Buffer overflow in mpfr_snprintf for p = %d!\n", p);
++          exit (1);
++        }
++    }
++  if (n0 != n1)
+     {
+       printf ("Error in mpfr_snprintf (s, %d, \"%s\", x) return value\n",
+               p, fmt);
+       printf ("expected: %d\ngot:      %d\n", n0, n1);
+       exit (1);
+     }
+-  if (strncmp (expected, buffer, p) != 0)
++  if ((p > 1 && strncmp (expected, buffer, p-1) != 0)
++      || (p == 1 && buffer[0] != '\0'))
+     {
+-      printf ("Error in mpfr_snprintf (s, %d, \"%s\", x);\n", p, fmt);
+-      printf ("expected: \"%s\"\ngot:      \"%s\"\n", expected, buffer);
++      char part_expected[p];
++      strncpy (part_expected, expected, p);
++      part_expected[p-1] = '\0';
++      printf ("Error in mpfr_vsnprintf (s, %d, \"%s\", ...);\n", p, fmt);
++      printf ("expected: \"%s\"\ngot:      \"%s\"\n", part_expected, buffer);
+       exit (1);
+     }
+-
+   return n0;
+ }
+ 
+@@ -116,8 +132,21 @@
+ 
+   /* test mpfr_snprintf */
+   p = (int) (randlimb () % n0);
+-  n1 = mpfr_vsnprintf (buffer, p, fmt, ap1);
+-  if ((p != 0 && n0 != n1) || (p == 0 && n1 != 0))
++  if (p == 0 && (randlimb () & 1) == 0)
++    {
++      n1 = mpfr_vsnprintf (NULL, 0, fmt, ap1);
++    }
++  else
++    {
++      buffer[p] = 17;
++      n1 = mpfr_vsnprintf (buffer, p, fmt, ap1);
++      if (buffer[p] != 17)
++        {
++          printf ("Buffer overflow in mpfr_vsnprintf for p = %d!\n", p);
++          exit (1);
++        }
++    }
++  if (n0 != n1)
+     {
+       printf ("Error in mpfr_vsnprintf (s, %d, \"%s\", ...) return value\n",
+               p, fmt);
+@@ -126,10 +155,14 @@
+       va_end (ap1);
+       exit (1);
+     }
+-  if (strncmp (expected, buffer, p) != 0)
++  if ((p > 1 && strncmp (expected, buffer, p-1) != 0)
++      || (p == 1 && buffer[0] != '\0'))
+     {
++      char part_expected[p];
++      strncpy (part_expected, expected, p);
++      part_expected[p-1] = '\0';
+       printf ("Error in mpfr_vsnprintf (s, %d, \"%s\", ...);\n", p, fmt);
+-      printf ("expected: \"%s\"\ngot:      \"%s\"\n", expected, buffer);
++      printf ("expected: \"%s\"\ngot:      \"%s\"\n", part_expected, buffer);
+ 
+       va_end (ap1);
+       exit (1);
+diff -Naurd mpfr-2.4.0-a/version.c mpfr-2.4.0-b/version.c
+--- mpfr-2.4.0-a/version.c	2009-02-20 17:27:44.000000000 +0000
++++ mpfr-2.4.0-b/version.c	2009-02-25 13:41:31.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "2.4.0-p1";
++  return "2.4.0-p2";
+ }
diff --git a/mpfr.changes b/mpfr.changes
index 1a8c155..10bfc76 100644
--- a/mpfr.changes
+++ b/mpfr.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb 25 15:57:54 CET 2009 - rguenther@suse.de
+
+- Apply current cummulative bugfixing patch.
+  * Fixes mpfr_snprintf and mpfr_vsnprintf buffer overflows.
+
 -------------------------------------------------------------------
 Tue Jan 27 10:43:32 CET 2009 - rguenther@suse.de
 
diff --git a/mpfr.spec b/mpfr.spec
index 1f4d720..d253859 100644
--- a/mpfr.spec
+++ b/mpfr.spec
@@ -26,10 +26,11 @@ Group:          Development/Libraries/C and C++
 AutoReqProv:    on
 Requires:       gmp
 Version:        2.4.0
-Release:        1
+Release:        2
 Summary:        The MPFR multiple-precision floating-point library
 Url:            http://www.mpfr.org/
 Source:         mpfr-%{version}.tar.bz2
+Patch1:         mpfr-2.4.0.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -98,6 +99,7 @@ Authors:
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %configure \
@@ -143,6 +145,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_prefix}/include/mpfr.h
 
 %changelog
+* Wed Feb 25 2009 rguenther@suse.de
+- Apply current cummulative bugfixing patch.
+  * Fixes mpfr_snprintf and mpfr_vsnprintf buffer overflows.
 * Tue Jan 27 2009 rguenther@suse.de
 - Update to version 2.4.0.
   * Function mpfr_init_gmp_rand is no longer defined.