From ae96c6e0f68cde871c2ca4c0e5f890e88b7f6982 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Thu, 6 Jan 2011 15:47:32 +0000 Subject: [PATCH] - rel 3; famous float bug on 32bit matchines fix Changed files: php-bug-float.patch -> 1.1 php.spec -> 1.913 --- php-bug-float.patch | 11 +++++++++++ php.spec | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 php-bug-float.patch diff --git a/php-bug-float.patch b/php-bug-float.patch new file mode 100644 index 0000000..6531079 --- /dev/null +++ b/php-bug-float.patch @@ -0,0 +1,11 @@ +--- PHP_5_3/Zend/zend_strtod.c 2011/01/04 22:01:09 307094 ++++ PHP_5_3/Zend/zend_strtod.c 2011/01/04 22:36:23 307095 +@@ -2035,7 +2035,7 @@ + int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, dsign, + e, e1, esign, i, j, k, nd, nd0, nf, nz, nz0, sign; + CONST char *s, *s0, *s1; +- double aadj, aadj1, adj; ++ volatile double aadj, aadj1, adj; + volatile _double rv, rv0; + Long L; + ULong y, z; diff --git a/php.spec b/php.spec index 8c26a8a..8560fe2 100644 --- a/php.spec +++ b/php.spec @@ -101,7 +101,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules. %undefine with_filter %endif -%define rel 2 +%define rel 3 Summary: PHP: Hypertext Preprocessor Summary(fr.UTF-8): Le langage de script embarque-HTML PHP Summary(pl.UTF-8): Język skryptowy PHP @@ -183,6 +183,7 @@ Patch57: bug-52448.patch Patch59: %{name}-systzdata.patch Patch60: %{name}-oracle-instantclient.patch Patch61: %{name}-krb5-ac.patch +Patch62: %{name}-bug-float.patch URL: http://www.php.net/ %{?with_interbase:%{!?with_interbase_inst:BuildRequires: Firebird-devel >= 1.0.2.908-2}} %{?with_pspell:BuildRequires: aspell-devel >= 2:0.50.0} @@ -1857,6 +1858,7 @@ cp php.ini-production php.ini %patch59 -p1 %patch60 -p1 %patch61 -p1 +%patch62 -p1 %if "%{pld_release}" != "ac" sed -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4 -- 2.44.0