up to 5.5.4

diff --git a/php-bug-60598.patch b/php-bug-60598.patch
deleted file mode 100644 (file)
index 613889f..0000000
--- a/php-bug-60598.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/Zend/zend_objects_API.c b/Zend/zend_objects_API.c
-index 1fe5d0c..b5dd48f 100644
---- a/Zend/zend_objects_API.c
-+++ b/Zend/zend_objects_API.c
-@@ -57,6 +57,11 @@ ZEND_API void zend_objects_store_call_destructors(zend_objects_store *objects TS
-                                       obj->dtor(obj->object, i TSRMLS_CC);
-                                       obj = &objects->object_buckets[i].bucket.obj;
-                                       obj->refcount--;
-+
-+                                      if (obj->refcount == 0) {
-+                                              /* in case gc_collect_cycle is triggered before free_storage */
-+                                              GC_REMOVE_ZOBJ_FROM_BUFFER(obj);
-+                                      }
-                               }
-                       }
-               }

diff --git a/php.spec b/php.spec
index b86cdad21ab858aece9cc8f2d66d01746258f6f4..bae73a1045e892e79fc00e88c9cd4879c7c21407 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -139,13 +139,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:          %{orgname}%{php_suffix}
-Version:       5.5.3
+Version:       5.5.4
 Release:       %{rel}%{?with_type_hints:.th}%{?with_oci8:.oci}
 Epoch:         4
 License:       PHP
 Group:         Libraries
 Source0:       http://www.php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5: 437e98144ef014dfab0922a9eed36853
+# Source0-md5: 32c1dc56701d21def91a39a312392b54
 Source2:       %{orgname}-mod_%{orgname}.conf
 Source3:       %{orgname}-cgi-fcgi.ini
 Source4:       %{orgname}-apache.ini
@@ -217,7 +217,6 @@ Patch63:    %{orgname}-mysql-nowarning.patch
 #Patch64:      %{orgname}-m4.patch # not needed on 5.4 branch
 Patch65:       system-libzip.patch
 Patch66:       php-db.patch
-Patch67:       php-bug-60598.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}
@@ -1951,7 +1950,6 @@ cp -p php.ini-production php.ini
 %patch63 -p1
 %{?with_system_libzip:%patch65 -p1}
 %patch66 -p1
-%patch67 -p1
 
 sed -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4