From 7ef3faf99a1b3ecb45f25cf06e54cf14776e5ae5 Mon Sep 17 00:00:00 2001 From: Frantisek Kluknavsky Date: Tue, 23 Jun 2015 16:27:06 +0200 Subject: [PATCH] rebase to 3.1.3 --- .gitignore | 1 + limboverflow.patch | 15 --------------- mpfr.spec | 11 ++++++----- sources | 2 +- 4 files changed, 8 insertions(+), 21 deletions(-) delete mode 100644 limboverflow.patch diff --git a/.gitignore b/.gitignore index 7e8ec13..500ec48 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /mpfr-3.1.1.tar.xz /mpfr-3.1.2.zip /mpfr-3.1.2.tar.xz +/mpfr-3.1.3.tar.xz diff --git a/limboverflow.patch b/limboverflow.patch deleted file mode 100644 index 95232c5..0000000 --- a/limboverflow.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- mpfr-3.1.2-a/src/strtofr.c 2013-03-13 15:37:32.000000000 +0000 -+++ mpfr-3.1.2-b/src/strtofr.c 2014-12-04 01:41:57.287791246 +0000 -@@ -473,8 +473,10 @@ - /* prec bits corresponds to ysize limbs */ - ysize_bits = ysize * GMP_NUMB_BITS; - /* and to ysize_bits >= prec > MPFR_PREC (x) bits */ -- y = MPFR_TMP_LIMBS_ALLOC (2 * ysize + 1); -- y += ysize; /* y has (ysize+1) allocated limbs */ -+ /* we need to allocate one more limb to work around bug -+ https://gmplib.org/list-archives/gmp-bugs/2013-December/003267.html */ -+ y = MPFR_TMP_LIMBS_ALLOC (2 * ysize + 2); -+ y += ysize; /* y has (ysize+2) allocated limbs */ - - /* pstr_size is the number of characters we read in pstr->mant - to have at least ysize full limbs. diff --git a/mpfr.spec b/mpfr.spec index 6a4a0b5..77a13da 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -1,7 +1,7 @@ Summary: A C library for multiple-precision floating-point computations Name: mpfr -Version: 3.1.2 -Release: 8%{?dist} +Version: 3.1.3 +Release: 1%{?dist} URL: http://www.mpfr.org/ Source0: http://www.mpfr.org/mpfr-current/%{name}-%{version}.tar.xz # GFDL (mpfr.texi, mpfr.info and fdl.texi) @@ -12,8 +12,6 @@ Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Requires: gmp >= 4.2.1 -Patch0: limboverflow.patch - %description The MPFR library is a C library for multiple-precision floating-point computations with "correct rounding". The MPFR is efficient and @@ -39,7 +37,6 @@ install the mpfr package. %prep %setup -q -%patch0 -p1 -b .limboverflow %build %configure --disable-assert --disable-static @@ -87,6 +84,10 @@ fi %{_infodir}/mpfr.info* %changelog +* Tue Jun 23 2015 Frantisek Kluknavsky - 3.1.3-1 +- rebase to 3.1.3 +- limboverflow.patch already in tarball, dropped + * Fri Dec 12 2014 Frantisek Kluknavsky - 3.1.2-8 - added limboverflow.patch, rhbz#1171701, rhbz#1171710, there was one less limb allocated in strtofr diff --git a/sources b/sources index ef2a210..0f0fbb1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e3d203d188b8fe60bb6578dd3152e05c mpfr-3.1.2.tar.xz +6969398cd2fbc56a6af570b5273c56a9 mpfr-3.1.3.tar.xz