- up to 5.2.11 (hash is now merged into common since session requires it)

Changed files:
    php-bug-48619.patch -> 1.1.2.3
    php.spec -> 1.805.2.11

diff --git a/php-bug-48619.patch b/php-bug-48619.patch
deleted file mode 100644 (file)
index 3975162..0000000
--- a/php-bug-48619.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-commit 19db2c409fce51c612ce673550b186163c6e72d6
-Author: pajoye <pajoye@c90b9560-bf6c-de11-be94-00142212c4b1>
-Date:   Mon Jun 22 20:42:04 2009 +0000
-
-    - MF53: #48619, imap_search ALL segfaults
-    
-    
-    git-svn-id: http://svn.php.net/repository/php/php-src/branches/PHP_5_2@282598 c90b9560-bf6c-de11-be94-00142212c4b1
-
-diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
-index ea4e8d5..24111e1 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) {
-+      if (spg && !(flags & SE_FREE)) {
-               mail_free_searchpgm(&spg);
-       }
- 
-@@ -3712,7 +3712,7 @@ PHP_FUNCTION(imap_search)
- 
-       mail_search_full(imap_le_struct->imap_stream, (argc == 4 ? Z_STRVAL_PP(charset) : NIL), pgm, flags);
- 
--      if (pgm) {
-+      if (pgm && !(flags & SE_FREE)) {
-               mail_free_searchpgm(&pgm);
-       }
- 
-@@ -4341,7 +4341,7 @@ PHP_FUNCTION(imap_thread)
- 
-       pgm = mail_criteria(criteria);
-       top = mail_thread(imap_le_struct->imap_stream, "REFERENCES", NIL, pgm, flags);
--      if (pgm) {
-+      if (pgm && !(flags & SE_FREE)) {
-               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 bee175ed1ed55c19b4ef4b2f227ea578f2283496..45457d6065e6e8ae1a4607756403079bb097dfdb 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -99,13 +99,13 @@ Summary(pt_BR.UTF-8):       A linguagem de script PHP
 Summary(ru.UTF-8):     PHP Версии 5 - язык препроцессирования HTML-файлов, выполняемый на сервере
 Summary(uk.UTF-8):     PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:          php
-Version:       5.2.10
-Release:       13
+Version:       5.2.11
+Release:       1
 Epoch:         4
 License:       PHP
 Group:         Libraries
 Source0:       http://www.php.net/distributions/%{name}-%{version}.tar.bz2
-# Source0-md5: 15c7b5a87f57332d6fc683528e28247b
+# Source0-md5: 286bf34630f5643c25ebcedfec5e0a09
 Source2:       %{name}-mod_%{name}.conf
 Source3:       %{name}-cgi-fcgi.ini
 Source4:       %{name}-cgi.ini
@@ -166,9 +166,7 @@ Patch44:    %{name}-include_path.patch
 Patch45:       %{name}-imap-annotations.patch
 Patch46:       %{name}-imap-myrights.patch
 Patch47:       suhosin.patch
-Patch48:       %{name}-bug-48697.patch
 Patch49:       %{name}-m4-divert.patch
-Patch50:       %{name}-bug-48619.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}
@@ -427,6 +425,7 @@ Group:              Libraries
 Requires:      glibc >= 6:2.3.5
 Requires:      php-dirs
 Provides:      php(date)
+Provides:      php(hash)
 Provides:      php(libxml)
 %{?with_zend_multibyte:Provides:       php(mbstring)}
 Provides:      php(modules_api) = %{php_api_version}
@@ -443,8 +442,10 @@ Provides:  php(zend_module_api) = %{zend_module_api}
 %{?with_pcre:Provides: php-pcre = %{epoch}:%{version}-%{release}}
 Provides:      php5(debug) = %{php_debug}
 Provides:      php5(thread-safety) = %{zend_zts}
+Obsoletes:     php-hash
 Obsoletes:     php-pcre < 4:5.2.0
 Obsoletes:     php-pecl-domxml
+Obsoletes:     php-pecl-hash
 Obsoletes:     php-session < 3:4.2.1-2
 Conflicts:     php4-common < 3:4.4.4-8
 Conflicts:     rpm < 4.4.2-0.2
@@ -747,22 +748,6 @@ length number support with GNU MP library.
 Moduł PHP umożliwiający korzystanie z biblioteki gmp do obliczeń na
 liczbach o dowolnej długości.
 
-%package hash
-Summary:       HASH Message Digest Framework
-Summary(pl.UTF-8):     Szkielet do obliczania skrótów wiadomości
-Group:         Libraries
-Requires:      %{name}-common = %{epoch}:%{version}-%{release}
-Provides:      php(hash)
-Obsoletes:     php-pecl-hash
-
-%description hash
-Native implementations of common message digest algorithms using a
-generic factory method.
-
-%description hash -l pl.UTF-8
-Natywne implementacje popularnych algorytmów obliczania skrótów
-wiadomości przy użyciu wspólnego interfejsu.
-
 %package iconv
 Summary:       iconv extension module for PHP
 Summary(pl.UTF-8):     Moduł iconv dla PHP
@@ -1681,9 +1666,7 @@ done
 %if %{with suhosin}
 %patch47 -p1
 %endif
-%patch48 -R -p3
 %patch49 -p1
-%patch50 -p1
 
 # conflict seems to be resolved by recode patches
 rm -f ext/recode/config9.m4
@@ -1817,7 +1800,7 @@ for sapi in $sapis; do
        --enable-pcntl=shared \
        --enable-pdo=shared \
        --enable-json=shared \
-       --enable-hash=shared \
+       --enable-hash \
        --enable-xmlwriter=shared \
 %if %{with fpm}
        --with-fpm-conf=%{_sysconfdir}/fpm.conf \
@@ -2169,7 +2152,6 @@ fi
 %extension_scripts gd
 %extension_scripts gettext
 %extension_scripts gmp
-%extension_scripts hash
 %extension_scripts iconv
 %extension_scripts imap
 %extension_scripts interbase
@@ -2555,11 +2537,6 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/gmp.ini
 %attr(755,root,root) %{php_extensiondir}/gmp.so
 
-%files hash
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/hash.ini
-%attr(755,root,root) %{php_extensiondir}/hash.so
-
 %files iconv
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/iconv.ini