PHP 5.5.0 released (20-Jun-2013)

diff --git a/php.spec b/php.spec
index dadec0ae5cd29046fb7635524b83a3946297480d..c9c0ae0c01575105317d51c8acc5b8c4e6ff36f4 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -129,8 +129,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %define                orgname php
 %define                php_suffix 55
 
-%define                rel     0.3
-%define                subver  RC3
+%define                rel     0.4
 Summary:       PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):     Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):     Język skryptowy PHP
@@ -139,12 +138,12 @@ Summary(ru.UTF-8):        PHP Версии 5 - язык препроцессирова
 Summary(uk.UTF-8):     PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:          %{orgname}%{php_suffix}
 Version:       5.5.0
-Release:       %{rel}%{?subver:.%{subver}}%{?with_type_hints:.th}%{?with_oci8:.oci}
+Release:       %{rel}%{?with_type_hints:.th}%{?with_oci8:.oci}
 Epoch:         4
 License:       PHP
 Group:         Libraries
-Source0:       http://downloads.php.net/dsp/%{orgname}-%{version}%{subver}.tar.xz
-# Source0-md5: 1221aff0c050611d5ec04d73349f9db6
+Source0:       http://www.php.net/distributions/%{orgname}-%{version}.tar.bz2
+# Source0-md5: daf2d54e79def9fd0fb2ac7dfcefb7f3
 Source2:       %{orgname}-mod_%{orgname}.conf
 Source3:       %{orgname}-cgi-fcgi.ini
 Source4:       %{orgname}-apache.ini
@@ -1886,7 +1885,7 @@ compression support to PHP.
 Moduł PHP umożliwiający używanie kompresji zlib.
 
 %prep
-%setup -q -n %{orgname}-%{version}%{?subver}
+%setup -q -n %{orgname}-%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1

diff --git a/suhosin.patch b/suhosin.patch
index f13727e091fe2773d1661a916aa490a5e2f730b2..07dc03702d2c2648e1bcd0719343c9d520380dd0 100644 (file)
--- a/suhosin.patch
+++ b/suhosin.patch
@@ -3833,8 +3833,8 @@ the following modifications have been made:
  #endif /* ZEND_ERRORS_H */
  
  /*
---- a/Zend/zend_hash.c
-+++ b/Zend/zend_hash.c
+--- php-5.5.0/Zend/zend_hash.c~        2013-06-20 23:57:44.000000000 +0300
++++ php-5.5.0/Zend/zend_hash.c 2013-06-20 23:58:38.383348644 +0300
 @@ -21,6 +21,7 @@
  
  #include "zend.h"
@@ -4075,10 +4075,10 @@ the following modifications have been made:
                        if (ht->pDestructor) {
                                ht->pDestructor(p->pData);
                        }
-@@ -527,6 +725,7 @@ ZEND_API int zend_hash_del_key_or_index(
-                       if (ht->pInternalPointer == p) {
+@@ -726,6 +726,7 @@
                                ht->pInternalPointer = p->pListNext;
                        }
+                       ht->nNumOfElements--;
 +                      zend_hash_check_destructor(ht->pDestructor);
                        if (ht->pDestructor) {
                                ht->pDestructor(p->pData);