diff options
Diffstat (limited to 'php55.spec')
| -rw-r--r-- | php55.spec | 18 |
1 files changed, 14 insertions, 4 deletions
@@ -106,7 +106,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: php Version: 5.5.7 %if 0%{?snapdate:1}%{?rcver:1} -Release: 0.3.%{?snapdate}%{?rcver}%{?dist} +Release: 0.4.%{?snapdate}%{?rcver}%{?dist} %else Release: 1%{?dist} %endif @@ -165,6 +165,14 @@ Patch46: php-5.4.9-fixheader.patch # drop "Configure command" from phpinfo output Patch47: php-5.4.9-phpinfo.patch +# Upstream fixes +# 66060 Heap buffer over-read in DateInterval +Patch100: php-bug66060.patch +# 66218 zend_register_functions breaks reflection +Patch101: php-bug66218.patch +# Zend: fix overflow handling bug in non-x86 +Patch103: php-bugarm.patch + # Security fixes # Fixes for tests @@ -173,8 +181,6 @@ Patch47: php-5.4.9-phpinfo.patch Patch91: php-5.3.7-oci8conf.patch # WIP -Patch100: php-wip.patch -Patch101: php-wip2.patch Patch102: php-wip3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -884,9 +890,10 @@ rm -rf ext/json %patch91 -p1 -b .remi-oci8 # wip patches -%patch100 -p1 -b .wip1 +%patch100 -p1 -b .bug66060 %patch101 -p1 -b .bug66218 %patch102 -p1 -b .wip3 +%patch103 -p1 -b .bugarm # Prevent %%doc confusion over LICENSE files cp Zend/LICENSE Zend/ZEND_LICENSE @@ -1861,6 +1868,9 @@ fi %changelog +* Tue Dec 10 2013 Remi Collet <rcollet@redhat.com> 5.5.7-0.4.RC1 +- test build + * Wed Dec 04 2013 Remi Collet <rcollet@redhat.com> 5.5.7-0.3.RC1 - test build |