- rel 26; fix gmp build

Changed files:
    php4-gmp.patch -> 1.2
    php4.spec -> 1.654

diff --git a/php4-gmp.patch b/php4-gmp.patch
index d7138ceb519d56f4601a162008c40a4fe1fa6333..9f2a6c68ee51de59542838799e7a480fc858a675 100644 (file)
--- a/php4-gmp.patch
+++ b/php4-gmp.patch
@@ -1,11 +1,11 @@
---- php.org/ext/gmp/gmp.c.org  2005-04-03 14:52:52.249524040 +0200
-+++ php/ext/gmp/gmp.c  2005-04-03 14:53:58.781409656 +0200
-@@ -221,6 +221,7 @@
- {
-       int ret = 0;
-       int skip_lead = 0;
-+      TSRMLS_FETCH();
+--- php-5.2.13/ext/gmp/gmp.c~  2010-01-03 10:23:27.000000000 +0100
++++ php-5.2.13/ext/gmp/gmp.c   2010-03-29 10:36:17.522388852 +0200
+@@ -1396,7 +1396,7 @@
  
-       *gmpnumber = emalloc(sizeof(mpz_t));
-       switch(Z_TYPE_PP(val)) {
-
+               GMPG(rand_initialized) = 1;
+       }
+-      mpz_urandomb(*gmpnum_result, GMPG(rand_state), GMP_ABS (limiter) * __GMP_BITS_PER_MP_LIMB);
++      mpz_urandomb(*gmpnum_result, GMPG(rand_state), GMP_ABS (limiter) * GMP_LIMB_BITS);
+ 
+       ZEND_REGISTER_RESOURCE(return_value, gmpnum_result, le_gmp);
+ }

diff --git a/php4.spec b/php4.spec
index 4e9b1f687e8b6cef83e4adb50ee7cc92e9784201..a34a416219f3315bf3602f8ffb1089686da3a49e 100644 (file)
--- a/php4.spec
+++ b/php4.spec
@@ -72,7 +72,7 @@
 %undefine      with_msession
 %endif
 
-%define                rel 25
+%define                rel 26
 Summary:       PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):     Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):     Język skryptowy PHP
@@ -148,6 +148,7 @@ Patch52:    %{name}-lib64.patch
 Patch53:       %{name}-silent-session-cleanup.patch
 Patch54:       %{name}-m4-divert.patch
 Patch55:       %{name}-libpng.patch
+Patch56:       %{name}-gmp.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}
@@ -1623,6 +1624,7 @@ cp php.ini-dist php.ini
 %patch53 -p1
 %patch54 -p1
 %patch55 -p1
+%patch56 -p1
 
 %if %{with hardening}
 zcat %{SOURCE8} | patch -p1