summaryrefslogtreecommitdiffstats
path: root/php.spec
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-08-05 08:42:31 +0200
committerRemi Collet <fedora@famillecollet.com>2016-08-05 08:42:31 +0200
commit7eeeb6e96a8354ae5c553662e96a1bfcf3bb9b65 (patch)
tree112530e37ed64aa91435291a889bf8bd81ef08b6 /php.spec
parente82f7094730b3e7a3ef16eff7e094b67580e7ef8 (diff)
php 5.4+5.5: add upstream patch for exif regression
Diffstat (limited to 'php.spec')
-rw-r--r--php.spec7
1 files changed, 6 insertions, 1 deletions
diff --git a/php.spec b/php.spec
index 4e858fd..d047521 100644
--- a/php.spec
+++ b/php.spec
@@ -140,7 +140,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
Version: 5.5.38
-Release: 1%{?dist}
+Release: 1%{?dist}.1
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
# TSRM is licensed under BSD
@@ -192,6 +192,7 @@ Patch47: php-5.4.9-phpinfo.patch
Patch91: php-5.3.7-oci8conf.patch
# Upstream fixes (100+)
+Patch100: bug72735.patch
# Security fixes (200+)
@@ -882,6 +883,7 @@ support for using the enchant library to PHP.
# upstream patches
# security patches
+%patch100 -p1 -b .bug72735
# Fixes for tests
%patch300 -p1 -b .datetests
@@ -1776,6 +1778,9 @@ fi
%changelog
+* Fri Aug 5 2016 Remi Collet <remi@fedoraproject.org> 5.5.38-1.1
+- fix #72735 regression in exif maker note parser
+
* Wed Jul 20 2016 Remi Collet <remi@fedoraproject.org> 5.5.38-1
- Update to 5.5.38 - http://www.php.net/releases/5_5_38.php