diff options
| -rw-r--r-- | php-5.6.0-mock.patch | 20 | ||||
| -rw-r--r-- | php56.spec | 10 |
2 files changed, 5 insertions, 25 deletions
diff --git a/php-5.6.0-mock.patch b/php-5.6.0-mock.patch deleted file mode 100644 index 35e2983..0000000 --- a/php-5.6.0-mock.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up php-5.6.0RC1/ext/standard/var_unserializer.c.mock php-5.6.0RC1/ext/standard/var_unserializer.c ---- php-5.6.0RC1/ext/standard/var_unserializer.c.mock 2014-06-19 03:26:09.000000000 +0200 -+++ php-5.6.0RC1/ext/standard/var_unserializer.c 2014-06-23 18:51:04.702265786 +0200 -@@ -22,6 +22,7 @@ - #include "php.h" - #include "ext/standard/php_var.h" - #include "php_incomplete_class.h" -+#include "Zend/zend_interfaces.h" - - /* {{{ reference-handling for unserializer: var_* */ - #define VAR_ENTRIES_MAX 1024 -@@ -394,7 +395,7 @@ static inline long object_common1(UNSERI - - (*p) += 2; - -- if (ce->serialize == NULL) { -+ if (ce->serialize == NULL || ce->unserialize == zend_user_unserialize || (ZEND_INTERNAL_CLASS != ce->type && ce->create_object == NULL)) { - object_init_ex(*rval, ce); - } else { - /* If this class implements Serializable, it should not land here but in object_custom(). The passed string @@ -115,13 +115,13 @@ %endif #global snapdate 201405061030 -%global rcver RC3 +%global rcver RC4 Summary: PHP scripting language for creating dynamic web sites Name: php Version: 5.6.0 %if 0%{?snapdate:1}%{?rcver:1} -Release: 0.20.%{?snapdate}%{?rcver}%{?dist} +Release: 0.21.%{?snapdate}%{?rcver}%{?dist} %else Release: 1%{?dist} %endif @@ -177,8 +177,6 @@ Patch45: php-5.4.8-ldap_r.patch Patch46: php-5.4.9-fixheader.patch # drop "Configure command" from phpinfo output Patch47: php-5.4.9-phpinfo.patch -# temporary fix (from 5.4/5.5) for unserialize/mock -Patch48: php-5.6.0-mock.patch # RC Patch Patch91: php-5.3.7-oci8conf.patch @@ -905,7 +903,6 @@ rm -rf ext/json %endif %patch46 -p1 -b .fixheader %patch47 -p1 -b .phpinfo -%patch48 -p1 -b .mock %patch91 -p1 -b .remi-oci8 @@ -1875,6 +1872,9 @@ fi %changelog +* Thu Aug 14 2014 Remi Collet <rcollet@redhat.com> 5.6.0-0.21.RC4 +- php 5.6.0RC4 + * Wed Jul 30 2014 Remi Collet <rcollet@redhat.com> 5.6.0-0.20.RC3 - php 5.6.0RC3 - fix license handling |