summaryrefslogtreecommitdiffstats
path: root/php55.spec
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-06-03 14:06:47 +0200
committerRemi Collet <fedora@famillecollet.com>2014-06-03 14:06:47 +0200
commitc21955ff3fb6c3fe45e3a96492d790acb1ca4030 (patch)
tree935900bb45ed885c3de920cabaf0b85d22e38428 /php55.spec
parentf7ddab1e2b247522e39345c2dc7de5ee3c7d70b6 (diff)
PHP 5.5.13: apply 2 upstream fix
Diffstat (limited to 'php55.spec')
-rw-r--r--php55.spec11
1 files changed, 10 insertions, 1 deletions
diff --git a/php55.spec b/php55.spec
index e8337f5..8737006 100644
--- a/php55.spec
+++ b/php55.spec
@@ -126,7 +126,7 @@ Version: 5.5.13
%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
@@ -187,6 +187,8 @@ Patch47: php-5.4.9-phpinfo.patch
Patch91: php-5.3.7-oci8conf.patch
# Upstream fixes (100+)
+Patch100: php-reg67072.patch
+Patch101: php-bug67326.patch
# Security fixes (200+)
@@ -904,6 +906,8 @@ rm -rf ext/json
%patch91 -p1 -b .remi-oci8
# upstream patches
+%patch100 -p1 -b .reg67072
+%patch101 -p1 -b .bug67326
# security patches
@@ -1894,6 +1898,11 @@ fi
%changelog
+* Tue Jun 3 2014 Remi Collet <remi@fedoraproject.org> 5.5.13-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.5.13-1
- Update to 5.5.13
http://www.php.net/releases/5_5_13.php