- rel 12; build fixed

Changed files:
    php-bug-48619.patch -> 1.1.2.2
    php.spec -> 1.805.2.7

diff --git a/php-bug-48619.patch b/php-bug-48619.patch
index 2bca0610740b86213b506985afcc839e2dd5ed60..3975162ec67b0514f1b19c87702b4873b15ba694 100644 (file)
--- a/php-bug-48619.patch
+++ b/php-bug-48619.patch
@@ -38,3 +38,25 @@ index ea4e8d5..24111e1 100644
                mail_free_searchpgm(&pgm);
        }
  
+commit 069ddaf37eaf2e8f4864b9bbff4cab9174961ffc
+Author: iliaa <iliaa@c90b9560-bf6c-de11-be94-00142212c4b1>
+Date:   Tue Jun 23 12:43:10 2009 +0000
+
+    Fixed build
+    
+    
+    git-svn-id: http://svn.php.net/repository/php/php-src/branches/PHP_5_2@282642 c90b9560-bf6c-de11-be94-00142212c4b1
+
+diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
+index 24111e1..a5b2dc9 100644
+--- a/ext/imap/php_imap.c
++++ b/ext/imap/php_imap.c
+@@ -2670,7 +2670,7 @@ PHP_FUNCTION(imap_sort)
+ 
+       slst = mail_sort(imap_le_struct->imap_stream, (myargc == 6 ? Z_STRVAL_PP(charset) : NIL), spg, mypgm, (myargc >= 4 ? Z_LVAL_PP(flags) : NIL));
+ 
+-      if (spg && !(flags & SE_FREE)) {
++      if (spg && myargc >= 4 && !(Z_LVAL_PP(flags) & SE_FREE)) {
+               mail_free_searchpgm(&spg);
+       }
+ 

diff --git a/php.spec b/php.spec
index 667dbf2314dc4ff1b3b2695a6602d5a361de4d00..c84e2c388961fb837659819a898e20a45a5fa286 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -94,7 +94,7 @@ Summary(ru.UTF-8):    PHP Версии 5 - язык препроцессирова
 Summary(uk.UTF-8):     PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:          php
 Version:       5.2.10
-Release:       11
+Release:       12
 Epoch:         4
 License:       PHP
 Group:         Libraries