diff options
| author | Remi Collet <fedora@famillecollet.com> | 2014-06-03 15:17:26 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2014-06-03 15:17:26 +0200 |
| commit | 76dab6ee2fb63a89f034b5fe33374d69e72e862f (patch) | |
| tree | 9ae5ec6442484155af5704340858e91137793281 /php54.spec | |
| parent | 6e4d020d29c31eb67a04830875112f220a32fbdb (diff) | |
PHP 5.4.29: apply 2 upstream fix
Diffstat (limited to 'php54.spec')
| -rw-r--r-- | php54.spec | 14 |
1 files changed, 13 insertions, 1 deletions
@@ -85,7 +85,7 @@ Version: 5.4.29 %if 0%{?snapdate:1}%{?rcver:1} Release: 0.1.%{?snapdate}%{?rcver}%{?dist} %else -Release: 1%{?dist} +Release: 2%{?dist} %endif # All files licensed under PHP version 3.01, except # Zend is licensed under Zend @@ -136,6 +136,8 @@ Patch46: php-5.4.9-fixheader.patch Patch47: php-5.4.9-phpinfo.patch # Upstream fixes +Patch100: php-reg67072.patch +Patch101: php-bug67326.patch # Security fixes @@ -800,6 +802,11 @@ rm -f ext/json/utf8_to_utf16.* %patch91 -p1 -b .remi-oci8 +# upstream patches +%patch100 -p1 -b .reg67072 +%patch101 -p1 -b .bug67326 + +# security patches # Prevent %%doc confusion over LICENSE files cp Zend/LICENSE Zend/ZEND_LICENSE @@ -1646,6 +1653,11 @@ fi %changelog +* Tue Jun 3 2014 Remi Collet <remi@fedoraproject.org> 5.4.29-2 +- fileinfo: fix insufficient boundary check +- workaround regression introduce in fix for 67072 in + serialize/unzerialize functions + * Wed May 28 2014 Remi Collet <remi@fedoraproject.org> 5.4.29-1 - Update to 5.4.29 http://www.php.net/releases/5_4_29.php |